[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-5' - sw/source

[Michael Stahl]

 sw/source/core/layout/trvlfrm.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41e7a4e9a7199cc1e93792ca34c74e3784a93274
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 24 23:04:03 2014 +0100

    fdo#68876: sw: layout should never care about IsFirstShared()
    
    With 75084f6c42c27dc95418df9cefed2fddfb26000e the layout should put the
    "first" frame-format on every first-page of a page style; unfortunately
    SwFrm::OnFirstPage() was not adapted with this change and that results
    in various misbehaviour in the layout.
    
    Change-Id: Ia31add0d72ca581963b7e8e40c3ea932361b7fd6
    (cherry picked from commit ecf617ee0cb74526e3989500c122835c32082845)
    Reviewed-on: https://gerrit.libreoffice.org/7639
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit 34afdbfd9689ecfa2ea3e93cd7812d192016baf3)
    Reviewed-on: https://gerrit.libreoffice.org/7678
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index fcaa4af..6d0624e 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1909,7 +1909,7 @@ bool SwFrm::OnFirstPage() const
         if (pPrevFrm)
         {
             const SwPageDesc* pDesc = pPage->GetPageDesc();
-            bRet = pPrevFrm->GetPageDesc() != pDesc && !pDesc->IsFirstShared();
+            bRet = pPrevFrm->GetPageDesc() != pDesc;
         }
         else
             bRet = true;