diff options
author | Noel Grandin <noel@peralex.com> | 2013-12-09 12:51:35 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-12-09 12:53:18 +0200 |
commit | c5b7a5fd191a8ec65a64980fe3197832dba1ffae (patch) | |
tree | a4da3b16cd52626274819345cfbac480b04eef52 /framework/source/uielement/comboboxtoolbarcontroller.cxx | |
parent | aefd8ff742f8952327f1bddc37e62317d69ffb7d (diff) |
fix equalsAscii conversion. Noticed in fdo#72391
In commit 363cc397172f2b0a94d9c4dc44fc8d95072795a3
"convert equalsAsciiL calls to startWith calls where possible"
I incorrectly converted equalsAsciiL calls to startsWith calls.
This commit fixes those places to use the == OUString operator.
Change-Id: If76993baf73e3d8fb3bbcf6e8314e59fdc1207b6
Diffstat (limited to 'framework/source/uielement/comboboxtoolbarcontroller.cxx')
-rw-r--r-- | framework/source/uielement/comboboxtoolbarcontroller.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 9e2003ffb09c..6310d92cef19 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -263,11 +263,11 @@ long ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { - if ( rControlCommand.Command.startsWith( "SetText" )) + if ( rControlCommand.Command == "SetText" ) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.startsWith( "Text")) + if ( rControlCommand.Arguments[i].Name == "Text" ) { OUString aText; rControlCommand.Arguments[i].Value >>= aText; @@ -279,11 +279,11 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.startsWith( "SetList" )) + else if ( rControlCommand.Command == "SetList" ) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.startsWith( "List" )) + if ( rControlCommand.Arguments[i].Name == "List" ) { Sequence< OUString > aList; m_pComboBox->Clear(); @@ -304,13 +304,13 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.startsWith( "AddEntry" )) + else if ( rControlCommand.Command == "AddEntry" ) { sal_uInt16 nPos( COMBOBOX_APPEND ); OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.startsWith( "Text" )) + if ( rControlCommand.Arguments[i].Name == "Text" ) { if ( rControlCommand.Arguments[i].Value >>= aText ) m_pComboBox->InsertEntry( aText, nPos ); @@ -318,13 +318,13 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.startsWith( "InsertEntry" )) + else if ( rControlCommand.Command == "InsertEntry" ) { sal_uInt16 nPos( COMBOBOX_APPEND ); OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.startsWith( "Pos" )) + if ( rControlCommand.Arguments[i].Name == "Pos" ) { sal_Int32 nTmpPos = 0; if ( rControlCommand.Arguments[i].Value >>= nTmpPos ) @@ -334,17 +334,17 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f nPos = sal_uInt16( nTmpPos ); } } - else if ( rControlCommand.Arguments[i].Name.startsWith( "Text" )) + else if ( rControlCommand.Arguments[i].Name == "Text" ) rControlCommand.Arguments[i].Value >>= aText; } m_pComboBox->InsertEntry( aText, nPos ); } - else if ( rControlCommand.Command.startsWith( "RemoveEntryPos" )) + else if ( rControlCommand.Command == "RemoveEntryPos" ) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.startsWith( "Pos" )) + if ( rControlCommand.Arguments[i].Name == "Pos" ) { sal_Int32 nPos( -1 ); if ( rControlCommand.Arguments[i].Value >>= nPos ) @@ -356,11 +356,11 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.startsWith( "RemoveEntryText" )) + else if ( rControlCommand.Command == "RemoveEntryText" ) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.startsWith( "Text")) + if ( rControlCommand.Arguments[i].Name == "Text") { OUString aText; if ( rControlCommand.Arguments[i].Value >>= aText ) @@ -369,11 +369,11 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.startsWith( "SetDropDownLines" )) + else if ( rControlCommand.Command == "SetDropDownLines" ) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.startsWith( "Lines" )) + if ( rControlCommand.Arguments[i].Name == "Lines" ) { sal_Int32 nValue( 5 ); rControlCommand.Arguments[i].Value >>= nValue; @@ -382,11 +382,11 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.startsWith( "SetBackgroundColor" )) + else if ( rControlCommand.Command == "SetBackgroundColor" ) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.startsWith( "Color" )) + if ( rControlCommand.Arguments[i].Name == "Color" ) { com::sun::star::util::Color aColor(0); if ( rControlCommand.Arguments[i].Value >>= aColor ) @@ -398,11 +398,11 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.startsWith( "SetTextColor" )) + else if ( rControlCommand.Command == "SetTextColor" ) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.startsWith( "Color" )) + if ( rControlCommand.Arguments[i].Name == "Color" ) { com::sun::star::util::Color aColor(0); if ( rControlCommand.Arguments[i].Value >>= aColor ) |