diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-06-21 13:17:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-06-27 11:32:42 +0200 |
| commit | 04073c5fedd33654f242fecb7e39afb07cf0e273 (patch) | |
| tree | 467852ad2c7ca41b90c89eff2b6c9e4ae5544617 /include/oox/drawingml | |
| parent | 5b21b65572610df88986e700b81f1156aff14f65 (diff) | |
replace oox::OptValue with std::optional
Change-Id: I16e7179b2851640b4d73665685dcc1e84042ddaf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136270
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/oox/drawingml')
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 5f4173c9de87..246a964fc2a6 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -179,7 +179,7 @@ public: void setSubType( sal_Int32 nSubType ) { mnSubType = nSubType; } sal_Int32 getSubType() const { return mnSubType; } void setSubTypeIndex( sal_Int32 nSubTypeIndex ) { moSubTypeIndex = nSubTypeIndex; } - const OptValue< sal_Int32 >& getSubTypeIndex() const { return moSubTypeIndex; } + const std::optional< sal_Int32 >& getSubTypeIndex() const { return moSubTypeIndex; } // setDefaults has to be called if styles are imported (OfficeXML is not storing properties having the default value) void setDefaults(bool bHeight); @@ -353,7 +353,7 @@ protected: OUString msId; OUString msDescription; sal_Int32 mnSubType; // if this type is not zero, then the shape is a placeholder - OptValue< sal_Int32 > moSubTypeIndex; + std::optional< sal_Int32 > moSubTypeIndex; ShapeStyleRefMap maShapeStyleRefs; |