diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-03 14:03:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-11-05 08:44:19 +0200 |
| commit | 705c48d32eec0aa5180e60ca157daca4b154e4a3 (patch) | |
| tree | 97f43496f4b429a2b8d03b1e71cb2a1c33142a15 /accessibility | |
| parent | b7d8a58ff2698ffc6e22943f64aa97c5ea253bd9 (diff) | |
fdo#38835 strip out OUString globals
they are largely unnecessary these days, since our OUString infrastructure
gained optimised handling for static char constants.
Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
Diffstat (limited to 'accessibility')
3 files changed, 6 insertions, 8 deletions
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 443feb1d5f54..a24d05bc9135 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -681,8 +681,7 @@ throw(RuntimeException, std::exception) checkActionIndex_Impl( nIndex ); EnsureIsAlive(); - static const OUString sActionDesc( "Select" ); - return sActionDesc; + return OUString( "Select" ); } Reference< XAccessibleKeyBinding > AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 31f0947307f6..fc296b4eb121 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -819,8 +819,8 @@ namespace accessibility checkActionIndex_Impl( nIndex ); EnsureIsAlive(); - static const OUString sActionDesc1( "Check" ); - static const OUString sActionDesc2( "UnCheck" ); + static const char sActionDesc1[] = "Check"; + static const char sActionDesc2[] = "UnCheck"; // sal_Bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); SvButtonState state = getListBox()->GetCheckButtonState( pEntry ); @@ -830,9 +830,9 @@ namespace accessibility if(getAccessibleRole() == AccessibleRole::CHECK_BOX) { if ( state == SV_BUTTON_CHECKED ) - return sActionDesc2; + return OUString(sActionDesc2); else if (state == SV_BUTTON_UNCHECKED) - return sActionDesc1; + return OUString(sActionDesc1); } else { diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 8a1fd5c9fdbe..b52bf85eec16 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -275,8 +275,7 @@ OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); - static const OUString sAction( "activate" ); - return sAction; + return OUString( "activate" ); } |