tdf#89329: use shared_ptr for pImpl in addonsoptions

Change-Id: I159ba04fa70f324d2a7f5b3c592337b92c7f097d
Reviewed-on: https://gerrit.libreoffice.org/26560
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

1 files changed, 3 insertions, 29 deletions

diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index 8241f324815b..e0c40136edfe 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <framework/fwedllapi.h>
+#include <memory>
 
 /*-************************************************************************************************************
     @descr          The method GetAddonsMenu() returns a list of property values.
@@ -97,18 +98,6 @@ class AddonsOptions_Impl;
 class FWE_DLLPUBLIC AddonsOptions
 {
     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
-        *//*-*****************************************************************************************************/
-
          AddonsOptions();
         ~AddonsOptions();
 
@@ -116,7 +105,6 @@ class FWE_DLLPUBLIC AddonsOptions
             @short      returns if an addons menu is available
             @descr      Call to retrieve if a addons menu is available
 
-
             @return     true if there is a menu otherwise false
         *//*-*****************************************************************************************************/
 
@@ -126,7 +114,6 @@ class FWE_DLLPUBLIC AddonsOptions
             @short      returns number of addons toolbars
             @descr      Call to retrieve the number of addons toolbars
 
-
             @return     number of addons toolbars
         *//*-*****************************************************************************************************/
         sal_Int32   GetAddonsToolBarCount() const ;
@@ -208,10 +195,8 @@ class FWE_DLLPUBLIC AddonsOptions
         Image GetImageFromURL( const OUString& aURL, bool bBig, bool bNoScale ) const;
         Image GetImageFromURL( const OUString& aURL, bool bBig ) const;
 
-
     //  private methods
 
-
         /*-****************************************************************************************************
             @short      return a reference to a static mutex
             @descr      These class is partially threadsafe (for de-/initialization only).
@@ -229,21 +214,10 @@ class FWE_DLLPUBLIC AddonsOptions
                         We create a static mutex only for one ime and use at different times.
             @return     A reference to a static mutex member.
         *//*-*****************************************************************************************************/
-        DECL_STATIC_LINK_TYPED( AddonsOptions, Notify, void*, void );
+        DECL_LINK_TYPED( Notify, void*, void );
 
     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 AddonsOptions_Impl*  m_pDataContainer    ;
-        static sal_Int32            m_nRefCount         ;
-
+        std::shared_ptr<AddonsOptions_Impl>  m_pImpl;
 };
 
 }