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 /sd/source/ui/dlg/tpaction.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 'sd/source/ui/dlg/tpaction.cxx')
| -rw-r--r-- | sd/source/ui/dlg/tpaction.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 38ebfe206e44..be80813b5957 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -76,7 +76,7 @@ using namespace com::sun::star::lang; * Constructor of the Tab dialog: appends the pages to the dialog */ SdActionDlg::SdActionDlg ( - ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) + vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) : SfxSingleTabDialog(pParent, *pAttr, "InteractionDialog", "modules/simpress/ui/interactiondialog.ui") , rOutAttrs(*pAttr) @@ -95,7 +95,7 @@ SdActionDlg::SdActionDlg ( /** * Action-TabPage */ -SdTPAction::SdTPAction(Window* pWindow, const SfxItemSet& rInAttrs) +SdTPAction::SdTPAction(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, "InteractionPage", "modules/simpress/ui/interactionpage.ui", &rInAttrs) , rOutAttrs(rInAttrs) @@ -358,7 +358,7 @@ int SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) return( LEAVE_PAGE ); } -SfxTabPage* SdTPAction::Create( Window* pWindow, +SfxTabPage* SdTPAction::Create( vcl::Window* pWindow, const SfxItemSet& rAttrs ) { return( new SdTPAction( pWindow, rAttrs ) ); @@ -410,7 +410,7 @@ void SdTPAction::OpenFileDialog() } else if (bMacro) { - Window* pOldWin = Application::GetDefDialogParent(); + vcl::Window* pOldWin = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); // choose macro dialog |