summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-01-23 19:23:14 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-01-24 08:55:53 +0000
commitf5dc652c6d3157d41d20dc1baf3cfc92907dc6b0 (patch)
tree93709b77178d38632805eed8f9dc30717f2d10dc /sw
parenta6433b4a9c053b7088d52b216c7d7cf8d9cdfcd7 (diff)
fdo#59428: SwDoc::ChgPageDesc: always copy to first-pagedesc
... otherwise the first page will not be updated on page style changes. (uncovered by commit c41675a7d13dac64540ad420f905e80dbcbc023d, which should have fixed this too) Change-Id: I04f75b2a8e8929767fb36dd7085c3a273f07c93a (cherry picked from commit da1398c503784086ecd0a10dd8e809069d649653) Reviewed-on: https://gerrit.libreoffice.org/1830 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/docdesc.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 37b656676a42..1852b4c16fd4 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -296,12 +296,12 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
((SwPageDesc&)rChged).Mirror();
else
{
- // Or else transfer values from Master to Left and First.
- ::lcl_DescSetAttr( ((SwPageDesc&)rChged).GetMaster(),
- ((SwPageDesc&)rChged).GetLeft() );
- ::lcl_DescSetAttr( ((SwPageDesc&)rChged).GetMaster(),
- ((SwPageDesc&)rChged).GetFirst() );
+ // Or else transfer values from Master to Left
+ ::lcl_DescSetAttr(rChged.GetMaster(),
+ const_cast<SwPageDesc&>(rChged).GetLeft());
}
+ ::lcl_DescSetAttr(rChged.GetMaster(),
+ const_cast<SwPageDesc&>(rChged).GetFirst());
// Take over NumType.
if( rChged.GetNumType().GetNumberingType() != pDesc->GetNumType().GetNumberingType() )