diff options
Diffstat (limited to 'basic/source/inc/dlgcont.hxx')
| -rw-r--r-- | basic/source/inc/dlgcont.hxx | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 582e462ab93e..e66a23701759 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BASIC_SOURCE_INC_DLGCONT_HXX -#define INCLUDED_BASIC_SOURCE_INC_DLGCONT_HXX +#pragma once #include "namecont.hxx" @@ -32,11 +31,11 @@ namespace basic { -class SfxDialogLibraryContainer : public SfxLibraryContainer +class SfxDialogLibraryContainer final : public SfxLibraryContainer { // 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; @@ -57,14 +56,14 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer virtual void importFromOldStorage( const OUString& aFile ) override; - virtual SfxLibraryContainer* createInstanceImpl() override; + virtual rtl::Reference<SfxLibraryContainer> createInstanceImpl() override; 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(); @@ -89,7 +88,7 @@ public: typedef ::cppu::ImplHelper1 < css::resource::XStringResourceSupplier > SfxDialogLibrary_BASE; -class SfxDialogLibrary :public SfxLibrary +class SfxDialogLibrary final : public SfxLibrary ,public SfxDialogLibrary_BASE { SfxDialogLibraryContainer* m_pParent; @@ -109,7 +108,7 @@ public: SfxDialogLibrary ( ModifiableHelper& _rModifiable, - const OUString& aName, + OUString aName, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI, SfxDialogLibraryContainer* pParent ); @@ -117,7 +116,7 @@ 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 @@ -141,12 +140,10 @@ public: static bool containsValidDialog( const css::uno::Any& aElement ); -protected: +private: virtual bool isLibraryElementValid(const css::uno::Any& rElement) const override; }; } // namespace basic -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |