From 1edb495a45fde1d788b409fd1a9a839bd370c426 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Thu, 15 Aug 2013 16:56:09 +0400 Subject: convert GetName/Title/Description methods to OUString Change-Id: Id16a2b29b1d6cf02b94cc6c423e2475a9cbeb8a3 --- chart2/source/controller/main/ShapeController.cxx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'chart2/source') diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 999177409985..24c32c1061f0 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -231,12 +231,12 @@ void ShapeController::describeSupportedFeatures() IMPL_LINK( ShapeController, CheckNameHdl, AbstractSvxNameDialog*, pDialog ) { - String aName; + OUString aName; if ( pDialog ) { pDialog->GetName( aName ); } - if ( aName.Len() ) + if ( !aName.isEmpty() ) { DrawViewWrapper* pDrawViewWrapper = ( m_pChartController ? m_pChartController->GetDrawViewWrapper() : NULL ); if ( pDrawViewWrapper && pDrawViewWrapper->getNamedSdrObject( aName ) ) @@ -436,8 +436,8 @@ void ShapeController::executeDispatch_ObjectTitleDescription() SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject(); if ( pSelectedObj ) { - String aTitle( pSelectedObj->GetTitle() ); - String aDescription( pSelectedObj->GetDescription() ); + OUString aTitle( pSelectedObj->GetTitle() ); + OUString aDescription( pSelectedObj->GetDescription() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { @@ -476,9 +476,7 @@ void ShapeController::executeDispatch_RenameObject() pDlg->SetCheckNameHdl( LINK( this, ShapeController, CheckNameHdl ) ); if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) ) { - String aTmp; - pDlg->GetName(aTmp); - aName = aTmp; + pDlg->GetName(aName); if (pSelectedObj->GetName().equals(aName)) { pSelectedObj->SetName( aName ); -- cgit