diff options
author | Michael Weghorn <m.weghorn@posteo.de> | 2025-05-08 23:28:12 +0200 |
---|---|---|
committer | Michael Weghorn <m.weghorn@posteo.de> | 2025-05-12 11:41:50 +0200 |
commit | c0bdc3daf157ce7929facc95aa1d71967909bde4 (patch) | |
tree | 20994183db773eb8a8d2d24eba6642a60c96e7db | |
parent | 0ff4c6619031582b6c520db90a17ed285973e1be (diff) |
shell: Drop "EnableATToolSupport" backend setting
The "EnableATToolSupport" setting/property that
can be queried from desktop backend implementations
doesn't seem to be used anywhere, so drop it.
There is still MiscSettings::GetEnableATToolSupport,
but that doesn't make use of the above.
Change-Id: I1ce64101d9795356e87e29c598dde25579a73111
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185071
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-rw-r--r-- | officecfg/registry/data/org/openoffice/VCL.xcu | 6 | ||||
-rw-r--r-- | shell/source/backends/desktopbe/desktopbackend.cxx | 3 | ||||
-rw-r--r-- | shell/source/backends/kf5be/kfaccess.cxx | 7 | ||||
-rw-r--r-- | shell/source/backends/kf5be/kfbackend.cxx | 19 |
4 files changed, 10 insertions, 25 deletions
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 2cdc2bd9ab3a..4ed4bdb528ba 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -19,12 +19,6 @@ <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd"> <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="VCL" oor:package="org.openoffice"> <node oor:name="Settings"> - <node oor:name="Accessibility" oor:op="replace"> - <prop oor:name="EnableATToolSupport" oor:type="xs:string" oor:op="replace"> - <value>false</value> - <value install:module="unixdesktop" oor:external="com.sun.star.configuration.backend.DesktopBackend EnableATToolSupport"/> - </prop> - </node> <node oor:name="DesktopManagement" oor:op="replace"> <prop oor:name="DisablePrinting" oor:type="xs:string" oor:op="replace"> <value>false</value> diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index f91383815644..7cefe025ed58 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -234,8 +234,7 @@ css::uno::Any Default::getPropertyValue(OUString const & PropertyName) return xdgDirectoryIfExists("Documents", true); } - if ( PropertyName == "EnableATToolSupport" || - PropertyName == "ExternalMailer" || + if ( PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight" || PropertyName == "SourceViewFontName" || PropertyName == "ooInetHTTPProxyName" || diff --git a/shell/source/backends/kf5be/kfaccess.cxx b/shell/source/backends/kf5be/kfaccess.cxx index 741dacdd36f4..e7d6cc60bd86 100644 --- a/shell/source/backends/kf5be/kfaccess.cxx +++ b/shell/source/backends/kf5be/kfaccess.cxx @@ -75,13 +75,6 @@ css::beans::Optional<css::uno::Any> getValue(std::u16string_view id) const OUString sFontName = toOUString(aFontName); return css::beans::Optional<css::uno::Any>(true, uno::Any(sFontName)); } - else if (id == u"EnableATToolSupport") - { - /* does not make much sense without an accessibility bridge */ - bool ATToolSupport = false; - return css::beans::Optional<css::uno::Any>(true, - uno::Any(OUString::boolean(ATToolSupport))); - } else if (id == u"WorkPathVariable") { QString aDocumentsDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)); diff --git a/shell/source/backends/kf5be/kfbackend.cxx b/shell/source/backends/kf5be/kfbackend.cxx index 836b3505b94c..0c3c77df119b 100644 --- a/shell/source/backends/kf5be/kfbackend.cxx +++ b/shell/source/backends/kf5be/kfbackend.cxx @@ -137,10 +137,10 @@ OString getExecutable() void readKDESettings(std::map<OUString, css::beans::Optional<css::uno::Any>>& rSettings) { const std::vector<OUString> aKeys - = { u"EnableATToolSupport"_ustr, u"ExternalMailer"_ustr, u"SourceViewFontHeight"_ustr, - u"SourceViewFontName"_ustr, u"WorkPathVariable"_ustr, u"ooInetHTTPProxyName"_ustr, - u"ooInetHTTPProxyPort"_ustr, u"ooInetHTTPSProxyName"_ustr, u"ooInetHTTPSProxyPort"_ustr, - u"ooInetNoProxy"_ustr, u"ooInetProxyType"_ustr }; + = { u"ExternalMailer"_ustr, u"SourceViewFontHeight"_ustr, u"SourceViewFontName"_ustr, + u"WorkPathVariable"_ustr, u"ooInetHTTPProxyName"_ustr, u"ooInetHTTPProxyPort"_ustr, + u"ooInetHTTPSProxyName"_ustr, u"ooInetHTTPSProxyPort"_ustr, u"ooInetNoProxy"_ustr, + u"ooInetProxyType"_ustr }; for (const OUString& aKey : aKeys) { @@ -218,12 +218,11 @@ void Service::setPropertyValue(OUString const&, css::uno::Any const&) css::uno::Any Service::getPropertyValue(OUString const& PropertyName) { - if (PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" - || PropertyName == "SourceViewFontHeight" || PropertyName == "SourceViewFontName" - || PropertyName == "WorkPathVariable" || PropertyName == "ooInetHTTPProxyName" - || PropertyName == "ooInetHTTPProxyPort" || PropertyName == "ooInetHTTPSProxyName" - || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy" - || PropertyName == "ooInetProxyType") + if (PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight" + || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" + || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort" + || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" + || PropertyName == "ooInetNoProxy" || PropertyName == "ooInetProxyType") { std::map<OUString, css::beans::Optional<css::uno::Any>>::iterator it = m_KDESettings.find(PropertyName); |