diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 11:30:16 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 11:30:16 +0000 |
| commit | bc1c7324363e5e806b54af98e4d91763be4b1830 (patch) | |
| tree | 65434566f0330ed5606f3e00d24eb81eb1d8438d /shell | |
| parent | 8ae752f3a35c697d0ad930b68cd6b195d59f3b1c (diff) | |
INTEGRATION: CWS kdesettings3 (1.4.2); FILE MERGED
2006/07/21 12:53:50 kendy 1.4.2.1: #i66204#
Don't link with KDE libraries in Gnome (and v.v.)
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/backends/gconfbe/gconfbe1-ucd.txt | 3 | ||||
| -rw-r--r-- | shell/source/backends/kdebe/kdebackend.cxx | 25 |
2 files changed, 3 insertions, 25 deletions
diff --git a/shell/source/backends/gconfbe/gconfbe1-ucd.txt b/shell/source/backends/gconfbe/gconfbe1-ucd.txt index c9451360a702..daa5444ff0c5 100644 --- a/shell/source/backends/gconfbe/gconfbe1-ucd.txt +++ b/shell/source/backends/gconfbe/gconfbe1-ucd.txt @@ -2,8 +2,5 @@ ImplementationName=com.sun.star.comp.configuration.backend.GconfBackend ComponentName=gconfbe1.uno.so LoaderName=com.sun.star.loader.SharedLibrary -[Data] -SupportedComponents=org.openoffice.VCL;org.openoffice.Inet;org.openoffice.Office.Common;org.openoffice.Office.Paths [SupportedServices] com.sun.star.configuration.backend.GconfBackend -com.sun.star.configuration.backend.PlatformBackend diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 374135b3859f..88f2fb855ae3 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -4,9 +4,9 @@ * * $RCSfile: kdebackend.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-07-13 12:31:31 $ + * last change: $Author: ihi $ $Date: 2006-08-04 12:30:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -136,34 +136,15 @@ rtl::OUString SAL_CALL KDEBackend::getImplementationName(void) uno::Sequence<rtl::OUString> SAL_CALL KDEBackend::getBackendServiceNames(void) { - uno::Sequence<rtl::OUString> aServices(2) ; + uno::Sequence<rtl::OUString> aServices(1) ; aServices[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.KDEBackend")) ; - aServices[1] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.PlatformBackend")) ; return aServices ; } //------------------------------------------------------------------------------ -uno::Sequence<rtl::OUString> SAL_CALL KDEBackend::getSupportedComponents(void) -{ - uno::Sequence<rtl::OUString> aSupportedComponentsList(4) ; - aSupportedComponentsList[0] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("org.openoffice.VCL")) ; - aSupportedComponentsList[1] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Inet")) ; - aSupportedComponentsList[2] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common")) ; - aSupportedComponentsList[3] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths")) ; - - return aSupportedComponentsList ; -} - -//------------------------------------------------------------------------------ - sal_Bool SAL_CALL KDEBackend::supportsService(const rtl::OUString& aServiceName) throw (uno::RuntimeException) { |