From 6f50961e69406a17d6ec998956a6b33208b1001b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Oct 2018 12:06:00 +0200 Subject: remove more rtl::OUString and OString prefixes which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin --- framework/inc/uielement/statusbarmerger.hxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'framework/inc/uielement/statusbarmerger.hxx') diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx index 0d676b86b35c..4f61ed7c3ff5 100644 --- a/framework/inc/uielement/statusbarmerger.hxx +++ b/framework/inc/uielement/statusbarmerger.hxx @@ -28,14 +28,14 @@ namespace framework struct AddonStatusbarItemData { - rtl::OUString aLabel; + OUString aLabel; }; struct AddonStatusbarItem { - rtl::OUString aCommandURL; - rtl::OUString aLabel; - rtl::OUString aContext; + OUString aCommandURL; + OUString aLabel; + OUString aContext; StatusBarItemBits nItemBits; sal_Int16 nWidth; }; @@ -44,25 +44,25 @@ typedef ::std::vector< AddonStatusbarItem > AddonStatusbarItemContainer; namespace StatusbarMerger { - bool IsCorrectContext( const ::rtl::OUString& aContext ); + bool IsCorrectContext( const OUString& aContext ); bool ConvertSeqSeqToVector( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence, AddonStatusbarItemContainer& rContainer ); sal_uInt16 FindReferencePos( StatusBar* pStatusbar, - const ::rtl::OUString& rReferencePoint ); + const OUString& rReferencePoint ); bool ProcessMergeOperation( StatusBar* pStatusbar, sal_uInt16 nPos, sal_uInt16& rItemId, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeCommandParameter, + const OUString& rMergeCommand, + const OUString& rMergeCommandParameter, const AddonStatusbarItemContainer& rItems ); bool ProcessMergeFallback( StatusBar* pStatusbar, sal_uInt16& rItemId, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeFallback, + const OUString& rMergeCommand, + const OUString& rMergeFallback, const AddonStatusbarItemContainer& rItems ); } -- cgit