ooo-build r12512 - in branches/ooo-build-2-4: . patches/src680

[thorstenb svn gnome org]

Author: thorstenb
Date: Sat May 10 15:53:01 2008
New Revision: 12512
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12512&view=rev

Log:
	* patches/src680/sd-inplace-deselection-fix.diff: fixing the fact
	that deselecting an activated inplace OLE object in draw/impress
	ends up with a drag selection frame



Added:
   branches/ooo-build-2-4/patches/src680/sd-inplace-deselection-fix.diff
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Sat May 10 15:53:01 2008
@@ -2300,6 +2300,7 @@
 sw-allow-negative-spacing.diff, n#364534, freuter
 
 sd-slideshow-slideshowview-transformation-fix.diff, rodo
+sd-inplace-deselection-fix.diff, i#89283, n#384506, thorsten
 cairocanvas-fix-image-cache.diff, rodo
 
 [ LinkWarningDlg ]

Added: branches/ooo-build-2-4/patches/src680/sd-inplace-deselection-fix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/src680/sd-inplace-deselection-fix.diff	Sat May 10 15:53:01 2008
@@ -0,0 +1,51 @@
+--- sd/source/ui/func/fusel.cxx	2008-04-10 22:25:23.000000000 +0200
++++ sd/source/ui/func/fusel.cxx	2008-05-10 16:26:03.000000000 +0200
+@@ -414,26 +418,29 @@
+                         }
+                     }
+ 
+-                    if ( !bReadOnly &&
+-                        bMarked                                                   &&
+-                        (!rMEvt.IsShift() || mpView->IsMarkedHit(aMDPos, nHitLog)))
+-                    {
+-                        /**********************************************************
+-                        * Objekt verschieben
+-                        **********************************************************/
+-                        aDragTimer.Start();
+-
+-                        pHdl=mpView->PickHandle(aMDPos);
+-                        if ( ! rMEvt.IsRight())
+-                            mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog);
+-                    }
+-                    else
++                    if( !bDeactivateOLE )
+                     {
+-                        /**********************************************************
+-                        * Objekt selektieren
+-                        **********************************************************/
+-                        if ( ! rMEvt.IsRight())
+-                            mpView->BegMarkObj(aMDPos);
++                        if ( !bReadOnly &&
++                             bMarked                                                   &&
++                             (!rMEvt.IsShift() || mpView->IsMarkedHit(aMDPos, nHitLog)))
++                        {
++                            /**********************************************************
++                             * Objekt verschieben
++                             **********************************************************/
++                            aDragTimer.Start();
++
++                            pHdl=mpView->PickHandle(aMDPos);
++                            if ( ! rMEvt.IsRight())
++                                mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog);
++                        }
++                        else
++                        {
++                            /**********************************************************
++                             * Objekt selektieren
++                             **********************************************************/
++                            if ( ! rMEvt.IsRight())
++                                mpView->BegMarkObj(aMDPos);
++                        }
+                     }
+                 }
+             }