diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-28 14:53:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-29 17:51:17 +0200 |
| commit | 3823e81c25ba6f0f9b6a67d77e585426905e1b19 (patch) | |
| tree | fa61ee28fb91300555b34475379cebc1cff054b8 /include | |
| parent | ee50d4152cc4a06367d66808ceba1e74e62f3ed8 (diff) | |
std::unique_ptr -> std::optional
Change-Id: I15779eca607f27a758575f4f095910277aa85eda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116377
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdpage.hxx | 3 | ||||
| -rw-r--r-- | include/svx/xmleohlp.hxx | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index ff936bd3a0a2..11d49191a017 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <svx/svdobj.hxx> #include <memory> +#include <optional> #include <vector> @@ -228,7 +229,7 @@ public: private: /// This list, if it exists, defines the navigation order. If it does /// not exist then maList defines the navigation order. - std::unique_ptr<std::vector<tools::WeakReference<SdrObject>>> mxNavigationOrder; + std::optional<std::vector<tools::WeakReference<SdrObject>>> mxNavigationOrder; /// This flag is <TRUE/> when the mpNavigation list has been changed but /// the indices of the referenced SdrObjects still have their old values. diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index ed64bd71522b..d252ee8e2d0f 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -31,6 +31,7 @@ #include <tools/stream.hxx> #include <map> #include <memory> +#include <optional> enum class SvXMLEmbeddedObjectHelperMode { @@ -57,8 +58,8 @@ class SVXCORE_DLLPUBLIC SvXMLEmbeddedObjectHelper final : css::uno::Reference < css::embed::XStorage > mxTempStorage; // package // objects SvXMLEmbeddedObjectHelperMode meCreateMode; - std::unique_ptr<std::map< OUString, rtl::Reference<OutputStorageWrapper_Impl> >> - mpStreamMap; + std::optional<std::map< OUString, rtl::Reference<OutputStorageWrapper_Impl> >> + mxStreamMap; SVX_DLLPRIVATE bool ImplGetStorageNames( const OUString& rURLStr, |