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 /reportdesign/source/ui/inc/DesignView.hxx | |
| 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 'reportdesign/source/ui/inc/DesignView.hxx')
| -rw-r--r-- | reportdesign/source/ui/inc/DesignView.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 18379fed6647..2b219ea3ee63 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -44,7 +44,7 @@ class KeyEvent; class MouseEvent; class Timer; -class Window; +namespace vcl { class Window; } namespace rptui { @@ -63,7 +63,7 @@ namespace rptui ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xReportComponent; OReportController& m_rReportController; OScrollWindowHelper m_aScrollWindow; - Window* m_pTaskPane; + vcl::Window* m_pTaskPane; PropBrw* m_pPropWin; OAddFieldWindow* m_pAddField; OSectionView* m_pCurrentView; @@ -95,7 +95,7 @@ namespace rptui virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - ODesignView(Window* pParent, + ODesignView(vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, OReportController& _rController); virtual ~ODesignView(); |