INTEGRATION: CWS vcl18 (1.6.6); FILE MERGED

2004/01/27 13:01:10 pl 1.6.6.1: #113718# join from vcl7pp1r3

1 files changed, 22 insertions, 18 deletions

diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 0d0523d15507..8d35ec1b67cf 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pamain.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: vg $ $Date: 2003-12-17 15:29:43 $
+ *  last change: $Author: obo $ $Date: 2004-03-17 10:08:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -137,21 +137,23 @@ void MyApp::Main()
     //-------------------------------------------------
     // create the global service-manager
     //-------------------------------------------------
-    Reference< XComponentContext > xCtx = defaultBootstrap_InitialComponentContext();
-    Reference< XMultiServiceFactory > xFactory(  xCtx->getServiceManager(), UNO_QUERY );
-    if( xFactory.is() )
-        setProcessServiceFactory( xFactory );
-
-    /*
-     * Initialize the Java UNO AccessBridge if accessibility is turned on
-     */
+    Reference< XComponentContext > xCtx;
+    Reference< XMultiServiceFactory > xFactory;
+    try
+    {
+        Reference< XComponentContext > xCtx = defaultBootstrap_InitialComponentContext();
+        xFactory = Reference< XMultiServiceFactory >(  xCtx->getServiceManager(), UNO_QUERY );
+        if( xFactory.is() )
+            setProcessServiceFactory( xFactory );
+    }
+    catch( com::sun::star::uno::Exception& rExc)
+    {
+    }
 
-    if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
+    if( ! xFactory.is() )
     {
-        BOOL bQuitApp;
-        if( !InitAccessBridge( true, bQuitApp ) )
-            if( bQuitApp )
-                return;
+        fprintf( stderr, "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" );
+        exit( 1 );
     }
 
     /*
@@ -162,10 +164,12 @@ void MyApp::Main()
     aArgs[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
     sal_Bool bSuccess = ::ucb::ContentBroker::initialize( xFactory, aArgs );
 
-#if OSL_DEBUG_LEVEL > 1
     if ( !bSuccess )
-        fprintf( stderr, "Error creating UCB\n" );
-#endif
+    {
+        fprintf( stderr, "Error creating UCB, installation must be in disorder. Exiting.\n" );
+        exit( 1 );
+    }
+
 
     pPADialog = PADialog::Create( NULL , FALSE );
     Application::SetDisplayName( pPADialog->GetText() );