diff options
-rw-r--r-- | sw/source/ui/utlui/uitool.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 64469417451d..a220a9f9f22a 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -164,6 +164,7 @@ void FillHdFt(SwFrmFmt* pFmt, const SfxItemSet& rSet) void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) { SwFrmFmt& rMaster = rPageDesc.GetMaster(); + int nFirstShare = -1; // alle allgemeinen Rahmen-Attribute uebertragen // @@ -219,8 +220,12 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) rPageDesc.ChgHeaderShare(((const SfxBoolItem&) rHeaderSet.Get(SID_ATTR_PAGE_SHARED)).GetValue()); - rPageDesc.ChgFirstShare(((const SfxBoolItem&) - rHeaderSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue()); + if (nFirstShare < 0) + { + rPageDesc.ChgFirstShare(((const SfxBoolItem&) + rHeaderSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue()); + nFirstShare = rPageDesc.IsFirstShared(); + } } else { // Header ausschalten @@ -257,8 +262,12 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) rPageDesc.ChgFooterShare(((const SfxBoolItem&) rFooterSet.Get(SID_ATTR_PAGE_SHARED)).GetValue()); - rPageDesc.ChgFirstShare(((const SfxBoolItem&) - rFooterSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue()); + if (nFirstShare < 0) + { + rPageDesc.ChgFirstShare(((const SfxBoolItem&) + rFooterSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue()); + nFirstShare = rPageDesc.IsFirstShared(); + } } else { // Footer ausschalten |