summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg/generalpage.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/dlg/generalpage.hxx')
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx26
1 files changed, 15 insertions, 11 deletions
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 083d3f0cda25..6c5d3294f749 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -40,7 +40,7 @@ namespace dbaui
m_eNotSupportedKnownType; /// if a data source of an unsupported, but known type is encountered ....
private:
- FixedText* m_pSpecialMessage;
+ VclPtr<FixedText> m_pSpecialMessage;
enum SPECIAL_MESSAGE
{
@@ -56,7 +56,7 @@ namespace dbaui
void insertDatasourceTypeEntryData( const OUString& _sType, const OUString& sDisplayName );
protected:
- ListBox* m_pDatasourceType;
+ VclPtr<ListBox> m_pDatasourceType;
::dbaccess::ODsnTypeCollection*
m_pCollection; /// the DSN type collection instance
@@ -65,6 +65,9 @@ namespace dbaui
m_aURLPrefixes;
public:
+ virtual ~OGeneralPage();
+ virtual void dispose() SAL_OVERRIDE;
+
/// set a handler which gets called every time the user selects a new type
void SetTypeSelectHandler( const Link& _rHandler ) { m_aTypeSelectHandler = _rHandler; }
@@ -115,7 +118,8 @@ namespace dbaui
{
public:
OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems );
-
+ virtual ~OGeneralPageWizard();
+ virtual void dispose() SAL_OVERRIDE;
public:
enum CreationMode
{
@@ -132,16 +136,16 @@ namespace dbaui
private:
// dialog controls
- RadioButton* m_pRB_CreateDatabase;
- RadioButton* m_pRB_OpenExistingDatabase;
- RadioButton* m_pRB_ConnectDatabase;
+ VclPtr<RadioButton> m_pRB_CreateDatabase;
+ VclPtr<RadioButton> m_pRB_OpenExistingDatabase;
+ VclPtr<RadioButton> m_pRB_ConnectDatabase;
- FixedText* m_pFT_EmbeddedDBLabel;
- ListBox* m_pEmbeddedDBType;
+ VclPtr<FixedText> m_pFT_EmbeddedDBLabel;
+ VclPtr<ListBox> m_pEmbeddedDBType;
- FixedText* m_pFT_DocListLabel;
- OpenDocumentListBox* m_pLB_DocumentList;
- OpenDocumentButton* m_pPB_OpenDatabase;
+ VclPtr<FixedText> m_pFT_DocListLabel;
+ VclPtr<OpenDocumentListBox> m_pLB_DocumentList;
+ VclPtr<OpenDocumentButton> m_pPB_OpenDatabase;
// state
DocumentDescriptor m_aBrowsedDocument;