[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
Michael Stahl
mstahl at redhat.com
Sat Jan 25 03:55:12 PST 2014
sw/source/core/layout/trvlfrm.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 77d63a83125a2471be0d121211e914aa5616ce2b
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/7637
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index c67008d..73d2ef5 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1784,7 +1784,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;
More information about the Libreoffice-commits
mailing list