diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-06 14:51:42 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-06 14:51:42 +0200 |
| commit | 0c6ebe5d225d6a655f078977455cec6d0a3afa6e (patch) | |
| tree | becc109d0f2684ebf50afc783e089b49dd469661 /chart2/source/controller | |
| parent | merge feature/gbuild_components (diff) | |
| parent | Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator (diff) | |
| download | core-0c6ebe5d225d6a655f078977455cec6d0a3afa6e.tar.gz core-0c6ebe5d225d6a655f078977455cec6d0a3afa6e.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'chart2/source/controller')
| -rw-r--r-- | chart2/source/controller/main/ElementSelector.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/main/ShapeToolbarController.cxx | 12 | ||||
| -rw-r--r-- | chart2/source/controller/main/UndoCommandDispatch.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 71e84b3ace7b..cbd4928f098e 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -307,7 +307,7 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat if( m_apSelectorListBox.get() ) { SolarMutexGuard aSolarMutexGuard; - if( rEvent.FeatureURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ChartElementSelector" ) ) ) + if ( rEvent.FeatureURL.Path == "ChartElementSelector" ) { Reference< frame::XController > xChartController; rEvent.State >>= xChartController; diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index 565eaf0f1bfa..1a655fa23fc2 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -135,37 +135,37 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments break; } } - if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:BasicShapes" ) ) ) + if ( m_aCommandURL == ".uno:BasicShapes" ) { m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BasicShapes" ) ), sal_True ) ); m_nSlotId = SID_DRAWTBX_CS_BASIC; m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) ); } - else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SymbolShapes" ) ) ) + else if ( m_aCommandURL == ".uno:SymbolShapes" ) { m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SymbolShapes" ) ), sal_True ) ); m_nSlotId = SID_DRAWTBX_CS_SYMBOL; m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) ); } - else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:ArrowShapes" ) ) ) + else if ( m_aCommandURL == ".uno:ArrowShapes" ) { m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ArrowShapes" ) ), sal_True ) ); m_nSlotId = SID_DRAWTBX_CS_ARROW; m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox) ); } - else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:FlowChartShapes" ) ) ) + else if ( m_aCommandURL == ".uno:FlowChartShapes" ) { m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FlowChartShapes" ) ), sal_True ) ); m_nSlotId = SID_DRAWTBX_CS_FLOWCHART; m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) ); } - else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:CalloutShapes" ) ) ) + else if ( m_aCommandURL == ".uno:CalloutShapes" ) { m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CalloutShapes" ) ), sal_True ) ); m_nSlotId = SID_DRAWTBX_CS_CALLOUT; m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) ); } - else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:StarShapes" ) ) ) + else if ( m_aCommandURL == ".uno:StarShapes" ) { m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StarShapes" ) ), sal_True ) ); m_nSlotId = SID_DRAWTBX_CS_STAR; diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index f1dbf032ea3c..4c29848813ed 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -111,7 +111,7 @@ void SAL_CALL UndoCommandDispatch::dispatch( SolarMutexGuard aSolarGuard; try { - if( URL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Undo" ))) + if ( URL.Path == "Undo" ) m_xUndoManager->undo(); else m_xUndoManager->redo(); |