OUString cleanup in Chart2

Include C2U macro and rtl cleanup

Change-Id: I4543a3a6d6a6971d2c31b8dc36bd2ec95bd892d4

6 files changed, 199 insertions, 202 deletions

diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 14eb7e060ff8..03d947736c0d 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -55,7 +55,7 @@ LegendItemConverter::LegendItemConverter(
                                  GraphicPropertyItemConverter::LINE_AND_FILL_PROPERTIES ));
     m_aConverters.push_back( new CharacterPropertyItemConverter(
                                  rPropertySet, rItemPool, pRefSize,
-                                 C2U( "ReferencePageSize" ) ));
+                                 "ReferencePageSize" ));
 }
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
@@ -112,10 +112,10 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
             {
                 sal_Bool bShow = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
                 sal_Bool bWasShown = sal_True;
-                if( ! (GetPropertySet()->getPropertyValue( C2U("Show")) >>= bWasShown) ||
+                if( ! (GetPropertySet()->getPropertyValue( "Show" ) >>= bWasShown) ||
                     ( bWasShown != bShow ))
                 {
-                    GetPropertySet()->setPropertyValue( C2U("Show"), uno::makeAny( bShow ));
+                    GetPropertySet()->setPropertyValue( "Show" , uno::makeAny( bShow ));
                     bChanged = true;
                 }
             }
@@ -147,12 +147,12 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
                 try
                 {
                     chart2::LegendPosition eOldPos;
-                    if( ! ( GetPropertySet()->getPropertyValue( C2U( "AnchorPosition" )) >>= eOldPos ) ||
+                    if( ! ( GetPropertySet()->getPropertyValue( "AnchorPosition" ) >>= eOldPos ) ||
                         ( eOldPos != eNewPos ))
                     {
-                        GetPropertySet()->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( eNewPos ));
-                        GetPropertySet()->setPropertyValue( C2U( "Expansion" ), uno::makeAny( eExpansion ));
-                        GetPropertySet()->setPropertyValue( C2U( "RelativePosition" ), uno::Any());
+                        GetPropertySet()->setPropertyValue( "AnchorPosition" , uno::makeAny( eNewPos ));
+                        GetPropertySet()->setPropertyValue( "Expansion" , uno::makeAny( eExpansion ));
+                        GetPropertySet()->setPropertyValue( "RelativePosition" , uno::Any());
                         bChanged = true;
                     }
                 }
@@ -177,14 +177,14 @@ void LegendItemConverter::FillSpecialItem(
         case SCHATTR_LEGEND_SHOW:
         {
             sal_Bool bShow = sal_True;
-            GetPropertySet()->getPropertyValue( C2U( "Show" )) >>= bShow;
+            GetPropertySet()->getPropertyValue( "Show" ) >>= bShow;
             rOutItemSet.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, bShow) );
         }
         break;
         case SCHATTR_LEGEND_POS:
         {
             chart2::LegendPosition eLegendPos( chart2::LegendPosition_LINE_END );
-            GetPropertySet()->getPropertyValue( C2U( "AnchorPosition" )) >>= eLegendPos;
+            GetPropertySet()->getPropertyValue( "AnchorPosition" ) >>= eLegendPos;
             rOutItemSet.Put( SfxInt32Item(SCHATTR_LEGEND_POS, eLegendPos ) );
         }
         break;
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 970330c64b4e..fcf49d925ec2 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -169,10 +169,10 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
                 OSL_ASSERT( xEqProp.is());
                 bool bOldShow = false;
                 if( xEqProp.is() &&
-                    (xEqProp->getPropertyValue( C2U( "ShowEquation" )) >>= bOldShow) &&
+                    (xEqProp->getPropertyValue( "ShowEquation" ) >>= bOldShow) &&
                     bOldShow != bNewShow )
                 {
-                    xEqProp->setPropertyValue( C2U( "ShowEquation" ), uno::makeAny( bNewShow ));
+                    xEqProp->setPropertyValue( "ShowEquation" , uno::makeAny( bNewShow ));
                     bChanged = true;
                 }
             }
@@ -192,10 +192,10 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
                 OSL_ASSERT( xEqProp.is());
                 bool bOldShow = false;
                 if( xEqProp.is() &&
-                    (xEqProp->getPropertyValue( C2U( "ShowCorrelationCoefficient" )) >>= bOldShow) &&
+                    (xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bOldShow) &&
                     bOldShow != bNewShow )
                 {
-                    xEqProp->setPropertyValue( C2U( "ShowCorrelationCoefficient" ), uno::makeAny( bNewShow ));
+                    xEqProp->setPropertyValue( "ShowCorrelationCoefficient" , uno::makeAny( bNewShow ));
                     bChanged = true;
                 }
             }
@@ -235,7 +235,7 @@ void RegressionCurveItemConverter::FillSpecialItem(
                 OSL_ASSERT( xEqProp.is());
                 bool bShow = false;
                 if( xEqProp.is() &&
-                    (xEqProp->getPropertyValue( C2U( "ShowEquation" )) >>= bShow))
+                    (xEqProp->getPropertyValue( "ShowEquation" ) >>= bShow))
                 {
                     rOutItemSet.Put( SfxBoolItem( nWhichId, bShow ));
                 }
@@ -252,7 +252,7 @@ void RegressionCurveItemConverter::FillSpecialItem(
                 OSL_ASSERT( xEqProp.is());
                 bool bShow = false;
                 if( xEqProp.is() &&
-                    (xEqProp->getPropertyValue( C2U( "ShowCorrelationCoefficient" )) >>= bShow))
+                    (xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bShow))
                 {
                     rOutItemSet.Put( SfxBoolItem( nWhichId, bShow ));
                 }
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 04b2e458c252..15fe0a816b50 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -111,12 +111,12 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
             uno::Reference< beans::XPropertySet > xChartTypeProps( xChartType, uno::UNO_QUERY );
             if( xChartTypeProps.is() )
             {
-                if( xChartTypeProps->getPropertyValue( C2U( "OverlapSequence" ) ) >>= m_aBarPositionSequence )
+                if( xChartTypeProps->getPropertyValue( "OverlapSequence" ) >>= m_aBarPositionSequence )
                 {
                     if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() )
                         m_nBarOverlap = m_aBarPositionSequence[nAxisIndex];
                 }
-                if( xChartTypeProps->getPropertyValue( C2U( "GapwidthSequence" ) ) >>= m_aBarPositionSequence )
+                if( xChartTypeProps->getPropertyValue( "GapwidthSequence" ) >>= m_aBarPositionSequence )
                 {
                     if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() )
                         m_nGapWidth = m_aBarPositionSequence[nAxisIndex];
@@ -127,20 +127,20 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
         m_bSupportingBarConnectors = ChartTypeHelper::isSupportingBarConnectors( xChartType, nDimensionCount );
         if( m_bSupportingBarConnectors && xDiagramProperties.is() )
         {
-            xDiagramProperties->getPropertyValue( C2U("ConnectBars")) >>= m_bConnectBars;
+            xDiagramProperties->getPropertyValue( "ConnectBars" ) >>= m_bConnectBars;
         }
 
         m_bSupportingAxisSideBySide = ChartTypeHelper::isSupportingAxisSideBySide( xChartType, nDimensionCount );
         if( m_bSupportingAxisSideBySide && xDiagramProperties.is() )
         {
-            xDiagramProperties->getPropertyValue( C2U("GroupBarsPerAxis")) >>= m_bGroupBarsPerAxis;
+            xDiagramProperties->getPropertyValue( "GroupBarsPerAxis" ) >>= m_bGroupBarsPerAxis;
             m_bAllSeriesAttachedToSameAxis = DataSeriesHelper::areAllSeriesAttachedToSameAxis( xChartType, m_nAllSeriesAxisIndex );
         }
 
         m_bSupportingStartingAngle = ChartTypeHelper::isSupportingStartingAngle( xChartType );
         if( m_bSupportingStartingAngle )
         {
-            xDiagramProperties->getPropertyValue( C2U( "StartingAngle" ) ) >>= m_nStartingAngle;
+            xDiagramProperties->getPropertyValue( "StartingAngle" ) >>= m_nStartingAngle;
         }
 
         m_aSupportedMissingValueTreatments = ChartTypeHelper::getSupportedMissingValueTreatments( xChartType );
@@ -154,10 +154,10 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
             try
             {
                 //test whether the data provider offers this property
-                xProp->getPropertyValue(C2U("IncludeHiddenCells"));
+                xProp->getPropertyValue( "IncludeHiddenCells" );
                 //if not exception is thrown the property is offered
                 m_bSupportingPlottingOfHiddenCells = true;
-                xDiagramProperties->getPropertyValue( C2U("IncludeHiddenCells") ) >>= m_bIncludeHiddenCells;
+                xDiagramProperties->getPropertyValue( "IncludeHiddenCells" ) >>= m_bIncludeHiddenCells;
             }
             catch( const beans::UnknownPropertyException& )
             {
@@ -216,9 +216,9 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
                 sal_Int32& rBarPosition = ( SCHATTR_BAR_OVERLAP == nWhichId ) ? m_nBarOverlap : m_nGapWidth;
                 rBarPosition = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
 
-                rtl::OUString aPropName( C2U( "GapwidthSequence" ) );
+                OUString aPropName("GapwidthSequence" );
                 if( SCHATTR_BAR_OVERLAP == nWhichId )
-                    aPropName = C2U( "OverlapSequence" );
+                    aPropName = "OverlapSequence";
 
                 uno::Reference< XDataSeries > xDataSeries( GetPropertySet(), uno::UNO_QUERY );
                 uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram(m_xChartModel) );
@@ -259,10 +259,10 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
             {
                 uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY );
                 if( xDiagramProperties.is() &&
-                    (xDiagramProperties->getPropertyValue( C2U("ConnectBars")) >>= bOldConnectBars) &&
+                    (xDiagramProperties->getPropertyValue( "ConnectBars" ) >>= bOldConnectBars) &&
                     bOldConnectBars != m_bConnectBars )
                 {
-                    xDiagramProperties->setPropertyValue( C2U("ConnectBars"), uno::makeAny(m_bConnectBars) );
+                    xDiagramProperties->setPropertyValue( "ConnectBars" , uno::makeAny(m_bConnectBars) );
                     bChanged = true;
                 }
             }
@@ -278,10 +278,10 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
             {
                 uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY );
                 if( xDiagramProperties.is() &&
-                    (xDiagramProperties->getPropertyValue( C2U("GroupBarsPerAxis")) >>= bOldGroupBarsPerAxis) &&
+                    (xDiagramProperties->getPropertyValue( "GroupBarsPerAxis" ) >>= bOldGroupBarsPerAxis) &&
                     bOldGroupBarsPerAxis != m_bGroupBarsPerAxis )
                 {
-                    xDiagramProperties->setPropertyValue( C2U("GroupBarsPerAxis"), uno::makeAny(m_bGroupBarsPerAxis) );
+                    xDiagramProperties->setPropertyValue( "GroupBarsPerAxis" , uno::makeAny(m_bGroupBarsPerAxis) );
                     bChanged = true;
                 }
             }
@@ -296,7 +296,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
                 uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY );
                 if( xDiagramProperties.is() )
                 {
-                    xDiagramProperties->setPropertyValue( C2U("StartingAngle"), uno::makeAny(m_nStartingAngle) );
+                    xDiagramProperties->setPropertyValue( "StartingAngle" , uno::makeAny(m_nStartingAngle) );
                     bChanged = true;
                 }
             }
@@ -333,7 +333,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
                         uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY );
                         if( xDiagramProperties.is() )
                         {
-                            xDiagramProperties->setPropertyValue( C2U( "MissingValueTreatment" ), uno::makeAny( nNew ));
+                            xDiagramProperties->setPropertyValue( "MissingValueTreatment" , uno::makeAny( nNew ));
                             bChanged = true;
                         }
                     }
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 0acc974f3e38..6cddc4e5cf10 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -57,7 +57,7 @@ uno::Reference< beans::XPropertySet > lcl_GetErrorBar(
     if( xProp.is())
         try
         {
-        ( xProp->getPropertyValue( bYError ? C2U( "ErrorBarY" ) : C2U("ErrorBarX") ) >>= xResult );
+        ( xProp->getPropertyValue( bYError ? OUString( "ErrorBarY" ) : OUString("ErrorBarX") ) >>= xResult );
         }
         catch( const uno::Exception & ex )
         {
@@ -106,8 +106,8 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar
 
     try
     {
-        xErrorBarProp->getPropertyValue( C2U( "PositiveError" )) >>= rOutPosError;
-        xErrorBarProp->getPropertyValue( C2U( "NegativeError" )) >>= rOutNegError;
+        xErrorBarProp->getPropertyValue( "PositiveError" ) >>= rOutPosError;
+        xErrorBarProp->getPropertyValue( "NegativeError" ) >>= rOutNegError;
     }
     catch( const uno::Exception & ex )
     {
@@ -124,8 +124,8 @@ void lcl_getErrorIndicatorValues(
 
     try
     {
-        xErrorBarProp->getPropertyValue( C2U( "ShowPositiveError" )) >>= rOutShowPosError;
-        xErrorBarProp->getPropertyValue( C2U( "ShowNegativeError" )) >>= rOutShowNegError;
+        xErrorBarProp->getPropertyValue( "ShowPositiveError" ) >>= rOutShowPosError;
+        xErrorBarProp->getPropertyValue( "ShowNegativeError" ) >>= rOutShowNegError;
     }
     catch( const uno::Exception & ex )
     {
@@ -282,12 +282,11 @@ bool StatisticsItemConverter::ApplySpecialItem(
                 if( !xErrorBarProp.is() )
                 {
                     xErrorBarProp = lcl_GetDefaultErrorBar();
-                    GetPropertySet()->setPropertyValue( bYError ? C2U( "ErrorBarY" ) : C2U("ErrorBarX"),
+                    GetPropertySet()->setPropertyValue( bYError ? OUString( "ErrorBarY" ) : OUString("ErrorBarX"),
                                                         uno::makeAny( xErrorBarProp ));
                 }
 
-                xErrorBarProp->setPropertyValue( C2U( "ErrorBarStyle" ),
-                                                    uno::makeAny( nStyle ));
+                xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::makeAny( nStyle ));
                 bChanged = true;
             }
         }
@@ -296,7 +295,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
         case SCHATTR_STAT_PERCENT:
         case SCHATTR_STAT_BIGERROR:
         {
-            OSL_FAIL( "Deprectaed item" );
+            OSL_FAIL( "Deprecated item" );
             bool bYError =
                 static_cast<const SfxBoolItem&>(rItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
 
@@ -314,10 +313,8 @@ bool StatisticsItemConverter::ApplySpecialItem(
                 ! ( ::rtl::math::approxEqual( fPos, fValue ) &&
                     ::rtl::math::approxEqual( fNeg, fValue )))
             {
-                xErrorBarProp->setPropertyValue( C2U( "PositiveError" ),
-                                                    uno::makeAny( fValue ));
-                xErrorBarProp->setPropertyValue( C2U( "NegativeError" ),
-                                                    uno::makeAny( fValue ));
+                xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
+                xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
                 bChanged = true;
             }
         }
@@ -341,7 +338,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
             if( bOldHasErrorBar &&
                 ! ::rtl::math::approxEqual( fPos, fValue ))
             {
-                xErrorBarProp->setPropertyValue( C2U( "PositiveError" ), uno::makeAny( fValue ));
+                xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
                 bChanged = true;
             }
         }
@@ -364,7 +361,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
             if( bOldHasErrorBar &&
                 ! ::rtl::math::approxEqual( fNeg, fValue ))
             {
-                xErrorBarProp->setPropertyValue( C2U( "NegativeError" ), uno::makeAny( fValue ));
+                xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
                 bChanged = true;
             }
         }
@@ -406,12 +403,12 @@ bool StatisticsItemConverter::ApplySpecialItem(
             if( xEqProp.is())
             {
                 bool bShowEq = false;
-                xEqProp->getPropertyValue( C2U("ShowEquation")) >>= bShowEq;
+                xEqProp->getPropertyValue( "ShowEquation" ) >>= bShowEq;
                 bool bNewShowEq =
                     static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue();
                 if( bShowEq != bNewShowEq )
                 {
-                    xEqProp->setPropertyValue( C2U("ShowEquation"), uno::makeAny( bNewShowEq ));
+                    xEqProp->setPropertyValue( "ShowEquation" , uno::makeAny( bNewShowEq ));
                     bChanged = true;
                 }
             }
@@ -424,12 +421,12 @@ bool StatisticsItemConverter::ApplySpecialItem(
             if( xEqProp.is())
             {
                 bool bShowCoeff = false;
-                xEqProp->getPropertyValue( C2U("ShowCorrelationCoefficient")) >>= bShowCoeff;
+                xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bShowCoeff;
                 bool bNewShowCoeff =
                     static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue();
                 if( bShowCoeff != bNewShowCoeff )
                 {
-                    xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( bNewShowCoeff ));
+                    xEqProp->setPropertyValue( "ShowCorrelationCoefficient" , uno::makeAny( bNewShowCoeff ));
                     bChanged = true;
                 }
             }
@@ -458,8 +455,8 @@ bool StatisticsItemConverter::ApplySpecialItem(
                 ( bShowPos != bNewIndPos ||
                   bShowNeg != bNewIndNeg ))
             {
-                xErrorBarProp->setPropertyValue( C2U( "ShowPositiveError" ), uno::makeAny( bNewIndPos ));
-                xErrorBarProp->setPropertyValue( C2U( "ShowNegativeError" ), uno::makeAny( bNewIndNeg ));
+                xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::makeAny( bNewIndPos ));
+                xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::makeAny( bNewIndNeg ));
                 bChanged = true;
             }
         }
@@ -479,7 +476,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
                 xDataProvider.set( xChartDoc->getDataProvider());
             if( xErrorBarSource.is() && xDataProvider.is())
             {
-                ::rtl::OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue());
+                OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue());
                 bool bApplyNewRange = false;
 
                 bool bIsPositiveValue( nWhichId == SCHATTR_STAT_RANGE_POS );
@@ -498,7 +495,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
                             if( xIntDataProvider.is())
                             {
                                 xIntDataProvider->appendSequence();
-                                aNewRange = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("last"));
+                                aNewRange = "last";
                                 bApplyNewRange = true;
                             }
                         }
@@ -510,7 +507,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
                         StatisticsHelper::getErrorDataSequenceFromDataSource(
                             xErrorBarSource, bIsPositiveValue, bYError ));
                     bApplyNewRange =
-                        ! ( xSeq.is() && aNewRange.equals( xSeq->getSourceRangeRepresentation()));
+                        ! ( xSeq.is() && (aNewRange == xSeq->getSourceRangeRepresentation()));
                 }
 
                 if( bApplyNewRange )
@@ -548,7 +545,7 @@ void StatisticsItemConverter::FillSpecialItem(
             if( xErrorBarProp.is() )
             {
                 sal_Int32 nStyle = 0;
-                if( xErrorBarProp->getPropertyValue( C2U( "ErrorBarStyle" )) >>= nStyle )
+                if( xErrorBarProp->getPropertyValue( "ErrorBarStyle" ) >>= nStyle )
                 {
                     switch( nStyle )
                     {
@@ -647,7 +644,7 @@ void StatisticsItemConverter::FillSpecialItem(
             bool bShowEq = false;
             uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), 0 ));
             if( xEqProp.is())
-                xEqProp->getPropertyValue( C2U("ShowEquation")) >>= bShowEq;
+                xEqProp->getPropertyValue( "ShowEquation" ) >>= bShowEq;
             rOutItemSet.Put( SfxBoolItem( nWhichId, bShowEq ));
         }
         break;
@@ -657,7 +654,7 @@ void StatisticsItemConverter::FillSpecialItem(
             bool bShowCoeff = false;
             uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), 0 ));
             if( xEqProp.is())
-                xEqProp->getPropertyValue( C2U("ShowCorrelationCoefficient")) >>= bShowCoeff;
+                xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bShowCoeff;
             rOutItemSet.Put( SfxBoolItem( nWhichId, bShowCoeff ));
         }
         break;
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index f4ec1ad601ae..981b8dc55c70 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -90,7 +90,7 @@ FormattedStringsConverter::FormattedStringsConverter(
                 m_aConverters.push_back( new CharacterPropertyItemConverter(
                                              xProp, rItemPool,
                                              ::std::auto_ptr< awt::Size >( new awt::Size( *pRefSize )),
-                                             C2U( "ReferencePageSize" ),
+                                             "ReferencePageSize" ,
                                              xParentProp ));
             else
                 m_aConverters.push_back( new CharacterPropertyItemConverter( xProp, rItemPool ));
@@ -201,12 +201,12 @@ bool TitleItemConverter::ApplySpecialItem(
                     rItemSet.Get( nWhichId )).GetValue()) / 100.0;
             double fOldVal = 0.0;
             bool bPropExisted =
-                ( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fOldVal );
+                ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldVal );
 
             if( ! bPropExisted ||
                 ( bPropExisted && fOldVal != fVal ))
             {
-                GetPropertySet()->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fVal ));
+                GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fVal ));
                 bChanged = true;
             }
         }
@@ -227,7 +227,7 @@ void TitleItemConverter::FillSpecialItem(
             // convert double to int (times 100)
             double fVal = 0;
 
-            if( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fVal )
+            if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fVal )
             {
                 rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast< sal_Int32 >(
                                                    ::rtl::math::round( fVal * 100.0 ) ) ));
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index e1cd60acc4bb..6eb90ae805ec 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -249,8 +249,8 @@ void ChartController::TheModel::tryTermination()
     catch(const uno::Exception& ex)
     {
         (void)(ex); // no warning in non-debug builds
-        OSL_FAIL( ( rtl::OString("Termination of model failed: ")
-            + rtl::OUStringToOString( ex.Message, RTL_TEXTENCODING_ASCII_US ) ).getStr() );
+        OSL_FAIL( ( OString("Termination of model failed: ")
+            + OUStringToOString( ex.Message, RTL_TEXTENCODING_ASCII_US ) ).getStr() );
     }
 }
 
@@ -332,12 +332,12 @@ sal_Bool ChartController::TheModelRef::is() const
 
 APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME)
 
-    uno::Sequence< rtl::OUString > ChartController
+    uno::Sequence< OUString > ChartController
 ::getSupportedServiceNames_Static()
 {
-    uno::Sequence< rtl::OUString > aSNS( 2 );
+    uno::Sequence< OUString > aSNS( 2 );
     aSNS.getArray()[ 0 ] = CHART_CONTROLLER_SERVICE_NAME;
-    aSNS.getArray()[ 1 ] = ::rtl::OUString( "com.sun.star.frame.Controller"  );
+    aSNS.getArray()[ 1 ] = "com.sun.star.frame.Controller";
     //// @todo : add additional services if you support any further
     return aSNS;
 }
@@ -417,23 +417,23 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT
             try
             {
                 uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
-                xPropSet->getPropertyValue( C2U( "LayoutManager" ) ) >>= xLayoutManager;
+                xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager;
                 if ( xLayoutManager.is() )
                 {
                     xLayoutManager->lock();
-                    xLayoutManager->requestElement( C2U( "private:resource/menubar/menubar" ) );
+                    xLayoutManager->requestElement( "private:resource/menubar/menubar" );
                     //@todo: createElement should become unnecessary, remove when #i79198# is fixed
-                    xLayoutManager->createElement(  C2U( "private:resource/toolbar/standardbar" ) );
-                    xLayoutManager->requestElement( C2U( "private:resource/toolbar/standardbar" ) );
+                    xLayoutManager->createElement( "private:resource/toolbar/standardbar" );
+                    xLayoutManager->requestElement( "private:resource/toolbar/standardbar" );
                     //@todo: createElement should become unnecessary, remove when #i79198# is fixed
-                    xLayoutManager->createElement(  C2U( "private:resource/toolbar/toolbar" ) );
-                    xLayoutManager->requestElement( C2U( "private:resource/toolbar/toolbar" ) );
+                    xLayoutManager->createElement( "private:resource/toolbar/toolbar" );
+                    xLayoutManager->requestElement( "private:resource/toolbar/toolbar" );
 
                     // #i12587# support for shapes in chart
-                    xLayoutManager->createElement(  C2U( "private:resource/toolbar/drawbar" ) );
-                    xLayoutManager->requestElement( C2U( "private:resource/toolbar/drawbar" ) );
+                    xLayoutManager->createElement( "private:resource/toolbar/drawbar" );
+                    xLayoutManager->requestElement( "private:resource/toolbar/drawbar" );
 
-                    xLayoutManager->requestElement( C2U( "private:resource/statusbar/statusbar" ) );
+                    xLayoutManager->requestElement( "private:resource/statusbar/statusbar" );
                     xLayoutManager->unlock();
 
                     // add as listener to get notified when
@@ -456,14 +456,14 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
 {
     //adjust controller to view status changes
 
-    if( rEvent.NewMode.equals(C2U("dirty")) )
+    if( rEvent.NewMode == "dirty" )
     {
         //the view has become dirty, we should repaint it if we have a window
         SolarMutexGuard aGuard;
         if( m_pChartWindow )
             m_pChartWindow->ForceInvalidate();
     }
-    else if( rEvent.NewMode.equals(C2U("invalid")) )
+    else if( rEvent.NewMode == "invalid" )
     {
         //the view is about to become invalid so end all actions on it
         impl_invalidateAccessible();
@@ -582,7 +582,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
 #endif
 
     //select chart area per default:
-    select( uno::makeAny( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) ) );
+    select( uno::makeAny( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ) );
 
     uno::Reference< lang::XMultiServiceFactory > xFact( getModel(), uno::UNO_QUERY );
     if( xFact.is())
@@ -953,8 +953,8 @@ void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, ::
         Reference< frame::XLayoutManager > xLM( aSource.Source, uno::UNO_QUERY );
         if( xLM.is())
         {
-            xLM->createElement( C2U("private:resource/statusbar/statusbar"));
-            xLM->requestElement( C2U("private:resource/statusbar/statusbar"));
+            xLM->createElement(  "private:resource/statusbar/statusbar" );
+            xLM->requestElement( "private:resource/statusbar/statusbar" );
         }
     }
 }
@@ -966,55 +966,55 @@ void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, ::
 
 namespace
 {
-bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
+bool lcl_isFormatObjectCommand( const OString& aCommand )
 {
-    if(    aCommand.equals("MainTitle")
-        || aCommand.equals("SubTitle")
-        || aCommand.equals("XTitle")
-        || aCommand.equals("YTitle")
-        || aCommand.equals("ZTitle")
-        || aCommand.equals("SecondaryXTitle")
-        || aCommand.equals("SecondaryYTitle")
-        || aCommand.equals("AllTitles")
-        || aCommand.equals("DiagramAxisX")
-        || aCommand.equals("DiagramAxisY")
-        || aCommand.equals("DiagramAxisZ")
-        || aCommand.equals("DiagramAxisA")
-        || aCommand.equals("DiagramAxisB")
-        || aCommand.equals("DiagramAxisAll")
-        || aCommand.equals("DiagramGridXMain")
-        || aCommand.equals("DiagramGridYMain")
-        || aCommand.equals("DiagramGridZMain")
-        || aCommand.equals("DiagramGridXHelp")
-        || aCommand.equals("DiagramGridYHelp")
-        || aCommand.equals("DiagramGridZHelp")
-        || aCommand.equals("DiagramGridAll")
-
-        || aCommand.equals("DiagramWall")
-        || aCommand.equals("DiagramFloor")
-        || aCommand.equals("DiagramArea")
-        || aCommand.equals("Legend")
-
-        || aCommand.equals("FormatWall")
-        || aCommand.equals("FormatFloor")
-        || aCommand.equals("FormatChartArea")
-        || aCommand.equals("FormatLegend")
-
-        || aCommand.equals("FormatTitle")
-        || aCommand.equals("FormatAxis")
-        || aCommand.equals("FormatDataSeries")
-        || aCommand.equals("FormatDataPoint")
-        || aCommand.equals("FormatDataLabels")
-        || aCommand.equals("FormatDataLabel")
-        || aCommand.equals("FormatXErrorBars")
-        || aCommand.equals("FormatYErrorBars")
-        || aCommand.equals("FormatMeanValue")
-        || aCommand.equals("FormatTrendline")
-        || aCommand.equals("FormatTrendlineEquation")
-        || aCommand.equals("FormatStockLoss")
-        || aCommand.equals("FormatStockGain")
-        || aCommand.equals("FormatMajorGrid")
-        || aCommand.equals("FormatMinorGrid")
+    if(    aCommand == "MainTitle"
+        || aCommand == "SubTitle"
+        || aCommand == "XTitle"
+        || aCommand == "YTitle"
+        || aCommand == "ZTitle"
+        || aCommand == "SecondaryXTitle"
+        || aCommand == "SecondaryYTitle"
+        || aCommand == "AllTitles"
+        || aCommand == "DiagramAxisX"
+        || aCommand == "DiagramAxisY"
+        || aCommand == "DiagramAxisZ"
+        || aCommand == "DiagramAxisA"
+        || aCommand == "DiagramAxisB"
+        || aCommand == "DiagramAxisAll"
+        || aCommand == "DiagramGridXMain"
+        || aCommand == "DiagramGridYMain"
+        || aCommand == "DiagramGridZMain"
+        || aCommand == "DiagramGridXHelp"
+        || aCommand == "DiagramGridYHelp"
+        || aCommand == "DiagramGridZHelp"
+        || aCommand == "DiagramGridAll"
+
+        || aCommand == "DiagramWall"
+        || aCommand == "DiagramFloor"
+        || aCommand == "DiagramArea"
+        || aCommand == "Legend"
+
+        || aCommand == "FormatWall"
+        || aCommand == "FormatFloor"
+        || aCommand == "FormatChartArea"
+        || aCommand == "FormatLegend"
+
+        || aCommand == "FormatTitle"
+        || aCommand == "FormatAxis"
+        || aCommand == "FormatDataSeries"
+        || aCommand == "FormatDataPoint"
+        || aCommand == "FormatDataLabels"
+        || aCommand == "FormatDataLabel"
+        || aCommand == "FormatXErrorBars"
+        || aCommand == "FormatYErrorBars"
+        || aCommand == "FormatMeanValue"
+        || aCommand == "FormatTrendline"
+        || aCommand == "FormatTrendlineEquation"
+        || aCommand == "FormatStockLoss"
+        || aCommand == "FormatStockGain"
+        || aCommand == "FormatMajorGrid"
+        || aCommand == "FormatMinorGrid"
         )
     return true;
 
@@ -1025,7 +1025,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
 
         uno::Reference<frame::XDispatch> SAL_CALL ChartController
 ::queryDispatch( const util::URL& rURL
-        , const rtl::OUString& rTargetFrameName
+        , const OUString& rTargetFrameName
         , sal_Int32 /* nSearchFlags */)
         throw(uno::RuntimeException)
 {
@@ -1059,109 +1059,109 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
             throw (uno::RuntimeException)
 {
     //@todo avoid OString
-    rtl::OString aCommand( rtl::OUStringToOString( rURL.Path, RTL_TEXTENCODING_ASCII_US ) );
+    OString aCommand( OUStringToOString( rURL.Path, RTL_TEXTENCODING_ASCII_US ) );
 
-    if(aCommand.equals("Paste"))
+    if(aCommand == "Paste")
         this->executeDispatch_Paste();
-    else if(aCommand.equals("Copy"))
+    else if(aCommand == "Copy" )
         this->executeDispatch_Copy();
-    else if(aCommand.equals("Cut"))
+    else if(aCommand == "Cut" )
         this->executeDispatch_Cut();
-    else if(aCommand.equals("DataRanges"))
+    else if(aCommand == "DataRanges" )
         this->executeDispatch_SourceData();
     //----------------------------------
-    else if(aCommand.equals("Update")) //Update Chart
+    else if(aCommand == "Update" ) //Update Chart
     {
         ChartViewHelper::setViewToDirtyState( getModel() );
         SolarMutexGuard aGuard;
         if( m_pChartWindow )
             m_pChartWindow->Invalidate();
     }
-    else if(aCommand.equals("DiagramData"))
+    else if(aCommand == "DiagramData" )
         this->executeDispatch_EditData();
     //insert objects
-    else if( aCommand.equals("InsertTitles")
-        || aCommand.equals("InsertMenuTitles") )
+    else if( aCommand == "InsertTitles"
+        || aCommand == "InsertMenuTitles")
         this->executeDispatch_InsertTitles();
-    else if( aCommand.equals("InsertMenuLegend") )
+    else if( aCommand == "InsertMenuLegend" )
         this->executeDispatch_OpenLegendDialog();
-    else if( aCommand.equals("InsertLegend") )
+    else if( aCommand == "InsertLegend" )
         this->executeDispatch_InsertLegend();
-    else if( aCommand.equals("DeleteLegend") )
+    else if( aCommand == "DeleteLegend" )
         this->executeDispatch_DeleteLegend();
-    else if( aCommand.equals("InsertMenuDataLabels"))
+    else if( aCommand == "InsertMenuDataLabels" )
         this->executeDispatch_InsertMenu_DataLabels();
-    else if( aCommand.equals("InsertMenuAxes")
-        || aCommand.equals("InsertRemoveAxes") )
+    else if( aCommand == "InsertMenuAxes"
+        || aCommand == "InsertRemoveAxes" )
         this->executeDispatch_InsertAxes();
-    else if( aCommand.equals("InsertMenuGrids"))
+    else if( aCommand == "InsertMenuGrids" )
         this->executeDispatch_InsertGrid();
-    else if( aCommand.equals("InsertMenuTrendlines"))
+    else if( aCommand == "InsertMenuTrendlines" )
         this->executeDispatch_InsertMenu_Trendlines();
-    else if( aCommand.equals("InsertMenuMeanValues"))
+    else if( aCommand == "InsertMenuMeanValues" )
         this->executeDispatch_InsertMenu_MeanValues();
-    else if( aCommand.equals("InsertMenuXErrorBars"))
+    else if( aCommand == "InsertMenuXErrorBars" )
         this->executeDispatch_InsertErrorBars(false);
-    else if( aCommand.equals("InsertMenuYErrorBars"))
+    else if( aCommand == "InsertMenuYErrorBars" )
         this->executeDispatch_InsertErrorBars(true);
-    else if( aCommand.equals("InsertSymbol"))
+    else if( aCommand == "InsertSymbol" )
          this->executeDispatch_InsertSpecialCharacter();
-    else if( aCommand.equals("InsertTrendline"))
+    else if( aCommand == "InsertTrendline" )
          this->executeDispatch_InsertTrendline();
-    else if( aCommand.equals("DeleteTrendline"))
+    else if( aCommand == "DeleteTrendline" )
          this->executeDispatch_DeleteTrendline();
-    else if( aCommand.equals("InsertMeanValue"))
+    else if( aCommand == "InsertMeanValue" )
         this->executeDispatch_InsertMeanValue();
-    else if( aCommand.equals("DeleteMeanValue"))
+    else if( aCommand == "DeleteMeanValue" )
         this->executeDispatch_DeleteMeanValue();
-    else if( aCommand.equals("InsertXErrorBars"))
+    else if( aCommand == "InsertXErrorBars" )
         this->executeDispatch_InsertErrorBars(false);
-    else if( aCommand.equals("InsertYErrorBars"))
+    else if( aCommand == "InsertYErrorBars" )
         this->executeDispatch_InsertErrorBars(true);
-    else if( aCommand.equals("DeleteXErrorBars"))
+    else if( aCommand == "DeleteXErrorBars" )
         this->executeDispatch_DeleteErrorBars(false);
-    else if( aCommand.equals("DeleteYErrorBars"))
+    else if( aCommand == "DeleteYErrorBars" )
         this->executeDispatch_DeleteErrorBars(true);
-    else if( aCommand.equals("InsertTrendlineEquation"))
+    else if( aCommand == "InsertTrendlineEquation" )
          this->executeDispatch_InsertTrendlineEquation();
-    else if( aCommand.equals("DeleteTrendlineEquation"))
+    else if( aCommand == "DeleteTrendlineEquation" )
          this->executeDispatch_DeleteTrendlineEquation();
-    else if( aCommand.equals("InsertTrendlineEquationAndR2"))
+    else if( aCommand == "InsertTrendlineEquationAndR2" )
          this->executeDispatch_InsertTrendlineEquation( true );
-    else if( aCommand.equals("InsertR2Value"))
+    else if( aCommand == "InsertR2Value" )
          this->executeDispatch_InsertR2Value();
-    else if( aCommand.equals("DeleteR2Value"))
+    else if( aCommand == "DeleteR2Value")
          this->executeDispatch_DeleteR2Value();
-    else if( aCommand.equals("InsertDataLabels") )
+    else if( aCommand == "InsertDataLabels" )
         this->executeDispatch_InsertDataLabels();
-    else if( aCommand.equals("InsertDataLabel") )
+    else if( aCommand == "InsertDataLabel" )
         this->executeDispatch_InsertDataLabel();
-    else if( aCommand.equals("DeleteDataLabels") )
+    else if( aCommand == "DeleteDataLabels")
         this->executeDispatch_DeleteDataLabels();
-    else if( aCommand.equals("DeleteDataLabel") )
+    else if( aCommand == "DeleteDataLabel" )
         this->executeDispatch_DeleteDataLabel();
-    else if( aCommand.equals("ResetAllDataPoints") )
+    else if( aCommand == "ResetAllDataPoints" )
         this->executeDispatch_ResetAllDataPoints();
-    else if( aCommand.equals("ResetDataPoint") )
+    else if( aCommand == "ResetDataPoint" )
         this->executeDispatch_ResetDataPoint();
-    else if( aCommand.equals("InsertAxis") )
+    else if( aCommand == "InsertAxis" )
         this->executeDispatch_InsertAxis();
-    else if( aCommand.equals("InsertMajorGrid") )
+    else if( aCommand == "InsertMajorGrid" )
         this->executeDispatch_InsertMajorGrid();
-    else if( aCommand.equals("InsertMinorGrid") )
+    else if( aCommand == "InsertMinorGrid" )
         this->executeDispatch_InsertMinorGrid();
-    else if( aCommand.equals("InsertAxisTitle") )
+    else if( aCommand == "InsertAxisTitle" )
         this->executeDispatch_InsertAxisTitle();
-    else if( aCommand.equals("DeleteAxis") )
+    else if( aCommand == "DeleteAxis" )
         this->executeDispatch_DeleteAxis();
-    else if( aCommand.equals("DeleteMajorGrid") )
+    else if( aCommand == "DeleteMajorGrid")
         this->executeDispatch_DeleteMajorGrid();
-    else if( aCommand.equals("DeleteMinorGrid") )
+    else if( aCommand == "DeleteMinorGrid" )
         this->executeDispatch_DeleteMinorGrid();
     //format objects
-    else if( aCommand.equals("FormatSelection") )
+    else if( aCommand == "FormatSelection" )
         this->executeDispatch_ObjectProperties();
-    else if( aCommand.equals("TransformDialog"))
+    else if( aCommand == "TransformDialog" )
     {
         if ( isShapeContext() )
         {
@@ -1175,11 +1175,11 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
     else if( lcl_isFormatObjectCommand(aCommand) )
         this->executeDispatch_FormatObject(rURL.Path);
     //more format
-    else if( aCommand.equals("DiagramType"))
+    else if( aCommand == "DiagramType" )
         this->executeDispatch_ChartType();
-    else if( aCommand.equals("View3D"))
+    else if( aCommand == "View3D" )
         this->executeDispatch_View3D();
-    else if ( aCommand.equals( "Forward" ) )
+    else if ( aCommand == "Forward" )
     {
         if ( isShapeContext() )
         {
@@ -1190,7 +1190,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
             this->executeDispatch_MoveSeries( sal_True );
         }
     }
-    else if ( aCommand.equals( "Backward" ) )
+    else if ( aCommand == "Backward" )
     {
         if ( isShapeContext() )
         {
@@ -1201,34 +1201,34 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
             this->executeDispatch_MoveSeries( sal_False );
         }
     }
-    else if( aCommand.equals("NewArrangement"))
+    else if( aCommand == "NewArrangement")
         this->executeDispatch_NewArrangement();
-    else if( aCommand.equals("ToggleLegend"))
+    else if( aCommand == "ToggleLegend" )
         this->executeDispatch_ToggleLegend();
-    else if( aCommand.equals("ToggleGridHorizontal"))
+    else if( aCommand == "ToggleGridHorizontal" )
         this->executeDispatch_ToggleGridHorizontal();
-    else if( aCommand.equals("ScaleText"))
+    else if( aCommand == "ScaleText" )
         this->executeDispatch_ScaleText();
-    else if( aCommand.equals("StatusBarVisible"))
+    else if( aCommand == "StatusBarVisible" )
     {
         // workaround: this should not be necessary.
         uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY );
         if( xPropSet.is() )
         {
             uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
-            xPropSet->getPropertyValue( C2U( "LayoutManager" ) ) >>= xLayoutManager;
+            xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager;
             if ( xLayoutManager.is() )
             {
-                bool bIsVisible( xLayoutManager->isElementVisible( C2U("private:resource/statusbar/statusbar")));
+                bool bIsVisible( xLayoutManager->isElementVisible( "private:resource/statusbar/statusbar" ));
                 if( bIsVisible )
                 {
-                    xLayoutManager->hideElement( C2U( "private:resource/statusbar/statusbar"));
-                    xLayoutManager->destroyElement( C2U( "private:resource/statusbar/statusbar"));
+                    xLayoutManager->hideElement( "private:resource/statusbar/statusbar" );
+                    xLayoutManager->destroyElement( "private:resource/statusbar/statusbar" );
                 }
                 else
                 {
-                    xLayoutManager->createElement( C2U( "private:resource/statusbar/statusbar"));
-                    xLayoutManager->showElement( C2U( "private:resource/statusbar/statusbar"));
+                    xLayoutManager->createElement( "private:resource/statusbar/statusbar" );
+                    xLayoutManager->showElement( "private:resource/statusbar/statusbar" );
                 }
                 // @todo: update menu state (checkmark next to "Statusbar").
             }
@@ -1323,7 +1323,7 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward )
     ControllerLockGuard aCLGuard( getModel() );
 
     //get selected series
-    ::rtl::OUString aObjectCID(m_aSelection.getSelectedCID());
+    OUString aObjectCID(m_aSelection.getSelectedCID());
     uno::Reference< XDataSeries > xGivenDataSeries( ObjectIdentifier::getDataSeriesForCID( //yyy todo also legendentries and labels?
             aObjectCID, getModel() ) );
 
@@ -1343,19 +1343,19 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward )
 
 // ____ XMultiServiceFactory ____
 uno::Reference< uno::XInterface > SAL_CALL
-    ChartController::createInstance( const ::rtl::OUString& aServiceSpecifier )
+    ChartController::createInstance( const OUString& aServiceSpecifier )
     throw (uno::Exception,
            uno::RuntimeException)
 {
     uno::Reference< uno::XInterface > xResult;
 
-    if( aServiceSpecifier.equals( CHART_ACCESSIBLE_TEXT_SERVICE_NAME ))
+    if( aServiceSpecifier == CHART_ACCESSIBLE_TEXT_SERVICE_NAME )
         xResult.set( impl_createAccessibleTextContext());
     return xResult;
 }
 
 uno::Reference< uno::XInterface > SAL_CALL
-    ChartController::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier,
+    ChartController::createInstanceWithArguments( const OUString& ServiceSpecifier,
                                  const uno::Sequence< uno::Any >& /* Arguments */ )
     throw (uno::Exception,
            uno::RuntimeException)
@@ -1364,11 +1364,11 @@ uno::Reference< uno::XInterface > SAL_CALL
     return createInstance( ServiceSpecifier );
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL
+uno::Sequence< OUString > SAL_CALL
     ChartController::getAvailableServiceNames()
     throw (uno::RuntimeException)
 {
-    uno::Sequence< ::rtl::OUString > aServiceNames(1);
+    uno::Sequence< OUString > aServiceNames(1);
     aServiceNames[0] = CHART_ACCESSIBLE_TEXT_SERVICE_NAME;
     return aServiceNames;
 }
@@ -1388,7 +1388,7 @@ IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction )
 {
     ENSURE_OR_RETURN( pUndoAction, "invalid Undo action", 1L );
 
-    ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID();
+    OUString aObjectCID = m_aSelection.getSelectedCID();
     if ( aObjectCID.isEmpty() )
     {
         try
@@ -1483,9 +1483,9 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
     }
 }
 
-::std::set< ::rtl::OUString > ChartController::impl_getAvailableCommands()
+::std::set< OUString > ChartController::impl_getAvailableCommands()
 {
-    return ::comphelper::MakeSet< ::rtl::OUString >
+    return ::comphelper::MakeSet< OUString >
         // commands for container forward
         ( "AddDirect" )           ( "NewDoc" )                ( "Open" )
         ( "Save" )                ( "SaveAs" )                ( "SendMail" )