[PATCH] Change in core[libreoffice-4-0]: fdo#59428: SwDoc::ChgPageDesc: always copy to first-pagedesc

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1830

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/1830/1

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)
---
M sw/source/core/doc/docdesc.cxx
1 file changed, 5 insertions(+), 5 deletions(-)



diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 37b6566..1852b4c 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -296,12 +296,12 @@
         ((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() )

-- 
To view, visit https://gerrit.libreoffice.org/1830
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04f75b2a8e8929767fb36dd7085c3a273f07c93a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl <mstahl at redhat.com>