summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg/detailpages.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/dlg/detailpages.hxx')
-rw-r--r--dbaccess/source/ui/dlg/detailpages.hxx98
1 files changed, 50 insertions, 48 deletions
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index fd4119bdbbfa..407a986c2c1c 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -50,22 +50,20 @@ namespace dbaui
{
protected:
- FixedText* m_pOptionsLabel;
- Edit* m_pOptions;
+ VclPtr<FixedText> m_pOptionsLabel;
+ VclPtr<Edit> m_pOptions;
- FixedText* m_pCharsetLabel;
- CharSetListBox* m_pCharset;
+ VclPtr<FixedText> m_pCharsetLabel;
+ VclPtr<CharSetListBox> m_pCharset;
- CheckBox* m_pAutoRetrievingEnabled;
- FixedText* m_pAutoIncrementLabel;
- Edit* m_pAutoIncrement;
- FixedText* m_pAutoRetrievingLabel;
- Edit* m_pAutoRetrieving;
+ VclPtr<CheckBox> m_pAutoRetrievingEnabled;
+ VclPtr<FixedText> m_pAutoIncrementLabel;
+ VclPtr<Edit> m_pAutoIncrement;
+ VclPtr<FixedText> m_pAutoRetrievingLabel;
+ VclPtr<Edit> m_pAutoRetrieving;
sal_uInt32 m_nControlFlags;
- bool m_bDelete;
-
public:
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
@@ -74,6 +72,7 @@ namespace dbaui
protected:
virtual ~OCommonBehaviourTabPage();
+ virtual void dispose() SAL_OVERRIDE;
// subclasses must override this, but it isn't pure virtual
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
@@ -92,18 +91,16 @@ namespace dbaui
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
ODbaseDetailsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
+ virtual ~ODbaseDetailsPage();
+ virtual void dispose() SAL_OVERRIDE;
private:
- CheckBox* m_pShowDeleted;
- FixedText* m_pFT_Message;
- PushButton* m_pIndexes;
+ VclPtr<CheckBox> m_pShowDeleted;
+ VclPtr<FixedText> m_pFT_Message;
+ VclPtr<PushButton> m_pIndexes;
OUString m_sDsn;
protected:
-
- virtual ~ODbaseDetailsPage();
-
- protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
private:
@@ -113,10 +110,7 @@ namespace dbaui
// OAdoDetailsPage
class OAdoDetailsPage : public OCommonBehaviourTabPage
{
- protected:
- virtual ~OAdoDetailsPage();
public:
-
OAdoDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
};
@@ -127,10 +121,12 @@ namespace dbaui
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
OOdbcDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
+ virtual ~OOdbcDetailsPage();
+ virtual void dispose() SAL_OVERRIDE;
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
private:
- CheckBox* m_pUseCatalog;
+ VclPtr<CheckBox> m_pUseCatalog;
};
// OUserDriverDetailsPage
@@ -140,16 +136,18 @@ namespace dbaui
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
OUserDriverDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
+ virtual ~OUserDriverDetailsPage();
+ virtual void dispose() SAL_OVERRIDE;
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
private:
- FixedText* m_pFTHostname;
- Edit* m_pEDHostname;
- FixedText* m_pPortNumber;
- NumericField* m_pNFPortNumber;
- CheckBox* m_pUseCatalog;
+ VclPtr<FixedText> m_pFTHostname;
+ VclPtr<Edit> m_pEDHostname;
+ VclPtr<FixedText> m_pPortNumber;
+ VclPtr<NumericField> m_pNFPortNumber;
+ VclPtr<CheckBox> m_pUseCatalog;
};
// OMySQLODBCDetailsPage
@@ -168,6 +166,8 @@ namespace dbaui
, sal_uInt16 _nPortId
, bool bShowSocket = true
);
+ virtual ~OGeneralSpecialJDBCDetailsPage();
+ virtual void dispose() SAL_OVERRIDE;
protected:
@@ -177,14 +177,14 @@ namespace dbaui
DECL_LINK(OnTestJavaClickHdl,PushButton*);
DECL_LINK(OnEditModified,Edit*);
- Edit* m_pEDHostname;
- NumericField* m_pNFPortNumber;
- FixedText* m_pFTSocket;
- Edit* m_pEDSocket;
+ VclPtr<Edit> m_pEDHostname;
+ VclPtr<NumericField> m_pNFPortNumber;
+ VclPtr<FixedText> m_pFTSocket;
+ VclPtr<Edit> m_pEDSocket;
- FixedText* m_pFTDriverClass;
- Edit* m_pEDDriverClass;
- PushButton* m_pTestJavaDriver;
+ VclPtr<FixedText> m_pFTDriverClass;
+ VclPtr<Edit> m_pEDDriverClass;
+ VclPtr<PushButton> m_pTestJavaDriver;
OUString m_sDefaultJdbcDriverName;
sal_uInt16 m_nPortId;
@@ -197,15 +197,17 @@ namespace dbaui
public:
MySQLNativePage( vcl::Window* pParent,
const SfxItemSet& _rCoreAttrs );
+ virtual ~MySQLNativePage();
+ virtual void dispose() SAL_OVERRIDE;
private:
- FixedText *m_pSeparator1;
- MySQLNativeSettings m_aMySQLSettings;
+ VclPtr<FixedText> m_pSeparator1;
+ VclPtr<MySQLNativeSettings> m_aMySQLSettings;
- FixedText *m_pSeparator2;
- FixedText *m_pUserNameLabel;
- Edit *m_pUserName;
- CheckBox *m_pPasswordRequired;
+ VclPtr<FixedText> m_pSeparator2;
+ VclPtr<FixedText> m_pUserNameLabel;
+ VclPtr<Edit> m_pUserName;
+ VclPtr<CheckBox> m_pPasswordRequired;
protected:
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
@@ -221,13 +223,15 @@ namespace dbaui
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
OLDAPDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
+ virtual ~OLDAPDetailsPage();
+ virtual void dispose() SAL_OVERRIDE;
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
private:
- Edit* m_pETBaseDN;
- CheckBox* m_pCBUseSSL;
- NumericField* m_pNFPortNumber;
- NumericField* m_pNFRowCount;
+ VclPtr<Edit> m_pETBaseDN;
+ VclPtr<CheckBox> m_pCBUseSSL;
+ VclPtr<NumericField> m_pNFPortNumber;
+ VclPtr<NumericField> m_pNFRowCount;
sal_Int32 m_iSSLPort;
sal_Int32 m_iNormalPort;
@@ -237,10 +241,7 @@ namespace dbaui
// OMozillaDetailsPage Detail page for Mozilla and Thunderbird addressbook
class OMozillaDetailsPage : public OCommonBehaviourTabPage
{
- protected:
- virtual ~OMozillaDetailsPage();
public:
-
OMozillaDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
};
@@ -251,10 +252,11 @@ namespace dbaui
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
OTextDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
- OTextConnectionHelper* m_pTextConnectionHelper;
+ VclPtr<OTextConnectionHelper> m_pTextConnectionHelper;
protected:
virtual ~OTextDetailsPage();
+ virtual void dispose() SAL_OVERRIDE;
virtual bool prepareLeave() SAL_OVERRIDE;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;