sc/source/ui/dbgui/pfiltdlg.cxx | 22 +++++++++++----------- sc/source/ui/inc/pfiltdlg.hxx | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-)
New commits: commit 5d1052ce6047ecc8c366f860a27dd4c4f9c6f212 Author: Kohei Yoshida <kohei.yosh...@suse.com> Date: Tue Nov 8 10:12:33 2011 -0500 String to rtl::OUString. diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 687da91..6c091b6 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -91,12 +91,12 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), aBtnMore ( this, ScResId( BTN_MORE ) ), - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), - aStrNone ( ScResId( SCSTR_NONE ) ), - aStrEmpty ( ScResId( SCSTR_EMPTY ) ), - aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ), - aStrRow ( ScResId( SCSTR_ROW ) ), - aStrColumn ( ScResId( SCSTR_COLUMN ) ), + aStrUndefined ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ), + aStrNone ( ResId::toString(ScResId(SCSTR_NONE)) ), + aStrEmpty ( ResId::toString(ScResId(SCSTR_EMPTY)) ), + aStrNotEmpty ( ResId::toString(ScResId(SCSTR_NOTEMPTY)) ), + aStrRow ( ResId::toString(ScResId(SCSTR_ROW)) ), + aStrColumn ( ResId::toString(ScResId(SCSTR_COLUMN)) ), // nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), theQueryData ( ((const ScQueryItem&) @@ -416,19 +416,19 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() ScQueryEntry& rEntry = theParam.GetEntry(i); ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); - String aStrVal( aValueEdArr[i]->GetText() ); + rtl::OUString aStrVal = aValueEdArr[i]->GetText(); /* * Dialog liefert die ausgezeichneten Feldwerte "leer"/"nicht leer" * als Konstanten in nVal in Verbindung mit dem Schalter * bQueryByString auf FALSE. */ - if ( aStrVal == aStrEmpty ) + if ( aStrVal.equals(aStrEmpty) ) { OSL_ASSERT(eOp == SC_EQUAL); rEntry.SetQueryByEmpty(); } - else if ( aStrVal == aStrNotEmpty ) + else if ( aStrVal.equals(aStrNotEmpty) ) { OSL_ASSERT(eOp == SC_EQUAL); rEntry.SetQueryByNonEmpty(); @@ -594,7 +594,7 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) { if ( pEd ) { - String aStrVal = pEd->GetText(); + rtl::OUString aStrVal = pEd->GetText(); ListBox* pLb = &aLbCond1; if ( pEd == &aEdVal2 ) pLb = &aLbCond2; @@ -603,7 +603,7 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) // wenn einer der Sonderwerte leer/nicht-leer // gewaehlt wird, so macht nur der =-Operator Sinn: - if ( aStrEmpty == aStrVal || aStrNotEmpty == aStrVal ) + if ( aStrEmpty.equals(aStrVal) || aStrNotEmpty.equals(aStrVal) ) { pLb->SelectEntry( '=' ); pLb->Disable(); diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 0c35cc9..7953cab 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -89,14 +89,14 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; MoreButton aBtnMore; - const String aStrUndefined; - const String aStrNone; - const String aStrEmpty; - const String aStrNotEmpty; - const String aStrRow; - const String aStrColumn; - - const sal_uInt16 nWhichQuery; + const rtl::OUString aStrUndefined; + const rtl::OUString aStrNone; + const rtl::OUString aStrEmpty; + const rtl::OUString aStrNotEmpty; + const rtl::OUString aStrRow; + const rtl::OUString aStrColumn; + + const sal_uInt16 nWhichQuery; const ScQueryParam theQueryData; ScQueryItem* pOutItem; ScViewData* pViewData; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits