diff options
Diffstat (limited to 'framework/source/uielement/menubarmerger.cxx')
-rw-r--r-- | framework/source/uielement/menubarmerger.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index b353fc954d56..eebf61aa7383 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -20,6 +20,7 @@ #include <uielement/menubarmerger.hxx> #include <framework/addonsoptions.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <o3tl/string_view.hxx> using namespace ::com::sun::star; @@ -56,13 +57,13 @@ namespace framework */ bool MenuBarMerger::IsCorrectContext( - const OUString& rContext, std::u16string_view rModuleIdentifier ) + std::u16string_view rContext, std::u16string_view rModuleIdentifier ) { - return ( rContext.isEmpty() || ( rContext.indexOf( rModuleIdentifier ) >= 0 )); + return ( rContext.empty() || ( rContext.find( rModuleIdentifier ) != std::u16string_view::npos )); } void MenuBarMerger::RetrieveReferencePath( - const OUString& rReferencePathString, + std::u16string_view rReferencePathString, ::std::vector< OUString >& rReferencePath ) { const char aDelimiter = '\\'; @@ -71,7 +72,7 @@ void MenuBarMerger::RetrieveReferencePath( sal_Int32 nIndex( 0 ); do { - OUString aToken = rReferencePathString.getToken( 0, aDelimiter, nIndex ); + OUString aToken( o3tl::getToken(rReferencePathString, 0, aDelimiter, nIndex ) ); if ( !aToken.isEmpty() ) rReferencePath.push_back( aToken ); } @@ -215,11 +216,11 @@ bool MenuBarMerger::MergeMenuItems( { if ( rMenuItem.aURL == SEPARATOR_STRING ) { - pMenu->InsertSeparator(OString(), nPos+nModIndex+nIndex); + pMenu->InsertSeparator({}, nPos + nModIndex + nIndex); } else { - pMenu->InsertItem(nItemId, rMenuItem.aTitle, MenuItemBits::NONE, OString(), nPos+nModIndex+nIndex); + pMenu->InsertItem(nItemId, rMenuItem.aTitle, MenuItemBits::NONE, {}, nPos + nModIndex + nIndex); pMenu->SetItemCommand( nItemId, rMenuItem.aURL ); if ( !rMenuItem.aSubMenu.empty() ) { @@ -256,9 +257,9 @@ bool MenuBarMerger::ReplaceMenuItem( bool MenuBarMerger::RemoveMenuItems( Menu* pMenu, sal_uInt16 nPos, - const OUString& rMergeCommandParameter ) + std::u16string_view rMergeCommandParameter ) { - const sal_uInt16 nParam( sal_uInt16( rMergeCommandParameter.toInt32() )); + const sal_uInt16 nParam( sal_uInt16( o3tl::toInt32(rMergeCommandParameter) )); sal_uInt16 nCount = std::max( nParam, sal_uInt16(1) ); sal_uInt16 i = 0; @@ -276,7 +277,7 @@ bool MenuBarMerger::ProcessMergeOperation( sal_uInt16 nPos, sal_uInt16& nItemId, std::u16string_view rMergeCommand, - const OUString& rMergeCommandParameter, + std::u16string_view rMergeCommandParameter, const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ) { |