diff options
Diffstat (limited to 'desktop/source/app/appinit.cxx')
| -rw-r--r-- | desktop/source/app/appinit.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index a477eb2ad4..94bd3c55b3 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.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 @@ -75,9 +75,9 @@ #include <unotools/tempfile.hxx> #include <ucbhelper/contentbroker.hxx> #include <vcl/svapp.hxx> -#include <svtools/startoptions.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/internaloptions.hxx> +#include <unotools/startoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/internaloptions.hxx> #define DEFINE_CONST_OUSTRING(CONSTASCII) OUString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) @@ -131,7 +131,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) aArgs[4] <<= rtl::OUString::createFromAscii("PORTAL"); aArgs[5] <<= aPortal.makeStringAndClear(); - bool ret = + bool ret = ::ucbhelper::ContentBroker::initialize( xServiceFactory, aArgs ) != false; #ifdef GNOME_VFS_ENABLED @@ -178,7 +178,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) // Workaround for P1 #124597#. Instanciate GNOME-VFS-UCP in the thread that initialized // GNOME in order to avoid a deadlock that may occure in case UCP gets initialized from - // a different thread. The latter may happen when calling the Office remotely via UNO. + // a different thread. The latter may happen when calling the Office remotely via UNO. // THIS IS NOT A FIX, JUST A WORKAROUND! try @@ -201,16 +201,16 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) } } catch (RuntimeException e) { } - } + } #endif // GNOME_VFS_ENABLED - + return ret;; } Reference< XMultiServiceFactory > Desktop::CreateApplicationServiceManager() { RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::createApplicationServiceManager" ); - + try { Reference<XComponentContext> xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext(); @@ -332,7 +332,7 @@ void Desktop::createAcceptor(const OUString& aAcceptString) Sequence< Any > aSeq( 2 ); aSeq[0] <<= aAcceptString; aSeq[1] <<= bAccept; - Reference<XInitialization> rAcceptor( + Reference<XInitialization> rAcceptor( ::comphelper::getProcessServiceFactory()->createInstance( OUString::createFromAscii( "com.sun.star.office.Acceptor" )), UNO_QUERY ); if ( rAcceptor.is() ) { @@ -366,7 +366,7 @@ class enable } } }; - + void Desktop::enableAcceptors() { RTL_LOGFILE_CONTEXT(aLog, "desktop (lo119109) Desktop::enableAcceptors"); @@ -389,14 +389,14 @@ void Desktop::destroyAcceptor(const OUString& aAcceptString) AcceptorMap &rMap = acceptorMap::get(); if (aAcceptString.compareToAscii("all") == 0) { rMap.clear(); - + } else { // try to remove acceptor from map AcceptorMap::const_iterator pIter = rMap.find(aAcceptString); if (pIter != rMap.end() ) { // remove reference from map // this is the last reference and the acceptor will be destructed - rMap.erase(aAcceptString); + rMap.erase(aAcceptString); } else { OSL_ENSURE(sal_False, "Found no acceptor to remove"); } @@ -407,7 +407,7 @@ void Desktop::destroyAcceptor(const OUString& aAcceptString) void Desktop::DeregisterServices() { // stop all acceptors by clearing the map - acceptorMap::get().clear(); + acceptorMap::get().clear(); } void Desktop::CreateTemporaryDirectory() @@ -434,7 +434,7 @@ void Desktop::CreateTemporaryDirectory() e.Message = aMsg + e.Message; throw e; } - + // remove possible old directory and base directory SvtInternalOptions aInternalOpt; |