diff options
Diffstat (limited to 'dbaccess/source/ui/inc')
70 files changed, 306 insertions, 256 deletions
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 704ea76c6068..f407b70bc918 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -34,12 +34,12 @@ namespace dbaui */ class OCollectionView : public ModalDialog { - FixedText* m_pFTCurrentPath; - PushButton* m_pNewFolder; - PushButton* m_pUp; - SvtFileView* m_pView; - Edit* m_pName; - PushButton* m_pPB_OK; + VclPtr<FixedText> m_pFTCurrentPath; + VclPtr<PushButton> m_pNewFolder; + VclPtr<PushButton> m_pUp; + VclPtr<SvtFileView> m_pView; + VclPtr<Edit> m_pName; + VclPtr<PushButton> m_pPB_OK; ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; bool m_bCreateForm; @@ -57,7 +57,7 @@ namespace dbaui ,const OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); virtual ~OCollectionView(); - + virtual void dispose() SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> getSelectedFolder() const { return m_xContent;} OUString getName() const; }; diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index b09d6ff6e030..583481a7d7b2 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -55,7 +55,6 @@ namespace dbaui public: OColumnControlWindow(vcl::Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); - virtual ~OColumnControlWindow(); void setConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xCon); diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx index 6ae780d4705a..f5bef2a5d5d9 100644 --- a/dbaccess/source/ui/inc/ConnectionLine.hxx +++ b/dbaccess/source/ui/inc/ConnectionLine.hxx @@ -22,6 +22,7 @@ #include <tools/gen.hxx> #include "ConnectionLineData.hxx" #include <functional> +#include <vcl/vclptr.hxx> class OutputDevice; namespace dbaui @@ -38,7 +39,7 @@ namespace dbaui class OTableConnection; class OConnectionLine { - OTableConnection* m_pTabConn; + VclPtr<OTableConnection> m_pTabConn; OConnectionLineDataRef m_pData; Point m_aSourceConnPos, @@ -72,7 +73,7 @@ namespace dbaui /// draws a connectionline object on outputdevice struct TConnectionLineDrawFunctor : ::std::unary_function<OConnectionLine*,void> { - OutputDevice* pDevice; + VclPtr<OutputDevice> pDevice; TConnectionLineDrawFunctor(OutputDevice* _pDevice) { pDevice = _pDevice; diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index fb63317073f6..8df3cf848f34 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <cppuhelper/implbase2.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <vcl/vclptr.hxx> namespace dbaui { @@ -35,7 +36,7 @@ namespace dbaui class OConnectionLineAccess : public VCLXAccessibleComponent , public OConnectionLineAccess_BASE { - const OTableConnection* m_pLine; // the window which I should give accessibility to + VclPtr<const OTableConnection> m_pLine; // the window which I should give accessibility to protected: /** this function is called upon disposing the component */ diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index d8913ed932fa..983bfc6d2183 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -65,40 +65,40 @@ namespace dbaui class OFieldDescControl : public TabPage { private: - OTableDesignHelpBar* pHelp; - vcl::Window* pLastFocusWindow; - vcl::Window* m_pActFocusWindow; - - FixedText* pDefaultText; - FixedText* pRequiredText; - FixedText* pAutoIncrementText; - FixedText* pTextLenText; - FixedText* pNumTypeText; - FixedText* pLengthText; - FixedText* pScaleText; - FixedText* pFormatText; - FixedText* pBoolDefaultText; - FixedText* m_pColumnNameText; - FixedText* m_pTypeText; - FixedText* m_pAutoIncrementValueText; - - OPropListBoxCtrl* pRequired; - OPropListBoxCtrl* pNumType; - OPropListBoxCtrl* pAutoIncrement; - OPropEditCtrl* pDefault; - OPropNumericEditCtrl* pTextLen; - OPropNumericEditCtrl* pLength; - OPropNumericEditCtrl* pScale; - OPropEditCtrl* pFormatSample; - OPropListBoxCtrl* pBoolDefault; - OPropColumnEditCtrl* m_pColumnName; - OPropListBoxCtrl* m_pType; - OPropEditCtrl* m_pAutoIncrementValue; - - PushButton* pFormat; - - ScrollBar* m_pVertScroll; - ScrollBar* m_pHorzScroll; + VclPtr<OTableDesignHelpBar> pHelp; + VclPtr<vcl::Window> pLastFocusWindow; + VclPtr<vcl::Window> m_pActFocusWindow; + + VclPtr<FixedText> pDefaultText; + VclPtr<FixedText> pRequiredText; + VclPtr<FixedText> pAutoIncrementText; + VclPtr<FixedText> pTextLenText; + VclPtr<FixedText> pNumTypeText; + VclPtr<FixedText> pLengthText; + VclPtr<FixedText> pScaleText; + VclPtr<FixedText> pFormatText; + VclPtr<FixedText> pBoolDefaultText; + VclPtr<FixedText> m_pColumnNameText; + VclPtr<FixedText> m_pTypeText; + VclPtr<FixedText> m_pAutoIncrementValueText; + + VclPtr<OPropListBoxCtrl> pRequired; + VclPtr<OPropListBoxCtrl> pNumType; + VclPtr<OPropListBoxCtrl> pAutoIncrement; + VclPtr<OPropEditCtrl> pDefault; + VclPtr<OPropNumericEditCtrl> pTextLen; + VclPtr<OPropNumericEditCtrl> pLength; + VclPtr<OPropNumericEditCtrl> pScale; + VclPtr<OPropEditCtrl> pFormatSample; + VclPtr<OPropListBoxCtrl> pBoolDefault; + VclPtr<OPropColumnEditCtrl> m_pColumnName; + VclPtr<OPropListBoxCtrl> m_pType; + VclPtr<OPropEditCtrl> m_pAutoIncrementValue; + + VclPtr<PushButton> pFormat; + + VclPtr<ScrollBar> m_pVertScroll; + VclPtr<ScrollBar> m_pHorzScroll; TOTypeInfoSP m_pPreviousType; short m_nPos; @@ -126,15 +126,15 @@ namespace dbaui void UpdateFormatSample(OFieldDescription* pFieldDescr); void ArrangeAggregates(); - void SetPosSize( Control** ppControl, long nRow, sal_uInt16 nCol ); + void SetPosSize( VclPtr<Control>& rControl, long nRow, sal_uInt16 nCol ); void ScrollAggregate(Control* pText, Control* pInput, Control* pButton, long nDeltaX, long nDeltaY); void ScrollAllAggregates(); 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: @@ -175,6 +175,7 @@ namespace dbaui public: OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar); virtual ~OFieldDescControl(); + virtual void dispose() SAL_OVERRIDE; void DisplayData(OFieldDescription* pFieldDescr ); diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index 2306dfef8d4b..11604c2e2fd3 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -21,6 +21,7 @@ #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <cppuhelper/implbase1.hxx> +#include <vcl/vclptr.hxx> namespace dbaui { @@ -32,7 +33,7 @@ namespace dbaui */ class OJoinDesignViewAccess : public VCLXAccessibleComponent, public OJoinDesignViewAccess_BASE { - OJoinTableView* m_pTableView; // the window which I should give accessibility to + VclPtr<OJoinTableView> m_pTableView; // the window which I should give accessibility to public: /** OJoinDesignViewAccess needs a valid view diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index bfbfc560544b..4fd57a929b86 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -51,7 +51,7 @@ namespace dbaui Fraction m_aZoom; ::dbtools::SQLExceptionInfo m_aExceptionInfo; - OAddTableDlg* m_pAddTableDialog; + VclPtr<OAddTableDlg> m_pAddTableDialog; ::std::unique_ptr< AddTableDialogContext > m_pDialogContext; Point m_aMinimumTableViewSize; diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index 7b29ddde90af..da50da1e20ac 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -33,8 +33,8 @@ namespace dbaui class OJoinDesignView : public ODataView { protected: - OScrollWindowHelper* m_pScrollWindow; // contains only the scrollbars - OJoinTableView* m_pTableView; // presents the upper window + VclPtr<OScrollWindowHelper> m_pScrollWindow; // contains only the scrollbars + VclPtr<OJoinTableView> m_pTableView; // presents the upper window OJoinController& m_rController; public: @@ -42,6 +42,7 @@ namespace dbaui OJoinController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~OJoinDesignView(); + virtual void dispose() SAL_OVERRIDE; // set the view readonly or not virtual void setReadOnly(bool _bReadOnly); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index f43cdd254baf..608c2d82dc98 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -23,6 +23,7 @@ #include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <vcl/scrbar.hxx> +#include <vcl/vclptr.hxx> #include <tools/rtti.hxx> #include <svtools/transfer.hxx> @@ -51,10 +52,10 @@ namespace dbaui class OJoinTableView; class OScrollWindowHelper : public vcl::Window { - ScrollBar m_aHScrollBar; - ScrollBar m_aVScrollBar; - vcl::Window* m_pCornerWindow; - OJoinTableView* m_pTableView; + VclPtr<ScrollBar> m_aHScrollBar; + VclPtr<ScrollBar> m_aVScrollBar; + VclPtr<vcl::Window> m_pCornerWindow; + VclPtr<OJoinTableView> m_pTableView; protected: virtual void Resize() SAL_OVERRIDE; @@ -62,14 +63,15 @@ namespace dbaui public: OScrollWindowHelper( vcl::Window* pParent); virtual ~OScrollWindowHelper(); + virtual void dispose() SAL_OVERRIDE; void setTableView(OJoinTableView* _pTableView); void resetRange(const Point& _aSize); // own methods - ScrollBar& GetHScrollBar() { return m_aHScrollBar; } - ScrollBar& GetVScrollBar() { return m_aVScrollBar; } + ScrollBar& GetHScrollBar() { return *m_aHScrollBar.get(); } + ScrollBar& GetVScrollBar() { return *m_aVScrollBar.get(); } }; @@ -80,11 +82,11 @@ namespace dbaui friend class OJoinMoveTabWinUndoAct; public: - typedef std::map<OUString, OTableWindow*> OTableWindowMap; + typedef std::map<OUString, VclPtr<OTableWindow> > OTableWindowMap; private: OTableWindowMap m_aTableMap; - ::std::vector<OTableConnection*> m_vTableConnection; + ::std::vector<VclPtr<OTableConnection> > m_vTableConnection; Idle m_aDragScrollIdle; Rectangle m_aDragRect; @@ -95,9 +97,9 @@ namespace dbaui Size m_aOutputSize; - OTableWindow* m_pDragWin; - OTableWindow* m_pSizingWin; - OTableConnection* m_pSelectedConn; + VclPtr<OTableWindow> m_pDragWin; + VclPtr<OTableWindow> m_pSizingWin; + VclPtr<OTableConnection> m_pSelectedConn; bool m_bTrackingInitiallyMoved; @@ -105,13 +107,14 @@ namespace dbaui DECL_LINK(OnDragScrollTimer, void*); protected: - OTableWindow* m_pLastFocusTabWin; - OJoinDesignView* m_pView; + VclPtr<OTableWindow> m_pLastFocusTabWin; + VclPtr<OJoinDesignView> m_pView; OJoinDesignViewAccess* m_pAccessible; public: OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView ); virtual ~OJoinTableView(); + virtual void dispose() SAL_OVERRIDE; // window override virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; @@ -180,7 +183,7 @@ namespace dbaui /** gives a read only access to the connection vector */ - const ::std::vector<OTableConnection*>& getTableConnections() const { return m_vTableConnection; } + const ::std::vector<VclPtr<OTableConnection> >& getTableConnections() const { return m_vTableConnection; } bool ExistsAConn(const OTableWindow* pFromWin) const; @@ -189,7 +192,7 @@ namespace dbaui @param _pFromWin the table for which connections should be found @return an iterator which can be used to travel all connections of the table */ - ::std::vector<OTableConnection*>::const_iterator getTableConnections(const OTableWindow* _pFromWin) const; + ::std::vector<VclPtr<OTableConnection> >::const_iterator getTableConnections(const OTableWindow* _pFromWin) const; /** how many connection belongs to single table @@ -290,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/LimitBox.hxx b/dbaccess/source/ui/inc/LimitBox.hxx index 5f9187a38bba..6ff436daa170 100644 --- a/dbaccess/source/ui/inc/LimitBox.hxx +++ b/dbaccess/source/ui/inc/LimitBox.hxx @@ -24,7 +24,6 @@ class LimitBox: public NumericBox { public: LimitBox( vcl::Window* pParent, WinBits nStyle ); - virtual ~LimitBox(); virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 2baba04ac840..04d2724f94f1 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -64,18 +64,19 @@ namespace dbaui NONE }; - Splitter m_aSplitter; + VclPtr<Splitter> m_aSplitter; ::com::sun::star::lang::Locale m_aLocale; - OUString m_sDecimalSep; + OUString m_sDecimalSep; - OSelectionBrowseBox* m_pSelectionBox; // presents the lower window + VclPtr<OSelectionBrowseBox> m_pSelectionBox; // presents the lower window ChildFocusState m_eChildFocus; - bool m_bInSplitHandler; + bool m_bInSplitHandler; public: OQueryDesignView(OQueryContainerWindow* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~OQueryDesignView(); + virtual void dispose() SAL_OVERRIDE; virtual bool isCutAllowed() SAL_OVERRIDE; virtual bool isPasteAllowed() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx index 6b19daedb287..a083b4cca893 100644 --- a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx +++ b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx @@ -30,16 +30,16 @@ public: QueryPropertiesDialog( vcl::Window* pParent, const bool bDistinct, const sal_Int64 nLimit ); virtual ~QueryPropertiesDialog(); - + virtual void dispose() SAL_OVERRIDE; bool getDistinct() const; sal_Int64 getLimit() const; private: - RadioButton* m_pRB_Distinct; - RadioButton* m_pRB_NonDistinct; + VclPtr<RadioButton> m_pRB_Distinct; + VclPtr<RadioButton> m_pRB_NonDistinct; - LimitBox* m_pLB_Limit; + VclPtr<LimitBox> m_pLB_Limit; }; diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index 5bac4fb4d2b0..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. @@ -58,7 +58,6 @@ namespace dbaui public: OQueryTableView(vcl::Window* pParent,OQueryDesignView* pView); - virtual ~OQueryTableView(); /// base class overwritten: create and delete windows /// (not really delete, as it becomes an UndoAction) diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index 5d9cff71e4e4..ff447f27a476 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -28,10 +28,11 @@ namespace dbaui class OQueryTextView : public vcl::Window { friend class OQueryViewSwitch; - OSqlEdit* m_pEdit; + VclPtr<OSqlEdit> m_pEdit; public: OQueryTextView( OQueryContainerWindow* pParent ); virtual ~OQueryTextView(); + virtual void dispose() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx index e6f936a57617..ccf45802c394 100644 --- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx +++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx @@ -34,8 +34,8 @@ namespace dbaui class OQueryContainerWindow; class OQueryViewSwitch { - OQueryDesignView* m_pDesignView; - OQueryTextView* m_pTextView; + VclPtr<OQueryDesignView> m_pDesignView; + VclPtr<OQueryTextView> m_pTextView; bool m_bAddTableDialogWasVisible; // true if so public: OQueryViewSwitch(OQueryContainerWindow* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx index a04c08d5f9ca..12973d55b9f5 100644 --- a/dbaccess/source/ui/inc/RelationControl.hxx +++ b/dbaccess/source/ui/inc/RelationControl.hxx @@ -32,10 +32,10 @@ namespace dbaui class OTableListBoxControl { - ListBox* m_pLeftTable; - ListBox* m_pRightTable; + VclPtr<ListBox> m_pLeftTable; + VclPtr<ListBox> m_pRightTable; - ORelationControl* m_pRC_Tables; + VclPtr<ORelationControl> m_pRC_Tables; const OJoinTableView::OTableWindowMap* m_pTableMap; IRelationControlInterface* m_pParentDialog; OUString m_strCurrentLeft; diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index f7a97a9687f5..7f1559427eb9 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -33,7 +33,6 @@ namespace dbaui { public: ORelationDesignView(vcl::Window* pParent, ORelationController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); - virtual ~ORelationDesignView(); // set the statement for representation /// late construction diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 5950d64f7502..3435632c08f8 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -27,11 +27,11 @@ #include "JoinTableView.hxx" #include "RelControliFace.hxx" #include "moduledbu.hxx" +#include "RelationControl.hxx" namespace dbaui { class OJoinTableView; - class OTableListBoxControl; class ORelationDialog : public ModalDialog ,public IRelationControlInterface { @@ -39,16 +39,16 @@ namespace dbaui boost::scoped_ptr<OTableListBoxControl> m_xTableControl; OJoinTableView::OTableWindowMap* m_pTableMap; - RadioButton* m_pRB_NoCascUpd; - RadioButton* m_pRB_CascUpd; - RadioButton* m_pRB_CascUpdNull; - RadioButton* m_pRB_CascUpdDefault; - RadioButton* m_pRB_NoCascDel; - RadioButton* m_pRB_CascDel; - RadioButton* m_pRB_CascDelNull; - RadioButton* m_pRB_CascDelDefault; + VclPtr<RadioButton> m_pRB_NoCascUpd; + VclPtr<RadioButton> m_pRB_CascUpd; + VclPtr<RadioButton> m_pRB_CascUpdNull; + VclPtr<RadioButton> m_pRB_CascUpdDefault; + VclPtr<RadioButton> m_pRB_NoCascDel; + VclPtr<RadioButton> m_pRB_CascDel; + VclPtr<RadioButton> m_pRB_CascDelNull; + VclPtr<RadioButton> m_pRB_CascDelDefault; - OKButton* m_pPB_OK; + VclPtr<OKButton> m_pPB_OK; TTableConnectionData::value_type m_pConnData; TTableConnectionData::value_type m_pOrigConnData; @@ -61,6 +61,7 @@ namespace dbaui const TTableConnectionData::value_type& pConnectionData, bool bAllowTableSelect = false ); virtual ~ORelationDialog(); + virtual void dispose() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() SAL_OVERRIDE { return m_xConnection; } diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index 9b38d8fb47b6..da09f88bf900 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -32,7 +32,7 @@ namespace dbaui public OJoinTableView, public ::comphelper::OContainerListener { - OTableConnection* m_pExistingConnection; ///< is set when a connection was draged on an existing connection + VclPtr<OTableConnection> m_pExistingConnection; ///< is set when a connection was draged on an existing connection TTableConnectionData::value_type m_pCurrentlyTabConnData; ///< set when we creating a connection with more than one keycolumn ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; bool m_bInRemove; @@ -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 */ @@ -54,6 +54,7 @@ namespace dbaui public: ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView ); virtual ~ORelationTableView(); + virtual void dispose() SAL_OVERRIDE; virtual void RemoveTabWin( OTableWindow* pTabWin ) SAL_OVERRIDE; virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index 76428fb60b24..a027fa033e5a 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -41,7 +41,7 @@ namespace dbaui ::std::vector<OConnectionLine*> m_vConnLine; TTableConnectionData::value_type m_pData; - OJoinTableView* m_pParent; + VclPtr<OJoinTableView> m_pParent; bool m_bSelected; @@ -65,6 +65,7 @@ namespace dbaui eventually. */ virtual ~OTableConnection(); + virtual void dispose() SAL_OVERRIDE; OTableConnection& operator=( const OTableConnection& rConn ); diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index 4cabf5d7dd7e..97acc014cf04 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -47,7 +47,6 @@ namespace dbaui public: OTableRowView(vcl::Window* pParent); - virtual ~OTableRowView(); virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) = 0; virtual void SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData ) = 0; diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index 900c32374754..bcc79095dec8 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -33,7 +33,7 @@ namespace dbaui { private: OUString m_sHelpText; - MultiLineEdit* m_pTextWin; + VclPtr<MultiLineEdit> m_pTextWin; protected: virtual void Resize() SAL_OVERRIDE; @@ -41,6 +41,7 @@ namespace dbaui public: OTableDesignHelpBar( vcl::Window* pParent ); virtual ~OTableDesignHelpBar(); + virtual void dispose() SAL_OVERRIDE; void SetHelpText( const OUString& rText ); OUString GetHelpText() const { return m_sHelpText; } diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 72ece65cf6cc..7a1016f6753f 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -32,9 +32,9 @@ namespace dbaui class OTableEditorCtrl; class OTableBorderWindow : public vcl::Window { - Splitter m_aHorzSplitter; - OTableFieldDescWin* m_pFieldDescWin; - OTableEditorCtrl* m_pEditorCtrl; + VclPtr<Splitter> m_aHorzSplitter; + VclPtr<OTableFieldDescWin> m_pFieldDescWin; + VclPtr<OTableEditorCtrl> m_pEditorCtrl; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); void ArrangeChildren( long nSplitPos ,Rectangle& rRect); @@ -45,6 +45,7 @@ namespace dbaui OTableBorderWindow(vcl::Window* pParent); virtual ~OTableBorderWindow(); // Window overrides + virtual void dispose() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; @@ -62,7 +63,7 @@ namespace dbaui }; private: ::com::sun::star::lang::Locale m_aLocale; - OTableBorderWindow* m_pWin; + VclPtr<OTableBorderWindow> m_pWin; OTableController& m_rController; ChildFocusState m_eChildFocus; @@ -77,6 +78,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, OTableController& _rController); virtual ~OTableDesignView(); + virtual void dispose() SAL_OVERRIDE; // Window overrides virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 9a6992bd732c..d8e5f3d524d2 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -25,6 +25,7 @@ #include <rtl/ustring.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <rtl/ref.hxx> +#include <vcl/vclptr.hxx> #include <salhelper/simplereferenceobject.hxx> @@ -49,7 +50,7 @@ namespace dbaui OUString m_aFieldAlias; ///< column alias OUString m_aFunctionName;///< contains the function name (only if m_eFunctionType != FKT_NONE) - vcl::Window* m_pTabWindow; + VclPtr<vcl::Window> m_pTabWindow; sal_Int32 m_eDataType; sal_Int32 m_eFunctionType; diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index c16cba5d5568..5f80e75fcbf3 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -53,14 +53,15 @@ class OTableGrantControl : public ::svt::EditBrowseBox mutable TTablePrivilegeMap m_aPrivMap; OUString m_sUserName; - ::svt::CheckBoxControl* m_pCheckCell; - Edit* m_pEdit; + VclPtr<::svt::CheckBoxControl> m_pCheckCell; + VclPtr<Edit> m_pEdit; long m_nDataPos; ImplSVEvent * m_nDeactivateEvent; public: OTableGrantControl( vcl::Window* pParent, WinBits nBits); virtual ~OTableGrantControl(); + virtual void dispose() SAL_OVERRIDE; void UpdateTables(); void setUserName(const OUString& _sUserName); void setGrantUser(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable>& _xGrantUser); diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 004139a5cb95..2d1aac671a01 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -54,9 +54,9 @@ namespace dbaui friend class OTableWindowListBox; protected: // and the table itself (needed for me as I want to lock it as long as the window is alive) - FixedImage m_aTypeImage; - OTableWindowTitle m_aTitle; - OTableWindowListBox* m_pListBox; + VclPtr<FixedImage> m_aTypeImage; + VclPtr<OTableWindowTitle> m_aTitle; + VclPtr<OTableWindowListBox> m_pListBox; OTableWindowAccess* m_pAccessible; private: @@ -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 @@ -125,6 +125,7 @@ namespace dbaui public: virtual ~OTableWindow(); + virtual void dispose() SAL_OVERRIDE; // late Constructor, see also CreateListbox and FillListbox virtual bool Init(); @@ -148,7 +149,7 @@ namespace dbaui OUString GetComposedName() const { return m_pData->GetComposedName(); } OTableWindowListBox* GetListBox() const { return m_pListBox; } TTableWindowData::value_type GetData() const { return m_pData; } - OTableWindowTitle& GetTitleCtrl() { return m_aTitle; } + OTableWindowTitle& GetTitleCtrl() { return *m_aTitle.get(); } /** returns the name which should be used when displaying join or relations @return diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index 305f89838f20..c03871c2b7ea 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <cppuhelper/implbase2.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <vcl/vclptr.hxx> namespace dbaui { @@ -35,7 +36,7 @@ namespace dbaui class OTableWindowAccess : public VCLXAccessibleComponent , public OTableWindowAccess_BASE { - OTableWindow* m_pTable; // the window which I should give accessibility to + VclPtr<OTableWindow> m_pTable; // the window which I should give accessibility to ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getParentChild(sal_Int32 _nIndex); protected: diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index 13f30c6437fb..dfd8f4b39e21 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -30,7 +30,7 @@ namespace dbaui struct OJoinExchangeData { public: - OTableWindowListBox* pListBox; // the ListBox inside the same (you can get the TabWin and the WinName out of it) + VclPtr<OTableWindowListBox> pListBox; // the ListBox inside the same (you can get the TabWin and the WinName out of it) SvTreeListEntry* pEntry; // the entry, which was dragged or to which was dropped on OJoinExchangeData(OTableWindowListBox* pBox); @@ -56,7 +56,7 @@ namespace dbaui Timer m_aScrollTimer; Point m_aMousePos; - OTableWindow* m_pTabWin; + VclPtr<OTableWindow> m_pTabWin; ImplSVEvent * m_nDropEvent; ImplSVEvent * m_nUiEvent; OJoinDropData m_aDropInfo; @@ -78,6 +78,7 @@ namespace dbaui public: OTableWindowListBox(OTableWindow* pParent); virtual ~OTableWindowListBox(); + virtual void dispose() SAL_OVERRIDE; // DnD stuff virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx b/dbaccess/source/ui/inc/TableWindowTitle.hxx index 77ac0d4ce89f..3d009e3c603e 100644 --- a/dbaccess/source/ui/inc/TableWindowTitle.hxx +++ b/dbaccess/source/ui/inc/TableWindowTitle.hxx @@ -26,7 +26,7 @@ namespace dbaui class OTableWindow; class OTableWindowTitle : public FixedText { - OTableWindow* m_pTabWin; + VclPtr<OTableWindow> m_pTabWin; protected: virtual void Command(const CommandEvent& rEvt) SAL_OVERRIDE; @@ -38,6 +38,7 @@ namespace dbaui public: OTableWindowTitle( OTableWindow* pParent ); virtual ~OTableWindowTitle(); + virtual void dispose() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 7b0bf1651d2a..51977b928e4c 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -55,6 +55,7 @@ class ODbDataSourceAdministrationHelper; ,const ::com::sun::star::uno::Any& _aDataSourceName ); virtual ~OTableSubscriptionDialog(); + virtual void dispose() SAL_OVERRIDE; // forwards from ODbDataSourceAdministrationHelper void successfullyConnected(); diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 6e0cc172a7b7..35b81ad01ea4 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -196,7 +196,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; - vcl::Window* m_pParent; + VclPtr<vcl::Window> m_pParent; bool m_bAlreadyAsked; bool insertNewRow(); diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index a003fe898e3e..cc2df632a9f5 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -60,6 +60,7 @@ namespace dbaui ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); virtual ~OUserAdminDlg(); + virtual void dispose() SAL_OVERRIDE; virtual const SfxItemSet* getOutputSet() const SAL_OVERRIDE; virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index 4a91f47e05d5..ac7bde548eed 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -27,9 +27,9 @@ namespace dbaui { class OSplitterView : public vcl::Window { - Splitter* m_pSplitter; - vcl::Window* m_pLeft; - vcl::Window* m_pRight; + VclPtr<Splitter> m_pSplitter; + VclPtr<vcl::Window> m_pLeft; + VclPtr<vcl::Window> m_pRight; bool m_bVertical; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); @@ -40,6 +40,7 @@ namespace dbaui OSplitterView(vcl::Window* _pParent,bool _bVertical = true); virtual ~OSplitterView(); // Window overrides + virtual void dispose() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; void setSplitter(Splitter* _pSplitter); diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index e99fcf810529..008a9376ce01 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -34,19 +34,19 @@ namespace dbaui class OCopyTable : public OWizardPage { protected: - Edit* m_pEdTableName; - RadioButton* m_pRB_DefData; - RadioButton* m_pRB_Def; - RadioButton* m_pRB_View; - RadioButton* m_pRB_AppendData; - CheckBox* m_pCB_UseHeaderLine; - CheckBox* m_pCB_PrimaryColumn; - FixedText* m_pFT_KeyName; - Edit* m_pEdKeyName; + VclPtr<Edit> m_pEdTableName; + VclPtr<RadioButton> m_pRB_DefData; + VclPtr<RadioButton> m_pRB_Def; + VclPtr<RadioButton> m_pRB_View; + VclPtr<RadioButton> m_pRB_AppendData; + VclPtr<CheckBox> m_pCB_UseHeaderLine; + VclPtr<CheckBox> m_pCB_PrimaryColumn; + VclPtr<FixedText> m_pFT_KeyName; + VclPtr<Edit> m_pEdKeyName; sal_Int16 m_nOldOperation; - OWizColumnSelect* m_pPage2; - OWizNormalExtend* m_pPage3; + VclPtr<OWizColumnSelect> m_pPage2; + VclPtr<OWizNormalExtend> m_pPage3; bool m_bPKeyAllowed; bool m_bUseHeaderAllowed; @@ -66,6 +66,7 @@ namespace dbaui OCopyTable( vcl::Window * pParent ); virtual ~OCopyTable(); + virtual void dispose() SAL_OVERRIDE; bool IsOptionDefData() const { return m_pRB_DefData->IsChecked(); } bool IsOptionDef() const { return m_pRB_Def->IsChecked(); } diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 98f029c6c665..9b08f6b97f0d 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -35,12 +35,12 @@ namespace dbaui class OWizColumnSelect : public OWizardPage { - ListBox* m_pOrgColumnNames; // left side - PushButton* m_pColumn_RH; - PushButton* m_pColumns_RH; - PushButton* m_pColumn_LH; - PushButton* m_pColumns_LH; - ListBox* m_pNewColumnNames; // right side + VclPtr<ListBox> m_pOrgColumnNames; // left side + VclPtr<PushButton> m_pColumn_RH; + VclPtr<PushButton> m_pColumns_RH; + VclPtr<PushButton> m_pColumn_LH; + VclPtr<PushButton> m_pColumns_LH; + VclPtr<ListBox> m_pNewColumnNames; // right side DECL_LINK( ButtonClickHdl, Button * ); DECL_LINK( ListDoubleClickHdl, ListBox * ); @@ -80,6 +80,7 @@ namespace dbaui OWizColumnSelect(vcl::Window* pParent); virtual ~OWizColumnSelect(); + virtual void dispose() SAL_OVERRIDE; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WCOLUMNSELECT_HXX diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 32fa0a79e9cc..8a10f01cc795 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -238,11 +238,11 @@ namespace dbaui ODatabaseExport::TColumns m_vSourceColumns; ODatabaseExport::TColumnVector m_vSourceVec; - HelpButton* m_pbHelp; - CancelButton* m_pbCancel; - PushButton* m_pbPrev; - PushButton* m_pbNext; - PushButton* m_pbFinish; + VclPtr<HelpButton> m_pbHelp; + VclPtr<CancelButton> m_pbCancel; + VclPtr<PushButton> m_pbPrev; + VclPtr<PushButton> m_pbNext; + VclPtr<PushButton> m_pbFinish; OTypeInfoMap m_aTypeInfo; ::std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; @@ -323,6 +323,7 @@ namespace dbaui ); virtual ~OCopyTableWizard(); + virtual void dispose() SAL_OVERRIDE; virtual bool DeactivatePage() SAL_OVERRIDE; OKButton& GetOKButton() { return static_cast<OKButton&>(*m_pbFinish); } diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx index e9d19621457f..e51abe09a9bd 100644 --- a/dbaccess/source/ui/inc/WExtendPages.hxx +++ b/dbaccess/source/ui/inc/WExtendPages.hxx @@ -35,9 +35,7 @@ namespace dbaui { } - static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizHTMLExtend( _pParent, _rInput ); } - - virtual ~OWizHTMLExtend(){} + static VclPtr<OWizTypeSelect> Create( vcl::Window* _pParent, SvStream& _rInput ) { return VclPtr<OWizHTMLExtend>::Create( _pParent, _rInput ); } }; // Wizard Page: OWizRTFExtend class OWizRTFExtend : public OWizTypeSelect @@ -50,9 +48,7 @@ namespace dbaui { } - static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizRTFExtend( _pParent, _rInput ); } - - virtual ~OWizRTFExtend(){} + 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/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 3feb7dc28e01..61f71b56ce47 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -50,16 +50,16 @@ namespace dbaui // Name matching for data appending class OWizNameMatching : public OWizardPage { - FixedText *m_pTABLE_LEFT; - FixedText *m_pTABLE_RIGHT; - OColumnTreeBox *m_pCTRL_LEFT; // left side - OColumnTreeBox *m_pCTRL_RIGHT; // right side - PushButton *m_pColumn_up; - PushButton *m_pColumn_down; - PushButton *m_pColumn_up_right; - PushButton *m_pColumn_down_right; - PushButton *m_pAll; - PushButton *m_pNone; + VclPtr<FixedText> m_pTABLE_LEFT; + VclPtr<FixedText> m_pTABLE_RIGHT; + VclPtr<OColumnTreeBox> m_pCTRL_LEFT; // left side + VclPtr<OColumnTreeBox> m_pCTRL_RIGHT; // right side + VclPtr<PushButton> m_pColumn_up; + VclPtr<PushButton> m_pColumn_down; + VclPtr<PushButton> m_pColumn_up_right; + VclPtr<PushButton> m_pColumn_down_right; + VclPtr<PushButton> m_pAll; + VclPtr<PushButton> m_pNone; OUString m_sSourceText; OUString m_sDestText; Image m_aImgUp; @@ -79,7 +79,7 @@ namespace dbaui OWizNameMatching(vcl::Window* pParent); virtual ~OWizNameMatching(); - + virtual void dispose() SAL_OVERRIDE; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WNAMEMATCH_HXX diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index 9a30d7c311fb..6a5d3ab48eb1 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -29,12 +29,14 @@ namespace dbaui class OWizardPage : public TabPage { protected: - OCopyTableWizard* m_pParent; + VclPtr<OCopyTableWizard> m_pParent; bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode OWizardPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); public: + virtual ~OWizardPage(); + virtual void dispose() SAL_OVERRIDE; virtual void Reset ( ) = 0; virtual bool LeavePage() = 0; virtual OUString GetTitle() const = 0; diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index 5f587481e867..d86c70e5f07a 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -37,7 +37,7 @@ namespace dbaui class OWizTypeSelectControl : public OFieldDescControl { protected: - vcl::Window* m_pParentTabPage; + VclPtr<vcl::Window> m_pParentTabPage; virtual void ActivateAggregate( EControlType eType ) SAL_OVERRIDE; virtual void DeactivateAggregate( EControlType eType ) SAL_OVERRIDE; @@ -53,6 +53,7 @@ namespace dbaui public: OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL); virtual ~OWizTypeSelectControl(); + virtual void dispose() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() SAL_OVERRIDE; @@ -69,13 +70,15 @@ namespace dbaui bool _bSet = false); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - vcl::Window* m_pParentTabPage; + VclPtr<vcl::Window> m_pParentTabPage; public: OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER ) : MultiListBox(pParent,nStyle) , m_bPKey(false) , m_pParentTabPage(NULL) {} + virtual ~OWizTypeSelectList(); + virtual void dispose() SAL_OVERRIDE; void SetPKey(bool bPKey) { m_bPKey = bPKey; } void SetParentTabPage(vcl::Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; } }; @@ -91,13 +94,13 @@ namespace dbaui DECL_LINK( ColumnSelectHdl, MultiListBox* ); DECL_LINK( ButtonClickHdl, Button * ); protected: - OWizTypeSelectList *m_pColumnNames; - FixedText *m_pColumns; - OWizTypeSelectControl *m_pTypeControl; - FixedText *m_pAutoType; - FixedText *m_pAutoFt; - NumericField *m_pAutoEt; - PushButton *m_pAutoPb; + VclPtr<OWizTypeSelectList> m_pColumnNames; + VclPtr<FixedText> m_pColumns; + VclPtr<OWizTypeSelectControl> m_pTypeControl; + VclPtr<FixedText> m_pAutoType; + VclPtr<FixedText> m_pAutoFt; + VclPtr<NumericField> m_pAutoEt; + VclPtr<PushButton> m_pAutoPb; Image m_imgPKey; SvStream* m_pParserStream; // stream to read the tokens from or NULL @@ -118,12 +121,13 @@ namespace dbaui OWizTypeSelect(vcl::Window* pParent, SvStream* _pStream = NULL ); virtual ~OWizTypeSelect(); + virtual void dispose() SAL_OVERRIDE; inline void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; } 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/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 360ee70fa9eb..815f8c4d566a 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -58,15 +58,15 @@ namespace dbaui class OAddTableDlg : public ModelessDialog { - RadioButton* m_pCaseTables; - RadioButton* m_pCaseQueries; + VclPtr<RadioButton> m_pCaseTables; + VclPtr<RadioButton> m_pCaseQueries; - OTableTreeListBox* m_pTableList; - SvTreeListBox* m_pQueryList; + VclPtr<OTableTreeListBox> m_pTableList; + VclPtr<SvTreeListBox> m_pQueryList; boost::scoped_ptr< TableObjectListFacade > m_xCurrentList; - PushButton* m_pAddButton; - PushButton* m_pCloseButton; + VclPtr<PushButton> m_pAddButton; + VclPtr<PushButton> m_pCloseButton; IAddTableDialogContext& m_rContext; @@ -81,6 +81,7 @@ namespace dbaui vcl::Window* _pParent, IAddTableDialogContext& _rContext ); virtual ~OAddTableDlg(); + virtual void dispose() SAL_OVERRIDE; void DetermineAddTable() { m_pAddButton->Enable( impl_isAddAllowed() ); } void Update(); diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 108467ac78f8..2ba76b55466c 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -51,6 +51,7 @@ namespace dbaui ,const ::com::sun::star::uno::Any& _aDataSourceName); virtual ~AdvancedSettingsDialog(); + virtual void dispose() SAL_OVERRIDE; /// determines whether or not the given data source type has any advanced setting static bool doesHaveAnyAdvancedSettings( const OUString& _sURL ); diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index a214e462e08e..e68ff09847c4 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -46,10 +46,10 @@ namespace dbaui protected: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > m_xGrid; // our grid's UNO representation ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xMe; // our own UNO representation - DBTreeView* m_pTreeView; - Splitter* m_pSplitter; - mutable SbaGridControl* m_pVclControl; // our grid's VCL representation - vcl::Window* m_pStatus; + VclPtr<DBTreeView> m_pTreeView; + VclPtr<Splitter> m_pSplitter; + mutable VclPtr<SbaGridControl> m_pVclControl; // our grid's VCL representation + VclPtr<vcl::Window> m_pStatus; DECL_LINK( SplitHdl, void* ); // attribute access @@ -62,6 +62,7 @@ namespace dbaui IController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~UnoDataBrowserView(); + virtual void dispose() SAL_OVERRIDE; /// late construction void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel); @@ -93,7 +94,7 @@ namespace dbaui class BrowserViewStatusDisplay { protected: - UnoDataBrowserView* m_pView; + VclPtr<UnoDataBrowserView> m_pView; public: BrowserViewStatusDisplay( UnoDataBrowserView* _pView, const OUString& _rStatus ); diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx index 78f2da4f4a28..02641062174a 100644 --- a/dbaccess/source/ui/inc/charsetlistbox.hxx +++ b/dbaccess/source/ui/inc/charsetlistbox.hxx @@ -34,7 +34,6 @@ namespace dbaui { public: CharSetListBox( vcl::Window* _pParent, WinBits _nBits ); - virtual ~CharSetListBox(); void SelectEntryByIanaName( const OUString& _rIanaName ); bool StoreSelectedCharSet( SfxItemSet& _rSet, const sal_uInt16 _nItemId ); diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index cb9201328ada..4dff5e14ca9f 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -36,13 +36,14 @@ class OConnectionURLEdit : public Edit { ::dbaccess::ODsnTypeCollection* m_pTypeCollection; - FixedText* m_pForcedPrefix; + VclPtr<FixedText> m_pForcedPrefix; OUString m_sSaveValueNoPrefix; bool m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not public: OConnectionURLEdit(vcl::Window* pParent, WinBits _nBits,bool _bShowPrefix = false); virtual ~OConnectionURLEdit(); + virtual void dispose() SAL_OVERRIDE; public: // Edit overridables diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index f5d64a0f48cd..c5459ecbe15b 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> +#include <vcl/vclptr.hxx> namespace dbtools { @@ -38,10 +39,10 @@ namespace dbaui class ODatasourceConnector { protected: - vcl::Window* m_pErrorMessageParent; + VclPtr<vcl::Window> m_pErrorMessageParent; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xContext; - OUString m_sContextInformation; + m_xContext; + OUString m_sContextInformation; public: ODatasourceConnector( diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 7c437d6f1ab7..0510cd6fa10d 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -66,6 +66,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); virtual ~ODbAdminDialog(); + virtual void dispose() SAL_OVERRIDE; /** create and return an item set for use with the dialog. @param _pTypeCollection pointer to an <type>ODatasourceMap</type>. May be NULL, in this case diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 0a5b71da3809..cbeb1b6e540f 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -84,6 +84,7 @@ namespace dbaui ,WinBits nWinStyle=0 ,bool _bHandleEnterKey = false); virtual ~DBTreeListBox(); + virtual void dispose() SAL_OVERRIDE; void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } void setContextMenuProvider( IContextMenuProvider* _pContextMenuProvider ) { m_pContextMenuProvider = _pContextMenuProvider; } diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index d86e027a0092..ce534eba107d 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -76,6 +76,7 @@ public: ,const ::com::sun::star::uno::Any& _aDataSourceName ); virtual ~ODbTypeWizDialog(); + virtual void dispose() SAL_OVERRIDE; virtual const SfxItemSet* getOutputSet() const SAL_OVERRIDE; virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; @@ -92,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 734f967e7ef8..79926668b5d5 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -85,9 +85,9 @@ private: OUString m_sRM_FinalText; INetURLObject m_aDocURL; OUString m_sWorkPath; - OGeneralPageWizard* m_pGeneralPage; - OMySQLIntroPageSetup* m_pMySQLIntroPage; - OFinalDBPageSetup* m_pFinalPage; + VclPtr<OGeneralPageWizard> m_pGeneralPage; + VclPtr<OMySQLIntroPageSetup> m_pMySQLIntroPage; + VclPtr<OFinalDBPageSetup> m_pFinalPage; ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance @@ -102,6 +102,7 @@ public: ,const ::com::sun::star::uno::Any& _aDataSourceName ); virtual ~ODbTypeWizDialogSetup(); + virtual void dispose() SAL_OVERRIDE; virtual const SfxItemSet* getOutputSet() const SAL_OVERRIDE; virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; @@ -127,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; diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 401b46df7f8e..60a5d05f6b84 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -49,13 +49,13 @@ namespace dbaui OModuleClient m_aModuleClient; ::osl::Mutex m_aMutex; - MultiLineEditSyntaxHighlight* m_pSQL; - PushButton* m_pExecute; - ListBox* m_pSQLHistory; - VclMultiLineEdit* m_pStatus; - CheckBox* m_pShowOutput; - VclMultiLineEdit* m_pOutput; - PushButton* m_pClose; + VclPtr<MultiLineEditSyntaxHighlight> m_pSQL; + VclPtr<PushButton> m_pExecute; + VclPtr<ListBox> m_pSQLHistory; + VclPtr<VclMultiLineEdit> m_pStatus; + VclPtr<CheckBox> m_pShowOutput; + VclPtr<VclMultiLineEdit> m_pOutput; + VclPtr<PushButton> m_pClose; typedef ::std::deque< OUString > StringQueue; StringQueue m_aStatementHistory; // previous statements @@ -72,6 +72,7 @@ namespace dbaui vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn); virtual ~DirectSQLDialog(); + virtual void dispose() SAL_OVERRIDE; /// number of history entries sal_Int32 getHistorySize() const; diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index b6614cf62701..4bf07d1b3406 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -35,6 +35,7 @@ namespace dbaui public: SbaSbAttrDlg(vcl::Window * pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat, bool bRow = false); virtual ~SbaSbAttrDlg(); + virtual void dispose() SAL_OVERRIDE; virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; }; diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 5217e1fcb0a0..38c0f5b7c2d8 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -66,6 +66,7 @@ namespace dbaui const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); virtual ~OSaveAsDlg(); + virtual void dispose() SAL_OVERRIDE; OUString getName() const; OUString getCatalog() const; diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index e145cf7675ad..1d51ed11a534 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -39,11 +39,13 @@ namespace dbaui protected: DECL_LINK( CbClickHdl, Button * ); - MetricField* m_pMF_VALUE; - CheckBox* m_pCB_STANDARD; + VclPtr<MetricField> m_pMF_VALUE; + VclPtr<CheckBox> m_pCB_STANDARD; public: DlgSize( vcl::Window * pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard = -1 ); + virtual ~DlgSize(); + virtual void dispose() SAL_OVERRIDE; sal_Int32 GetValue(); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index f204c8c3cf89..bd595e012263 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -85,15 +85,15 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; SvtViewOptions m_aGeometrySettings; - ToolBox *m_pActions; - DbaIndexList *m_pIndexList; - FixedText *m_pIndexDetails; - FixedText *m_pDescriptionLabel; - FixedText *m_pDescription; - CheckBox *m_pUnique; - FixedText *m_pFieldsLabel; - IndexFieldsControl *m_pFields; - PushButton *m_pClose; + VclPtr<ToolBox> m_pActions; + VclPtr<DbaIndexList> m_pIndexList; + VclPtr<FixedText> m_pIndexDetails; + VclPtr<FixedText> m_pDescriptionLabel; + VclPtr<FixedText> m_pDescription; + VclPtr<CheckBox> m_pUnique; + VclPtr<FixedText> m_pFieldsLabel; + VclPtr<IndexFieldsControl> m_pFields; + VclPtr<PushButton> m_pClose; OIndexCollection* m_pIndexes; SvTreeListEntry* m_pPreviousSelection; @@ -111,6 +111,7 @@ namespace dbaui sal_Int32 _nMaxColumnsInIndex ); virtual ~DbaIndexDialog(); + virtual void dispose() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index fb1347d2b3eb..3f262156d129 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -40,8 +40,8 @@ namespace dbaui Link m_aModifyHdl; - ::svt::ListBoxControl* m_pSortingCell; - ::svt::ListBoxControl* m_pFieldNameCell; + VclPtr<::svt::ListBoxControl> m_pSortingCell; + VclPtr<::svt::ListBoxControl> m_pFieldNameCell; OUString m_sAscendingText; OUString m_sDescendingText; @@ -52,6 +52,7 @@ namespace dbaui public: IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle); virtual ~IndexFieldsControl(); + virtual void dispose() SAL_OVERRIDE; void Init(const ::com::sun::star::uno::Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix); diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index 7c597b24624e..a13383b71955 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <comphelper/namedvaluecollection.hxx> +#include <vcl/vclptr.hxx> namespace vcl { class Window; } namespace dbaui @@ -49,7 +50,7 @@ namespace dbaui m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > m_xDocumentUI; - vcl::Window* m_pDialogParent; + VclPtr<vcl::Window> m_pDialogParent; OUString m_sCurrentlyEditing; OUString m_sDataSourceName; diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index 2e10a99b82c6..f39d5281ffde 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -40,6 +40,7 @@ class OMarkableTreeListBox : public DBTreeListBox public: OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 ); virtual ~OMarkableTreeListBox(); + virtual void dispose() SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void CheckButtonHdl() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index edc37862a366..11db9808841f 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -52,11 +52,11 @@ namespace dbaui { protected: // the controls - ListBox* m_pAllParams; - Edit* m_pParam; - PushButton* m_pTravelNext; - OKButton* m_pOKBtn; - CancelButton* m_pCancelBtn; + VclPtr<ListBox> m_pAllParams; + VclPtr<Edit> m_pParam; + VclPtr<PushButton> m_pTravelNext; + VclPtr<OKButton> m_pOKBtn; + VclPtr<CancelButton> m_pCancelBtn; sal_Int32 m_nCurrentlySelected; @@ -84,6 +84,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext); virtual ~OParameterDialog(); + virtual void dispose() SAL_OVERRIDE; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getValues() const { return m_aFinalValues; } diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index 646c5e1488a9..5c1e151aedbe 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -42,14 +42,15 @@ namespace dbaui class OQueryContainerWindow : public ODataView { OQueryViewSwitch* m_pViewSwitch; - OBeamer* m_pBeamer; - Splitter* m_pSplitter; + VclPtr<OBeamer> m_pBeamer; + VclPtr<Splitter> m_pSplitter; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xBeamer; DECL_LINK( SplitHdl, void* ); public: OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); virtual ~OQueryContainerWindow(); + virtual void dispose() SAL_OVERRIDE; virtual void Construct() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index b9d76cccca97..06cc9510080f 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -67,19 +67,19 @@ namespace dbaui ,public ::svxform::OParseContextClient { private: - ListBox* m_pLB_WHEREFIELD1; - ListBox* m_pLB_WHERECOMP1; - Edit* m_pET_WHEREVALUE1; + VclPtr<ListBox> m_pLB_WHEREFIELD1; + VclPtr<ListBox> m_pLB_WHERECOMP1; + VclPtr<Edit> m_pET_WHEREVALUE1; - ListBox* m_pLB_WHERECOND2; - ListBox* m_pLB_WHEREFIELD2; - ListBox* m_pLB_WHERECOMP2; - Edit* m_pET_WHEREVALUE2; + VclPtr<ListBox> m_pLB_WHERECOND2; + VclPtr<ListBox> m_pLB_WHEREFIELD2; + VclPtr<ListBox> m_pLB_WHERECOMP2; + VclPtr<Edit> m_pET_WHEREVALUE2; - ListBox* m_pLB_WHERECOND3; - ListBox* m_pLB_WHEREFIELD3; - ListBox* m_pLB_WHERECOMP3; - Edit* m_pET_WHEREVALUE3; + VclPtr<ListBox> m_pLB_WHERECOND3; + VclPtr<ListBox> m_pLB_WHEREFIELD3; + VclPtr<ListBox> m_pLB_WHERECOMP3; + VclPtr<Edit> m_pET_WHEREVALUE3; OUString m_aSTR_COMPARE_OPERATORS; @@ -113,6 +113,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxCols ); virtual ~DlgFilterCrit(); + virtual void dispose() SAL_OVERRIDE; void BuildWherePart(); diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 007c42966a6a..46da94464b53 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -59,12 +59,12 @@ namespace dbaui class DlgOrderCrit : public ModalDialog { protected: - ListBox* m_pLB_ORDERFIELD1; - ListBox* m_pLB_ORDERVALUE1; - ListBox* m_pLB_ORDERFIELD2; - ListBox* m_pLB_ORDERVALUE2; - ListBox* m_pLB_ORDERFIELD3; - ListBox* m_pLB_ORDERVALUE3; + VclPtr<ListBox> m_pLB_ORDERFIELD1; + VclPtr<ListBox> m_pLB_ORDERVALUE1; + VclPtr<ListBox> m_pLB_ORDERFIELD2; + VclPtr<ListBox> m_pLB_ORDERVALUE2; + VclPtr<ListBox> m_pLB_ORDERFIELD3; + VclPtr<ListBox> m_pLB_ORDERVALUE3; OUString aSTR_NOENTRY; OUString m_sOrgOrder; @@ -72,8 +72,8 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ListBox* m_aColumnList[DOG_ROWS]; - ListBox* m_aValueList[DOG_ROWS]; + VclPtr<ListBox> m_aColumnList[DOG_ROWS]; + VclPtr<ListBox> m_aValueList[DOG_ROWS]; DECL_LINK( FieldListSelectHdl, ListBox * ); void EnableLines(); @@ -83,8 +83,9 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxCols); + virtual ~DlgOrderCrit(); + virtual void dispose() SAL_OVERRIDE; - virtual ~DlgOrderCrit(); void BuildOrderPart(); OUString GetOrderList( ) const; diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 0a05a3153b40..645525ca8874 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -28,7 +28,6 @@ namespace dbaui { public: OQueryView(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); - virtual ~OQueryView(); virtual bool isCutAllowed() = 0; virtual bool isPasteAllowed() = 0; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 443ed2791a48..25292c90231e 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -127,7 +127,7 @@ namespace dbaui virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - virtual FmGridControl* imp_CreateControl(vcl::Window* pParent, WinBits nStyle) SAL_OVERRIDE; + virtual VclPtr<FmGridControl> imp_CreateControl(vcl::Window* pParent, WinBits nStyle) SAL_OVERRIDE; #ifdef _MSC_VER typedef ::com::sun::star::frame::XStatusListener xstlist_type; typedef ::com::sun::star::uno::Reference< xstlist_type > xlistener_type; @@ -231,6 +231,7 @@ namespace dbaui public: SbaGridControl(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >,Window* pParent, FmXGridPeer* _pPeer, WinBits nBits = WB_TABSTOP); virtual ~SbaGridControl(); + virtual void dispose() SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void Select() SAL_OVERRIDE; @@ -273,7 +274,7 @@ namespace dbaui virtual void MouseButtonDown( const BrowserMouseEvent& rMEvt) SAL_OVERRIDE; // EditBrowseBox overridables - virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; + virtual VclPtr<BrowserHeader> imp_CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) SAL_OVERRIDE; // DbGridControl overridables diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index c941bdfa4c6e..2e5ac221ee65 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -43,7 +43,7 @@ namespace dbaui Timer m_timerUndoActionCreation; Link m_lnkTextModifyHdl; OUString m_strOrigText; // is restored on undo - OQueryTextView* m_pView; + VclPtr<OQueryTextView> m_pView; bool m_bAccelAction; // is set on cut, copy, paste bool m_bStopTimer; svtools::ColorConfig m_ColorConfig; @@ -68,6 +68,7 @@ namespace dbaui public: OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle = WB_LEFT | WB_VSCROLL |WB_BORDER); virtual ~OSqlEdit(); + virtual void dispose() SAL_OVERRIDE; // Edit overridables virtual void SetText(const OUString& rNewText) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 1f4200c827ad..51cc296b5624 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -45,9 +45,9 @@ namespace dbaui struct SQLMessageBox_Impl; class OSQLMessageBox : public ButtonDialog { - FixedImage m_aInfoImage; - FixedText m_aTitle; - FixedText m_aMessage; + VclPtr<FixedImage> m_aInfoImage; + VclPtr<FixedText> m_aTitle; + VclPtr<FixedText> m_aMessage; OUString m_sHelpURL; ::std::unique_ptr< SQLMessageBox_Impl > m_pImpl; @@ -90,6 +90,7 @@ public: const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); virtual ~OSQLMessageBox(); + virtual void dispose() SAL_OVERRIDE; private: void Construct( WinBits nStyle, MessageType eImage ); diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index 872b02e42734..89bcfc354e9c 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -39,6 +39,7 @@ namespace dbaui public: TextConnectionSettingsDialog( vcl::Window* _pParent, SfxItemSet& _rItems ); virtual ~TextConnectionSettingsDialog(); + virtual void dispose() SAL_OVERRIDE; /** initializes a set of PropertyStorage instaces, which are bound to the text-connection relevant items in our item sets @@ -48,8 +49,8 @@ namespace dbaui virtual short Execute() SAL_OVERRIDE; private: - ::std::unique_ptr< OTextConnectionHelper > m_pTextConnectionHelper; - OKButton *m_pOK; + VclPtr<OTextConnectionHelper> m_pTextConnectionHelper; + VclPtr<OKButton> m_pOK; SfxItemSet& m_rItems; private: diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx index e9307c66c599..66a2f48795c3 100644 --- a/dbaccess/source/ui/inc/undosqledit.hxx +++ b/dbaccess/source/ui/inc/undosqledit.hxx @@ -21,6 +21,7 @@ #include "GeneralUndo.hxx" #include "dbu_control.hrc" +#include <vcl/vclptr.hxx> namespace dbaui { @@ -29,7 +30,7 @@ namespace dbaui class OSqlEditUndoAct : public OCommentUndoAction { protected: - OSqlEdit* m_pOwner; + VclPtr<OSqlEdit> m_pOwner; OUString m_strNextText; virtual void Undo() SAL_OVERRIDE { ToggleText(); } diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index a544a2a98fee..18cb4322295c 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -100,11 +100,11 @@ namespace dbaui OUString m_sQueryCommand; // the command of the query currently loaded (if any) //OUString m_sToBeLoaded; // contains the element name which should be loaded if any - DBTreeView* m_pTreeView; - Splitter* m_pSplitter; - SvTreeList* m_pTreeModel; // contains the datasources of the registry - SvTreeListEntry* m_pCurrentlyDisplayed; - ImplSVEvent * m_nAsyncDrop; + VclPtr<DBTreeView> m_pTreeView; + VclPtr<Splitter> m_pSplitter; + SvTreeList* m_pTreeModel; // contains the datasources of the registry + SvTreeListEntry* m_pCurrentlyDisplayed; + ImplSVEvent * m_nAsyncDrop; sal_Int16 m_nBorder; // sal_True when border should be shown diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 7028db2c22e6..5a41729aee2c 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -71,7 +71,7 @@ protected: virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& _rConvertedValue, com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const com::sun::star::uno::Any& _rValue) throw(com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; // OGenericUnoDialog overridables - virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui |