sc/source/ui/dbgui/filtdlg.cxx | 6 ++---- sc/source/ui/dbgui/pfiltdlg.cxx | 6 ++---- sc/source/ui/dbgui/tpsort.cxx | 13 ++++--------- sc/source/ui/dbgui/tpsubt.cxx | 5 ++--- sc/source/ui/inc/filtdlg.hxx | 1 - sc/source/ui/inc/pfiltdlg.hxx | 1 - 6 files changed, 10 insertions(+), 22 deletions(-)
New commits: commit 289d4bf7e0631221a3b0b4a59e031069a608ab18 Author: Eike Rathke <[email protected]> Date: Tue Nov 5 19:42:04 2013 +0100 removed unused aStrRow member variable Change-Id: Iaf722c7c59e1659a598180e3a5cbc3edde6157c4 diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 9c03d78..bfc9de8 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -59,7 +59,6 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, , aStrNone(SC_RESSTR(SCSTR_NONE)) , aStrEmpty(SC_RESSTR(SCSTR_FILTER_EMPTY)) , aStrNotEmpty(SC_RESSTR(SCSTR_FILTER_NOTEMPTY)) - , aStrRow(SC_RESSTR(SCSTR_ROW)) , aStrColumn(SC_RESSTR(SCSTR_COLUMN)) , pOptionsMgr(NULL) , nWhichQuery(rArgSet.GetPool()->GetWhich(SID_QUERY)) diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 94f36f3..23d0122 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -82,7 +82,6 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, aStrNone ( SC_RESSTR(SCSTR_NONE) ), aStrEmpty ( SC_RESSTR(SCSTR_FILTER_EMPTY) ), aStrNotEmpty ( SC_RESSTR(SCSTR_FILTER_NOTEMPTY) ), - aStrRow ( SC_RESSTR(SCSTR_ROW) ), aStrColumn ( SC_RESSTR(SCSTR_COLUMN) ), // nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index c9a8928..0f2d71a 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -113,7 +113,6 @@ private: const OUString aStrEmpty; const OUString aStrNotEmpty; - const OUString aStrRow; const OUString aStrColumn; ScFilterOptionsMgr* pOptionsMgr; diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index ecc406e..cf4ef4e 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -84,7 +84,6 @@ private: const OUString aStrNone; const OUString aStrEmpty; const OUString aStrNotEmpty; - const OUString aStrRow; const OUString aStrColumn; const sal_uInt16 nWhichQuery; commit 56fbf9854634cf7e6195a2f1a0c91eaa7e2179e2 Author: Eike Rathke <[email protected]> Date: Tue Nov 5 18:56:29 2013 +0100 OUStringBuffer is unnecessary here Change-Id: I385acd3b730053daeb704d71d2d099317e87fbc8 diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 917c9ef..9c03d78 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -461,9 +461,8 @@ void ScFilterDlg::FillFieldLists() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if (!pBtnHeader->IsChecked() || aFieldName.isEmpty()) { - OUStringBuffer aBuf; - aBuf.append(aStrColumn); - aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col )); + OUString aTemp( aStrColumn); + aFieldName = aTemp.replaceFirst("%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 fbb46bf..94f36f3 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -292,9 +292,8 @@ void ScPivotFilterDlg::FillFieldLists() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if ( aFieldName.isEmpty() ) { - OUStringBuffer aBuf; - aBuf.append(aStrColumn); - aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col )); + OUString aTemp( aStrColumn); + aFieldName = aTemp.replaceFirst("%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 2c0bb95..6a8f05d 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -384,9 +384,8 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) aFieldName = pDoc->GetString(col, nFirstSortRow, nTab); if ( !bHasHeader || aFieldName.isEmpty() ) { - OUStringBuffer aBuf; - aBuf.append(aStrColumn); - aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col )); + OUString aTemp( aStrColumn); + aFieldName = aTemp.replaceFirst("%1", ScColToAlpha( col )); } nFieldArr.push_back( col ); @@ -407,12 +406,8 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) aFieldName = pDoc->GetString(nFirstSortCol, row, nTab); if ( !bHasHeader || aFieldName.isEmpty() ) { - OUStringBuffer aBuf; - OUStringBuffer tempBuf; - - aBuf.append(aStrRow); - tempBuf.append(row+1 ); - aFieldName = aBuf.makeStringAndClear().replaceAll("%1", tempBuf.makeStringAndClear()); + OUString aTemp( aStrRow); + aFieldName = aTemp.replaceFirst( "%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 ed5f1c8..e8608a8 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -278,9 +278,8 @@ void ScTpSubTotalGroup::FillListBoxes() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if ( aFieldName.isEmpty() ) { - OUStringBuffer aBuf; - aBuf.append(aStrColumn); - aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col )); + OUString aTemp( aStrColumn); + aFieldName = aTemp.replaceFirst("%1", ScColToAlpha( col )); } nFieldArr[i] = col; aLbGroup.InsertEntry( aFieldName, i+1 ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
