diff options
Diffstat (limited to 'framework/inc/uielement/menubarmerger.hxx')
| -rw-r--r-- | framework/inc/uielement/menubarmerger.hxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx index 8de837c5e81e..16bb8ec67610 100644 --- a/framework/inc/uielement/menubarmerger.hxx +++ b/framework/inc/uielement/menubarmerger.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARMERGER_HXX -#define INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARMERGER_HXX +#pragma once #include <com/sun/star/beans/PropertyValue.hpp> @@ -61,9 +60,9 @@ struct ReferencePathInfo namespace MenuBarMerger { bool IsCorrectContext( - const OUString& aContext, std::u16string_view aModuleIdentifier ); + std::u16string_view aContext, std::u16string_view aModuleIdentifier ); - void RetrieveReferencePath( const OUString&, + void RetrieveReferencePath( std::u16string_view, std::vector< OUString >& aReferencePath ); ReferencePathInfo FindReferencePath( const std::vector< OUString >& aReferencePath, Menu* pMenu ); sal_uInt16 FindMenuItem( std::u16string_view rCmd, @@ -76,7 +75,7 @@ namespace MenuBarMerger sal_uInt16 nPos, sal_uInt16& rItemId, std::u16string_view rMergeCommand, - const OUString& rMergeCommandParameter, + std::u16string_view rMergeCommandParameter, const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); bool ProcessFallbackOperation( const ReferencePathInfo& aRefPathInfo, @@ -99,7 +98,7 @@ namespace MenuBarMerger const AddonMenuContainer& rAddonMenuItems ); bool RemoveMenuItems( Menu* pMenu, sal_uInt16 nPos, - const OUString& rMergeCommandParameter ); + std::u16string_view rMergeCommandParameter ); bool CreateSubMenu( Menu* pSubMenu, sal_uInt16& nItemId, const OUString& rModuleIdentifier, @@ -108,6 +107,4 @@ namespace MenuBarMerger } // namespace framework -#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARMERGER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |