[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source

Oliver-Rainer Wittmann orw at apache.org
Thu Jun 13 07:07:55 PDT 2013


 sw/source/ui/docvw/edtwin.cxx |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit ba9e13a1ebad1569cd5ccf65925a06329ba0d188
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Thu Jun 13 13:53:16 2013 +0000

    122529: only check position protection when moving a text frame, graphic or embedded object in Writer

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index c577b21..392d982 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -977,14 +977,8 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, sal_Bool bWeb )
     SwWrtShell &rSh = rView.GetWrtShell();
     SwRect aTmp = rSh.GetFlyRect();
     if( aTmp.HasArea() &&
-        // --> FME 2005-01-13 #i40348#
-        // IsSelObjProtected() seems to be the correct condition, not
-        // !HasReadonlySel(), otherwise frame is not moveable if content is
-        // protected.
-        !rSh.IsSelObjProtected( FLYPROTECT_POS|FLYPROTECT_SIZE ) )
-        // <--
+        !rSh.IsSelObjProtected( FLYPROTECT_POS ) )
     {
-        // OD 18.09.2003 #i18732# - add item <RES_FOLLOW_TEXT_FLOW>
         SfxItemSet aSet(rSh.GetAttrPool(),
                         RES_FRM_SIZE, RES_FRM_SIZE,
                         RES_VERT_ORIENT, RES_ANCHOR,


More information about the Libreoffice-commits mailing list