Cleanup of C2U macro in chart2.

chart2/source/controller/accessibility/AccessibleBase.cxx

@@ -118,8 +118,7 @@ bool AccessibleBase::CheckDisposeState( bool bThrowException /* default: true */
     if( bThrowException &&
         m_bIsDisposed )
     {
-        throw lang::DisposedException(
-            C2U("component has state DEFUNC" ),
+        throw lang::DisposedException("component has state DEFUNC",
             static_cast< uno::XWeak * >( const_cast< AccessibleBase * >( this )));
     }
     return m_bIsDisposed;
@@ -861,25 +860,25 @@ sal_Int32 AccessibleBase::getColor( eColorType eColType )
                 case OBJECTTYPE_DATA_POINT:
                     if( eColType == ACC_BASE_FOREGROUND )
                     {
-                        aPropName = C2U("BorderColor");
-                        aStylePropName = C2U("BorderTransparency");
+                        aPropName = "BorderColor";
+                        aStylePropName = "BorderTransparency";
                     }
                     else
                     {
-                        aPropName = C2U("Color");
-                        aStylePropName = C2U("Transparency");
+                        aPropName = "Color";
+                        aStylePropName = "Transparency";
                     }
                     break;
                 default:
                     if( eColType == ACC_BASE_FOREGROUND )
                     {
-                        aPropName = C2U("LineColor");
-                        aStylePropName = C2U("LineTransparence");
+                        aPropName = "LineColor";
+                        aStylePropName = "LineTransparence";
                     }
                     else
                     {
-                        aPropName = C2U("FillColor");
-                        aStylePropName = C2U("FillTransparence");
+                        aPropName = "FillColor";
+                        aStylePropName = "FillTransparence";
                     }
                     break;
             }

chart2/source/controller/accessibility/AccessibleChartView.cxx

@@ -334,7 +334,7 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments
 
         {
             AccessibleElementInfo aAccInfo;
-            aAccInfo.m_aOID = ObjectIdentifier( C2U( "ROOT" ) );
+            aAccInfo.m_aOID = ObjectIdentifier("ROOT");
             aAccInfo.m_xChartDocument = uno::WeakReference< chart2::XChartDocument >(
                 uno::Reference< chart2::XChartDocument >( m_xChartModel.get(), uno::UNO_QUERY ));
             aAccInfo.m_xSelectionSupplier = m_xSelectionSupplier;

chart2/source/controller/chartapiwrapper/AreaWrapper.cxx

@@ -133,7 +133,7 @@ void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ )
 ::rtl::OUString SAL_CALL AreaWrapper::getShapeType()
     throw (uno::RuntimeException)
 {
-    return C2U( "com.sun.star.chart.ChartArea" );
+    return rtl::OUString( "com.sun.star.chart.ChartArea" );
 }
 
 // ____ XComponent ____
@@ -182,7 +182,7 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties()
 {
     ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
 
-    aWrappedProperties.push_back( new WrappedDirectStateProperty( C2U("LineStyle"), C2U("LineStyle") ) );
+    aWrappedProperties.push_back( new WrappedDirectStateProperty("LineStyle","LineStyle") );
 
     return aWrappedProperties;
 }
@@ -192,10 +192,10 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties()
 Sequence< ::rtl::OUString > AreaWrapper::getSupportedServiceNames_Static()
 {
     Sequence< ::rtl::OUString > aServices( 4 );
-    aServices[ 0 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
-    aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" );
-    aServices[ 2 ] = C2U( "com.sun.star.drawing.FillProperties" );
-    aServices[ 3 ] = C2U( "com.sun.star.drawing.LineProperties" );
+    aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+    aServices[ 1 ] = "com.sun.star.beans.PropertySet";
+    aServices[ 2 ] = "com.sun.star.drawing.FillProperties";
+    aServices[ 3 ] = "com.sun.star.drawing.LineProperties";
 
     return aServices;
 }

chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx

@@ -72,17 +72,17 @@ void Chart2ModelContact::setModel( const ::com::sun::star::uno::Reference<
     uno::Reference< lang::XMultiServiceFactory > xTableFactory( xChartModel, uno::UNO_QUERY );
     if( xTableFactory.is() )
     {
-        uno::Reference< container::XNameContainer > xDashTable( xTableFactory->createInstance( C2U( "com.sun.star.drawing.DashTable" ) ), uno::UNO_QUERY );
-        uno::Reference< container::XNameContainer > xGradientTable( xTableFactory->createInstance( C2U( "com.sun.star.drawing.GradientTable" ) ), uno::UNO_QUERY );
-        uno::Reference< container::XNameContainer > xHatchTable( xTableFactory->createInstance( C2U( "com.sun.star.drawing.HatchTable" ) ), uno::UNO_QUERY );
-        uno::Reference< container::XNameContainer > xBitmapTable( xTableFactory->createInstance( C2U( "com.sun.star.drawing.BitmapTable" ) ), uno::UNO_QUERY );
-        uno::Reference< container::XNameContainer > xTransparencyGradientTable( xTableFactory->createInstance( C2U( "com.sun.star.drawing.TransparencyGradientTable" ) ), uno::UNO_QUERY );
+        uno::Reference< container::XNameContainer > xDashTable( xTableFactory->createInstance("com.sun.star.drawing.DashTable"), uno::UNO_QUERY );
+        uno::Reference< container::XNameContainer > xGradientTable( xTableFactory->createInstance("com.sun.star.drawing.GradientTable"), uno::UNO_QUERY );
+        uno::Reference< container::XNameContainer > xHatchTable( xTableFactory->createInstance("com.sun.star.drawing.HatchTable"), uno::UNO_QUERY );
+        uno::Reference< container::XNameContainer > xBitmapTable( xTableFactory->createInstance("com.sun.star.drawing.BitmapTable"), uno::UNO_QUERY );
+        uno::Reference< container::XNameContainer > xTransparencyGradientTable( xTableFactory->createInstance("com.sun.star.drawing.TransparencyGradientTable"), uno::UNO_QUERY );
         //C2U( "com.sun.star.drawing.MarkerTable" )
-        m_aTableMap[ C2U( "LineDashName" ) ] = xDashTable;
-        m_aTableMap[ C2U( "FillGradientName" ) ] = xGradientTable;
-        m_aTableMap[ C2U( "FillHatchName" ) ] = xHatchTable;
-        m_aTableMap[ C2U( "FillBitmapName" ) ] = xBitmapTable;
-        m_aTableMap[ C2U( "FillTransparenceGradientName" ) ] = xTransparencyGradientTable;
+        m_aTableMap["LineDashName"] = xDashTable;
+        m_aTableMap["FillGradientName"] = xGradientTable;
+        m_aTableMap["FillHatchName"] = xHatchTable;
+        m_aTableMap["FillBitmapName"] = xBitmapTable;
+        m_aTableMap["FillTransparenceGradientName"] = xTransparencyGradientTable;
     }
 }
 
@@ -215,7 +215,7 @@ awt::Rectangle Chart2ModelContact::GetDiagramRectangleIncludingAxes() const
     {
         ExplicitValueProvider* pProvider( getExplicitValueProvider() );
         if( pProvider )
-            aRect = pProvider->getRectangleOfObject( C2U("PlotAreaIncludingAxes") );
+            aRect = pProvider->getRectangleOfObject("PlotAreaIncludingAxes");
     }
     return aRect;
 }

chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx

@@ -697,9 +697,9 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator )
     uno::Reference< beans::XPropertySet > xDiaProp( xOldDoc->getDiagram(), uno::UNO_QUERY );
     if( xDiaProp.is())
     {
-        xDiaProp->getPropertyValue( C2U("Stacked")) >>= bStacked;
-        xDiaProp->getPropertyValue( C2U("Percent")) >>= bPercent;
-        xDiaProp->getPropertyValue( C2U("Deep")) >>= bDeep;
+        xDiaProp->getPropertyValue("Stacked") >>= bStacked;
+        xDiaProp->getPropertyValue("Percent") >>= bPercent;
+        xDiaProp->getPropertyValue("Deep") >>= bDeep;
     }
 
     //detect arguments for the new data source
@@ -716,7 +716,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator )
     if( !bHasCategories && rDataOperator.setsCategories( bUseColumns ) )
         bHasCategories = true;
 
-    aRangeString = C2U("all");
+    aRangeString = "all";
     uno::Sequence< beans::PropertyValue > aArguments( DataSourceHelper::createArguments(
             aRangeString, aSequenceMapping, bUseColumns, bFirstCellAsLabel, bHasCategories ) );
 
@@ -761,8 +761,8 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator )
 uno::Sequence< ::rtl::OUString > ChartDataWrapper::getSupportedServiceNames_Static()
 {
     uno::Sequence< ::rtl::OUString > aServices( 2 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart.ChartDataArray" );
-    aServices[ 1 ] = C2U( "com.sun.star.chart.ChartData" );
+    aServices[ 0 ] = "com.sun.star.chart.ChartDataArray";
+    aServices[ 1 ] = "com.sun.star.chart.ChartData";
 
     return aServices;
 }