[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source

[Julien Nabet (via logerrit)]

 sfx2/source/doc/autoredactdialog.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 2d2d9e65104f0d6a1ebaed69fa604905be401438
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Wed Jul 22 15:42:29 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 30 12:50:26 2020 +0200

    tdf#130863: autoredact, disable useless checkboxes for regex
    
    Change-Id: Ic2bebfb24b8630c6135500a872eb6d6dee7935f2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99227
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit b53fbe19dfd39d27868d616afb4f743b1237229b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99201
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/doc/autoredactdialog.cxx b/sfx2/source/doc/autoredactdialog.cxx
index 95780bde8320..d95b44169eef 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -695,10 +695,18 @@ IMPL_LINK_NOARG(SfxAddTargetDialog, SelectTypeHdl, weld::ComboBox&, void)
         m_xLabelContent->set_visible(true);
         m_xContent->set_sensitive(true);
         m_xContent->set_visible(true);
-        m_xWholeWords->set_sensitive(true);
         m_xWholeWords->set_visible(true);
-        m_xCaseSensitive->set_sensitive(true);
         m_xCaseSensitive->set_visible(true);
+        if (m_xType->get_active_id() == "regex")
+        {
+            m_xWholeWords->set_sensitive(false);
+            m_xCaseSensitive->set_sensitive(false);
+        }
+        else
+        {
+            m_xWholeWords->set_sensitive(true);
+            m_xCaseSensitive->set_sensitive(true);
+        }
     }
 }