[PATCH] Fix build with boost < 1.68
authorRico Tzschichholz <ricotz@ubuntu.com>
Fri, 20 Mar 2020 06:51:53 +0000 (07:51 +0100)
committerRene Engelhard <rene@debian.org>
Sat, 28 Mar 2020 05:53:24 +0000 (05:53 +0000)
Follow-up fix for 73cac1031131021819a0fbd4d60554196aea230c
"tdf130839: Corrects second level left margin in Smartart"

Change-Id: Ie194062ba33cf505ad33fbfdc73c2f764b61d0aa

Gbp-Pq: Name Fix-build-with-boost-lesser-than-1.68.diff

oox/source/drawingml/diagram/diagramlayoutatoms.cxx

index 1b6a821f3a0acc34819a981457ba9f951e33ffe5..ff83dde63fa3d5ed0a1aec736f0f377a3f13b056 100644 (file)
@@ -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.