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 /filter/source/flash | |
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 'filter/source/flash')
-rw-r--r-- | filter/source/flash/impswfdialog.cxx | 2 | ||||
-rw-r--r-- | filter/source/flash/impswfdialog.hxx | 4 | ||||
-rw-r--r-- | filter/source/flash/swfdialog.cxx | 2 | ||||
-rw-r--r-- | filter/source/flash/swfdialog.hxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx index 3de33b2bacf5..fe6b7fe7c485 100644 --- a/filter/source/flash/impswfdialog.cxx +++ b/filter/source/flash/impswfdialog.cxx @@ -28,7 +28,7 @@ using namespace com::sun::star::beans; // - ImpPDFDialog - -ImpSWFDialog::ImpSWFDialog( Window* pParent, Sequence< PropertyValue >& rFilterData ) : +ImpSWFDialog::ImpSWFDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFilterData ) : ModalDialog( pParent, "ImpSWFDialog", "filter/ui/impswfdialog.ui" ), maConfigItem( "Office.Common/Filter/Flash/Export/", &rFilterData ) diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx index 0726e2de3729..cb128448112e 100644 --- a/filter/source/flash/impswfdialog.hxx +++ b/filter/source/flash/impswfdialog.hxx @@ -36,7 +36,7 @@ class ResMgr; -class Window; +namespace vcl { class Window; } class ImpSWFDialog : public ModalDialog { @@ -55,7 +55,7 @@ private: DECL_LINK( OnToggleCheckbox, CheckBox* ); public: - ImpSWFDialog( Window* pParent, + ImpSWFDialog( vcl::Window* pParent, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData ); virtual ~ImpSWFDialog(); diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index e13fc4bd03b2..1b5f5fa287f4 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -146,7 +146,7 @@ Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames() -Dialog* SWFDialog::createDialog( Window* pParent ) +Dialog* SWFDialog::createDialog( vcl::Window* pParent ) { Dialog* pRet = NULL; diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index 793d6eea0f83..931432e33c4c 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -29,7 +29,7 @@ // - SWFDialog - -class Window; +namespace vcl { class Window; } class ResMgr; class SWFDialog : public ::svt::OGenericUnoDialog, @@ -54,7 +54,7 @@ protected: virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Dialog* createDialog( Window* pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* pParent ) SAL_OVERRIDE; virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; |