summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat@free.fr>2012-08-27 12:40:38 +0200
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2012-08-27 12:41:57 +0200
commitd79cd86e2e2b1e6a8f94794946752909ed7e7a7f (patch)
tree8a2136b53daf27af237f9276d6705c100b343a5a /sw
parent61acb79808a641e49e4db3a106807045dd744704 (diff)
sw, FIRSTSHARE flag wasn't set in defaults and copied in SetUseOn
Change-Id: Ib0fd2097af4f45ec838b96e8214dfe913a3b47df
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/pagedesc.hxx2
-rw-r--r--sw/source/core/doc/poolfmt.cxx2
2 files changed, 3 insertions, 1 deletions
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index e83452f9e883..4e21c55bb177 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -287,6 +287,8 @@ inline void SwPageDesc::SetUseOn( UseOnPage eNew )
eTmp = nsUseOnPage::PD_HEADERSHARE;
if ( eUse & nsUseOnPage::PD_FOOTERSHARE )
eTmp = (UseOnPage) (eTmp | nsUseOnPage::PD_FOOTERSHARE);
+ if ( eUse & nsUseOnPage::PD_FIRSTSHARE )
+ eTmp = (UseOnPage) (eTmp | nsUseOnPage::PD_FIRSTSHARE);
eUse = (UseOnPage) (eTmp | eNew);
}
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index ccd967067247..9343ef31182e 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1486,7 +1486,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
aSet.Put( aLR );
aSet.Put( aUL );
if( pNewPgDsc )
- pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL );
+ pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL | nsUseOnPage::PD_FIRSTSHARE );
}
break;