diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-07-19 08:20:20 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-19 13:20:19 +0100 |
commit | ea3edee44ad4796f6fc68190b7d03f8c8917c313 (patch) | |
tree | d06599d0b748b0572145a5708180f3e5bdbeddc8 /sc | |
parent | 1399a51fd6c2644dd1dc2c79d3448deeacbb2c9d (diff) |
callcatcher: update unused code
ResId loaders begining to melt away
Change-Id: Ied10d95f6561f24b2305d202847b7e7c39eb63c3
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/dbgui/filtdlg.cxx | 22 | ||||
-rw-r--r-- | sc/source/ui/dbgui/foptmgr.cxx | 318 | ||||
-rw-r--r-- | sc/source/ui/dbgui/sfiltdlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/filtdlg.hxx | 11 | ||||
-rw-r--r-- | sc/source/ui/inc/foptmgr.hxx | 119 |
5 files changed, 32 insertions, 442 deletions
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index ba88eea33d1a..7c3e929004c1 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -35,9 +35,7 @@ #include "globstr.hrc" #include "filter.hrc" -#define _FILTDLG_CXX #include "filtdlg.hxx" -#undef _FILTDLG_CXX #include <vcl/msgbox.hxx> #include <limits> @@ -232,7 +230,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) maConnLbArr.push_back(pLbConnect4); // Option initialization: - pOptionsMgr = new ScNewFilterOptionsMgr( + pOptionsMgr = new ScFilterOptionsMgr( pViewData, theQueryData, pBtnCase, @@ -738,24 +736,6 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) return 0; } - -//---------------------------------------------------------------------------- - -IMPL_LINK_NOARG(ScFilterDlg, MoreClickHdl) -{ - if ( pExpander->get_expanded() ) - pTimer->Start(); - else - { - pTimer->Stop(); - bRefInputMode = false; - //@BugID 54702 Enable/disable only in Basic class - //SFX_APPWINDOW->Disable(FALSE); //! general method in ScAnyRefDlg - } - return 0; -} - - //---------------------------------------------------------------------------- IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 895103101377..abf1faacd4f2 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/morebtn.hxx> #include <svtools/stdctrl.hxx> #include "anyrefdg.hxx" @@ -28,308 +27,13 @@ #include "queryparam.hxx" #include "globalnames.hxx" -#define _FOPTMGR_CXX -#define _NEWFOPTMGR_CXX #include "foptmgr.hxx" -#undef _NEWFOPTMGR_CXX -#undef _FOPTMGR_CXX //---------------------------------------------------------------------------- - -ScFilterOptionsMgr::ScFilterOptionsMgr( - ScViewData* ptrViewData, - const ScQueryParam& refQueryData, - MoreButton& refBtnMore, - CheckBox& refBtnCase, - CheckBox& refBtnRegExp, - CheckBox& refBtnHeader, - CheckBox& refBtnUnique, - CheckBox& refBtnCopyResult, - CheckBox& refBtnDestPers, - ListBox& refLbCopyArea, - Edit& refEdCopyArea, - formula::RefButton& refRbCopyArea, - FixedText& refFtDbAreaLabel, - FixedInfo& refFtDbArea, - FixedLine& refFlOptions, - const String& refStrUndefined ) - - : pViewData ( ptrViewData ), - pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ), - rBtnMore ( refBtnMore ), - rBtnCase ( refBtnCase ), - rBtnRegExp ( refBtnRegExp ), - rBtnHeader ( refBtnHeader ), - rBtnUnique ( refBtnUnique ), - rBtnCopyResult ( refBtnCopyResult ), - rBtnDestPers ( refBtnDestPers ), - rLbCopyPos ( refLbCopyArea ), - rEdCopyPos ( refEdCopyArea ), - rRbCopyPos ( refRbCopyArea ), - rFtDbAreaLabel ( refFtDbAreaLabel ), - rFtDbArea ( refFtDbArea ), - rFlOptions ( refFlOptions ), - rStrUndefined ( refStrUndefined ), - rQueryData ( refQueryData ) -{ - Init(); -} - - -//---------------------------------------------------------------------------- - -ScFilterOptionsMgr::~ScFilterOptionsMgr() -{ - sal_uInt16 nEntries = rLbCopyPos.GetEntryCount(); - sal_uInt16 i; - - for ( i=2; i<nEntries; i++ ) - delete (String*)rLbCopyPos.GetEntryData( i ); -} - - -//---------------------------------------------------------------------------- - -void ScFilterOptionsMgr::Init() -{ -//moggi:TODO - OSL_ENSURE( pViewData && pDoc, "Init failed :-/" ); - - rLbCopyPos.SetSelectHdl ( LINK( this, ScFilterOptionsMgr, LbPosSelHdl ) ); - rEdCopyPos.SetModifyHdl ( LINK( this, ScFilterOptionsMgr, EdPosModifyHdl ) ); - rBtnCopyResult.SetClickHdl( LINK( this, ScFilterOptionsMgr, BtnCopyResultHdl ) ); - - rBtnMore.AddWindow( &rBtnCase ); - rBtnMore.AddWindow( &rBtnRegExp ); - rBtnMore.AddWindow( &rBtnHeader ); - rBtnMore.AddWindow( &rBtnUnique ); - rBtnMore.AddWindow( &rBtnCopyResult ); - rBtnMore.AddWindow( &rBtnDestPers ); - rBtnMore.AddWindow( &rLbCopyPos ); - rBtnMore.AddWindow( &rEdCopyPos ); - rBtnMore.AddWindow( &rRbCopyPos ); - rBtnMore.AddWindow( &rFtDbAreaLabel ); - rBtnMore.AddWindow( &rFtDbArea ); - rBtnMore.AddWindow( &rFlOptions ); - - rBtnCase .Check( rQueryData.bCaseSens ); - rBtnHeader .Check( rQueryData.bHasHeader ); - rBtnRegExp .Check( rQueryData.bRegExp ); - rBtnUnique .Check( !rQueryData.bDuplicate ); - - if ( pViewData && pDoc ) - { - OUString theAreaStr; - ScRange theCurArea ( ScAddress( rQueryData.nCol1, - rQueryData.nRow1, - pViewData->GetTabNo() ), - ScAddress( rQueryData.nCol2, - rQueryData.nRow2, - pViewData->GetTabNo() ) ); - ScDBCollection* pDBColl = pDoc->GetDBCollection(); - OUStringBuffer theDbArea; - OUString theDbName(STR_DB_LOCAL_NONAME); - const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - - theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv ); - - // Zielbereichsliste fuellen - - rLbCopyPos.Clear(); - rLbCopyPos.InsertEntry( rStrUndefined, 0 ); - - ScAreaNameIterator aIter( pDoc ); - String aName; - ScRange aRange; - String aRefStr; - while ( aIter.Next( aName, aRange ) ) - { - sal_uInt16 nInsert = rLbCopyPos.InsertEntry( aName ); - - aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, eConv ); - rLbCopyPos.SetEntryData( nInsert, new String( aRefStr ) ); - } - - rBtnDestPers.Check( sal_True ); // beim Aufruf immer an - rLbCopyPos.SelectEntryPos( 0 ); - rEdCopyPos.SetText( EMPTY_STRING ); - - /* - * Ueberpruefen, ob es sich bei dem uebergebenen - * Bereich um einen Datenbankbereich handelt: - */ - - theDbArea = theAreaStr; - - if ( pDBColl ) - { - ScAddress& rStart = theCurArea.aStart; - ScAddress& rEnd = theCurArea.aEnd; - const ScDBData* pDBData = pDBColl->GetDBAtArea( - rStart.Tab(), rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row()); - - if ( pDBData ) - { - rBtnHeader.Check( pDBData->HasHeader() ); - theDbName = pDBData->GetName(); - - if ( theDbName == STR_DB_LOCAL_NONAME ) - rBtnHeader.Enable(); - else - rBtnHeader.Disable(); - } - } - - if ( !theDbName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)) ) - { - theDbArea.appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")); - theDbArea.append(theDbName).append(')'); - rFtDbArea.SetText( theDbArea.makeStringAndClear() ); - } - else - { - rFtDbAreaLabel.SetText( OUString() ); - rFtDbArea.SetText( OUString() ); - } - - //------------------------------------------------------ - // Kopierposition: - - if ( !rQueryData.bInplace ) - { - String aString; - - ScAddress( rQueryData.nDestCol, - rQueryData.nDestRow, - rQueryData.nDestTab - ).Format( aString, SCA_ABS_3D, pDoc, eConv ); - - rBtnCopyResult.Check( sal_True ); - rEdCopyPos.SetText( aString ); - EdPosModifyHdl( &rEdCopyPos ); - rLbCopyPos.Enable(); - rEdCopyPos.Enable(); - rRbCopyPos.Enable(); - rBtnDestPers.Enable(); - } - else - { - rBtnCopyResult.Check( false ); - rEdCopyPos.SetText( EMPTY_STRING ); - rLbCopyPos.Disable(); - rEdCopyPos.Disable(); - rRbCopyPos.Disable(); - rBtnDestPers.Disable(); - } - } - else - rEdCopyPos.SetText( EMPTY_STRING ); -} - - -//---------------------------------------------------------------------------- - -sal_Bool ScFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const -{ - String aPosStr( rPosStr ); - xub_StrLen nColonPos = aPosStr.Search( ':' ); - - if ( STRING_NOTFOUND != nColonPos ) - aPosStr.Erase( nColonPos ); - - sal_uInt16 nResult = ScAddress().Parse( aPosStr, pDoc, pDoc->GetAddressConvention() ); - - return ( SCA_VALID == (nResult & SCA_VALID) ); -} - - -//---------------------------------------------------------------------------- -// Handler: - -//---------------------------------------------------------------------------- - -IMPL_LINK( ScFilterOptionsMgr, LbPosSelHdl, ListBox*, pLb ) -{ - if ( pLb == &rLbCopyPos ) - { - String aString; - sal_uInt16 nSelPos = rLbCopyPos.GetSelectEntryPos(); - - if ( nSelPos > 0 ) - aString = *(String*)rLbCopyPos.GetEntryData( nSelPos ); - - rEdCopyPos.SetText( aString ); - } - - return 0; -} - - +// ScFilterOptionsMgr (.ui's option helper) //---------------------------------------------------------------------------- -IMPL_LINK( ScFilterOptionsMgr, EdPosModifyHdl, Edit*, pEd ) -{ - if ( pEd == &rEdCopyPos ) - { - String theCurPosStr = pEd->GetText(); - sal_uInt16 nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); - - if ( SCA_VALID == (nResult & SCA_VALID) ) - { - String* pStr = NULL; - sal_Bool bFound = false; - sal_uInt16 i = 0; - sal_uInt16 nCount = rLbCopyPos.GetEntryCount(); - - for ( i=2; i<nCount && !bFound; i++ ) - { - pStr = (String*)rLbCopyPos.GetEntryData( i ); - bFound = (theCurPosStr == *pStr); - } - - if ( bFound ) - rLbCopyPos.SelectEntryPos( --i ); - else - rLbCopyPos.SelectEntryPos( 0 ); - } - else - rLbCopyPos.SelectEntryPos( 0 ); - } - - return 0; -} - - -//---------------------------------------------------------------------------- - -IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox*, pBox ) -{ - if ( pBox == &rBtnCopyResult ) - { - if ( pBox->IsChecked() ) - { - rBtnDestPers.Enable(); - rLbCopyPos.Enable(); - rEdCopyPos.Enable(); - rRbCopyPos.Enable(); - rEdCopyPos.GrabFocus(); - } - else - { - rBtnDestPers.Disable(); - rLbCopyPos.Disable(); - rEdCopyPos.Disable(); - rRbCopyPos.Disable(); - } - } - - return 0; -} -//---------------------------------------------------------------------------- -// ScNewFilterOptionsMgr (.ui's option helper) -//---------------------------------------------------------------------------- - -ScNewFilterOptionsMgr::ScNewFilterOptionsMgr( +ScFilterOptionsMgr::ScFilterOptionsMgr( ScViewData* ptrViewData, const ScQueryParam& refQueryData, CheckBox* refBtnCase, @@ -367,7 +71,7 @@ ScNewFilterOptionsMgr::ScNewFilterOptionsMgr( //---------------------------------------------------------------------------- -ScNewFilterOptionsMgr::~ScNewFilterOptionsMgr() +ScFilterOptionsMgr::~ScFilterOptionsMgr() { sal_uInt16 nEntries = pLbCopyArea->GetEntryCount(); sal_uInt16 i; @@ -379,14 +83,14 @@ ScNewFilterOptionsMgr::~ScNewFilterOptionsMgr() //---------------------------------------------------------------------------- -void ScNewFilterOptionsMgr::Init() +void ScFilterOptionsMgr::Init() { //moggi:TODO OSL_ENSURE( pViewData && pDoc, "Init failed :-/" ); - pLbCopyArea->SetSelectHdl ( LINK( this, ScNewFilterOptionsMgr, LbAreaSelHdl ) ); - pEdCopyArea->SetModifyHdl ( LINK( this, ScNewFilterOptionsMgr, EdAreaModifyHdl ) ); - pBtnCopyResult->SetToggleHdl ( LINK( this, ScNewFilterOptionsMgr, BtnCopyResultHdl ) ); + pLbCopyArea->SetSelectHdl ( LINK( this, ScFilterOptionsMgr, LbAreaSelHdl ) ); + pEdCopyArea->SetModifyHdl ( LINK( this, ScFilterOptionsMgr, EdAreaModifyHdl ) ); + pBtnCopyResult->SetToggleHdl ( LINK( this, ScFilterOptionsMgr, BtnCopyResultHdl ) ); pBtnCase ->Check( rQueryData.bCaseSens ); pBtnHeader ->Check( rQueryData.bHasHeader ); @@ -504,7 +208,7 @@ void ScNewFilterOptionsMgr::Init() //---------------------------------------------------------------------------- -sal_Bool ScNewFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const +sal_Bool ScFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const { String aPosStr( rPosStr ); xub_StrLen nColonPos = aPosStr.Search( ':' ); @@ -522,7 +226,7 @@ sal_Bool ScNewFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const //---------------------------------------------------------------------------- -IMPL_LINK( ScNewFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) +IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) { if ( pLb == pLbCopyArea ) { @@ -541,7 +245,7 @@ IMPL_LINK( ScNewFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) //---------------------------------------------------------------------------- -IMPL_LINK( ScNewFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) +IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) { if ( pEd == pEdCopyArea ) { @@ -576,7 +280,7 @@ IMPL_LINK( ScNewFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) //---------------------------------------------------------------------------- -IMPL_LINK( ScNewFilterOptionsMgr, BtnCopyResultHdl, CheckBox*, pBox ) +IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox*, pBox ) { if ( pBox == pBtnCopyResult ) { diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index acd2d51e1e00..a8904cbe840e 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -33,9 +33,7 @@ #include "globstr.hrc" #include "filter.hrc" -#define _SFILTDLG_CXX #include "filtdlg.hxx" -#undef _SFILTDLG_CXX #include <vcl/msgbox.hxx> // DEFINE -------------------------------------------------------------------- @@ -180,7 +178,7 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) // Optionen initialisieren lassen: - pOptionsMgr = new ScNewFilterOptionsMgr( + pOptionsMgr = new ScFilterOptionsMgr( pViewData, theQueryData, pBtnCase, diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 2a789bd884b9..3dc88e9f0167 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -40,7 +40,7 @@ //---------------------------------------------------------------------------- -class ScNewFilterOptionsMgr; +class ScFilterOptionsMgr; class ScViewData; class ScDocument; class ScQueryItem; @@ -116,7 +116,7 @@ private: const OUString aStrRow; const OUString aStrColumn; - ScNewFilterOptionsMgr* pOptionsMgr; + ScFilterOptionsMgr* pOptionsMgr; const sal_uInt16 nWhichQuery; ScQueryParam theQueryData; @@ -139,7 +139,6 @@ private: // Hack: RefInput control Timer* pTimer; -#ifdef _FILTDLG_CXX private: void Init ( const SfxItemSet& rArgSet ); void FillFieldLists (); @@ -155,12 +154,10 @@ private: DECL_LINK( ValModifyHdl, ComboBox* ); DECL_LINK( CheckBoxHdl, CheckBox* ); DECL_LINK( EndDlgHdl, Button* ); - DECL_LINK( MoreClickHdl, void* ); DECL_LINK( ScrollHdl, void* ); // Hack: RefInput control DECL_LINK( TimeOutHdl, Timer* ); -#endif }; class ScSpecialFilterDlg : public ScAnyRefDlg @@ -201,7 +198,7 @@ private: CancelButton* pBtnCancel; HelpButton* pBtnHelp; - ScNewFilterOptionsMgr* pOptionsMgr; + ScFilterOptionsMgr* pOptionsMgr; const sal_uInt16 nWhichQuery; const ScQueryParam theQueryData; @@ -215,7 +212,6 @@ private: // Hack: RefInput control Timer* pTimer; -#ifdef _SFILTDLG_CXX private: void Init( const SfxItemSet& rArgSet ); ScQueryItem* GetOutputItem( const ScQueryParam& rParam, @@ -229,7 +225,6 @@ private: // Hack: RefInput control DECL_LINK( TimeOutHdl, Timer* ); -#endif }; diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index f138d360ddfe..eb2ca01d43e1 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -17,89 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SC_FOPTMGR_HXX -#define SC_FOPTMGR_HXX - -#include <vcl/fixed.hxx> -#include <vcl/edit.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/button.hxx> - -//---------------------------------------------------------------------------- - -class FixedInfo; -namespace formula -{ - class RefButton; -} -class MoreButton; -struct ScQueryParam; -class ScDocument; -class ScViewData; - -//---------------------------------------------------------------------------- - -class ScFilterOptionsMgr -{ -public: - ScFilterOptionsMgr( ScViewData* ptrViewData, - const ScQueryParam& refQueryData, - MoreButton& refBtnMore, - CheckBox& refBtnCase, - CheckBox& refBtnRegExp, - CheckBox& refBtnHeader, - CheckBox& refBtnUnique, - CheckBox& refBtnCopyResult, - CheckBox& refBtnDestPers, - ListBox& refLbCopyArea, - Edit& refEdCopyArea, - formula::RefButton& refRbCopyArea, - FixedText& refFtDbAreaLabel, - FixedInfo& refFtDbArea, - FixedLine& refFlOptions, - const String& refStrUndefined ); - ~ScFilterOptionsMgr(); - - sal_Bool VerifyPosStr ( const String& rPosStr ) const; - -private: - ScViewData* pViewData; - ScDocument* pDoc; - - MoreButton& rBtnMore; - CheckBox& rBtnCase; - CheckBox& rBtnRegExp; - CheckBox& rBtnHeader; - CheckBox& rBtnUnique; - CheckBox& rBtnCopyResult; - CheckBox& rBtnDestPers; - ListBox& rLbCopyPos; - Edit& rEdCopyPos; - formula::RefButton& rRbCopyPos; - FixedText& rFtDbAreaLabel; - FixedInfo& rFtDbArea; - FixedLine& rFlOptions; - - const String& rStrUndefined; - - const ScQueryParam& rQueryData; - -#ifdef _FOPTMGR_CXX -private: - void Init(); - - // Handler: - DECL_LINK( EdPosModifyHdl, Edit* ); - DECL_LINK( LbPosSelHdl, ListBox* ); - DECL_LINK( BtnCopyResultHdl, CheckBox* ); -#endif -}; - - - -#endif // SC_FOPTMGR_HXX - - #ifndef SC_NEWFOPTMGR_HXX #define SC_NEWFOPTMGR_HXX @@ -107,7 +24,6 @@ private: #include <vcl/edit.hxx> #include <vcl/lstbox.hxx> #include <vcl/button.hxx> -//#include <vcl/layout.hxx> //---------------------------------------------------------------------------- @@ -121,24 +37,24 @@ class ScViewData; //---------------------------------------------------------------------------- -class ScNewFilterOptionsMgr +class ScFilterOptionsMgr { public: - ScNewFilterOptionsMgr( ScViewData* ptrViewData, - const ScQueryParam& refQueryData, - CheckBox* refBtnCase, - CheckBox* refBtnRegExp, - CheckBox* refBtnHeader, - CheckBox* refBtnUnique, - CheckBox* refBtnCopyResult, - CheckBox* refBtnDestPers, - ListBox* refLbCopyArea, - Edit* refEdCopyArea, - formula::RefButton* refRbCopyArea, - FixedText* refFtDbAreaLabel, - FixedText* refFtDbArea, - const String& refStrUndefined ); - ~ScNewFilterOptionsMgr(); + ScFilterOptionsMgr( ScViewData* ptrViewData, + const ScQueryParam& refQueryData, + CheckBox* refBtnCase, + CheckBox* refBtnRegExp, + CheckBox* refBtnHeader, + CheckBox* refBtnUnique, + CheckBox* refBtnCopyResult, + CheckBox* refBtnDestPers, + ListBox* refLbCopyArea, + Edit* refEdCopyArea, + formula::RefButton* refRbCopyArea, + FixedText* refFtDbAreaLabel, + FixedText* refFtDbArea, + const String& refStrUndefined ); + ~ScFilterOptionsMgr(); sal_Bool VerifyPosStr ( const String& rPosStr ) const; private: @@ -161,7 +77,6 @@ private: const ScQueryParam& rQueryData; -#ifdef _NEWFOPTMGR_CXX private: void Init(); @@ -169,11 +84,9 @@ private: DECL_LINK( EdAreaModifyHdl, Edit* ); DECL_LINK( LbAreaSelHdl, ListBox* ); DECL_LINK( BtnCopyResultHdl, CheckBox* ); -#endif }; #endif // SC_NEWFOPTMGR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |