summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/inc
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-04-20 14:00:04 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-04-20 15:13:23 +0100
commitf12488405cdfd8555078d15807aafc5ffd1b037b (patch)
tree487b1ae6138d7f2c320a9846289ee7c422d5b8a3 /dbaccess/source/ui/inc
parentb8bc9023a3190cd93150fb14c2e37ad4deb8b435 (diff)
dbaccess: convert new to ::Create.
Also convert svtools' WizardShell::createPage. Change-Id: I09bd40ef4748aa2de7b49eeefc95be06b545ea05
Diffstat (limited to 'dbaccess/source/ui/inc')
-rw-r--r--dbaccess/source/ui/inc/FieldDescControl.hxx4
-rw-r--r--dbaccess/source/ui/inc/JoinTableView.hxx2
-rw-r--r--dbaccess/source/ui/inc/QueryTableView.hxx2
-rw-r--r--dbaccess/source/ui/inc/RelationTableView.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableWindow.hxx2
-rw-r--r--dbaccess/source/ui/inc/WExtendPages.hxx4
-rw-r--r--dbaccess/source/ui/inc/WTypeSelect.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbwiz.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbwizsetup.hxx2
9 files changed, 11 insertions, 11 deletions
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 6de1b7f4b8bc..983bfc6d2183 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -133,8 +133,8 @@ namespace dbaui
bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const;
void Contruct();
- OPropNumericEditCtrl* CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId);
- FixedText* CreateText(sal_uInt16 _nTextRes);
+ VclPtr<OPropNumericEditCtrl> CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId);
+ VclPtr<FixedText> CreateText(sal_uInt16 _nTextRes);
void InitializeControl(Control* _pControl,const OString& _sHelpId,bool _bAddChangeHandler);
protected:
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index 466d77c484e7..608c2d82dc98 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -293,7 +293,7 @@ namespace dbaui
@param _pData The data corresponding to the window.
@return The new TableWindow
*/
- virtual OTableWindow* createWindow(const TTableWindowData::value_type& _pData) = 0;
+ virtual VclPtr<OTableWindow> createWindow(const TTableWindowData::value_type& _pData) = 0;
/** determines whether the classes Init method should accept a query
name, or only table names */
diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx
index 962c71c39cf9..3b8d74618bd9 100644
--- a/dbaccess/source/ui/inc/QueryTableView.hxx
+++ b/dbaccess/source/ui/inc/QueryTableView.hxx
@@ -47,7 +47,7 @@ namespace dbaui
virtual void ConnDoubleClicked(OTableConnection* pConnection) SAL_OVERRIDE;
virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE;
- virtual OTableWindow* createWindow(const TTableWindowData::value_type& _pData) SAL_OVERRIDE;
+ virtual VclPtr<OTableWindow> createWindow(const TTableWindowData::value_type& _pData) SAL_OVERRIDE;
/** called when init fails at the tablewindowdata because the m_xTable
object could not provide columns, but no exception was thrown.
diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx
index 1ae96254e24e..da09f88bf900 100644
--- a/dbaccess/source/ui/inc/RelationTableView.hxx
+++ b/dbaccess/source/ui/inc/RelationTableView.hxx
@@ -40,7 +40,7 @@ namespace dbaui
virtual void ConnDoubleClicked( OTableConnection* pConnection ) SAL_OVERRIDE;
virtual void AddTabWin(const OUString& _rComposedName, const OUString& rWinName, bool bNewTable = false) SAL_OVERRIDE;
- virtual OTableWindow* createWindow(const TTableWindowData::value_type& _pData) SAL_OVERRIDE;
+ virtual VclPtr<OTableWindow> createWindow(const TTableWindowData::value_type& _pData) SAL_OVERRIDE;
/** determines whether the classes Init method should accept a query
name, or only table names */
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index 459184fa83fb..2d1aac671a01 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -82,7 +82,7 @@ namespace dbaui
virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- OTableWindowListBox* CreateListBox();
+ VclPtr<OTableWindowListBox> CreateListBox();
// called at FIRST Init
bool FillListBox();
// called at EACH Init
diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx
index 612dc4816d42..e51abe09a9bd 100644
--- a/dbaccess/source/ui/inc/WExtendPages.hxx
+++ b/dbaccess/source/ui/inc/WExtendPages.hxx
@@ -35,7 +35,7 @@ namespace dbaui
{
}
- static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizHTMLExtend( _pParent, _rInput ); }
+ static VclPtr<OWizTypeSelect> Create( vcl::Window* _pParent, SvStream& _rInput ) { return VclPtr<OWizHTMLExtend>::Create( _pParent, _rInput ); }
};
// Wizard Page: OWizRTFExtend
class OWizRTFExtend : public OWizTypeSelect
@@ -48,7 +48,7 @@ namespace dbaui
{
}
- static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizRTFExtend( _pParent, _rInput ); }
+ static VclPtr<OWizTypeSelect> Create( vcl::Window* _pParent, SvStream& _rInput ) { return VclPtr<OWizRTFExtend>::Create( _pParent, _rInput ); }
};
// Wizard Page: OWizNormalExtend
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index c2f7d8e3f53d..d86c70e5f07a 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -127,7 +127,7 @@ namespace dbaui
inline void setDuplicateName(bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; }
};
- typedef OWizTypeSelect* (*TypeSelectionPageFactory)( vcl::Window*, SvStream& );
+ typedef VclPtr<OWizTypeSelect> (*TypeSelectionPageFactory)( vcl::Window*, SvStream& );
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WTYPESELECT_HXX
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index b12d1031edab..ce534eba107d 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -93,7 +93,7 @@ public:
protected:
/// to override to create new pages
- virtual TabPage* createPage(WizardState _nState) SAL_OVERRIDE;
+ virtual VclPtr<TabPage> createPage(WizardState _nState) SAL_OVERRIDE;
virtual WizardState determineNextState(WizardState _nCurrentState) const SAL_OVERRIDE;
virtual bool leaveState(WizardState _nState) SAL_OVERRIDE;
virtual ::svt::IWizardPageController*
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index ce39f6f02282..79926668b5d5 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -128,7 +128,7 @@ public:
protected:
/// to override to create new pages
- virtual TabPage* createPage(WizardState _nState) SAL_OVERRIDE;
+ virtual VclPtr<TabPage> createPage(WizardState _nState) SAL_OVERRIDE;
virtual bool leaveState(WizardState _nState) SAL_OVERRIDE;
virtual void enterState(WizardState _nState) SAL_OVERRIDE;
virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const SAL_OVERRIDE;