[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source vcl/win

[Steve Yin]

 vcl/source/app/svapp.cxx           |    5 +++--
 vcl/source/app/svdata.cxx          |   22 +++++++++++-----------
 vcl/win/source/window/salframe.cxx |    2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

New commits:
commit d9f425e86d95d6fc9fbf17f85c445875b5855b57
Author: Steve Yin <steve_y at apache.org>
Date:   Wed Apr 2 06:08:41 2014 +0000

    Issue 124573 - Office does not start when accessibility is activated.
    
    Fixed access bridge initialization issue in vcl.

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e8eb02f..978fec7 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -2058,12 +2058,13 @@ sal_Bool Application::IsAccessibilityEnabled()
 
 sal_Bool InitAccessBridge( sal_Bool bShowCancel, sal_Bool &rCancelled )
 {
-    sal_Bool bRet = true;
+    sal_Bool bRet = sal_True;
+
+    rCancelled = sal_False;
 
 // Disable Java bridge on UNIX and OS/2
 #ifndef WNT
     (void) bShowCancel; // unsued
-    (void) rCancelled; // unused
 #else
     // Checking HasAtHook() was introduced with IBM's IA2 CWS.
     if( HasAtHook() )
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 7325c09..9d77057 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -442,7 +442,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
 {
     rCancelled = sal_False;
 
-    bool bErrorMessage = true;
+    sal_Bool bErrorMessage = sal_True;
 
     // Note:
     // if bAllowCancel is sal_True we were called from application startup
@@ -452,13 +452,13 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
 
     try
     {
-        bool bSuccess = true;
+        sal_Bool bSuccess = sal_True;
 
         // No error messages when env var is set ..
         static const char* pEnv = getenv("SAL_ACCESSIBILITY_ENABLED" );
         if( pEnv && *pEnv )
         {
-            bErrorMessage = false;
+            bErrorMessage = sal_False;
         }
 
         ImplSVData* pSVData = ImplGetSVData();
@@ -479,7 +479,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
                 }
 
                 if( !pSVData->mxAccessBridge.is() )
-                    bSuccess = false;
+                    bSuccess = sal_False;
                 return bSuccess;
 #endif
                 css::uno::Reference< XExtendedToolkit > xToolkit =
@@ -512,7 +512,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
                 }
 
                 if( !pSVData->mxAccessBridge.is() )
-                    bSuccess = false;
+                    bSuccess = sal_False;
             }
         }
 
@@ -541,7 +541,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
                 rCancelled = sal_True;
         }
 
-        return false;
+        return sal_False;
     }
 
     catch(::com::sun::star::java::JavaVMCreationFailureException&)
@@ -566,7 +566,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
                 rCancelled = sal_True;
         }
 
-        return false;
+        return sal_False;
     }
 
     catch(::com::sun::star::java::MissingJavaRuntimeException&)
@@ -591,7 +591,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
                 rCancelled = sal_True;
         }
 
-        return false;
+        return sal_False;
     }
 
     catch(::com::sun::star::java::JavaDisabledException&)
@@ -616,7 +616,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
                 rCancelled = sal_True;
         }
 
-        return false;
+        return sal_False;
     }
 
 
@@ -670,12 +670,12 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
             }
         }
 
-        return false;
+        return sal_False;
     }
 
     catch (...)
     {
-        return false;
+        return sal_False;
     }
 }
 
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 86ef843..835ea98 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -6211,7 +6211,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
                         // Make sure to launch Accessibiliity only the following criterias are satisfied to avoid RFT interrupts regular acc processing
                         if (g_acc_manager1 == NULL)
                         {
-                            sal_Bool bCancelled;
+                            sal_Bool bCancelled(sal_False);
                             InitAccessBridge(sal_False,bCancelled);
                             if( bCancelled )
                                 break;