[Libreoffice-commits] core.git: sc/source sd/source sw/source

Samuel Mehrbrodt Samuel.Mehrbrodt at cib.de
Tue Mar 15 18:25:54 UTC 2016


 sc/source/ui/drawfunc/fupoor.cxx  |    3 ++-
 sd/source/ui/func/fupoor.cxx      |    3 ++-
 sw/source/uibase/docvw/edtwin.cxx |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 4af2f26a955d172e8b72579c9bc6534e98b9f72b
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Tue Mar 15 19:22:31 2016 +0100

    tdf#97919 Also resize ole objects proportionally by default
    
    Change-Id: I1c3b13aa4cb0127451353f20179f39b6eebe12ec
    Reviewed-on: https://gerrit.libreoffice.org/23284
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 29116e2..cdb0ac3 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -298,7 +298,8 @@ bool FuPoor::doConstructOrthogonal() const
         {
             sal_uInt16 aObjIdentifier = rMarkList.GetMark(0)->GetMarkedSdrObj()->GetObjIdentifier();
             return aObjIdentifier == OBJ_GRAF ||
-                   aObjIdentifier == OBJ_MEDIA;
+                   aObjIdentifier == OBJ_MEDIA ||
+                   aObjIdentifier == OBJ_OLE2;
         }
     }
     else if (aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON || aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON_NOFILL)
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 9b05d71..c1f4989 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -1134,7 +1134,8 @@ bool FuPoor::doConstructOrthogonal() const
             SdrMark* pMark = rMarkList.GetMark(0);
             sal_uInt16 aObjIdentifier = pMark->GetMarkedSdrObj()->GetObjIdentifier();
             bIsMediaSelected = aObjIdentifier == OBJ_GRAF ||
-                               aObjIdentifier == OBJ_MEDIA;
+                               aObjIdentifier == OBJ_MEDIA ||
+                               aObjIdentifier == OBJ_OLE2;
         }
     }
 
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 780a853..d7be3c0 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -4080,7 +4080,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                         break;
 
                     bool bIsMediaSelected = rSh.GetSelectionType() & nsSelectionType::SEL_GRF ||
-                                            rSh.GetSelectionType() & nsSelectionType::SEL_MEDIA;
+                                            rSh.GetSelectionType() & nsSelectionType::SEL_MEDIA ||
+                                            rSh.GetSelectionType() & nsSelectionType::SEL_OLE;
                     bool bisResize = g_eSdrMoveHdl != HDL_MOVE;
 
                     if (pSdrView)


More information about the Libreoffice-commits mailing list