diff options
author | Noel <noelgrandin@gmail.com> | 2020-11-18 10:10:40 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-24 09:45:04 +0100 |
commit | bb06f51308428500c9c8d11ae05f0aa03ecc179c (patch) | |
tree | b18620e8572ed6d4c43c8605660d59f5f7a7e531 /sd | |
parent | 42e8e16cf93dcf944e5c1106f76aaa32057c0397 (diff) |
loplugin:stringviewparam extend to comparison operators
which means that some call sites have to change to use
unicode string literals i.e. u"foo" instead of "foo"
Change-Id: Ie51c3adf56d343dd1d1710777f9d2a43ee66221c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106125
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
39 files changed, 72 insertions, 72 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index e4af8b713aa5..59c29717995a 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -127,8 +127,8 @@ public: SAL_DLLPRIVATE bool getAutoReverse() const { return mbAutoReverse; } SAL_DLLPRIVATE void setAutoReverse( bool bAutoReverse ); - SAL_DLLPRIVATE css::uno::Any getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue ); - SAL_DLLPRIVATE bool setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const css::uno::Any& rValue ); + SAL_DLLPRIVATE css::uno::Any getProperty( sal_Int32 nNodeType, std::u16string_view rAttributeName, EValue eValue ); + SAL_DLLPRIVATE bool setProperty( sal_Int32 nNodeType, std::u16string_view rAttributeName, EValue eValue, const css::uno::Any& rValue ); SAL_DLLPRIVATE css::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue ); SAL_DLLPRIVATE bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const css::uno::Any& rValue ); diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index b05f1675c6a7..e2739fd3213c 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -53,7 +53,7 @@ public: std::vector<OUString> getSubTypes(); std::vector<OUString> getProperties() const; - bool hasProperty( const OUString& rProperty ) const; + bool hasProperty( std::u16string_view rProperty ) const; bool isTextOnly() const { return mbIsTextOnly; } private: diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 2d05e269ff58..e18a1492ea4b 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -355,7 +355,7 @@ public: void CloseBookmarkDoc(); - SAL_DLLPRIVATE SdrObject* GetObj(const OUString& rObjName) const; + SAL_DLLPRIVATE SdrObject* GetObj(std::u16string_view rObjName) const; /** Return the first page that has the given name. Regular pages and notes pages are searched first. When not found then the master @@ -370,14 +370,14 @@ public: Returns the index of the page with the given name or SDRPAGE_NOTFOUND (=0xffff) when such a page does not exist. */ - SAL_DLLPRIVATE sal_uInt16 GetPageByName(const OUString& rPgName, bool& rbIsMasterPage ) const; + SAL_DLLPRIVATE sal_uInt16 GetPageByName(std::u16string_view rPgName, bool& rbIsMasterPage ) const; /** checks, if the given name is a *unique* name for an *existing* slide @param rPageName the name of an existing slide @return true, if the name is unique and the slide exists */ - bool IsPageNameUnique( const OUString& rPageName ) const; + bool IsPageNameUnique( std::u16string_view rPageName ) const; SdPage*GetSdPage(sal_uInt16 nPgNum, PageKind ePgKind) const; sal_uInt16 GetSdPageCount(PageKind ePgKind) const; diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index e54e02ddecd5..cc883a8fb019 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -570,7 +570,7 @@ void SdExportTest::testUnknownAttributes() // TODO: if the namespace is *known*, the attribute is not preserved, but that seems to be a pre-existing problem, or maybe it's even intentional? // assertXPath(pXmlDoc, "/office:document-content/office:automatic-styles/style:style[@style:name='gr1']/style:graphic-properties[@svg:non-existent-att='blah']"); // this was on style:graphic-properties on the import, but the export moves it to root node which is OK - assertXPathNSDef(pXmlDoc, "/office:document-content", "foo", "http://example.com/"); + assertXPathNSDef(pXmlDoc, "/office:document-content", u"foo", u"http://example.com/"); } void SdExportTest::testTdf80020() diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 1aba4c65a77a..c9bd05d737d4 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -2309,7 +2309,7 @@ void SdTiledRenderingTest::testTdf115873() pNavigator->InitTreeLB(pXImpressDocument->GetDoc()); pNavigator->Show(); SdPageObjsTLV& rObjects = pNavigator->GetObjects(); - rObjects.SelectEntry("Slide 1"); + rObjects.SelectEntry(u"Slide 1"); rObjects.Select(); sd::ViewShell* pSdViewShell = pXImpressDocument->GetDocShell()->GetViewShell(); SdrView* pSdrView = pSdViewShell->GetView(); @@ -2323,7 +2323,7 @@ void SdTiledRenderingTest::testTdf115873() // Single-click with the mouse. MouseEvent aMouseEvent(Point(0, 0), /*nClicks=*/1, MouseEventModifiers::NONE, MOUSE_LEFT); rObjects.MousePressHdl(aMouseEvent); - rObjects.SelectEntry("Rectangle"); + rObjects.SelectEntry(u"Rectangle"); rObjects.Select(); rObjects.MouseReleaseHdl(aMouseEvent); Scheduler::ProcessEventsToIdle(); diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index ca84ab88285a..492c9c0e45fc 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1146,7 +1146,7 @@ void CustomAnimationEffect::setPath( const OUString& rPath ) } } -Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue ) +Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, std::u16string_view rAttributeName, EValue eValue ) { Any aProperty; if( mxNode.is() ) try @@ -1186,7 +1186,7 @@ Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAt return aProperty; } -bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const Any& rValue ) +bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, std::u16string_view rAttributeName, EValue eValue, const Any& rValue ) { bool bChanged = false; if( mxNode.is() ) try diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index b40b271d9910..d65d8aebce65 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -193,7 +193,7 @@ std::vector<OUString> CustomAnimationPreset::getProperties() const return aPropertyList; } -bool CustomAnimationPreset::hasProperty( const OUString& rProperty )const +bool CustomAnimationPreset::hasProperty( std::u16string_view rProperty )const { if (maProperty.isEmpty()) return false; diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 2a12ebc9a600..c6d663ba2696 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -65,7 +65,7 @@ const ::tools::Long PRINT_OFFSET = 30; // see /svx/source/dialog/page.cxx using namespace com::sun::star; // Looks up an object by name -SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const +SdrObject* SdDrawDocument::GetObj(std::u16string_view rObjName) const { SdrObject* pObj = nullptr; SdrObject* pObjFound = nullptr; @@ -125,7 +125,7 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const } // Find SdPage by name -sal_uInt16 SdDrawDocument::GetPageByName(const OUString& rPgName, bool& rbIsMasterPage) const +sal_uInt16 SdDrawDocument::GetPageByName(std::u16string_view rPgName, bool& rbIsMasterPage) const { SdPage* pPage = nullptr; sal_uInt16 nPage = 0; @@ -172,7 +172,7 @@ sal_uInt16 SdDrawDocument::GetPageByName(const OUString& rPgName, bool& rbIsMast return nPageNum; } -bool SdDrawDocument::IsPageNameUnique( const OUString& rPgName ) const +bool SdDrawDocument::IsPageNameUnique( std::u16string_view rPgName ) const { sal_uInt16 nCount = 0; SdPage* pPage = nullptr; diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 02c6054751b2..143b5a47a2fd 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1321,9 +1321,9 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, bool bOnl * If rLayoutName is empty, the first master page is used. */ // #i121863# factored out functionality -static bool isMasterPageLayoutNameUnique(const SdDrawDocument& rDoc, const OUString& rCandidate) +static bool isMasterPageLayoutNameUnique(const SdDrawDocument& rDoc, std::u16string_view rCandidate) { - if (rCandidate.isEmpty()) + if (rCandidate.empty()) { return false; } diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 14b2c3fe1ec8..30707c9be125 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -84,9 +84,9 @@ OUString lcl_findRenamedStyleName(std::vector< std::pair< OUString, OUString > > return OUString(); } -SfxStyleSheet *lcl_findStyle(StyleSheetCopyResultVector& rStyles, const OUString& aStyleName) +SfxStyleSheet *lcl_findStyle(StyleSheetCopyResultVector& rStyles, std::u16string_view aStyleName) { - if( aStyleName.isEmpty() ) + if( aStyleName.empty() ) return nullptr; for (const auto& a : rStyles) { diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index 34e26bd354d0..c4770e6442e9 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -65,7 +65,7 @@ OUString ExSoundEntry::ImplGetExtension() const return aExtension; } -bool ExSoundEntry::IsSameURL(const OUString& rURL) const +bool ExSoundEntry::IsSameURL(std::u16string_view rURL) const { return ( rURL == aSoundURL ); } diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx index a104cd4a7eb3..2e990aba06b2 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.hxx +++ b/sd/source/filter/eppt/pptexsoundcollection.hxx @@ -42,7 +42,7 @@ class ExSoundEntry public: - bool IsSameURL(const OUString& rURL) const; + bool IsSameURL(std::u16string_view rURL) const; sal_uInt32 GetFileSize( ) const { return nFileSize; }; ExSoundEntry(const OUString& rSoundURL); diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 2e6d511253ee..39ea654879a9 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -956,7 +956,7 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32 nType, const CustomAnimati } case nPropertyTypeFont: - return pEffect->getProperty( AnimationNodeType::SET, "CharFontName" , EValue::To ); + return pEffect->getProperty( AnimationNodeType::SET, u"CharFontName" , EValue::To ); case nPropertyTypeCharHeight: { @@ -971,7 +971,7 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32 nType, const CustomAnimati return pEffect->getTransformationProperty( AnimationTransformType::ROTATE, EValue::By); case nPropertyTypeTransparency: - return pEffect->getProperty( AnimationNodeType::SET, "Opacity" , EValue::To ); + return pEffect->getProperty( AnimationNodeType::SET, u"Opacity" , EValue::To ); case nPropertyTypeScale: return pEffect->getTransformationProperty( AnimationTransformType::SCALE, EValue::By ); @@ -979,9 +979,9 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32 nType, const CustomAnimati case nPropertyTypeCharDecoration: { Sequence< Any > aValues(3); - aValues[0] = pEffect->getProperty( AnimationNodeType::SET, "CharWeight" , EValue::To ); - aValues[1] = pEffect->getProperty( AnimationNodeType::SET, "CharPosture" , EValue::To ); - aValues[2] = pEffect->getProperty( AnimationNodeType::SET, "CharUnderline" , EValue::To ); + aValues[0] = pEffect->getProperty( AnimationNodeType::SET, u"CharWeight" , EValue::To ); + aValues[1] = pEffect->getProperty( AnimationNodeType::SET, u"CharPosture" , EValue::To ); + aValues[2] = pEffect->getProperty( AnimationNodeType::SET, u"CharUnderline" , EValue::To ); return makeAny( aValues ); } } @@ -1027,7 +1027,7 @@ bool CustomAnimationPane::setProperty1Value( sal_Int32 nType, const CustomAnimat break; case nPropertyTypeFont: - bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, "CharFontName" , EValue::To, rValue ); + bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, u"CharFontName" , EValue::To, rValue ); break; case nPropertyTypeCharHeight: @@ -1043,7 +1043,7 @@ bool CustomAnimationPane::setProperty1Value( sal_Int32 nType, const CustomAnimat break; case nPropertyTypeTransparency: - bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, "Opacity" , EValue::To, rValue ); + bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, u"Opacity" , EValue::To, rValue ); break; case nPropertyTypeScale: @@ -1054,9 +1054,9 @@ bool CustomAnimationPane::setProperty1Value( sal_Int32 nType, const CustomAnimat { Sequence< Any > aValues(3); rValue >>= aValues; - bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, "CharWeight" , EValue::To, aValues[0] ); - bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, "CharPosture" , EValue::To, aValues[1] ); - bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, "CharUnderline" , EValue::To, aValues[2] ); + bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, u"CharWeight" , EValue::To, aValues[0] ); + bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, u"CharPosture" , EValue::To, aValues[1] ); + bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, u"CharUnderline" , EValue::To, aValues[2] ); } break; @@ -1185,17 +1185,17 @@ std::unique_ptr<STLPropertySet> CustomAnimationPane::createSelectionSet() addValue( pSet, nHandleProperty1Value, getProperty1Value( nType, pEffect ) ); } - if( pDescriptor->hasProperty( "Accelerate" ) ) + if( pDescriptor->hasProperty( u"Accelerate" ) ) { addValue( pSet, nHandleAccelerate, makeAny( pEffect->getAcceleration() ) ); } - if( pDescriptor->hasProperty( "Decelerate" ) ) + if( pDescriptor->hasProperty( u"Decelerate" ) ) { addValue( pSet, nHandleDecelerate, makeAny( pEffect->getDecelerate() ) ); } - if( pDescriptor->hasProperty( "AutoReverse" ) ) + if( pDescriptor->hasProperty( u"AutoReverse" ) ) { addValue( pSet, nHandleAutoReverse, makeAny( pEffect->getAutoReverse() ) ); } diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 155862469313..d24897a5c7dd 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -639,7 +639,7 @@ void AnnotationManagerImpl::DeleteAnnotation( const Reference< XAnnotation >& xA } } -void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const OUString& sAuthor ) +void AnnotationManagerImpl::DeleteAnnotationsByAuthor( std::u16string_view sAuthor ) { if( mpDoc->IsUndoEnabled() ) mpDoc->BegUndo( SdResId( STR_ANNOTATION_UNDO_DELETE ) ); diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 533b6658644c..a00fc0e1882b 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -79,7 +79,7 @@ public: void InsertAnnotation(const OUString& rText); void DeleteAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation ); - void DeleteAnnotationsByAuthor( const OUString& sAuthor ); + void DeleteAnnotationsByAuthor( std::u16string_view sAuthor ); void DeleteAllAnnotations(); void ExecuteAnnotationContextMenu( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, vcl::Window* pParent, const ::tools::Rectangle& rContextRect, bool bButtonMenu = false ); diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index c37aa9637885..7b274dd7210f 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -113,7 +113,7 @@ void LayerTabBar::SetPageText( sal_uInt16 nPageId, const OUString& rText ) TabBar::SetPageText(nPageId, sLocalizedName); } -bool LayerTabBar::IsLocalizedNameOfStandardLayer(const OUString& rName) +bool LayerTabBar::IsLocalizedNameOfStandardLayer(std::u16string_view rName) { return ( rName == SdResId(STR_LAYER_LAYOUT) || rName == SdResId(STR_LAYER_CONTROLS) diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 780f8a6ce35b..68ca6bdbff69 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -166,11 +166,11 @@ SotClipboardFormatId SdPageObjsTLV::SdPageObjsTransferable::GetListBoxDropFormat /** * @return true if children of the specified string are selected */ -bool SdPageObjsTLV::HasSelectedChildren( const OUString& rName ) +bool SdPageObjsTLV::HasSelectedChildren( std::u16string_view rName ) { bool bChildren = false; - if( !rName.isEmpty() ) + if( !rName.empty() ) { std::unique_ptr<weld::TreeIter> xEntry(m_xTreeView->make_iterator()); OUString aTmp; @@ -216,7 +216,7 @@ void SdPageObjsTLV::SetShowAllShapes ( } bool SdPageObjsTLV::IsEqualToShapeList(std::unique_ptr<weld::TreeIter>& rEntry, const SdrObjList& rList, - const OUString& rListName) + std::u16string_view rListName) { if (!rEntry) return false; @@ -1144,11 +1144,11 @@ void SdPageObjsTLV::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium, /** * select an entry in TreeLB */ -bool SdPageObjsTLV::SelectEntry( const OUString& rName ) +bool SdPageObjsTLV::SelectEntry( std::u16string_view rName ) { bool bFound = false; - if (!rName.isEmpty()) + if (!rName.empty()) { std::unique_ptr<weld::TreeIter> xEntry(m_xTreeView->make_iterator()); OUString aTmp; diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 084c0d313359..bfbb92ab61c5 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -404,7 +404,7 @@ bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStr return bCanUseNewName; } -bool DrawDocShell::IsPageNameUnique( const OUString & rPageName ) const +bool DrawDocShell::IsPageNameUnique( std::u16string_view rPageName ) const { return mpDoc->IsPageNameUnique(rPageName); } diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 8ae543c5c9d5..302f96bf4d96 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -109,7 +109,7 @@ static void lcl_setLanguageForObj( SdrObject *pObj, LanguageType nLang, bool bLa } } -static void lcl_setLanguage( const SdDrawDocument *pDoc, const OUString &rLanguage, bool bLanguageNone = false ) +static void lcl_setLanguage( const SdDrawDocument *pDoc, std::u16string_view rLanguage, bool bLanguageNone = false ) { LanguageType nLang = SvtLanguageTable::GetLanguageType( rLanguage ); @@ -313,9 +313,9 @@ void DrawDocShell::Execute( SfxRequest& rReq ) aNewLangTxt = aNewLangTxt.replaceAt( nPos, aDocumentLangPrefix.getLength(), "" ); if (aNewLangTxt == "LANGUAGE_NONE") - lcl_setLanguage( pDoc, OUString(), true ); + lcl_setLanguage( pDoc, u"", true ); else if (aNewLangTxt == "RESET_LANGUAGES") - lcl_setLanguage( pDoc, OUString() ); + lcl_setLanguage( pDoc, u"" ); else lcl_setLanguage( pDoc, aNewLangTxt ); } diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 969981c2c7be..d60476dcaf76 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -69,7 +69,7 @@ public: */ bool mbIsReleased; - bool CompareURL(const OUString& rsPaneURL) const { return msPaneURL == rsPaneURL; } + bool CompareURL(std::u16string_view rsPaneURL) const { return msPaneURL == rsPaneURL; } bool ComparePane(const Reference<XResource>& rxPane) const { return mxPane == rxPane; } }; diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 958ed8042c81..b998191083f9 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -501,9 +501,9 @@ void FuConstructRectangle::Deactivate() // Update infobar to offer "finish signing". SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); - if (pFrame && pFrame->HasInfoBarWithID("readonly")) + if (pFrame && pFrame->HasInfoBarWithID(u"readonly")) { - pFrame->RemoveInfoBar("readonly"); + pFrame->RemoveInfoBar(u"readonly"); pFrame->AppendReadOnlyInfobar(); } } diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index d6639c78a736..9634c3d6c97f 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -183,7 +183,7 @@ public: @return true, if the name is unique and the slide exists */ - bool IsPageNameUnique(const OUString& rPagName) const; + bool IsPageNameUnique(std::u16string_view rPagName) const; /** Return the reference device for the current document. When the inherited implementation returns a device then this is passed to the diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index 2e0bee3aabef..a7fbefc4fb35 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -69,7 +69,7 @@ public: static bool IsRealNameOfStandardLayer(const OUString& rName); // Used e.g. in validity test of user entered names - static bool IsLocalizedNameOfStandardLayer(const OUString& rName); + static bool IsLocalizedNameOfStandardLayer(std::u16string_view rName); // In case rName is one of the sUNO_LayerName_*, it generates a localized name, // otherwise it returns value of rName. diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index a25a93009aa0..0d7087d2f281 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -61,7 +61,7 @@ namespace sd // For the control dialog SD_DLLPUBLIC static std::vector< std::shared_ptr< ClientInfo > > getClients(); SD_DLLPUBLIC static bool connectClient( const std::shared_ptr< ClientInfo >& pClient, - const OUString& aPin ); + std::u16string_view aPin ); SD_DLLPUBLIC static void deauthoriseClient( const std::shared_ptr< ClientInfo >& pClient ); /// ensure that discoverability (eg. for Bluetooth) is enabled diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 888fbfcf3b9c..328cc0f23b47 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -206,8 +206,8 @@ public: m_aRowActivatedHdl = rLink; } - bool HasSelectedChildren(const OUString& rName); - bool SelectEntry(const OUString& rName); + bool HasSelectedChildren(std::u16string_view rName); + bool SelectEntry(std::u16string_view rName); OUString get_selected_text() const { @@ -266,7 +266,7 @@ public: bool IsEqualToDoc(const SdDrawDocument* pInDoc); /// Visits rList recursively and tries to advance rEntry accordingly. bool IsEqualToShapeList(std::unique_ptr<weld::TreeIter>& rEntry, const SdrObjList& rList, - const OUString& rListName); + std::u16string_view rListName); static bool IsInDrag(); diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 4f4ba44e170e..7856e46aa33f 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -399,7 +399,7 @@ public: // intern /// @throws std::exception - SdPage* FindPage( const OUString& rName ) const; + SdPage* FindPage( std::u16string_view rName ) const; }; #endif diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx index 1607e3779ead..b66db4f90e88 100644 --- a/sd/source/ui/inc/unopage.hxx +++ b/sd/source/ui/inc/unopage.hxx @@ -284,7 +284,7 @@ public: virtual ~SdPageLinkTargets() throw() override; // intern - SdrObject* FindObject( const OUString& rName ) const throw(); + SdrObject* FindObject( std::u16string_view rName ) const throw(); // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 840784d538eb..d3f1ac67f904 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -260,7 +260,7 @@ std::vector< std::shared_ptr< ClientInfo > > RemoteServer::getClients() return aClients; } -bool RemoteServer::connectClient( const std::shared_ptr< ClientInfo >& pClient, const OUString& aPin ) +bool RemoteServer::connectClient( const std::shared_ptr< ClientInfo >& pClient, std::u16string_view aPin ) { SAL_INFO( "sdremote", "RemoteServer::connectClient called" ); if ( !spServer ) diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 8d518c65011d..4219c5f76a1f 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2216,7 +2216,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() return xShow; } -void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) +void SlideshowImpl::createSlideList( bool bAll, std::u16string_view rPresSlide ) { const sal_uInt16 nSlideCount = mpDoc->GetSdPageCount( PageKind::Standard ); @@ -2244,7 +2244,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) sal_Int32 nFirstVisibleSlide = 0; // normal presentation - if( !rPresSlide.isEmpty() ) + if( !rPresSlide.empty() ) { sal_Int32 nSlide; bool bTakeNextAvailable = false; @@ -2280,7 +2280,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) } else { - if( meAnimationMode != ANIMATIONMODE_SHOW && !rPresSlide.isEmpty() ) + if( meAnimationMode != ANIMATIONMODE_SHOW && !rPresSlide.empty() ) { sal_Int32 nSlide; for( nSlide = 0; nSlide < nSlideCount; nSlide++ ) diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index d870d7ec49d3..ac84875c4c65 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -223,7 +223,7 @@ private: void update(); - void createSlideList( bool bAll, const OUString& rPresSlide ); + void createSlideList( bool bAll, std::u16string_view rPresSlide ); void displayCurrentSlide (const bool bSkipAllMainSequenceEffects = false); diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 91deb290441f..c3bd9adcb31c 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -184,7 +184,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) // First make sure that the sidebar is visible pShell->GetViewFrame()->ShowChildWindow(SID_SIDEBAR); ::sfx2::sidebar::Sidebar::ShowPanel( - "SdSlideTransitionPanel", + u"SdSlideTransitionPanel", pShell->GetViewFrame()->GetFrame().GetFrameInterface()); rRequest.Ignore (); break; @@ -195,7 +195,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) // First make sure that the sidebar is visible pShell->GetViewFrame()->ShowChildWindow(SID_SIDEBAR); ::sfx2::sidebar::Sidebar::ShowPanel( - "SdAllMasterPagesPanel", + u"SdAllMasterPagesPanel", pShell->GetViewFrame()->GetFrame().GetFrameInterface()); rRequest.Ignore (); break; diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index c420397e1621..6f84adf95d6f 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -234,7 +234,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) // First make sure that the sidebar is visible GetViewFrame()->ShowChildWindow(SID_SIDEBAR); ::sfx2::sidebar::Sidebar::ShowPanel( - "SdTableDesignPanel", + u"SdTableDesignPanel", GetViewFrame()->GetFrame().GetFrameInterface()); Cancel(); diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx index 54e5b586df7b..0b67f75c0ba2 100644 --- a/sd/source/ui/uitest/uiobject.cxx +++ b/sd/source/ui/uitest/uiobject.cxx @@ -47,7 +47,7 @@ OUString getObjectName(SdrObject const* pObject) return pObject->GetName(); } -SdrObject* getObject(const VclPtr<sd::Window>& xWindow, const OUString& rName) +SdrObject* getObject(const VclPtr<sd::Window>& xWindow, std::u16string_view rName) { SdrPage* pPage = getViewShell(xWindow)->getCurrentPage(); diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 2571b1388bbf..ff169dc9b13d 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -429,7 +429,7 @@ sal_Bool SAL_CALL SdXCustomPresentationAccess::hasElements() return pList && !pList->empty(); } -SdCustomShow * SdXCustomPresentationAccess::getSdCustomShow( const OUString& rName ) const throw() +SdCustomShow * SdXCustomPresentationAccess::getSdCustomShow( std::u16string_view rName ) const throw() { sal_uInt32 nIdx = 0; diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index bf1b7b7efa5b..8328e0dcc1a9 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -105,7 +105,7 @@ private: // intern inline SdCustomShowList* GetCustomShowList() const throw(); - SdCustomShow * getSdCustomShow( const OUString& Name ) const throw(); + SdCustomShow * getSdCustomShow( std::u16string_view Name ) const throw(); public: explicit SdXCustomPresentationAccess(SdXImpressDocument& rMyModel) throw(); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 2ffc5acc0664..314741f228cf 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -3375,7 +3375,7 @@ sal_Bool SAL_CALL SdDocLinkTargets::hasElements() return mpModel->GetDoc() != nullptr; } -SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const +SdPage* SdDocLinkTargets::FindPage( std::u16string_view rName ) const { SdDrawDocument* pDoc = mpModel->GetDoc(); if( pDoc == nullptr ) diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 0ea67fbd7bcb..11417c30651b 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1973,7 +1973,7 @@ sal_Bool SAL_CALL SdPageLinkTargets::hasByName( const OUString& aName ) return FindObject( aName ) != nullptr; } -SdrObject* SdPageLinkTargets::FindObject( const OUString& rName ) const throw() +SdrObject* SdPageLinkTargets::FindObject( std::u16string_view rName ) const throw() { SdPage* pPage = mpUnoPage->GetPage(); if( pPage == nullptr ) diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index a8f3be88994a..4ca73b2bb5dc 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -114,7 +114,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( mrViewShell.GetDrawView()->UnmarkAll(); mrViewShell.GetViewFrame()->ShowChildWindow(SID_SIDEBAR); sfx2::sidebar::Sidebar::TogglePanel( - "SdLayoutsPanel", + u"SdLayoutsPanel", mrViewShell.GetViewFrame()->GetFrame().GetFrameInterface()); break; } diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 30a334bfd6ec..a81fa4f5a5e4 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -211,7 +211,7 @@ const SvxFieldItem* findField(editeng::Section const & rSection) return nullptr; } -bool hasCustomPropertyField(std::vector<editeng::Section> const & aSections, OUString const & rName) +bool hasCustomPropertyField(std::vector<editeng::Section> const & aSections, std::u16string_view rName) { for (editeng::Section const & rSection : aSections) { |