Skip to content

C
core
Kaydet (Commit) 2ba8fe1e authored tarafından Bence Babati's avatar Bence Babati Kaydeden (comit) Cédric Bosdonnat
Dosyalara gözat
Seçenekler

String to OUString 

Change-Id: I424a3e91cd6163907e364c7d6f40e19d8bf12b48
üst 9658704f
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 53 deletions
sc/source/ui/dbgui/pfiltdlg.cxx
Dosyayı görüntüle @ 2ba8fe1e
...@@ -162,7 +162,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) ...@@ -162,7 +162,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
if ( pViewData && pDoc ) if ( pViewData && pDoc )
{ {
String theAreaStr; rtl::OUString theAreaStr;
ScRange theCurArea ( ScAddress( theQueryData.nCol1, ScRange theCurArea ( ScAddress( theQueryData.nCol1,
theQueryData.nRow1, theQueryData.nRow1,
nSrcTab ), nSrcTab ),
...@@ -290,7 +290,7 @@ void ScPivotFilterDlg::FillFieldLists() ...@@ -290,7 +290,7 @@ void ScPivotFilterDlg::FillFieldLists()
if ( pDoc ) if ( pDoc )
{ {
String aFieldName; rtl::OUString aFieldName;
SCTAB nTab = nSrcTab; SCTAB nTab = nSrcTab;
SCCOL nFirstCol = theQueryData.nCol1; SCCOL nFirstCol = theQueryData.nCol1;
SCROW nFirstRow = theQueryData.nRow1; SCROW nFirstRow = theQueryData.nRow1;
...@@ -301,11 +301,13 @@ void ScPivotFilterDlg::FillFieldLists() ...@@ -301,11 +301,13 @@ void ScPivotFilterDlg::FillFieldLists()
for ( col=nFirstCol; col<=nMaxCol; col++ ) for ( col=nFirstCol; col<=nMaxCol; col++ )
{ {
pDoc->GetString( col, nFirstRow, nTab, aFieldName ); pDoc->GetString( col, nFirstRow, nTab, aFieldName );
if ( aFieldName.Len() == 0 ) if ( aFieldName.isEmpty() )
{ {
aFieldName = aStrColumn; rtl::OUStringBuffer aBuf;
aFieldName += ' '; aBuf.append(aStrColumn);
aFieldName += ScColToAlpha( col ); aBuf.append(sal_Unicode(' '));
aBuf.append(ScColToAlpha(col));
aFieldName = aBuf.makeStringAndClear();
} }
aLbField1.InsertEntry( aFieldName, i ); aLbField1.InsertEntry( aFieldName, i );
aLbField2.InsertEntry( aFieldName, i ); aLbField2.InsertEntry( aFieldName, i );
...@@ -325,7 +327,7 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList ) ...@@ -325,7 +327,7 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList )
ComboBox* pValList = aValueEdArr[nList-1]; ComboBox* pValList = aValueEdArr[nList-1];
sal_uInt16 nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); sal_uInt16 nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos();
sal_uInt16 nListPos = 0; sal_uInt16 nListPos = 0;
String aCurValue = pValList->GetText(); rtl::OUString aCurValue = pValList->GetText();
pValList->Clear(); pValList->Clear();
pValList->InsertEntry( aStrNotEmpty, 0 ); pValList->InsertEntry( aStrNotEmpty, 0 );
...@@ -565,9 +567,9 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) ...@@ -565,9 +567,9 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox )
for (sal_uInt16 i=0; i<=MAXCOL; i++) for (sal_uInt16 i=0; i<=MAXCOL; i++)
DELETEZ( pEntryLists[i] ); DELETEZ( pEntryLists[i] );
String aCurVal1 = aEdVal1.GetText(); rtl::OUString aCurVal1 = aEdVal1.GetText();
String aCurVal2 = aEdVal2.GetText(); rtl::OUString aCurVal2 = aEdVal2.GetText();
String aCurVal3 = aEdVal3.GetText(); rtl::OUString aCurVal3 = aEdVal3.GetText();
UpdateValueList( 1 ); UpdateValueList( 1 );
UpdateValueList( 2 ); UpdateValueList( 2 );
UpdateValueList( 3 ); UpdateValueList( 3 );
......
sc/source/ui/dbgui/tpsort.cxx
Dosyayı görüntüle @ 2ba8fe1e
...@@ -91,9 +91,9 @@ ScTabPageSortFields::ScTabPageSortFields( Window* pParent, ...@@ -91,9 +91,9 @@ ScTabPageSortFields::ScTabPageSortFields( Window* pParent,
ScResId( RID_SCPAGE_SORT_FIELDS ), ScResId( RID_SCPAGE_SORT_FIELDS ),
rArgSet ), rArgSet ),
// //
aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), aStrUndefined ( SC_RESSTR( SCSTR_UNDEFINED ) ),
aStrColumn ( ScResId( SCSTR_COLUMN ) ), aStrColumn ( SC_RESSTR( SCSTR_COLUMN ) ),
aStrRow ( ScResId( SCSTR_ROW ) ), aStrRow ( SC_RESSTR( SCSTR_ROW ) ),
// //
nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ), pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ),
...@@ -350,18 +350,20 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) ...@@ -350,18 +350,20 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField )
if ( bSortByRows ) if ( bSortByRows )
{ {
String aFieldName; rtl::OUString aFieldName;
SCCOL nMaxCol = aSortData.nCol2; SCCOL nMaxCol = aSortData.nCol2;
SCCOL col; SCCOL col;
for ( col=nFirstSortCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ ) for ( col=nFirstSortCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ )
{ {
pDoc->GetString( col, nFirstSortRow, nTab, aFieldName ); pDoc->GetString( col, nFirstSortRow, nTab, aFieldName );
if ( !bHasHeader || (aFieldName.Len() == 0) ) if ( !bHasHeader || aFieldName.isEmpty() )
{ {
aFieldName = aStrColumn; rtl::OUStringBuffer aBuf;
aFieldName += ' '; aBuf.append(aStrColumn);
aFieldName += ScColToAlpha( col ); aBuf.append(sal_Unicode(' '));
aBuf.append(ScColToAlpha(col));
aFieldName = aBuf.makeStringAndClear();
} }
nFieldArr.push_back( col ); nFieldArr.push_back( col );
...@@ -373,18 +375,20 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) ...@@ -373,18 +375,20 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField )
} }
else else
{ {
String aFieldName; rtl::OUString aFieldName;
SCROW nMaxRow = aSortData.nRow2; SCROW nMaxRow = aSortData.nRow2;
SCROW row; SCROW row;
for ( row=nFirstSortRow; row<=nMaxRow && i<SC_MAXFIELDS; row++ ) for ( row=nFirstSortRow; row<=nMaxRow && i<SC_MAXFIELDS; row++ )
{ {
pDoc->GetString( nFirstSortCol, row, nTab, aFieldName ); pDoc->GetString( nFirstSortCol, row, nTab, aFieldName );
if ( !bHasHeader || (aFieldName.Len() == 0) ) if ( !bHasHeader || aFieldName.isEmpty() )
{ {
aFieldName = aStrRow; rtl::OUStringBuffer aBuf;
aFieldName += ' '; aBuf.append(aStrRow);
aFieldName += String::CreateFromInt32( row+1 ); aBuf.append(sal_Unicode(' '));
aBuf.append(row+1);
aFieldName = aBuf.makeStringAndClear();
} }
nFieldArr.push_back( row ); nFieldArr.push_back( row );
...@@ -424,7 +428,7 @@ sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField ) ...@@ -424,7 +428,7 @@ sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField )
IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
{ {
String aSelEntry = pLb->GetSelectEntry(); rtl::OUString aSelEntry = pLb->GetSelectEntry();
ScSortKeyItems::iterator pIter; ScSortKeyItems::iterator pIter;
sal_uInt16 nSortKeyIndex = nSortKeyCount; sal_uInt16 nSortKeyIndex = nSortKeyCount;
...@@ -506,9 +510,9 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, ...@@ -506,9 +510,9 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ), aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ),
aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ), aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ),
// //
aStrRowLabel ( ScResId( STR_ROW_LABEL ) ), aStrRowLabel ( SC_RESSTR( STR_ROW_LABEL ) ),
aStrColLabel ( ScResId( STR_COL_LABEL ) ), aStrColLabel ( SC_RESSTR( STR_COL_LABEL ) ),
aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), aStrUndefined ( SC_RESSTR( SCSTR_UNDEFINED ) ),
// //
nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
aSortData ( ((const ScSortItem&) aSortData ( ((const ScSortItem&)
...@@ -538,7 +542,7 @@ ScTabPageSortOptions::~ScTabPageSortOptions() ...@@ -538,7 +542,7 @@ ScTabPageSortOptions::~ScTabPageSortOptions()
sal_uInt16 nEntries = aLbOutPos.GetEntryCount(); sal_uInt16 nEntries = aLbOutPos.GetEntryCount();
for ( sal_uInt16 i=1; i<nEntries; i++ ) for ( sal_uInt16 i=1; i<nEntries; i++ )
delete (String*)aLbOutPos.GetEntryData( i ); delete (rtl::OUString*)aLbOutPos.GetEntryData( i );
delete pColRes; delete pColRes;
delete pColWrap; //! not if from document delete pColWrap; //! not if from document
...@@ -574,9 +578,9 @@ void ScTabPageSortOptions::Init() ...@@ -574,9 +578,9 @@ void ScTabPageSortOptions::Init()
{ {
String theArea; String theArea;
ScDBCollection* pDBColl = pDoc->GetDBCollection(); ScDBCollection* pDBColl = pDoc->GetDBCollection();
String theDbArea; rtl::OUString theDbArea;
const SCTAB nCurTab = pViewData->GetTabNo(); const SCTAB nCurTab = pViewData->GetTabNo();
String theDbName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); rtl::OUString theDbName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME));
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
aLbOutPos.Clear(); aLbOutPos.Clear();
...@@ -584,15 +588,15 @@ void ScTabPageSortOptions::Init() ...@@ -584,15 +588,15 @@ void ScTabPageSortOptions::Init()
aLbOutPos.Disable(); aLbOutPos.Disable();
ScAreaNameIterator aIter( pDoc ); ScAreaNameIterator aIter( pDoc );
String aName; rtl::OUString aName;
ScRange aRange; ScRange aRange;
String aRefStr; rtl::OUString aRefStr;
while ( aIter.Next( aName, aRange ) ) while ( aIter.Next( aName, aRange ) )
{ {
sal_uInt16 nInsert = aLbOutPos.InsertEntry( aName ); sal_uInt16 nInsert = aLbOutPos.InsertEntry( aName );
aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, eConv ); aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, eConv );
aLbOutPos.SetEntryData( nInsert, new String( aRefStr ) ); aLbOutPos.SetEntryData( nInsert, new rtl::OUString( aRefStr ) );
} }
aLbOutPos.SelectEntryPos( 0 ); aLbOutPos.SelectEntryPos( 0 );
...@@ -685,7 +689,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) ...@@ -685,7 +689,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
if ( pDoc && !aSortData.bInplace ) if ( pDoc && !aSortData.bInplace )
{ {
String aStr; rtl::OUString aStr;
sal_uInt16 nFormat = (aSortData.nDestTab != pViewData->GetTabNo()) sal_uInt16 nFormat = (aSortData.nDestTab != pViewData->GetTabNo())
? SCR_ABS_3D ? SCR_ABS_3D
: SCR_ABS; : SCR_ABS;
...@@ -745,7 +749,7 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) ...@@ -745,7 +749,7 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
aNewSortData.aCollatorLocale = MsLangId::convertLanguageToLocale( eLang, false ); aNewSortData.aCollatorLocale = MsLangId::convertLanguageToLocale( eLang, false );
// get algorithm // get algorithm
String sAlg; rtl::OUString sAlg;
if ( eLang != LANGUAGE_SYSTEM ) if ( eLang != LANGUAGE_SYSTEM )
{ {
uno::Sequence<rtl::OUString> aAlgos = pColWrap->listCollatorAlgorithms( uno::Sequence<rtl::OUString> aAlgos = pColWrap->listCollatorAlgorithms(
...@@ -893,7 +897,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) ...@@ -893,7 +897,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb )
{ {
if ( pLb == &aLbOutPos ) if ( pLb == &aLbOutPos )
{ {
String aString; rtl::OUString aString;
sal_uInt16 nSelPos = aLbOutPos.GetSelectEntryPos(); sal_uInt16 nSelPos = aLbOutPos.GetSelectEntryPos();
if ( nSelPos > 0 ) if ( nSelPos > 0 )
...@@ -925,7 +929,7 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) ...@@ -925,7 +929,7 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
{ {
if ( pEd == &aEdOutPos ) if ( pEd == &aEdOutPos )
{ {
String theCurPosStr = aEdOutPos.GetText(); String theCurPosStr = aEdOutPos.GetText();
sal_uInt16 nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); sal_uInt16 nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
if ( SCA_VALID == (nResult & SCA_VALID) ) if ( SCA_VALID == (nResult & SCA_VALID) )
......
sc/source/ui/dbgui/tpsubt.cxx
Dosyayı görüntüle @ 2ba8fe1e
...@@ -55,8 +55,8 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, sal_uInt16 nResId, ...@@ -55,8 +55,8 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, sal_uInt16 nResId,
aLbColumns ( this, ScResId( WND_COLUMNS ) ), aLbColumns ( this, ScResId( WND_COLUMNS ) ),
aFtFunctions ( this, ScResId( FT_FUNCTIONS ) ), aFtFunctions ( this, ScResId( FT_FUNCTIONS ) ),
aLbFunctions ( this, ScResId( LB_FUNCTIONS ) ), aLbFunctions ( this, ScResId( LB_FUNCTIONS ) ),
aStrNone ( ScResId( SCSTR_NONE ) ), aStrNone ( SC_RESSTR( SCSTR_NONE ) ),
aStrColumn ( ScResId( SCSTR_COLUMN ) ), aStrColumn ( SC_RESSTR( SCSTR_COLUMN ) ),
pViewData ( NULL ), pViewData ( NULL ),
pDoc ( NULL ), pDoc ( NULL ),
nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ), nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ),
...@@ -276,7 +276,7 @@ void ScTpSubTotalGroup::FillListBoxes() ...@@ -276,7 +276,7 @@ void ScTpSubTotalGroup::FillListBoxes()
SCCOL nMaxCol = rSubTotalData.nCol2; SCCOL nMaxCol = rSubTotalData.nCol2;
SCCOL col; SCCOL col;
sal_uInt16 i=0; sal_uInt16 i=0;
String aFieldName; rtl::OUString aFieldName;
aLbGroup.Clear(); aLbGroup.Clear();
aLbColumns.Clear(); aLbColumns.Clear();
...@@ -286,11 +286,13 @@ void ScTpSubTotalGroup::FillListBoxes() ...@@ -286,11 +286,13 @@ void ScTpSubTotalGroup::FillListBoxes()
for ( col=nFirstCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ ) for ( col=nFirstCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ )
{ {
pDoc->GetString( col, nFirstRow, nTab, aFieldName ); pDoc->GetString( col, nFirstRow, nTab, aFieldName );
if ( aFieldName.Len() == 0 ) if ( aFieldName.isEmpty() )
{ {
aFieldName = aStrColumn; rtl::OUStringBuffer aBuf;
aFieldName += ' '; aBuf.append(aStrColumn);
aFieldName += ::ScColToAlpha( col ); // from global.hxx aBuf.append(sal_Unicode(' '));
aBuf.append(ScColToAlpha(col));
aFieldName = aBuf.makeStringAndClear();
} }
nFieldArr[i] = col; nFieldArr[i] = col;
aLbGroup.InsertEntry( aFieldName, i+1 ); aLbGroup.InsertEntry( aFieldName, i+1 );
......
sc/source/ui/inc/tpsort.hxx
Dosyayı görüntüle @ 2ba8fe1e
...@@ -77,9 +77,9 @@ protected: ...@@ -77,9 +77,9 @@ protected:
virtual int DeactivatePage ( SfxItemSet* pSet = 0); virtual int DeactivatePage ( SfxItemSet* pSet = 0);
private: private:
String aStrUndefined; rtl::OUString aStrUndefined;
String aStrColumn; rtl::OUString aStrColumn;
String aStrRow; rtl::OUString aStrRow;
const sal_uInt16 nWhichSort; const sal_uInt16 nWhichSort;
ScSortDlg* pDlg; ScSortDlg* pDlg;
...@@ -161,10 +161,10 @@ private: ...@@ -161,10 +161,10 @@ private:
RadioButton aBtnTopDown; RadioButton aBtnTopDown;
RadioButton aBtnLeftRight; RadioButton aBtnLeftRight;
String aStrRowLabel; rtl::OUString aStrRowLabel;
String aStrColLabel; rtl::OUString aStrColLabel;
String aStrUndefined; rtl::OUString aStrUndefined;
String aStrAreaLabel; rtl::OUString aStrAreaLabel;
const sal_uInt16 nWhichSort; const sal_uInt16 nWhichSort;
ScSortParam aSortData; ScSortParam aSortData;
......
sc/source/ui/inc/tpsubt.hxx
Dosyayı görüntüle @ 2ba8fe1e
...@@ -66,8 +66,8 @@ protected: ...@@ -66,8 +66,8 @@ protected:
SvxCheckListBox aLbColumns; SvxCheckListBox aLbColumns;
FixedText aFtFunctions; FixedText aFtFunctions;
ListBox aLbFunctions; ListBox aLbFunctions;
const String aStrNone; const rtl::OUString aStrNone;
const String aStrColumn; const rtl::OUString aStrColumn;
ScViewData* pViewData; ScViewData* pViewData;
ScDocument* pDoc; ScDocument* pDoc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment