diff options
| -rw-r--r-- | include/svx/svdedxv.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index bacb8db8f8ab..1730e427539d 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -80,7 +80,7 @@ protected: std::unique_ptr<SdrOutliner> pTextEditOutliner; // outliner for the TextEdit OutlinerView* pTextEditOutlinerView; // current view of the outliners VclPtr<vcl::Window> pTextEditWin; // matching window to pTextEditOutlinerView - vcl::Cursor* pTextEditCursorMerker; // to restore the cursor in each window + vcl::Cursor* pTextEditCursorBuffer; // to restore the cursor in each window SdrObject* pMacroObj; SdrPageView* pMacroPV; VclPtr<vcl::Window> pMacroWin; diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index cbc6b661cc35..0f7361bbd6d8 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -78,7 +78,7 @@ void SdrObjEditView::ImpClearVars() pTextEditOutlinerView=nullptr; pTextEditPV=nullptr; pTextEditWin=nullptr; - pTextEditCursorMerker=nullptr; + pTextEditCursorBuffer=nullptr; bTextEditNewObj=false; bMacroDown=false; pMacroObj=nullptr; @@ -1157,7 +1157,7 @@ bool SdrObjEditView::SdrBeginTextEdit( aTextEditArea.Move(aPvOfs.X(),aPvOfs.Y()); aMinTextEditArea += pTextObj->GetGridOffset(); aMinTextEditArea.Move(aPvOfs.X(),aPvOfs.Y()); - pTextEditCursorMerker=pWin->GetCursor(); + pTextEditCursorBuffer=pWin->GetCursor(); maHdlList.SetMoveOutside(true); @@ -1352,7 +1352,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) SdrTextObj* pTEObj = mxTextEditObj.get(); vcl::Window* pTEWin =pTextEditWin; OutlinerView* pTEOutlinerView=pTextEditOutlinerView; - vcl::Cursor* pTECursorMerker=pTextEditCursorMerker; + vcl::Cursor* pTECursorBuffer=pTextEditCursorBuffer; SdrUndoManager* pUndoEditUndoManager = nullptr; bool bNeedToUndoSavedRedoTextEdit(false); @@ -1422,7 +1422,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) pTextEditWin=nullptr; SdrOutliner* pTEOutliner = pTextEditOutliner.release(); pTextEditOutlinerView=nullptr; - pTextEditCursorMerker=nullptr; + pTextEditCursorBuffer=nullptr; aTextEditArea=tools::Rectangle(); if (pTEOutliner!=nullptr) @@ -1564,7 +1564,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) if (!bTextEditDontDelete) delete pTEOutliner; else pTEOutliner->Clear(); if (pTEWin!=nullptr) { - pTEWin->SetCursor(pTECursorMerker); + pTEWin->SetCursor(pTECursorBuffer); } maHdlList.SetMoveOutside(false); if (eRet!=SdrEndTextEditKind::Unchanged) |