summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorSzabolcs Dezsi <dezsiszabi@hotmail.com>2012-04-06 14:28:18 +0200
committerJan Holesovsky <kendy@suse.cz>2012-04-06 14:30:05 +0200
commit8a01ee624318ac08800af89d988971114637a04e (patch)
treee4acf35e42ab0c1d0b593bd8970fa2c435f90c95 /chart2
parent6cf547f02c79278430ee75483a3128076cfc609e (diff)
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used: find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\) ) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/main/ElementSelector.cxx2
-rw-r--r--chart2/source/controller/main/ShapeToolbarController.cxx12
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.cxx2
-rw-r--r--chart2/source/tools/DataSourceHelper.cxx16
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx2
-rw-r--r--chart2/source/view/main/ChartView.cxx8
6 files changed, 21 insertions, 21 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();
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index ac11380fa76b..db49b7d20c43 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -201,25 +201,25 @@ void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue
for(sal_Int32 i=0; i<rArguments.getLength(); ++i, ++pArguments)
{
const beans::PropertyValue& aProperty = *pArguments;
- if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataRowSource" ) ))
+ if ( aProperty.Name == "DataRowSource" )
{
::com::sun::star::chart::ChartDataRowSource eRowSource;
if( aProperty.Value >>= eRowSource )
bUseColumns = (eRowSource==::com::sun::star::chart::ChartDataRowSource_COLUMNS);
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FirstCellAsLabel" ) ))
+ else if ( aProperty.Name == "FirstCellAsLabel" )
{
aProperty.Value >>= bFirstCellAsLabel;
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HasCategories" ) ))
+ else if ( aProperty.Name == "HasCategories" )
{
aProperty.Value >>= bHasCategories;
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CellRangeRepresentation" ) ))
+ else if ( aProperty.Name == "CellRangeRepresentation" )
{
aProperty.Value >>= rRangeRepresentation;
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SequenceMapping" ) ))
+ else if ( aProperty.Name == "SequenceMapping" )
{
aProperty.Value >>= rSequenceMapping;
}
@@ -383,19 +383,19 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
for(sal_Int32 i=0; i<aArguments.getLength(); ++i, ++pArguments)
{
const beans::PropertyValue& aProperty = *pArguments;
- if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataRowSource" ) ))
+ if ( aProperty.Name == "DataRowSource" )
{
bHasDataRowSource =
(aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(
::getCppuType( reinterpret_cast<
const ::com::sun::star::chart::ChartDataRowSource * >(0))));
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FirstCellAsLabel" ) ))
+ else if ( aProperty.Name == "FirstCellAsLabel" )
{
bHasFirstCellAsLabel =
(aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(::getBooleanCppuType()));
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CellRangeRepresentation" ) ))
+ else if ( aProperty.Name == "CellRangeRepresentation" )
{
::rtl::OUString aRange;
bHasCellRangeRepresentation =
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 09dfd0508f4c..48e7cb671f80 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -767,7 +767,7 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa
sal_Int32 nIndex = aRangeRepresentation.copy( lcl_aLabelRangePrefix.getLength()).toInt32();
return lcl_createDataSequenceAndAddToMap( lcl_aLabelRangePrefix + OUString::valueOf( nIndex ));
}
- else if( aRangeRepresentation.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "last" )))
+ else if ( aRangeRepresentation == "last" )
{
sal_Int32 nIndex = (m_bDataInColumns
? m_aInternalData.getColumnCount()
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index d8f518790176..250332f08b78 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2883,13 +2883,13 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName
beans::PropertyValue* pDataValues = aZoomFactors.getArray();
while( nFilterArgs-- )
{
- if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleXNumerator" ) ) )
+ if ( pDataValues->Name == "ScaleXNumerator" )
pDataValues->Value >>= m_nScaleXNumerator;
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleXDenominator" ) ) )
+ else if ( pDataValues->Name == "ScaleXDenominator" )
pDataValues->Value >>= m_nScaleXDenominator;
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleYNumerator" ) ) )
+ else if ( pDataValues->Name == "ScaleYNumerator" )
pDataValues->Value >>= m_nScaleYNumerator;
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleYDenominator" ) ) )
+ else if ( pDataValues->Name == "ScaleYDenominator" )
pDataValues->Value >>= m_nScaleYDenominator;
pDataValues++;