diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-21 15:52:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-22 08:07:19 +0200 |
| commit | 73342dbb82ba074d01962359dac50fb2aa36cbeb (patch) | |
| tree | addab0397681725810b42ad55ab15be3fdb4c236 /chart2 | |
| parent | 071c3f3e93c4c00cf57ce3c382325cd717fed511 (diff) | |
remove unnecessary RTL_CONSTASCII_STRINGPARAM
A final pass through the code, converting code to use the new
OUString and OString methods that can detect string literals.
Change-Id: Ifa6382335e5650a1c67e52006b26354e0692c710
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ChartFrameloader.cxx | 3 | ||||
| -rw-r--r-- | chart2/source/view/main/ChartView.cxx | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index 8f2f027136f9..9d06b6aebb29 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -140,8 +140,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT if( aIt != aMediaDescriptor.end()) { OUString aURL( (*aIt).second.get< OUString >()); - if( aURL.matchAsciiL( - RTL_CONSTASCII_STRINGPARAM( "private:factory/schart" ))) + if( aURL.startsWith( "private:factory/schart" ) ) { // create new file uno::Reference< frame::XLoadable > xLoadable( xModel, uno::UNO_QUERY_THROW ); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index f501aa956d75..16da8f870b67 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2862,7 +2862,7 @@ Reference< uno::XInterface > ChartView::createInstance( const OUString& aService SdrModel* pModel = ( m_pDrawModelWrapper ? &m_pDrawModelWrapper->getSdrModel() : NULL ); if ( pModel ) { - if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DashTable" ) ) == 0 ) + if ( aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.DashTable" ) == 0 ) { if ( !m_xDashTable.is() ) { @@ -2870,7 +2870,7 @@ Reference< uno::XInterface > ChartView::createInstance( const OUString& aService } return m_xDashTable; } - else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.GradientTable" ) ) == 0 ) + else if ( aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.GradientTable" ) == 0 ) { if ( !m_xGradientTable.is() ) { @@ -2878,7 +2878,7 @@ Reference< uno::XInterface > ChartView::createInstance( const OUString& aService } return m_xGradientTable; } - else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.HatchTable" ) ) == 0 ) + else if ( aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.HatchTable" ) == 0 ) { if ( !m_xHatchTable.is() ) { @@ -2886,7 +2886,7 @@ Reference< uno::XInterface > ChartView::createInstance( const OUString& aService } return m_xHatchTable; } - else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.BitmapTable" ) ) == 0 ) + else if ( aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.BitmapTable" ) == 0 ) { if ( !m_xBitmapTable.is() ) { @@ -2894,7 +2894,7 @@ Reference< uno::XInterface > ChartView::createInstance( const OUString& aService } return m_xBitmapTable; } - else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.TransparencyGradientTable" ) ) == 0 ) + else if ( aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.TransparencyGradientTable" ) == 0 ) { if ( !m_xTransGradientTable.is() ) { @@ -2902,7 +2902,7 @@ Reference< uno::XInterface > ChartView::createInstance( const OUString& aService } return m_xTransGradientTable; } - else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.MarkerTable" ) ) == 0 ) + else if ( aServiceSpecifier.reverseCompareTo( "com.sun.star.drawing.MarkerTable" ) == 0 ) { if ( !m_xMarkerTable.is() ) { |