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 /include/dbaccess | |
| 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 'include/dbaccess')
| -rw-r--r-- | include/dbaccess/dataview.hxx | 4 | ||||
| -rw-r--r-- | include/dbaccess/genericcontroller.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 448d864aba25..47292d09a7ac 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -32,7 +32,7 @@ class FixedLine; namespace dbaui { class IController; - class DBACCESS_DLLPUBLIC ODataView : public Window + class DBACCESS_DLLPUBLIC ODataView : public vcl::Window { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; // the service factory to work with @@ -42,7 +42,7 @@ namespace dbaui ::std::auto_ptr< ::svt::AcceleratorExecute> m_pAccel; public: - ODataView( Window* pParent, + ODataView( vcl::Window* pParent, IController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& , WinBits nStyle = 0 ); diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index e11098df228a..4bdd59c5d9af 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -65,7 +65,7 @@ namespace dbtools class SQLExceptionInfo; } -class Window; +namespace vcl { class Window; } namespace dbaui { class ODataView; @@ -424,7 +424,7 @@ namespace dbaui */ virtual void InvalidateAll(); // late construction - virtual bool Construct(Window* pParent); + virtual bool Construct(vcl::Window* pParent); /** get the layout manager @param _xFrame |