diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-01-24 23:04:03 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2014-01-30 15:10:49 +0000 |
| commit | 41e7a4e9a7199cc1e93792ca34c74e3784a93274 (patch) | |
| tree | 2c22882e555dbcad2f6e533418699cefdb1a35fc | |
| parent | 28c613edb7bde90c49c61c56c9bb32fb312070e9 (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/7639
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 34afdbfd9689ecfa2ea3e93cd7812d192016baf3)
Reviewed-on: https://gerrit.libreoffice.org/7678
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
| -rw-r--r-- | sw/source/core/layout/trvlfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index fcaa4af43ff1..6d0624e3d762 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; |