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 /include/svx/svdedxv.hxx | |
| 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 'include/svx/svdedxv.hxx')
| -rw-r--r-- | include/svx/svdedxv.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index cd282eeb6ad6..1e6c1348d044 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -67,7 +67,7 @@ protected: SdrOutliner* pTextEditOutliner; // Na eben der Outliner fuers TextEdit OutlinerView* pTextEditOutlinerView; // die aktuelle View des Outliners Window* pTextEditWin; // passendes Win zu pTextEditOutlinerView - Cursor* pTextEditCursorMerker; // Zum Restaurieren des Cursors am jeweiligen Win + vcl::Cursor* pTextEditCursorMerker; // Zum Restaurieren des Cursors am jeweiligen Win ImpSdrEditPara* pEditPara; // Da hau' ich erstmal alles rein um kompatibel zu bleiben... SdrObject* pMacroObj; SdrPageView* pMacroPV; |