diff options
| -rw-r--r-- | desktop/source/app/app.cxx | 7 | ||||
| -rw-r--r-- | include/vcl/svapp.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/svdata.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 22 | ||||
| -rw-r--r-- | vcl/source/app/svdata.cxx | 7 | ||||
| -rw-r--r-- | vcl/win/window/salframe.cxx | 3 |
7 files changed, 13 insertions, 34 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 624b5cb0b6b4..f33080482bba 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1404,12 +1404,9 @@ int Desktop::Main() } } - // check if accessibility is enabled but not working and allow to quit + // check if accessibility is enabled if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() ) - { - if( !InitAccessBridge() ) - return EXIT_FAILURE; - } + InitAccessBridge(); #endif // terminate if requested... diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 57836fc59794..c22daf19fcc2 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1434,7 +1434,7 @@ VCL_DLLPUBLIC bool IsVCLInit(); VCL_DLLPUBLIC bool InitVCL(); VCL_DLLPUBLIC void DeInitVCL(); -VCL_DLLPUBLIC bool InitAccessBridge(); +VCL_DLLPUBLIC void InitAccessBridge(); // only allowed to call, if no thread is running. You must call JoinMainLoopThread to free all memory. VCL_DLLPUBLIC void CreateMainLoopThread( oslWorkerFunction pWorker, void * pThreadData ); diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 584018ccfdbe..f3c2f43a369f 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -462,7 +462,7 @@ VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData(); VCL_PLUGIN_PUBLIC void ImplHideSplash(); #ifdef _WIN32 -bool ImplInitAccessBridge(); +void ImplInitAccessBridge(); #endif const FieldUnitStringList& ImplGetFieldUnits(); diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 3f2160420806..26c398c3f063 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2735,8 +2735,8 @@ void MiscSettings::SetEnableATToolSupport( bool bEnable ) { if ( (bEnable ? TRISTATE_TRUE : TRISTATE_FALSE) != mxData->mnEnableATT ) { - if( bEnable && !ImplInitAccessBridge() ) - return; + if (bEnable) + ImplInitAccessBridge(); mxData->mnEnableATT = bEnable ? TRISTATE_TRUE : TRISTATE_FALSE; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index debd5ec920ff..819fdaf729d7 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1634,25 +1634,11 @@ void Application::AddToRecentDocumentList(const OUString& rFileUrl, const OUStri pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType, rDocumentService); } -bool InitAccessBridge() +void InitAccessBridge() { -// Disable MSAA bridge on UNIX -#if defined UNX - return true; -#else - bool bRet = ImplInitAccessBridge(); - - if( !bRet ) - { - // disable accessibility if the user chooses to continue - AllSettings aSettings = Application::GetSettings(); - MiscSettings aMisc = aSettings.GetMiscSettings(); - aMisc.SetEnableATToolSupport( false ); - aSettings.SetMiscSettings( aMisc ); - Application::SetSettings( aSettings ); - } - return bRet; -#endif // !UNX +#ifdef _WIN32 + ImplInitAccessBridge(); +#endif } // MT: AppEvent was in oldsv.cxx, but is still needed... diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index b48fc6695a3a..6f0732ef498c 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -330,7 +330,7 @@ BlendFrameCache* ImplGetBlendFrameCache() } #ifdef _WIN32 -bool ImplInitAccessBridge() +void ImplInitAccessBridge() { ImplSVData* pSVData = ImplGetSVData(); if( ! pSVData->mxAccessBridge.is() ) @@ -340,16 +340,13 @@ bool ImplInitAccessBridge() { pSVData->mxAccessBridge = css::accessibility::MSAAService::create(xContext); SAL_INFO("vcl", "got IAccessible2 bridge"); - return true; } catch (css::uno::DeploymentException &) { TOOLS_WARN_EXCEPTION("vcl", "got no IAccessible2 bridge"); - return false; + assert(false && "failed to create IAccessible2 bridge"); } } - - return true; } #endif diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 3a688858b312..e35d55ff30f3 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -5631,8 +5631,7 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet) // to avoid RFT interrupts regular accessibility processing if ( !pSVData->mxAccessBridge.is() ) { - if( !InitAccessBridge() ) - return false; + InitAccessBridge(); } xMSAA.set(pSVData->mxAccessBridge, uno::UNO_QUERY); ImplSalYieldMutexRelease(); |