[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/inc

[Libreoffice Gerrit user]

 sw/inc/pagedesc.hxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit c41675a7d13dac64540ad420f905e80dbcbc023d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 17 21:55:32 2013 +0100

    fdo#59428: SwPageDesc::GetUseOn(): mask PD_FIRSTSHARE.
    
    There is at least one call in SwDoc::ChgPageDesc() checks if the result
    equals PD_MIRROR.
    
    (regression from fa0f42bafbf24e9141ddee728b160b5ab47077f2)
    
    Change-Id: Id37ca46eec5885f7f5230337d8a8a594845f7842
    (cherry picked from commit 8d301533f0c7764c94f8ad72fced2ce9d9de7585)
    Reviewed-on: https://gerrit.libreoffice.org/1748
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index b6c40a8..dbf3144 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -292,6 +292,7 @@ inline UseOnPage SwPageDesc::GetUseOn() const
     UseOnPage eRet = eUse;
     eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOHEADERSHARE);
     eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOFOOTERSHARE);
+    eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOFIRSTSHARE);
     return eRet;
 }