rpms/openoffice.org/F-12 openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch, NONE, 1.1 openoffice.org.spec, 1.2073, 1.2074

[Caolan McNamara]

Author: caolanm

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

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-12/openoffice.org.spec,v
retrieving revision 1.2073
retrieving revision 1.2074
diff -u -p -r1.2073 -r1.2074
--- openoffice.org.spec	22 Feb 2010 16:54:52 -0000	1.2073
+++ openoffice.org.spec	2 Mar 2010 16:43:53 -0000	1.2074
@@ -199,6 +199,7 @@ Patch121: workspace.hb32showstoppers3.pa
 Patch122: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
 Patch123: openoffice.org-3.3.0.ooo109406.sdext.pdfimport.escape-newlines-in-pdf-processor.patch
 Patch124: workspace.fwk131.patch
+Patch125: openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1792,6 +1793,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch122 -p1 -b .ooo95369.sw.sortedobjs.patch
 %patch123 -p1 -b .ooo109406.sdext.pdfimport.escape-newlines-in-pdf-processor.patch
 %patch124 -p1 -b .workspace.fwk131.patch
+%patch125 -p1 -b .ooo109743.svx.safedragdrop.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4331,7 +4333,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Feb 22 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.27-UNBUILT
+* Tue Mar 02 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.27-UNBUILT
 - Resolves: rhbz#565519 add openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
 - Resolves: rhbz#566099 fix modal dialog exit in qstarter
 - Resolves: rhbz#565906 don't crash on bad .svg in add to gallery
@@ -4340,6 +4342,7 @@ fi
 - Resolves: rhbz#566586 setting OpenOffice to show changes in document
   colored by author doesn't persist (dtardon)
 - Resolves: rhbz#566990 handle unreadable .db files (caolanm)
+- Resolves: rhbz#568655 add openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch (caolanm)
 
 * Fri Feb 12 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.26
 - CVE-2009-2950 GIF file parsing heap overflow (caolanm)