diff options
| author | Krisztian Pinter <pin.terminator@gmail.com> | 2013-03-08 03:07:46 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-08 02:45:23 +0000 |
| commit | fd4380759d67bcfa582dd8880077ea8445ab8a06 (patch) | |
| tree | 606dee7c3f7e0b6987976302865dfc2a4ac77570 /framework/source/uielement/dropdownboxtoolbarcontroller.cxx | |
| parent | 925138ec7f0a162bd3d984935849226ad91126ca (diff) | |
RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
Change-Id: Ief6418425676d6943993513c4d05c8d22e4740cf
Reviewed-on: https://gerrit.libreoffice.org/2470
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'framework/source/uielement/dropdownboxtoolbarcontroller.cxx')
| -rw-r--r-- | framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index a5438c9c7da8..ac746a76924c 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -127,7 +127,7 @@ DropdownToolbarController::DropdownToolbarController( ToolBox* pToolbar, sal_uInt16 nID, sal_Int32 nWidth, - const ::rtl::OUString& aCommand ) : + const OUString& aCommand ) : ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) , m_pListBoxControl( 0 ) { @@ -169,12 +169,12 @@ throw ( RuntimeException ) Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); - ::rtl::OUString aSelectedText = m_pListBoxControl->GetSelectEntry(); + OUString aSelectedText = m_pListBoxControl->GetSelectEntry(); // Add key modifier to argument list - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" )); + aArgs[0].Name = OUString( "KeyModifier" ); aArgs[0].Value <<= KeyModifier; - aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )); + aArgs[1].Name = OUString( "Text" ); aArgs[1].Value <<= aSelectedText; return aArgs; } @@ -221,7 +221,7 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "List", 4 )) { - Sequence< ::rtl::OUString > aList; + Sequence< OUString > aList; m_pListBoxControl->Clear(); rControlCommand.Arguments[i].Value >>= aList; @@ -232,9 +232,9 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f // send notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" )); + aInfo[0].Name = OUString( "List" ); aInfo[0].Value <<= aList; - addNotifyInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListChanged" )), + addNotifyInfo( OUString( "ListChanged" ), getDispatchFromCommand( m_aCommandURL ), aInfo ); @@ -245,7 +245,7 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f else if ( rControlCommand.Command.equalsAsciiL( "AddEntry", 8 )) { sal_uInt16 nPos( LISTBOX_APPEND ); - rtl::OUString aText; + OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) @@ -259,7 +259,7 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f else if ( rControlCommand.Command.equalsAsciiL( "InsertEntry", 11 )) { sal_uInt16 nPos( LISTBOX_APPEND ); - rtl::OUString aText; + OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Pos", 3 )) @@ -300,7 +300,7 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) { - rtl::OUString aText; + OUString aText; if ( rControlCommand.Arguments[i].Value >>= aText ) m_pListBoxControl->RemoveEntry( aText ); break; |