Cleanup in Tools > Options > User Data

Change-Id: I4f0a0304d7dd23ed8ce011e6f8f90e170bfbe5df

Cleanup in Tools > Options > User Data

Change-Id: If89f19e22b6efeb0fdd811ff8afe2cb6c0b0bf4e
Reviewed-on: https://gerrit.libreoffice.org/500
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>

1 files changed, 54 insertions, 48 deletions

diff --git a/unotools/inc/unotools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx
index 97e50c4c977c..6dc8bc63534c 100644
--- a/unotools/inc/unotools/useroptions.hxx
+++ b/unotools/inc/unotools/useroptions.hxx
@@ -23,6 +23,8 @@
 #include <unotools/configitem.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/options.hxx>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 // define ----------------------------------------------------------------
 
@@ -43,66 +45,70 @@
 #define USER_OPT_ZIP                ((sal_uInt16)14)
 #define USER_OPT_FATHERSNAME        ((sal_uInt16)15)
 #define USER_OPT_APARTMENT          ((sal_uInt16)16)
+#define USER_OPT_CUSTOMERNUMBER     ((sal_uInt16)17)
 
 // class SvtUserOptions --------------------------------------------------
 
-class SvtUserOptions_Impl;
-
-class UNOTOOLS_DLLPUBLIC SvtUserOptions: public utl::detail::Options
+class UNOTOOLS_DLLPUBLIC SvtUserOptions : public utl::detail::Options
 {
-private:
-    SvtUserOptions_Impl*    pImp;
-
 public:
-    SvtUserOptions();
-    virtual ~SvtUserOptions();
+    SvtUserOptions ();
+    virtual ~SvtUserOptions ();
 
-    static ::osl::Mutex&    GetInitMutex();
+    static osl::Mutex& GetInitMutex ();
 
     // get the address token
-     ::rtl::OUString    GetCompany() const;
-     ::rtl::OUString    GetFirstName() const;
-     ::rtl::OUString    GetLastName() const;
-     ::rtl::OUString    GetID() const;
-     ::rtl::OUString    GetStreet() const;
-     ::rtl::OUString    GetCity() const;
-     ::rtl::OUString    GetState() const;
-     ::rtl::OUString    GetZip() const;
-     ::rtl::OUString    GetCountry() const;
-     ::rtl::OUString    GetPosition() const;
-     ::rtl::OUString    GetTitle() const;
-     ::rtl::OUString    GetTelephoneHome() const;
-     ::rtl::OUString    GetTelephoneWork() const;
-     ::rtl::OUString    GetFax() const;
-     ::rtl::OUString    GetEmail() const;
-     ::rtl::OUString    GetCustomerNumber() const;
-     ::rtl::OUString    GetFathersName() const;
-     ::rtl::OUString    GetApartment() const;
+    rtl::OUString GetCompany        () const;
+    rtl::OUString GetFirstName      () const;
+    rtl::OUString GetLastName       () const;
+    rtl::OUString GetID             () const;
+    rtl::OUString GetStreet         () const;
+    rtl::OUString GetCity           () const;
+    rtl::OUString GetState          () const;
+    rtl::OUString GetZip            () const;
+    rtl::OUString GetCountry        () const;
+    rtl::OUString GetPosition       () const;
+    rtl::OUString GetTitle          () const;
+    rtl::OUString GetTelephoneHome  () const;
+    rtl::OUString GetTelephoneWork  () const;
+    rtl::OUString GetFax            () const;
+    rtl::OUString GetEmail          () const;
+    rtl::OUString GetCustomerNumber () const;
+    rtl::OUString GetFathersName    () const;
+    rtl::OUString GetApartment      () const;
 
-     ::rtl::OUString    GetFullName() const;
+    rtl::OUString GetFullName       () const;
 
     // set the address token
-    void            SetCompany( const ::rtl::OUString& rNewToken );
-    void            SetFirstName( const ::rtl::OUString& rNewToken );
-    void            SetLastName( const ::rtl::OUString& rNewToken );
-    void            SetID( const ::rtl::OUString& rNewToken );
-    void            SetStreet( const ::rtl::OUString& rNewToken );
-    void            SetCity( const ::rtl::OUString& rNewToken );
-    void            SetState( const ::rtl::OUString& rNewToken );
-    void            SetZip( const ::rtl::OUString& rNewToken );
-    void            SetCountry( const ::rtl::OUString& rNewToken );
-    void            SetPosition( const ::rtl::OUString& rNewToken );
-    void            SetTitle( const ::rtl::OUString& rNewToken );
-    void            SetTelephoneHome( const ::rtl::OUString& rNewToken );
-    void            SetTelephoneWork( const ::rtl::OUString& rNewToken );
-    void            SetFax( const ::rtl::OUString& rNewToken );
-    void            SetEmail( const ::rtl::OUString& rNewToken );
-    void            SetCustomerNumber( const ::rtl::OUString& rNewToken );
-    void            SetFathersName( const ::rtl::OUString& rNewToken );
-    void            SetApartment( const ::rtl::OUString& rNewToken );
+    void SetCompany        (rtl::OUString const&);
+    void SetFirstName      (rtl::OUString const&);
+    void SetLastName       (rtl::OUString const&);
+    void SetID             (rtl::OUString const&);
+    void SetStreet         (rtl::OUString const&);
+    void SetCity           (rtl::OUString const&);
+    void SetState          (rtl::OUString const&);
+    void SetZip            (rtl::OUString const&);
+    void SetCountry        (rtl::OUString const&);
+    void SetPosition       (rtl::OUString const&);
+    void SetTitle          (rtl::OUString const&);
+    void SetTelephoneHome  (rtl::OUString const&);
+    void SetTelephoneWork  (rtl::OUString const&);
+    void SetFax            (rtl::OUString const&);
+    void SetEmail          (rtl::OUString const&);
+    void SetCustomerNumber (rtl::OUString const&);
+    void SetFathersName    (rtl::OUString const&);
+    void SetApartment      (rtl::OUString const&);
 
-    sal_Bool        IsTokenReadonly( sal_uInt16 nToken ) const;
-    ::rtl::OUString GetToken(sal_uInt16 nToken) const;
+    sal_Bool      IsTokenReadonly (sal_uInt16 nToken) const;
+    rtl::OUString GetToken (sal_uInt16 nToken) const;
+    void          SetToken (sal_uInt16 nToken, rtl::OUString const& rNewToken);
+
+private:
+    class Impl;
+    boost::shared_ptr<Impl> pImpl;
+    static boost::weak_ptr<Impl> pSharedImpl;
+private:
+    class ChangeListener;
 };
 
 #endif // #ifndef INCLUDED_unotools_USEROPTIONS_HXX