summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-07-03 14:37:21 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-07-03 16:28:51 +0200
commit84a9c3ff504218683d0391d3dfe7491eb043a2b5 (patch)
tree07eab60aa3f7d3b5d69cf973ad7979b55e38151f
parent64011a43020b108febf94cbd89fb352dc61c75df (diff)
SwDoc: initialize first page format as well
Change-Id: I788584d4e32731b7bc76086df88640b59f27dfc1
-rw-r--r--sw/source/core/doc/docdesc.cxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 0d3073fa6760..ed700a58edb5 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -78,7 +78,8 @@ using namespace com::sun::star;
static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
SwFrmFmt &rFmt1,
- SwFrmFmt &rFmt2 )
+ SwFrmFmt &rFmt2,
+ SwFrmFmt &rFmt3 )
{
// --> #i41075# Printer on demand
// This function does not require a printer anymore.
@@ -130,6 +131,10 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
rFmt2.SetFmtAttr( aFrmSize );
rFmt2.SetFmtAttr( aLR );
rFmt2.SetFmtAttr( aUL );
+
+ rFmt3.SetFmtAttr( aFrmSize );
+ rFmt3.SetFmtAttr( aLR );
+ rFmt3.SetFmtAttr( aUL );
}
/*************************************************************************
@@ -560,7 +565,7 @@ sal_uInt16 SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy,
{
pNew = new SwPageDesc( rName, GetDfltFrmFmt(), this );
// Set the default page format.
- lcl_DefaultPageFmt( USHRT_MAX, pNew->GetMaster(), pNew->GetLeft() );
+ lcl_DefaultPageFmt( USHRT_MAX, pNew->GetMaster(), pNew->GetLeft(), pNew->GetFirst() );
SvxFrameDirection aFrameDirection = bRegardLanguage ?
GetDefaultFrameDirection(GetAppLanguage())
@@ -868,7 +873,7 @@ void SwDoc::CheckDefaultPageFmt()
LONG_MAX == rLeftSize.GetHeight();
if ( bSetSize )
- lcl_DefaultPageFmt( rDesc.GetPoolFmtId(), rDesc.GetMaster(), rDesc.GetLeft() );
+ lcl_DefaultPageFmt( rDesc.GetPoolFmtId(), rDesc.GetMaster(), rDesc.GetLeft(), rDesc.GetFirst() );
}
}