diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-23 18:33:43 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-23 19:20:03 +0300 |
| commit | 708fc1c187986796861c4dcecba2861ce272dd57 (patch) | |
| tree | eddd1b2260db90b6727e69b977a4f48922b6b6b2 /sw/source/uibase | |
| parent | f74a6338b3897df49f3041e7ce33453eaba9e2e5 (diff) | |
fdo#82577, fdo#82579: Handle Cursor
Put the vcl Cursor in the vcl namespace. Avoids collision with the Xlib Cursor
typedef and some ancient Carbon (?) Cursor typedef on OS X.
Change-Id: I7af770c522b5774c87f58cc079ced9fc1bcc88b0
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/docvw/AnnotationWin.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/lingu/hhcwrp.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 1a0692146548..403906adba7d 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -77,7 +77,7 @@ void SwAnnotationWin::SetPostItText() { //If the cursor was visible, then make it visible again after //changing text, e.g. fdo#33599 - Cursor *pCursor = GetOutlinerView()->GetEditView().GetCursor(); + vcl::Cursor *pCursor = GetOutlinerView()->GetEditView().GetCursor(); bool bCursorVisible = pCursor && pCursor->IsVisible(); //If the new text is the same as the old text, keep the same insertion diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 941ca804710d..b83dd99f9f46 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -123,7 +123,7 @@ SwHHCWrapper::~SwHHCWrapper() // I.e. we like to check those too. if ( IsDrawObj() /*&& bLastRet*/ && m_pView->GetWrtShell().HasDrawView() ) { - Cursor *pSave = m_pView->GetWindow()->GetCursor(); + vcl::Cursor *pSave = m_pView->GetWindow()->GetCursor(); { SwKeepConversionDirectionStateContext aContext; |