svx/source/sdr/properties/measureproperties.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a3fa7c4e04c489f8d8ec6db3385e965900d801a3
Author: Armin Le Grand <armin.le.gr...@cib.de>
AuthorDate: Sun Sep 16 10:49:42 2018 +0200
Commit: Armin Le Grand <armin.le.gr...@cib.de>
CommitDate: Mon Sep 17 11:27:34 2018 +0200
tdf#118203 Avoid endless recussion in MeasureObject
Change-Id: I1e6fff80e7b6d36830f61387cc5245fc54877d95
Reviewed-on: https://gerrit.libreoffice.org/60546
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Reviewed-by: Armin Le Grand <armin.le.gr...@cib.de>
(cherry picked from commit d357e50fa1734da0bf341dbd49fc0596011bdfe3)
Reviewed-on: https://gerrit.libreoffice.org/60557
Tested-by: Xisco Faulí <xiscofa...@libreoffice.org>
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()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
