diff options
Diffstat (limited to 'sw/source/core/layout/wsfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 0bb81e82a04b..f0c92d042ddd 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -963,7 +963,7 @@ void SwCntntFrm::Cut() { if ( pUp->GetUpper() ) { - // + // prevent delete of <ColLocked> footnote frame if ( pUp->IsFtnFrm() && !pUp->IsColLocked()) { @@ -978,7 +978,7 @@ void SwCntntFrm::Cut() } else { - // + if ( pSct->IsColLocked() || !pSct->IsInFtn() || ( pUp->IsFtnFrm() && pUp->IsColLocked() ) ) { @@ -1054,7 +1054,6 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling) //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin fnRect = GetUpper()->IsVertical() ? ( GetUpper()->IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori; - if( (Frm().*fnRect->fnGetWidth)() != (pParent->Prt().*fnRect->fnGetWidth)()) _InvalidateSize(); _InvalidatePos(); |