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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index e8ee21796624..c510207a8a63 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -275,7 +275,7 @@ namespace sdr if(bTargetIsWindow) { Window& rWindow = static_cast< Window& >(rmOutputDevice); - Cursor* pCursor = rWindow.GetCursor(); + vcl::Cursor* pCursor = rWindow.GetCursor(); if(pCursor && pCursor->IsVisible()) { @@ -405,7 +405,7 @@ namespace sdr if(bCursorWasEnabled) { Window& rWindow = static_cast< Window& >(rmOutputDevice); - Cursor* pCursor = rWindow.GetCursor(); + vcl::Cursor* pCursor = rWindow.GetCursor(); if(pCursor) { diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 8210d3ac41b1..ea649b056d94 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -809,7 +809,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) Window* pTEWin =pTextEditWin; SdrOutliner* pTEOutliner =pTextEditOutliner; OutlinerView* pTEOutlinerView=pTextEditOutlinerView; - Cursor* pTECursorMerker=pTextEditCursorMerker; + vcl::Cursor* pTECursorMerker=pTextEditCursorMerker; SdrUndoManager* pUndoEditUndoManager = 0; bool bNeedToUndoSavedRedoTextEdit(false); @@ -1383,7 +1383,7 @@ bool SdrObjEditView::ImpIsTextEditAllSelected() const void SdrObjEditView::ImpMakeTextCursorAreaVisible() { if (pTextEditOutlinerView!=NULL && pTextEditWin!=NULL) { - Cursor* pCsr=pTextEditWin->GetCursor(); + vcl::Cursor* pCsr=pTextEditWin->GetCursor(); if (pCsr!=NULL) { Size aSiz(pCsr->GetSize()); if (aSiz.Width()!=0 && aSiz.Height()!=0) { |