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 /sw/source/ui/dbui/mmoutputtypepage.cxx | |
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 'sw/source/ui/dbui/mmoutputtypepage.cxx')
-rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index ca442c0b786f..a587b1c9f21e 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -209,10 +209,10 @@ class SwSendWarningBox_Impl : public MessageDialog { VclMultiLineEdit *m_pDetailED; public: - SwSendWarningBox_Impl(Window* pParent, const OUString& rDetails); + SwSendWarningBox_Impl(vcl::Window* pParent, const OUString& rDetails); }; -SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const OUString& rDetails) +SwSendWarningBox_Impl::SwSendWarningBox_Impl(vcl::Window* pParent, const OUString& rDetails) : MessageDialog(pParent, "WarnEmailDialog", "modules/swriter/ui/warnemaildialog.ui") { get(m_pDetailED, "errors"); @@ -225,7 +225,7 @@ SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const OUString& rD #define ITEMID_TASK 1 #define ITEMID_STATUS 2 -SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConfigItem) : +SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem& rConfigItem) : ModelessDialog /*SfxModalDialog*/(pParent, "SendMailsDialog", "modules/swriter/ui/mmsendmails.ui"), m_pTransferStatus(get<FixedText>("transferstatus")), m_pPaused(get<FixedText>("paused")), |