diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-07 08:26:11 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-08 10:03:10 +0200 |
commit | 9e6f77021e4b69a6bc32d10c09691bd4cd6ceccb (patch) | |
tree | 414412cf00d8f28f762af63dc1c55d537ba90c12 /sc/source/ui/undo | |
parent | 6bd2075b71146d0ec6ee44ba52800e2610ff4971 (diff) |
convert sc/source/ui/undo/*.cxx from String to OUString
Change-Id: I2d2657c5f2ccdf37be0a2376650b66af8f3b1fce
Diffstat (limited to 'sc/source/ui/undo')
-rw-r--r-- | sc/source/ui/undo/undoblk.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/undo/undoblk3.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/undo/undocell.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/undo/undostyl.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/undo/undotab.cxx | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index b8571a909c1a..7b7d726f8710 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -1509,7 +1509,7 @@ void ScUndoUseScenario::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { - String aTemp = aName; + OUString aTemp = aName; ((ScTabViewTarget&)rTarget).GetViewShell()->UseScenario(aTemp); } } @@ -1708,7 +1708,7 @@ void ScUndoEnterMatrix::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) { - String aTemp = aFormula; + OUString aTemp = aFormula; ScDocument* pDoc = pDocShell->GetDocument(); ((ScTabViewTarget&)rTarget).GetViewShell()->EnterMatrix(aTemp, pDoc->GetGrammar()); } diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index d1ca63b30121..00ae959cc6c1 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -998,7 +998,7 @@ void ScUndoReplace::Undo() else if (pSearchItem->GetPattern() && pSearchItem->GetCommand() == SVX_SEARCHCMD_REPLACE) { - String aTempStr = pSearchItem->GetSearchString(); // toggle + OUString aTempStr = pSearchItem->GetSearchString(); // toggle pSearchItem->SetSearchString(pSearchItem->GetReplaceString()); pSearchItem->SetReplaceString(aTempStr); pDoc->ReplaceStyle( *pSearchItem, @@ -1470,9 +1470,9 @@ bool ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; } -static ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDoc, - const String& rFlt, const String& rOpt, - const String& rSrc, const ScRange& rDest ) +static ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const OUString& rDoc, + const OUString& rFlt, const OUString& rOpt, + const OUString& rSrc, const ScRange& rDest ) { const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks(); sal_uInt16 nCount = pLinkManager->GetLinks().size(); diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 8151d3f7cf05..bdecc941d79b 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -514,7 +514,7 @@ ScUndoPageBreak::~ScUndoPageBreak() OUString ScUndoPageBreak::GetComment() const { //"Column break" | "Row break" "insert" | "delete" - return String ( bColumn ? + return OUString ( bColumn ? ( bInsert ? ScGlobal::GetRscString( STR_UNDO_INSCOLBREAK ) : ScGlobal::GetRscString( STR_UNDO_DELCOLBREAK ) @@ -601,7 +601,7 @@ void ScUndoPrintZoom::DoChange( sal_Bool bUndo ) sal_uInt16 nPages = bUndo ? nOldPages : nNewPages; ScDocument* pDoc = pDocShell->GetDocument(); - String aStyleName = pDoc->GetPageStyle( nTab ); + OUString aStyleName = pDoc->GetPageStyle( nTab ); ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); SfxStyleSheetBase* pStyleSheet = pStylePool->Find( aStyleName, SFX_STYLE_FAMILY_PAGE ); OSL_ENSURE( pStyleSheet, "PageStyle not found" ); diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 6000f997ebc7..1023fce27adc 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -130,8 +130,8 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const OUString& rName, { ScDocument* pDoc = pDocSh->GetDocument(); ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool(); - String aNewName = rData.GetName(); - sal_Bool bDelete = ( aNewName.Len() == 0 ); // no new name -> delete style + OUString aNewName = rData.GetName(); + sal_Bool bDelete = aNewName.isEmpty(); // no new name -> delete style sal_Bool bNew = ( rName.isEmpty() && !bDelete ); // creating new style SfxStyleSheetBase* pStyle = NULL; @@ -172,7 +172,7 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const OUString& rName, { // modify style - String aNewParent = rData.GetParent(); + OUString aNewParent = rData.GetParent(); if ( aNewParent != pStyle->GetParent() ) pStyle->SetParent( aNewParent ); diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 04160a2c559f..bba5cf666b25 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -1088,7 +1088,7 @@ OUString ScUndoRemoveLink::GetComment() const void ScUndoRemoveLink::DoChange( sal_Bool bLink ) const { ScDocument* pDoc = pDocShell->GetDocument(); - String aEmpty; + OUString aEmpty; for (sal_uInt16 i=0; i<nCount; i++) if (bLink) // establish link pDoc->SetLink( pTabs[i], pModes[i], aDocName, aFltName, aOptions, pTabNames[i], nRefreshDelay ); @@ -1475,7 +1475,7 @@ ScUndoRenameObject::~ScUndoRenameObject() OUString ScUndoRenameObject::GetComment() const { // string resource shared with title for dialog - return String( ScResId(SCSTR_RENAMEOBJECT) ); + return OUString( ScResId(SCSTR_RENAMEOBJECT) ); } SdrObject* ScUndoRenameObject::GetObject() |