summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-10-04 00:09:15 +0200
committerJan Holesovsky <kendy@collabora.com>2019-10-04 15:14:22 +0200
commit9fc6029c9066701b36fc28e32cb540d520b578e2 (patch)
tree350742bd9ff6e6116b9a46bdd8ca5f8d552526c7
parentd97f27133ddc07ca224297a7525dcda6297077bc (diff)
tdf#127941: Don't be _that_ eager to assert(!IsTextEdit());
Turns out that this is still a condition that can happen regularly: * open Impress * click an object with a spelling mistake * press F7 to activate the spelling dialog (don't choose it from the menu) => assert() It is unclear how to sort this out correctly without refactoring, and also unclear how many other cases fail this condition, so let's change to SAL_WARN_IF for the moment. Change-Id: I97730cc93c86c279973702bbf4ddc922f1616c0b Reviewed-on: https://gerrit.libreoffice.org/80169 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r--svx/source/svdraw/svdedxv.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 0e018a5fe08b..fd0e64d5ca36 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1018,7 +1018,10 @@ bool SdrObjEditView::SdrBeginTextEdit(
bool bDontDeleteOutliner, bool bOnlyOneView,
bool bGrabFocus)
{
- assert(!IsTextEdit());
+ // FIXME cannot be an assert() yet, the code is not ready for that;
+ // eg. press F7 in Impress when you are inside a text object with spelling
+ // mistakes => boom; and it is unclear how to avoid that
+ SAL_WARN_IF(IsTextEdit(), "svx", "SdrBeginTextEdit called when IsTextEdit() is already true.");
// FIXME this encourages all sorts of bad habits and should be removed
SdrEndTextEdit();