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/table/tabledlg.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/table/tabledlg.cxx')
| -rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 2252272406e0..221211fd3446 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star; -SwFormatTablePage::SwFormatTablePage(Window* pParent, const SfxItemSet& rSet) +SwFormatTablePage::SwFormatTablePage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", &rSet) , m_aTextFilter(" .<>") , pTblData(0) @@ -370,7 +370,7 @@ void SwFormatTablePage::ModifyHdl(const Edit * pEdit) bModified = true; } -SfxTabPage* SwFormatTablePage::Create( Window* pParent, +SfxTabPage* SwFormatTablePage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwFormatTablePage( pParent, *rAttrSet ); @@ -709,7 +709,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) } //Description: Page column configuration -SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) +SwTableColumnPage::SwTableColumnPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "TableColumnPage", "modules/swriter/ui/tablecolumnpage.ui", &rSet) , pTblData(0) @@ -754,7 +754,7 @@ SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) { } -SfxTabPage* SwTableColumnPage::Create( Window* pParent, +SfxTabPage* SwTableColumnPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTableColumnPage( pParent, *rAttrSet ); @@ -1201,7 +1201,7 @@ void SwTableColumnPage::SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth) } -SwTableTabDlg::SwTableTabDlg(Window* pParent, SfxItemPool&, +SwTableTabDlg::SwTableTabDlg(vcl::Window* pParent, SfxItemPool&, const SfxItemSet* pItemSet, SwWrtShell* pSh) : SfxTabDialog(0, pParent, "TablePropertiesDialog", "modules/swriter/ui/tableproperties.ui", pItemSet) @@ -1243,7 +1243,7 @@ void SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) } } -SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet) +SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "TableTextFlowPage", "modules/swriter/ui/tabletextflowpage.ui", &rSet) , pShell(0) @@ -1315,7 +1315,7 @@ SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet) { } -SfxTabPage* SwTextFlowPage::Create( Window* pParent, +SfxTabPage* SwTextFlowPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTextFlowPage(pParent, *rAttrSet); |