summaryrefslogtreecommitdiff
path: root/sc/source/filter/inc
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-11-11 18:19:21 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2021-11-11 20:12:31 +0100
commit06ca3d89f4b9761f1bfea66a93f0fc7e0bab71a6 (patch)
tree1c977402e7b76e9662b9e44b4881f517a4b18018 /sc/source/filter/inc
parentbe73c64d11fd330f76b08fc75354164aba3ecc88 (diff)
Drop ScGlobal::GetEmptyOUString() and EMPTY_OUSTRING
OUString default ctor already uses a static instance (through rtl_uString_new), no need to have another module-specific static. Commit d8037ae18a297229d1b79f8f76331abfd548350d had removed its sw counterpart some time ago. Change-Id: I140fe13bc1f6b0cbe188e83e602fdebe995e467a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125061 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sc/source/filter/inc')
-rw-r--r--sc/source/filter/inc/xename.hxx2
-rw-r--r--sc/source/filter/inc/xilink.hxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx
index 989dff3d4e00..a81a12804b95 100644
--- a/sc/source/filter/inc/xename.hxx
+++ b/sc/source/filter/inc/xename.hxx
@@ -55,7 +55,7 @@ public:
sal_uInt16 InsertMacroCall( const OUString& rMacroName, bool bVBasic, bool bFunc, bool bHidden = false );
/** Returns the Calc sheet of a local defined name, or SCTAB_GLOBAL for global defined names. */
- const OUString& GetOrigName( sal_uInt16 nNameIdx ) const;
+ OUString GetOrigName( sal_uInt16 nNameIdx ) const;
/** Returns the Calc sheet of a local defined name, or SCTAB_GLOBAL for global defined names. */
SCTAB GetScTab( sal_uInt16 nNameIdx ) const;
/** Returns true, if the specified defined name is volatile. */
diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx
index 91321f3bcef9..cdfef4c82397 100644
--- a/sc/source/filter/inc/xilink.hxx
+++ b/sc/source/filter/inc/xilink.hxx
@@ -209,7 +209,7 @@ public:
const OUString* GetSupbookUrl( sal_uInt16 nXtiIndex ) const;
- const OUString& GetSupbookTabName( sal_uInt16 nXti, sal_uInt16 nXtiTab ) const;
+ OUString GetSupbookTabName( sal_uInt16 nXti, sal_uInt16 nXtiTab ) const;
/** Tries to decode the URL of the specified XTI entry to OLE or DDE link components.
@descr For DDE links: Decodes to application name and topic.
@@ -217,7 +217,7 @@ public:
@return true = decoding was successful, returned strings are valid (not empty). */
bool GetLinkData( OUString& rApplic, OUString& rTopic, sal_uInt16 nXtiIndex ) const;
/** Returns the specified macro name or an empty string on error. */
- const OUString& GetMacroName( sal_uInt16 nExtSheet, sal_uInt16 nExtName ) const;
+ OUString GetMacroName( sal_uInt16 nExtSheet, sal_uInt16 nExtName ) const;
private:
typedef ::std::unique_ptr< XclImpLinkManagerImpl > XclImpLinkMgrImplPtr;