[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - svx/source

Miklos Vajna vmiklos at collabora.co.uk
Wed Mar 11 08:42:10 PDT 2015


 svx/source/svdraw/svdmrkv.cxx |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 46d05bbb8ece5d16deef15be6dc45fb027f031c6
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Mar 11 16:33:25 2015 +0100

    SdrMarkView::SetMarkHandles: when tiled rendering, show non-frame handles, too
    
    This gives graphic selection / moving / resizing for non-frame shapes
    (the ones with the blue handles on the desktop).
    
    Change-Id: I59018d4beb2ad1d2133d439afda56686b3c00b0c

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 3209f4e..cc8badb 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -699,20 +699,20 @@ void SdrMarkView::SetMarkHandles()
             }
         }
 
-        if (bFrmHdl)
-        {
-            Rectangle aRect(GetMarkedObjRect());
+        Rectangle aRect(GetMarkedObjRect());
 
-            if (GetModel()->isTiledRendering())
-            {
-                OString sRectangle;
-                if (aRect.IsEmpty())
-                    sRectangle = "EMPTY";
-                else
-                    sRectangle = aRect.toString();
-                GetModel()->libreOfficeKitCallback(LOK_CALLBACK_GRAPHIC_SELECTION, sRectangle.getStr());
-            }
+        if (GetModel()->isTiledRendering())
+        {
+            OString sRectangle;
+            if (aRect.IsEmpty())
+                sRectangle = "EMPTY";
+            else
+                sRectangle = aRect.toString();
+            GetModel()->libreOfficeKitCallback(LOK_CALLBACK_GRAPHIC_SELECTION, sRectangle.getStr());
+        }
 
+        if (bFrmHdl)
+        {
             if(!aRect.IsEmpty())
             { // otherwise nothing is found
                 if( bSingleTextObjMark )


More information about the Libreoffice-commits mailing list