Author: af
Date: Tue Apr  1 13:49:43 2014
New Revision: 1583671

URL: http://svn.apache.org/r1583671
Log:
i124573: Initialize flags to allow acess bridge initialization to fail 
gracefully (Merged from branch AOO410).

Modified:
    openoffice/trunk/   (props changed)
    openoffice/trunk/main/desktop/source/app/app.cxx
    openoffice/trunk/main/padmin/source/pamain.cxx

Propchange: openoffice/trunk/
------------------------------------------------------------------------------
  Merged /openoffice/branches/AOO410:r1583666

Modified: openoffice/trunk/main/desktop/source/app/app.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/app/app.cxx?rev=1583671&r1=1583670&r2=1583671&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/app/app.cxx (original)
+++ openoffice/trunk/main/desktop/source/app/app.cxx Tue Apr  1 13:49:43 2014
@@ -1917,7 +1917,7 @@ void Desktop::Main()
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ GetEnableATToolSupport" );
         if( 
Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
         {
-            sal_Bool bQuitApp;
+            sal_Bool bQuitApp (sal_False);
 
             if( !InitAccessBridge( true, bQuitApp ) )
                 if( bQuitApp )

Modified: openoffice/trunk/main/padmin/source/pamain.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/padmin/source/pamain.cxx?rev=1583671&r1=1583670&r2=1583671&view=diff
==============================================================================
--- openoffice/trunk/main/padmin/source/pamain.cxx (original)
+++ openoffice/trunk/main/padmin/source/pamain.cxx Tue Apr  1 13:49:43 2014
@@ -145,7 +145,7 @@ void MyApp::Main()
      
     if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
     {
-        sal_Bool bQuitApp;
+        sal_Bool bQuitApp (sal_False);
         if( !InitAccessBridge( true, bQuitApp ) )
             if( bQuitApp )
                 return;


Reply via email to