summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorGülşah Köse <gulsah.kose@collabora.com>2020-02-20 14:13:40 +0300
committerGülşah Köse <gulsah.kose@collabora.com>2020-02-24 08:23:59 +0100
commit73cac1031131021819a0fbd4d60554196aea230c (patch)
treec21fdd4d4bbbd759047f329f1867a48f475b67e2 /oox
parent1e97fb44829481845a7e768392f92f6c00f324de (diff)
tdf130839: Corrects second level left margin in Smartart
Change-Id: Ifec339759427336fd53012e0a8a906d240be9654 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89085 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> (cherry picked from commit eeaa7aba6e7ace8b69d7056645b15be2f996d8fb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89277
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.cxx12
1 files changed, 9 insertions, 3 deletions
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 14af84da6ac4..1b6a821f3a0a 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -1224,10 +1224,16 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
aParagraph->getProperties().setLevel(nLevel);
if (nLevel >= nStartBulletsAtLevel)
{
+ if (!aParagraph->getProperties().getParaLeftMargin().has_value())
+ {
+ sal_Int32 nLeftMargin = 285750 * (nLevel - nStartBulletsAtLevel + 1) / EMU_PER_HMM;
+ aParagraph->getProperties().getParaLeftMargin() = nLeftMargin;
+ }
+
+ if (!aParagraph->getProperties().getFirstLineIndentation().has_value())
+ aParagraph->getProperties().getFirstLineIndentation() = -285750 / EMU_PER_HMM;
+
// It is not possible to change the bullet style for text.
- sal_Int32 nLeftMargin = 285750 * (nLevel - nStartBulletsAtLevel + 1) / EMU_PER_HMM;
- aParagraph->getProperties().getParaLeftMargin() = nLeftMargin;
- aParagraph->getProperties().getFirstLineIndentation() = -285750 / EMU_PER_HMM;
OUString aBulletChar = OUString::fromUtf8(u8"•");
aParagraph->getProperties().getBulletList().setBulletChar(aBulletChar);
aParagraph->getProperties().getBulletList().setSuffixNone();