diff options
| -rw-r--r-- | sc/inc/drwlayer.hxx | 12 | ||||
| -rw-r--r-- | sc/source/core/data/drwlayer.cxx | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index bd4191a9053c..a7cda389b015 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -81,7 +81,7 @@ public: class SC_DLLPUBLIC ScDrawLayer : public FmFormModel { private: - String aName; + OUString aName; ScDocument* pDoc; SdrUndoGroup* pUndoGroup; sal_Bool bRecording; @@ -96,7 +96,7 @@ private: void ResizeLastRectFromAnchor( SdrObject* pObj, ScDrawObjData& rData, bool bUseLogicRect, bool bNegativePage, bool bCanResize, bool bHiddenAsZero = true ); public: - ScDrawLayer( ScDocument* pDocument, const String& rName ); + ScDrawLayer( ScDocument* pDocument, const OUString& rName ); virtual ~ScDrawLayer(); virtual SdrPage* AllocPage(bool bMasterPage); @@ -109,7 +109,7 @@ public: sal_Bool ScAddPage( SCTAB nTab ); void ScRemovePage( SCTAB nTab ); - void ScRenamePage( SCTAB nTab, const String& rNewName ); + void ScRenamePage( SCTAB nTab, const OUString& rNewName ); void ScMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos ); // incl. content, bAlloc=FALSE -> only content void ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos, sal_Bool bAlloc ); @@ -156,12 +156,12 @@ public: // GetVisibleName: name for navigator etc: GetPersistName or GetName // (ChartListenerCollection etc. must use GetPersistName directly) - static String GetVisibleName( SdrObject* pObj ); + static OUString GetVisibleName( SdrObject* pObj ); - SdrObject* GetNamedObject( const String& rName, sal_uInt16 nId, SCTAB& rFoundTab ) const; + SdrObject* GetNamedObject( const OUString& rName, sal_uInt16 nId, SCTAB& rFoundTab ) const; // if pnCounter != NULL, the search for a name starts with this index + 1, // and the index really used is returned. - String GetNewGraphicName( long* pnCounter = NULL ) const; + OUString GetNewGraphicName( long* pnCounter = NULL ) const; void EnsureGraphicNames(); static bool IsCellAnchored( const SdrObject& rObj ); diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 363969c9c92d..aa193efe7a92 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -189,7 +189,7 @@ static void lcl_ReverseTwipsToMM( Rectangle& rRect ) // ----------------------------------------------------------------------- -ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : +ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : FmFormModel( SvtPathOptions().GetPalettePath(), NULL, // SfxItemPool* Pool pGlobalDrawPersist ? @@ -366,7 +366,7 @@ void ScDrawLayer::ScRemovePage( SCTAB nTab ) ResetTab(nTab, pDoc->GetTableCount()-1); } -void ScDrawLayer::ScRenamePage( SCTAB nTab, const String& rNewName ) +void ScDrawLayer::ScRenamePage( SCTAB nTab, const OUString& rNewName ) { ScDrawPage* pPage = (ScDrawPage*) GetPage(static_cast<sal_uInt16>(nTab)); if (pPage) @@ -1650,7 +1650,7 @@ Rectangle ScDrawLayer::GetCellRect( ScDocument& rDoc, const ScAddress& rPos, boo return aCellRect; } -String ScDrawLayer::GetVisibleName( SdrObject* pObj ) +OUString ScDrawLayer::GetVisibleName( SdrObject* pObj ) { String aName = pObj->GetName(); if ( pObj->GetObjIdentifier() == OBJ_OLE2 ) @@ -1676,7 +1676,7 @@ inline sal_Bool IsNamedObject( SdrObject* pObj, const String& rName ) static_cast<SdrOle2Obj*>(pObj)->GetPersistName() == rName ) ); } -SdrObject* ScDrawLayer::GetNamedObject( const String& rName, sal_uInt16 nId, SCTAB& rFoundTab ) const +SdrObject* ScDrawLayer::GetNamedObject( const OUString& rName, sal_uInt16 nId, SCTAB& rFoundTab ) const { sal_uInt16 nTabCount = GetPageCount(); for (sal_uInt16 nTab=0; nTab<nTabCount; nTab++) @@ -1704,10 +1704,10 @@ SdrObject* ScDrawLayer::GetNamedObject( const String& rName, sal_uInt16 nId, SCT return NULL; } -String ScDrawLayer::GetNewGraphicName( long* pnCounter ) const +OUString ScDrawLayer::GetNewGraphicName( long* pnCounter ) const { - String aBase = ScGlobal::GetRscString(STR_GRAPHICNAME); - aBase += ' '; + OUString aBase = ScGlobal::GetRscString(STR_GRAPHICNAME); + aBase += " "; bool bThere = true; String aGraphicName; |