[Libreoffice-commits] .: 3 commits - sc/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Mon Aug 29 20:02:23 PDT 2011
sc/source/ui/dbgui/dbnamdlg.cxx | 2
sc/source/ui/dbgui/filtdlg.cxx | 75 +++++++++++++++++++--------------
sc/source/ui/dbgui/sfiltdlg.cxx | 30 +++++++++----
sc/source/ui/inc/filtdlg.hxx | 89 ++++++++++++++++------------------------
4 files changed, 103 insertions(+), 93 deletions(-)
New commits:
commit 3f848490c2e0e3bad28a7911431baa98d6b53972
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Aug 29 23:02:07 2011 -0400
Unused data member.
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 6c3741c..d4ea918 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -90,7 +90,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
aFtDbArea ( this, ScResId( FT_DBAREA ) ),
aStrUndefined ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
- aStrNone ( ResId::toString(ScResId(SCSTR_NONE)) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 681fbbc..48f595a 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -204,7 +204,6 @@ private:
FixedInfo aFtDbArea;
const rtl::OUString aStrUndefined;
const rtl::OUString aStrNoName;
- const rtl::OUString aStrNone;
OKButton aBtnOk;
CancelButton aBtnCancel;
commit 44d6b727ad0df7905c6404d5d326fa2c863b159b
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Aug 29 23:01:07 2011 -0400
String to rtl::OUString.
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 03de6ca..539e0a4 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -114,13 +114,13 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ),
aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ),
aFtDbArea ( this, ScResId( FT_DBAREA ) ),
- aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
+ aStrUndefined ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
- aStrNone ( ScResId( SCSTR_NONE ) ),
- aStrEmpty ( ScResId( SCSTR_EMPTY ) ),
- aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ),
- aStrRow ( ScResId( SCSTR_ROW ) ),
- aStrColumn ( ScResId( SCSTR_COLUMN ) ),
+ 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)) ),
//
pOptionsMgr ( NULL ),
nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
@@ -332,14 +332,14 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
nFieldSelPos = GetFieldSelPos( pViewData->GetCurX() );
rEntry.nField = nFieldSelPos ? (theQueryData.nCol1 +
static_cast<SCCOL>(nFieldSelPos) - 1) : static_cast<SCCOL>(0);
- rEntry.bDoQuery=sal_True;
- bRefreshExceptQuery[i]=sal_True;
+ rEntry.bDoQuery=true;
+ bRefreshExceptQuery[i]=true;
}
aFieldLbArr[i]->SelectEntryPos( nFieldSelPos );
aCondLbArr [i]->SelectEntryPos( nCondPos );
aValueEdArr[i]->SetText( aValStr );
- aValueEdArr[i]->EnableAutocomplete( sal_False );
+ aValueEdArr[i]->EnableAutocomplete( false );
aValueEdArr[i]->SetModifyHdl( LINK( this, ScFilterDlg, ValModifyHdl ) );
UpdateValueList( static_cast<sal_uInt16>(i+1) );
}
@@ -410,9 +410,9 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
if(pDoc!=NULL &&
pDoc->GetChangeTrack()!=NULL) aBtnCopyResult.Disable();
// Switch on modal mode
-// SetDispatcherLock( sal_True );
+// SetDispatcherLock( true );
//@BugID 54702 Enable/disable only in Basic class
-// SFX_APPWINDOW->Disable(sal_False); //! general method in ScAnyRefDlg
+// SFX_APPWINDOW->Disable(false); //! general method in ScAnyRefDlg
}
@@ -684,14 +684,14 @@ ScQueryItem* ScFilterDlg::GetOutputItem()
}
else
{
- theParam.bInplace = sal_True;
+ theParam.bInplace = true;
theParam.nDestTab = 0;
theParam.nDestCol = 0;
theParam.nDestRow = 0;
}
theParam.bHasHeader = aBtnHeader.IsChecked();
- theParam.bByRow = sal_True;
+ theParam.bByRow = true;
theParam.bDuplicate = !aBtnUnique.IsChecked();
theParam.bCaseSens = aBtnCase.IsChecked();
theParam.bRegExp = aBtnRegExp.IsChecked();
@@ -722,14 +722,14 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn )
{
if ( pBtn == &aBtnOk )
{
- sal_Bool bAreaInputOk = sal_True;
+ sal_Bool bAreaInputOk = true;
if ( aBtnCopyResult.IsChecked() )
{
if ( !pOptionsMgr->VerifyPosStr( aEdCopyArea.GetText() ) )
{
if ( !aBtnMore.GetState() )
- aBtnMore.SetState( sal_True );
+ aBtnMore.SetState( true );
ERRORBOX( STR_INVALID_TABREF );
aEdCopyArea.GrabFocus();
@@ -807,7 +807,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
sal_uInt16 nConnect1 = aLbConnect1.GetSelectEntryPos();
sal_uInt16 nQE = nOffset;
theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect1;
- bRefreshExceptQuery[nQE]=sal_True;
+ bRefreshExceptQuery[nQE]=true;
}
else if ( pLb == &aLbConnect2 )
@@ -819,7 +819,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
sal_uInt16 nConnect2 = aLbConnect2.GetSelectEntryPos();
sal_uInt16 nQE = 1+nOffset;
theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect2;
- bRefreshExceptQuery[nQE]=sal_True;
+ bRefreshExceptQuery[nQE]=true;
}
else if ( pLb == &aLbConnect3 )
{
@@ -830,7 +830,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
sal_uInt16 nConnect3 = aLbConnect3.GetSelectEntryPos();
sal_uInt16 nQE = 2+nOffset;
theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect3;
- bRefreshExceptQuery[nQE]=sal_True;
+ bRefreshExceptQuery[nQE]=true;
}
else if ( pLb == &aLbConnect4 )
@@ -842,7 +842,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
sal_uInt16 nConnect4 = aLbConnect4.GetSelectEntryPos();
sal_uInt16 nQE = 3+nOffset;
theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect4;
- bRefreshExceptQuery[nQE]=sal_True;
+ bRefreshExceptQuery[nQE]=true;
}
else if ( pLb == &aLbField1 )
@@ -881,7 +881,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
bRefreshExceptQuery[i]=false;
theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0);
}
- bRefreshExceptQuery[nOffset] =sal_True;
+ bRefreshExceptQuery[nOffset] =true;
}
else
{
@@ -890,7 +890,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
{
aLbConnect2.Enable();
}
- theQueryData.GetEntry(nOffset).bDoQuery = sal_True;
+ theQueryData.GetEntry(nOffset).bDoQuery = true;
sal_uInt16 nField = pLb->GetSelectEntryPos();
theQueryData.GetEntry(nOffset).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
}
@@ -925,7 +925,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
bRefreshExceptQuery[i]=false;
theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0);
}
- bRefreshExceptQuery[nTemp]=sal_True;
+ bRefreshExceptQuery[nTemp]=true;
}
else
{
@@ -936,7 +936,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
}
sal_uInt16 nField = pLb->GetSelectEntryPos();
sal_uInt16 nQ=1+nOffset;
- theQueryData.GetEntry(nQ).bDoQuery = sal_True;
+ theQueryData.GetEntry(nQ).bDoQuery = true;
theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
}
}
@@ -962,7 +962,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
bRefreshExceptQuery[i]=false;
theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0);
}
- bRefreshExceptQuery[nTemp]=sal_True;
+ bRefreshExceptQuery[nTemp]=true;
}
else
{
@@ -974,7 +974,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
sal_uInt16 nField = pLb->GetSelectEntryPos();
sal_uInt16 nQ=2+nOffset;
- theQueryData.GetEntry(nQ).bDoQuery = sal_True;
+ theQueryData.GetEntry(nQ).bDoQuery = true;
theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
}
@@ -991,14 +991,14 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
bRefreshExceptQuery[i]=false;
theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0);
}
- bRefreshExceptQuery[nTemp]=sal_True;
+ bRefreshExceptQuery[nTemp]=true;
}
else
{
UpdateValueList( 4 );
sal_uInt16 nField = pLb->GetSelectEntryPos();
sal_uInt16 nQ=3+nOffset;
- theQueryData.GetEntry(nQ).bDoQuery = sal_True;
+ theQueryData.GetEntry(nQ).bDoQuery = true;
theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
}
@@ -1104,7 +1104,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
nQE=i+nOffset;
}
- if ( aStrEmpty == aStrVal || aStrNotEmpty == aStrVal )
+ if ( aStrEmpty.equals(aStrVal) || aStrNotEmpty.equals(aStrVal) )
{
pLbCond->SelectEntry( '=' );
pLbCond->Disable();
@@ -1113,18 +1113,18 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
pLbCond->Enable();
ScQueryEntry& rEntry = theQueryData.GetEntry( nQE );
- sal_Bool bDoThis = (pLbField->GetSelectEntryPos() != 0);
+ bool bDoThis = (pLbField->GetSelectEntryPos() != 0);
rEntry.bDoQuery = bDoThis;
if ( rEntry.bDoQuery || bRefreshExceptQuery[nQE] )
{
- if ( aStrVal == aStrEmpty )
+ if ( aStrEmpty.equals(aStrVal) )
{
rEntry.pStr->Erase();
rEntry.nVal = SC_EMPTYFIELDS;
rEntry.bQueryByString = false;
}
- else if ( aStrVal == aStrNotEmpty )
+ else if ( aStrNotEmpty.equals(aStrVal) )
{
rEntry.pStr->Erase();
rEntry.nVal = SC_NONEMPTYFIELDS;
@@ -1134,7 +1134,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
{
*rEntry.pStr = aStrVal;
rEntry.nVal = 0;
- rEntry.bQueryByString = sal_True;
+ rEntry.bQueryByString = true;
}
sal_uInt16 nField = pLbField->GetSelectEntryPos();
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index caf931f..6c3741c 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -88,9 +88,9 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ),
aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ),
aFtDbArea ( this, ScResId( FT_DBAREA ) ),
- aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
+ aStrUndefined ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
- aStrNone ( ScResId( SCSTR_NONE ) ),
+ aStrNone ( ResId::toString(ScResId(SCSTR_NONE)) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 61e1e2a..681fbbc 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -112,14 +112,14 @@ private:
CheckBox aBtnDestPers;
FixedText aFtDbAreaLabel;
FixedInfo aFtDbArea;
- const String aStrUndefined;
- const String aStrNoName;
- const String aStrNone;
+ const rtl::OUString aStrUndefined;
+ const rtl::OUString aStrNoName;
+ const rtl::OUString aStrNone;
- const String aStrEmpty;
- const String aStrNotEmpty;
- const String aStrRow;
- const String aStrColumn;
+ const rtl::OUString aStrEmpty;
+ const rtl::OUString aStrNotEmpty;
+ const rtl::OUString aStrRow;
+ const rtl::OUString aStrColumn;
ScFilterOptionsMgr* pOptionsMgr;
@@ -169,8 +169,6 @@ private:
#endif
};
-
-//============================================================================
class ScSpecialFilterDlg : public ScAnyRefDlg
{
public:
@@ -204,9 +202,9 @@ private:
CheckBox aBtnDestPers;
FixedText aFtDbAreaLabel;
FixedInfo aFtDbArea;
- const String aStrUndefined;
- const String aStrNoName;
- const String aStrNone;
+ const rtl::OUString aStrUndefined;
+ const rtl::OUString aStrNoName;
+ const rtl::OUString aStrNone;
OKButton aBtnOk;
CancelButton aBtnCancel;
commit d8acdc5fa8d688087d453b7c2bad6cf85af73745
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Aug 29 22:49:51 2011 -0400
Some cleanups & removed lazy macros.
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 99001cc..3d03943 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -690,7 +690,7 @@ IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG )
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
//SFX_APPWINDOW->Enable();
- bRefInputMode = sal_True;
+ bRefInputMode = true;
}
return 0;
}
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index d05f2d2..03de6ca 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -103,7 +103,20 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
aBtnHelp ( this, ScResId( BTN_HELP ) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- _INIT_COMMON_FILTER_RSCOBJS
+ aBtnCase ( this, ScResId( BTN_CASE ) ),
+ aBtnRegExp ( this, ScResId( BTN_REGEXP ) ),
+ aBtnHeader ( this, ScResId( BTN_HEADER ) ),
+ aBtnUnique ( this, ScResId( BTN_UNIQUE ) ),
+ aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ),
+ aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ),
+ aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ),
+ aRbCopyArea ( this, ScResId( RB_COPY_AREA ) ),
+ aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ),
+ aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ),
+ aFtDbArea ( this, ScResId( FT_DBAREA ) ),
+ aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
+ aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
+ aStrNone ( ScResId( SCSTR_NONE ) ),
aStrEmpty ( ScResId( SCSTR_EMPTY ) ),
aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ),
aStrRow ( ScResId( SCSTR_ROW ) ),
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index e50f91d..caf931f 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -77,7 +77,20 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
aRbFilterArea ( this, ScResId( RB_CRITERIA_AREA ), &aEdFilterArea, this ),
//
aFlOptions ( this, ScResId( FL_OPTIONS ) ),
- _INIT_COMMON_FILTER_RSCOBJS
+ aBtnCase ( this, ScResId( BTN_CASE ) ),
+ aBtnRegExp ( this, ScResId( BTN_REGEXP ) ),
+ aBtnHeader ( this, ScResId( BTN_HEADER ) ),
+ aBtnUnique ( this, ScResId( BTN_UNIQUE ) ),
+ aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ),
+ aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ),
+ aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ),
+ aRbCopyArea ( this, ScResId( RB_COPY_AREA ) ),
+ aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ),
+ aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ),
+ aFtDbArea ( this, ScResId( FT_DBAREA ) ),
+ aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
+ aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
+ aStrNone ( ScResId( SCSTR_NONE ) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
@@ -214,9 +227,9 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
aBtnHeader.Disable();
// Modal-Modus einschalten
-// SetDispatcherLock( sal_True );
+// SetDispatcherLock( true );
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
- //SFX_APPWINDOW->Disable(sal_False); //! allgemeine Methode im ScAnyRefDlg
+ //SFX_APPWINDOW->Disable(false); //! allgemeine Methode im ScAnyRefDlg
}
@@ -315,7 +328,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
String theAreaStr( aEdFilterArea.GetText() );
ScQueryParam theOutParam( theQueryData );
ScAddress theAdrCopy;
- sal_Bool bEditInputOk = sal_True;
+ sal_Bool bEditInputOk = true;
sal_Bool bQueryOk = false;
ScRange theFilterArea;
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
@@ -332,7 +345,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
if ( SCA_VALID != (nResult & SCA_VALID) )
{
if ( !aBtnMore.GetState() )
- aBtnMore.SetState( sal_True );
+ aBtnMore.SetState( true );
ERRORBOX( STR_INVALID_TABREF );
aEdCopyArea.GrabFocus();
@@ -376,14 +389,14 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
}
else
{
- theOutParam.bInplace = sal_True;
+ theOutParam.bInplace = true;
theOutParam.nDestTab = 0;
theOutParam.nDestCol = 0;
theOutParam.nDestRow = 0;
}
theOutParam.bHasHeader = aBtnHeader.IsChecked();
- theOutParam.bByRow = sal_True;
+ theOutParam.bByRow = true;
theOutParam.bCaseSens = aBtnCase.IsChecked();
theOutParam.bRegExp = aBtnRegExp.IsChecked();
theOutParam.bDuplicate = !aBtnUnique.IsChecked();
@@ -443,12 +456,12 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer )
if( aEdCopyArea.HasFocus() || aRbCopyArea.HasFocus() )
{
pRefInputEdit = &aEdCopyArea;
- bRefInputMode = sal_True;
+ bRefInputMode = true;
}
else if( aEdFilterArea.HasFocus() || aRbFilterArea.HasFocus() )
{
pRefInputEdit = &aEdFilterArea;
- bRefInputMode = sal_True;
+ bRefInputMode = true;
}
else if( bRefInputMode )
{
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index c8fce86..61e1e2a 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -47,44 +47,6 @@ class ScDocument;
class ScQueryItem;
class TypedScStrCollection;
-//==================================================================
-// Shared resource objects:
-
-#define _COMMON_FILTER_RSCOBJS \
- CheckBox aBtnCase; \
- CheckBox aBtnRegExp; \
- CheckBox aBtnHeader; \
- CheckBox aBtnUnique; \
- CheckBox aBtnCopyResult; \
- ListBox aLbCopyArea; \
- formula::RefEdit aEdCopyArea; \
- formula::RefButton aRbCopyArea; \
- CheckBox aBtnDestPers; \
- FixedText aFtDbAreaLabel; \
- FixedInfo aFtDbArea; \
- const String aStrUndefined; \
- const String aStrNoName; \
- const String aStrNone;
-
-
-#define _INIT_COMMON_FILTER_RSCOBJS \
- aBtnCase ( this, ScResId( BTN_CASE ) ), \
- aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \
- aBtnHeader ( this, ScResId( BTN_HEADER ) ), \
- aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \
- aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \
- aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), \
- aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ), \
- aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), \
- aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), \
- aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), \
- aFtDbArea ( this, ScResId( FT_DBAREA ) ), \
- aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), \
- aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), \
- aStrNone ( ScResId( SCSTR_NONE ) ),
-
-
-//============================================================================
class ScFilterDlg : public ScAnyRefDlg
{
public:
@@ -139,7 +101,20 @@ private:
OKButton aBtnOk;
CancelButton aBtnCancel;
- _COMMON_FILTER_RSCOBJS
+ CheckBox aBtnCase;
+ CheckBox aBtnRegExp;
+ CheckBox aBtnHeader;
+ CheckBox aBtnUnique;
+ CheckBox aBtnCopyResult;
+ ListBox aLbCopyArea;
+ formula::RefEdit aEdCopyArea;
+ formula::RefButton aRbCopyArea;
+ CheckBox aBtnDestPers;
+ FixedText aFtDbAreaLabel;
+ FixedInfo aFtDbArea;
+ const String aStrUndefined;
+ const String aStrNoName;
+ const String aStrNone;
const String aStrEmpty;
const String aStrNotEmpty;
@@ -213,12 +188,25 @@ public:
private:
FixedText aFtFilterArea;
ListBox aLbFilterArea;
- formula::RefEdit aEdFilterArea;
- formula::RefButton aRbFilterArea;
+ formula::RefEdit aEdFilterArea;
+ formula::RefButton aRbFilterArea;
FixedLine aFlOptions;
- _COMMON_FILTER_RSCOBJS
+ CheckBox aBtnCase;
+ CheckBox aBtnRegExp;
+ CheckBox aBtnHeader;
+ CheckBox aBtnUnique;
+ CheckBox aBtnCopyResult;
+ ListBox aLbCopyArea;
+ formula::RefEdit aEdCopyArea;
+ formula::RefButton aRbCopyArea;
+ CheckBox aBtnDestPers;
+ FixedText aFtDbAreaLabel;
+ FixedInfo aFtDbArea;
+ const String aStrUndefined;
+ const String aStrNoName;
+ const String aStrNone;
OKButton aBtnOk;
CancelButton aBtnCancel;
@@ -227,14 +215,14 @@ private:
ScFilterOptionsMgr* pOptionsMgr;
- const sal_uInt16 nWhichQuery;
+ const sal_uInt16 nWhichQuery;
const ScQueryParam theQueryData;
ScQueryItem* pOutItem;
ScViewData* pViewData;
ScDocument* pDoc;
- formula::RefEdit* pRefInputEdit;
- sal_Bool bRefInputMode;
+ formula::RefEdit* pRefInputEdit;
+ bool bRefInputMode;
// Hack: RefInput control
Timer* pTimer;
More information about the Libreoffice-commits
mailing list