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/func/fudraw.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/func/fudraw.cxx')
| -rw-r--r-- | sd/source/ui/func/fudraw.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 39228ef29f6e..99e63b280847 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -398,7 +398,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) pIPClient->SetSdrGrafObj(NULL); // wait-mousepointer while deleting object - WaitObject aWait( (Window*)mpViewShell->GetActiveWindow() ); + WaitObject aWait( (vcl::Window*)mpViewShell->GetActiveWindow() ); // delete object mpView->DeleteMarked(); } @@ -966,9 +966,9 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE mpWindow->OutputToScreenPixel(aLogicPix.BottomRight())); if (Help::IsBalloonHelpEnabled()) - Help::ShowBalloon( (Window*)mpWindow, rPosPixel, aScreenRect, aHelpText); + Help::ShowBalloon( (vcl::Window*)mpWindow, rPosPixel, aScreenRect, aHelpText); else if (Help::IsQuickHelpEnabled()) - Help::ShowQuickHelp( (Window*)mpWindow, aScreenRect, aHelpText); + Help::ShowQuickHelp( (vcl::Window*)mpWindow, aScreenRect, aHelpText); } return bSet; |