diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-22 15:16:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-23 09:54:16 +0200 |
| commit | 2e8523f4083965085e19adac1e97eb3fb794d1db (patch) | |
| tree | 86d358e4e654d6a618fffea68b2c711084506fb7 /sd | |
| parent | 6fc92adb8f89e653fd733e77ab24b4fcffe6a909 (diff) | |
convert SdrEndTextEditKind to scoped enum
Change-Id: Ic331db66ad937eba6488e6a9bbb30131230a29d7
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/futext.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index e86d391214a3..17f798d04f63 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -155,7 +155,7 @@ void FuText::disposing() { if(mpView) { - if(mpView->SdrEndTextEdit() == SDRENDTEXTEDIT_DELETED) + if(mpView->SdrEndTextEdit() == SdrEndTextEditKind::Deleted) mxTextObj.reset( nullptr ); // reset the RequestHandler of the used Outliner to the handler of the document @@ -269,7 +269,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) if (mpView->IsTextEdit() && eHit != SdrHitKind::MarkedObject && eHit != SdrHitKind::Handle) { // finish text input - if(mpView->SdrEndTextEdit() == SDRENDTEXTEDIT_DELETED) + if(mpView->SdrEndTextEdit() == SdrEndTextEditKind::Deleted) { /* Bugfix from MBA: during a double click onto the unused? area in text mode, we get with the second click eHit = @@ -872,7 +872,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) else { // switch to selection - if (mpView->SdrEndTextEdit() == SDRENDTEXTEDIT_DELETED) + if (mpView->SdrEndTextEdit() == SdrEndTextEditKind::Deleted) { mxTextObj.reset(nullptr); } @@ -1330,7 +1330,7 @@ bool FuText::cancel() { if ( mpView->IsTextEdit() ) { - if(mpView->SdrEndTextEdit() == SDRENDTEXTEDIT_DELETED) + if(mpView->SdrEndTextEdit() == SdrEndTextEditKind::Deleted) mxTextObj.reset(nullptr); mpView->SetCurrentObj(OBJ_TEXT); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 80cb4f18baf7..301d202ca1fb 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -792,7 +792,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally) } else { - eKind = SDRENDTEXTEDIT_UNCHANGED; + eKind = SdrEndTextEditKind::Unchanged; } } else if( xObj.is() && xObj->IsEmptyPresObj() ) |