diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2016-06-15 20:06:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-18 09:24:56 +0000 |
| commit | c13f60e7cd18df6b0ab70289f5b91ee01e4ae126 (patch) | |
| tree | 7b42adbca420d12d9f8985d63ca57912ce795fc9 /include/unotools | |
| parent | 9db384d9947c8d0bb566160c50b34bc8f6a2cc72 (diff) | |
tdf#89329: use shared_ptr for pImpl in moduleoptions
Change-Id: I2dfcdde6ef1782edc22ca6d70d353549706eb14f
Reviewed-on: https://gerrit.libreoffice.org/26322
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/unotools')
| -rw-r--r-- | include/unotools/moduleoptions.hxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index b2a7160ad7ad..3dfb4aaa8104 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -28,6 +28,7 @@ #include <sal/types.h> #include <osl/mutex.hxx> #include <unotools/options.hxx> +#include <memory> /*-************************************************************************************************************ @short forward declaration to our private date container implementation @@ -86,7 +87,6 @@ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtModuleOptions : public utl::detail:: }; public: - SvtModuleOptions(); virtual ~SvtModuleOptions(); @@ -169,16 +169,7 @@ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtModuleOptions : public utl::detail:: private: UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex(); - /*Attention - - Don't initialize these static members in these headers! - a) Double defined symbols will be detected ... - b) and unresolved externals exist at linking time. - Do it in your source only. - */ - - static SvtModuleOptions_Impl* m_pDataContainer; - static sal_Int32 m_nRefCount; + std::shared_ptr<SvtModuleOptions_Impl> m_pImpl; }; // class SvtModuleOptions |