sw/source/core/layout/pagedesc.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
New commits: commit c47f102d8df5e413dbf70e9968ed913f2855787d Author: Marcos Paulo de Souza <marcos.souza....@gmail.com> Date: Tue Jan 7 12:42:25 2014 -0200 Fix fdo#70807: Page Style method isInUse() broken We need to check m_FirstMaster and m_FirstLeft too to verify is a style is used Thanks a lot mst__ for pointing how to fix this! Change-Id: Ic9c37c552893c17fba4aabcc0fd4beb7fe2550e8 Reviewed-on: https://gerrit.libreoffice.org/7295 Reviewed-by: Michael Stahl <mst...@redhat.com> Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br> (cherry picked from commit 6131787afbb32e1e12aac4cf4f65625d11d39f08) diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index c450a8c..a10ffcd 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -157,13 +157,16 @@ void SwPageDesc::ResetAllAttr( sal_Bool bLeft ) |* *************************************************************************/ - - // gets information from Modify +// gets information from Modify bool SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const { if( !aMaster.GetInfo( rInfo ) ) - return false; // found - return aLeft.GetInfo( rInfo ); + return false; // found + if ( !aLeft.GetInfo( rInfo ) ) + return false ; + if ( !m_FirstMaster.GetInfo( rInfo ) ) + return false; + return m_FirstLeft.GetInfo( rInfo ); } /************************************************************************* _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits