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 /sc | |
| parent | 90413af046d22d1ea7376da4856846744049d613 (diff) | |
Get the whole thing to build after the method sig change in SdrObject.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/drwlayer.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh5.cxx | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 82fbf7b10a97..64935132d7e7 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -1648,7 +1648,7 @@ inline sal_Bool IsNamedObject( SdrObject* pObj, const String& rName ) // sal_True if rName is the object's Name or PersistName // (used to find a named object) - return ( pObj->GetName() == rName || + return ( pObj->GetName().equals(rName) || ( pObj->GetObjIdentifier() == OBJ_OLE2 && static_cast<SdrOle2Obj*>(pObj)->GetPersistName() == rName ) ); } @@ -1725,7 +1725,7 @@ void ScDrawLayer::EnsureGraphicNames() while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_GRAF && pObject->GetName().Len() == 0 ) + if ( pObject->GetObjIdentifier() == OBJ_GRAF && pObject->GetName().isEmpty()) pObject->SetName( GetNewGraphicName( &nCounter ) ); pObject = aIter.Next(); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index a146b426452a..410ac0116d93 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -500,7 +500,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) if(SC_LAYER_INTERN != pSelected->GetLayer()) { - String aName(pSelected->GetName()); + rtl::OUString aName = pSelected->GetName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); @@ -512,14 +512,16 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) if(RET_OK == pDlg->Execute()) { ScDocShell* pDocSh = pViewData->GetDocShell(); - pDlg->GetName(aName); + String aTmp; + pDlg->GetName(aTmp); + aName = aTmp; - if(aName != pSelected->GetName()) + if (!aName.equals(pSelected->GetName())) { // handle name change const sal_uInt16 nObjType(pSelected->GetObjIdentifier()); - if(OBJ_GRAF == nObjType && 0L == aName.Len()) + if (OBJ_GRAF == nObjType && aName.isEmpty()) { // graphics objects must have names // (all graphics are supposed to be in the navigator) |