diff options
author | Júlio Hoffimann <julio.hoffimann@gmail.com> | 2011-04-16 16:19:09 -0300 |
---|---|---|
committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-04-18 16:41:11 +0200 |
commit | e1e2228306dd3ed6460198729dd4d3f201ee0925 (patch) | |
tree | 314f24ea9487414cd5eb04eb78369238362eccd1 /sw/source/core/layout/wsfrm.cxx | |
parent | f7a86cc350f4364639c95058c32611efb2fde809 (diff) |
bug id's from Oracle internal database removed
Diffstat (limited to 'sw/source/core/layout/wsfrm.cxx')
-rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 0d9f04e62d9c..eedf5edef30a 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -233,7 +233,7 @@ void SwCellFrm::CheckDirection( sal_Bool bVert ) { const SwFrmFmt* pFmt = GetFmt(); const SfxPoolItem* pItem; - // --> FME 2006-03-30 #b6402837# Check if the item is set, before actually + // Check if the item is set, before actually // using it. Otherwise the dynamic pool default is used, which may be set // to LTR in case of OOo 1.0 documents. // <-- @@ -1040,7 +1040,7 @@ void SwCntntFrm::Cut() { if ( pUp->GetUpper() ) { - // --> OD 2006-09-25 #b6448963# + // // prevent delete of <ColLocked> footnote frame if ( pUp->IsFtnFrm() && !pUp->IsColLocked()) // <-- @@ -1056,7 +1056,7 @@ void SwCntntFrm::Cut() } else { - // --> OD 2006-09-25 #b6448963# + // if ( pSct->IsColLocked() || !pSct->IsInFtn() || ( pUp->IsFtnFrm() && pUp->IsColLocked() ) ) // <-- |