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/querydesign/QueryViewSwitch.cxx | |
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/querydesign/QueryViewSwitch.cxx')
-rw-r--r-- | dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index 4d97d18297d9..e506dbeddbbd 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -43,11 +43,11 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryContro OQueryViewSwitch::~OQueryViewSwitch() { { - boost::scoped_ptr<Window> aTemp(m_pTextView); + boost::scoped_ptr<vcl::Window> aTemp(m_pTextView); m_pTextView = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pDesignView); + boost::scoped_ptr<vcl::Window> aTemp(m_pDesignView); m_pDesignView = NULL; } } @@ -167,7 +167,7 @@ void OQueryViewSwitch::paste() OQueryContainerWindow* OQueryViewSwitch::getContainer() const { - Window* pDesignParent = getDesignView() ? getDesignView()->GetParent() : NULL; + vcl::Window* pDesignParent = getDesignView() ? getDesignView()->GetParent() : NULL; return static_cast< OQueryContainerWindow* >( pDesignParent ); } |