diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2012-05-09 12:51:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-02 10:39:13 +0100 |
| commit | f0d001a378c64ea457e722266e60c96522c72e9b (patch) | |
| tree | a3f6890b6c130d7fa02841c45ff3aadd4249147f /sw/inc | |
| parent | 641d8eaa980c00802964e07b0397ba3c2884bd7d (diff) | |
Resolves: #i119292# remove misusage of <SwDoc::Set|IsLoaded()>
...for the adjustments of certain AT_PAGE anchored objects
Addresses the underlying problem of fdo#37024 fixed by
9d32497c01475f2b5e5bec756e4dd0ca9f9d4928
(cherry picked from commit b41eec25c2c6bc44eef55ae1c4ef57b9012fc8e6)
Conflicts:
sw/inc/doc.hxx
sw/source/core/doc/doclay.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/layout/frmtool.cxx
Change-Id: I786eabdf84677e14c6f4b67d79e1e210e0532a21
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/doc.hxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index a4bfb58d0b79..7c79c097b03e 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -475,6 +475,10 @@ private: bool mbXMLExport : 1; ///< sal_True: during XML export #endif + // true: Document contains at least one anchored object, which is anchored AT_PAGE with a content position. + // Thus, certain adjustment needed during formatting for these kind of anchored objects. + bool mbContainsAtPageObjWithContentAnchor : 1; + // // COMPATIBILITY FLAGS START // @@ -1030,6 +1034,15 @@ public: void SetXMLExport( bool bFlag ) { mbXMLExport = bFlag; } #endif + void SetContainsAtPageObjWithContentAnchor( const bool bFlag ) + { + mbContainsAtPageObjWithContentAnchor = bFlag; + } + bool DoesContainAtPageObjWithContentAnchor() + { + return mbContainsAtPageObjWithContentAnchor; + } + /** Returns positions of all FlyFrames in the document. If a Pam-Pointer is passed the FlyFrames attached to paragraphes have to be surrounded completely by ::com::sun::star::awt::Selection. |