diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-08-18 08:26:48 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-18 09:34:55 +0100 |
commit | b5a0b00d494928482e4dd44395765c480c8ae252 (patch) | |
tree | e50d32b261b9d92334a4f2bd8a66ab94c100013b /extensions | |
parent | e2b9531e43d37677109aa13eb6e2ebf857961016 (diff) |
callcatcher: another round of resource ctor removals
Change-Id: Ic554fa7c1e549a0f39296836868b22ccf4c859d3
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/dbpilots/controlwizard.cxx | 25 | ||||
-rw-r--r-- | extensions/source/dbpilots/controlwizard.hxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/gridwizard.hxx | 5 | ||||
-rw-r--r-- | extensions/source/dbpilots/groupboxwiz.hxx | 6 | ||||
-rw-r--r-- | extensions/source/dbpilots/listcombowizard.hxx | 8 |
5 files changed, 8 insertions, 38 deletions
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index a60491a59e5e..d51aef5fd4ac 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -46,11 +46,8 @@ #include <tools/urlobj.hxx> #include <vcl/layout.hxx> - namespace dbp { - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::lang; @@ -68,9 +65,6 @@ namespace dbp using namespace ::comphelper; using namespace ::dbtools; - - //= OAccessRegulator - struct OAccessRegulator { friend class OControlWizardPage; @@ -79,22 +73,6 @@ namespace dbp OAccessRegulator() { } }; - - //= OControlWizardPage - - - OControlWizardPage::OControlWizardPage( OControlWizard* _pParent, const ResId& _rResId ) - :OControlWizardPage_Base( _pParent, _rResId ) - ,m_pFormDatasourceLabel(NULL) - ,m_pFormDatasource(NULL) - ,m_pFormContentTypeLabel(NULL) - ,m_pFormContentType(NULL) - ,m_pFormTableLabel(NULL) - ,m_pFormTable(NULL) - { - } - - OControlWizardPage::OControlWizardPage( OControlWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription ) :OControlWizardPage_Base( _pParent, rID, rUIXMLDescription ) ,m_pFormDatasourceLabel(NULL) @@ -106,18 +84,15 @@ namespace dbp { } - OControlWizardPage::~OControlWizardPage() { } - OControlWizard* OControlWizardPage::getDialog() { return static_cast< OControlWizard* >(GetParent()); } - const OControlWizard* OControlWizardPage::getDialog() const { return static_cast< OControlWizard* >(GetParent()); diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 725c0b3f2e96..6df51b8d3427 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -72,9 +72,7 @@ namespace dbp void setFormConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getFormConnection() const; - public: - OControlWizardPage( OControlWizard* _pParent, const ResId& _rResId ); OControlWizardPage( OControlWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~OControlWizardPage(); diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index e65e75d58506..d3aac825857e 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -68,22 +68,17 @@ namespace dbp void implApplySettings(); }; - //= OGridPage - class OGridPage : public OControlWizardPage { public: - OGridPage( OGridWizard* _pParent, const ResId& _rId ) : OControlWizardPage(_pParent, _rId) { } OGridPage( OGridWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription ) : OControlWizardPage(_pParent, _rID, _rUIXMLDescription) { } protected: OGridSettings& getSettings() { return static_cast<OGridWizard*>(getDialog())->getSettings(); } }; - //= OGridFieldsSelection - class OGridFieldsSelection : public OGridPage { protected: diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index 28bf05b810b5..a2e1c3e47ae2 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -79,8 +79,10 @@ namespace dbp class OGBWPage : public OControlWizardPage { public: - OGBWPage( OControlWizard* _pParent, const ResId& _rId ) : OControlWizardPage(_pParent, _rId) { } - OGBWPage( OControlWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription ) : OControlWizardPage(_pParent, _rID, _rUIXMLDescription) { } + OGBWPage(OControlWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription) + : OControlWizardPage(_pParent, _rID, _rUIXMLDescription) + { + } protected: OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); } diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index d7576093d036..a2ac8e136d00 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -82,14 +82,14 @@ namespace dbp void implApplySettings(); }; - //= OLCPage - class OLCPage : public OControlWizardPage { public: - OLCPage( OListComboWizard* _pParent, const ResId& _rId ) : OControlWizardPage(_pParent, _rId) { } - OLCPage( OListComboWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription ) : OControlWizardPage(_pParent, rID, rUIXMLDescription) { } + OLCPage(OListComboWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription) + : OControlWizardPage(_pParent, rID, rUIXMLDescription) + { + } protected: OListComboSettings& getSettings() { return static_cast<OListComboWizard*>(getDialog())->getSettings(); } |