diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-06-02 10:30:12 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-06-02 10:30:12 +0000 |
| commit | 35f694afba08dad957bbc9396ce999c2432273b9 (patch) | |
| tree | 897d9d78c99f04c2717ce380a3829ca6682bd729 /svx/source/gengal | |
| parent | 302a00f404e04e814081f6a2f3a39d41091ef314 (diff) | |
INTEGRATION: CWS pmladek01 (1.4.104); FILE MERGED
2006/05/24 17:33:53 pmladek 1.4.104.1: #i65361#
gengal stuff clean up
Diffstat (limited to 'svx/source/gengal')
| -rw-r--r-- | svx/source/gengal/gengal.cxx | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index dacfd10e247c..13271fc2a049 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -2,6 +2,11 @@ * * OpenOffice.org - a multi-platform office productivity suite * + * $RCSfile: gengal.cxx,v $ + * + * $Revision: 1.5 $ + * + * last change: $Author: vg $ $Date: 2006-06-02 11:30:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -241,21 +246,6 @@ Reference< XMultiServiceFactory > CreateApplicationServiceManager() void GalApp::Main() { -#ifdef TOO_SIMPLE_BY_HALF - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - xMSF = cppu::createRegistryServiceFactory( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "gengal.rdb" ) ), sal_True ); - ::comphelper::setProcessServiceFactory( xMSF ); - - // Without this no file access works ... - ucb::ContentProviderDataList aData; - ucb::ContentProviderData aFileProvider( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.FileContentProvider" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "file" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ) ) ); - aData.push_back( aFileProvider ); - ucb::ContentBroker::initialize( xMSF, aData ); -#else Reference<XComponentContext> xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext(); Reference<XMultiServiceFactory> xMSF(xComponentContext->getServiceManager(), UNO_QUERY); if( !xMSF.is() ) @@ -274,9 +264,7 @@ void GalApp::Main() aArgs[5] <<= aEmpty; if (! ::ucb::ContentBroker::initialize( xMSF, aArgs ) ) - fprintf( stderr, "Failed to init content broker\n" ); -#endif - + fprintf( stderr, "Failed to init content broker\n" ); bool bHelp = false; rtl::OUString aPath, aDestDir; |