Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING

Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>

18 files changed, 180 insertions, 180 deletions

diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 5e0d07e6e4aa..b949ece25b14 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -85,100 +85,100 @@ void lcl_AddPropertiesToVector(
     ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
-        Property( C2U( "Show" ),
+        Property( "Show",
                   PROP_AXIS_SHOW,
                   ::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( "DisplayLabels" ),
+        Property( "DisplayLabels",
                   PROP_AXIS_DISPLAY_LABELS,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "NumberFormat" ),
+        Property( "NumberFormat",
                   PROP_AXIS_NUMBER_FORMAT,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     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 double * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "TextBreak" ),
+        Property( "TextBreak",
                   PROP_AXIS_TEXT_BREAK,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "TextOverlap" ),
+        Property( "TextOverlap",
                   PROP_AXIS_TEXT_OVERLAP,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "StackCharacters" ),
+        Property( "StackCharacters",
                   PROP_AXIS_TEXT_STACKED,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "ArrangeOrder" ),
+        Property( "ArrangeOrder",
                   PROP_AXIS_TEXT_ARRANGE_ORDER,
                   ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisArrangeOrderType * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "ReferencePageSize" ),
+        Property( "ReferencePageSize",
                   PROP_AXIS_REFERENCE_DIAGRAM_SIZE,
                   ::getCppuType( reinterpret_cast< const awt::Size * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "MajorTickmarks" ),
+        Property( "MajorTickmarks",
                   PROP_AXIS_MAJOR_TICKMARKS,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "MinorTickmarks" ),
+        Property( "MinorTickmarks",
                   PROP_AXIS_MINOR_TICKMARKS,
                   ::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 ));
@@ -606,8 +606,8 @@ Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo()
 Sequence< OUString > Axis::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServices( 2 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart2.Axis" );
-    aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" );
+    aServices[ 0 ] = "com.sun.star.chart2.Axis";
+    aServices[ 1 ] = "com.sun.star.beans.PropertySet";
     return aServices;
 }
 
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index cb937f2be7cc..048f38d4e579 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -53,7 +53,7 @@ void lcl_AddPropertiesToVector(
     ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
-        Property( C2U( "SwapXAndYAxis" ),
+        Property( "SwapXAndYAxis",
                   PROP_COORDINATESYSTEM_SWAPXANDYAXIS,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
@@ -289,7 +289,7 @@ void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XC
           aIt( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType ));
     if( aIt == m_aChartTypes.end())
         throw container::NoSuchElementException(
-            C2U( "The given chart type is no element of the container" ),
+            "The given chart type is no element of the container",
             static_cast< uno::XWeak * >( this ));
 
     m_aChartTypes.erase( aIt );
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index ff8be7fe568d..73d249bac593 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -91,7 +91,7 @@ Sequence< OUString > CartesianCoordinateSystem::getSupportedServiceNames_Static(
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem,
-                             C2U( "com.sun.star.comp.chart.CartesianCoordinateSystem" ))
+                             OUString("com.sun.star.comp.chart.CartesianCoordinateSystem"))
 
 
 // =================================
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 0564adde45e1..743e248a2b3c 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -104,7 +104,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
     , m_xInternalDataProvider( 0 )
     , m_xPageBackground( new PageBackground( m_xContext ) )
     , m_xXMLNamespaceMap( createNameContainer( ::getCppuType( (const OUString*) 0 ),
-                C2U( "com.sun.star.xml.NamespaceMap" ), C2U( "com.sun.star.comp.chart.XMLNameSpaceMap" ) ), uno::UNO_QUERY)
+                "com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY)
 {
     OSL_TRACE( "ChartModel: CTOR called" );
 
@@ -120,7 +120,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
     {
         ModifyListenerHelper::addListener( m_xPageBackground, this );
         m_xChartTypeManager.set( xContext->getServiceManager()->createInstanceWithContext(
-                C2U( "com.sun.star.chart2.ChartTypeManager" ), m_xContext ), uno::UNO_QUERY );
+                "com.sun.star.chart2.ChartTypeManager", m_xContext ), uno::UNO_QUERY );
     }
     osl_atomic_decrement(&m_refCount);
 }
@@ -273,7 +273,7 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV
     if ( xProperties.is() )
     {
         uno::Reference< drawing::XShapes > xShapes;
-        xProperties->getPropertyValue( C2U( "AdditionalShapes" ) ) >>= xShapes;
+        xProperties->getPropertyValue( "AdditionalShapes" ) >>= xShapes;
         if ( xShapes.is() )
         {
             sal_Int32 nCount = xShapes->getCount();
@@ -314,8 +314,8 @@ uno::Sequence< rtl::OUString > ChartModel::getSupportedServiceNames_Static()
 {
     uno::Sequence< rtl::OUString > aSNS( 3 );
     aSNS[0] = CHART_MODEL_SERVICE_NAME;
-    aSNS[1] = C2U( "com.sun.star.document.OfficeDocument" );
-    aSNS[2] = C2U( "com.sun.star.chart.ChartDocument" );
+    aSNS[1] = "com.sun.star.document.OfficeDocument";
+    aSNS[2] = "com.sun.star.chart.ChartDocument";
     //// @todo : add additional services if you support any further
     return aSNS;
 }
@@ -760,8 +760,8 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
             //create data
             uno::Sequence< beans::PropertyValue > aArgs( 4 );
             aArgs[0] = beans::PropertyValue(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CellRangeRepresentation" )), -1,
-                uno::makeAny( C2U("all") ), beans::PropertyState_DIRECT_VALUE );
+                OUString( "CellRangeRepresentation" ), -1,
+                uno::makeAny( OUString("all") ), beans::PropertyState_DIRECT_VALUE );
             aArgs[1] = beans::PropertyValue(
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )), -1,
                 uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
@@ -821,7 +821,7 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data
             try
             {
                 sal_Bool bIncludeHiddenCells = ChartModelHelper::isIncludeHiddenCells( Reference< frame::XModel >(this) );
-                xProp->setPropertyValue(C2U("IncludeHiddenCells"), uno::makeAny(bIncludeHiddenCells));
+                xProp->setPropertyValue("IncludeHiddenCells", uno::makeAny(bIncludeHiddenCells));
             }
             catch (const beans::UnknownPropertyException&)
             {
@@ -934,7 +934,7 @@ Reference< chart2::XChartTypeTemplate > ChartModel::impl_createDefaultChartTypeT
     Reference< chart2::XChartTypeTemplate > xTemplate;
     Reference< lang::XMultiServiceFactory > xFact( m_xChartTypeManager, uno::UNO_QUERY );
     if( xFact.is() )
-        xTemplate.set( xFact->createInstance( C2U( "com.sun.star.chart2.template.Column" ) ), uno::UNO_QUERY );
+        xTemplate.set( xFact->createInstance( "com.sun.star.chart2.template.Column" ), uno::UNO_QUERY );
     return xTemplate;
 }
 
@@ -1079,7 +1079,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio
         if( xTransferable.is() )
         {
             datatransfer::DataFlavor aDataFlavor( lcl_aGDIMetaFileMIMEType,
-                    C2U( "GDIMetaFile" ),
+                    "GDIMetaFile",
                     ::getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
 
             uno::Any aData( xTransferable->getTransferData( aDataFlavor ) );
@@ -1149,7 +1149,7 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors
     uno::Sequence< datatransfer::DataFlavor > aRet(1);
 
     aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast,
-        C2U( "GDIMetaFile" ),
+        "GDIMetaFile",
         ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
 
     return aRet;
@@ -1183,13 +1183,13 @@ tServiceNameMap & lcl_getStaticServiceNameMap()
 {
     static tServiceNameMap aServiceNameMap(
         tMakeServiceNameMap
-        ( C2U( "com.sun.star.drawing.DashTable" ),                    SERVICE_DASH_TABLE )
-        ( C2U( "com.sun.star.drawing.GradientTable" ),                SERVICE_GARDIENT_TABLE )
-        ( C2U( "com.sun.star.drawing.HatchTable" ),                   SERVICE_HATCH_TABLE )
-        ( C2U( "com.sun.star.drawing.BitmapTable" ),                  SERVICE_BITMAP_TABLE )
-        ( C2U( "com.sun.star.drawing.TransparencyGradientTable" ),    SERVICE_TRANSP_GRADIENT_TABLE )
-        ( C2U( "com.sun.star.drawing.MarkerTable" ),                  SERVICE_MARKER_TABLE )
-        ( C2U( "com.sun.star.xml.NamespaceMap" ),                     SERVICE_NAMESPACE_MAP )
+        ( "com.sun.star.drawing.DashTable",                    SERVICE_DASH_TABLE )
+        ( "com.sun.star.drawing.GradientTable",                SERVICE_GARDIENT_TABLE )
+        ( "com.sun.star.drawing.HatchTable",                   SERVICE_HATCH_TABLE )
+        ( "com.sun.star.drawing.BitmapTable",                  SERVICE_BITMAP_TABLE )
+        ( "com.sun.star.drawing.TransparencyGradientTable",    SERVICE_TRANSP_GRADIENT_TABLE )
+        ( "com.sun.star.drawing.MarkerTable",                  SERVICE_MARKER_TABLE )
+        ( "com.sun.star.xml.NamespaceMap",                     SERVICE_NAMESPACE_MAP )
         );
     return aServiceNameMap;
 }
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 0e638ece1c15..e0bf13019595 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -100,7 +100,7 @@ void lcl_addStorageToMediaDescriptor(
 {
     rOutMD.realloc( rOutMD.getLength() + 1 );
     rOutMD[rOutMD.getLength() - 1] = beans::PropertyValue(
-        C2U("Storage"), -1, uno::makeAny( xStorage ), beans::PropertyState_DIRECT_VALUE );
+        "Storage", -1, uno::makeAny( xStorage ), beans::PropertyState_DIRECT_VALUE );
 }
 
 Reference< embed::XStorage > lcl_createStorage(
@@ -157,7 +157,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
         {
             Reference< container::XNameAccess > xFilterFact(
                 m_xContext->getServiceManager()->createInstanceWithContext(
-                    C2U( "com.sun.star.document.FilterFactory" ), m_xContext ),
+                    "com.sun.star.document.FilterFactory", m_xContext ),
                 uno::UNO_QUERY_THROW );
             uno::Any aFilterProps( xFilterFact->getByName( aFilterName ));
             Sequence< beans::PropertyValue > aProps;
@@ -190,7 +190,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
         OSL_TRACE( "No FilterName passed in MediaDescriptor" );
         xFilter.set(
             m_xContext->getServiceManager()->createInstanceWithContext(
-                C2U("com.sun.star.comp.chart2.XMLFilter"), m_xContext ),
+                "com.sun.star.comp.chart2.XMLFilter", m_xContext ),
             uno::UNO_QUERY_THROW );
     }
 
@@ -247,10 +247,10 @@ void SAL_CALL ChartModel::store()
     ::rtl::OUString aLocation = m_aResource;
 
     if( aLocation.isEmpty() )
-        throw io::IOException( C2U( "no location specified" ), static_cast< ::cppu::OWeakObject* >(this));
+        throw io::IOException( "no location specified", static_cast< ::cppu::OWeakObject* >(this));
     //@todo check whether aLocation is something like private:factory...
     if( m_bReadOnly )
-        throw io::IOException( C2U( "document is read only" ), static_cast< ::cppu::OWeakObject* >(this));
+        throw io::IOException( "document is read only", static_cast< ::cppu::OWeakObject* >(this));
 
     aGuard.clear();
 
@@ -411,7 +411,7 @@ void SAL_CALL ChartModel::initNew()
                 if( bSupportsCategories )
                 {
                     aParam.realloc( 1 );
-                    aParam[0] = beans::PropertyValue( C2U("HasCategories"), -1, uno::makeAny( true ),
+                    aParam[0] = beans::PropertyValue( "HasCategories", -1, uno::makeAny( true ),
                                                       beans::PropertyState_DIRECT_VALUE );
                 }
 
@@ -427,17 +427,17 @@ void SAL_CALL ChartModel::initNew()
                 // create and attach legend
                 Reference< chart2::XLegend > xLegend(
                     m_xContext->getServiceManager()->createInstanceWithContext(
-                        C2U( "com.sun.star.chart2.Legend" ), m_xContext ), uno::UNO_QUERY_THROW );
+                        "com.sun.star.chart2.Legend", m_xContext ), uno::UNO_QUERY_THROW );
                 Reference< beans::XPropertySet > xLegendProperties( xLegend, uno::UNO_QUERY );
                 if( xLegendProperties.is() )
                 {
-                    xLegendProperties->setPropertyValue( C2U( "FillStyle" ), uno::makeAny( drawing::FillStyle_NONE ));
-                    xLegendProperties->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_NONE ));
-                    xLegendProperties->setPropertyValue( C2U( "LineColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ));  // gray30
-                    xLegendProperties->setPropertyValue( C2U( "FillColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10
+                    xLegendProperties->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE ));
+                    xLegendProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ));
+                    xLegendProperties->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ));  // gray30
+                    xLegendProperties->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10
 
                     if( bIsRTL )
-                        xLegendProperties->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( chart2::LegendPosition_LINE_START ));
+                        xLegendProperties->setPropertyValue( "AnchorPosition", uno::makeAny( chart2::LegendPosition_LINE_START ));
                 }
                 if(xDiagram.is())
                     xDiagram->setLegend( xLegend );
@@ -446,8 +446,8 @@ void SAL_CALL ChartModel::initNew()
                 Reference< beans::XPropertySet > xDiagramProperties( xDiagram, uno::UNO_QUERY );
                 if( xDiagramProperties.is() )
                 {
-                    xDiagramProperties->setPropertyValue( C2U("RightAngledAxes"), uno::makeAny( sal_True ));
-                    xDiagramProperties->setPropertyValue( C2U("D3DScenePerspective"), uno::makeAny( drawing::ProjectionMode_PARALLEL ));
+                    xDiagramProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( sal_True ));
+                    xDiagramProperties->setPropertyValue( "D3DScenePerspective", uno::makeAny( drawing::ProjectionMode_PARALLEL ));
                     ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Realistic );
                 }
 
@@ -457,18 +457,18 @@ void SAL_CALL ChartModel::initNew()
                     Reference< beans::XPropertySet > xWall( xDiagram->getWall() );
                     if( xWall.is() )
                     {
-                        xWall->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID ) );
-                        xWall->setPropertyValue( C2U( "FillStyle" ), uno::makeAny( drawing::FillStyle_NONE ) );
-                        xWall->setPropertyValue( C2U( "LineColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
-                        xWall->setPropertyValue( C2U( "FillColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10
+                        xWall->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) );
+                        xWall->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE ) );
+                        xWall->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
+                        xWall->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10
                     }
                     Reference< beans::XPropertySet > xFloor( xDiagram->getFloor() );
                     if( xFloor.is() )
                     {
-                        xFloor->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_NONE ) );
-                        xFloor->setPropertyValue( C2U( "FillStyle" ), uno::makeAny( drawing::FillStyle_SOLID ) );
-                        xFloor->setPropertyValue( C2U( "LineColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
-                        xFloor->setPropertyValue( C2U( "FillColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xcccccc ) ) ); // gray20
+                        xFloor->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+                        xFloor->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_SOLID ) );
+                        xFloor->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
+                        xFloor->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xcccccc ) ) ); // gray20
                     }
 
                 }
@@ -514,9 +514,9 @@ void SAL_CALL ChartModel::load(
                  aMDHelper.ISSET_InputStream )
         {
             if( aMDHelper.ISSET_FilterName &&
-                (aMDHelper.FilterName.equals( C2U("StarChart 5.0")) ||
-                 aMDHelper.FilterName.equals( C2U("StarChart 4.0")) ||
-                 aMDHelper.FilterName.equals( C2U("StarChart 3.0")) ))
+                (aMDHelper.FilterName.equals( "StarChart 5.0") ||
+                 aMDHelper.FilterName.equals( "StarChart 4.0") ||
+                 aMDHelper.FilterName.equals( "StarChart 3.0") ))
             {
                 attachResource( aMDHelper.URL, rMediaDescriptor );
                 impl_load( rMediaDescriptor, 0 ); // cannot create a storage from binary streams, but I do not need the storage here anyhow
@@ -612,7 +612,7 @@ void ChartModel::impl_loadGraphics(
     try
     {
         const Reference< embed::XStorage >& xGraphicsStorage(
-            xStorage->openStorageElement( C2U( "Pictures" ),
+            xStorage->openStorageElement( "Pictures",
                                           embed::ElementModes::READ ) );
 
         if( xGraphicsStorage.is() )
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 14711771169c..2537dba9f869 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -289,9 +289,9 @@ void DataPoint::fireModifyEvent()
 Sequence< OUString > DataPoint::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServices( 3 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart2.DataPoint" );
-    aServices[ 1 ] = C2U( "com.sun.star.chart2.DataPointProperties" );
-    aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" );
+    aServices[ 0 ] = "com.sun.star.chart2.DataPoint";
+    aServices[ 1 ] = "com.sun.star.chart2.DataPointProperties";
+    aServices[ 2 ] = "com.sun.star.beans.PropertySet";
     return aServices;
 }
 
@@ -301,7 +301,7 @@ using impl::DataPoint_Base;
 IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertySet )
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( DataPoint, C2U( "com.sun.star.comp.chart.DataPoint" ));
+APPHELPER_XSERVICEINFO_IMPL( DataPoint, OUString("com.sun.star.comp.chart.DataPoint") );
 
 } //  namespace chart
 
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 3eba35af4b72..fb11ece86a93 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -51,7 +51,7 @@ void DataPointProperties::AddPropertiesToVector(
     // Common
     // ------
     rOutProperties.push_back(
-        Property( C2U( "Color" ),
+        Property( "Color",
                   PROP_DATAPOINT_COLOR,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -59,7 +59,7 @@ void DataPointProperties::AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "Transparency" ),
+        Property( "Transparency",
                   PROP_DATAPOINT_TRANSPARENCY,
                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -68,14 +68,14 @@ void DataPointProperties::AddPropertiesToVector(
     // Fill Properties
     // ---------------
     rOutProperties.push_back(
-        Property( C2U( "FillStyle" ),
+        Property( "FillStyle",
                   PROP_DATAPOINT_FILL_STYLE,
                   ::getCppuType( reinterpret_cast< const drawing::FillStyle * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "TransparencyGradientName" ),
+        Property( "TransparencyGradientName",
                   PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME,
                   ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -83,7 +83,7 @@ void DataPointProperties::AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "GradientName" ),
+        Property( "GradientName",
                   PROP_DATAPOINT_GRADIENT_NAME,
                   ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -92,14 +92,14 @@ void DataPointProperties::AddPropertiesToVector(
 
 
     rOutProperties.push_back(
-        beans::Property( C2U( "GradientStepCount" ),
+        beans::Property( "GradientStepCount",
                   PROP_DATAPOINT_GRADIENT_STEPCOUNT,
                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "HatchName" ),
+        Property( "HatchName",
                   PROP_DATAPOINT_HATCH_NAME,
                   ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -107,14 +107,14 @@ void DataPointProperties::AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "FillBitmapName" ),
+        Property( "FillBitmapName",
                   PROP_DATAPOINT_FILL_BITMAP_NAME,
                   ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT
                   | beans::PropertyAttribute::MAYBEVOID  ));
     rOutProperties.push_back(
-        Property( C2U( "FillBackground" ),
+        Property( "FillBackground",
                   PROP_DATAPOINT_FILL_BACKGROUND,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
@@ -123,32 +123,32 @@ void DataPointProperties::AddPropertiesToVector(
 
     // border for filled objects
     rOutProperties.push_back(
-        Property( C2U( "BorderColor" ),
+        Property( "BorderColor",
                   PROP_DATAPOINT_BORDER_COLOR,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID         // "maybe auto"
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "BorderStyle" ),
+        Property( "BorderStyle",
                   PROP_DATAPOINT_BORDER_STYLE,
                   ::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "BorderWidth" ),
+        Property( "BorderWidth",
                   PROP_DATAPOINT_BORDER_WIDTH,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "BorderDashName" ),
+        Property( "BorderDashName",
                   PROP_DATAPOINT_BORDER_DASH_NAME,
                   ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
-        Property( C2U( "BorderTransparency" ),
+        Property( "BorderTransparency",
                   PROP_DATAPOINT_BORDER_TRANSPARENCY,
                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -157,25 +157,25 @@ void DataPointProperties::AddPropertiesToVector(
     // Line Properties
     // ---------------
     rOutProperties.push_back(
-        Property( C2U( "LineStyle" ),
+        Property( "LineStyle",
                   LineProperties::PROP_LINE_STYLE,
                   ::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "LineWidth" ),
+        Property( "LineWidth",
                   LineProperties::PROP_LINE_WIDTH,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-         Property( C2U( "LineDash" ),
+         Property( "LineDash",
                    LineProperties::PROP_LINE_DASH,
                    ::getCppuType( reinterpret_cast< const drawing::LineDash * >(0)),
                    beans::PropertyAttribute::BOUND
                    | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
-        Property( C2U( "LineDashName" ),
+        Property( "LineDashName",
                   LineProperties::PROP_LINE_DASH_NAME,
                   ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -184,28 +184,28 @@ void DataPointProperties::AddPropertiesToVector(
     // FillProperties
     // bitmap properties
     rOutProperties.push_back(
-        Property( C2U( "FillBitmapOffsetX" ),
+        Property( "FillBitmapOffsetX",
                   FillProperties::PROP_FILL_BITMAP_OFFSETX,
                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "FillBitmapOffsetY" ),
+        Property( "FillBitmapOffsetY",
                   FillProperties::PROP_FILL_BITMAP_OFFSETY,
                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "FillBitmapPositionOffsetX" ),
+        Property( "FillBitmapPositionOffsetX",
                   FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETX,
                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "FillBitmapPositionOffsetY" ),
+        Property( "FillBitmapPositionOffsetY",
                   FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETY,
                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -213,35 +213,35 @@ void DataPointProperties::AddPropertiesToVector(
 
 
     rOutProperties.push_back(
-        Property( C2U( "FillBitmapRectanglePoint" ),
+        Property( "FillBitmapRectanglePoint",
                   FillProperties::PROP_FILL_BITMAP_RECTANGLEPOINT,
                   ::getCppuType( reinterpret_cast< const drawing::RectanglePoint * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "FillBitmapLogicalSize" ),
+        Property( "FillBitmapLogicalSize",
                   FillProperties::PROP_FILL_BITMAP_LOGICALSIZE,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "FillBitmapSizeX" ),
+        Property( "FillBitmapSizeX",
                   FillProperties::PROP_FILL_BITMAP_SIZEX,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "FillBitmapSizeY" ),
+        Property( "FillBitmapSizeY",
                   FillProperties::PROP_FILL_BITMAP_SIZEY,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "FillBitmapMode" ),
+        Property( "FillBitmapMode",
                   FillProperties::PROP_FILL_BITMAP_MODE,
                   ::getCppuType( reinterpret_cast< const drawing::BitmapMode * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -249,40 +249,40 @@ void DataPointProperties::AddPropertiesToVector(
 
     // others
     rOutProperties.push_back(
-        Property( C2U( "Symbol" ),
+        Property( "Symbol",
                   PROP_DATAPOINT_SYMBOL_PROP,
                   ::getCppuType( reinterpret_cast< const chart2::Symbol * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "Offset" ),
+        Property( "Offset",
                   PROP_DATAPOINT_OFFSET,
                   ::getCppuType( reinterpret_cast< const double * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "Geometry3D" ),
+        Property( "Geometry3D",
                   PROP_DATAPOINT_GEOMETRY3D,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "Label" ),
+        Property( "Label",
                   PROP_DATAPOINT_LABEL,
                   ::getCppuType( reinterpret_cast< const chart2::DataPointLabel * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "LabelSeparator" ),
+        Property( "LabelSeparator",
                   PROP_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_DATAPOINT_NUMBER_FORMAT,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -290,28 +290,28 @@ void DataPointProperties::AddPropertiesToVector(
 
     //additional 'PercentageNumberFormat'
     rOutProperties.push_back(
-        Property( C2U( "PercentageNumberFormat" ),
+        Property( "PercentageNumberFormat",
                   PROP_DATAPOINT_PERCENTAGE_NUMBER_FORMAT,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "LabelPlacement" ),
+        Property( "LabelPlacement",
                   PROP_DATAPOINT_LABEL_PLACEMENT,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "ReferencePageSize" ),
+        Property( "ReferencePageSize",
                   PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE,
                   ::getCppuType( reinterpret_cast< const awt::Size * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
         rOutProperties.push_back(
-        Property( C2U( "TextRotation" ),
+        Property( "TextRotation",
                   PROP_DATAPOINT_TEXT_ROTATION,
                   ::getCppuType( reinterpret_cast< const double * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -319,27 +319,27 @@ void DataPointProperties::AddPropertiesToVector(
 
     // statistics
     rOutProperties.push_back(
-        Property( C2U( "ErrorBarX" ),
+        Property( "ErrorBarX",
                   PROP_DATAPOINT_ERROR_BAR_X,
                   // XPropertySet supporting service ErrorBar
                   ::getCppuType( reinterpret_cast< const uno::Reference< beans::XPropertySet > * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
-        Property( C2U( "ErrorBarY" ),
+        Property( "ErrorBarY",
                   PROP_DATAPOINT_ERROR_BAR_Y,
                   // XPropertySet supporting service ErrorBar
                   ::getCppuType( reinterpret_cast< const uno::Reference< beans::XPropertySet > * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
-        Property( C2U( "ShowErrorBox" ),
+        Property( "ShowErrorBox",
                   PROP_DATAPOINT_SHOW_ERROR_BOX,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
-        Property( C2U( "PercentDiagonal" ),
+        Property( "PercentDiagonal",
                   PROP_DATAPOINT_PERCENT_DIAGONAL,
                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -406,7 +406,7 @@ void DataPointProperties::AddDefaultsToMap(
             sal_False  // ShowLegendSymbol
             ));
 
-    PropertyHelper::setPropertyValueDefault< rtl::OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, C2U(" ") );
+    PropertyHelper::setPropertyValueDefault< rtl::OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, " " );
 
     //@todo maybe choose a different one here -> should be dynamically that of the attached axis
     PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_ERROR_BAR_X, uno::Reference< beans::XPropertySet >());
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 26c64c350515..c292e1822a5f 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -268,9 +268,9 @@ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone()
 Sequence< OUString > DataSeries::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServices( 3 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart2.DataSeries" );
-    aServices[ 1 ] = C2U( "com.sun.star.chart2.DataPointProperties" );
-    aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" );
+    aServices[ 0 ] = "com.sun.star.chart2.DataSeries";
+    aServices[ 1 ] = "com.sun.star.chart2.DataPointProperties";
+    aServices[ 2 ] = "com.sun.star.beans.PropertySet";
     return aServices;
 }
 
@@ -366,7 +366,7 @@ Reference< beans::XPropertySet >
     }
 
     ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aValuesSeries(
-        DataSeriesHelper::getAllDataSequencesByRole( aSequences , C2U("values"), true ) );
+        DataSeriesHelper::getAllDataSequencesByRole( aSequences , "values", true ) );
     if( !aValuesSeries.empty() )
     {
         Reference< chart2::data::XDataSequence > xSeq( aValuesSeries.front()->getValues() );
@@ -513,7 +513,7 @@ void SAL_CALL DataSeries::removeRegressionCurve(
             ::std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve ) );
         if( aIt == m_aRegressionCurves.end())
             throw container::NoSuchElementException(
-                C2U( "The given regression curve is no element of this series" ),
+                "The given regression curve is no element of this series",
                 static_cast< uno::XWeak * >( this ));
         m_aRegressionCurves.erase( aIt );
     }
@@ -616,7 +616,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet )
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 APPHELPER_XSERVICEINFO_IMPL( DataSeries,
-                             C2U( "com.sun.star.comp.chart.DataSeries" ));
+                             OUString("com.sun.star.comp.chart.DataSeries") );
 
 }  // namespace chart
 
diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx
index 941d1bdf29f8..74ca6183f34c 100644
--- a/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/chart2/source/model/main/DataSeriesProperties.cxx
@@ -40,28 +40,28 @@ void DataSeriesProperties::AddPropertiesToVector(
     ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
-        Property( C2U( "AttributedDataPoints" ),
+        Property( "AttributedDataPoints",
                   PROP_DATASERIES_ATTRIBUTED_DATA_POINTS,
                   ::getCppuType( reinterpret_cast< const uno::Sequence< sal_Int32 > * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "StackingDirection" ),
+        Property( "StackingDirection",
                   PROP_DATASERIES_STACKING_DIRECTION,
                   ::getCppuType( reinterpret_cast< const chart2::StackingDirection * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "VaryColorsByPoint" ),
+        Property( "VaryColorsByPoint",
                   PROP_DATASERIES_VARY_COLORS_BY_POINT,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "AttachedAxisIndex" ),
+        Property( "AttachedAxisIndex",
                   PROP_DATASERIES_ATTACHED_AXIS_INDEX,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 1cca41cb71a2..75c97e173f93 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -80,88 +80,88 @@ void lcl_AddPropertiesToVector(
     ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
-        Property( C2U( "RelativePosition" ),
+        Property( "RelativePosition",
                   PROP_DIAGRAM_REL_POS,
                   ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "RelativeSize" ),
+        Property( "RelativeSize",
                   PROP_DIAGRAM_REL_SIZE,
                   ::getCppuType( reinterpret_cast< const chart2::RelativeSize * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "PosSizeExcludeAxes" ),
+        Property( "PosSizeExcludeAxes",
                   PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "SortByXValues" ),
+        Property( "SortByXValues",
                   PROP_DIAGRAM_SORT_BY_X_VALUES,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U("ConnectBars"),
+        Property( "ConnectBars",
                   PROP_DIAGRAM_CONNECT_BARS,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U("GroupBarsPerAxis"),
+        Property( "GroupBarsPerAxis",
                   PROP_DIAGRAM_GROUP_BARS_PER_AXIS,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U("IncludeHiddenCells"),
+        Property( "IncludeHiddenCells",
                   PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "StartingAngle" ),
+        Property( "StartingAngle",
                   PROP_DIAGRAM_STARTING_ANGLE,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0) ),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U("RightAngledAxes"),
+        Property( "RightAngledAxes",
                   PROP_DIAGRAM_RIGHT_ANGLED_AXES,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U("Perspective"),
+        Property( "Perspective",
                   PROP_DIAGRAM_PERSPECTIVE,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U("RotationHorizontal"),
+        Property( "RotationHorizontal",
                   PROP_DIAGRAM_ROTATION_HORIZONTAL,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U("RotationVertical"),
+        Property( "RotationVertical",
                   PROP_DIAGRAM_ROTATION_VERTICAL,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "MissingValueTreatment" ),
+        Property( "MissingValueTreatment",
                   PROP_DIAGRAM_MISSING_VALUE_TREATMENT,
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -425,11 +425,11 @@ void SAL_CALL Diagram::setDiagramData(
         throw (uno::RuntimeException)
 {
     uno::Reference< lang::XMultiServiceFactory > xChartTypeManager( m_xContext->getServiceManager()->createInstanceWithContext(
-            C2U( "com.sun.star.chart2.ChartTypeManager" ), m_xContext ), uno::UNO_QUERY );
+            "com.sun.star.chart2.ChartTypeManager", m_xContext ), uno::UNO_QUERY );
     DiagramHelper::tTemplateWithServiceName aTemplateAndService = DiagramHelper::getTemplateForDiagram( this, xChartTypeManager );
     uno::Reference< chart2::XChartTypeTemplate > xTemplate( aTemplateAndService.first );
     if( !xTemplate.is() )
-        xTemplate.set( xChartTypeManager->createInstance( C2U("com.sun.star.chart2.template.Column") ), uno::UNO_QUERY );
+        xTemplate.set( xChartTypeManager->createInstance( "com.sun.star.chart2.template.Column" ), uno::UNO_QUERY );
     if(!xTemplate.is())
         return;
     xTemplate->changeDiagramData( this, xDataSource, aArguments );
@@ -514,7 +514,7 @@ void SAL_CALL Diagram::removeCoordinateSystem(
               aIt( ::std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys ));
         if( aIt == m_aCoordSystems.end())
             throw container::NoSuchElementException(
-                C2U( "The given coordinate-system is no element of the container" ),
+                "The given coordinate-system is no element of the container",
                 static_cast< uno::XWeak * >( this ));
         m_aCoordSystems.erase( aIt );
     }
@@ -619,9 +619,9 @@ Sequence< OUString > Diagram::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServices( 3 );
 
-    aServices[ 0 ] = C2U( "com.sun.star.chart2.Diagram" );
-    aServices[ 1 ] = C2U( "com.sun.star.layout.LayoutElement" );
-    aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" );
+    aServices[ 0 ] = "com.sun.star.chart2.Diagram";
+    aServices[ 1 ] = "com.sun.star.layout.LayoutElement";
+    aServices[ 2 ] = "com.sun.star.beans.PropertySet";
     return aServices;
 }
 
@@ -716,7 +716,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySe
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 APPHELPER_XSERVICEINFO_IMPL( Diagram,
-                             C2U( "com.sun.star.comp.chart2.Diagram" ));
+                             OUString("com.sun.star.comp.chart2.Diagram") );
 
 } //  namespace chart
 
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index bdb71320e096..e21beed575df 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -207,8 +207,8 @@ Sequence< OUString > FormattedString::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServices( 2 );
 
-    aServices[ 0 ] = C2U( "com.sun.star.chart2.FormattedString" );
-    aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" );
+    aServices[ 0 ] = "com.sun.star.chart2.FormattedString";
+    aServices[ 1 ] = "com.sun.star.beans.PropertySet";
     return aServices;
 }
 
@@ -248,7 +248,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 APPHELPER_XSERVICEINFO_IMPL( FormattedString,
-                             C2U( "com.sun.star.comp.chart.FormattedString" ));
+                             OUString("com.sun.star.comp.chart.FormattedString") );
 
 } //  namespace chart
 
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index ec947bdd219f..77e009be2f2c 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -54,7 +54,7 @@ void lcl_AddPropertiesToVector(
     ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
-        Property( C2U( "Show" ),
+        Property( "Show",
                   PROP_GRID_SHOW,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
@@ -247,8 +247,8 @@ void GridProperties::fireModifyEvent()
 Sequence< OUString > GridProperties::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServices( 2 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart2.GridProperties" );
-    aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" );
+    aServices[ 0 ] = "com.sun.star.chart2.GridProperties";
+    aServices[ 1 ] = "com.sun.star.beans.PropertySet";
     return aServices;
 }
 
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 5e1656f48316..353d1e9eeb0c 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -65,41 +65,41 @@ void lcl_AddPropertiesToVector(
     ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
-        Property( C2U( "AnchorPosition" ),
+        Property( "AnchorPosition",
                   PROP_LEGEND_ANCHOR_POSITION,
                   ::getCppuType( reinterpret_cast< const chart2::LegendPosition * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "Expansion" ),
+        Property( "Expansion",
                   PROP_LEGEND_EXPANSION,
                   ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartLegendExpansion * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "Show" ),
+        Property( "Show",
                   PROP_LEGEND_SHOW,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "ReferencePageSize" ),
+        Property( "ReferencePageSize",
                   PROP_LEGEND_REF_PAGE_SIZE,
                   ::getCppuType( reinterpret_cast< const awt::Size * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "RelativePosition" ),
+        Property( "RelativePosition",
                   PROP_LEGEND_REL_POS,
                   ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "RelativeSize" ),
+        Property( "RelativeSize",
                   PROP_LEGEND_REL_SIZE,
                   ::getCppuType( reinterpret_cast< const chart2::RelativeSize * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -271,12 +271,12 @@ Sequence< OUString > Legend::getSupportedServiceNames_Static()
     const sal_Int32 nNumServices( 6 );
     sal_Int32 nI = 0;
     Sequence< OUString > aServices( nNumServices );
-    aServices[ nI++ ] = C2U( "com.sun.star.chart2.Legend" );
-    aServices[ nI++ ] = C2U( "com.sun.star.beans.PropertySet" );
-    aServices[ nI++ ] = C2U( "com.sun.star.drawing.FillProperties" );
-    aServices[ nI++ ] = C2U( "com.sun.star.drawing.LineProperties" );
-    aServices[ nI++ ] = C2U( "com.sun.star.style.CharacterProperties" );
-    aServices[ nI++ ] = C2U( "com.sun.star.layout.LayoutElement" );
+    aServices[ nI++ ] = "com.sun.star.chart2.Legend";
+    aServices[ nI++ ] = "com.sun.star.beans.PropertySet";
+    aServices[ nI++ ] = "com.sun.star.drawing.FillProperties";
+    aServices[ nI++ ] = "com.sun.star.drawing.LineProperties";
+    aServices[ nI++ ] = "com.sun.star.style.CharacterProperties";
+    aServices[ nI++ ] = "com.sun.star.layout.LayoutElement";
     OSL_ASSERT( nNumServices == nI );
     return aServices;
 }
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index dce468a589df..83a4c8e02ea8 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -224,8 +224,8 @@ void PageBackground::fireModifyEvent()
 uno::Sequence< ::rtl::OUString > PageBackground::getSupportedServiceNames_Static()
 {
     uno::Sequence< ::rtl::OUString > aServices( 2 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart2.PageBackground" );
-    aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" );
+    aServices[ 0 ] = "com.sun.star.chart2.PageBackground";
+    aServices[ 1 ] = "com.sun.star.beans.PropertySet";
     return aServices;
 }
 
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index 6f34cc44a9dc..d82b09369e7c 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -91,7 +91,7 @@ Sequence< OUString > PolarCoordinateSystem::getSupportedServiceNames_Static()
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem,
-                             C2U( "com.sun.star.comp.chart.PolarCoordinateSystem" ))
+                             OUString("com.sun.star.comp.chart.PolarCoordinateSystem") )
 
 
 // =================================
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index 0fbf2e648c1d..f0d440f6f36f 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -236,8 +236,8 @@ void StockBar::fireModifyEvent()
 uno::Sequence< ::rtl::OUString > StockBar::getSupportedServiceNames_Static()
 {
     uno::Sequence< ::rtl::OUString > aServices( 2 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart2.StockBar" );
-    aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" );
+    aServices[ 0 ] = "com.sun.star.chart2.StockBar";
+    aServices[ 1 ] = "com.sun.star.beans.PropertySet";
     return aServices;
 }
 
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index fc3769d9c3ef..8295a390926f 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -70,76 +70,76 @@ void lcl_AddPropertiesToVector(
     ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
-        Property( C2U( "ParaAdjust" ),
+        Property( "ParaAdjust",
                   PROP_TITLE_PARA_ADJUST,
                   ::getCppuType( reinterpret_cast< ::com::sun::star::style::ParagraphAdjust * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "ParaLastLineAdjust" ),
+        Property( "ParaLastLineAdjust",
                   PROP_TITLE_PARA_LAST_LINE_ADJUST,
                   ::getCppuType( reinterpret_cast< sal_Int16 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "ParaLeftMargin" ),
+        Property( "ParaLeftMargin",
                   PROP_TITLE_PARA_LEFT_MARGIN,
                   ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "ParaRightMargin" ),
+        Property( "ParaRightMargin",
                   PROP_TITLE_PARA_RIGHT_MARGIN,
                   ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "ParaTopMargin" ),
+        Property( "ParaTopMargin",
                   PROP_TITLE_PARA_TOP_MARGIN,
                   ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "ParaBottomMargin" ),
+        Property( "ParaBottomMargin",
                   PROP_TITLE_PARA_BOTTOM_MARGIN,
                   ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "ParaIsHyphenation" ),
+        Property( "ParaIsHyphenation",
                   PROP_TITLE_PARA_IS_HYPHENATION,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "TextRotation" ),
+        Property( "TextRotation",
                   PROP_TITLE_TEXT_ROTATION,
                   ::getCppuType( reinterpret_cast< const double * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
-        Property( C2U( "StackCharacters" ),
+        Property( "StackCharacters",
                   PROP_TITLE_TEXT_STACKED,
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( C2U( "RelativePosition" ),
+        Property( "RelativePosition",
                   PROP_TITLE_REL_POS,
                   ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
-        Property( C2U( "ReferencePageSize" ),
+        Property( "ReferencePageSize",
                   PROP_TITLE_REF_PAGE_SIZE,
                   ::getCppuType( reinterpret_cast< const awt::Size * >(0)),
                   beans::PropertyAttribute::BOUND
@@ -377,10 +377,10 @@ void Title::fireModifyEvent()
 uno::Sequence< ::rtl::OUString > Title::getSupportedServiceNames_Static()
 {
     uno::Sequence< ::rtl::OUString > aServices( 4 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart2.Title" );
-    aServices[ 1 ] = C2U( "com.sun.star.style.ParagraphProperties" );
-    aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" );
-    aServices[ 3 ] = C2U( "com.sun.star.layout.LayoutElement" );
+    aServices[ 0 ] = "com.sun.star.chart2.Title";
+    aServices[ 1 ] = "com.sun.star.style.ParagraphProperties";
+    aServices[ 2 ] = "com.sun.star.beans.PropertySet";
+    aServices[ 3 ] = "com.sun.star.layout.LayoutElement";
     return aServices;
 }
 
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index 2f56aa568909..4947f259e180 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -227,8 +227,8 @@ void Wall::fireModifyEvent()
 uno::Sequence< ::rtl::OUString > Wall::getSupportedServiceNames_Static()
 {
     uno::Sequence< ::rtl::OUString > aServices( 2 );
-    aServices[ 0 ] = C2U( "com.sun.star.chart2.Wall" );
-    aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" );
+    aServices[ 0 ] = "com.sun.star.chart2.Wall";
+    aServices[ 1 ] = "com.sun.star.beans.PropertySet";
     return aServices;
 }