sw: InsertNewPage() should ignore GetFirstFmt() if it's shared

This allows to get rid of the ugly hack in
SwLayHelper::CheckInsertPage() and has the same effect.

Change-Id: I491eb617c42bbca3ca1676d7bf44795e947ce6f9

2 files changed, 3 insertions, 9 deletions

diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 1a61f726aaa1..7cb768e794f6 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2701,13 +2701,10 @@ SwPageFrm * InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
     SwPageFrm *pRet;
     SwDoc *pDoc = ((SwLayoutFrm*)pUpper)->GetFmt()->GetDoc();
     SwFrmFmt *pFmt = 0;
-    if (bFirst)
-    {
+    // rDesc can't know if the first page will be 'left' or 'right', so if
+    // first is shared, let's ignore first here.
+    if (bFirst && !rDesc.IsHeaderSharedFirst())
         pFmt = rDesc.GetFirstFmt();
-        // If there is no first format, use what is relevant anyway.
-        if (!pFmt)
-            pFmt = bOdd ? rDesc.GetRightFmt() : rDesc.GetLeftFmt();
-    }
     else
         pFmt = bOdd ? rDesc.GetRightFmt() : rDesc.GetLeftFmt();
     //Wenn ich kein FrmFmt fuer die Seite gefunden habe, muss ich eben
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index a05572af77af..ee6a02d24f8f 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -654,9 +654,6 @@ sal_Bool SwLayHelper::CheckInsertPage()
         }
         // If the page style is changing, we'll have a first page.
         bool bNextPageFirst = pDesc != rpPage->GetPageDesc();
-        // Considering the page after the first page would be confusing.
-        if (rpPage->GetPageDesc() == pDoc->GetPageDescFromPool(RES_POOLPAGE_FIRST))
-            bNextPageFirst = false;
         ::InsertNewPage( (SwPageDesc&)*pDesc, rpPage->GetUpper(),
                          bNextPageOdd, bNextPageFirst, bInsertEmpty, sal_False, rpPage->GetNext() );
         if ( bEnd )