Author: steve_y
Date: Wed Apr 2 06:08:41 2014
New Revision: 1583887
URL: http://svn.apache.org/r1583887
Log:
Issue 124573 - Office does not start when accessibility is activated.
Fixed access bridge initialization issue in vcl.
Modified:
openoffice/trunk/main/vcl/source/app/svapp.cxx
openoffice/trunk/main/vcl/source/app/svdata.cxx
openoffice/trunk/main/vcl/win/source/window/salframe.cxx
Modified: openoffice/trunk/main/vcl/source/app/svapp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/svapp.cxx?rev=1583887&r1=1583886&r2=1583887&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/app/svapp.cxx (original)
+++ openoffice/trunk/main/vcl/source/app/svapp.cxx Wed Apr 2 06:08:41 2014
@@ -2058,12 +2058,13 @@ sal_Bool Application::IsAccessibilityEna
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() )
Modified: openoffice/trunk/main/vcl/source/app/svdata.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/svdata.cxx?rev=1583887&r1=1583886&r2=1583887&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/app/svdata.cxx (original)
+++ openoffice/trunk/main/vcl/source/app/svdata.cxx Wed Apr 2 06:08:41 2014
@@ -442,7 +442,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
{
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 bAllo
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 bAllo
}
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 bAllo
}
if( !pSVData->mxAccessBridge.is() )
- bSuccess = false;
+ bSuccess = sal_False;
}
}
@@ -541,7 +541,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
rCancelled = sal_True;
}
- return false;
+ return sal_False;
}
catch(::com::sun::star::java::JavaVMCreationFailureException&)
@@ -566,7 +566,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
rCancelled = sal_True;
}
- return false;
+ return sal_False;
}
catch(::com::sun::star::java::MissingJavaRuntimeException&)
@@ -591,7 +591,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
rCancelled = sal_True;
}
- return false;
+ return sal_False;
}
catch(::com::sun::star::java::JavaDisabledException&)
@@ -616,7 +616,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
rCancelled = sal_True;
}
- return false;
+ return sal_False;
}
@@ -670,12 +670,12 @@ bool ImplInitAccessBridge(sal_Bool bAllo
}
}
- return false;
+ return sal_False;
}
catch (...)
{
- return false;
+ return sal_False;
}
}
Modified: openoffice/trunk/main/vcl/win/source/window/salframe.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/win/source/window/salframe.cxx?rev=1583887&r1=1583886&r2=1583887&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/win/source/window/salframe.cxx (original)
+++ openoffice/trunk/main/vcl/win/source/window/salframe.cxx Wed Apr 2
06:08:41 2014
@@ -6211,7 +6211,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND h
// 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;
