diff options
Diffstat (limited to 'extensions/source/dbpilots')
-rw-r--r-- | extensions/source/dbpilots/commonpagesdbp.cxx | 39 | ||||
-rw-r--r-- | extensions/source/dbpilots/commonpagesdbp.hxx | 28 | ||||
-rw-r--r-- | extensions/source/dbpilots/controlwizard.cxx | 12 | ||||
-rw-r--r-- | extensions/source/dbpilots/controlwizard.hxx | 13 | ||||
-rw-r--r-- | extensions/source/dbpilots/gridwizard.cxx | 24 | ||||
-rw-r--r-- | extensions/source/dbpilots/gridwizard.hxx | 16 | ||||
-rw-r--r-- | extensions/source/dbpilots/groupboxwiz.cxx | 62 | ||||
-rw-r--r-- | extensions/source/dbpilots/groupboxwiz.hxx | 30 | ||||
-rw-r--r-- | extensions/source/dbpilots/listcombowizard.cxx | 47 | ||||
-rw-r--r-- | extensions/source/dbpilots/listcombowizard.hxx | 20 | ||||
-rw-r--r-- | extensions/source/dbpilots/unoautopilot.hxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/unoautopilot.inl | 4 |
12 files changed, 232 insertions, 65 deletions
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 5a9817164ca0..5c730601a17c 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -77,6 +77,19 @@ namespace dbp m_pDatasource->SetDropDownLineCount(10); } + OTableSelectionPage::~OTableSelectionPage() + { + disposeOnce(); + } + + void OTableSelectionPage::dispose() + { + m_pDatasourceLabel.clear(); + m_pDatasource.clear(); + m_pSearchDatabase.clear(); + m_pTable.clear(); + OControlWizardPage::dispose(); + } void OTableSelectionPage::ActivatePage() { @@ -383,6 +396,19 @@ namespace dbp { } + OMaybeListSelectionPage::~OMaybeListSelectionPage() + { + disposeOnce(); + } + + void OMaybeListSelectionPage::dispose() + { + m_pYes.clear(); + m_pNo.clear(); + m_pList.clear(); + OControlWizardPage::dispose(); + } + void OMaybeListSelectionPage::announceControls(RadioButton& _rYesButton, RadioButton& _rNoButton, ListBox& _rSelection) { m_pYes = &_rYesButton; @@ -453,6 +479,19 @@ namespace dbp m_pStoreWhere->SetDropDownLineCount(10); } + ODBFieldPage::~ODBFieldPage() + { + disposeOnce(); + } + + void ODBFieldPage::dispose() + { + m_pDescription.clear(); + m_pStoreYes.clear(); + m_pStoreNo.clear(); + m_pStoreWhere.clear(); + OMaybeListSelectionPage::dispose(); + } void ODBFieldPage::initializePage() { diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 8d9d9c801d3f..1ff1d51b4601 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -36,16 +36,18 @@ namespace dbp class OTableSelectionPage : public OControlWizardPage { protected: - FixedText *m_pDatasourceLabel; - ListBox *m_pDatasource; - PushButton *m_pSearchDatabase; - ListBox *m_pTable; + VclPtr<FixedText> m_pDatasourceLabel; + VclPtr<ListBox> m_pDatasource; + VclPtr<PushButton> m_pSearchDatabase; + VclPtr<ListBox> m_pTable; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext > m_xDSContext; public: OTableSelectionPage(OControlWizard* _pParent); + virtual ~OTableSelectionPage(); + virtual void dispose() SAL_OVERRIDE; protected: // TabPage overridables @@ -74,12 +76,14 @@ namespace dbp class OMaybeListSelectionPage : public OControlWizardPage { protected: - RadioButton* m_pYes; - RadioButton* m_pNo; - ListBox* m_pList; + VclPtr<RadioButton> m_pYes; + VclPtr<RadioButton> m_pNo; + VclPtr<ListBox> m_pList; public: OMaybeListSelectionPage( OControlWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription ); + virtual ~OMaybeListSelectionPage(); + virtual void dispose() SAL_OVERRIDE; protected: DECL_LINK( OnRadioSelected, RadioButton* ); @@ -105,13 +109,15 @@ namespace dbp class ODBFieldPage : public OMaybeListSelectionPage { protected: - FixedText* m_pDescription; - RadioButton* m_pStoreYes; - RadioButton* m_pStoreNo; - ListBox* m_pStoreWhere; + VclPtr<FixedText> m_pDescription; + VclPtr<RadioButton> m_pStoreYes; + VclPtr<RadioButton> m_pStoreNo; + VclPtr<ListBox> m_pStoreWhere; public: ODBFieldPage( OControlWizard* _pParent ); + virtual ~ODBFieldPage(); + virtual void dispose() SAL_OVERRIDE; protected: void setDescriptionText(const OUString& _rDesc) { m_pDescription->SetText(_rDesc); } diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index c3f8c025d20c..9128bbbf4589 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -86,6 +86,18 @@ namespace dbp OControlWizardPage::~OControlWizardPage() { + disposeOnce(); + } + + void OControlWizardPage::dispose() + { + m_pFormDatasourceLabel.clear(); + m_pFormDatasource.clear(); + m_pFormContentTypeLabel.clear(); + m_pFormContentType.clear(); + m_pFormTableLabel.clear(); + m_pFormTable.clear(); + OControlWizardPage_Base::dispose(); } OControlWizard* OControlWizardPage::getDialog() diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 879520db1c99..529e94bb25c4 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -57,12 +57,12 @@ namespace dbp class OControlWizardPage : public OControlWizardPage_Base { protected: - FixedText* m_pFormDatasourceLabel; - FixedText* m_pFormDatasource; - FixedText* m_pFormContentTypeLabel; - FixedText* m_pFormContentType; - FixedText* m_pFormTableLabel; - FixedText* m_pFormTable; + VclPtr<FixedText> m_pFormDatasourceLabel; + VclPtr<FixedText> m_pFormDatasource; + VclPtr<FixedText> m_pFormContentTypeLabel; + VclPtr<FixedText> m_pFormContentType; + VclPtr<FixedText> m_pFormTableLabel; + VclPtr<FixedText> m_pFormTable; protected: OControlWizard* getDialog(); @@ -75,6 +75,7 @@ namespace dbp public: OControlWizardPage( OControlWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~OControlWizardPage(); + virtual void dispose() SAL_OVERRIDE; protected: static void fillListBox( diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 882847b0f99f..aec86cd649ca 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -228,17 +228,16 @@ namespace dbp } - OWizardPage* OGridWizard::createPage(WizardState _nState) + VclPtr<TabPage> OGridWizard::createPage(WizardState _nState) { switch (_nState) { case GW_STATE_DATASOURCE_SELECTION: - return new OTableSelectionPage(this); + return VclPtr<OTableSelectionPage>::Create(this); case GW_STATE_FIELDSELECTION: - return new OGridFieldsSelection(this); + return VclPtr<OGridFieldsSelection>::Create(this); } - - return NULL; + return VclPtr<TabPage>(); } @@ -319,6 +318,21 @@ namespace dbp m_pSelFields->SetDoubleClickHdl(LINK(this, OGridFieldsSelection, OnEntryDoubleClicked)); } + OGridFieldsSelection::~OGridFieldsSelection() + { + disposeOnce(); + } + + void OGridFieldsSelection::dispose() + { + m_pExistFields.clear(); + m_pSelectOne.clear(); + m_pSelectAll.clear(); + m_pDeselectOne.clear(); + m_pDeselectAll.clear(); + m_pSelFields.clear(); + OGridPage::dispose(); + } void OGridFieldsSelection::ActivatePage() { diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index 91da2fd5bee7..9c66ae9e72cd 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -56,7 +56,7 @@ namespace dbp protected: // OWizardMachine overridables - virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE; + virtual VclPtr<TabPage> createPage( WizardState _nState ) SAL_OVERRIDE; virtual WizardState determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE; virtual void enterState( WizardState _nState ) SAL_OVERRIDE; virtual bool leaveState( WizardState _nState ) SAL_OVERRIDE; @@ -82,15 +82,17 @@ namespace dbp class OGridFieldsSelection : public OGridPage { protected: - ListBox *m_pExistFields; - PushButton *m_pSelectOne; - PushButton *m_pSelectAll; - PushButton *m_pDeselectOne; - PushButton *m_pDeselectAll; - ListBox *m_pSelFields; + VclPtr<ListBox> m_pExistFields; + VclPtr<PushButton> m_pSelectOne; + VclPtr<PushButton> m_pSelectAll; + VclPtr<PushButton> m_pDeselectOne; + VclPtr<PushButton> m_pDeselectAll; + VclPtr<ListBox> m_pSelFields; public: OGridFieldsSelection( OGridWizard* _pParent ); + virtual ~OGridFieldsSelection(); + virtual void dispose() SAL_OVERRIDE; protected: // TabPage overridables diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 2f165addf0cf..fbcaa668990b 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -69,24 +69,24 @@ namespace dbp } - OWizardPage* OGroupBoxWizard::createPage(::svt::WizardTypes::WizardState _nState) + VclPtr<TabPage> OGroupBoxWizard::createPage(::svt::WizardTypes::WizardState _nState) { switch (_nState) { case GBW_STATE_OPTIONLIST: - return new ORadioSelectionPage(this); + return VclPtr<ORadioSelectionPage>::Create(this); case GBW_STATE_DEFAULTOPTION: - return new ODefaultFieldSelectionPage(this); + return VclPtr<ODefaultFieldSelectionPage>::Create(this); case GBW_STATE_OPTIONVALUES: - return new OOptionValuesPage(this); + return VclPtr<OOptionValuesPage>::Create(this); case GBW_STATE_DBFIELD: - return new OOptionDBFieldPage(this); + return VclPtr<OOptionDBFieldPage>::Create(this); case GBW_STATE_FINALIZE: - return new OFinalizeGBWPage(this); + return VclPtr<OFinalizeGBWPage>::Create(this); } return NULL; @@ -207,11 +207,24 @@ namespace dbp implCheckMoveButtons(); m_pExistingRadios->EnableMultiSelection(true); - getDialog()->defaultButton(m_pMoveRight); + getDialog()->defaultButton(m_pMoveRight.get()); m_pExistingRadios->SetAccessibleRelationMemberOf(m_pExistingRadios); } + ORadioSelectionPage::~ORadioSelectionPage() + { + disposeOnce(); + } + + void ORadioSelectionPage::dispose() + { + m_pRadioName.clear(); + m_pMoveRight.clear(); + m_pMoveLeft.clear(); + m_pExistingRadios.clear(); + OGBWPage::dispose(); + } void ORadioSelectionPage::ActivatePage() { @@ -315,7 +328,7 @@ namespace dbp if (bUnfinishedInput) { if (0 == (m_pMoveRight->GetStyle() & WB_DEFBUTTON)) - getDialog()->defaultButton(m_pMoveRight); + getDialog()->defaultButton(m_pMoveRight.get()); } else { @@ -341,6 +354,18 @@ namespace dbp m_pDefSelection->SetStyle(WB_DROPDOWN); } + ODefaultFieldSelectionPage::~ODefaultFieldSelectionPage() + { + disposeOnce(); + } + + void ODefaultFieldSelectionPage::dispose() + { + m_pDefSelYes.clear(); + m_pDefSelNo.clear(); + m_pDefSelection.clear(); + OMaybeListSelectionPage::dispose(); + } void ODefaultFieldSelectionPage::initializePage() { @@ -388,6 +413,17 @@ namespace dbp m_pOptions->SetAccessibleRelationMemberOf(m_pOptions); } + OOptionValuesPage::~OOptionValuesPage() + { + disposeOnce(); + } + + void OOptionValuesPage::dispose() + { + m_pValue.clear(); + m_pOptions.clear(); + OGBWPage::dispose(); + } IMPL_LINK( OOptionValuesPage, OnOptionSelected, ListBox*, /*NOTINTERESTEDIN*/ ) { @@ -486,6 +522,16 @@ namespace dbp get(m_pName, "nameit"); } + OFinalizeGBWPage::~OFinalizeGBWPage() + { + disposeOnce(); + } + + void OFinalizeGBWPage::dispose() + { + m_pName.clear(); + OGBWPage::dispose(); + } void OFinalizeGBWPage::ActivatePage() { diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index e37840f88216..9413628bcc88 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -62,7 +62,7 @@ namespace dbp protected: // OWizardMachine overridables - virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE; + virtual VclPtr<TabPage> createPage( WizardState _nState ) SAL_OVERRIDE; virtual WizardState determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE; virtual void enterState( WizardState _nState ) SAL_OVERRIDE; virtual bool onFinish() SAL_OVERRIDE; @@ -94,13 +94,15 @@ namespace dbp class ORadioSelectionPage : public OGBWPage { protected: - Edit *m_pRadioName; - PushButton *m_pMoveRight; - PushButton *m_pMoveLeft; - ListBox *m_pExistingRadios; + VclPtr<Edit> m_pRadioName; + VclPtr<PushButton> m_pMoveRight; + VclPtr<PushButton> m_pMoveLeft; + VclPtr<ListBox> m_pExistingRadios; public: ORadioSelectionPage( OControlWizard* _pParent ); + virtual ~ORadioSelectionPage(); + virtual void dispose() SAL_OVERRIDE; protected: // TabPage overridables @@ -124,12 +126,14 @@ namespace dbp class ODefaultFieldSelectionPage : public OMaybeListSelectionPage { protected: - RadioButton *m_pDefSelYes; - RadioButton *m_pDefSelNo; - ListBox *m_pDefSelection; + VclPtr<RadioButton> m_pDefSelYes; + VclPtr<RadioButton> m_pDefSelNo; + VclPtr<ListBox> m_pDefSelection; public: ODefaultFieldSelectionPage( OControlWizard* _pParent ); + virtual ~ODefaultFieldSelectionPage(); + virtual void dispose() SAL_OVERRIDE; protected: // OWizardPage overridables @@ -145,8 +149,8 @@ namespace dbp class OOptionValuesPage : public OGBWPage { protected: - Edit *m_pValue; - ListBox *m_pOptions; + VclPtr<Edit> m_pValue; + VclPtr<ListBox> m_pOptions; StringArray m_aUncommittedValues; ::svt::WizardTypes::WizardState @@ -154,6 +158,8 @@ namespace dbp public: OOptionValuesPage( OControlWizard* _pParent ); + virtual ~OOptionValuesPage(); + virtual void dispose() SAL_OVERRIDE; protected: // TabPage overridables @@ -189,10 +195,12 @@ namespace dbp class OFinalizeGBWPage : public OGBWPage { protected: - Edit *m_pName; + VclPtr<Edit> m_pName; public: OFinalizeGBWPage( OControlWizard* _pParent ); + virtual ~OFinalizeGBWPage(); + virtual void dispose() SAL_OVERRIDE; protected: // TabPage overridables diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 6349c0796c58..0173584e3455 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -88,23 +88,23 @@ namespace dbp } - OWizardPage* OListComboWizard::createPage(WizardState _nState) + VclPtr<TabPage> OListComboWizard::createPage(WizardState _nState) { switch (_nState) { case LCW_STATE_DATASOURCE_SELECTION: - return new OTableSelectionPage(this); + return VclPtr<OTableSelectionPage>::Create(this); case LCW_STATE_TABLESELECTION: - return new OContentTableSelection(this); + return VclPtr<OContentTableSelection>::Create(this); case LCW_STATE_FIELDSELECTION: - return new OContentFieldSelection(this); + return VclPtr<OContentFieldSelection>::Create(this); case LCW_STATE_FIELDLINK: - return new OLinkFieldsPage(this); + return VclPtr<OLinkFieldsPage>::Create(this); case LCW_STATE_COMBODBFIELD: - return new OComboDBFieldPage(this); + return VclPtr<OComboDBFieldPage>::Create(this); } - return NULL; + return VclPtr<TabPage>(); } @@ -285,6 +285,16 @@ namespace dbp m_pSelectTable->SetSelectHdl(LINK(this, OContentTableSelection, OnTableSelected)); } + OContentTableSelection::~OContentTableSelection() + { + disposeOnce(); + } + + void OContentTableSelection::dispose() + { + m_pSelectTable.clear(); + OLCPage::dispose(); + } void OContentTableSelection::ActivatePage() { @@ -369,6 +379,18 @@ namespace dbp m_pSelectTableField->SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked)); } + OContentFieldSelection::~OContentFieldSelection() + { + disposeOnce(); + } + + void OContentFieldSelection::dispose() + { + m_pSelectTableField.clear(); + m_pDisplayedField.clear(); + m_pInfo.clear(); + OLCPage::dispose(); + } void OContentFieldSelection::ActivatePage() { @@ -439,6 +461,17 @@ namespace dbp m_pTableField->SetSelectHdl(LINK(this, OLinkFieldsPage, OnSelectionModified)); } + OLinkFieldsPage::~OLinkFieldsPage() + { + disposeOnce(); + } + + void OLinkFieldsPage::dispose() + { + m_pValueListField.clear(); + m_pTableField.clear(); + OLCPage::dispose(); + } void OLinkFieldsPage::ActivatePage() { diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index 6d4908cdda5c..ec28093479ce 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -68,7 +68,7 @@ namespace dbp protected: // OWizardMachine overridables - virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE; + virtual VclPtr<TabPage> createPage( WizardState _nState ) SAL_OVERRIDE; virtual WizardState determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE; virtual void enterState( WizardState _nState ) SAL_OVERRIDE; virtual bool leaveState( WizardState _nState ) SAL_OVERRIDE; @@ -108,10 +108,12 @@ namespace dbp class OContentTableSelection : public OLCPage { protected: - ListBox *m_pSelectTable; + VclPtr<ListBox> m_pSelectTable; public: OContentTableSelection( OListComboWizard* _pParent ); + virtual ~OContentTableSelection(); + virtual void dispose() SAL_OVERRIDE; protected: // TabPage overridables @@ -133,13 +135,15 @@ namespace dbp class OContentFieldSelection : public OLCPage { protected: - ListBox *m_pSelectTableField; - Edit *m_pDisplayedField; - FixedText *m_pInfo; + VclPtr<ListBox> m_pSelectTableField; + VclPtr<Edit> m_pDisplayedField; + VclPtr<FixedText> m_pInfo; public: OContentFieldSelection( OListComboWizard* _pParent ); + virtual ~OContentFieldSelection(); + virtual void dispose() SAL_OVERRIDE; protected: DECL_LINK( OnFieldSelected, ListBox* ); @@ -160,12 +164,14 @@ namespace dbp class OLinkFieldsPage : public OLCPage { protected: - ComboBox *m_pValueListField; - ComboBox *m_pTableField; + VclPtr<ComboBox> m_pValueListField; + VclPtr<ComboBox> m_pTableField; public: OLinkFieldsPage( OListComboWizard* _pParent ); + virtual ~OLinkFieldsPage(); + virtual void dispose() SAL_OVERRIDE; protected: // TabPage overridables diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index c70597fca7d5..0e669efb8af9 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -85,7 +85,7 @@ namespace dbp protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; }; diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl index 77f3cf6e795d..55e5861f3595 100644 --- a/extensions/source/dbpilots/unoautopilot.inl +++ b/extensions/source/dbpilots/unoautopilot.inl @@ -96,9 +96,9 @@ template <class TYPE, class SERVICEINFO> template <class TYPE, class SERVICEINFO> -Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(::vcl::Window* _pParent) +VclPtr<Dialog> OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(::vcl::Window* _pParent) { - return new TYPE(_pParent, m_xObjectModel, m_aContext); + return VclPtr<TYPE>::Create(_pParent, m_xObjectModel, m_aContext); } |