INTEGRATION: CWS a11yshowstop (1.11.10); FILE MERGED

2005/04/21 08:55:01 obr 1.11.10.1: #i47798# initialize accessibility bridge

1 files changed, 21 insertions, 2 deletions

diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index ce3b1d0b6816..87d362f1018f 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pamain.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: kz $ $Date: 2005-03-03 20:00:26 $
+ *  last change: $Author: obo $ $Date: 2005-04-22 11:36:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,6 +81,10 @@
 #include <helper.hxx>
 #endif
 
+#ifndef _PADMIN_DESKTOPCONTEXT_HXX_
+#include <desktopcontext.hxx>
+#endif
+
 #ifndef _CPPUHELPER_BOOTSTRAP_HXX_
 #include <cppuhelper/bootstrap.hxx>
 #endif
@@ -161,6 +165,10 @@ void MyApp::Main()
         exit( 1 );
     }
 
+    // Detect desktop environment - need to do this as early as possible
+    com::sun::star::uno::setCurrentContext(
+        new DesktopContext( com::sun::star::uno::getCurrentContext() ) );
+
     /*
      *  Create UCB.
      */
@@ -180,6 +188,17 @@ void MyApp::Main()
     }
 #endif
 
+    /*
+     * Initialize the Java UNO AccessBridge if accessibility is turned on
+     */
+
+    if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
+    {
+        BOOL bQuitApp;
+        if( !InitAccessBridge( true, bQuitApp ) )
+            if( bQuitApp )
+                return;
+    }
 
     // initialize test-tool library (if available)
     tools::InitTestToolLib();