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/uibase/dbui/mailmergechildwindow.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/uibase/dbui/mailmergechildwindow.cxx')
| -rw-r--r-- | sw/source/uibase/dbui/mailmergechildwindow.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx index f52bf6298d21..caaec215a799 100644 --- a/sw/source/uibase/dbui/mailmergechildwindow.cxx +++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; SFX_IMPL_FLOATINGWINDOW( SwMailMergeChildWindow, FN_MAILMERGE_CHILDWINDOW ) -SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent, +SwMailMergeChildWindow::SwMailMergeChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -64,7 +64,7 @@ SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent, } SwMailMergeChildWin::SwMailMergeChildWin(SfxBindings* _pBindings, - SfxChildWindow* pChild, Window *pParent) + SfxChildWindow* pChild, vcl::Window *pParent) : SfxFloatingWindow(_pBindings, pChild, pParent, "FloatingMMChild", "modules/swriter/ui/floatingmmchild.ui") { |