rpms/openoffice.org/F-13 openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch, NONE, 1.1 openoffice.org.spec, 1.2162, 1.2163

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19442/F-13

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch 
Log Message:
Resolves: rhbz#568655 add openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch

openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch:
 impedit.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch ---
diff -ru svx.orig/source/editeng/impedit.cxx svx/source/editeng/impedit.cxx
--- svx.orig/source/editeng/impedit.cxx	2010-02-26 13:50:40.000000000 +0000
+++ svx/source/editeng/impedit.cxx	2010-03-02 15:10:15.000000000 +0000
@@ -1497,7 +1497,7 @@
 
 void ImpEditView::ShowDDCursor( const Rectangle& rRect )
 {
-	if ( !pDragAndDropInfo->bVisCursor )
+	if ( pDragAndDropInfo && !pDragAndDropInfo->bVisCursor )
 	{
 		if ( pOutWin->GetCursor() )
 			pOutWin->GetCursor()->Hide();
@@ -1552,6 +1552,8 @@
 
     vos::OGuard aVclGuard( Application::GetSolarMutex() );
 
+    pDragAndDropInfo = NULL;
+
     Point aMousePosPixel( rDGE.DragOriginX, rDGE.DragOriginY );
 
     EditSelection aCopySel( GetEditSelection() );
@@ -1725,7 +1727,7 @@
 
     DBG_ASSERT( pDragAndDropInfo, "Drop - No Drag&Drop info?!" );
 
-    if ( pDragAndDropInfo->bDragAccepted )
+    if ( pDragAndDropInfo && pDragAndDropInfo->bDragAccepted )
     {
 		pEditEngine->GetBeginDropHdl().Call(GetEditViewPtr());
 	    BOOL bChanges = FALSE;
@@ -1825,7 +1827,7 @@
 
     HideDDCursor();
 
-	if ( !pDragAndDropInfo->bStarterOfDD )
+	if ( pDragAndDropInfo && !pDragAndDropInfo->bStarterOfDD )
 	{
 		delete pDragAndDropInfo;
 		pDragAndDropInfo = NULL;
@@ -1845,7 +1847,7 @@
     {
 //        sal_Int8 nSupportedActions = bReadOnly ? datatransfer::dnd::DNDConstants::ACTION_COPY : datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE;
 
-        if ( pDragAndDropInfo->bHasValidData /* && ( nSupportedActions & rDTDE.DropAction ) MT: Default = 0x80 ?! */ )
+        if ( pDragAndDropInfo && pDragAndDropInfo->bHasValidData /* && ( nSupportedActions & rDTDE.DropAction ) MT: Default = 0x80 ?! */ )
         {
             bAccept = sal_True;
 
@@ -1965,7 +1967,8 @@
     if ( !bAccept )
     {
         HideDDCursor();
-        pDragAndDropInfo->bDragAccepted = FALSE;
+        if (pDragAndDropInfo)
+            pDragAndDropInfo->bDragAccepted = FALSE;
         rDTDE.Context->rejectDrag();
     }
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/openoffice.org.spec,v
retrieving revision 1.2162
retrieving revision 1.2163
diff -u -p -r1.2162 -r1.2163
--- openoffice.org.spec	28 Feb 2010 17:54:44 -0000	1.2162
+++ openoffice.org.spec	2 Mar 2010 16:43:55 -0000	1.2163
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 8
+%define rh_rpm_release 9
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -142,6 +142,7 @@ Patch66: openoffice.org-3.3.0.ooo109406.
 Patch67: workspace.koheicsvimport.patch
 Patch68: openoffice.org-3.2.0.ooo108991.redlandfixes.patch
 Patch69: workspace.vcl110.patch
+Patch70: openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1711,6 +1712,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch67 -p1 -b .workspace.koheicsvimport.patch
 %patch68 -p1 -b .ooo108991.redlandfixes.patch
 %patch69 -p0 -b .workspace.vcl110.patch
+%patch70 -p0 -b .ooo109743.svx.safedragdrop.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4195,6 +4197,9 @@ fi
 %endif
 
 %changelog
+* Tue Mar 02 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.9
+- Resolves: rhbz#568655 add openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch (caolanm)
+
 * Thu Feb 25 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.8
 - Resolves: rhbz#568335 silence a11y warning (caolanm)