diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /dbaccess/source/ui/relationdesign | |
parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
4 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx index e315edb4ee36..27d31189a098 100644 --- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx +++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx @@ -26,7 +26,7 @@ namespace dbaui class ORelationTableWindow : public OTableWindow { public: - ORelationTableWindow( Window* pParent,const TTableWindowData::value_type& pTabWinData) + ORelationTableWindow( vcl::Window* pParent,const TTableWindowData::value_type& pTabWinData) : OTableWindow(pParent, pTabWinData) {} /** returns the name which should be used when displaying join or relations diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 0237d46212e4..184a20e27f0e 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -243,7 +243,7 @@ OUString ORelationController::getPrivateTitle( ) const return ::dbaui::getStrippedDatabaseName(getDataSource(),sName); } -bool ORelationController::Construct(Window* pParent) +bool ORelationController::Construct(vcl::Window* pParent) { setView( * new ORelationDesignView( pParent, *this, getORB() ) ); OJoinController::Construct(pParent); diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 02a826e88dd5..0305b4603736 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -ORelationDesignView::ORelationDesignView(Window* _pParent, ORelationController& _rController,const Reference< XComponentContext >& _rxContext) +ORelationDesignView::ORelationDesignView(vcl::Window* _pParent, ORelationController& _rController,const Reference< XComponentContext >& _rxContext) :OJoinDesignView( _pParent, _rController, _rxContext ) { } diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 84a84f5cc792..a5ce0cf4714e 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::accessibility; // class ORelationTableView -ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pView ) +ORelationTableView::ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView ) :OJoinTableView( pParent, pView ) , ::comphelper::OContainerListener(m_aMutex) ,m_pExistingConnection(NULL) |