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/PaneDockingWindow.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/PaneDockingWindow.cxx')
| -rw-r--r-- | sd/source/ui/dlg/PaneDockingWindow.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 4c960db514eb..cc2dd553bcc4 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -38,7 +38,7 @@ using ::sfx2::TitledDockingWindow; namespace sd { PaneDockingWindow::PaneDockingWindow( - SfxBindings *_pBindings, SfxChildWindow *pChildWindow, ::Window* pParent, + SfxBindings *_pBindings, SfxChildWindow *pChildWindow, vcl::Window* pParent, const ResId& rResId, const OUString& rsTitle ) :TitledDockingWindow( _pBindings, pChildWindow, pParent, rResId ) { @@ -95,7 +95,7 @@ void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange) SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); if (pSplitWindow != NULL) { - const sal_uInt16 nId (pSplitWindow->GetItemId(static_cast< ::Window*>(this))); + const sal_uInt16 nId (pSplitWindow->GetItemId(static_cast< vcl::Window*>(this))); const sal_uInt16 nSetId (pSplitWindow->GetSet(nId)); // Because the PaneDockingWindow paints its own decoration, we have // to compensate the valid size range for that. |