diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-05-03 22:03:10 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-05-03 22:44:32 +0200 |
| commit | 72097be9ca128083ed5b1cf5a5166ea7419891c5 (patch) | |
| tree | 19c3b2a2091ccb61d463d7fba54e9dba36f6ec11 /svx | |
| parent | f5a89dac29f745527ed8c437d4a138ebd0f2f4f8 (diff) | |
svx: SdrObjEditView::SdrEndTextEdit() must be called after SdrBeginTextEdit()
... to prevent disasters with managing the UndoManager, so assert that.
Change-Id: Id577ea465e21e3d358b3ff0bb36de0af34e0b69d
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 0e7f9ec3543a..1552591e1b38 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -97,6 +97,7 @@ SdrObjEditView::SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut): SdrObjEditView::~SdrObjEditView() { pTextEditWin = nullptr; // so there's no ShowCursor in SdrEndTextEdit + assert(!IsTextEdit()); if (IsTextEdit()) SdrEndTextEdit(); delete pTextEditOutliner; @@ -707,6 +708,8 @@ bool SdrObjEditView::SdrBeginTextEdit( bool bDontDeleteOutliner, bool bOnlyOneView, bool bGrabFocus) { + assert(!IsTextEdit()); + // FIXME this encourages all sorts of bad habits and should be removed SdrEndTextEdit(); if( dynamic_cast< SdrTextObj* >( pObj ) == nullptr ) |