summaryrefslogtreecommitdiff
path: root/sw/source/uibase/uiview/viewdraw.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /sw/source/uibase/uiview/viewdraw.cxx
parent7cbbefae224ab85343accb42b03f9431ec693a83 (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/uibase/uiview/viewdraw.cxx')
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 73d0106b3a5d..3169d2dc5c5a 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -165,7 +165,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
}
else if ( nSlotId == SID_FONTWORK_GALLERY_FLOATER )
{
- Window* pWin = &( m_pWrtShell->GetView().GetViewFrame()->GetWindow() );
+ vcl::Window* pWin = &( m_pWrtShell->GetView().GetViewFrame()->GetWindow() );
if ( pWin )
pWin->EnterWait();
@@ -506,7 +506,7 @@ bool SwView::EnterDrawTextMode(const Point& aDocPos)
// Enable DrawTextEditMode
-bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
+bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin,
bool bIsNewObj, bool bSetSelectionToStart)
{
SwWrtShell *pSh = &GetWrtShell();