1 files changed, 13 insertions, 13 deletions
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index bc82a42ca915..2d0e8bcf3232 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -29,13 +29,13 @@ namespace basic
 {
 
 
-class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPassword
+class SfxScriptLibraryContainer final : public SfxLibraryContainer
 {
     css::uno::Reference< css::container::XNameAccess > mxCodeNameAccess;
 
     // Methods to distinguish between different library types
-    virtual SfxLibrary* implCreateLibrary( const OUString& aName ) override;
-    virtual SfxLibrary* implCreateLibraryLink
+    virtual rtl::Reference<SfxLibrary> implCreateLibrary( const OUString& aName ) override;
+    virtual rtl::Reference<SfxLibrary> implCreateLibraryLink
         ( const OUString& aName, const OUString& aLibInfoFileURL,
           const OUString& StorageURL, bool ReadOnly ) override;
     virtual css::uno::Any createEmptyLibraryElement() override;
@@ -56,7 +56,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
 
     virtual void importFromOldStorage( const OUString& aFile ) override;
 
-    virtual SfxLibraryContainer* createInstanceImpl() override;
+    virtual rtl::Reference<SfxLibraryContainer> createInstanceImpl() override;
 
 
     // Password encryption
@@ -75,13 +75,10 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
     virtual void onNewRootStorage() override;
 
 
-    // OldBasicPassword interface
-    virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) 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:
     SfxScriptLibraryContainer();
@@ -99,6 +96,9 @@ public:
     // Methods XServiceInfo
     virtual OUString SAL_CALL getImplementationName( ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
+
+    // Library password handling for 5.0 documents
+    void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword );
 };
 
 
@@ -106,7 +106,7 @@ typedef std::unordered_map< OUString, css::script::ModuleInfo > ModuleInfoMap;
 
 typedef ::cppu::ImplHelper1< css::script::vba::XVBAModuleInfo > SfxScriptLibrary_BASE;
 
-class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE
+class SfxScriptLibrary final : public SfxLibrary, public SfxScriptLibrary_BASE
 {
     friend class SfxScriptLibraryContainer;
 
@@ -150,7 +150,7 @@ public:
 
     static bool containsValidModule( const css::uno::Any& _rElement );
 
-protected:
+private:
     virtual bool isLibraryElementValid(const css::uno::Any& rElement) const override;
 };