diff options
Diffstat (limited to 'sc')
94 files changed, 273 insertions, 273 deletions
diff --git a/sc/inc/ChartTools.hxx b/sc/inc/ChartTools.hxx index 79aa00fb6056..08b53437d43e 100644 --- a/sc/inc/ChartTools.hxx +++ b/sc/inc/ChartTools.hxx @@ -42,13 +42,13 @@ public: }; SdrOle2Obj* findChartsByName(ScDocShell* pDocShell, SCTAB nTab, - OUString const & rName, + std::u16string_view rName, ChartSourceType eChartSourceType); SdrOle2Obj* getChartByIndex(ScDocShell* pDocShell, SCTAB nTab, ::tools::Long nIndex, ChartSourceType eChartSourceType); -std::vector<SdrOle2Obj*> getAllPivotChartsConnectedTo(OUString const & sPivotTableName, ScDocShell* pDocShell); +std::vector<SdrOle2Obj*> getAllPivotChartsConnectedTo(std::u16string_view sPivotTableName, ScDocShell* pDocShell); } // end sc::tools diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index fca864ecf136..f3d9ba2a3d20 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -46,7 +46,7 @@ class ScAutoFormatsObj final : public ::cppu::WeakImplHelper< { private: static ScAutoFormatObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); - static ScAutoFormatObj* GetObjectByName_Impl(const OUString& aName); + static ScAutoFormatObj* GetObjectByName_Impl(std::u16string_view aName); public: ScAutoFormatsObj(); diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index 9419dc14d13e..f4a59750e68c 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -63,8 +63,8 @@ public: void SetSource(const OUString& rDoc, const OUString& rFlt, const OUString& rOpt, const OUString& rArea); - bool IsEqual( const OUString& rFile, const OUString& rFilter, const OUString& rOpt, - const OUString& rSource, const ScRange& rDest ) const; + bool IsEqual( std::u16string_view rFile, std::u16string_view rFilter, std::u16string_view rOpt, + std::u16string_view rSource, const ScRange& rDest ) const; const OUString& GetFile() const { return aFileName; } const OUString& GetFilter() const { return aFilterName; } diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index b3caae236efb..d22c623bd06e 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -577,7 +577,7 @@ public: void InsertCol(SCTAB nTab, SCROW nRowStart, SCROW nRowEnd, SCCOL nColStart, SCSIZE nSize); void DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void RenameCellStyle( const OUString& rOld, const OUString& rNew ); + void RenameCellStyle( std::u16string_view rOld, const OUString& rNew ); const ScFormatEntry* GetEntry( sal_uInt16 nPos ) const; @@ -660,7 +660,7 @@ public: void InsertRow(SCTAB nTab, SCCOL nColStart, SCCOL nColEnd, SCROW nRowStart, SCSIZE nSize); void InsertCol(SCTAB nTab, SCROW nRowStart, SCROW nRowEnd, SCCOL nColStart, SCSIZE nSize); - void RenameCellStyle( const OUString& rOld, const OUString& rNew ); + void RenameCellStyle( std::u16string_view rOld, const OUString& rNew ); void DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); typedef ConditionalFormatContainer::iterator iterator; diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index 9c3a6edcc50a..6a6e6be3d189 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -42,7 +42,7 @@ public: virtual MapUnit GetMetric( sal_uInt16 nWhich ) const override; void StyleDeleted( const ScStyleSheet* pStyle ); // delete templates(?) in organizer - void CellStyleCreated( const OUString& rName, const ScDocument& rDoc ); + void CellStyleCreated( std::u16string_view rName, const ScDocument& rDoc ); virtual bool GetPresentation( const SfxPoolItem& rItem, MapUnit ePresentationMetric, OUString& rText, diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 5bab5a19d80c..44c1fc6fd4b4 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -844,21 +844,21 @@ public: SdrObject* GetObjectAtPoint( SCTAB nTab, const Point& rPos ); bool HasChartAtPoint( SCTAB nTab, const Point& rPos, OUString& rName ); - css::uno::Reference< css::chart2::XChartDocument > GetChartByName( const OUString& rChartName ); + css::uno::Reference< css::chart2::XChartDocument > GetChartByName( std::u16string_view rChartName ); - SC_DLLPUBLIC void GetChartRanges( const OUString& rChartName, std::vector< ScRangeList >& rRanges, const ScDocument& rSheetNameDoc ); - void SetChartRanges( const OUString& rChartName, const std::vector< ScRangeList >& rRanges ); + SC_DLLPUBLIC void GetChartRanges( std::u16string_view rChartName, std::vector< ScRangeList >& rRanges, const ScDocument& rSheetNameDoc ); + void SetChartRanges( std::u16string_view rChartName, const std::vector< ScRangeList >& rRanges ); void UpdateChartArea( const OUString& rChartName, const ScRange& rNewArea, bool bColHeaders, bool bRowHeaders, bool bAdd ); void UpdateChartArea( const OUString& rChartName, const ScRangeListRef& rNewList, bool bColHeaders, bool bRowHeaders, bool bAdd ); - void GetOldChartParameters( const OUString& rName, + void GetOldChartParameters( std::u16string_view rName, ScRangeList& rRanges, bool& rColHeaders, bool& rRowHeaders ); css::uno::Reference< css::embed::XEmbeddedObject > - FindOleObjectByName( const OUString& rName ); + FindOleObjectByName( std::u16string_view rName ); SC_DLLPUBLIC void MakeTable( SCTAB nTab,bool _bNeedsNameCheck = true ); @@ -1000,8 +1000,8 @@ public: void SetLink( SCTAB nTab, ScLinkMode nMode, const OUString& rDoc, const OUString& rFilter, const OUString& rOptions, const OUString& rTabName, sal_uLong nRefreshDelay ); - bool HasLink( const OUString& rDoc, - const OUString& rFilter, const OUString& rOptions ) const; + bool HasLink( std::u16string_view rDoc, + std::u16string_view rFilter, std::u16string_view rOptions ) const; SC_DLLPUBLIC bool LinkExternalTab( SCTAB& nTab, const OUString& aDocTab, const OUString& aFileName, const OUString& aTabName ); @@ -1030,8 +1030,8 @@ public: /** Tries to find a DDE link with the specified connection data. @param rnDdePos (out-param) Returns the index of the DDE link (does not include other links from link manager). @return true = DDE link found, rnDdePos valid. */ - SC_DLLPUBLIC bool FindDdeLink( const OUString& rAppl, const OUString& rTopic, - const OUString& rItem, sal_uInt8 nMode, size_t& rnDdePos ); + SC_DLLPUBLIC bool FindDdeLink( std::u16string_view rAppl, std::u16string_view rTopic, + std::u16string_view rItem, sal_uInt8 nMode, size_t& rnDdePos ); /** Returns the connection data of the specified DDE link. @param nDdePos Index of the DDE link (does not include other links from link manager). @@ -1081,7 +1081,7 @@ public: SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCCOL nDx, SCROW nDy, SCTAB nDz ); //! only assigns the new RangeList, no ChartListener or the like - void SetChartRangeList( const OUString& rChartName, + void SetChartRangeList( std::u16string_view rChartName, const ScRangeListRef& rNewRangeListRef ); void StartAnimations( SCTAB nTab ); @@ -2012,9 +2012,9 @@ public: void RemoveManualBreaks( SCTAB nTab ); bool HasManualBreaks( SCTAB nTab ) const; - bool IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab ); - bool RemovePageStyleInUse( const OUString& rStrPageStyle ); - bool RenamePageStyleInUse( const OUString& rOld, const OUString& rNew ); + bool IsPageStyleInUse( std::u16string_view rStrPageStyle, SCTAB* pInTab ); + bool RemovePageStyleInUse( std::u16string_view rStrPageStyle ); + bool RenamePageStyleInUse( std::u16string_view rOld, const OUString& rNew ); void ModifyStyleSheet( SfxStyleSheetBase& rPageStyle, const SfxItemSet& rChanges ); @@ -2111,7 +2111,7 @@ public: SCCOL nCol, SCROW nRow, SCTAB nTab, const ScMarkData& rMark); - void InvalidateTextWidth( const OUString& rStyleName ); + void InvalidateTextWidth( std::u16string_view rStyleName ); void InvalidateTextWidth( SCTAB nTab ); void InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo, bool bNumFormatChanged ); diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx index 99a3ca3e5a95..3d7bb9b82ddb 100644 --- a/sc/inc/documentlinkmgr.hxx +++ b/sc/inc/documentlinkmgr.hxx @@ -57,7 +57,7 @@ public: bool updateDdeOrOleOrWebServiceLinks(weld::Window* pWin); - void updateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem ); + void updateDdeLink( std::u16string_view rAppl, std::u16string_view rTopic, std::u16string_view rItem ); size_t getDdeLinkCount() const; diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 44fdc3463aed..6c80b3f0f2c7 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -715,9 +715,9 @@ private: ScDocShell* pDocShell; SCTAB nTab; - bool GetScenarioIndex_Impl( const OUString& rName, SCTAB& rIndex ); + bool GetScenarioIndex_Impl( std::u16string_view rName, SCTAB& rIndex ); ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex); - ScTableSheetObj* GetObjectByName_Impl(const OUString& aName); + ScTableSheetObj* GetObjectByName_Impl(std::u16string_view aName); public: ScScenariosObj(ScDocShell* pDocSh, SCTAB nT); diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index 404ebf2ddaac..ccb26df2492f 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -163,7 +163,7 @@ public: */ sal_Int32 GetGroupType(tools::Long nDim) const; - SCCOL GetDimensionIndex(const OUString& sName) const; + SCCOL GetDimensionIndex(std::u16string_view sName) const; sal_uInt32 GetNumberFormat( tools::Long nDim ) const; bool IsDateDimension( tools::Long nDim ) const ; tools::Long GetDimMemberCount(tools::Long nDim) const; diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index eaf560437b8d..30254b321efa 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -139,7 +139,7 @@ public: void AddGroupDimension( const ScDPGroupDimension& rGroup ); void SetNumGroupDimension( sal_Int32 nIndex, const ScDPNumGroupDimension& rGroup ); - sal_Int32 GetDimensionIndex( const OUString& rName ); + sal_Int32 GetDimensionIndex( std::u16string_view rName ); virtual sal_Int32 GetColumnCount() override; virtual sal_Int32 GetMembersCount( sal_Int32 nDim ) override; diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 6d8fc8cf0357..4459b4b06dce 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -186,7 +186,7 @@ public: tools::Rectangle& rPosRect, css::sheet::DataPilotFieldOrientation& rOrient, tools::Long& rDimPos ); bool IsFilterButton( const ScAddress& rPos ); - OUString GetFormattedString( const OUString& rDimName, const double fValue ); + OUString GetFormattedString( std::u16string_view rDimName, const double fValue ); double GetPivotData( const OUString& rDataFieldName, @@ -392,7 +392,7 @@ public: SC_DLLPUBLIC ScDPObject& operator[](size_t nIndex); SC_DLLPUBLIC const ScDPObject& operator[](size_t nIndex) const; - ScDPObject* GetByName(const OUString& rName) const; + ScDPObject* GetByName(std::u16string_view rName) const; void DeleteOnTab( SCTAB nTab ); void UpdateReference( UpdateRefMode eUpdateRefMode, @@ -434,9 +434,9 @@ private: void RemoveCache(const ScDPCache* pCache); void GetAllTables(const ScRange& rSrcRange, o3tl::sorted_vector<ScDPObject*>& rRefs) const; - void GetAllTables(const OUString& rSrcName, o3tl::sorted_vector<ScDPObject*>& rRefs) const; + void GetAllTables(std::u16string_view rSrcName, o3tl::sorted_vector<ScDPObject*>& rRefs) const; void GetAllTables( - sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand, + sal_Int32 nSdbType, std::u16string_view rDBName, std::u16string_view rCommand, o3tl::sorted_vector<ScDPObject*>& rRefs) const; private: diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 54a04d7ed4ad..79145ec833f0 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -306,10 +306,10 @@ public: SC_DLLPUBLIC ScDPSaveDimension* GetDataLayoutDimension(); SC_DLLPUBLIC ScDPSaveDimension* GetExistingDataLayoutDimension() const; - ScDPSaveDimension* DuplicateDimension(const OUString& rName); + ScDPSaveDimension* DuplicateDimension(std::u16string_view rName); SC_DLLPUBLIC ScDPSaveDimension& DuplicateDimension(const ScDPSaveDimension& rDim); - SC_DLLPUBLIC ScDPSaveDimension* GetExistingDimensionByName(const OUString& rName) const; + SC_DLLPUBLIC ScDPSaveDimension* GetExistingDimensionByName(std::u16string_view rName) const; SC_DLLPUBLIC ScDPSaveDimension* GetNewDimensionByName(const OUString& rName); void RemoveDimensionByName(const OUString& rName); @@ -361,7 +361,7 @@ public: * * @param rDimName dimension name */ - SC_DLLPUBLIC bool HasInvisibleMember(const OUString& rDimName) const; + SC_DLLPUBLIC bool HasInvisibleMember(std::u16string_view rDimName) const; #if DUMP_PIVOT_TABLE void Dump() const; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index c12d80a80e66..38892ea1bceb 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -165,7 +165,7 @@ public: bool SubTotalAllowed(sal_Int32 nColumn); //! move to ScDPResultData - ScDPDimension* AddDuplicated(const OUString& rNewName); + ScDPDimension* AddDuplicated(std::u16string_view rNewName); sal_Int32 GetDupCount() const { return nDupCount; } sal_Int32 GetSourceDim(sal_Int32 nDim); diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index d0efb68513fa..030fd3855ec8 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -164,7 +164,7 @@ public: // (ChartListenerCollection etc. must use GetPersistName directly) static OUString GetVisibleName( const SdrObject* pObj ); - SdrObject* GetNamedObject( const OUString& rName, sal_uInt16 nId, SCTAB& rFoundTab ) const; + SdrObject* GetNamedObject( std::u16string_view rName, sal_uInt16 nId, SCTAB& rFoundTab ) const; // if pnCounter != NULL, the search for a name starts with this index + 1, // and the index really used is returned. OUString GetNewGraphicName( tools::Long* pnCounter = nullptr ) const; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index db81502b3ef6..fd07fa0e657a 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -571,7 +571,7 @@ public: bool isValidRangeName(sal_uInt16 nFileId, const OUString& rName); OUString getOwnDocumentName() const; - bool isOwnDocument(const OUString& rFile) const; + bool isOwnDocument(std::u16string_view rFile) const; /** * Takes a flat file name, and convert it to an absolute URL path. An diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index d1a93f2ed6cd..34e0d7e5584c 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -327,7 +327,7 @@ private: ScDocShell* pDocShell; ScDDELinkObj* GetObjectByIndex_Impl(sal_Int32 nIndex); - ScDDELinkObj* GetObjectByName_Impl(const OUString& aName); + ScDDELinkObj* GetObjectByName_Impl(std::u16string_view aName); public: ScDDELinksObj(ScDocShell* pDocSh); diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx index ba3ac290153a..b71ceb4cc3f6 100644 --- a/sc/inc/userlist.hxx +++ b/sc/inc/userlist.hxx @@ -78,7 +78,7 @@ public: const ScUserListData* GetData(const OUString& rSubStr) const; /// If the list in rStr is already inserted - bool HasEntry(const OUString& rStr) const; + bool HasEntry(std::u16string_view rStr) const; const ScUserListData& operator[](size_t nIndex) const; ScUserListData& operator[](size_t nIndex); diff --git a/sc/qa/unit/pivottable_filters_test.cxx b/sc/qa/unit/pivottable_filters_test.cxx index 49248230ee28..6322c9a809d4 100644 --- a/sc/qa/unit/pivottable_filters_test.cxx +++ b/sc/qa/unit/pivottable_filters_test.cxx @@ -320,7 +320,7 @@ void ScPivotTableFiltersTest::testPivotTableNamedRangeSourceODS() namespace { bool checkVisiblePageFieldMember(const ScDPSaveDimension::MemberList& rMembers, - const OUString& rVisibleMember) + std::u16string_view rVisibleMember) { bool bFound = false; for (const ScDPSaveMember* pMem : rMembers) @@ -356,23 +356,23 @@ void ScPivotTableFiltersTest::testPivotTableSharedCacheGroupODS() CPPUNIT_ASSERT_MESSAGE("There should be a pivot table here.", pDPObj); ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT_MESSAGE("Save data is expected.", pSaveData); - ScDPSaveDimension* pDim = pSaveData->GetExistingDimensionByName("Project Name"); + ScDPSaveDimension* pDim = pSaveData->GetExistingDimensionByName(u"Project Name"); CPPUNIT_ASSERT_MESSAGE("Failed to get page field named 'Project Name'.", pDim); const ScDPSaveDimension::MemberList* pMembers = &pDim->GetMembers(); CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(14), pMembers->size()); CPPUNIT_ASSERT_MESSAGE("Incorrect member visibility.", - checkVisiblePageFieldMember(*pMembers, "APL-01-1")); + checkVisiblePageFieldMember(*pMembers, u"APL-01-1")); pDPObj = rDoc.GetDPAtCursor(0, 1, 2); // A2 on 3rd sheet CPPUNIT_ASSERT_MESSAGE("There should be a pivot table here.", pDPObj); pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT_MESSAGE("Save data is expected.", pSaveData); - pDim = pSaveData->GetExistingDimensionByName("Project Name"); + pDim = pSaveData->GetExistingDimensionByName(u"Project Name"); CPPUNIT_ASSERT_MESSAGE("Failed to get page field named 'Project Name'.", pDim); pMembers = &pDim->GetMembers(); CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(14), pMembers->size()); CPPUNIT_ASSERT_MESSAGE("Incorrect member visibility.", - checkVisiblePageFieldMember(*pMembers, "VEN-01-1")); + checkVisiblePageFieldMember(*pMembers, u"VEN-01-1")); // These two pivot tables share the same data range. We should only have // one pivot cache. @@ -389,7 +389,7 @@ void ScPivotTableFiltersTest::testPivotTableSharedCacheGroupODS() CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(9), pCache->GetFieldCount()); CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), pCache->GetGroupFieldCount()); - SCCOL nDim = pCache->GetDimensionIndex("StartDate"); + SCCOL nDim = pCache->GetDimensionIndex(u"StartDate"); CPPUNIT_ASSERT_MESSAGE("Dimension 'StartDate' doesn't exist in the cache.", nDim >= 0); sal_Int32 nGrpType = pCache->GetGroupType(nDim); CPPUNIT_ASSERT_EQUAL(sheet::DataPilotFieldGroupBy::DAYS, nGrpType); @@ -1490,7 +1490,7 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilter() CPPUNIT_ASSERT(pDPObj); ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Double field1"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Double field1"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1515,7 +1515,7 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilter() CPPUNIT_ASSERT(pDPObj); ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Double field2"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Double field2"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1540,7 +1540,7 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilter() CPPUNIT_ASSERT(pDPObj); ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Double field3"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Double field3"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1581,7 +1581,7 @@ void ScPivotTableFiltersTest::testPivotTableStringFieldFilter() CPPUNIT_ASSERT(pDPObj); ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Country"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Country"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1616,7 +1616,7 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilter() CPPUNIT_ASSERT(pSaveData); { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Date"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Date"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1636,7 +1636,7 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilter() } { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Date2"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Date2"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1656,7 +1656,7 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilter() } { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Date3"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Date3"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1697,7 +1697,7 @@ void ScPivotTableFiltersTest::testPivotTableBoolFieldFilter() ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Bool field"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Bool field"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1733,7 +1733,7 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter() // Row field { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Order ID"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Order ID"); CPPUNIT_ASSERT(pSaveDim); CPPUNIT_ASSERT_EQUAL(sheet::DataPilotFieldOrientation_ROW, pSaveDim->GetOrientation()); @@ -1752,7 +1752,7 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter() // Column field { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Double2 field"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Double2 field"); CPPUNIT_ASSERT(pSaveDim); CPPUNIT_ASSERT_EQUAL(sheet::DataPilotFieldOrientation_COLUMN, pSaveDim->GetOrientation()); @@ -1771,7 +1771,7 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter() // Page field { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Double3 field"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Double3 field"); CPPUNIT_ASSERT(pSaveDim); CPPUNIT_ASSERT_EQUAL(sheet::DataPilotFieldOrientation_PAGE, pSaveDim->GetOrientation()); @@ -1790,7 +1790,7 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter() // Hidden field { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Double4 field"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Double4 field"); CPPUNIT_ASSERT(pSaveDim); CPPUNIT_ASSERT_EQUAL(sheet::DataPilotFieldOrientation_HIDDEN, pSaveDim->GetOrientation()); @@ -1829,7 +1829,7 @@ void ScPivotTableFiltersTest::testPivotTableEmptyItem() ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Category"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Category"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1868,7 +1868,7 @@ void ScPivotTableFiltersTest::testPivotTablePageFieldFilter() // Only one item is selected (an empty item) { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Product"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Product"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); @@ -1885,7 +1885,7 @@ void ScPivotTableFiltersTest::testPivotTablePageFieldFilter() // More items are selected, but not all { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Category"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Category"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1903,7 +1903,7 @@ void ScPivotTableFiltersTest::testPivotTablePageFieldFilter() // All items are selected { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Order ID"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Order ID"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1921,7 +1921,7 @@ void ScPivotTableFiltersTest::testPivotTablePageFieldFilter() // Only one item is selected (a non-empty item) { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Country"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Country"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -1986,7 +1986,7 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilterXLSX() CPPUNIT_ASSERT(pDPObj); ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Double field1"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Double field1"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -2011,7 +2011,7 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilterXLSX() CPPUNIT_ASSERT(pDPObj); ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Double field2"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Double field2"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -2036,7 +2036,7 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilterXLSX() CPPUNIT_ASSERT(pDPObj); ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Double field3"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Double field3"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -2077,7 +2077,7 @@ void ScPivotTableFiltersTest::testPivotTableStringFieldFilterXLSX() CPPUNIT_ASSERT(pDPObj); ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Country"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Country"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -2112,7 +2112,7 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilterXLSX() CPPUNIT_ASSERT(pSaveData); { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Date"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Date"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -2128,7 +2128,7 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilterXLSX() } { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Date2"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Date2"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -2144,7 +2144,7 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilterXLSX() } { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Date3"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Date3"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -2181,7 +2181,7 @@ void ScPivotTableFiltersTest::testPivotTableBoolFieldFilterXLSX() ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Bool field"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Bool field"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); @@ -2217,7 +2217,7 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilterXLSX() // Row field { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Order ID"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Order ID"); CPPUNIT_ASSERT(pSaveDim); CPPUNIT_ASSERT_EQUAL(sheet::DataPilotFieldOrientation_ROW, pSaveDim->GetOrientation()); @@ -2236,7 +2236,7 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilterXLSX() // Column field { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Double2 field"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Double2 field"); CPPUNIT_ASSERT(pSaveDim); CPPUNIT_ASSERT_EQUAL(sheet::DataPilotFieldOrientation_COLUMN, pSaveDim->GetOrientation()); @@ -2255,7 +2255,7 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilterXLSX() // Page field { - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("Double3 field"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"Double3 field"); CPPUNIT_ASSERT(pSaveDim); CPPUNIT_ASSERT_EQUAL(sheet::DataPilotFieldOrientation_PAGE, pSaveDim->GetOrientation()); @@ -2314,7 +2314,7 @@ void ScPivotTableFiltersTest::testPivotTableErrorItemFilterXLSX() ScDPSaveData* pSaveData = pDPObj->GetSaveData(); CPPUNIT_ASSERT(pSaveData); - ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName("b"); + ScDPSaveDimension* pSaveDim = pSaveData->GetExistingDimensionByName(u"b"); CPPUNIT_ASSERT(pSaveDim); const ScDPSaveDimension::MemberList& rMembers = pSaveDim->GetMembers(); CPPUNIT_ASSERT_EQUAL(size_t(4), rMembers.size()); diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index f9e6e1f3ebb5..36d85d8f2343 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -2817,7 +2817,7 @@ void ScExportTest::testTrackChangesSimpleXLSX() return true; } - bool checkRevisionUserAndTime( ScDocument& rDoc, const OUString& rOwnerName ) + bool checkRevisionUserAndTime( ScDocument& rDoc, std::u16string_view rOwnerName ) { ScChangeTrack* pCT = rDoc.GetChangeTrack(); if (!pCT) diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index f5da5620744c..774f3eb7069a 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -6647,7 +6647,7 @@ void Test::testEmptyCalcDocDefaults() CPPUNIT_ASSERT_EQUAL( false, m_pDoc->HasManualBreaks(tab) ); } -ScDocShell* Test::findLoadedDocShellByName(const OUString& rName) +ScDocShell* Test::findLoadedDocShellByName(std::u16string_view rName) { ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>, false)); while (pShell) diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx index 40ef0d2898a0..e72e2e94128d 100644 --- a/sc/qa/unit/ucalc.hxx +++ b/sc/qa/unit/ucalc.hxx @@ -43,7 +43,7 @@ public: sal_uInt16 mnIndex; }; - static ScDocShell* findLoadedDocShellByName(const OUString& rName); + static ScDocShell* findLoadedDocShellByName(std::u16string_view rName); static bool insertRangeNames(ScDocument* pDoc, ScRangeName* pNames, const RangeNameDef* p, const RangeNameDef* pEnd); static void printRange(ScDocument* pDoc, const ScRange& rRange, const char* pCaption); diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx index 54a4e85d6dcf..00bb90dfe2c2 100644 --- a/sc/qa/unit/ucalc_pivottable.cxx +++ b/sc/qa/unit/ucalc_pivottable.cxx @@ -1629,7 +1629,7 @@ void Test::testPivotTableTextNumber() // Set the Name dimension to page dimension. pDPObj->BuildAllDimensionMembers(); ScDPSaveData aSaveData(*pDPObj->GetSaveData()); - ScDPSaveDimension* pDim = aSaveData.GetExistingDimensionByName("Name"); + ScDPSaveDimension* pDim = aSaveData.GetExistingDimensionByName(u"Name"); CPPUNIT_ASSERT(pDim); pDim->SetOrientation(sheet::DataPilotFieldOrientation_PAGE); OUString aVisiblePage("0004"); @@ -2407,9 +2407,9 @@ void Test::testPivotTableDPCollection() CPPUNIT_ASSERT_EQUAL_MESSAGE("there should be no DP table", size_t(0), pDPs->GetCount()); CPPUNIT_ASSERT_EQUAL_MESSAGE("should return nullptr", - static_cast<ScDPObject*>(nullptr), pDPs->GetByName("DP1")); + static_cast<ScDPObject*>(nullptr), pDPs->GetByName(u"DP1")); CPPUNIT_ASSERT_EQUAL_MESSAGE("should return nullptr", - static_cast<ScDPObject*>(nullptr), pDPs->GetByName("")); + static_cast<ScDPObject*>(nullptr), pDPs->GetByName(u"")); // Add 2 DP objects ScDPObject* pDPObj = createDPFromRange(m_pDoc, aDataRange , aFields, nFieldCount, false); @@ -2424,36 +2424,36 @@ void Test::testPivotTableDPCollection() CPPUNIT_ASSERT_EQUAL_MESSAGE("there should be two DP tables", size_t(2), pDPs->GetCount()); CPPUNIT_ASSERT_EQUAL_MESSAGE("should return first DPObject", - pDPObj, pDPs->GetByName("DP1")); + pDPObj, pDPs->GetByName(u"DP1")); CPPUNIT_ASSERT_EQUAL_MESSAGE("should return second DPObject", - pDPObj2, pDPs->GetByName("DP2")); + pDPObj2, pDPs->GetByName(u"DP2")); CPPUNIT_ASSERT_EQUAL_MESSAGE("empty string should return nullptr", - static_cast<ScDPObject*>(nullptr), pDPs->GetByName("")); + static_cast<ScDPObject*>(nullptr), pDPs->GetByName(u"")); CPPUNIT_ASSERT_EQUAL_MESSAGE("non existent name should return nullptr", - static_cast<ScDPObject*>(nullptr), pDPs->GetByName("Non")); + static_cast<ScDPObject*>(nullptr), pDPs->GetByName(u"Non")); // Remove first DP Object pDPs->FreeTable(pDPObj); CPPUNIT_ASSERT_EQUAL_MESSAGE("there should be only one DP table", size_t(1), pDPs->GetCount()); CPPUNIT_ASSERT_EQUAL_MESSAGE("first DP object was deleted, should return nullptr", - static_cast<ScDPObject*>(nullptr), pDPs->GetByName("DP1")); + static_cast<ScDPObject*>(nullptr), pDPs->GetByName(u"DP1")); CPPUNIT_ASSERT_EQUAL_MESSAGE("should return second DPObject", - pDPObj2, pDPs->GetByName("DP2")); + pDPObj2, pDPs->GetByName(u"DP2")); CPPUNIT_ASSERT_EQUAL_MESSAGE("empty string should return nullptr", - static_cast<ScDPObject*>(nullptr), pDPs->GetByName("")); + static_cast<ScDPObject*>(nullptr), pDPs->GetByName(u"")); CPPUNIT_ASSERT_EQUAL_MESSAGE("non existent name should return nullptr", - static_cast<ScDPObject*>(nullptr), pDPs->GetByName("Non")); + static_cast<ScDPObject*>(nullptr), pDPs->GetByName(u"Non")); // Remove second DP Object pDPs->FreeTable(pDPObj2); CPPUNIT_ASSERT_EQUAL_MESSAGE("first DP object was deleted, should return nullptr", - static_cast<ScDPObject*>(nullptr), pDPs->GetByName("DP1")); + static_cast<ScDPObject*>(nullptr), pDPs->GetByName(u"DP1")); CPPUNIT_ASSERT_EQUAL_MESSAGE("second DP object was deleted, should return nullptr", - static_cast<ScDPObject*>(nullptr), pDPs->GetByName("DP2")); + static_cast<ScDPObject*>(nullptr), pDPs->GetByName(u"DP2")); CPPUNIT_ASSERT_EQUAL_MESSAGE("empty string should return nullptr", - static_cast<ScDPObject*>(nullptr), pDPs->GetByName("")); + static_cast<ScDPObject*>(nullptr), pDPs->GetByName(u"")); CPPUNIT_ASSERT_EQUAL_MESSAGE("non existent name should return nullptr", - static_cast<ScDPObject*>(nullptr), pDPs->GetByName("Non")); + static_cast<ScDPObject*>(nullptr), pDPs->GetByName(u"Non")); // Clean-up m_pDoc->DeleteTab(1); diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index f71946688f6f..11e74fa258db 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1992,7 +1992,7 @@ void ScConditionalFormat::DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR maRanges.DeleteArea( nCol1, nRow1, nTab, nCol2, nRow2, nTab ); } -void ScConditionalFormat::RenameCellStyle(const OUString& rOld, const OUString& rNew) +void ScConditionalFormat::RenameCellStyle(std::u16string_view rOld, const OUString& rNew) { for(const auto& rxEntry : maEntries) if(rxEntry->GetType() == ScFormatEntry::Type::Condition || @@ -2156,7 +2156,7 @@ void ScConditionalFormatList::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) } } -void ScConditionalFormatList::RenameCellStyle( const OUString& rOld, const OUString& rNew ) +void ScConditionalFormatList::RenameCellStyle( std::u16string_view rOld, const OUString& rNew ) { for (auto const& it : m_ConditionalFormats) { diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index a4691f69ef81..f49f99bd0c69 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -358,7 +358,7 @@ void ScDocumentPool::StyleDeleted( const ScStyleSheet* pStyle ) } } -void ScDocumentPool::CellStyleCreated( const OUString& rName, const ScDocument& rDoc ) +void ScDocumentPool::CellStyleCreated( std::u16string_view rName, const ScDocument& rDoc ) { // If a style was created, don't keep any pattern with its name string in the pool, // because it would compare equal to a pattern with a pointer to the new style. diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index c2adce1c3ae7..944ca8c75982 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -546,8 +546,8 @@ void ScDocument::SetLink( SCTAB nTab, ScLinkMode nMode, const OUString& rDoc, maTabs[nTab]->SetLink( nMode, rDoc, rFilter, rOptions, rTabName, nRefreshDelay ); } -bool ScDocument::HasLink( const OUString& rDoc, - const OUString& rFilter, const OUString& rOptions ) const +bool ScDocument::HasLink( std::u16string_view rDoc, + std::u16string_view rFilter, std::u16string_view rOptions ) const { SCTAB nCount = static_cast<SCTAB>(maTabs.size()); for (SCTAB i=0; i<nCount; i++) diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index 33d0d74703b0..1933601aa7db 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -134,7 +134,7 @@ void ScDocument::UpdateChartArea( const OUString& rChartName, UpdateChartArea( rChartName, aRLR, bColHeaders, bRowHeaders, bAdd ); } -uno::Reference< chart2::XChartDocument > ScDocument::GetChartByName( const OUString& rChartName ) +uno::Reference< chart2::XChartDocument > ScDocument::GetChartByName( std::u16string_view rChartName ) { uno::Reference< chart2::XChartDocument > xReturn; @@ -164,7 +164,7 @@ uno::Reference< chart2::XChartDocument > ScDocument::GetChartByName( const OUStr return xReturn; } -void ScDocument::GetChartRanges( const OUString& rChartName, ::std::vector< ScRangeList >& rRangesVector, const ScDocument& rSheetNameDoc ) +void ScDocument::GetChartRanges( std::u16string_view rChartName, ::std::vector< ScRangeList >& rRangesVector, const ScDocument& rSheetNameDoc ) { rRangesVector.clear(); uno::Reference< chart2::XChartDocument > xChartDoc( GetChartByName( rChartName ) ); @@ -181,7 +181,7 @@ void ScDocument::GetChartRanges( const OUString& rChartName, ::std::vector< ScRa } } -void ScDocument::SetChartRanges( const OUString& rChartName, const ::std::vector< ScRangeList >& rRangesVector ) +void ScDocument::SetChartRanges( std::u16string_view rChartName, const ::std::vector< ScRangeList >& rRangesVector ) { uno::Reference< chart2::XChartDocument > xChartDoc( GetChartByName( rChartName ) ); if ( !xChartDoc.is() ) @@ -199,7 +199,7 @@ void ScDocument::SetChartRanges( const OUString& rChartName, const ::std::vector ScChartHelper::SetChartRanges( xChartDoc, aRangeStrings ); } -void ScDocument::GetOldChartParameters( const OUString& rName, +void ScDocument::GetOldChartParameters( std::u16string_view rName, ScRangeList& rRanges, bool& rColHeaders, bool& rRowHeaders ) { // used for undo of changing chart source area @@ -479,7 +479,7 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode, } } -void ScDocument::SetChartRangeList( const OUString& rChartName, +void ScDocument::SetChartRangeList( std::u16string_view rChartName, const ScRangeListRef& rNewRangeListRef ) { // called from ChartListener @@ -533,7 +533,7 @@ bool ScDocument::HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ) } uno::Reference< embed::XEmbeddedObject > - ScDocument::FindOleObjectByName( const OUString& rName ) + ScDocument::FindOleObjectByName( std::u16string_view rName ) { if (!mpDrawLayer) return uno::Reference< embed::XEmbeddedObject >(); diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 3e09e16656ab..e4cb29e8fae7 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -292,7 +292,7 @@ void ScDocument::CopyStdStylesFrom( const ScDocument& rSrcDoc ) mxPoolHelper->GetStylePool()->CopyStdStylesFrom( rSrcDoc.mxPoolHelper->GetStylePool() ); } -void ScDocument::InvalidateTextWidth( const OUString& rStyleName ) +void ScDocument::InvalidateTextWidth( std::u16string_view rStyleName ) { const SCTAB nCount = GetTableCount(); for ( SCTAB i=0; i<nCount && maTabs[i]; i++ ) @@ -307,7 +307,7 @@ void ScDocument::InvalidateTextWidth( SCTAB nTab ) InvalidateTextWidth( &aAdrFrom, &aAdrTo, false ); } -bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab ) +bool ScDocument::IsPageStyleInUse( std::u16string_view rStrPageStyle, SCTAB* pInTab ) { bool bInUse = false; const SCTAB nCount = GetTableCount(); @@ -322,7 +322,7 @@ bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab return bInUse; } -bool ScDocument::RemovePageStyleInUse( const OUString& rStyle ) +bool ScDocument::RemovePageStyleInUse( std::u16string_view rStyle ) { bool bWasInUse = false; const SCTAB nCount = GetTableCount(); @@ -337,7 +337,7 @@ bool ScDocument::RemovePageStyleInUse( const OUString& rStyle ) return bWasInUse; } -bool ScDocument::RenamePageStyleInUse( const OUString& rOld, const OUString& rNew ) +bool ScDocument::RenamePageStyleInUse( std::u16string_view rOld, const OUString& rNew ) { bool bWasInUse = false; const SCTAB nCount = GetTableCount(); @@ -903,7 +903,7 @@ namespace { @return The DDE link, if it exists, otherwise 0. */ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, - const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, + std::u16string_view rAppl, std::u16string_view rTopic, std::u16string_view rItem, sal_uInt8 nMode, size_t* pnDdePos = nullptr ) { if( pLinkManager ) @@ -954,7 +954,7 @@ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, size_t nDdePos } // namespace -bool ScDocument::FindDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem, +bool ScDocument::FindDdeLink( std::u16string_view rAppl, std::u16string_view rTopic, std::u16string_view rItem, sal_uInt8 nMode, size_t& rnDdePos ) { return lclGetDdeLink( GetLinkManager(), rAppl, rTopic, rItem, nMode, &rnDdePos ) != nullptr; diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 02fc414e2642..d16ceb957c61 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -1084,7 +1084,7 @@ tools::Long ScDPCache::GetDimMemberCount(tools::Long nDim) const return maFields[nDim]->maItems.size(); } -SCCOL ScDPCache::GetDimensionIndex(const OUString& sName) const +SCCOL ScDPCache::GetDimensionIndex(std::u16string_view sName) const { for (size_t i = 1; i < maLabelNames.size(); ++i) { diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index e2ef44e785bd..b2b5b4681306 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -493,7 +493,7 @@ void ScDPGroupTableData::SetNumGroupDimension( sal_Int32 nIndex, const ScDPNumGr } } -sal_Int32 ScDPGroupTableData::GetDimensionIndex( const OUString& rName ) +sal_Int32 ScDPGroupTableData::GetDimensionIndex( std::u16string_view rName ) { for (tools::Long i = 0; i < nSourceCount; ++i) // nSourceCount excludes data layout if (pSourceData->getDimensionName(i) == rName) //TODO: ignore case? diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 74a99790422a..ba1a8f4d398e 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1426,7 +1426,7 @@ void ScDPObject::GetMemberResultNames(ScDPUniqueStringSet& rNames, tools::Long n pOutput->GetMemberResultNames(rNames, nDimension); // used only with table data -> level not needed } -OUString ScDPObject::GetFormattedString(const OUString& rDimName, const double fValue) +OUString ScDPObject::GetFormattedString(std::u16string_view rDimName, const double fValue) { ScDPTableData* pTableData = GetTableData(); if(!pTableData) @@ -3689,7 +3689,7 @@ const ScDPObject& ScDPCollection::operator [](size_t nIndex) const return *maTables[nIndex]; } -ScDPObject* ScDPCollection::GetByName(const OUString& rName) const +ScDPObject* ScDPCollection::GetByName(std::u16string_view rName) const { for (std::unique_ptr<ScDPObject> const & pObject : maTables) { @@ -3872,7 +3872,7 @@ void ScDPCollection::GetAllTables(const ScRange& rSrcRange, o3tl::sorted_vector< rRefs.swap(aRefs); } -void ScDPCollection::GetAllTables(const OUString& rSrcName, o3tl::sorted_vector<ScDPObject*>& rRefs) const +void ScDPCollection::GetAllTables(std::u16string_view rSrcName, o3tl::sorted_vector<ScDPObject*>& rRefs) const { o3tl::sorted_vector<ScDPObject*> aRefs; for (const auto& rxTable : maTables) @@ -3901,7 +3901,7 @@ void ScDPCollection::GetAllTables(const OUString& rSrcName, o3tl::sorted_vector< } void ScDPCollection::GetAllTables( - sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand, + sal_Int32 nSdbType, std::u16string_view rDBName, std::u16string_view rCommand, o3tl::sorted_vector<ScDPObject*>& rRefs) const { o3tl::sorted_vector<ScDPObject*> aRefs; diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 95bd2a84985f..cb8e56e6d6fa 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -842,7 +842,7 @@ ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const OUString& rName) return AppendNewDimension(rName, false); } -ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const OUString& rName) const +ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(std::u16string_view rName) const { for (auto const& iter : m_DimList) { @@ -882,7 +882,7 @@ ScDPSaveDimension* ScDPSaveData::GetExistingDataLayoutDimension() const return nullptr; } -ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const OUString& rName) +ScDPSaveDimension* ScDPSaveData::DuplicateDimension(std::u16string_view rName) { // always insert new @@ -1292,7 +1292,7 @@ void ScDPSaveData::SyncAllDimensionMembers(ScDPTableData* pData) } } -bool ScDPSaveData::HasInvisibleMember(const OUString& rDimName) const +bool ScDPSaveData::HasInvisibleMember(std::u16string_view rDimName) const { ScDPSaveDimension* pDim = GetExistingDimensionByName(rDimName); if (!pDim) diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 56f5256929a0..b57bf76dcb96 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -310,7 +310,7 @@ void ScDPSource::SetDupCount( tools::Long nNew ) nDupCount = nNew; } -ScDPDimension* ScDPSource::AddDuplicated(const OUString& rNewName) +ScDPDimension* ScDPSource::AddDuplicated(std::u16string_view rNewName) { OSL_ENSURE( pDimensions.is(), "AddDuplicated without dimensions?" ); diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 3901434df913..477eefead496 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -2055,7 +2055,7 @@ OUString ScDrawLayer::GetVisibleName( const SdrObject* pObj ) return aName; } -static bool IsNamedObject( const SdrObject* pObj, const OUString& rName ) +static bool IsNamedObject( const SdrObject* pObj, std::u16string_view rName ) { // sal_True if rName is the object's Name or PersistName // (used to find a named object) @@ -2065,7 +2065,7 @@ static bool IsNamedObject( const SdrObject* pObj, const OUString& rName ) static_cast<const SdrOle2Obj*>(pObj)->GetPersistName() == rName ) ); } -SdrObject* ScDrawLayer::GetNamedObject( const OUString& rName, sal_uInt16 nId, SCTAB& rFoundTab ) const +SdrObject* ScDrawLayer::GetNamedObject( std::u16string_view rName, sal_uInt16 nId, SCTAB& rFoundTab ) const { sal_uInt16 nTabCount = GetPageCount(); for (sal_uInt16 nTab=0; nTab<nTabCount; nTab++) diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index fba985930b78..aa6e15111808 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -595,7 +595,7 @@ bool ScUnoAddInCollection::GetCalcName( const OUString& rExcelName, OUString& rR return false; } -static bool IsTypeName( const OUString& rName, const uno::Type& rType ) +static bool IsTypeName( std::u16string_view rName, const uno::Type& rType ) { return rName == rType.getTypeName(); } @@ -930,7 +930,7 @@ static void lcl_UpdateFunctionList( const ScFunctionList& rFunctionList, const S } } -static const ScAddInArgDesc* lcl_FindArgDesc( const ScUnoAddInFuncData& rFuncData, const OUString& rArgIntName ) +static const ScAddInArgDesc* lcl_FindArgDesc( const ScUnoAddInFuncData& rFuncData, std::u16string_view rArgIntName ) { tools::Long nArgCount = rFuncData.GetArgumentCount(); const ScAddInArgDesc* pArguments = rFuncData.GetArguments(); diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index f7fd4a96fbd0..f917e40acae2 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2708,7 +2708,7 @@ void ScInterpreter::ScStyle() } static ScDdeLink* lcl_GetDdeLink( const sfx2::LinkManager* pLinkMgr, - const OUString& rA, const OUString& rT, const OUString& rI, sal_uInt8 nM ) + std::u16string_view rA, std::u16string_view rT, std::u16string_view rI, sal_uInt8 nM ) { size_t nCount = pLinkMgr->GetLinks().size(); for (size_t i=0; i<nCount; i++ ) diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx index b615830e4e56..fbc403db56a7 100644 --- a/sc/source/core/tool/interpr7.cxx +++ b/sc/source/core/tool/interpr7.cxx @@ -241,7 +241,7 @@ void ScInterpreter::ScFilterXML() } } -static ScWebServiceLink* lcl_GetWebServiceLink(const sfx2::LinkManager* pLinkMgr, const OUString& rURL) +static ScWebServiceLink* lcl_GetWebServiceLink(const sfx2::LinkManager* pLinkMgr, std::u16string_view rURL) { size_t nCount = pLinkMgr->GetLinks().size(); for (size_t i=0; i<nCount; ++i) diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx index 6d68545e3284..4facfde96b8f 100644 --- a/sc/source/core/tool/userlist.cxx +++ b/sc/source/core/tool/userlist.cxx @@ -325,7 +325,7 @@ bool ScUserList::operator!=( const ScUserList& r ) const return !operator==( r ); } -bool ScUserList::HasEntry( const OUString& rStr ) const +bool ScUserList::HasEntry( std::u16string_view rStr ) const { return ::std::any_of(maData.begin(), maData.end(), [&] (std::unique_ptr<ScUserListData> const& pData) diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 95ece38d976d..0b1f109f665c 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -1953,7 +1953,7 @@ bool XclExpChSeries::ConvertDataSeries( } bool XclExpChSeries::ConvertStockSeries( css::uno::Reference< css::chart2::XDataSeries > const & xDataSeries, - const OUString& rValueRole, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol ) + std::u16string_view rValueRole, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol ) { bool bOk = false; Reference< XDataSource > xDataSource( xDataSeries, UNO_QUERY ); @@ -2569,7 +2569,7 @@ void XclExpChTypeGroup::CreateAllStockSeries( } bool XclExpChTypeGroup::CreateStockSeries( Reference< XDataSeries > const & xDataSeries, - const OUString& rValueRole, bool bCloseSymbol ) + std::u16string_view rValueRole, bool bCloseSymbol ) { bool bOk = false; // let chart create series object with correct series index diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 644c7a57a35f..d8b3a954f278 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -137,7 +137,7 @@ public: sal_uInt16 InsertEuroTool( const OUString& rName ); /** Inserts a DDE link. @return The 1-based (Excel-like) list index of the DDE link. */ - sal_uInt16 InsertDde( const OUString& rApplic, const OUString& rTopic, const OUString& rItem ); + sal_uInt16 InsertDde( std::u16string_view rApplic, std::u16string_view rTopic, const OUString& rItem ); sal_uInt16 InsertExtName( const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ); @@ -148,7 +148,7 @@ public: private: /** Returns the 1-based (Excel-like) list index of the external name or 0, if not found. */ - sal_uInt16 GetIndex( const OUString& rName ) const; + sal_uInt16 GetIndex( std::u16string_view rName ) const; /** Appends the passed newly crested external name. @return The 1-based (Excel-like) list index of the appended name. */ sal_uInt16 AppendNew( XclExpExtNameBase* pExtName ); @@ -300,9 +300,9 @@ public: explicit XclExpSupbook( const XclExpRoot& rRoot, const OUString& rApplic, const OUString& rTopic ); /** Returns true, if this SUPBOOK contains the passed URL of an external document. */ - bool IsUrlLink( const OUString& rUrl ) const; + bool IsUrlLink( std::u16string_view rUrl ) const; /** Returns true, if this SUPBOOK contains the passed DDE link. */ - bool IsDdeLink( const OUString& rApplic, const OUString& rTopic ) const; + bool IsDdeLink( std::u16string_view rApplic, std::u16string_view rTopic ) const; /** Fills the passed reference log entry with the URL and sheet names. */ void FillRefLogEntry( XclExpRefLogEntry& rRefLogEntry, sal_uInt16 nFirstSBTab, sal_uInt16 nLastSBTab ) const; @@ -460,13 +460,13 @@ private: @param rnIndex (out-param) Returns the list index, if the SUPBOOK exists. @return True, if the SUPBOOK record exists (out-parameters are valid). */ bool GetSupbookUrl( XclExpSupbookRef& rxSupbook, sal_uInt16& rnIndex, - const OUString& rUrl ) const; + std::u16string_view rUrl ) const; /** Searches for the SUPBOOK record containing the passed DDE link. @param rxSupbook (out-param) Returns a reference to the SUPBOOK record, or 0. @param rnIndex (out-param) Returns the list index, if the SUPBOOK exists. @return True, if the SUPBOOK record exists (out-parameters are valid). */ bool GetSupbookDde( XclExpSupbookRef& rxSupbook, sal_uInt16& rnIndex, - const OUString& rApplic, const OUString& rTopic ) const; + std::u16string_view rApplic, std::u16string_view rTopic ) const; /** Appends a new SUPBOOK to the list. @return The list index of the SUPBOOK record. */ @@ -1090,7 +1090,7 @@ sal_uInt16 XclExpExtNameBuffer::InsertEuroTool( const OUString& rName ) } sal_uInt16 XclExpExtNameBuffer::InsertDde( - const OUString& rApplic, const OUString& rTopic, const OUString& rItem ) + std::u16string_view rApplic, std::u16string_view rTopic, const OUString& rItem ) { sal_uInt16 nIndex = GetIndex( rItem ); if( nIndex == 0 ) @@ -1128,7 +1128,7 @@ void XclExpExtNameBuffer::SaveXml(XclExpXmlStream& rStrm) maNameList.SaveXml(rStrm); } -sal_uInt16 XclExpExtNameBuffer::GetIndex( const OUString& rName ) const +sal_uInt16 XclExpExtNameBuffer::GetIndex( std::u16string_view rName ) const { for( size_t nPos = 0, nSize = maNameList.GetSize(); nPos < nSize; ++nPos ) if( maNameList.GetRecord( nPos )->GetName() == rName ) @@ -1562,12 +1562,12 @@ XclExpSupbook::XclExpSupbook( const XclExpRoot& rRoot, const OUString& rApplic, SetRecSize( 2 + maUrlEncoded.GetSize() ); } -bool XclExpSupbook::IsUrlLink( const OUString& rUrl ) const +bool XclExpSupbook::IsUrlLink( std::u16string_view rUrl ) const { return (meType == XclSupbookType::Extern || meType == XclSupbookType::Eurotool) && (maUrl == rUrl); } -bool XclExpSupbook::IsDdeLink( const OUString& rApplic, const OUString& rTopic ) const +bool XclExpSupbook::IsDdeLink( std::u16string_view rApplic, std::u16string_view rTopic ) const { return (meType == XclSupbookType::Special) && (maUrl == rApplic) && (maDdeTopic == rTopic); } @@ -2127,7 +2127,7 @@ bool XclExpSupbookBuffer::HasExternalReferences() const } bool XclExpSupbookBuffer::GetSupbookUrl( - XclExpSupbookRef& rxSupbook, sal_uInt16& rnIndex, const OUString& rUrl ) const + XclExpSupbookRef& rxSupbook, sal_uInt16& rnIndex, std::u16string_view rUrl ) const { for( size_t nPos = 0, nSize = maSupbookList.GetSize(); nPos < nSize; ++nPos ) { @@ -2142,7 +2142,7 @@ bool XclExpSupbookBuffer::GetSupbookUrl( } bool XclExpSupbookBuffer::GetSupbookDde( XclExpSupbookRef& rxSupbook, - sal_uInt16& rnIndex, const OUString& rApplic, const OUString& rTopic ) const + sal_uInt16& rnIndex, std::u16string_view rApplic, std::u16string_view rTopic ) const { for( size_t nPos = 0, nSize = maSupbookList.GetSize(); nPos < nSize; ++nPos ) { diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 2a962da3e5ea..7f8ace82683f 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -130,9 +130,9 @@ XclExpPCItem::XclExpPCItem( bool bValue, const OUString& rText ) : SetBool( bValue, rText ); } -bool XclExpPCItem::EqualsText( const OUString& rText ) const +bool XclExpPCItem::EqualsText( std::u16string_view rText ) const { - return rText.isEmpty() ? IsEmpty() : (GetText() && (*GetText() == rText)); + return rText.empty() ? IsEmpty() : (GetText() && (*GetText() == rText)); } bool XclExpPCItem::EqualsDouble( double fValue ) const @@ -268,7 +268,7 @@ const XclExpPCItem* XclExpPCField::GetItem( sal_uInt16 nItemIdx ) const return GetVisItemList().GetRecord( nItemIdx ); } -sal_uInt16 XclExpPCField::GetItemIndex( const OUString& rItemName ) const +sal_uInt16 XclExpPCField::GetItemIndex( std::u16string_view rItemName ) const { const XclExpPCItemList& rItemList = GetVisItemList(); for( size_t nPos = 0, nSize = rItemList.GetSize(); nPos < nSize; ++nPos ) @@ -961,7 +961,7 @@ sal_uInt16 XclExpPTField::GetLastDataInfoIndex() const return static_cast< sal_uInt16 >( maDataInfoVec.size() - 1 ); } -sal_uInt16 XclExpPTField::GetItemIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const +sal_uInt16 XclExpPTField::GetItemIndex( std::u16string_view rName, sal_uInt16 nDefaultIdx ) const { for( size_t nPos = 0, nSize = maItemList.GetSize(); nPos < nSize; ++nPos ) if( maItemList.GetRecord( nPos )->GetItemName() == rName ) @@ -1144,7 +1144,7 @@ void XclExpPTField::Save( XclExpStream& rStrm ) // private -------------------------------------------------------------------- -XclExpPTItem* XclExpPTField::GetItemAcc( const OUString& rName ) +XclExpPTItem* XclExpPTField::GetItemAcc( std::u16string_view rName ) { XclExpPTItem* pItem = nullptr; for( size_t nPos = 0, nSize = maItemList.GetSize(); !pItem && (nPos < nSize); ++nPos ) @@ -1240,7 +1240,7 @@ const XclExpPTField* XclExpPivotTable::GetField( sal_uInt16 nFieldIdx ) const return (nFieldIdx == EXC_SXIVD_DATA) ? &maDataOrientField : maFieldList.GetRecord( nFieldIdx ); } -const XclExpPTField* XclExpPivotTable::GetField( const OUString& rName ) const +const XclExpPTField* XclExpPivotTable::GetField( std::u16string_view rName ) const { return const_cast< XclExpPivotTable* >( this )->GetFieldAcc( rName ); } @@ -1284,7 +1284,7 @@ void XclExpPivotTable::Save( XclExpStream& rStrm ) WriteSxViewEx9( rStrm ); } -XclExpPTField* XclExpPivotTable::GetFieldAcc( const OUString& rName ) +XclExpPTField* XclExpPivotTable::GetFieldAcc( std::u16string_view rName ) { XclExpPTField* pField = nullptr; for( size_t nPos = 0, nSize = maFieldList.GetSize(); !pField && (nPos < nSize); ++nPos ) diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 50a16a76cb99..11d1d753963a 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -287,7 +287,7 @@ void XclImpNameManager::ReadName( XclImpStream& rStrm ) maNameList.push_back( std::make_unique<XclImpName>( rStrm, static_cast< sal_uInt16 >( nCount + 1 ) ) ); } -const XclImpName* XclImpNameManager::FindName( const OUString& rXclName, SCTAB nScTab ) const +const XclImpName* XclImpNameManager::FindName( std::u16string_view rXclName, SCTAB nScTab ) const { const XclImpName* pGlobalName = nullptr; // a found global name const XclImpName* pLocalName = nullptr; // a found local name diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 5e45b4d07878..dd2b92b30d0c 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -713,7 +713,7 @@ public: /** Converts the passed data series for stock charts. */ bool ConvertStockSeries( css::uno::Reference< css::chart2::XDataSeries > const & xDataSeries, - const OUString& rValueRole, + std::u16string_view rValueRole, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol ); /** Converts the passed error bar settings (called at trend line child series). */ bool ConvertTrendLine( const XclExpChSeries& rParent, @@ -919,7 +919,7 @@ private: css::uno::Reference< css::chart2::XDataSeries > const & xDataSeries ); /** Creates a single data series of a stock chart. */ bool CreateStockSeries( css::uno::Reference< css::chart2::XDataSeries > const & xDataSeries, - const OUString& rValueRole, bool bCloseSymbol ); + std::u16string_view rValueRole, bool bCloseSymbol ); virtual void WriteBody( XclExpStream& rStrm ) override; diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index d508e7135c1d..2b6387550ff3 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -45,7 +45,7 @@ public: sal_uInt16 GetTypeFlag() const { return mnTypeFlag; } - bool EqualsText( const OUString& rText ) const; + bool EqualsText( std::u16string_view rText ) const; bool EqualsDouble( double fValue ) const; bool EqualsDateTime( const DateTime& rDateTime ) const; bool EqualsBool( bool bValue ) const; @@ -82,7 +82,7 @@ public: /** Returns the specified pivot cache item (returns visible items in groupings). */ const XclExpPCItem* GetItem( sal_uInt16 nItemIdx ) const; /** Returns the index of a pivot cache item, or EXC_PC_NOITEM on error. */ - sal_uInt16 GetItemIndex( const OUString& rItemName ) const; + sal_uInt16 GetItemIndex( std::u16string_view rItemName ) const; /** Returns the size an item index needs to write out. */ std::size_t GetIndexSize() const; @@ -268,7 +268,7 @@ public: /** Returns the list index of an item by its name. @param nDefaultIdx This value will be returned, if the item could not be found. */ - sal_uInt16 GetItemIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const; + sal_uInt16 GetItemIndex( std::u16string_view rName, sal_uInt16 nDefaultIdx ) const; // fill data -------------------------------------------------------------- @@ -292,7 +292,7 @@ public: private: /** Returns an item by its name. */ - XclExpPTItem* GetItemAcc( const OUString& rName ); + XclExpPTItem* GetItemAcc( std::u16string_view rName ); /** Appends a special item describing a field subtotal entry. */ void AppendSubtotalItem( sal_uInt16 nItemType ); @@ -330,7 +330,7 @@ public: /** Returns a pivot table field by its name. */ const XclExpPTField* GetField( sal_uInt16 nFieldIdx ) const; /** Returns a pivot table field by its name. */ - const XclExpPTField* GetField( const OUString& rName ) const; + const XclExpPTField* GetField( std::u16string_view rName ) const; /** Returns the data-field-only index of the first data field with the passed name. @param nDefaultIdx This value will be returned, if the field could not be found. */ @@ -341,7 +341,7 @@ public: private: /** Returns a pivot table field by its name. */ - XclExpPTField* GetFieldAcc( const OUString& rName ); + XclExpPTField* GetFieldAcc( std::u16string_view rName ); /** Returns a pivot table field corresponding to the passed save dimension. */ XclExpPTField* GetFieldAcc( const ScDPSaveDimension& rSaveDim ); diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index 658d81e195a3..f26d593c5c88 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -91,7 +91,7 @@ public: @param nScTab The sheet index for local names or SCTAB_MAX for global names. If no local name is found, tries to find a matching global name. @return Pointer to the defined name or 0 on error. */ - const XclImpName* FindName( const OUString& rXclName, SCTAB nScTab ) const; + const XclImpName* FindName( std::u16string_view rXclName, SCTAB nScTab ) const; /** Returns the defined name specified by its Excel index. @param nXclNameIdx The index of the internal defined name. diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 10d481913755..8f5508f65fd3 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -133,19 +133,19 @@ class XclRoot; #define EXC_CHPROP_WHITEDAY "WhiteDay" // data series roles -#define EXC_CHPROP_ROLE_CATEG "categories" -#define EXC_CHPROP_ROLE_ERRORBARS_NEGX "error-bars-x-negative" -#define EXC_CHPROP_ROLE_ERRORBARS_NEGY "error-bars-y-negative" -#define EXC_CHPROP_ROLE_ERRORBARS_POSX "error-bars-x-positive" -#define EXC_CHPROP_ROLE_ERRORBARS_POSY "error-bars-y-positive" -#define EXC_CHPROP_ROLE_LABEL "label" -#define EXC_CHPROP_ROLE_XVALUES "values-x" -#define EXC_CHPROP_ROLE_YVALUES "values-y" -#define EXC_CHPROP_ROLE_OPENVALUES "values-first" -#define EXC_CHPROP_ROLE_CLOSEVALUES "values-last" -#define EXC_CHPROP_ROLE_LOWVALUES "values-min" -#define EXC_CHPROP_ROLE_HIGHVALUES "values-max" -#define EXC_CHPROP_ROLE_SIZEVALUES "values-size" +#define EXC_CHPROP_ROLE_CATEG u"categories" +#define EXC_CHPROP_ROLE_ERRORBARS_NEGX u"error-bars-x-negative" +#define EXC_CHPROP_ROLE_ERRORBARS_NEGY u"error-bars-y-negative" +#define EXC_CHPROP_ROLE_ERRORBARS_POSX u"error-bars-x-positive" +#define EXC_CHPROP_ROLE_ERRORBARS_POSY u"error-bars-y-positive" +#define EXC_CHPROP_ROLE_LABEL u"label" +#define EXC_CHPROP_ROLE_XVALUES u"values-x" +#define EXC_CHPROP_ROLE_YVALUES u"values-y" +#define EXC_CHPROP_ROLE_OPENVALUES u"values-first" +#define EXC_CHPROP_ROLE_CLOSEVALUES u"values-last" +#define EXC_CHPROP_ROLE_LOWVALUES u"values-min" +#define EXC_CHPROP_ROLE_HIGHVALUES u"values-max" +#define EXC_CHPROP_ROLE_SIZEVALUES u"values-size" // Constants and Enumerations ================================================= diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 551cd1585a54..ca28b0ebf818 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -345,7 +345,7 @@ void IconSetRule::importFormula(const OUString& rFormula) namespace { -ScIconSetType getType(const OUString& rName) +ScIconSetType getType(std::u16string_view rName) { ScIconSetType eIconSetType = IconSet_3TrafficLights1; const ScIconSetMap* pIconSetMap = ScIconSetFormat::g_IconSetMap; diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 9d39c831afce..50c3722723f1 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -57,7 +57,7 @@ public: explicit CachedTokenArray( const ScDocument& rDoc ) : maCxt(rDoc, formula::FormulaGrammar::GRAM_OOXML) {} - Item* get( const ScAddress& rPos, const OUString& rFormula ) + Item* get( const ScAddress& rPos, std::u16string_view rFormula ) { // Check if a token array is cached for this column. ColCacheType::iterator it = maCache.find(rPos.Col()); diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 883e0cd90041..9ab1c550a14a 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -101,7 +101,7 @@ OUString lclBuildWebQueryTables( const WebPrModel::TablesVector& rTables ) Reference< XAreaLink > lclFindAreaLink( const Reference< XAreaLinks >& rxAreaLinks, const ScAddress& rDestPos, - const OUString& rFileUrl, const OUString& rTables, const OUString& rFilterName, const OUString& rFilterOptions ) + std::u16string_view rFileUrl, std::u16string_view rTables, std::u16string_view rFilterName, std::u16string_view rFilterOptions ) { try { @@ -252,7 +252,7 @@ void QueryTable::finalizeImport() sal_Int32 nRefreshPeriod = xConnection->getModel().mnInterval * 60; if( nRefreshPeriod > 0 ) { - PropertySet aPropSet( lclFindAreaLink( xAreaLinks, aDestRange.aStart, aFileUrl, aTables, aFilterName, /*aFilterOptions*/"" ) ); + PropertySet aPropSet( lclFindAreaLink( xAreaLinks, aDestRange.aStart, aFileUrl, aTables, aFilterName, /*aFilterOptions*/u"" ) ); aPropSet.setProperty( PROP_RefreshPeriod, nRefreshPeriod ); } } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 1f31e5d52c6d..41218fe5c227 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -880,7 +880,7 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const ScRange& aColumnHe void ScXMLExport::ExportExternalRefCacheStyles() { sal_Int32 nEntryIndex = GetCellStylesPropertySetMapper()->FindEntryIndex( - "NumberFormat", XML_NAMESPACE_STYLE, "data-style-name"); + "NumberFormat", XML_NAMESPACE_STYLE, u"data-style-name"); if (nEntryIndex < 0) // No entry index for the number format is found. @@ -929,7 +929,7 @@ namespace { void handleFont( std::vector<XMLPropertyState>& rPropStates, - const SfxPoolItem* p, const rtl::Reference<XMLPropertySetMapper>& xMapper, const OUString& rXMLName ) + const SfxPoolItem* p, const rtl::Reference<XMLPropertySetMapper>& xMapper, std::u16string_view rXMLName ) { sal_Int32 nEntryCount = xMapper->GetEntryCount(); @@ -977,13 +977,13 @@ const SvxFieldData* toXMLPropertyStates( switch (p->Which()) { case EE_CHAR_FONTINFO: - handleFont(rPropStates, p, xMapper, "font-name"); + handleFont(rPropStates, p, xMapper, u"font-name"); break; case EE_CHAR_FONTINFO_CJK: - handleFont(rPropStates, p, xMapper, "font-name-asian"); + handleFont(rPropStates, p, xMapper, u"font-name-asian"); break; case EE_CHAR_FONTINFO_CTL: - handleFont(rPropStates, p, xMapper, "font-name-complex"); + handleFont(rPropStates, p, xMapper, u"font-name-complex"); break; case EE_CHAR_WEIGHT: case EE_CHAR_WEIGHT_CJK: @@ -1018,23 +1018,23 @@ const SvxFieldData* toXMLPropertyStates( case EE_CHAR_UNDERLINE: { // Underline attribute needs to export multiple entries. - sal_Int32 nIndexStyle = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-underline-style", 0); + sal_Int32 nIndexStyle = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-underline-style", 0); if (nIndexStyle == -1 || nIndexStyle > nEntryCount) break; - sal_Int32 nIndexWidth = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-underline-width", 0); + sal_Int32 nIndexWidth = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-underline-width", 0); if (nIndexWidth == -1 || nIndexWidth > nEntryCount) break; - sal_Int32 nIndexType = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-underline-type", 0); + sal_Int32 nIndexType = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-underline-type", 0); if (nIndexType == -1 || nIndexType > nEntryCount) break; - sal_Int32 nIndexColor = xMapper->FindEntryIndex("CharUnderlineColor", XML_NAMESPACE_STYLE, "text-underline-color"); + sal_Int32 nIndexColor = xMapper->FindEntryIndex("CharUnderlineColor", XML_NAMESPACE_STYLE, u"text-underline-color"); if (nIndexColor == -1 || nIndexColor > nEntryCount) break; - sal_Int32 nIndexHasColor = xMapper->FindEntryIndex("CharUnderlineHasColor", XML_NAMESPACE_STYLE, "text-underline-color"); + sal_Int32 nIndexHasColor = xMapper->FindEntryIndex("CharUnderlineHasColor", XML_NAMESPACE_STYLE, u"text-underline-color"); if (nIndexHasColor == -1 || nIndexHasColor > nEntryCount) break; @@ -1054,23 +1054,23 @@ const SvxFieldData* toXMLPropertyStates( case EE_CHAR_OVERLINE: { // Same with overline. Do just as we do with underline attributes. - sal_Int32 nIndexStyle = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-overline-style", 0); + sal_Int32 nIndexStyle = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-overline-style", 0); if (nIndexStyle == -1 || nIndexStyle > nEntryCount) break; - sal_Int32 nIndexWidth = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-overline-width", 0); + sal_Int32 nIndexWidth = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-overline-width", 0); if (nIndexWidth == -1 || nIndexWidth > nEntryCount) break; - sal_Int32 nIndexType = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, "text-overline-type", 0); + sal_Int32 nIndexType = xMapper->GetEntryIndex(XML_NAMESPACE_STYLE, u"text-overline-type", 0); if (nIndexType == -1 || nIndexType > nEntryCount) break; - sal_Int32 nIndexColor = xMapper->FindEntryIndex("CharOverlineColor", XML_NAMESPACE_STYLE, "text-overline-color"); + sal_Int32 nIndexColor = xMapper->FindEntryIndex("CharOverlineColor", XML_NAMESPACE_STYLE, u"text-overline-color"); if (nIndexColor == -1 || nIndexColor > nEntryCount) break; - sal_Int32 nIndexHasColor = xMapper->FindEntryIndex("CharOverlineHasColor", XML_NAMESPACE_STYLE, "text-overline-color"); + sal_Int32 nIndexHasColor = xMapper->FindEntryIndex("CharOverlineHasColor", XML_NAMESPACE_STYLE, u"text-overline-color"); if (nIndexHasColor == -1 || nIndexHasColor > nEntryCount) break; @@ -1167,11 +1167,11 @@ const SvxFieldData* toXMLPropertyStates( break; case EE_CHAR_ESCAPEMENT: { - sal_Int32 nIndexEsc = xMapper->FindEntryIndex("CharEscapement", XML_NAMESPACE_STYLE, "text-position"); + sal_Int32 nIndexEsc = xMapper->FindEntryIndex("CharEscapement", XML_NAMESPACE_STYLE, u"text-position"); if (nIndexEsc == -1 || nIndexEsc > nEntryCount) break; - sal_Int32 nIndexEscHeight = xMapper->FindEntryIndex("CharEscapementHeight", XML_NAMESPACE_STYLE, "text-position"); + sal_Int32 nIndexEscHeight = xMapper->FindEntryIndex("CharEscapementHeight", XML_NAMESPACE_STYLE, u"text-position"); if (nIndexEscHeight == -1 || nIndexEscHeight > nEntryCount) break; @@ -1205,22 +1205,22 @@ const SvxFieldData* toXMLPropertyStates( switch (p->Which()) { case EE_CHAR_LANGUAGE: - nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_FO, "language", 0); - nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_FO, "country", 0); - nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_FO, "script", 0); - nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "rfc-language-tag", 0); + nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_FO, u"language", 0); + nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_FO, u"country", 0); + nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_FO, u"script", 0); + nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"rfc-language-tag", 0); break; case EE_CHAR_LANGUAGE_CJK: - nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "language-asian", 0); - nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "country-asian", 0); - nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "script-asian", 0); - nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "rfc-language-tag-asian", 0); + nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"language-asian", 0); + nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"country-asian", 0); + nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"script-asian", 0); + nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"rfc-language-tag-asian", 0); break; case EE_CHAR_LANGUAGE_CTL: - nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "language-complex", 0); - nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "country-complex", 0); - nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "script-complex", 0); - nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, "rfc-language-tag-complex", 0); + nIndexLanguage = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"language-complex", 0); + nIndexCountry = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"country-complex", 0); + nIndexScript = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"script-complex", 0); + nIndexTag = xMapper->GetEntryIndex( XML_NAMESPACE_STYLE, u"rfc-language-tag-complex", 0); break; default: nIndexLanguage = nIndexCountry = nIndexScript = nIndexTag = -1; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index e29112fab2b1..fb226b7c30ad 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1026,7 +1026,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const OUString& r return nKey; } -bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrentCurrency, const OUString& sBankSymbol) +bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrentCurrency, std::u16string_view sBankSymbol) { uno::Reference <util::XNumberFormatsSupplier> xNumberFormatsSupplier(GetNumberFormatsSupplier()); if (xNumberFormatsSupplier.is()) diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 910617027beb..daae1d3a98ed 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -355,7 +355,7 @@ public: ScMyStylesImportHelper* GetStylesImportHelper() { return pStylesImportHelper.get(); } sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const OUString& rCurrency); - bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrencySymbol, const OUString& sBankSymbol); + bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrencySymbol, std::u16string_view sBankSymbol); void SetType(const css::uno::Reference <css::beans::XPropertySet>& rProperties, sal_Int32& rNumberFormat, const sal_Int16 nCellType, diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index a55547cbc12b..42ec6f3e711e 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -986,7 +986,7 @@ void ScCheckListMenuControl::addMember(const OUString& rName, bool bVisible) maMembers.emplace_back(std::move(aMember)); } -std::unique_ptr<weld::TreeIter> ScCheckListMenuControl::FindEntry(const weld::TreeIter* pParent, const OUString& sNode) +std::unique_ptr<weld::TreeIter> ScCheckListMenuControl::FindEntry(const weld::TreeIter* pParent, std::u16string_view sNode) { std::unique_ptr<weld::TreeIter> xEntry = mpChecks->make_iterator(pParent); bool bEntry = pParent ? mpChecks->iter_children(*xEntry) : mpChecks->get_iter_first(*xEntry); @@ -1051,13 +1051,13 @@ std::unordered_set<OUString> ScCheckListMenuControl::GetAllChecked() return vResults; } -bool ScCheckListMenuControl::IsChecked(const OUString& sName, const weld::TreeIter* pParent) +bool ScCheckListMenuControl::IsChecked(std::u16string_view sName, const weld::TreeIter* pParent) { std::unique_ptr<weld::TreeIter> xEntry = FindEntry(pParent, sName); return xEntry && mpChecks->get_toggle(*xEntry) == TRISTATE_TRUE; } -void ScCheckListMenuControl::CheckEntry(const OUString& sName, const weld::TreeIter* pParent, bool bCheck) +void ScCheckListMenuControl::CheckEntry(std::u16string_view sName, const weld::TreeIter* pParent, bool bCheck) { std::unique_ptr<weld::TreeIter> xEntry = FindEntry(pParent, sName); if (xEntry) diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 5af5a68befc7..7d8c7bc42b12 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -363,7 +363,7 @@ const OUString& ScDPFunctionDlg::GetBaseItemName(const OUString& rLayoutName) co return itr == maBaseItemNameMap.end() ? rLayoutName : itr->second; } -sal_Int32 ScDPFunctionDlg::FindBaseItemPos( const OUString& rEntry, sal_Int32 nStartPos ) const +sal_Int32 ScDPFunctionDlg::FindBaseItemPos( std::u16string_view rEntry, sal_Int32 nStartPos ) const { sal_Int32 nPos = nStartPos; bool bFound = false; @@ -801,7 +801,7 @@ ScDPName ScDPSubtotalOptDlg::GetFieldName(const OUString& rLayoutName) const } sal_Int32 ScDPSubtotalOptDlg::FindListBoxEntry( - const weld::ComboBox& rLBox, const OUString& rEntry, sal_Int32 nStartPos ) const + const weld::ComboBox& rLBox, std::u16string_view rEntry, sal_Int32 nStartPos ) const { sal_Int32 nPos = nStartPos; bool bFound = false; diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index f81e3c50794a..9969251729e8 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -39,7 +39,7 @@ public: nDelIdx ( 0 ) {} - sal_uInt16 GetCode( const OUString& rDelimiter ) const; + sal_uInt16 GetCode( std::u16string_view rDelimiter ) const; OUString GetDelimiter( sal_Unicode nCode ) const; OUString FirstDel() { nDelIdx = 0; return theDelTab.getToken( 0, cSep, nDelIdx ); } @@ -51,7 +51,7 @@ private: sal_Int32 nDelIdx; }; -sal_uInt16 ScDelimiterTable::GetCode( const OUString& rDel ) const +sal_uInt16 ScDelimiterTable::GetCode( std::u16string_view rDel ) const { if (!theDelTab.isEmpty()) { diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 2920ca6ad08d..791c2a3b4085 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -172,8 +172,8 @@ void ScAreaLink::SetSource(const OUString& rDoc, const OUString& rFlt, const OUS SetName( aNewLinkName ); } -bool ScAreaLink::IsEqual( const OUString& rFile, const OUString& rFilter, const OUString& rOpt, - const OUString& rSource, const ScRange& rDest ) const +bool ScAreaLink::IsEqual( std::u16string_view rFile, std::u16string_view rFilter, std::u16string_view rOpt, + std::u16string_view rSource, const ScRange& rDest ) const { return aFileName == rFile && aFilterName == rFilter && aOptions == rOpt && aSourceArea == rSource && aDestArea.aStart == rDest.aStart; diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 111fb8262234..50a1ef3ecda3 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -146,7 +146,7 @@ IMPL_LINK_NOARG( ScDocShell, ReloadAllLinksHdl, weld::Button&, void ) ScTabViewShell* pViewSh = GetBestViewShell(); SfxViewFrame* pViewFrame = pViewSh ? pViewSh->GetFrame() : nullptr; if (pViewFrame) - pViewFrame->RemoveInfoBar("enablecontent"); + pViewFrame->RemoveInfoBar(u"enablecontent"); SAL_WARN_IF(!pViewFrame, "sc", "expected there to be a ViewFrame"); } @@ -500,7 +500,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) SfxViewFrame* pViewFrame = pViewSh ? pViewSh->GetFrame() : nullptr; if (pViewFrame) { - pViewFrame->RemoveInfoBar("enablecontent"); + pViewFrame->RemoveInfoBar(u"enablecontent"); auto pInfoBar = pViewFrame->AppendInfoBar("enablecontent", "", ScResId(STR_RELOAD_TABLES), InfobarType::WARNING); if (pInfoBar) { @@ -1712,7 +1712,7 @@ bool ScDocShell::AdjustPrintZoom( const ScRange& rRange ) return bChange; } -void ScDocShell::PageStyleModified( const OUString& rStyleName, bool bApi ) +void ScDocShell::PageStyleModified( std::u16string_view rStyleName, bool bApi ) { ScDocShellModificator aModificator( *this ); diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx index 1796b02b5434..842c1052bb45 100644 --- a/sc/source/ui/docshell/documentlinkmgr.cxx +++ b/sc/source/ui/docshell/documentlinkmgr.cxx @@ -214,7 +214,7 @@ bool DocumentLinkManager::updateDdeOrOleOrWebServiceLinks(weld::Window* pWin) return bAny; } -void DocumentLinkManager::updateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem ) +void DocumentLinkManager::updateDdeLink( std::u16string_view rAppl, std::u16string_view rTopic, std::u16string_view rItem ) { sfx2::LinkManager* pMgr = mpImpl->mpLinkManager; if (!pMgr) diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 7c1566472cbc..3243bfb6f6ed 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2687,7 +2687,7 @@ OUString ScExternalRefManager::getOwnDocumentName() const return pMed->GetName(); } -bool ScExternalRefManager::isOwnDocument(const OUString& rFile) const +bool ScExternalRefManager::isOwnDocument(std::u16string_view rFile) const { return getOwnDocumentName() == rFile; } diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index eb5c418a3cad..7e54f218cb13 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -179,17 +179,17 @@ private: void updateMemberParents(const weld::TreeIter* pLeaf, size_t nIdx); std::unique_ptr<weld::TreeIter> ShowCheckEntry(const OUString& sName, ScCheckListMember& rMember, bool bShow = true, bool bCheck = true); - void CheckEntry(const OUString& sName, const weld::TreeIter* pParent, bool bCheck); + void CheckEntry(std::u16string_view sName, const weld::TreeIter* pParent, bool bCheck); void CheckEntry(const weld::TreeIter& rEntry, bool bCheck); void GetRecursiveChecked(const weld::TreeIter* pEntry, std::unordered_set<OUString>& vOut, OUString& rLabel); std::unordered_set<OUString> GetAllChecked(); - bool IsChecked(const OUString& sName, const weld::TreeIter* pParent); + bool IsChecked(std::u16string_view sName, const weld::TreeIter* pParent); int GetCheckedEntryCount() const; void CheckAllChildren(const weld::TreeIter& rEntry, bool bCheck); void setSelectedMenuItem(size_t nPos, bool bSubMenuTimer); - std::unique_ptr<weld::TreeIter> FindEntry(const weld::TreeIter* pParent, const OUString& sNode); + std::unique_ptr<weld::TreeIter> FindEntry(const weld::TreeIter* pParent, std::u16string_view sNode); void executeMenuItem(size_t nPos); diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 53f234fdd145..ca1e5a1c6e0c 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -158,7 +158,7 @@ public: void SetManualDoc(const OUString& rName); void LoadFile(const OUString& rUrl); void SelectDoc(const OUString& rName); - void SelectEntryByName(const ScContentId nRoot, const OUString& rName); + void SelectEntryByName(const ScContentId nRoot, std::u16string_view rName); const OUString& GetHiddenTitle() const { return aHiddenTitle; } diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index bfdaf85af4b3..80ae6022ba6f 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -253,7 +253,7 @@ public: void LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellStyles, bool bPageStyles ); - void PageStyleModified( const OUString& rStyleName, bool bApi ); + void PageStyleModified( std::u16string_view rStyleName, bool bApi ); void NotifyStyle( const SfxStyleSheetHint& rHint ); void DoAutoStyle( const ScRange& rRange, const OUString& rStyle ); diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index c484a76e5bef..db52b1914122 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -113,7 +113,7 @@ public: void SetMarkedOriginalSize(); void FitToCellSize(); - bool SelectObject( const OUString& rName ); + bool SelectObject( std::u16string_view rName ); bool HasMarkedControl() const; bool HasMarkedInternal() const; @@ -140,9 +140,9 @@ public: SdrEndTextEditKind ScEndTextEdit(); // calls SetDrawTextUndo(0) css::uno::Reference< css::datatransfer::XTransferable > CopyToTransferable(); - SdrObject* GetObjectByName(const OUString& rName); + SdrObject* GetObjectByName(std::u16string_view rName); bool GetObjectIsMarked( const SdrObject * pObject ); - void SelectCurrentViewObject( const OUString& rName ); + void SelectCurrentViewObject( std::u16string_view rName ); // #i123922# helper which checks if a Graphic may be applied to an existing // SdrObject; if it's a SdrGrafObj the fill will be replaced. If it's a diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 43d48dc74f59..988822a69ee8 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -138,7 +138,7 @@ private: void SetCurrentCell( SCCOL nCol, SCROW Row ); void SetCurrentCellStr( const OUString& rName ); void SetCurrentTable( SCTAB nTab ); - void SetCurrentTableStr( const OUString& rName ); + void SetCurrentTableStr( std::u16string_view rName ); void SetCurrentObject( const OUString& rName ); void SetCurrentDoc( const OUString& rDocName ); void UpdateSelection(); diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 4c74ceb4e04e..79bd41f60bd2 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -67,7 +67,7 @@ private: const OUString& GetBaseItemName(const OUString& rLayoutName) const; /** Searches for a listbox entry, starts search at specified position. */ - sal_Int32 FindBaseItemPos( const OUString& rEntry, sal_Int32 nStartPos ) const; + sal_Int32 FindBaseItemPos( std::u16string_view rEntry, sal_Int32 nStartPos ) const; DECL_LINK(SelectHdl, weld::ComboBox&, void); DECL_LINK(DblClickHdl, weld::TreeView&, bool); @@ -140,7 +140,7 @@ private: ScDPName GetFieldName(const OUString& rLayoutName) const; /** Searches for a listbox entry, starts search at specified position. */ - sal_Int32 FindListBoxEntry( const weld::ComboBox& rLBox, const OUString& rEntry, sal_Int32 nStartPos ) const; + sal_Int32 FindListBoxEntry( const weld::ComboBox& rLBox, std::u16string_view rEntry, sal_Int32 nStartPos ) const; DECL_LINK( RadioClickHdl, weld::Button&, void ); DECL_LINK( CheckHdl, weld::Button&, void ); diff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx index fd6a8f26b50f..add2b2337e08 100644 --- a/sc/source/ui/inc/solverutil.hxx +++ b/sc/source/ui/inc/solverutil.hxx @@ -33,8 +33,8 @@ class ScSolverUtil public: static void GetImplementations( css::uno::Sequence<OUString>& rImplNames, css::uno::Sequence<OUString>& rDescriptions ); - static css::uno::Reference<css::sheet::XSolver> GetSolver( const OUString& rImplName ); - static css::uno::Sequence<css::beans::PropertyValue> GetDefaults( const OUString& rImplName ); + static css::uno::Reference<css::sheet::XSolver> GetSolver( std::u16string_view rImplName ); + static css::uno::Sequence<css::beans::PropertyValue> GetDefaults( std::u16string_view rImplName ); }; #endif diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 17809c51fdc8..b07ac0236b0c 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -493,7 +493,7 @@ public: void ClearHighlightRanges(); void DoChartSelection( const css::uno::Sequence< css::chart2::data::HighlightedRange > & rHilightRanges ); - void DoDPFieldPopup(OUString const & rPivotTableName, sal_Int32 nDimensionIndex, Point aPoint, Size aSize); + void DoDPFieldPopup(std::u16string_view rPivotTableName, sal_Int32 nDimensionIndex, Point aPoint, Size aSize); tools::Long GetGridWidth( ScHSplitPos eWhich ); tools::Long GetGridHeight( ScVSplitPos eWhich ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 480f4ca9c73b..1061dbe90a6e 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -342,7 +342,7 @@ public: const Point* pInsPos ); void InsertURLField( const OUString& rName, const OUString& rURL, const OUString& rTarget ); - bool SelectObject( const OUString& rName ); + bool SelectObject( std::u16string_view rName ); void SetInFormatDialog(bool bFlag) {bInFormatDialog=bFlag;} diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index df35741a4f3f..497c09729280 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -133,7 +133,7 @@ public: void PasteDraw(); void PasteDraw( const Point& rLogicPos, SdrModel* pModel, bool bGroup, - const OUString& rSrcShellID, const OUString& rDestShellID ); + std::u16string_view rSrcShellID, std::u16string_view rDestShellID ); bool PasteOnDrawObjectLinked( const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, @@ -279,7 +279,7 @@ public: void InsertTableLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, - const OUString& rTabName ); + std::u16string_view rTabName ); void InsertAreaLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource ); diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index e5d045378113..09c7aff18baa 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -95,7 +95,7 @@ void ScSolverUtil::GetImplementations( uno::Sequence<OUString>& rImplNames, } } -uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const OUString& rImplName ) +uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( std::u16string_view rImplName ) { uno::Reference<sheet::XSolver> xSolver; @@ -133,7 +133,7 @@ uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const OUString& rImplNam return xSolver; } -uno::Sequence<beans::PropertyValue> ScSolverUtil::GetDefaults( const OUString& rImplName ) +uno::Sequence<beans::PropertyValue> ScSolverUtil::GetDefaults( std::u16string_view rImplName ) { uno::Sequence<beans::PropertyValue> aDefaults; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 31fce4ea8bb8..6a638f88390f 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -1128,7 +1128,7 @@ static bool lcl_GetRange( const ScDocument& rDoc, ScContentId nType, const OUStr return bFound; } -static bool lcl_DoDragObject( ScDocShell* pSrcShell, const OUString& rName, ScContentId nType, weld::TreeView& rTreeView ) +static bool lcl_DoDragObject( ScDocShell* pSrcShell, std::u16string_view rName, ScContentId nType, weld::TreeView& rTreeView ) { bool bDisallow = true; @@ -1542,7 +1542,7 @@ void ScContentTree::SelectDoc(const OUString& rName) // rName like shown in } } -void ScContentTree::SelectEntryByName(const ScContentId nRoot, const OUString& rName) +void ScContentTree::SelectEntryByName(const ScContentId nRoot, std::u16string_view rName) { weld::TreeIter* pParent = m_aRootNodes[nRoot].get(); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 64b12b05902f..4b7247657e10 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -611,7 +611,7 @@ void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo ) } } -void ScNavigatorDlg::SetCurrentTableStr( const OUString& rName ) +void ScNavigatorDlg::SetCurrentTableStr( std::u16string_view rName ) { if (!GetViewData()) return; diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index ef0a5eff9738..2080f6e8d4bf 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -1462,9 +1462,9 @@ bool ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; } -static ScAreaLink* lcl_FindAreaLink( const sfx2::LinkManager* pLinkManager, const OUString& rDoc, - const OUString& rFlt, const OUString& rOpt, - const OUString& rSrc, const ScRange& rDest ) +static ScAreaLink* lcl_FindAreaLink( const sfx2::LinkManager* pLinkManager, std::u16string_view rDoc, + std::u16string_view rFlt, std::u16string_view rOpt, + std::u16string_view rSrc, const ScRange& rDest ) { const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks(); sal_uInt16 nCount = pLinkManager->GetLinks().size(); diff --git a/sc/source/ui/unoobj/ChartTools.cxx b/sc/source/ui/unoobj/ChartTools.cxx index b1763699334c..b405557d1c8b 100644 --- a/sc/source/ui/unoobj/ChartTools.cxx +++ b/sc/source/ui/unoobj/ChartTools.cxx @@ -95,7 +95,7 @@ SdrOle2Obj* ChartIterator::next() return nullptr; } -SdrOle2Obj* findChartsByName(ScDocShell* pDocShell, SCTAB nTab, OUString const & rName, ChartSourceType eChartSourceType) +SdrOle2Obj* findChartsByName(ScDocShell* pDocShell, SCTAB nTab, std::u16string_view rName, ChartSourceType eChartSourceType) { if (!pDocShell) return nullptr; @@ -139,7 +139,7 @@ SdrOle2Obj* getChartByIndex(ScDocShell* pDocShell, SCTAB nTab, ::tools::Long nIn return nullptr; } -std::vector<SdrOle2Obj*> getAllPivotChartsConnectedTo(OUString const & sPivotTableName, ScDocShell* pDocShell) +std::vector<SdrOle2Obj*> getAllPivotChartsConnectedTo(std::u16string_view sPivotTableName, ScDocShell* pDocShell) { std::vector<SdrOle2Obj*> aObjects; diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 177e7572fad2..9516b92e570c 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -131,7 +131,7 @@ SC_SIMPLE_SERVICE_INFO( ScAutoFormatFieldObj, "ScAutoFormatFieldObj", "com.sun.s SC_SIMPLE_SERVICE_INFO( ScAutoFormatObj, "ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat" ) SC_SIMPLE_SERVICE_INFO( ScAutoFormatsObj, "stardiv.StarCalc.ScAutoFormatsObj", SCAUTOFORMATSOBJ_SERVICE ) -static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUString& rName, sal_uInt16& rOutIndex ) +static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, std::u16string_view rName, sal_uInt16& rOutIndex ) { ScAutoFormat::const_iterator itBeg = rFormats.begin(), itEnd = rFormats.end(); for (ScAutoFormat::const_iterator it = itBeg; it != itEnd; ++it) @@ -176,7 +176,7 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) return nullptr; // wrong index } -ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const OUString& aName) +ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(std::u16string_view aName) { sal_uInt16 nIndex; if (lcl_FindAutoFormatIndex( diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 7ab5335529b2..4b8613fc30be 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -4223,7 +4223,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table:: // XNameContainer -static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const OUString& rName ) +static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, std::u16string_view rName ) { sal_uInt16 nCount = rNamedEntries.size(); for ( sal_uInt16 n=nCount; n--; ) @@ -4283,7 +4283,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const OUString& aName, const uno::A } static bool lcl_FindRangeByName( const ScRangeList& rRanges, ScDocShell* pDocSh, - const OUString& rName, size_t& rIndex ) + std::u16string_view rName, size_t& rIndex ) { if (pDocSh) { diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 76ae587cba03..d848b05ceb2f 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -245,7 +245,7 @@ void ScDataPilotConversion::FillGroupInfo( DataPilotFieldGroupInfo& rInfo, const rInfo.Step = rGroupInfo.mfStep; } -static ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName ) +static ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, std::u16string_view rName ) { if (pDocShell) { diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 1fbbf37ac812..c677e3639fb1 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -4630,7 +4630,7 @@ void ScScenariosObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XScenarios -bool ScScenariosObj::GetScenarioIndex_Impl( const OUString& rName, SCTAB& rIndex ) +bool ScScenariosObj::GetScenarioIndex_Impl( std::u16string_view rName, SCTAB& rIndex ) { //! Case-insensitive ???? @@ -4660,7 +4660,7 @@ ScTableSheetObj* ScScenariosObj::GetObjectByIndex_Impl(sal_Int32 nIndex) return nullptr; // no document or wrong index } -ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const OUString& aName) +ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(std::u16string_view aName) { SCTAB nIndex; if ( pDocShell && GetScenarioIndex_Impl( aName, nIndex ) ) diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 3aab2004dd66..c1d37d1d4490 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -53,7 +53,7 @@ void ScSheetEventsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -static ScSheetEventId lcl_GetEventFromName( const OUString& aName ) +static ScSheetEventId lcl_GetEventFromName( std::u16string_view aName ) { for (sal_Int32 nEvent=0; nEvent<static_cast<sal_Int32>(ScSheetEventId::COUNT); ++nEvent) if ( aName == ScSheetEvents::GetEventName(static_cast<ScSheetEventId>(nEvent)) ) diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 46a0755d802b..b4c45d5360d4 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -1218,7 +1218,7 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) return nullptr; } -ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const OUString& aName) +ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(std::u16string_view aName) { if (pDocShell) { diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index a2caa3fb3a77..f856ff0087bd 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -943,7 +943,7 @@ ScVbaWorksheet::hasProperty( const OUString& aName ) } uno::Any -ScVbaWorksheet::getControlShape( const OUString& sName ) +ScVbaWorksheet::getControlShape( std::u16string_view sName ) { // ideally we would get an XControl object but it appears an XControl // implementation only exists for a Control implementation obtained from the diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index a582c7858ba4..784d08b74db3 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -56,7 +56,7 @@ class ScVbaWorksheet : public WorksheetImpl_BASE css::uno::Reference< ov::excel::XRange > getSheetRange(); css::uno::Reference< css::container::XNameAccess > getFormControls() const; - css::uno::Any getControlShape( const OUString& sName ); + css::uno::Any getControlShape( std::u16string_view sName ); css::uno::Any getButtons( const css::uno::Any &rIndex, bool bOptionButtons ); diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 5ff95d735e72..d1acee975d3c 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -462,7 +462,7 @@ ScVbaWorksheets::getServiceNames() return sNames; } -bool ScVbaWorksheets::nameExists( const uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) +bool ScVbaWorksheets::nameExists( const uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, std::u16string_view name, SCTAB& nTab ) { if (!xSpreadDoc.is()) throw lang::IllegalArgumentException( "nameExists() xSpreadDoc is null", uno::Reference< uno::XInterface >(), 1 ); diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index fdb2400d4c01..54c324db4c76 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -63,7 +63,7 @@ public: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - static bool nameExists( const css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ); + static bool nameExists( const css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, std::u16string_view name, SCTAB& nTab ); }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEETS_HXX diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index f7a79a173e0f..60a57777c073 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -1332,7 +1332,7 @@ void ScDBFunc::UngroupDataPilot() Unmark(); } -static OUString lcl_replaceMemberNameInSubtotal(const OUString& rSubtotal, const OUString& rMemberName) +static OUString lcl_replaceMemberNameInSubtotal(const OUString& rSubtotal, std::u16string_view rMemberName) { sal_Int32 n = rSubtotal.getLength(); const sal_Unicode* p = rSubtotal.getStr(); diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index c589e661e88c..7b213050bf31 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -645,7 +645,7 @@ void ScDrawView::UpdateUserViewOptions() rGrid.GetFieldDrawY() / (rGrid.GetFieldDivisionY() + 1) ) ); } -SdrObject* ScDrawView::GetObjectByName(const OUString& rName) +SdrObject* ScDrawView::GetObjectByName(std::u16string_view rName) { SfxObjectShell* pShell = rDoc.GetDocumentShell(); if (pShell) @@ -676,7 +676,7 @@ SdrObject* ScDrawView::GetObjectByName(const OUString& rName) //realize multi-selection of objects -void ScDrawView::SelectCurrentViewObject( const OUString& rName ) +void ScDrawView::SelectCurrentViewObject( std::u16string_view rName ) { sal_uInt16 nObjectTab = 0; SdrObject* pFound = nullptr; @@ -727,7 +727,7 @@ void ScDrawView::SelectCurrentViewObject( const OUString& rName ) MarkObj( pFound, pPV, bUnMark); } -bool ScDrawView::SelectObject( const OUString& rName ) +bool ScDrawView::SelectObject( std::u16string_view rName ) { UnmarkAll(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 34d3ed07be21..e817730ed97e 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -4453,7 +4453,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) bPasteIsMove = bIsMove; mrViewData.GetView()->PasteDraw( - aLogicPos, rData.pDrawTransfer->GetModel(), false, "A", "B"); + aLogicPos, rData.pDrawTransfer->GetModel(), false, u"A", u"B"); if (bPasteIsMove) rData.pDrawTransfer->SetDragWasInternal(); diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 214f5a02ca3d..4f3d2eaec6b0 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -2598,7 +2598,7 @@ void ScTabView::DoChartSelection( ScInputHandler::SendReferenceMarks( aViewData.GetViewShell(), aReferenceMarks ); } -void ScTabView::DoDPFieldPopup(OUString const & rPivotTableName, sal_Int32 nDimensionIndex, Point aPoint, Size aSize) +void ScTabView::DoDPFieldPopup(std::u16string_view rPivotTableName, sal_Int32 nDimensionIndex, Point aPoint, Size aSize) { ScDocument& rDocument = aViewData.GetDocShell()->GetDocument(); ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()].get(); diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 5a7bcc2088b6..83f47834c0b6 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -445,7 +445,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) } } -bool ScTabViewShell::SelectObject( const OUString& rName ) +bool ScTabViewShell::SelectObject( std::u16string_view rName ) { ScDrawView* pView = GetViewData().GetScDrawView(); if (!pView) diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 72e6a72707ab..b6e401991684 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -623,7 +623,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) // First make sure that the sidebar is visible pThisFrame->ShowChildWindow(SID_SIDEBAR); - ::sfx2::sidebar::Sidebar::ShowPanel("ScFunctionsPanel", + ::sfx2::sidebar::Sidebar::ShowPanel(u"ScFunctionsPanel", pThisFrame->GetFrame().GetFrameInterface()); rReq.Done (); } diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 740f6af4cfad..7bf98acce6a4 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -53,7 +53,7 @@ void ScTabViewShell::ExecChildWin(const SfxRequest& rReq) GetViewFrame()->ShowChildWindow(SID_SIDEBAR); ::sfx2::sidebar::Sidebar::ShowPanel( - "GalleryPanel", + u"GalleryPanel", GetViewFrame()->GetFrame().GetFrameInterface()); } break; diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 4a6062fddff5..d6f2884ec182 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -341,7 +341,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) case FID_FUNCTION_BOX: { - const bool bBoxOpen = ::sfx2::sidebar::Sidebar::IsPanelVisible("ScFunctionsPanel", + const bool bBoxOpen = ::sfx2::sidebar::Sidebar::IsPanelVisible(u"ScFunctionsPanel", pThisFrame->GetFrame().GetFrameInterface()); rSet.Put(SfxBoolItem(nWhich, bBoxOpen)); break; diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 9bad80bb01d0..92452d24f71d 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2636,7 +2636,7 @@ void ScViewFunc::InsertAreaLink( const OUString& rFile, void ScViewFunc::InsertTableLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, - const OUString& rTabName ) + std::u16string_view rTabName ) { OUString aFilterName = rFilter; OUString aOpt = rOptions; @@ -2647,7 +2647,7 @@ void ScViewFunc::InsertTableLink( const OUString& rFile, ScDocShell* pSrcSh = aLoader.GetDocShell(); ScDocument& rSrcDoc = pSrcSh->GetDocument(); SCTAB nTab = MAXTAB+1; - if (rTabName.isEmpty()) // no name given -> first table + if (rTabName.empty()) // no name given -> first table nTab = 0; else { diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 90429fbde4e4..f85fbf75d6bd 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -547,7 +547,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, nObjCount += pPage->GetObjCount(); // count group object only once } - PasteDraw(aPos, pModel.get(), (nObjCount > 1), "A", "B"); // grouped if more than 1 object + PasteDraw(aPos, pModel.get(), (nObjCount > 1), u"A", u"B"); // grouped if more than 1 object pModel.reset(); aDragShellRef->DoClose(); bRet = true; diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index c1b93d0799b0..d58c4300a684 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -70,7 +70,7 @@ static void lcl_AdjustInsertPos( ScViewData& rData, Point& rPos, const Size& rSi } void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, - bool bGroup, const OUString& rSrcShellID, const OUString& rDestShellID ) + bool bGroup, std::u16string_view rSrcShellID, std::u16string_view rDestShellID ) { bool bSameDocClipboard = rSrcShellID == rDestShellID; |