From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Fri, 20 Mar 2020 06:51:53 +0000 (+0100)
Subject: [PATCH] Fix build with boost < 1.68
X-Git-Tag: archive/raspbian/1%6.4.2-3+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2a2c5b4a6183a4c5741f86752924f7175cd39a39;p=libreoffice.git

[PATCH] Fix build with boost < 1.68

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
---

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 1b6a821f3a0..ff83dde63fa 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.