[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - svx/source

[Jan Holesovsky (via logerrit)]

 svx/source/svdraw/svdedxv.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 3ca663cc5398b7c50c2476bd6372f1f766c7133e
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Oct 4 00:09:15 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Oct 4 15:14:51 2019 +0200

    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/80171
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index b704e8d34780..c38ebfa75505 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1021,7 +1021,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();