sw/source/ui/docvw/edtwin.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 57bf1f75942c2c9c0fc264bf0f9b84b674ea55f7
Author: Oliver-Rainer Wittmann <o...@apache.org>
Date: Thu Jun 13 13:53:16 2013 +0000
Resolves: #i122529# only check position protection when...
moving a text frame, graphic or embedded object in Writer
(cherry picked from commit ba9e13a1ebad1569cd5ccf65925a06329ba0d188)
Conflicts:
sw/source/ui/docvw/edtwin.cxx
Change-Id: I126165d6be7505223c4255262103cfb123ec3d55
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 80cac74..60b7c8b 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -994,10 +994,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, sal_Bool bWeb )
SwWrtShell &rSh = m_rView.GetWrtShell();
SwRect aTmp = rSh.GetFlyRect();
if( aTmp.HasArea() &&
- // 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 ) )
{
SfxItemSet aSet(rSh.GetAttrPool(),
RES_FRM_SIZE, RES_FRM_SIZE,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
