summaryrefslogtreecommitdiff
path: root/sc/source/ui/app
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-07-04 23:58:05 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-07-09 12:16:56 +0100
commit104261010aa5ccbb7df4a82a3a3cafcfb0591fa7 (patch)
treeb8db79d2707ff5925ad01dba8a41bd8ab6d66847 /sc/source/ui/app
parent1a1e953ee33c213dc8b88dd96a69ca9fc5e42d50 (diff)
some UniString->rtl::OUString
Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
Diffstat (limited to 'sc/source/ui/app')
-rw-r--r--sc/source/ui/app/inputhdl.cxx15
-rw-r--r--sc/source/ui/app/inputwin.cxx2
-rw-r--r--sc/source/ui/app/scmod.cxx2
3 files changed, 10 insertions, 9 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 8ea50a312820..cbadad7940e0 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1325,11 +1325,12 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress
if ( pCell->GetCode()->GetCodeLen() <= 1 )
{ // ==1: einzelner ist als Parameter immer Bereich
// ==0: es waere vielleicht einer, wenn..
- String aBraced( '(' );
- aBraced += rFormula;
- aBraced += ')';
+ rtl::OUStringBuffer aBraced;
+ aBraced.append('(');
+ aBraced.append(rFormula);
+ aBraced.append(')');
delete pCell;
- pCell = new ScFormulaCell( pDoc, rPos, aBraced );
+ pCell = new ScFormulaCell( pDoc, rPos, aBraced.makeStringAndClear() );
}
else
bColRowName = false;
@@ -2901,9 +2902,9 @@ void ScInputHandler::AddRefEntry()
RemoveSelection();
if (pTableView)
- pTableView->InsertText( cSep, false );
+ pTableView->InsertText( rtl::OUString(cSep), false );
if (pTopView)
- pTopView->InsertText( cSep, false );
+ pTopView->InsertText( rtl::OUString(cSep), false );
DataChanged();
}
@@ -3773,7 +3774,7 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine )
{
xub_StrLen nLen = rDestEngine.GetTextLen( (sal_uInt16)0 );
ESelection aSel( 0,nLen, 1,0 );
- rDestEngine.QuickInsertText( ' ', aSel ); // Umbruch durch Space ersetzen
+ rDestEngine.QuickInsertText( rtl::OUString(' '), aSel ); // Umbruch durch Space ersetzen
--nParCnt;
}
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index f857d8f39cb8..d819e0c733ab 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -519,7 +519,7 @@ void ScInputWindow::Select()
if ( pScMod->IsEditMode() ) // nicht, wenn z.B. geschuetzt
{
aTextWindow.StartEditEngine();
- aTextWindow.SetTextString( '=' );
+ aTextWindow.SetTextString(rtl::OUString('='));
EditView* pView = aTextWindow.GetEditView();
if (pView)
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 5d424abfc7d3..294ac6e64565 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2198,7 +2198,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo )
else
{
OSL_FAIL("unbekannter Feldbefehl");
- pInfo->SetRepresentation(String('?'));
+ pInfo->SetRepresentation(rtl::OUString('?'));
}
}