diff options
Diffstat (limited to 'shell/source')
| -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 |
3 files changed, 10 insertions, 19 deletions
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); |