summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <orw@apache.org>2013-06-13 13:53:16 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-06-13 15:54:41 +0100
commit57bf1f75942c2c9c0fc264bf0f9b84b674ea55f7 (patch)
treed97b569d281303d0585fd0514052e15a7ecbf99e /sw
parent90197a2375a77d02fcb70d74df318dc5f81288bb (diff)
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
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/docvw/edtwin.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 80cac74f6d3e..60b7c8b27fcc 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,