diff options
| author | Eike Rathke <erack@redhat.com> | 2013-11-08 14:22:21 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-11-08 14:27:16 +0100 |
| commit | 9b10373edae490d2b9b7f8d733c59b4f63927bec (patch) | |
| tree | 4f08c54a2e55d087314267ff65ed010b750de6cd /sc/source/ui/dbgui | |
| parent | 961e319da7e8aa16b64ceee421e896802cbb82c1 (diff) | |
"%1 is replaced to ..." ... maybe, or maybe not
Translations may have omitted the %1 placeholder in SCSTR_COLUMN and
SCSTR_ROW, or not have it translated newly yet because it was introduced
later. In these cases append the column indicator / row number as it was
done before.
Change-Id: I331cf0c529bebea02277784ea145c202eb6f6fda
Diffstat (limited to 'sc/source/ui/dbgui')
| -rw-r--r-- | sc/source/ui/dbgui/filtdlg.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/pfiltdlg.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/tpsort.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/tpsubt.cxx | 3 |
4 files changed, 5 insertions, 10 deletions
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index bfc9de8ccf4a..60953a040d95 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -460,8 +460,7 @@ void ScFilterDlg::FillFieldLists() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if (!pBtnHeader->IsChecked() || aFieldName.isEmpty()) { - OUString aTemp( aStrColumn); - aFieldName = aTemp.replaceFirst("%1", ScColToAlpha( col )); + aFieldName = ScGlobal::ReplaceOrAppend( aStrColumn, "%1", ScColToAlpha( col )); } pLbField1->InsertEntry( aFieldName, i ); pLbField2->InsertEntry( aFieldName, i ); diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 23d0122de9d4..8b0e3f629cc6 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -291,8 +291,7 @@ void ScPivotFilterDlg::FillFieldLists() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if ( aFieldName.isEmpty() ) { - OUString aTemp( aStrColumn); - aFieldName = aTemp.replaceFirst("%1", ScColToAlpha( col )); + aFieldName = ScGlobal::ReplaceOrAppend( aStrColumn, "%1", ScColToAlpha( col )); } aLbField1.InsertEntry( aFieldName, i ); aLbField2.InsertEntry( aFieldName, i ); diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 6a8f05d10367..16bf1793d818 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -384,8 +384,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) aFieldName = pDoc->GetString(col, nFirstSortRow, nTab); if ( !bHasHeader || aFieldName.isEmpty() ) { - OUString aTemp( aStrColumn); - aFieldName = aTemp.replaceFirst("%1", ScColToAlpha( col )); + aFieldName = ScGlobal::ReplaceOrAppend( aStrColumn, "%1", ScColToAlpha( col )); } nFieldArr.push_back( col ); @@ -406,8 +405,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) aFieldName = pDoc->GetString(nFirstSortCol, row, nTab); if ( !bHasHeader || aFieldName.isEmpty() ) { - OUString aTemp( aStrRow); - aFieldName = aTemp.replaceFirst( "%1", OUString::number( row+1)); + aFieldName = ScGlobal::ReplaceOrAppend( aStrRow, "%1", OUString::number( row+1)); } nFieldArr.push_back( row ); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index e8608a871fa3..48b12e91710d 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -278,8 +278,7 @@ void ScTpSubTotalGroup::FillListBoxes() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if ( aFieldName.isEmpty() ) { - OUString aTemp( aStrColumn); - aFieldName = aTemp.replaceFirst("%1", ScColToAlpha( col )); + aFieldName = ScGlobal::ReplaceOrAppend( aStrColumn, "%1", ScColToAlpha( col )); } nFieldArr[i] = col; aLbGroup.InsertEntry( aFieldName, i+1 ); |