diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-09-16 10:49:42 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-09-17 11:27:34 +0200 |
| commit | a3fa7c4e04c489f8d8ec6db3385e965900d801a3 (patch) | |
| tree | 00bac8722d71c49945b0bb5674cbff65245f812e | |
| parent | 1ebb77fd17b417d92ab48fcef56a0230c5750de2 (diff) | |
tdf#118203 Avoid endless recussion in MeasureObject
Change-Id: I1e6fff80e7b6d36830f61387cc5245fc54877d95
Reviewed-on: https://gerrit.libreoffice.org/60546
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
(cherry picked from commit d357e50fa1734da0bf341dbd49fc0596011bdfe3)
Reviewed-on: https://gerrit.libreoffice.org/60557
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
| -rw-r--r-- | svx/source/sdr/properties/measureproperties.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index ddf0159437b9..a62f49ae0d59 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -88,15 +88,15 @@ namespace sdr // get access to dimension line object SdrMeasureObj& rObj = static_cast<SdrMeasureObj&>(GetSdrObject()); + // call parent + TextProperties::SetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr); + // local changes // mark dimension line text as changed (dirty) in the dimension line object rObj.SetTextDirty(); // tdf#98525 ask the dimension line object to redraw the changed text rObj.UndirtyText(); - - // call parent - TextProperties::SetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr); } void MeasureProperties::ForceDefaultAttributes() |