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 /chart2/source/controller/dialogs/dlg_DataSource.cxx | |
| parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
| download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip | |
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 'chart2/source/controller/dialogs/dlg_DataSource.cxx')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_DataSource.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index a0e810df8e05..bfa90c7647be 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -84,7 +84,7 @@ Reference< chart2::XChartTypeTemplate > DocumentChartTypeTemplateProvider::getCu class DataSourceTabControl : public TabControl { public: - DataSourceTabControl(Window* pParent); + DataSourceTabControl(vcl::Window* pParent); virtual bool DeactivatePage() SAL_OVERRIDE; @@ -95,7 +95,7 @@ private: bool m_bTogglingEnabled; }; -DataSourceTabControl::DataSourceTabControl(Window* pParent) +DataSourceTabControl::DataSourceTabControl(vcl::Window* pParent) : TabControl(pParent) , m_bTogglingEnabled(true) { @@ -124,7 +124,7 @@ enum DataSourceDialogPages TP_DATA_SOURCE = 2 }; -DataSourceDialog::DataSourceDialog(Window * pParent, +DataSourceDialog::DataSourceDialog(vcl::Window * pParent, const Reference< XChartDocument > & xChartDocument, const Reference< uno::XComponentContext > & xContext) : TabDialog(pParent, "DataRangeDialog", |