diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-09-05 02:53:07 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-12-17 18:33:13 +0100 |
commit | 410bf59de02192c2daf1158b9de76ec0ebab4c56 (patch) | |
tree | be010e92b862f169076de979796075c925c3e576 /shell | |
parent | 6a53832080cf201e960113de8e1887d99e857606 (diff) |
kde5: remove older kde/tde plugins, and references to that
KDE4 is out of maintenance upstream since Nov. 2014, and binaries
provided by TDF have switched to KDE5 as the official backend.
Change-Id: I165465b56d3ba3a18912b203c06ae8fc6111c0c9
Reviewed-on: https://gerrit.libreoffice.org/60014
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'shell')
-rw-r--r-- | shell/Library_kde4be.mk | 32 | ||||
-rw-r--r-- | shell/Module_shell.mk | 6 | ||||
-rw-r--r-- | shell/source/backends/desktopbe/desktopbackend.cxx | 16 | ||||
-rw-r--r-- | shell/source/backends/kde4be/kde4access.cxx | 300 | ||||
-rw-r--r-- | shell/source/backends/kde4be/kde4access.hxx | 39 | ||||
-rw-r--r-- | shell/source/backends/kde4be/kde4backend.cxx | 180 | ||||
-rw-r--r-- | shell/source/backends/kde4be/kde4be1.component | 25 |
7 files changed, 4 insertions, 594 deletions
diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk deleted file mode 100644 index 45ca84c45e34..000000000000 --- a/shell/Library_kde4be.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Library_Library,kde4be1)) - -$(eval $(call gb_Library_use_sdk_api,kde4be1)) - -$(eval $(call gb_Library_use_externals,kde4be1,\ - boost_headers \ - kde4 \ -)) - -$(eval $(call gb_Library_use_libraries,kde4be1,\ - cppu \ - cppuhelper \ - sal \ -)) - -$(eval $(call gb_Library_set_componentfile,kde4be1,shell/source/backends/kde4be/kde4be1)) - -$(eval $(call gb_Library_add_exception_objects,kde4be1,\ - shell/source/backends/kde4be/kde4access \ - shell/source/backends/kde4be/kde4backend \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 6d54617f0268..48e0aaecdfb3 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -30,12 +30,6 @@ $(eval $(call gb_Module_add_targets,shell,\ endif endif -ifeq ($(ENABLE_KDE4),TRUE) -$(eval $(call gb_Module_add_targets,shell,\ - Library_kde4be \ -)) -endif - ifeq ($(ENABLE_KDE5),TRUE) $(eval $(call gb_Module_add_targets,shell,\ Library_kde5be \ diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 8cfaefc9f9c9..0860bcd421a1 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -296,20 +296,12 @@ css::uno::Reference< css::uno::XInterface > createInstance( current->getValueByName("system.desktop-environment") >>= desktop; } - OUString sTK = Application::GetToolkitName(); - // Fall back to the default if the specific backend is not available: css::uno::Reference< css::uno::XInterface > backend; - if ( desktop == "KDE4" ) { - if (!(sTK.startsWith("qt5") || sTK.startsWith("kde5"))) - backend = createBackend( - context, - "com.sun.star.configuration.backend.KDE4Backend"); - } else if ( desktop == "KDE5" ) { - if (!(sTK.startsWith("kde4"))) - backend = createBackend( - context, - "com.sun.star.configuration.backend.KDE5Backend"); + if ( desktop == "KDE5" ) { + backend = createBackend( + context, + "com.sun.star.configuration.backend.KDE5Backend"); } return backend.is() ? backend : static_cast< cppu::OWeakObject * >(new Default); diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx deleted file mode 100644 index fc27054cd895..000000000000 --- a/shell/source/backends/kde4be/kde4access.cxx +++ /dev/null @@ -1,300 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <sal/config.h> - -#include <QtGui/QFont> -#include <QtCore/QString> -#include <kemailsettings.h> -#include <kglobalsettings.h> -#include <kprotocolmanager.h> - -#include <com/sun/star/uno/Any.hxx> -#include <cppu/unotype.hxx> -#include <osl/diagnose.h> -#include <osl/file.h> -#include <rtl/string.h> -#include <rtl/ustring.hxx> - -#include "kde4access.hxx" - -#define SPACE ' ' -#define COMMA ',' -#define SEMI_COLON ';' - -namespace kde4access { - -namespace { - -namespace uno = css::uno ; - -} - -css::beans::Optional< css::uno::Any > getValue(OUString const & id) { - if ( id == "ExternalMailer" ) { - KEMailSettings aEmailSettings; - QString aClientProgram; - OUString sClientProgram; - - aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram ); - if ( aClientProgram.isEmpty() ) - aClientProgram = "kmail"; - else - aClientProgram = aClientProgram.section(SPACE, 0, 0); - sClientProgram = reinterpret_cast<const sal_Unicode *>(aClientProgram.utf16()); - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( sClientProgram ) ); - } else if (id == "SourceViewFontHeight") - { - QFont aFixedFont; - short nFontHeight; - - aFixedFont = KGlobalSettings::fixedFont(); - nFontHeight = aFixedFont.pointSize(); - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( nFontHeight ) ); - } else if (id == "SourceViewFontName") - { - QFont aFixedFont; - QString aFontName; - OUString sFontName; - - aFixedFont = KGlobalSettings::fixedFont(); - aFontName = aFixedFont.family(); - sFontName = reinterpret_cast<const sal_Unicode *>(aFontName.utf16()); - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( sFontName ) ); - } else if (id == "EnableATToolSupport") - { - /* does not make much sense without an accessibility bridge */ - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( OUString::boolean( false ) ) ); - } else if (id == "WorkPathVariable") - { - QString aDocumentsDir( KGlobalSettings::documentPath() ); - OUString sDocumentsDir; - OUString sDocumentsURL; - if ( aDocumentsDir.endsWith(QChar('/')) ) - aDocumentsDir.truncate ( aDocumentsDir.length() - 1 ); - sDocumentsDir = reinterpret_cast<const sal_Unicode *>(aDocumentsDir.utf16()); - osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData ); - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( sDocumentsURL ) ); - } else if (id == "ooInetFTPProxyName") - { - QString aFTPProxy; - switch ( KProtocolManager::proxyType() ) - { - case KProtocolManager::ManualProxy: // Proxies are manually configured - aFTPProxy = KProtocolManager::proxyFor( "FTP" ); - break; - case KProtocolManager::PACProxy: // A proxy configuration URL has been given - case KProtocolManager::WPADProxy: // A proxy should be automatically discovered - case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables -// In such cases, the proxy address is not stored in KDE, but determined dynamically. -// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind... -// The best we can do here is to ask the current value for a given address. - aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.libreoffice.org") ); - break; - default: // No proxy is used - break; - } - if ( !aFTPProxy.isEmpty() ) - { - KUrl aProxy(aFTPProxy); - OUString sProxy = reinterpret_cast<const sal_Unicode *>(aProxy.host().utf16()); - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( sProxy ) ); - } - } else if (id == "ooInetFTPProxyPort") - { - QString aFTPProxy; - switch ( KProtocolManager::proxyType() ) - { - case KProtocolManager::ManualProxy: // Proxies are manually configured - aFTPProxy = KProtocolManager::proxyFor( "FTP" ); - break; - case KProtocolManager::PACProxy: // A proxy configuration URL has been given - case KProtocolManager::WPADProxy: // A proxy should be automatically discovered - case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables -// In such cases, the proxy address is not stored in KDE, but determined dynamically. -// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind... -// The best we can do here is to ask the current value for a given address. - aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.libreoffice.org") ); - break; - default: // No proxy is used - break; - } - if ( !aFTPProxy.isEmpty() ) - { - KUrl aProxy(aFTPProxy); - sal_Int32 nPort = aProxy.port(); - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( nPort ) ); - } - } else if (id == "ooInetHTTPProxyName") - { - QString aHTTPProxy; - switch ( KProtocolManager::proxyType() ) - { - case KProtocolManager::ManualProxy: // Proxies are manually configured - aHTTPProxy = KProtocolManager::proxyFor( "HTTP" ); - break; - case KProtocolManager::PACProxy: // A proxy configuration URL has been given - case KProtocolManager::WPADProxy: // A proxy should be automatically discovered - case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables -// In such cases, the proxy address is not stored in KDE, but determined dynamically. -// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind... -// The best we can do here is to ask the current value for a given address. - aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.libreoffice.org") ); - break; - default: // No proxy is used - break; - } - if ( !aHTTPProxy.isEmpty() ) - { - KUrl aProxy(aHTTPProxy); - OUString sProxy = reinterpret_cast<const sal_Unicode *>(aProxy.host().utf16()); - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( sProxy ) ); - } - } else if (id == "ooInetHTTPProxyPort") - { - QString aHTTPProxy; - switch ( KProtocolManager::proxyType() ) - { - case KProtocolManager::ManualProxy: // Proxies are manually configured - aHTTPProxy = KProtocolManager::proxyFor( "HTTP" ); - break; - case KProtocolManager::PACProxy: // A proxy configuration URL has been given - case KProtocolManager::WPADProxy: // A proxy should be automatically discovered - case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables -// In such cases, the proxy address is not stored in KDE, but determined dynamically. -// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind... -// The best we can do here is to ask the current value for a given address. - aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.libreoffice.org") ); - break; - default: // No proxy is used - break; - } - if ( !aHTTPProxy.isEmpty() ) - { - KUrl aProxy(aHTTPProxy); - sal_Int32 nPort = aProxy.port(); - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( nPort ) ); - } - } else if (id == "ooInetHTTPSProxyName") - { - QString aHTTPSProxy; - switch ( KProtocolManager::proxyType() ) - { - case KProtocolManager::ManualProxy: // Proxies are manually configured - aHTTPSProxy = KProtocolManager::proxyFor( "HTTPS" ); - break; - case KProtocolManager::PACProxy: // A proxy configuration URL has been given - case KProtocolManager::WPADProxy: // A proxy should be automatically discovered - case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables -// In such cases, the proxy address is not stored in KDE, but determined dynamically. -// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind... -// The best we can do here is to ask the current value for a given address. - aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.libreoffice.org") ); - break; - default: // No proxy is used - break; - } - if ( !aHTTPSProxy.isEmpty() ) - { - KUrl aProxy(aHTTPSProxy); - OUString sProxy = reinterpret_cast<const sal_Unicode *>(aProxy.host().utf16()); - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( sProxy ) ); - } - } else if (id == "ooInetHTTPSProxyPort") - { - QString aHTTPSProxy; - switch ( KProtocolManager::proxyType() ) - { - case KProtocolManager::ManualProxy: // Proxies are manually configured - aHTTPSProxy = KProtocolManager::proxyFor( "HTTPS" ); - break; - case KProtocolManager::PACProxy: // A proxy configuration URL has been given - case KProtocolManager::WPADProxy: // A proxy should be automatically discovered - case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables -// In such cases, the proxy address is not stored in KDE, but determined dynamically. -// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind... -// The best we can do here is to ask the current value for a given address. - aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.libreoffice.org") ); - break; - default: // No proxy is used - break; - } - if ( !aHTTPSProxy.isEmpty() ) - { - KUrl aProxy(aHTTPSProxy); - sal_Int32 nPort = aProxy.port(); - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( nPort ) ); - } - } else if ( id == "ooInetNoProxy" ) { - QString aNoProxyFor; - switch ( KProtocolManager::proxyType() ) - { - case KProtocolManager::ManualProxy: // Proxies are manually configured - case KProtocolManager::PACProxy: // A proxy configuration URL has been given - case KProtocolManager::WPADProxy: // A proxy should be automatically discovered - case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables - aNoProxyFor = KProtocolManager::noProxyFor(); - break; - default: // No proxy is used - break; - } - if ( !aNoProxyFor.isEmpty() ) - { - OUString sNoProxyFor; - - aNoProxyFor = aNoProxyFor.replace( COMMA, SEMI_COLON ); - sNoProxyFor = reinterpret_cast<const sal_Unicode *>(aNoProxyFor.utf16()); - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( sNoProxyFor ) ); - } - } else if ( id == "ooInetProxyType" ) { - int nProxyType; - switch ( KProtocolManager::proxyType() ) - { - case KProtocolManager::ManualProxy: // Proxies are manually configured - case KProtocolManager::PACProxy: // A proxy configuration URL has been given - case KProtocolManager::WPADProxy: // A proxy should be automatically discovered - case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables - nProxyType = 1; - break; - default: // No proxy is used - nProxyType = 0; - } - return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( static_cast<sal_Int32>(nProxyType) ) ); - } else { - OSL_ASSERT(false); // this cannot happen - } - return css::beans::Optional< css::uno::Any >(); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/kde4be/kde4access.hxx b/shell/source/backends/kde4be/kde4access.hxx deleted file mode 100644 index f9516c050ac0..000000000000 --- a/shell/source/backends/kde4be/kde4access.hxx +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_KDE4BE_KDE4ACCESS_HXX -#define INCLUDED_SHELL_SOURCE_BACKENDS_KDE4BE_KDE4ACCESS_HXX - -#include <sal/config.h> - -#include <com/sun/star/beans/Optional.hpp> - -namespace com { namespace sun { namespace star { namespace uno { - class Any; -} } } } - -namespace kde4access { - -css::beans::Optional< css::uno::Any > getValue(OUString const & id); - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx deleted file mode 100644 index 800465002c28..000000000000 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ /dev/null @@ -1,180 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <sal/config.h> - -#include <kapplication.h> - -#include <com/sun/star/beans/Optional.hpp> -#include <com/sun/star/beans/PropertyVetoException.hpp> -#include <com/sun/star/beans/UnknownPropertyException.hpp> -#include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertySetInfo.hpp> -#include <com/sun/star/beans/XVetoableChangeListener.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/WrappedTargetException.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/uno/XCurrentContext.hpp> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/implementationentry.hxx> -#include <cppuhelper/weak.hxx> -#include <rtl/string.h> -#include <rtl/ustring.h> -#include <rtl/ustring.hxx> -#include <sal/types.h> -#include <uno/current_context.hxx> - -#include "kde4access.hxx" - -namespace { - -OUString getServiceImplementationName() { - return OUString( - "com.sun.star.comp.configuration.backend.KDE4Backend"); -} - -css::uno::Sequence< OUString > getServiceSupportedServiceNames() { - OUString name( - "com.sun.star.configuration.backend.KDE4Backend"); - return css::uno::Sequence< OUString >(&name, 1); -} - -class Service: - public cppu::WeakImplHelper< - css::lang::XServiceInfo, css::beans::XPropertySet > -{ -public: - Service(); - Service(const Service&) = delete; - Service& operator=(const Service&) = delete; - -private: - virtual ~Service() override {} - - virtual OUString SAL_CALL getImplementationName() override - { return getServiceImplementationName(); } - - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override - { return ServiceName == getSupportedServiceNames()[0]; } - - virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() override - { return getServiceSupportedServiceNames(); } - - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() override - { return css::uno::Reference< css::beans::XPropertySetInfo >(); } - - virtual void SAL_CALL setPropertyValue( - OUString const &, css::uno::Any const &) override; - - virtual css::uno::Any SAL_CALL getPropertyValue( - OUString const & PropertyName) override; - - virtual void SAL_CALL addPropertyChangeListener( - OUString const &, - css::uno::Reference< css::beans::XPropertyChangeListener > const &) override - {} - - virtual void SAL_CALL removePropertyChangeListener( - OUString const &, - css::uno::Reference< css::beans::XPropertyChangeListener > const &) override - {} - - virtual void SAL_CALL addVetoableChangeListener( - OUString const &, - css::uno::Reference< css::beans::XVetoableChangeListener > const &) override - {} - - virtual void SAL_CALL removeVetoableChangeListener( - OUString const &, - css::uno::Reference< css::beans::XVetoableChangeListener > const &) override - {} - - bool enabled_; -}; - -Service::Service(): enabled_(false) { - css::uno::Reference< css::uno::XCurrentContext > context( - css::uno::getCurrentContext()); - if (context.is()) { - OUString desktop; - context->getValueByName("system.desktop-environment") >>= desktop; - enabled_ = desktop == "KDE4" && KApplication::kApplication() != nullptr; - } -} - -void Service::setPropertyValue(OUString const &, css::uno::Any const &) -{ - throw css::lang::IllegalArgumentException( - "setPropertyValue not supported", - static_cast< cppu::OWeakObject * >(this), -1); -} - -css::uno::Any Service::getPropertyValue(OUString const & PropertyName) -{ - if (PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight" - || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName" - || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort" - || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy" - || PropertyName == "ooInetProxyType" || PropertyName == "TemplatePathVariable" ) - { - return css::uno::makeAny( - enabled_ - ? kde4access::getValue(PropertyName) - : css::beans::Optional< css::uno::Any >()); - } else if (PropertyName == "givenname" || PropertyName == "sn") { - return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); - //TODO: obtain values from KDE? - } - throw css::beans::UnknownPropertyException( - PropertyName, static_cast< cppu::OWeakObject * >(this)); -} - -css::uno::Reference< css::uno::XInterface > createInstance( - css::uno::Reference< css::uno::XComponentContext > const &) -{ - return static_cast< cppu::OWeakObject * >(new Service); -} - -static cppu::ImplementationEntry const services[] = { - { &createInstance, &getServiceImplementationName, - &getServiceSupportedServiceNames, &cppu::createSingleComponentFactory, nullptr, - 0 }, - { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } -}; - -} - -extern "C" SAL_DLLPUBLIC_EXPORT void * kde4be1_component_getFactory( - char const * pImplName, void * pServiceManager, void * pRegistryKey) -{ - return cppu::component_getFactoryHelper( - pImplName, pServiceManager, pRegistryKey, services); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component deleted file mode 100644 index 6217f1833435..000000000000 --- a/shell/source/backends/kde4be/kde4be1.component +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - -<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - prefix="kde4be1" xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.configuration.backend.KDE4Backend"> - <service name="com.sun.star.configuration.backend.KDE4Backend"/> - </implementation> -</component> |