diff options
Diffstat (limited to 'include/svtools/menuoptions.hxx')
| -rw-r--r-- | include/svtools/menuoptions.hxx | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx index e59f6a873a7f..64bdc735f625 100644 --- a/include/svtools/menuoptions.hxx +++ b/include/svtools/menuoptions.hxx @@ -25,6 +25,7 @@ #include <tools/link.hxx> #include <osl/mutex.hxx> #include <unotools/options.hxx> +#include <memory> /*-************************************************************************************************************ @short forward declaration to our private date container implementation @@ -43,18 +44,6 @@ class SvtMenuOptions_Impl; class SAL_WARN_UNUSED SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options { public: - - /*-**************************************************************************************************** - @short standard constructor and destructor - @descr This will initialize an instance with default values. - We implement these class with a refcount mechanism! Every instance of this class increase it - at create and decrease it at delete time - but all instances use the same data container! - He is implemented as a static member ... - - @seealso member m_nRefCount - @seealso member m_pDataContainer - *//*-*****************************************************************************************************/ - SvtMenuOptions(); virtual ~SvtMenuOptions(); @@ -91,17 +80,7 @@ class SAL_WARN_UNUSED SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); private: - - /*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 SvtMenuOptions_Impl* m_pDataContainer ; - static sal_Int32 m_nRefCount ; + std::shared_ptr<SvtMenuOptions_Impl> m_pImpl; }; // class SvtMenuOptions |