summaryrefslogtreecommitdiff
path: root/sw/source/core/inc/ftnfrm.hxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-09-28 10:08:50 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-09-28 10:08:50 +0000
commit4b44771918d44bd692f9630d794a13c75d07b484 (patch)
treeddc9c57a329786c7c3233cf11413752829b6fada /sw/source/core/inc/ftnfrm.hxx
parent342f90e61ec106555a6b8cfe47732b05d68d3601 (diff)
INTEGRATION: CWS swqbf35 (1.5.518); FILE MERGED
2005/09/22 15:52:22 fme 1.5.518.2: RESYNC: (1.5-1.6); FILE MERGED 2005/06/30 08:43:34 od 1.5.518.1: #i49383# class <SwFtnFrm> - new member <mbUnlockPosOfLowerObjs> to control unlock of position of lower objects.
Diffstat (limited to 'sw/source/core/inc/ftnfrm.hxx')
-rw-r--r--sw/source/core/inc/ftnfrm.hxx24
1 files changed, 21 insertions, 3 deletions
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index 4f5c0c155791..e1b7bea540f4 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: ftnfrm.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 03:48:53 $
+ * last change: $Author: hr $ $Date: 2005-09-28 11:08:50 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -76,8 +76,11 @@ class SwFtnFrm: public SwLayoutFrm
SwCntntFrm *pRef; //In diesem CntntFrm steht die Fussnotenref.
SwTxtFtn *pAttr; //Fussnotenattribut (zum wiedererkennen)
- BOOL bBackMoveLocked; //Absaetze in dieser Fussnote duerfen derzeit
+ BOOL bBackMoveLocked : 1; //Absaetze in dieser Fussnote duerfen derzeit
//nicht rueckwaerts fliessen.
+ // --> OD 2005-05-18 #i49383# - control unlock of position of lower anchored objects.
+ bool mbUnlockPosOfLowerObjs : 1;
+ // <--
#ifndef PRODUCT
protected:
virtual SwTwips ShrinkFrm( SwTwips, SZPTR
@@ -129,6 +132,21 @@ public:
// Verhindert, dass der letzte Inhalt den SwFtnFrm mitloescht (Cut())
inline void ColLock() { bColLocked = TRUE; }
inline void ColUnlock() { bColLocked = FALSE; }
+
+ // --> OD 2005-05-18 #i49383#
+ inline void UnlockPosOfLowerObjs()
+ {
+ mbUnlockPosOfLowerObjs = true;
+ }
+ inline void KeepLockPosOfLowerObjs()
+ {
+ mbUnlockPosOfLowerObjs = false;
+ }
+ inline bool IsUnlockPosOfLowerObjs()
+ {
+ return mbUnlockPosOfLowerObjs;
+ }
+ // <--
};
#endif //_FTNFRM_HXX