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

[Tomaž Vajngerl (via logerrit)]

 filter/source/pdf/impdialog.cxx    |    2 ++
 sw/sdi/_basesh.sdi                 |    1 +
 sw/source/uibase/shells/basesh.cxx |    7 +++++++
 3 files changed, 10 insertions(+)

New commits:
commit 520e076e2d1750c1cced7edf8356bf74664f0ecc
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Wed Jun 10 16:32:33 2020 +0200
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Jun 11 16:33:11 2020 +0200

    Make AccessibilityCheck experimental
    
    Change-Id: I3d9065a46483ea3f862f11ab6049256cb24c03ba
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96033
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 31f712c47edf..ec09ea39944b 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -516,6 +516,8 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(weld::Container* pPage, weld::DialogC
     , mxSlidesFt(m_xBuilder->weld_label("slides"))
     , mxSheetsFt(m_xBuilder->weld_label("selectedsheets"))
 {
+    if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
+        mxCbPDFUA->set_visible(false);
 }
 
 ImpPDFTabGeneralPage::~ImpPDFTabGeneralPage()
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi
index 9726bcd44f81..0c3362aebc43 100644
--- a/sw/sdi/_basesh.sdi
+++ b/sw/sdi/_basesh.sdi
@@ -590,6 +590,7 @@ interface BaseTextSelection
     SID_ACCESSIBILITY_CHECK
     [
         ExecMethod = ExecDlg;
+        StateMethod = GetState;
         DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
     ]
 }
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 64fd150e1700..2265ea10bb2a 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -91,6 +91,7 @@
 #include <svx/unobrushitemhelper.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/lok.hxx>
+#include <officecfg/Office/Common.hxx>
 
 #include <svx/svxdlg.hxx>
 
@@ -1851,6 +1852,12 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                 else
                     rSet.Put( SfxVisibilityItem( nWhich, false ) );
                 break;
+            case SID_ACCESSIBILITY_CHECK:
+            {
+                if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
+                    rSet.Put(SfxVisibilityItem(nWhich, false));
+            }
+            break;
         }
         nWhich = aIter.NextWhich();
     }