diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2014-01-07 12:42:25 -0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-01-07 19:11:21 +0100 |
| commit | 63c2990d0e67e90f5445dac10c8c1f7919031482 (patch) | |
| tree | 988bdff4003667ee98e1ebb187a1fd2e7d9aea9b | |
| parent | 5ea7f28bb9f787a1650e0d126e28ffb543c2a363 (diff) | |
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 <mstahl@redhat.com>
Tested-by: Olivier Hallot <olivier.hallot@edx.srv.br>
(cherry picked from commit 6131787afbb32e1e12aac4cf4f65625d11d39f08)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/core/layout/pagedesc.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index 05a24d1d62c7..1f7addba0935 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -156,13 +156,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 ); } /************************************************************************* |