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/tabpages/macroass.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 'cui/source/tabpages/macroass.cxx')
| -rw-r--r-- | cui/source/tabpages/macroass.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 52788fb317e2..3af840679e2b 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -135,7 +135,7 @@ void _SfxMacroTabPage::EnableButtons() mpImpl->pAssignPB->Enable( false ); } -_SfxMacroTabPage::_SfxMacroTabPage(Window* pParent, const SfxItemSet& rAttrSet) +_SfxMacroTabPage::_SfxMacroTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "EventAssignPage", "cui/ui/eventassignpage.ui", &rAttrSet) { mpImpl = new _SfxMacroTabPage_Impl; @@ -433,7 +433,7 @@ void _SfxMacroTabPage::FillEvents() } } -SfxMacroTabPage::SfxMacroTabPage(Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet ) +SfxMacroTabPage::SfxMacroTabPage(vcl::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet ) : _SfxMacroTabPage( pParent, rSet ) { mpImpl->sStrEvent = get<FixedText>("eventft")->GetText(); @@ -456,18 +456,18 @@ SfxMacroTabPage::SfxMacroTabPage(Window* pParent, const Reference< XFrame >& rxD namespace { - SfxMacroTabPage* CreateSfxMacroTabPage( Window* pParent, const SfxItemSet& rAttrSet ) + SfxMacroTabPage* CreateSfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rAttrSet ) { return new SfxMacroTabPage( pParent, NULL, rAttrSet ); } } -SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SfxMacroTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return CreateSfxMacroTabPage(pParent, *rAttrSet); } -SfxMacroAssignDlg::SfxMacroAssignDlg(Window* pParent, +SfxMacroAssignDlg::SfxMacroAssignDlg(vcl::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "EventAssignDialog", "cui/ui/eventassigndialog.ui") |