diff options
Diffstat (limited to 'shell/source/backends/kdebe/kdebecdef.cxx')
-rw-r--r-- | shell/source/backends/kdebe/kdebecdef.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/shell/source/backends/kdebe/kdebecdef.cxx b/shell/source/backends/kdebe/kdebecdef.cxx index 026bffa7c1..c4995e6e81 100644 --- a/shell/source/backends/kdebe/kdebecdef.cxx +++ b/shell/source/backends/kdebe/kdebecdef.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <cppuhelper/implementationentry.hxx> #endif #include <com/sun/star/uno/XComponentContext.hpp> -#include <vcl/kde_headers.h> +#include "kde_headers.h" #include "uno/current_context.hxx" @@ -52,28 +52,28 @@ static uno::Reference<uno::XInterface> SAL_CALL createKDEBackend(const uno::Refe { try { uno::Reference< uno::XCurrentContext > xCurrentContext(uno::getCurrentContext()); - + if (xCurrentContext.is()) { uno::Any aValue = xCurrentContext->getValueByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "system.desktop-environment" ) ) ); - + rtl::OUString aDesktopEnvironment; if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsAscii("KDE")) && (KApplication::kApplication() != NULL) ) return * KDEBackend::createInstance(xContext); } - - return uno::Reference<uno::XInterface>(); - + + return uno::Reference<uno::XInterface>(); + } catch (uno::RuntimeException e) { - return uno::Reference<uno::XInterface>(); - } - + return uno::Reference<uno::XInterface>(); + } + } //============================================================================== -static const cppu::ImplementationEntry kImplementations_entries[] = +static const cppu::ImplementationEntry kImplementations_entries[] = { { createKDEBackend, @@ -97,7 +97,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( extern "C" sal_Bool SAL_CALL component_writeInfo(void *, void *pRegistryKey) { - + using namespace ::com::sun::star::registry; if (pRegistryKey) { @@ -106,25 +106,25 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(void *, uno::Reference< XRegistryKey > xImplKey = static_cast< XRegistryKey* >( pRegistryKey )->createKey( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + KDEBackend::getBackendName() ); - + // Register associated service names - uno::Reference< XRegistryKey > xServicesKey = xImplKey->createKey( + uno::Reference< XRegistryKey > xServicesKey = xImplKey->createKey( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ) ); - + uno::Sequence<rtl::OUString> sServiceNames = KDEBackend::getBackendServiceNames(); for (sal_Int32 i = 0 ; i < sServiceNames.getLength() ; ++ i) xServicesKey->createKey(sServiceNames[i]); return sal_True; } - + catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); + { + OSL_ENSURE(sal_False, "InvalidRegistryException caught"); } } - + return sal_False; } @@ -133,7 +133,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(void *, extern "C" void *component_getFactory(const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { - + return cppu::component_getFactoryHelper( aImplementationName, aServiceManager, |