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/macropg.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 'cui/source/inc/macropg.hxx')
| -rw-r--r-- | cui/source/inc/macropg.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 19ee9d2459f1..f151c36ba6e7 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -72,7 +72,7 @@ protected: bool bReadOnly, bDocModified, bAppEvents, bInitialized; EventDisplayNames aDisplayNames; - _SvxMacroTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet ); + _SvxMacroTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet ); void EnableButtons(); ::com::sun::star::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); @@ -97,7 +97,7 @@ class SvxMacroTabPage : public _SvxMacroTabPage { public: SvxMacroTabPage( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xNameReplace, @@ -112,7 +112,7 @@ typedef const sal_uInt16* (*GetTabPageRanges)(); // gives international Which-va class SvxMacroAssignSingleTabDialog : public SfxSingleTabDialog { public: - SvxMacroAssignSingleTabDialog(Window* pParent, const SfxItemSet& rOptionsSet); + SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet); private: DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * ); @@ -123,7 +123,7 @@ class SvxMacroAssignDlg : public SvxMacroAssignSingleTabDialog { public: SvxMacroAssignDlg( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& xNameReplace, |