From 866b53623430275c491f7e33fb82812fd69ff2c4 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 20 Sep 2013 11:46:32 +0200 Subject: convert sc/.../undocell.hxx from String to OUString Change-Id: Id2bc7e5ea39eef64030f36c12d2535d69b58df7c --- sc/source/ui/inc/undocell.hxx | 10 +++++----- sc/source/ui/undo/undocell.cxx | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index e9e7d58d495c..8183d2ab4715 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -224,8 +224,8 @@ public: TYPEINFO(); ScUndoThesaurus( ScDocShell* pNewDocShell, SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, - const String& rNewUndoStr, const EditTextObject* pUndoTObj, - const String& rNewRedoStr, const EditTextObject* pRedoTObj); + const OUString& rNewUndoStr, const EditTextObject* pUndoTObj, + const OUString& rNewRedoStr, const EditTextObject* pRedoTObj); virtual ~ScUndoThesaurus(); virtual void Undo(); @@ -239,13 +239,13 @@ private: SCCOL nCol; SCROW nRow; SCTAB nTab; - String aUndoStr; // Data at String cell + OUString aUndoStr; // Data at String cell EditTextObject* pUndoTObject; // at Edit cell - String aRedoStr; + OUString aRedoStr; EditTextObject* pRedoTObject; sal_uLong nEndChangeAction; - void DoChange( sal_Bool bUndo, const String& rStr, + void DoChange( sal_Bool bUndo, const OUString& rStr, const EditTextObject* pTObj ); void SetChangeTrack( const ScCellValue& rOldCell ); }; diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 499ca5e31af7..8151d3f7cf05 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -647,8 +647,8 @@ bool ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const ScUndoThesaurus::ScUndoThesaurus( ScDocShell* pNewDocShell, SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, - const String& rNewUndoStr, const EditTextObject* pUndoTObj, - const String& rNewRedoStr, const EditTextObject* pRedoTObj) : + const OUString& rNewUndoStr, const EditTextObject* pUndoTObj, + const OUString& rNewRedoStr, const EditTextObject* pRedoTObj) : ScSimpleUndo( pNewDocShell ), nCol( nNewCol ), nRow( nNewRow ), @@ -698,7 +698,7 @@ void ScUndoThesaurus::SetChangeTrack( const ScCellValue& rOldCell ) nEndChangeAction = 0; } -void ScUndoThesaurus::DoChange( sal_Bool bUndo, const String& rStr, +void ScUndoThesaurus::DoChange( sal_Bool bUndo, const OUString& rStr, const EditTextObject* pTObj ) { ScDocument* pDoc = pDocShell->GetDocument(); -- cgit