1 files changed, 10 insertions, 14 deletions

diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index 4be36fec9160..81d14d72bec2 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -31,7 +31,7 @@ namespace basic
 {
 
 
-class SfxDialogLibraryContainer : public SfxLibraryContainer
+class SfxDialogLibraryContainer final : public SfxLibraryContainer
 {
     // Methods to distinguish between different library types
     virtual rtl::Reference<SfxLibrary> implCreateLibrary( const OUString& aName ) override;
@@ -60,10 +60,10 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer
 
     virtual void onNewRootStorage() override;
 
-    virtual const char*    getInfoFileName() const override;
-    virtual const char*    getOldInfoFileName() const override;
-    virtual const char*    getLibElementFileExtension() const override;
-    virtual const char*    getLibrariesDir() const override;
+    virtual OUString getInfoFileName() const override;
+    virtual OUString getOldInfoFileName() const override;
+    virtual OUString getLibElementFileExtension() const override;
+    virtual OUString getLibrariesDir() const override;
 
 public:
     SfxDialogLibraryContainer();
@@ -85,11 +85,10 @@ public:
 };
 
 
-typedef ::cppu::ImplHelper1 <   css::resource::XStringResourceSupplier
+typedef cppu::ImplInheritanceHelper<SfxLibrary, css::resource::XStringResourceSupplier
                             >   SfxDialogLibrary_BASE;
 
-class SfxDialogLibrary  :public SfxLibrary
-                        ,public SfxDialogLibrary_BASE
+class SfxDialogLibrary final : public SfxDialogLibrary_BASE
 {
     SfxDialogLibraryContainer*                                        m_pParent;
     css::uno::Reference< css::resource::XStringResourcePersistence>   m_xStringResourcePersistence;
@@ -108,7 +107,7 @@ public:
     SfxDialogLibrary
     (
         ModifiableHelper& _rModifiable,
-        const OUString& aName,
+        OUString aName,
         const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
         SfxDialogLibraryContainer* pParent
     );
@@ -116,15 +115,12 @@ public:
     SfxDialogLibrary
     (
         ModifiableHelper& _rModifiable,
-        const OUString& aName,
+        OUString aName,
         const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
         const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly,
         SfxDialogLibraryContainer* pParent
     );
 
-    DECLARE_XINTERFACE()
-    DECLARE_XTYPEPROVIDER()
-
     // XStringResourceSupplier
     virtual css::uno::Reference< css::resource::XStringResourceResolver >
         SAL_CALL getStringResource(  ) override;
@@ -140,7 +136,7 @@ public:
 
     static bool containsValidDialog( const css::uno::Any& aElement );
 
-protected:
+private:
     virtual bool isLibraryElementValid(const css::uno::Any& rElement) const override;
 };