diff options
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/addincol.hxx | 3 | ||||
-rw-r--r-- | sc/inc/calcconfig.hxx | 3 | ||||
-rw-r--r-- | sc/inc/chartlis.hxx | 3 | ||||
-rw-r--r-- | sc/inc/dpdimsave.hxx | 4 | ||||
-rw-r--r-- | sc/inc/global.hxx | 5 | ||||
-rw-r--r-- | sc/inc/unitconv.hxx | 7 |
6 files changed, 16 insertions, 9 deletions
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index 9ef43a033ae0..d36396a1f29b 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -32,6 +32,7 @@ #include "types.hxx" +#include <string_view> #include <vector> #include <unordered_map> @@ -146,7 +147,7 @@ private: void ReadConfiguration(); void ReadFromAddIn( const css::uno::Reference< css::uno::XInterface>& xInterface ); void UpdateFromAddIn( const css::uno::Reference< css::uno::XInterface>& xInterface, - const OUString& rServiceName ); + std::u16string_view rServiceName ); void LoadComponent( const ScUnoAddInFuncData& rFuncData ); public: diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 9781aa7414fc..00c49d66ffee 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -13,6 +13,7 @@ #include "scdllapi.h" #include <memory> +#include <string_view> #include <o3tl/sorted_vector.hxx> #include <formula/grammar.hxx> @@ -81,7 +82,7 @@ struct SC_DLLPUBLIC ScCalcConfig }; OUString ScOpCodeSetToSymbolicString(const ScCalcConfig::OpCodeSet& rOpCodes); -ScCalcConfig::OpCodeSet ScStringToOpCodeSet(const OUString& rOpCodes); +ScCalcConfig::OpCodeSet ScStringToOpCodeSet(std::u16string_view rOpCodes); #endif diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index f6baf78bc124..c5a882b40a4a 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -27,6 +27,7 @@ #include <memory> #include <map> +#include <string_view> #include <unordered_map> #include <unordered_set> #include <vector> @@ -169,7 +170,7 @@ public: * Create a unique name that's not taken by any existing chart listener * objects. The name consists of a prefix given followed by a number. */ - OUString getUniqueName(const OUString& rPrefix) const; + OUString getUniqueName(std::u16string_view rPrefix) const; void ChangeListening( const OUString& rName, const ScRangeListRef& rRangeListRef ); diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx index 20642f57bcab..a22342ed893a 100644 --- a/sc/inc/dpdimsave.hxx +++ b/sc/inc/dpdimsave.hxx @@ -24,6 +24,8 @@ #include <vector> #include <map> +#include <string_view> + #include "dpitemdata.hxx" #include "dpnumgroupinfo.hxx" #include "scdllapi.h" @@ -109,7 +111,7 @@ public: sal_Int32 GetDatePart() const { return nDatePart; } const ScDPNumGroupInfo& GetDateInfo() const { return aDateInfo; } - OUString CreateGroupName( const OUString& rPrefix ); + OUString CreateGroupName( std::u16string_view rPrefix ); const ScDPSaveGroupItem* GetNamedGroup( const OUString& rGroupName ) const; ScDPSaveGroupItem* GetNamedGroupAcc( const OUString& rGroupName ); void RemoveFromGroups( const OUString& rItemName ); diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index f6b4e83842e7..6e0836fe8342 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -36,6 +36,7 @@ #undef bool #include <memory> +#include <string_view> namespace com::sun::star::uno { template <typename > class Reference; } @@ -568,8 +569,8 @@ public: static bool ShouldOpenURL(); SC_DLLPUBLIC static OUString GetAbsDocName( const OUString& rFileName, const SfxObjectShell* pShell ); - SC_DLLPUBLIC static OUString GetDocTabName( const OUString& rFileName, - const OUString& rTabName ); + SC_DLLPUBLIC static OUString GetDocTabName( std::u16string_view rFileName, + std::u16string_view rTabName ); SC_DLLPUBLIC static sal_uInt32 GetStandardFormat( SvNumberFormatter&, sal_uInt32 nFormat, SvNumFormatType nType ); SC_DLLPUBLIC static sal_uInt16 GetStandardRowHeight(); diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index d16ee89391e1..fe301b32f14d 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -23,6 +23,7 @@ #include <rtl/ustring.hxx> #include <map> +#include <string_view> class ScUnitConverterData { @@ -30,14 +31,14 @@ class ScUnitConverterData double mfValue; public: - ScUnitConverterData(const OUString& rFromUnit, const OUString& rToUnit, double fValue); + ScUnitConverterData(std::u16string_view rFromUnit, std::u16string_view rToUnit, double fValue); ScUnitConverterData(const ScUnitConverterData&) = default; ScUnitConverterData& operator=(const ScUnitConverterData&) = delete; double GetValue() const { return mfValue; } const OUString& GetIndexString() const { return maIndexString; } - static OUString BuildIndexString(const OUString& rFromUnit, const OUString& rToUnit); + static OUString BuildIndexString(std::u16string_view rFromUnit, std::u16string_view rToUnit); }; class ScUnitConverter @@ -51,7 +52,7 @@ public: const ScUnitConverter& operator=(const ScUnitConverter&) = delete; ~ScUnitConverter(); - bool GetValue(double& fValue, const OUString& rFromUnit, const OUString& rToUnit) const; + bool GetValue(double& fValue, std::u16string_view rFromUnit, std::u16string_view rToUnit) const; }; #endif |