diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-24 15:41:40 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-25 16:00:48 +0200 |
commit | 371886dd1245751edb5ce728d0c764a6bb8e2205 (patch) | |
tree | 05fcf485f7a0253ce3b408d446809e230b017114 /basic | |
parent | e79db65efb48f2f4e82945fc850bc38c8923e22d (diff) |
elide some OUString allocation
Change-Id: Ia21421731dadc1d0e65da182471eb2b8d799782b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134918
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/inc/dlgcont.hxx | 8 | ||||
-rw-r--r-- | basic/source/inc/namecont.hxx | 8 | ||||
-rw-r--r-- | basic/source/inc/scriptcont.hxx | 8 | ||||
-rw-r--r-- | basic/source/uno/dlgcont.cxx | 24 | ||||
-rw-r--r-- | basic/source/uno/namecont.cxx | 8 | ||||
-rw-r--r-- | basic/source/uno/scriptcont.cxx | 24 |
6 files changed, 56 insertions, 24 deletions
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 58d1dbeb65f4..60882268e524 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -60,10 +60,10 @@ class SfxDialogLibraryContainer final : 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(); diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 56f660e52c30..6c25223da711 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -297,10 +297,10 @@ protected: void init( const OUString& rInitialDocumentURL, const css::uno::Reference< css::embed::XStorage >& _rxInitialStorage ); - virtual const char* getInfoFileName() const = 0; - virtual const char* getOldInfoFileName() const = 0; - virtual const char* getLibElementFileExtension() const = 0; - virtual const char* getLibrariesDir() const = 0; + virtual OUString getInfoFileName() const = 0; + virtual OUString getOldInfoFileName() const = 0; + virtual OUString getLibElementFileExtension() const = 0; + virtual OUString getLibrariesDir() const = 0; // Handle maLibInfoFileURL and maStorageURL correctly void checkStorageURL diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 592c3ad9d31b..f80fd81791b0 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -78,10 +78,10 @@ class SfxScriptLibraryContainer final : public SfxLibraryContainer, public OldBa // 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(); diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 31c64aef95f5..86cedbb47446 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -62,10 +62,26 @@ using com::sun::star::uno::Reference; // Implementation class SfxDialogLibraryContainer -const char* SfxDialogLibraryContainer::getInfoFileName() const { return "dialog"; } -const char* SfxDialogLibraryContainer::getOldInfoFileName() const { return "dialogs"; } -const char* SfxDialogLibraryContainer::getLibElementFileExtension() const { return "xdl"; } -const char* SfxDialogLibraryContainer::getLibrariesDir() const { return "Dialogs"; } +OUString SfxDialogLibraryContainer::getInfoFileName() const +{ + static constexpr OUStringLiteral dialog = u"dialog"; + return dialog; +} +OUString SfxDialogLibraryContainer::getOldInfoFileName() const +{ + static constexpr OUStringLiteral dialogs = u"dialogs"; + return dialogs; +} +OUString SfxDialogLibraryContainer::getLibElementFileExtension() const +{ + static constexpr OUStringLiteral xdl = u"xdl"; + return xdl; +} +OUString SfxDialogLibraryContainer::getLibrariesDir() const +{ + static constexpr OUStringLiteral Dialogs = u"Dialogs"; + return Dialogs; +} // Ctor for service SfxDialogLibraryContainer::SfxDialogLibraryContainer() diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 2f7d76d2251e..55058556bcfc 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -588,10 +588,10 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, uno::Reference< embed::XStorage > xStorage = rxInitialStorage; maInitialDocumentURL = rInitialDocumentURL; - maInfoFileName = OUString::createFromAscii( getInfoFileName() ); - maOldInfoFileName = OUString::createFromAscii( getOldInfoFileName() ); - maLibElementFileExtension = OUString::createFromAscii( getLibElementFileExtension() ); - maLibrariesDir = OUString::createFromAscii( getLibrariesDir() ); + maInfoFileName = getInfoFileName(); + maOldInfoFileName = getOldInfoFileName(); + maLibElementFileExtension = getLibElementFileExtension(); + maLibrariesDir = getLibrariesDir(); meInitMode = DEFAULT; INetURLObject aInitUrlInetObj( maInitialDocumentURL ); diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 5ccf6cc0ddfb..52413b759d15 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -66,10 +66,26 @@ using namespace osl; // Implementation class SfxScriptLibraryContainer -const char* SfxScriptLibraryContainer::getInfoFileName() const { return "script"; } -const char* SfxScriptLibraryContainer::getOldInfoFileName() const { return "script"; } -const char* SfxScriptLibraryContainer::getLibElementFileExtension() const { return "xba"; } -const char* SfxScriptLibraryContainer::getLibrariesDir() const { return "Basic"; } +OUString SfxScriptLibraryContainer::getInfoFileName() const +{ + static constexpr OUStringLiteral script = u"script"; + return script; +} +OUString SfxScriptLibraryContainer::getOldInfoFileName() const +{ + static constexpr OUStringLiteral script = u"script"; + return script; +} +OUString SfxScriptLibraryContainer::getLibElementFileExtension() const +{ + static constexpr OUStringLiteral xba = u"xba"; + return xba; +} +OUString SfxScriptLibraryContainer::getLibrariesDir() const +{ + static constexpr OUStringLiteral sBasic = u"Basic"; + return sBasic; +} // OldBasicPassword interface void SfxScriptLibraryContainer::setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) |