oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4f75f6a7434bae5f11e1205130fee1b4ac2df50b
Author: Rico Tzschichholz <ric...@ubuntu.com>
AuthorDate: Fri Mar 20 07:51:53 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Mar 24 18:16:17 2020 +0100
Fix build with boost < 1.68
Follow-up fix for 73cac1031131021819a0fbd4d60554196aea230c
"tdf130839: Corrects second level left margin in Smartart"
Change-Id: Ie194062ba33cf505ad33fbfdc73c2f764b61d0aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90808
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 51b4c8c96472..f625dac2cd97 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -1224,13 +1224,13 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
aParagraph->getProperties().setLevel(nLevel);
if (nLevel >= nStartBulletsAtLevel)
{
- if
(!aParagraph->getProperties().getParaLeftMargin().has_value())
+ if
(aParagraph->getProperties().getParaLeftMargin().get_ptr() == nullptr)
{
sal_Int32 nLeftMargin = 285750 * (nLevel -
nStartBulletsAtLevel + 1) / EMU_PER_HMM;
aParagraph->getProperties().getParaLeftMargin() =
nLeftMargin;
}
- if
(!aParagraph->getProperties().getFirstLineIndentation().has_value())
+ if
(aParagraph->getProperties().getFirstLineIndentation().get_ptr() == nullptr)
aParagraph->getProperties().getFirstLineIndentation()
= -285750 / EMU_PER_HMM;
// It is not possible to change the bullet style for text.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
