diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-31 16:03:46 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-31 21:38:58 -0500 |
| commit | c5bb73cae7c172ad0f02f8c67dd57b53337f1d78 (patch) | |
| tree | 67e2cfeb43b6c1803b766039fe49dfb1f438c07c /chart2 | |
| parent | More implicit inline methods to non-inline. (diff) | |
| download | core-c5bb73cae7c172ad0f02f8c67dd57b53337f1d78.tar.gz core-c5bb73cae7c172ad0f02f8c67dd57b53337f1d78.zip | |
Get the whole thing to build after the method sig change in SdrObject.
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ElementSelector.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/main/ShapeController.cxx | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index e795a7dcf4a2..71e84b3ace7b 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -154,7 +154,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() { ListBoxEntryData aEntry; SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() ); - ::rtl::OUString aName( pSelectedObj ? pSelectedObj->GetName() : String() ); + rtl::OUString aName = pSelectedObj ? pSelectedObj->GetName() : rtl::OUString(); aEntry.UIName = ( aName.isEmpty() ? ::rtl::OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName ); aEntry.OID = aSelectedOID; m_aEntries.push_back( aEntry ); diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 5878e4c318d1..a4c5f82eec2e 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -479,7 +479,7 @@ void ShapeController::executeDispatch_RenameObject() SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject(); if ( pSelectedObj ) { - String aName( pSelectedObj->GetName() ); + rtl::OUString aName = pSelectedObj->GetName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { @@ -488,8 +488,10 @@ void ShapeController::executeDispatch_RenameObject() pDlg->SetCheckNameHdl( LINK( this, ShapeController, CheckNameHdl ) ); if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) ) { - pDlg->GetName( aName ); - if ( aName != pSelectedObj->GetName() ) + String aTmp; + pDlg->GetName(aTmp); + aName = aTmp; + if (pSelectedObj->GetName().equals(aName)) { pSelectedObj->SetName( aName ); } |