summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/trvlfrm.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-01-24 23:04:03 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-01-25 11:54:45 +0000
commit77d63a83125a2471be0d121211e914aa5616ce2b (patch)
tree01aa3ab23d8ac078ebb4146378b74242c4c47f7f /sw/source/core/layout/trvlfrm.cxx
parent16d0b4020a1987accea37536defb2eb0fa7dd27f (diff)
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@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source/core/layout/trvlfrm.cxx')
-rw-r--r--sw/source/core/layout/trvlfrm.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index c67008d63df9..73d2ef510949 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;