sfx2/source/appl/appinit.cxx | 2 +-
sfx2/source/inc/appdata.hxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8bfb8574fe1b0bffff6ad82d469fc43247ac8c80
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Aug 30 21:58:24 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Aug 31 19:56:59 2021 +0200
no need to allocate SfxPickList separately
it only contains a pointer
Change-Id: I593665314eae2c0ad02b4555c2fda0d8719f2edf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121339
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 19483ac37705..e17d9eb88cf6 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -201,7 +201,7 @@ void SfxApplication::Initialize_Impl()
SolarMutexGuard aGuard;
//ensure instantiation of listener that manages the internal
recently-used
//list
- pImpl->mxAppPickList.reset(new SfxPickList(*this));
+ pImpl->mxAppPickList.emplace(*this);
}
DBG_ASSERT( !pImpl->pAppDispat, "AppDispatcher already exists" );
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 9966981241aa..ac29be15f9b7 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -28,13 +28,13 @@
#include <sfx2/app.hxx>
#include <sfx2/doctempl.hxx>
#include <o3tl/enumarray.hxx>
+#include "sfxpicklist.hxx"
#include <bitset.hxx>
#include <memory>
#include <vector>
class SfxApplication;
-class SfxPickList;
class SfxProgress;
class SfxDdeDocTopic_Impl;
class DdeService;
@@ -82,7 +82,7 @@ public:
std::unique_ptr<SfxErrorHandler> m_pSbxErrorHdl;
#endif
rtl::Reference<SfxStatusDispatcher> mxAppDispatch;
- std::unique_ptr<SfxPickList> mxAppPickList;
+ std::optional<SfxPickList> mxAppPickList;
std::optional<SfxDocumentTemplates> pTemplates;
// global pointers
