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 /cui/source/inc/insdlg.hxx | |
| 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 'cui/source/inc/insdlg.hxx')
| -rw-r--r-- | cui/source/inc/insdlg.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index bd793a7b0ece..f845ea80289a 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -44,7 +44,7 @@ protected: const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& m_xStorage; comphelper::EmbeddedObjectContainer aCnt; - InsertObjectDialog_Impl(Window * pParent, const OString& rID, + InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); public: @@ -83,7 +83,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl { return m_pRbNewObject->IsChecked(); } public: - SvInsertOleDlg( Window* pParent, + SvInsertOleDlg( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, const SvObjectServerList* pServers = NULL ); virtual short Execute() SAL_OVERRIDE; @@ -106,7 +106,7 @@ private: OUString GetPlugInOptions() const { return m_pEdPluginsOptions->GetText(); } public: - SvInsertPlugInDialog(Window* pParent, + SvInsertPlugInDialog(vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); virtual ~SvInsertPlugInDialog(); virtual short Execute() SAL_OVERRIDE; @@ -139,9 +139,9 @@ private: void Init(); public: - SfxInsertFloatingFrameDialog(Window *pParent, + SfxInsertFloatingFrameDialog(vcl::Window *pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); - SfxInsertFloatingFrameDialog( Window* pParent, + SfxInsertFloatingFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); virtual short Execute() SAL_OVERRIDE; }; |