Cleanup of C2U macro in chart2.

8 files changed, 231 insertions, 234 deletions

diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 526111fe5941..2c90880a0f9b 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/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;
             }
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 970f730ab92f..1448429cafcc 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/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;
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 340a6ad29f22..0d3a638f2e6a 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/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;
 }
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index ce1021daef20..69a18b6b3c25 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -117,28 +117,28 @@ void lcl_AddPropertiesToVector(
 {
     //Properties for scaling:
     rOutProperties.push_back(
-        Property( C2U( "Max" ),
+        Property( "Max",
                   PROP_AXIS_MAX,
                   ::getCppuType( reinterpret_cast< const double * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "Min" ),
+        Property( "Min",
                   PROP_AXIS_MIN,
                   ::getCppuType( reinterpret_cast< const double * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "StepMain" ),
+        Property( "StepMain",
                   PROP_AXIS_STEPMAIN,
                   ::getCppuType( reinterpret_cast< const double * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "StepHelpCount" ),
+        Property( "StepHelpCount",
                   PROP_AXIS_STEPHELP_COUNT,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -146,70 +146,70 @@ void lcl_AddPropertiesToVector(
 
     //deprecated property use 'StepHelpCount' instead
     rOutProperties.push_back(
-        Property( C2U( "StepHelp" ),
+        Property( "StepHelp",
                   PROP_AXIS_STEPHELP,
                   ::getCppuType( reinterpret_cast< const double * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "AutoMax" ),
+        Property( "AutoMax",
                   PROP_AXIS_AUTO_MAX,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "AutoMin" ),
+        Property( "AutoMin",
                   PROP_AXIS_AUTO_MIN,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "AutoStepMain" ),
+        Property( "AutoStepMain",
                   PROP_AXIS_AUTO_STEPMAIN,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "AutoStepHelp" ),
+        Property( "AutoStepHelp",
                   PROP_AXIS_AUTO_STEPHELP,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "AxisType" ),
+        Property( "AxisType",
                   PROP_AXIS_TYPE,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), //type com::sun::star::chart::ChartAxisType
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "TimeIncrement" ),
+        Property( "TimeIncrement",
                   PROP_AXIS_TIME_INCREMENT,
                   ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::TimeIncrement * >(0)),
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "ExplicitTimeIncrement" ),
+        Property( "ExplicitTimeIncrement",
                   PROP_AXIS_EXPLICIT_TIME_INCREMENT,
                   ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::TimeIncrement * >(0)),
                   beans::PropertyAttribute::READONLY |
                   beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "Logarithmic" ),
+        Property( "Logarithmic",
                   PROP_AXIS_LOGARITHMIC,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "ReverseDirection" ),
+        Property( "ReverseDirection",
                   PROP_AXIS_REVERSEDIRECTION,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
@@ -217,34 +217,34 @@ void lcl_AddPropertiesToVector(
 
     //todo: this property is missing in the API
     rOutProperties.push_back(
-        Property( C2U( "Visible" ),
+        Property( "Visible",
                   PROP_AXIS_VISIBLE,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "CrossoverPosition" ),
+        Property( "CrossoverPosition",
                   PROP_AXIS_CROSSOVER_POSITION,
                   ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisPosition * >(0)),
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "CrossoverValue" ),
+        Property( "CrossoverValue",
                   PROP_AXIS_CROSSOVER_VALUE,
                   ::getCppuType( reinterpret_cast< const double * >(0)),
                   beans::PropertyAttribute::MAYBEVOID ));
 
 
     rOutProperties.push_back(
-        Property( C2U( "Origin" ),
+        Property( "Origin",
                   PROP_AXIS_ORIGIN,
                   ::getCppuType( reinterpret_cast< const double * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "AutoOrigin" ),
+        Property( "AutoOrigin",
                   PROP_AXIS_AUTO_ORIGIN,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
@@ -252,21 +252,21 @@ void lcl_AddPropertiesToVector(
 
     //Properties for interval marks:
     rOutProperties.push_back(
-        Property( C2U( "Marks" ),
+        Property( "Marks",
                   PROP_AXIS_MARKS,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "HelpMarks" ),
+        Property( "HelpMarks",
                   PROP_AXIS_HELPMARKS,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "MarkPosition" ),
+        Property( "MarkPosition",
                   PROP_AXIS_MARK_POSITION,
                   ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisMarkPosition * >(0)),
                   beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -274,62 +274,62 @@ void lcl_AddPropertiesToVector(
 
     //Properties for labels:
     rOutProperties.push_back(
-        Property( C2U( "DisplayLabels" ),
+        Property( "DisplayLabels",
                   PROP_AXIS_DISPLAY_LABELS,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "NumberFormat" ),
+        Property( "NumberFormat",
                   PROP_AXIS_NUMBERFORMAT,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "LinkNumberFormatToSource" ),
+        Property( "LinkNumberFormatToSource",
                   PROP_AXIS_LINK_NUMBERFORMAT_TO_SOURCE,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "LabelPosition" ),
+        Property( "LabelPosition",
                   PROP_AXIS_LABEL_POSITION,
                   ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisLabelPosition * >(0)),
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "TextRotation" ),
+        Property( "TextRotation",
                   PROP_AXIS_TEXT_ROTATION,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "ArrangeOrder" ),
+        Property( "ArrangeOrder",
                   PROP_AXIS_ARRANGE_ORDER,
                   ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisArrangeOrderType * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "TextBreak" ),
+        Property( "TextBreak",
                   PROP_AXIS_TEXTBREAK,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "TextCanOverlap" ),
+        Property( "TextCanOverlap",
                   PROP_AXIS_CAN_OVERLAP,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "StackedText" ),
+        Property( "StackedText",
                   PROP_AXIS_STACKEDTEXT,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
@@ -337,14 +337,14 @@ void lcl_AddPropertiesToVector(
 
     // Properties related to bar charts:
     rOutProperties.push_back(
-        Property( C2U( "Overlap" ),
+        Property( "Overlap",
                   PROP_AXIS_OVERLAP,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "GapWidth" ),
+        Property( "GapWidth",
                   PROP_AXIS_GAP_WIDTH,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   //#i111967# no PropertyChangeEvent is fired on change so far
@@ -510,7 +510,7 @@ void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ )
 OUString SAL_CALL AxisWrapper::getShapeType()
     throw (uno::RuntimeException)
 {
-    return C2U( "com.sun.star.chart.ChartAxis" );
+    return rtl::OUString("com.sun.star.chart.ChartAxis");
 }
 
 // ____ XNumberFormatsSupplier ____
@@ -587,8 +587,8 @@ void AxisWrapper::updateReferenceSize()
     Reference< beans::XPropertySet > xProp( this->getAxis(), uno::UNO_QUERY );
     if( xProp.is() )
     {
-        if( xProp->getPropertyValue( C2U("ReferencePageSize") ).hasValue() )
-            xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
+        if( xProp->getPropertyValue("ReferencePageSize").hasValue() )
+            xProp->setPropertyValue("ReferencePageSize", uno::makeAny(
             m_spChart2ModelContact->GetPageSize() ));
     }
 }
@@ -597,7 +597,7 @@ Any AxisWrapper::getReferenceSize()
     Any aRet;
     Reference< beans::XPropertySet > xProp( this->getAxis(), uno::UNO_QUERY );
     if( xProp.is() )
-        aRet = xProp->getPropertyValue( C2U("ReferencePageSize") );
+        aRet = xProp->getPropertyValue("ReferencePageSize");
     return aRet;
 }
 awt::Size AxisWrapper::getCurrentSizeForReference()
@@ -623,7 +623,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis()
             xAxis = AxisHelper::createAxis( nDimensionIndex, bMainAxis, xDiagram, m_spChart2ModelContact->m_xContext );
             Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY );
             if( xProp.is() )
-                xProp->setPropertyValue( C2U( "Show" ), uno::makeAny( sal_False ) );
+                xProp->setPropertyValue("Show", uno::makeAny( sal_False ) );
         }
     }
     catch( const uno::Exception & ex )
@@ -649,18 +649,18 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
     ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
 
     aWrappedProperties.push_back( new WrappedTextRotationProperty() );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "Marks" ), C2U( "MajorTickmarks" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "HelpMarks" ), C2U( "MinorTickmarks" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "TextCanOverlap" ), C2U( "TextOverlap" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "ArrangeOrder" ), C2U( "ArrangeOrder" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "Visible" ), C2U( "Show" ) ) );
-    aWrappedProperties.push_back( new WrappedDirectStateProperty( C2U( "DisplayLabels" ), C2U( "DisplayLabels" ) ) );
-    aWrappedProperties.push_back( new WrappedDirectStateProperty( C2U( "TextBreak" ), C2U( "TextBreak" ) ) );
+    aWrappedProperties.push_back( new WrappedProperty("Marks","MajorTickmarks") );
+    aWrappedProperties.push_back( new WrappedProperty("HelpMarks","MinorTickmarks") );
+    aWrappedProperties.push_back( new WrappedProperty("TextCanOverlap","TextOverlap") );
+    aWrappedProperties.push_back( new WrappedProperty("ArrangeOrder","ArrangeOrder") );
+    aWrappedProperties.push_back( new WrappedProperty("Visible","Show") );
+    aWrappedProperties.push_back( new WrappedDirectStateProperty("DisplayLabels","DisplayLabels") );
+    aWrappedProperties.push_back( new WrappedDirectStateProperty("TextBreak","TextBreak") );
     WrappedNumberFormatProperty* pWrappedNumberFormatProperty = new WrappedNumberFormatProperty( m_spChart2ModelContact );
     aWrappedProperties.push_back( pWrappedNumberFormatProperty );
     aWrappedProperties.push_back( new WrappedLinkNumberFormatProperty(pWrappedNumberFormatProperty) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "StackedText" ), C2U( "StackCharacters" ) ) );
-    aWrappedProperties.push_back( new WrappedDirectStateProperty( C2U( "CrossoverPosition" ), C2U( "CrossoverPosition" ) ) );
+    aWrappedProperties.push_back( new WrappedProperty("StackedText","StackCharacters") );
+    aWrappedProperties.push_back( new WrappedDirectStateProperty("CrossoverPosition","CrossoverPosition") );
     {
         WrappedGapwidthProperty* pWrappedGapwidthProperty( new WrappedGapwidthProperty( m_spChart2ModelContact ) );
         WrappedBarOverlapProperty* pWrappedBarOverlapProperty( new WrappedBarOverlapProperty( m_spChart2ModelContact ) );
@@ -689,9 +689,9 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
 Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServices( 3 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart.ChartAxis" );
-    aServices[ 1 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
-    aServices[ 2 ] = C2U( "com.sun.star.style.CharacterProperties" );
+    aServices[ 0 ] = "com.sun.star.chart.ChartAxis";
+    aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+    aServices[ 2 ] = "com.sun.star.style.CharacterProperties";
 
     return aServices;
 }
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index f90aebba1f34..91e9d2810072 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/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;
 }
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index fede6a523944..5f73f89dd9a2 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/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;
 }
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 707d365c45e8..76fd95e5b848 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -119,27 +119,27 @@ tServiceNameMap & lcl_getStaticServiceNameMap()
 {
     static tServiceNameMap aServiceNameMap(
         tMakeServiceNameMap
-        ( C2U( "com.sun.star.chart.AreaDiagram" ),                    SERVICE_NAME_AREA_DIAGRAM )
-        ( C2U( "com.sun.star.chart.BarDiagram" ),                     SERVICE_NAME_BAR_DIAGRAM )
-        ( C2U( "com.sun.star.chart.DonutDiagram" ),                   SERVICE_NAME_DONUT_DIAGRAM )
-        ( C2U( "com.sun.star.chart.LineDiagram" ),                    SERVICE_NAME_LINE_DIAGRAM )
-        ( C2U( "com.sun.star.chart.NetDiagram" ),                     SERVICE_NAME_NET_DIAGRAM )
-        ( C2U( "com.sun.star.chart.FilledNetDiagram" ),               SERVICE_NAME_FILLED_NET_DIAGRAM )
-        ( C2U( "com.sun.star.chart.PieDiagram" ),                     SERVICE_NAME_PIE_DIAGRAM )
-        ( C2U( "com.sun.star.chart.StockDiagram" ),                   SERVICE_NAME_STOCK_DIAGRAM )
-        ( C2U( "com.sun.star.chart.XYDiagram" ),                      SERVICE_NAME_XY_DIAGRAM )
-        ( C2U( "com.sun.star.chart.BubbleDiagram" ),                  SERVICE_NAME_BUBBLE_DIAGRAM )
-
-        ( C2U( "com.sun.star.drawing.DashTable" ),                    SERVICE_NAME_DASH_TABLE )
-        ( C2U( "com.sun.star.drawing.GradientTable" ),                SERVICE_NAME_GARDIENT_TABLE )
-        ( C2U( "com.sun.star.drawing.HatchTable" ),                   SERVICE_NAME_HATCH_TABLE )
-        ( C2U( "com.sun.star.drawing.BitmapTable" ),                  SERVICE_NAME_BITMAP_TABLE )
-        ( C2U( "com.sun.star.drawing.TransparencyGradientTable" ),    SERVICE_NAME_TRANSP_GRADIENT_TABLE )
-        ( C2U( "com.sun.star.drawing.MarkerTable" ),                  SERVICE_NAME_MARKER_TABLE )
-
-        ( C2U( "com.sun.star.xml.NamespaceMap" ),                     SERVICE_NAME_NAMESPACE_MAP )
-        ( C2U( "com.sun.star.document.ExportGraphicObjectResolver" ), SERVICE_NAME_EXPORT_GRAPHIC_RESOLVER )
-        ( C2U( "com.sun.star.document.ImportGraphicObjectResolver" ), SERVICE_NAME_IMPORT_GRAPHIC_RESOLVER )
+        ( "com.sun.star.chart.AreaDiagram",                    SERVICE_NAME_AREA_DIAGRAM )
+        ( "com.sun.star.chart.BarDiagram",                     SERVICE_NAME_BAR_DIAGRAM )
+        ( "com.sun.star.chart.DonutDiagram",                   SERVICE_NAME_DONUT_DIAGRAM )
+        ( "com.sun.star.chart.LineDiagram",                    SERVICE_NAME_LINE_DIAGRAM )
+        ( "com.sun.star.chart.NetDiagram",                     SERVICE_NAME_NET_DIAGRAM )
+        ( "com.sun.star.chart.FilledNetDiagram",               SERVICE_NAME_FILLED_NET_DIAGRAM )
+        ( "com.sun.star.chart.PieDiagram",                     SERVICE_NAME_PIE_DIAGRAM )
+        ( "com.sun.star.chart.StockDiagram",                   SERVICE_NAME_STOCK_DIAGRAM )
+        ( "com.sun.star.chart.XYDiagram",                      SERVICE_NAME_XY_DIAGRAM )
+        ( "com.sun.star.chart.BubbleDiagram",                  SERVICE_NAME_BUBBLE_DIAGRAM )
+
+        ( "com.sun.star.drawing.DashTable",                    SERVICE_NAME_DASH_TABLE )
+        ( "com.sun.star.drawing.GradientTable",                SERVICE_NAME_GARDIENT_TABLE )
+        ( "com.sun.star.drawing.HatchTable",                   SERVICE_NAME_HATCH_TABLE )
+        ( "com.sun.star.drawing.BitmapTable",                  SERVICE_NAME_BITMAP_TABLE )
+        ( "com.sun.star.drawing.TransparencyGradientTable",    SERVICE_NAME_TRANSP_GRADIENT_TABLE )
+        ( "com.sun.star.drawing.MarkerTable",                  SERVICE_NAME_MARKER_TABLE )
+
+        ( "com.sun.star.xml.NamespaceMap",                     SERVICE_NAME_NAMESPACE_MAP )
+        ( "com.sun.star.document.ExportGraphicObjectResolver", SERVICE_NAME_EXPORT_GRAPHIC_RESOLVER )
+        ( "com.sun.star.document.ImportGraphicObjectResolver", SERVICE_NAME_IMPORT_GRAPHIC_RESOLVER )
         );
 
     return aServiceNameMap;
@@ -165,19 +165,19 @@ void lcl_AddPropertiesToVector(
     ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
-        Property( C2U( "HasMainTitle" ),
+        Property( "HasMainTitle",
                   PROP_DOCUMENT_HAS_MAIN_TITLE,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "HasSubTitle" ),
+        Property( "HasSubTitle",
                   PROP_DOCUMENT_HAS_SUB_TITLE,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "HasLegend" ),
+        Property( "HasLegend",
                   PROP_DOCUMENT_HAS_LEGEND,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
@@ -185,13 +185,13 @@ void lcl_AddPropertiesToVector(
 
     // really needed?
     rOutProperties.push_back(
-        Property( C2U( "DataSourceLabelsInFirstRow" ),
+        Property( "DataSourceLabelsInFirstRow",
                   PROP_DOCUMENT_LABELS_IN_FIRST_ROW,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "DataSourceLabelsInFirstColumn" ),
+        Property( "DataSourceLabelsInFirstColumn",
                   PROP_DOCUMENT_LABELS_IN_FIRST_COLUMN,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
@@ -199,26 +199,26 @@ void lcl_AddPropertiesToVector(
 
     //add-in
     rOutProperties.push_back(
-        Property( C2U( "AddIn" ),
+        Property( "AddIn",
                   PROP_DOCUMENT_ADDIN,
                   ::getCppuType( reinterpret_cast< Reference< util::XRefreshable > * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
-        Property( C2U( "BaseDiagram" ),
+        Property( "BaseDiagram",
                   PROP_DOCUMENT_BASEDIAGRAM,
                   ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
-        Property( C2U( "AdditionalShapes" ),
+        Property( "AdditionalShapes",
                   PROP_DOCUMENT_ADDITIONAL_SHAPES,
                   ::getCppuType( reinterpret_cast< Reference< drawing::XShapes > * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID
                   | beans::PropertyAttribute::READONLY ));
     rOutProperties.push_back(
-        Property( C2U( "RefreshAddInAllowed" ),
+        Property( "RefreshAddInAllowed",
                   PROP_DOCUMENT_UPDATE_ADDIN,
                   ::getBooleanCppuType(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
@@ -226,19 +226,19 @@ void lcl_AddPropertiesToVector(
 
     // table:null-date // i99104
     rOutProperties.push_back(
-        Property( C2U( "NullDate" ),
+        Property( "NullDate",
                   PROP_DOCUMENT_NULL_DATE,
                   ::getCppuType( static_cast< const ::com::sun::star::util::DateTime * >(0)),
                   beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "DisableComplexChartTypes" ),
+        Property( "DisableComplexChartTypes",
                   PROP_DOCUMENT_DISABLE_COMPLEX_CHARTTYPES,
                   ::getBooleanCppuType(),
                   //#i112666# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEDEFAULT ) );
     rOutProperties.push_back(
-        Property( C2U( "DisableDataTableDialog" ),
+        Property( "DisableDataTableDialog",
                   PROP_DOCUMENT_DISABLE_DATATABLE_DIALOG,
                   ::getBooleanCppuType(),
                   //#i112666# no PropertyChangeEvent is fired on change so far
@@ -301,7 +301,7 @@ private: //member
 };
 
 WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-            : WrappedProperty(C2U("DataSourceLabelsInFirstRow"),OUString())
+            : WrappedProperty("DataSourceLabelsInFirstRow",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
             , m_aOuterValue()
 {
@@ -317,7 +317,7 @@ void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOu
 {
     sal_Bool bLabelsInFirstRow = sal_True;
     if( ! (rOuterValue >>= bLabelsInFirstRow) )
-        throw lang::IllegalArgumentException( C2U("Property DataSourceLabelsInFirstRow requires value of type boolean"), 0, 0 );
+        throw lang::IllegalArgumentException("Property DataSourceLabelsInFirstRow requires value of type boolean", 0, 0 );
 
     m_aOuterValue = rOuterValue;
     bool bNewValue = bLabelsInFirstRow;
@@ -402,7 +402,7 @@ private: //member
 };
 
 WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColumnProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-            : WrappedProperty(C2U("DataSourceLabelsInFirstColumn"),OUString())
+            : WrappedProperty("DataSourceLabelsInFirstColumn",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
             , m_aOuterValue()
 {
@@ -418,7 +418,7 @@ void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any&
 {
     sal_Bool bLabelsInFirstRow = sal_True;
     if( ! (rOuterValue >>= bLabelsInFirstRow) )
-        throw lang::IllegalArgumentException( C2U("Property DataSourceLabelsInFirstRow requires value of type boolean"), 0, 0 );
+        throw lang::IllegalArgumentException("Property DataSourceLabelsInFirstRow requires value of type boolean", 0, 0 );
 
     m_aOuterValue = rOuterValue;
     bool bNewValue = bLabelsInFirstRow;
@@ -502,7 +502,7 @@ private: //member
 };
 
 WrappedHasLegendProperty::WrappedHasLegendProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-            : WrappedProperty(C2U("HasLegend"),OUString())
+            : WrappedProperty("HasLegend",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
 {
 }
@@ -516,7 +516,7 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R
 {
     sal_Bool bNewValue = sal_True;
     if( ! (rOuterValue >>= bNewValue) )
-        throw lang::IllegalArgumentException( C2U("Property HasLegend requires value of type boolean"), 0, 0 );
+        throw lang::IllegalArgumentException("Property HasLegend requires value of type boolean", 0, 0 );
 
     try
     {
@@ -525,10 +525,10 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R
         {
             Reference< beans::XPropertySet > xLegendProp( xLegend, uno::UNO_QUERY_THROW );
             sal_Bool bOldValue = sal_True;
-            Any aAOld = xLegendProp->getPropertyValue( C2U("Show") );
+            Any aAOld = xLegendProp->getPropertyValue("Show");
             aAOld >>= bOldValue;
             if( bOldValue != bNewValue )
-                xLegendProp->setPropertyValue( C2U("Show"), uno::makeAny( bNewValue ));
+                xLegendProp->setPropertyValue("Show", uno::makeAny( bNewValue ));
         }
     }
     catch (const uno::Exception& ex)
@@ -546,7 +546,7 @@ Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropert
         Reference< beans::XPropertySet > xLegendProp(
             LegendHelper::getLegend( m_spChart2ModelContact->getChartModel() ), uno::UNO_QUERY );
         if( xLegendProp.is())
-            aRet = xLegendProp->getPropertyValue( C2U("Show"));
+            aRet = xLegendProp->getPropertyValue("Show");
         else
             aRet <<= sal_False;
     }
@@ -589,7 +589,7 @@ private: //member
 };
 
 WrappedHasMainTitleProperty::WrappedHasMainTitleProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-            : WrappedProperty(C2U("HasMainTitle"),OUString())
+            : WrappedProperty("HasMainTitle",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
 {
 }
@@ -603,12 +603,12 @@ void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, cons
 {
     sal_Bool bNewValue = sal_True;
     if( ! (rOuterValue >>= bNewValue) )
-        throw lang::IllegalArgumentException( C2U("Property HasMainTitle requires value of type boolean"), 0, 0 );
+        throw lang::IllegalArgumentException("Property HasMainTitle requires value of type boolean", 0, 0 );
 
     try
     {
         if( bNewValue )
-            TitleHelper::createTitle( TitleHelper::MAIN_TITLE, C2U("main-title"), m_spChart2ModelContact->getChartModel(), m_spChart2ModelContact->m_xContext );
+            TitleHelper::createTitle( TitleHelper::MAIN_TITLE, "main-title", m_spChart2ModelContact->getChartModel(), m_spChart2ModelContact->m_xContext );
         else
             TitleHelper::removeTitle( TitleHelper::MAIN_TITLE, m_spChart2ModelContact->getChartModel() );
     }
@@ -665,7 +665,7 @@ private: //member
 };
 
 WrappedHasSubTitleProperty::WrappedHasSubTitleProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-            : WrappedProperty(C2U("HasSubTitle"),OUString())
+            : WrappedProperty("HasSubTitle",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
 {
 }
@@ -679,13 +679,13 @@ void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const
 {
     sal_Bool bNewValue = sal_True;
     if( ! (rOuterValue >>= bNewValue) )
-        throw lang::IllegalArgumentException( C2U("Property HasSubTitle requires value of type boolean"), 0, 0 );
+        throw lang::IllegalArgumentException("Property HasSubTitle requires value of type boolean", 0, 0 );
 
 
     try
     {
         if( bNewValue )
-            TitleHelper::createTitle( TitleHelper::SUB_TITLE, C2U("sub-title"), m_spChart2ModelContact->getChartModel(), m_spChart2ModelContact->m_xContext );
+            TitleHelper::createTitle( TitleHelper::SUB_TITLE, "sub-title", m_spChart2ModelContact->getChartModel(), m_spChart2ModelContact->m_xContext );
         else
             TitleHelper::removeTitle( TitleHelper::SUB_TITLE, m_spChart2ModelContact->getChartModel() );
     }
@@ -972,8 +972,7 @@ void SAL_CALL ChartDocumentWrapper::dispose()
     throw (uno::RuntimeException)
 {
     if( m_bIsDisposed )
-        throw lang::DisposedException(
-            C2U("ChartDocumentWrapper is disposed" ),
+        throw lang::DisposedException("ChartDocumentWrapper is disposed",
             static_cast< ::cppu::OWeakObject* >( this ));
 
     m_bIsDisposed = true;
@@ -1200,8 +1199,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                 if( xManagerFact.is())
                 {
                     xTemplate.set(
-                        xManagerFact->createInstance(
-                            C2U( "com.sun.star.chart2.template.Area" )), uno::UNO_QUERY );
+                        xManagerFact->createInstance("com.sun.star.chart2.template.Area"),
+                                uno::UNO_QUERY );
                     bCreateDiagram = true;
                 }
                 break;
@@ -1211,8 +1210,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                     // this is for bar and column (the latter is the default if
                     // no "Vertical=false" property was set)
                     xTemplate.set(
-                        xManagerFact->createInstance(
-                            C2U( "com.sun.star.chart2.template.Column" )), uno::UNO_QUERY );
+                        xManagerFact->createInstance("com.sun.star.chart2.template.Column"),
+                                uno::UNO_QUERY );
                     bCreateDiagram = true;
                 }
                 break;
@@ -1220,8 +1219,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                 if( xManagerFact.is())
                 {
                     xTemplate.set(
-                        xManagerFact->createInstance(
-                            C2U( "com.sun.star.chart2.template.Donut" )), uno::UNO_QUERY );
+                        xManagerFact->createInstance("com.sun.star.chart2.template.Donut"),
+                                uno::UNO_QUERY );
                     bCreateDiagram = true;
                 }
                 break;
@@ -1229,8 +1228,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                 if( xManagerFact.is())
                 {
                     xTemplate.set(
-                        xManagerFact->createInstance(
-                            C2U( "com.sun.star.chart2.template.Line" )), uno::UNO_QUERY );
+                        xManagerFact->createInstance("com.sun.star.chart2.template.Line"),
+                                uno::UNO_QUERY );
                     bCreateDiagram = true;
                 }
                 break;
@@ -1238,8 +1237,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                 if( xManagerFact.is())
                 {
                     xTemplate.set(
-                        xManagerFact->createInstance(
-                            C2U( "com.sun.star.chart2.template.Net" )), uno::UNO_QUERY );
+                        xManagerFact->createInstance("com.sun.star.chart2.template.Net"),
+                                uno::UNO_QUERY );
                     bCreateDiagram = true;
                 }
                 break;
@@ -1247,16 +1246,16 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                 if( xManagerFact.is())
                 {
                     xTemplate.set(
-                        xManagerFact->createInstance(
-                            C2U( "com.sun.star.chart2.template.FilledNet" )), uno::UNO_QUERY );
+                        xManagerFact->createInstance("com.sun.star.chart2.template.FilledNet"),
+                                uno::UNO_QUERY );
                     bCreateDiagram = true;
                 }
             case SERVICE_NAME_PIE_DIAGRAM:
                 if( xManagerFact.is())
                 {
                     xTemplate.set(
-                        xManagerFact->createInstance(
-                            C2U( "com.sun.star.chart2.template.Pie" )), uno::UNO_QUERY );
+                        xManagerFact->createInstance("com.sun.star.chart2.template.Pie"),
+                                uno::UNO_QUERY );
                     bCreateDiagram = true;
                 }
                 break;
@@ -1264,8 +1263,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                 if( xManagerFact.is())
                 {
                     xTemplate.set(
-                        xManagerFact->createInstance(
-                            C2U( "com.sun.star.chart2.template.StockLowHighClose" )), uno::UNO_QUERY );
+                        xManagerFact->createInstance("com.sun.star.chart2.template.StockLowHighClose"),
+                                uno::UNO_QUERY );
                     bCreateDiagram = true;
                 }
                 break;
@@ -1273,8 +1272,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                 if( xManagerFact.is())
                 {
                     xTemplate.set(
-                        xManagerFact->createInstance(
-                            C2U( "com.sun.star.chart2.template.ScatterLineSymbol" )), uno::UNO_QUERY );
+                        xManagerFact->createInstance("com.sun.star.chart2.template.ScatterLineSymbol"),
+                                uno::UNO_QUERY );
                     bCreateDiagram = true;
                 }
                 break;
@@ -1283,8 +1282,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                 if( xManagerFact.is())
                 {
                     xTemplate.set(
-                        xManagerFact->createInstance(
-                            C2U( "com.sun.star.chart2.template.Bubble" )), uno::UNO_QUERY );
+                        xManagerFact->createInstance("com.sun.star.chart2.template.Bubble"),
+                                uno::UNO_QUERY );
                     bCreateDiagram = true;
                 }
                 break;
@@ -1359,7 +1358,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
         xResult.set( xChartRenderer );
         bServiceFound = true;
     }
-    else if( aServiceSpecifier.equals( C2U("com.sun.star.comp.chart2.DataSeriesWrapper") ) )
+    else if( aServiceSpecifier == "com.sun.star.comp.chart2.DataSeriesWrapper" )
     {
         Reference< beans::XPropertySet > xDataSeries( new DataSeriesPointWrapper( m_spChart2ModelContact ) );
         xResult.set( xDataSeries );
@@ -1487,8 +1486,7 @@ void SAL_CALL ChartDocumentWrapper::setDelegator(
     if( m_bIsDisposed )
     {
         if( rDelegator.is() )
-            throw lang::DisposedException(
-                C2U("ChartDocumentWrapper is disposed" ),
+            throw lang::DisposedException("ChartDocumentWrapper is disposed",
                 static_cast< ::cppu::OWeakObject* >( this ));
         else
             return;
@@ -1564,9 +1562,9 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert
     aWrappedProperties.push_back( new WrappedBaseDiagramProperty( *this ) );
     aWrappedProperties.push_back( new WrappedAdditionalShapesProperty( *this ) );
     aWrappedProperties.push_back( new WrappedRefreshAddInAllowedProperty( *this ) );
-    aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U("NullDate"),Any() ) ); // i99104
-    aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U( "DisableComplexChartTypes" ), uno::makeAny( sal_False ) ) );
-    aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U( "DisableDataTableDialog" ), uno::makeAny( sal_False ) ) );
+    aWrappedProperties.push_back( new WrappedIgnoreProperty("NullDate",Any() ) ); // i99104
+    aWrappedProperties.push_back( new WrappedIgnoreProperty("DisableComplexChartTypes", uno::makeAny( sal_False ) ) );
+    aWrappedProperties.push_back( new WrappedIgnoreProperty("DisableDataTableDialog", uno::makeAny( sal_False ) ) );
 
     return aWrappedProperties;
 }
@@ -1576,10 +1574,10 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert
 uno::Sequence< ::rtl::OUString > ChartDocumentWrapper::getSupportedServiceNames_Static()
 {
     uno::Sequence< ::rtl::OUString > aServices( 4 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart.ChartDocument" );
+    aServices[ 0 ] = "com.sun.star.chart.ChartDocument";
     aServices[ 1 ] = CHART_CHARTAPIWRAPPER_SERVICE_NAME;
-    aServices[ 2 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
-    aServices[ 3 ] = C2U( "com.sun.star.beans.PropertySet" );
+    aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+    aServices[ 3 ] = "com.sun.star.beans.PropertySet";
     return aServices;
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 60a76e1bd43b..ab4b475fc602 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -96,56 +96,56 @@ void lcl_AddPropertiesToVector_PointProperties(
 {
     //service chart::Chart3DBarProperties
     rOutProperties.push_back(
-        Property( C2U( "SolidType" ),
+        Property( "SolidType",
                   PROP_SERIES_DATAPOINT_SOLIDTYPE,
                   ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "SegmentOffset" ),
+        Property( "SegmentOffset",
                   PROP_SERIES_DATAPOINT_SEGMENT_OFFSET,
                   ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "D3DPercentDiagonal" ),
+        Property( "D3DPercentDiagonal",
                   PROP_SERIES_DATAPOINT_PERCENT_DIAGONAL,
                   ::getCppuType( reinterpret_cast< sal_Int16 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "LabelSeparator" ),
+        Property( "LabelSeparator",
                   PROP_SERIES_DATAPOINT_LABEL_SEPARATOR,
                   ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "NumberFormat" ),
+        Property( "NumberFormat",
                   PROP_SERIES_NUMBERFORMAT,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "PercentageNumberFormat" ),
+        Property( "PercentageNumberFormat",
                   PROP_SERIES_PERCENTAGE_NUMBERFORMAT,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "LabelPlacement" ),
+        Property( "LabelPlacement",
                   PROP_SERIES_DATAPOINT_LABEL_PLACEMENT,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "TextRotation" ),
+        Property( "TextRotation",
                   PROP_SERIES_DATAPOINT_TEXT_ROTATION,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -156,14 +156,14 @@ void lcl_AddPropertiesToVector_SeriesOnly(
     ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
-        Property( C2U( "Axis" ),
+        Property( "Axis",
                   PROP_SERIES_ATTACHED_AXIS,
                   ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "LinkNumberFormatToSource" ),
+        Property( "LinkNumberFormatToSource",
                   PROP_SERIES_LINK_NUMBERFORMAT_TO_SOURCE,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
@@ -245,7 +245,7 @@ protected:
 
 WrappedAttachedAxisProperty::WrappedAttachedAxisProperty(
                 ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-                : WrappedProperty(C2U("Axis"),rtl::OUString())
+                : WrappedProperty("Axis",rtl::OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
 {
 }
@@ -283,7 +283,7 @@ void WrappedAttachedAxisProperty::setPropertyValue( const Any& rOuterValue, cons
 
     sal_Int32 nChartAxisAssign = ::com::sun::star::chart::ChartAxisAssign::PRIMARY_Y;
     if( ! (rOuterValue >>= nChartAxisAssign) )
-        throw lang::IllegalArgumentException( C2U("Property Axis requires value of type sal_Int32"), 0, 0 );
+        throw lang::IllegalArgumentException("Property Axis requires value of type sal_Int32", 0, 0 );
 
     bool bNewAttachedToMainAxis = nChartAxisAssign == ::com::sun::star::chart::ChartAxisAssign::PRIMARY_Y;
     bool bOldAttachedToMainAxis = ::chart::DiagramHelper::isSeriesAttachedToMainAxis( xDataSeries );
@@ -310,7 +310,7 @@ protected:
 };
 
 WrappedSegmentOffsetProperty::WrappedSegmentOffsetProperty() :
-        WrappedProperty( C2U( "SegmentOffset" ), C2U( "Offset" ) )
+        WrappedProperty("SegmentOffset","Offset")
 {}
 
 WrappedSegmentOffsetProperty::~WrappedSegmentOffsetProperty()
@@ -365,7 +365,7 @@ protected:
 
 WrappedLineColorProperty::WrappedLineColorProperty(
                 DataSeriesPointWrapper* pDataSeriesPointWrapper )
-                : WrappedSeriesAreaOrLineProperty(C2U( "LineColor" ), C2U( "BorderColor" ), C2U( "Color" ), pDataSeriesPointWrapper )
+                : WrappedSeriesAreaOrLineProperty("LineColor","BorderColor","Color", pDataSeriesPointWrapper )
                 , m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
                 , m_aDefaultValue(uno::makeAny(sal_Int32( 0x0099ccff )))  // blue 8
                 , m_aOuterValue(m_aDefaultValue)
@@ -425,7 +425,7 @@ protected:
 
 WrappedLineStyleProperty::WrappedLineStyleProperty(
                 DataSeriesPointWrapper* pDataSeriesPointWrapper )
-                : WrappedSeriesAreaOrLineProperty(C2U( "LineStyle" ), C2U( "BorderStyle" ), C2U( "LineStyle" ), pDataSeriesPointWrapper )
+                : WrappedSeriesAreaOrLineProperty("LineStyle","BorderStyle", "LineStyle", pDataSeriesPointWrapper )
                 , m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
                 , m_aDefaultValue(uno::makeAny(drawing::LineStyle_SOLID))
                 , m_aOuterValue(m_aDefaultValue)
@@ -496,7 +496,7 @@ void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any
 
     if( !m_xDataSeries.is() )
         throw uno::Exception(
-            C2U( "DataSeries index invalid" ), static_cast< ::cppu::OWeakObject * >( this ));
+            "DataSeries index invalid", static_cast< ::cppu::OWeakObject * >( this ));
 
     //todo: check upper border of point index
 
@@ -608,8 +608,8 @@ void DataSeriesPointWrapper::updateReferenceSize()
     Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
     if( xProp.is() )
     {
-        if( xProp->getPropertyValue( C2U("ReferencePageSize") ).hasValue() )
-            xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
+        if( xProp->getPropertyValue("ReferencePageSize").hasValue() )
+            xProp->setPropertyValue("ReferencePageSize", uno::makeAny(
                 m_spChart2ModelContact->GetPageSize() ));
     }
 }
@@ -618,7 +618,7 @@ Any DataSeriesPointWrapper::getReferenceSize()
     Any aRet;
     Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
     if( xProp.is() )
-        aRet = xProp->getPropertyValue( C2U("ReferencePageSize") );
+        aRet = xProp->getPropertyValue("ReferencePageSize");
     return aRet;
 }
 awt::Size DataSeriesPointWrapper::getCurrentSizeForReference()
@@ -640,17 +640,17 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const ::
         aState = WrappedPropertySet::getPropertyState( rPropertyName );
     else
     {
-        if( rPropertyName.equals(C2U("FillColor")) )
+        if( rPropertyName == "FillColor")
         {
             Reference< beans::XPropertySet > xSeriesProp( getDataSeries(), uno::UNO_QUERY );
             sal_Bool bVaryColorsByPoint = sal_False;
-            if( xSeriesProp.is() && (xSeriesProp->getPropertyValue( C2U("VaryColorsByPoint") ) >>= bVaryColorsByPoint)
+            if( xSeriesProp.is() && (xSeriesProp->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint)
                 && bVaryColorsByPoint )
                 return beans::PropertyState_DIRECT_VALUE;
         }
-        else if( rPropertyName.equals(C2U("Lines"))
-            ||  rPropertyName.equals(C2U("SymbolType"))
-            ||  rPropertyName.equals(C2U("SymbolSize")) )
+        else if( rPropertyName == "Lines"
+            ||  rPropertyName == "SymbolType"
+            ||  rPropertyName == "SymbolSize" )
             return WrappedPropertySet::getPropertyState( rPropertyName );
 
         uno::Any aDefault( getPropertyDefault( rPropertyName ) );
@@ -737,37 +737,37 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
 
     //add unnamed line properties (different inner names here)
 
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillColor" ), C2U( "Color" ) ) );
+    aWrappedProperties.push_back( new WrappedProperty("FillColor","Color") );
     aWrappedProperties.push_back( new WrappedLineStyleProperty( this ) );
     aWrappedProperties.push_back( new WrappedLineColorProperty( this ) );
-    aWrappedProperties.push_back( new WrappedSeriesAreaOrLineProperty( C2U( "LineDashName" ), C2U( "BorderDashName" ), C2U( "LineDashName" ), this ) );
-    aWrappedProperties.push_back( new WrappedSeriesAreaOrLineProperty( C2U( "LineTransparence" ), C2U( "BorderTransparency" ), C2U( "Transparency" ), this ) );
-    aWrappedProperties.push_back( new WrappedSeriesAreaOrLineProperty( C2U( "LineWidth" ), C2U( "BorderWidth" ), C2U( "LineWidth" ), this ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillStyle" ), C2U( "FillStyle" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillTransparence" ), C2U( "Transparency" ) ) );
-
-    aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U( "LineJoint" ), uno::makeAny( drawing::LineJoint_ROUND ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillTransparenceGradientName" ), C2U( "TransparencyGradientName" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillGradientName" ), C2U( "GradientName" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillGradientStepCount" ), C2U( "GradientStepCount" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillHatchName" ), C2U( "HatchName" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapName" ), C2U( "FillBitmapName" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBackground" ), C2U( "FillBackground" ) ) );
+    aWrappedProperties.push_back( new WrappedSeriesAreaOrLineProperty("LineDashName","BorderDashName","LineDashName", this ) );
+    aWrappedProperties.push_back( new WrappedSeriesAreaOrLineProperty("LineTransparence","BorderTransparency","Transparency", this ) );
+    aWrappedProperties.push_back( new WrappedSeriesAreaOrLineProperty("LineWidth","BorderWidth","LineWidth", this ) );
+    aWrappedProperties.push_back( new WrappedProperty("FillStyle","FillStyle" ) );
+    aWrappedProperties.push_back( new WrappedProperty("FillTransparence","Transparency") );
+
+    aWrappedProperties.push_back( new WrappedIgnoreProperty("LineJoint", uno::makeAny( drawing::LineJoint_ROUND ) ) );
+    aWrappedProperties.push_back( new WrappedProperty("FillTransparenceGradientName","TransparencyGradientName") );
+    aWrappedProperties.push_back( new WrappedProperty("FillGradientName","GradientName") );
+    aWrappedProperties.push_back( new WrappedProperty("FillGradientStepCount","GradientStepCount") );
+    aWrappedProperties.push_back( new WrappedProperty("FillHatchName","HatchName") );
+    aWrappedProperties.push_back( new WrappedProperty("FillBitmapName","FillBitmapName") );
+    aWrappedProperties.push_back( new WrappedProperty("FillBackground","FillBackground") );
 
     //bitmap properties
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapMode" ), C2U( "FillBitmapMode" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapSizeX" ), C2U( "FillBitmapSizeX" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapSizeY" ), C2U( "FillBitmapSizeY" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapLogicalSize" ), C2U( "FillBitmapLogicalSize" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapOffsetX" ), C2U( "FillBitmapOffsetX" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapOffsetY" ), C2U( "FillBitmapOffsetY" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapRectanglePoint" ), C2U( "FillBitmapRectanglePoint" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapPositionOffsetX" ), C2U( "FillBitmapPositionOffsetX" ) ) );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapPositionOffsetY" ), C2U( "FillBitmapPositionOffsetY" ) ) );
-
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "SolidType" ), C2U( "Geometry3D" ) ) );
+    aWrappedProperties.push_back( new WrappedProperty("FillBitmapMode","FillBitmapMode") );
+    aWrappedProperties.push_back( new WrappedProperty("FillBitmapSizeX","FillBitmapSizeX") );
+    aWrappedProperties.push_back( new WrappedProperty("FillBitmapSizeY","FillBitmapSizeY") );
+    aWrappedProperties.push_back( new WrappedProperty("FillBitmapLogicalSize","FillBitmapLogicalSize") );
+    aWrappedProperties.push_back( new WrappedProperty("FillBitmapOffsetX","FillBitmapOffsetX") );
+    aWrappedProperties.push_back( new WrappedProperty("FillBitmapOffsetY","FillBitmapOffsetY") );
+    aWrappedProperties.push_back( new WrappedProperty("FillBitmapRectanglePoint","FillBitmapRectanglePoint") );
+    aWrappedProperties.push_back( new WrappedProperty("FillBitmapPositionOffsetX","FillBitmapPositionOffsetX") );
+    aWrappedProperties.push_back( new WrappedProperty("FillBitmapPositionOffsetY","FillBitmapPositionOffsetY") );
+
+    aWrappedProperties.push_back( new WrappedProperty("SolidType","Geometry3D") );
     aWrappedProperties.push_back( new WrappedSegmentOffsetProperty() );
-    aWrappedProperties.push_back( new WrappedProperty( C2U( "D3DPercentDiagonal" ), C2U( "PercentDiagonal" ) ) );
+    aWrappedProperties.push_back( new WrappedProperty("D3DPercentDiagonal","PercentDiagonal") );
 
     aWrappedProperties.push_back( new WrappedTextRotationProperty() );
 
@@ -777,14 +777,14 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
 void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue )
                                     throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    if(rPropertyName.equals(C2U("Lines")))
+    if(rPropertyName == "Lines")
     {
         if( ! (rValue >>= m_bLinesAllowed) )
-            throw lang::IllegalArgumentException( C2U("Property Lines requires value of type sal_Bool"), 0, 0 );
+            throw lang::IllegalArgumentException("Property Lines requires value of type sal_Bool", 0, 0 );
     }
 
     sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
-    static const sal_Int32 nErrorCategoryHandle = getInfoHelper().getHandleByName( C2U("ErrorCategory") );
+    static const sal_Int32 nErrorCategoryHandle = getInfoHelper().getHandleByName("ErrorCategory");
     if( nErrorCategoryHandle == nHandle )
     {
         ::com::sun::star::chart::ChartErrorCategory aNewValue = ::com::sun::star::chart::ChartErrorCategory_NONE;
@@ -794,16 +794,16 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const ::rtl::OUString& r
         switch(aNewValue)
         {
             case ::com::sun::star::chart::ChartErrorCategory_CONSTANT_VALUE:
-                aHigh = this->getPropertyValue(C2U("ConstantErrorHigh"));
-                aLow = this->getPropertyValue(C2U("ConstantErrorLow"));
+                aHigh = this->getPropertyValue("ConstantErrorHigh");
+                aLow = this->getPropertyValue("ConstantErrorLow");
                 bSetHighAndLowValues = true;
                 break;
             case ::com::sun::star::chart::ChartErrorCategory_PERCENT:
-                aHigh = aLow = this->getPropertyValue(C2U("PercentageError"));
+                aHigh = aLow = this->getPropertyValue("PercentageError");
                 bSetHighAndLowValues = true;
                 break;
             case ::com::sun::star::chart::ChartErrorCategory_ERROR_MARGIN:
-                aHigh = aLow = this->getPropertyValue(C2U("ErrorMargin"));
+                aHigh = aLow = this->getPropertyValue("ErrorMargin");
                 bSetHighAndLowValues = true;
                 break;
             default:
@@ -817,14 +817,14 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const ::rtl::OUString& r
             switch(aNewValue)
             {
                 case ::com::sun::star::chart::ChartErrorCategory_CONSTANT_VALUE:
-                    this->setPropertyValue(C2U("ConstantErrorHigh"),aHigh);
-                    this->setPropertyValue(C2U("ConstantErrorLow"),aLow);
+                    this->setPropertyValue("ConstantErrorHigh",aHigh);
+                    this->setPropertyValue("ConstantErrorLow",aLow);
                     break;
                 case ::com::sun::star::chart::ChartErrorCategory_PERCENT:
-                    this->setPropertyValue(C2U("PercentageError"),aHigh);
+                    this->setPropertyValue("PercentageError",aHigh);
                     break;
                 case ::com::sun::star::chart::ChartErrorCategory_ERROR_MARGIN:
-                    this->setPropertyValue(C2U("ErrorMargin"),aHigh);
+                    this->setPropertyValue("ErrorMargin",aHigh);
                     break;
                 default:
                     break;
@@ -840,15 +840,15 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const rtl::OUString& rPro
 {
     if( m_eType == DATA_POINT )
     {
-        if( rPropertyName.equals(C2U("FillColor")) )
+        if( rPropertyName == "FillColor" )
         {
             Reference< beans::XPropertySet > xSeriesProp( getDataSeries(), uno::UNO_QUERY );
             sal_Bool bVaryColorsByPoint = sal_False;
-            if( xSeriesProp.is() && (xSeriesProp->getPropertyValue( C2U("VaryColorsByPoint") ) >>= bVaryColorsByPoint)
+            if( xSeriesProp.is() && (xSeriesProp->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint)
                 && bVaryColorsByPoint )
             {
                 uno::Reference< beans::XPropertyState > xPointState( DataSeriesPointWrapper::getDataPointProperties(), uno::UNO_QUERY );
-                if( xPointState.is() && xPointState->getPropertyState( C2U("Color")) == beans::PropertyState_DEFAULT_VALUE )
+                if( xPointState.is() && xPointState->getPropertyState("Color") == beans::PropertyState_DEFAULT_VALUE )
                 {
                     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
                     if( xDiagram.is() )
@@ -869,13 +869,13 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const rtl::OUString& rPro
 uno::Sequence< ::rtl::OUString > DataSeriesPointWrapper::getSupportedServiceNames_Static()
 {
     uno::Sequence< ::rtl::OUString > aServices( 7 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart.ChartDataRowProperties" );
-    aServices[ 1 ] = C2U( "com.sun.star.chart.ChartDataPointProperties" );
-    aServices[ 2 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
-    aServices[ 3 ] = C2U( "com.sun.star.beans.PropertySet" );
-    aServices[ 4 ] = C2U( "com.sun.star.drawing.FillProperties" );
-    aServices[ 5 ] = C2U( "com.sun.star.drawing.LineProperties" );
-    aServices[ 6 ] = C2U( "com.sun.star.style.CharacterProperties" );
+    aServices[ 0 ] = "com.sun.star.chart.ChartDataRowProperties";
+    aServices[ 1 ] = "com.sun.star.chart.ChartDataPointProperties";
+    aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributeSupplier";
+    aServices[ 3 ] =  "com.sun.star.beans.PropertySet";
+    aServices[ 4 ] = "com.sun.star.drawing.FillProperties";
+    aServices[ 5 ] = "com.sun.star.drawing.LineProperties";
+    aServices[ 6 ] = "com.sun.star.style.CharacterProperties";
 
     return aServices;
 }