chart2: String to OUString

Change-Id: I8abc6a31a46bea404e9d8b0c8777e3400dbf928c
Reviewed-on: https://gerrit.libreoffice.org/5865
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

16 files changed, 53 insertions, 53 deletions

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 46abae8b5cff..3dc268dd80c6 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -419,7 +419,7 @@ ColumnChartDialogController::ColumnChartDialogController()
 ColumnChartDialogController::~ColumnChartDialogController()
 {
 }
-String ColumnChartDialogController::getName()
+OUString ColumnChartDialogController::getName()
 {
     return SCH_RESSTR( STR_TYPE_COLUMN );
 }
@@ -494,7 +494,7 @@ BarChartDialogController::BarChartDialogController()
 BarChartDialogController::~BarChartDialogController()
 {
 }
-String BarChartDialogController::getName()
+OUString BarChartDialogController::getName()
 {
     return SCH_RESSTR( STR_TYPE_BAR );
 }
@@ -568,7 +568,7 @@ PieChartDialogController::PieChartDialogController()
 PieChartDialogController::~PieChartDialogController()
 {
 }
-String PieChartDialogController::getName()
+OUString PieChartDialogController::getName()
 {
     return SCH_RESSTR( STR_TYPE_PIE );
 }
@@ -630,7 +630,7 @@ LineChartDialogController::LineChartDialogController()
 LineChartDialogController::~LineChartDialogController()
 {
 }
-String LineChartDialogController::getName()
+OUString LineChartDialogController::getName()
 {
     return SCH_RESSTR( STR_TYPE_LINE );
 }
@@ -778,7 +778,7 @@ XYChartDialogController::XYChartDialogController()
 XYChartDialogController::~XYChartDialogController()
 {
 }
-String XYChartDialogController::getName()
+OUString XYChartDialogController::getName()
 {
     return SCH_RESSTR( STR_TYPE_XY );
 }
@@ -876,7 +876,7 @@ AreaChartDialogController::AreaChartDialogController()
 AreaChartDialogController::~AreaChartDialogController()
 {
 }
-String AreaChartDialogController::getName()
+OUString AreaChartDialogController::getName()
 {
     return SCH_RESSTR(STR_TYPE_AREA);
 }
@@ -958,7 +958,7 @@ NetChartDialogController::NetChartDialogController()
 NetChartDialogController::~NetChartDialogController()
 {
 }
-String NetChartDialogController::getName()
+OUString NetChartDialogController::getName()
 {
     return SCH_RESSTR(STR_TYPE_NET);
 }
@@ -1052,7 +1052,7 @@ StockChartDialogController::~StockChartDialogController()
 {
 }
 
-String StockChartDialogController::getName()
+OUString StockChartDialogController::getName()
 {
     return SCH_RESSTR(STR_TYPE_STOCK);
 }
@@ -1105,7 +1105,7 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController()
         delete m_pMF_NumberOfLines;
 }
 
-String CombiColumnLineChartDialogController::getName()
+OUString CombiColumnLineChartDialogController::getName()
 {
     return SCH_RESSTR(STR_TYPE_COMBI_COLUMN_LINE);
 }
@@ -1250,7 +1250,7 @@ BubbleChartDialogController::BubbleChartDialogController()
 BubbleChartDialogController::~BubbleChartDialogController()
 {
 }
-String BubbleChartDialogController::getName()
+OUString BubbleChartDialogController::getName()
 {
     return SCH_RESSTR(STR_TYPE_BUBBLE);
 }
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 498db10e780e..bcb70b299382 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -91,7 +91,7 @@ public:
     ChartTypeDialogController();
     virtual ~ChartTypeDialogController();
 
-    virtual String  getName()=0;
+    virtual OUString  getName()=0;
     virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0;
     virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -147,7 +147,7 @@ public:
     ColumnChartDialogController();
     virtual ~ColumnChartDialogController();
 
-    virtual String  getName();
+    virtual OUString  getName();
     virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
     virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -159,7 +159,7 @@ public:
     BarChartDialogController();
     virtual ~BarChartDialogController();
 
-    virtual String  getName();
+    virtual OUString  getName();
     virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
     virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -171,7 +171,7 @@ public:
     PieChartDialogController();
     virtual ~PieChartDialogController();
 
-    virtual String  getName();
+    virtual OUString  getName();
     virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
     virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -186,7 +186,7 @@ public:
     LineChartDialogController();
     virtual ~LineChartDialogController();
 
-    virtual String  getName();
+    virtual OUString  getName();
     virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
     virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -204,7 +204,7 @@ public:
     XYChartDialogController();
     virtual ~XYChartDialogController();
 
-    virtual String  getName();
+    virtual OUString  getName();
     virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
     virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -220,7 +220,7 @@ public:
     AreaChartDialogController();
     virtual ~AreaChartDialogController();
 
-    virtual String  getName();
+    virtual OUString  getName();
     virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
     virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -236,7 +236,7 @@ public:
     NetChartDialogController();
     virtual ~NetChartDialogController();
 
-    virtual String  getName();
+    virtual OUString  getName();
     virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
     virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -251,7 +251,7 @@ public:
     StockChartDialogController();
     virtual ~StockChartDialogController();
 
-    virtual String  getName();
+    virtual OUString  getName();
     virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
     virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -264,7 +264,7 @@ public:
     CombiColumnLineChartDialogController();
     virtual ~CombiColumnLineChartDialogController();
 
-    virtual String  getName();
+    virtual OUString  getName();
     virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
     virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -292,7 +292,7 @@ public:
     BubbleChartDialogController();
     virtual ~BubbleChartDialogController();
 
-    virtual String  getName();
+    virtual OUString  getName();
     virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
     virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index c86b10eec542..0a9c1d110045 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -664,9 +664,9 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
 
             if( ! ::rtl::math::isNan( fData ) &&
                 m_spNumberFormatterWrapper.get() )
-                aResult = String( m_spNumberFormatterWrapper->getFormattedString(
+                aResult = m_spNumberFormatterWrapper->getFormattedString(
                                       GetNumberFormatKey( nRow, nColumnId ),
-                                      fData, nLabelColor, bColorChanged ));
+                                      fData, nLabelColor, bColorChanged );
         }
         else if( m_apDataBrowserModel->getCellType( nColIndex, nRow ) == DataBrowserModel::TEXTORDATE )
         {
@@ -681,8 +681,8 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
                 bool bColorChanged = false;
                 sal_Int32 nDateNumberFormat = DiagramHelper::getDateNumberFormat( Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY) );
                 if( ! ::rtl::math::isNan( fDouble ) && m_spNumberFormatterWrapper.get() )
-                    aResult = String( m_spNumberFormatterWrapper->getFormattedString(
-                        nDateNumberFormat, fDouble, nLabelColor, bColorChanged ));
+                    aResult = m_spNumberFormatterWrapper->getFormattedString(
+                        nDateNumberFormat, fDouble, nLabelColor, bColorChanged );
             }
         }
         else
@@ -995,7 +995,7 @@ void DataBrowser::PaintCell(
     Point aPos( rRect.TopLeft());
     aPos.X() += 1;
 
-    String aText = GetCellText( m_nSeekRow, nColumnId );
+    OUString aText = GetCellText( m_nSeekRow, nColumnId );
     Size TxtSize( GetDataWindow().GetTextWidth( aText ), GetDataWindow().GetTextHeight());
 
     // clipping
@@ -1085,7 +1085,7 @@ void DataBrowser::InitController(
         // treat invalid and empty text as Nan
         m_aNumberEditField.EnableNotANumber( true );
         if( ::rtl::math::isNan( GetCellNumber( nRow, nCol )))
-            m_aNumberEditField.SetTextValue( String());
+            m_aNumberEditField.SetTextValue( OUString());
         else
             m_aNumberEditField.SetValue( GetCellNumber( nRow, nCol ) );
         OUString aText( m_aNumberEditField.GetText());
@@ -1256,11 +1256,11 @@ void DataBrowser::RenewSeriesHeaders()
             spHeader->SetColor( Color( nColor ));
         spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
         spHeader->SetSeriesName(
-            String( DataSeriesHelper::getDataSeriesLabel(
+            DataSeriesHelper::getDataSeriesLabel(
                         aIt->m_xDataSeries,
                         (aIt->m_xChartType.is() ?
                          aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() :
-                         OUString( "values-y")))));
+                         OUString( "values-y"))));
         spHeader->SetRange( aIt->m_nStartColumn + 1, aIt->m_nEndColumn + 1 );
         spHeader->SetGetFocusHdl( aFocusLink );
         spHeader->SetEditChangedHdl( aSeriesHeaderChangedLink );
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 1ecf30a197f4..882331c36d52 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -706,7 +706,7 @@ void ErrorBarResources::listeningFinished(
 
     if( m_pCurrentRangeChoosingField )
     {
-        m_pCurrentRangeChoosingField->SetText( String( aRange ));
+        m_pCurrentRangeChoosingField->SetText( aRange );
         m_pCurrentRangeChoosingField->GrabFocus();
         PosValueChanged( 0 );
     }
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 6cfa45dc978d..bdeaa35ab335 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -51,7 +51,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
 {
     SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF)   ) );
 
-    String aTipHelpStr( SCH_RESSTR(STR_TIP_LIGHTSOURCE_X) );
+    OUString aTipHelpStr( SCH_RESSTR(STR_TIP_LIGHTSOURCE_X) );
     OUString aTipHelp( aTipHelpStr  );
     const OUString aReplacementStr( "%LIGHTNUMBER" );
     sal_Int32 nIndex = aTipHelp.indexOf( aReplacementStr );
@@ -60,7 +60,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
         aTipHelp = aTipHelp.replaceAt(nIndex, aReplacementStr.getLength(),
             OUString::number( nLightNumber ) );
     }
-    this->SetQuickHelpText( String( aTipHelp ) );
+    this->SetQuickHelpText( aTipHelp );
 }
 
 LightButton::~LightButton()
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index ca3b12efdfea..d8aa5afc8732 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -437,7 +437,7 @@ void DataSourceTabPage::updateControlsFromDialogModel()
     SeriesSelectionChangedHdl( 0 );
 
     // categories
-    m_aEDT_CATEGORIES.SetText( String( m_rDialogModel.getCategoriesRange() ));
+    m_aEDT_CATEGORIES.SetText( m_rDialogModel.getCategoriesRange() );
 
     updateControlState();
 }
@@ -606,11 +606,11 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl)
         if( nIndex != -1 )
         {
             m_aFT_RANGE.SetText(
-                String( m_aFixedTextRange.replaceAt(
-                            nIndex, aReplacementStr.getLength(), aSelectedRoleUI )));
+                m_aFixedTextRange.replaceAt(
+                            nIndex, aReplacementStr.getLength(), aSelectedRoleUI ));
         }
 
-        m_aEDT_RANGE.SetText( String( aSelectedRange ));
+        m_aEDT_RANGE.SetText( aSelectedRange );
         isValid();
     }
 
@@ -840,18 +840,18 @@ void DataSourceTabPage::listeningFinished(
     GrabFocus();
     if( m_pCurrentRangeChoosingField )
     {
-        m_pCurrentRangeChoosingField->SetText( String( aRange ));
+        m_pCurrentRangeChoosingField->SetText( aRange );
         m_pCurrentRangeChoosingField->GrabFocus();
     }
 
     if( m_pCurrentRangeChoosingField == & m_aEDT_RANGE )
     {
-        m_aEDT_RANGE.SetText( String( aRange ));
+        m_aEDT_RANGE.SetText( aRange );
         setDirty();
     }
     else if( m_pCurrentRangeChoosingField == & m_aEDT_CATEGORIES )
     {
-        m_aEDT_CATEGORIES.SetText( String( aRange ));
+        m_aEDT_CATEGORIES.SetText( aRange );
         setDirty();
     }
 
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 891d48b8a9e0..897deb850cc0 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -182,7 +182,7 @@ void RangeChooserTabPage::initControlsFromModel()
         m_rDialogModel.detectArguments(
             m_aLastValidRangeString, bUseColumns, bFirstCellAsLabel, bHasCategories );
     else
-        m_aLastValidRangeString = String::EmptyString();
+        m_aLastValidRangeString = "";
 
     m_aED_Range.SetText( m_aLastValidRangeString );
 
@@ -372,7 +372,7 @@ void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
     //update dialog state
     ToTop();
     GrabFocus();
-    m_aED_Range.SetText( String( aRange ) );
+    m_aED_Range.SetText( aRange );
     m_aED_Range.GrabFocus();
 
     setDirty();
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index f93a98487323..a6313c8cdb34 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -262,7 +262,7 @@ void DataPointItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
     if( m_bUseSpecialFillColor )
     {
         Color aColor(m_nSpecialFillColor);
-        rOutItemSet.Put( XFillColorItem( String(), aColor ) );
+        rOutItemSet.Put( XFillColorItem( OUString(), aColor ) );
     }
 }
 
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index 1848f25f7bbd..284b2c7e3b60 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -437,7 +437,7 @@ void ErrorBarItemConverter::FillSpecialItem(
                     StatisticsHelper::getErrorDataSequenceFromDataSource(
                         xErrorBarSource, (nWhichId == SCHATTR_STAT_RANGE_POS), bYError ));
                 if( xSeq.is())
-                    rOutItemSet.Put( SfxStringItem( nWhichId, String( xSeq->getSourceRangeRepresentation())));
+                    rOutItemSet.Put( SfxStringItem( nWhichId, xSeq->getSourceRangeRepresentation()));
             }
         }
         break;
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 83b3daa13ccf..72dd3f9368fc 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -923,7 +923,7 @@ void StatisticsItemConverter::FillSpecialItem(
                     StatisticsHelper::getErrorDataSequenceFromDataSource(
                         xErrorBarSource, (nWhichId == SCHATTR_STAT_RANGE_POS), bYError ));
                 if( xSeq.is())
-                    rOutItemSet.Put( SfxStringItem( nWhichId, String( xSeq->getSourceRangeRepresentation())));
+                    rOutItemSet.Put( SfxStringItem( nWhichId, xSeq->getSourceRangeRepresentation()));
             }
         }
         break;
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 0dcef66ce70f..b495acb31620 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -123,7 +123,7 @@ bool ChartController::EndTextEdit()
     {
         pOutliner->SetText( *pParaObj );
 
-        String aString = pOutliner->GetText(
+        OUString aString = pOutliner->GetText(
                             pOutliner->GetParagraph( 0 ),
                             pOutliner->GetParagraphCount() );
 
@@ -173,7 +173,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
     {
         const SfxItemSet* pSet = pDlg->GetOutputItemSet();
         const SfxPoolItem* pItem=0;
-        String aString;
+        OUString aString;
         if ( pSet && pSet->GetItemState( SID_CHARMAP, sal_True, &pItem) == SFX_ITEM_SET &&
              pItem->ISA(SfxStringItem) )
                 aString = dynamic_cast<const SfxStringItem*>(pItem)->GetValue();
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index e103b56ba595..a1c3870afe35 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -209,10 +209,10 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt )
         {
             if( bIsBalloonHelp )
                 Help::ShowBalloon(
-                    this, rHEvt.GetMousePosPixel(), lcl_AWTRectToVCLRect( aHelpRect ), String( aQuickHelpText ));
+                    this, rHEvt.GetMousePosPixel(), lcl_AWTRectToVCLRect( aHelpRect ), aQuickHelpText );
             else
                 Help::ShowQuickHelp(
-                    this, lcl_AWTRectToVCLRect( aHelpRect ), String( aQuickHelpText ));
+                    this, lcl_AWTRectToVCLRect( aHelpRect ), aQuickHelpText );
         }
     }
 
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 0ff2135af9cb..f17a898a5b26 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -102,7 +102,7 @@ bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL )
     XLineEndListRef pLineEndList = rModel.GetLineEndList();
     if ( pLineEndList.is() )
     {
-        String aName( SVX_RESSTR( nResId ) );
+        OUString aName( SVX_RESSTR( nResId ) );
         long nCount = pLineEndList->Count();
         for ( long nIndex = 0; nIndex < nCount; ++nIndex )
         {
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index 695b60cf3090..85cbccba9836 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -116,7 +116,7 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments
         for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
         {
             const sal_uInt16 nItemId = pToolBox->GetItemId( nPos );
-            if ( pToolBox->GetItemCommand( nItemId ) == String( m_aCommandURL ) )
+            if ( pToolBox->GetItemCommand( nItemId ) == m_aCommandURL )
             {
                 m_nToolBoxId = nItemId;
                 break;
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index d58714c31adc..27891b95ec58 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -93,7 +93,7 @@ public:
     XBitmapListRef    GetBitmapList() const;
 
     SdrObject* getNamedSdrObject( const OUString& rName );
-    static SdrObject* getNamedSdrObject( const String& rName, SdrObjList* pObjList );
+    static SdrObject* getNamedSdrObject( const OUString& rName, SdrObjList* pObjList );
 
     static bool removeShape( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::drawing::XShape >& xShape );
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index c5ad39d15bf6..d99d46bbcf7b 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -351,9 +351,9 @@ SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rName )
     return getNamedSdrObject( rName, GetPage(0) );
 }
 
-SdrObject* DrawModelWrapper::getNamedSdrObject( const String& rObjectCID, SdrObjList* pSearchList )
+SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rObjectCID, SdrObjList* pSearchList )
 {
-    if(!pSearchList || rObjectCID.Len()==0)
+    if(!pSearchList || rObjectCID.isEmpty())
         return 0;
     sal_uLong nCount = pSearchList->GetObjCount();
     for( sal_uLong nN=0; nN<nCount; nN++  )