[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source

[Andras Timar]

 sd/source/ui/view/sdview2.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1677cffc602e15968ffb76ee0d5fd0ebcdac6b3c
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 9 22:38:52 2014 +0200

    Revert "fdo#45260: Objects having line thickness misplaced while pasting."
    
    This reverts commit c35c4769d8cabe0f01ef9911056d7a9d1d2f4b04.
    Fixes fdo#78413
    
    Change-Id: If0865cced045410d4e8f9603b55568ade6781b39
    (cherry picked from commit de8f5f2af78877bc63b462195ce63341f6ba7817)
    Reviewed-on: https://gerrit.libreoffice.org/9297
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index cc6229f..2572576 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -112,9 +112,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent
 
     // #112978# need to use GetAllMarkedBoundRect instead of GetAllMarkedRect to get
     // fat lines correctly
-    // This seems to be broken on LibreOffice. So reverted this temporarily
-    // to fix fdo#45260
-    const Rectangle                 aMarkRect( GetAllMarkedRect() );
+    const Rectangle                 aMarkRect( GetAllMarkedBoundRect() );
     TransferableObjectDescriptor    aObjDesc;
     SdrOle2Obj*                     pSdrOleObj = NULL;
     SdrPageView*                    pPgView = GetSdrPageView();