diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-06-13 13:53:16 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-13 16:44:55 +0100 |
| commit | 7c7f71623cc2143b20c76a1349bd44580ba5b442 (patch) | |
| tree | 743a5ee5ec0297688c2be361f53990dd1ff65f62 | |
| parent | Updated core (diff) | |
| download | core-7c7f71623cc2143b20c76a1349bd44580ba5b442.tar.gz core-7c7f71623cc2143b20c76a1349bd44580ba5b442.zip | |
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
(cherry picked from commit 57bf1f75942c2c9c0fc264bf0f9b84b674ea55f7)
| -rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 39526b997a93..857625868379 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -987,10 +987,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, |