diff options
| author | Bence Babati <b.baabsi@gmail.com> | 2012-08-15 10:46:08 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-08-16 10:26:36 +0200 |
| commit | 2ba8fe1e28fef76b1efea5f401360b38f720dbcf (patch) | |
| tree | cb5994fe1d74897b18bfeb291cc4c57992fdd4f5 /sc/source/ui/dbgui/tpsubt.cxx | |
| parent | 9658704fc4c691dfea7411eb36951ddc5154538a (diff) | |
String to OUString
Change-Id: I424a3e91cd6163907e364c7d6f40e19d8bf12b48
Diffstat (limited to 'sc/source/ui/dbgui/tpsubt.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/tpsubt.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index c2bc52f0f37c..510f3485a1f9 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -55,8 +55,8 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, sal_uInt16 nResId, aLbColumns ( this, ScResId( WND_COLUMNS ) ), aFtFunctions ( this, ScResId( FT_FUNCTIONS ) ), aLbFunctions ( this, ScResId( LB_FUNCTIONS ) ), - aStrNone ( ScResId( SCSTR_NONE ) ), - aStrColumn ( ScResId( SCSTR_COLUMN ) ), + aStrNone ( SC_RESSTR( SCSTR_NONE ) ), + aStrColumn ( SC_RESSTR( SCSTR_COLUMN ) ), pViewData ( NULL ), pDoc ( NULL ), nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ), @@ -276,7 +276,7 @@ void ScTpSubTotalGroup::FillListBoxes() SCCOL nMaxCol = rSubTotalData.nCol2; SCCOL col; sal_uInt16 i=0; - String aFieldName; + rtl::OUString aFieldName; aLbGroup.Clear(); aLbColumns.Clear(); @@ -286,11 +286,13 @@ void ScTpSubTotalGroup::FillListBoxes() for ( col=nFirstCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ ) { pDoc->GetString( col, nFirstRow, nTab, aFieldName ); - if ( aFieldName.Len() == 0 ) + if ( aFieldName.isEmpty() ) { - aFieldName = aStrColumn; - aFieldName += ' '; - aFieldName += ::ScColToAlpha( col ); // from global.hxx + rtl::OUStringBuffer aBuf; + aBuf.append(aStrColumn); + aBuf.append(sal_Unicode(' ')); + aBuf.append(ScColToAlpha(col)); + aFieldName = aBuf.makeStringAndClear(); } nFieldArr[i] = col; aLbGroup.InsertEntry( aFieldName, i+1 ); |