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 /ucb | |
| 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 'ucb')
| -rw-r--r-- | ucb/workben/ucb/ucbdemo.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index 953a9d00f8a1..d8b38bac5fbc 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -86,7 +86,7 @@ using namespace com::sun::star; class MyOutWindow : public ListBox { public: - MyOutWindow( Window *pParent, WinBits nWinStyle ) + MyOutWindow( vcl::Window *pParent, WinBits nWinStyle ) : ListBox ( pParent, nWinStyle | WB_AUTOHSCROLL ) {} ~MyOutWindow() {} @@ -1668,7 +1668,7 @@ private: bool m_bSort; public: - MyWin( Window *pParent, WinBits nWinStyle, + MyWin( vcl::Window *pParent, WinBits nWinStyle, uno::Reference< lang::XMultiServiceFactory >& rxFactory, OUString const & rConfigurationKey1, OUString const & rConfigurationKey2 ); @@ -1682,7 +1682,7 @@ public: }; -MyWin::MyWin( Window *pParent, WinBits nWinStyle, +MyWin::MyWin( vcl::Window *pParent, WinBits nWinStyle, uno::Reference< lang::XMultiServiceFactory >& rxFactory, OUString const & rConfigurationKey1, OUString const & rConfigurationKey2 ) |