Author: mseidel
Date: Wed May 22 23:41:32 2019
New Revision: 1859759
URL: http://svn.apache.org/viewvc?rev=1859759&view=rev
Log:
Cleaned up whitespace, fixed typos
Modified:
openoffice/trunk/main/vcl/source/app/svdata.cxx
Modified: openoffice/trunk/main/vcl/source/app/svdata.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/svdata.cxx?rev=1859759&r1=1859758&r2=1859759&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/app/svdata.cxx (original)
+++ openoffice/trunk/main/vcl/source/app/svdata.cxx Wed May 22 23:41:32 2019
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -56,7 +56,7 @@
#include "vcl/msgbox.hxx"
#include "vcl/unohelp.hxx"
#include "vcl/button.hxx" // for Button::GetStandardText
-#include "vcl/dockwin.hxx" // for DockingManager
+#include "vcl/dockwin.hxx" // for DockingManager
#include "salinst.hxx"
#include "salframe.hxx"
@@ -96,8 +96,8 @@ using namespace rtl;
namespace
{
- struct private_aImplSVData :
- public rtl::Static<ImplSVData, private_aImplSVData> {};
+ struct private_aImplSVData :
+ public rtl::Static<ImplSVData, private_aImplSVData> {};
}
// static SV-Data
@@ -105,118 +105,118 @@ ImplSVData* pImplSVData = NULL;
SalSystem* ImplGetSalSystem()
{
- ImplSVData* pSVData = ImplGetSVData();
- if( ! pSVData->mpSalSystem )
- pSVData->mpSalSystem = pSVData->mpDefInst->CreateSalSystem();
- return pSVData->mpSalSystem;
+ ImplSVData* pSVData = ImplGetSVData();
+ if( ! pSVData->mpSalSystem )
+ pSVData->mpSalSystem = pSVData->mpDefInst->CreateSalSystem();
+ return pSVData->mpSalSystem;
}
static String& ReplaceJavaErrorMessages( String& rString )
{
- rString.SearchAndReplaceAllAscii( "%OK", Button::GetStandardText(
BUTTON_OK ) );
- rString.SearchAndReplaceAllAscii( "%IGNORE", Button::GetStandardText(
BUTTON_IGNORE ) );
- rString.SearchAndReplaceAllAscii( "%CANCEL", Button::GetStandardText(
BUTTON_CANCEL ) );
+ rString.SearchAndReplaceAllAscii( "%OK", Button::GetStandardText(
BUTTON_OK ) );
+ rString.SearchAndReplaceAllAscii( "%IGNORE", Button::GetStandardText(
BUTTON_IGNORE ) );
+ rString.SearchAndReplaceAllAscii( "%CANCEL", Button::GetStandardText(
BUTTON_CANCEL ) );
- return rString;
+ return rString;
}
// =======================================================================
void ImplInitSVData()
{
- pImplSVData = &private_aImplSVData::get();
+ pImplSVData = &private_aImplSVData::get();
- // init global instance data
- memset( pImplSVData, 0, sizeof( ImplSVData ) );
- pImplSVData->maHelpData.mbAutoHelpId = sal_True;
- pImplSVData->maNWFData.maMenuBarHighlightTextColor = Color(
COL_TRANSPARENT );
-
- // find out whether we are running in the testtool
- // in this case we need some special workarounds
- sal_uInt32 nArgs = osl_getCommandArgCount();
- for( sal_uInt32 i = 0; i < nArgs; i++ )
- {
- rtl::OUString aArg;
- osl_getCommandArg( i, &aArg.pData );
- if( aArg.equalsAscii( "-enableautomation" ) )
- {
- pImplSVData->mbIsTestTool = true;
- break;
- }
- }
+ // init global instance data
+ memset( pImplSVData, 0, sizeof( ImplSVData ) );
+ pImplSVData->maHelpData.mbAutoHelpId = sal_True;
+ pImplSVData->maNWFData.maMenuBarHighlightTextColor = Color(
COL_TRANSPARENT );
+
+ // find out whether we are running in the testtool
+ // in this case we need some special workarounds
+ sal_uInt32 nArgs = osl_getCommandArgCount();
+ for( sal_uInt32 i = 0; i < nArgs; i++ )
+ {
+ rtl::OUString aArg;
+ osl_getCommandArg( i, &aArg.pData );
+ if( aArg.equalsAscii( "-enableautomation" ) )
+ {
+ pImplSVData->mbIsTestTool = true;
+ break;
+ }
+ }
#ifdef WNT
- //Default enable the acc bridge interface
+ // Default enable the acc bridge interface
pImplSVData->maAppData.m_bEnableAccessInterface =true;
#endif
-
- // mark default layout border as unitialized
- pImplSVData->maAppData.mnDefaultLayoutBorder = -1;
+
+ // mark default layout border as uninitialized
+ pImplSVData->maAppData.mnDefaultLayoutBorder = -1;
}
// -----------------------------------------------------------------------
void ImplDeInitSVData()
{
- ImplSVData* pSVData = ImplGetSVData();
+ ImplSVData* pSVData = ImplGetSVData();
+
+ // delete global instance data
+ if( pSVData->mpSettingsConfigItem )
+ delete pSVData->mpSettingsConfigItem;
+
+ if( pSVData->mpDockingManager )
+ delete pSVData->mpDockingManager;
+
+ if( pSVData->maGDIData.mpDefaultFontConfiguration )
+ delete pSVData->maGDIData.mpDefaultFontConfiguration;
+ if( pSVData->maGDIData.mpFontSubstConfiguration )
+ delete pSVData->maGDIData.mpFontSubstConfiguration;
- // delete global instance data
- if( pSVData->mpSettingsConfigItem )
- delete pSVData->mpSettingsConfigItem;
-
- if( pSVData->mpDockingManager )
- delete pSVData->mpDockingManager;
-
- if( pSVData->maGDIData.mpDefaultFontConfiguration )
- delete pSVData->maGDIData.mpDefaultFontConfiguration;
- if( pSVData->maGDIData.mpFontSubstConfiguration )
- delete pSVData->maGDIData.mpFontSubstConfiguration;
-
- if ( pSVData->maAppData.mpMSFTempFileName )
- {
- if ( pSVData->maAppData.mxMSF.is() )
- {
- ::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent > xComp( pSVData->maAppData.mxMSF,
::com::sun::star::uno::UNO_QUERY );
- xComp->dispose();
- pSVData->maAppData.mxMSF = NULL;
- }
-
- ::rtl::OUString aFileUrl;
- ::osl::File::getFileURLFromSystemPath(
*pSVData->maAppData.mpMSFTempFileName, aFileUrl );
- osl::File::remove( aFileUrl );
- delete pSVData->maAppData.mpMSFTempFileName;
- pSVData->maAppData.mpMSFTempFileName = NULL;
- }
-
- if( pSVData->maCtrlData.mpFieldUnitStrings )
- delete pSVData->maCtrlData.mpFieldUnitStrings,
pSVData->maCtrlData.mpFieldUnitStrings = NULL;
- if( pSVData->maCtrlData.mpCleanUnitStrings )
- delete pSVData->maCtrlData.mpCleanUnitStrings,
pSVData->maCtrlData.mpCleanUnitStrings = NULL;
- if( pSVData->mpPaperNames )
- delete pSVData->mpPaperNames, pSVData->mpPaperNames = NULL;
+ if ( pSVData->maAppData.mpMSFTempFileName )
+ {
+ if ( pSVData->maAppData.mxMSF.is() )
+ {
+ ::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent > xComp( pSVData->maAppData.mxMSF,
::com::sun::star::uno::UNO_QUERY );
+ xComp->dispose();
+ pSVData->maAppData.mxMSF = NULL;
+ }
+
+ ::rtl::OUString aFileUrl;
+ ::osl::File::getFileURLFromSystemPath(
*pSVData->maAppData.mpMSFTempFileName, aFileUrl );
+ osl::File::remove( aFileUrl );
+ delete pSVData->maAppData.mpMSFTempFileName;
+ pSVData->maAppData.mpMSFTempFileName = NULL;
+ }
+
+ if( pSVData->maCtrlData.mpFieldUnitStrings )
+ delete pSVData->maCtrlData.mpFieldUnitStrings,
pSVData->maCtrlData.mpFieldUnitStrings = NULL;
+ if( pSVData->maCtrlData.mpCleanUnitStrings )
+ delete pSVData->maCtrlData.mpCleanUnitStrings,
pSVData->maCtrlData.mpCleanUnitStrings = NULL;
+ if( pSVData->mpPaperNames )
+ delete pSVData->mpPaperNames, pSVData->mpPaperNames = NULL;
}
// -----------------------------------------------------------------------
void ImplDestroySVData()
{
- pImplSVData = NULL;
+ pImplSVData = NULL;
}
// -----------------------------------------------------------------------
Window* ImplGetDefaultWindow()
{
- ImplSVData* pSVData = ImplGetSVData();
- if ( pSVData->maWinData.mpAppWin )
- return pSVData->maWinData.mpAppWin;
+ ImplSVData* pSVData = ImplGetSVData();
+ if ( pSVData->maWinData.mpAppWin )
+ return pSVData->maWinData.mpAppWin;
// First test if we already have a default window.
- // Don't only place a single if..else inside solar mutex lockframe
- // because then we might have to wait for the solar mutex what is not
necessary
+ // Don't only place a single if...else inside solar mutex lockframe
+ // because then we might have to wait for the solar mutex what is not
necessary
// if we already have a default window.
- if ( !pSVData->mpDefaultWin )
+ if ( !pSVData->mpDefaultWin )
{
Application::GetSolarMutex().acquire();
@@ -227,12 +227,12 @@ Window* ImplGetDefaultWindow()
{
DBG_WARNING( "ImplGetDefaultWindow(): No AppWindow" );
pSVData->mpDefaultWin = new WorkWindow( 0,
WB_DEFAULTWIN );
- pSVData->mpDefaultWin->SetText( OUString(
RTL_CONSTASCII_USTRINGPARAM( "VCL ImplGetDefaultWindow" ) ) );
+ pSVData->mpDefaultWin->SetText( OUString(
RTL_CONSTASCII_USTRINGPARAM( "VCL ImplGetDefaultWindow" ) ) );
}
Application::GetSolarMutex().release();
}
- return pSVData->mpDefaultWin;
+ return pSVData->mpDefaultWin;
}
// -----------------------------------------------------------------------
@@ -241,180 +241,180 @@ Window* ImplGetDefaultWindow()
ResMgr* ImplGetResMgr()
{
- ImplSVData* pSVData = ImplGetSVData();
- if ( !pSVData->mpResMgr )
- {
- ::com::sun::star::lang::Locale aLocale =
Application::GetSettings().GetUILocale();
- pSVData->mpResMgr = ResMgr::SearchCreateResMgr( VCL_CREATERESMGR_NAME(
vcl ), aLocale );
-
- static bool bMessageOnce = false;
- if( !pSVData->mpResMgr && ! bMessageOnce )
- {
- bMessageOnce = true;
- const char* pMsg =
- "Missing vcl resource. This indicates that files vital to
localization are missing. "
- "You might have a corrupt installation.";
- fprintf( stderr, "%s\n", pMsg );
- ErrorBox aBox( NULL, WB_OK | WB_DEF_OK, rtl::OUString( pMsg,
strlen( pMsg ), RTL_TEXTENCODING_ASCII_US ) );
- aBox.Execute();
- }
- }
- return pSVData->mpResMgr;
+ ImplSVData* pSVData = ImplGetSVData();
+ if ( !pSVData->mpResMgr )
+ {
+ ::com::sun::star::lang::Locale aLocale =
Application::GetSettings().GetUILocale();
+ pSVData->mpResMgr = ResMgr::SearchCreateResMgr(
VCL_CREATERESMGR_NAME( vcl ), aLocale );
+
+ static bool bMessageOnce = false;
+ if( !pSVData->mpResMgr && ! bMessageOnce )
+ {
+ bMessageOnce = true;
+ const char* pMsg =
+ "Missing vcl resource. This indicates that
files vital to localization are missing. "
+ "You might have a corrupt installation.";
+ fprintf( stderr, "%s\n", pMsg );
+ ErrorBox aBox( NULL, WB_OK | WB_DEF_OK, rtl::OUString(
pMsg, strlen( pMsg ), RTL_TEXTENCODING_ASCII_US ) );
+ aBox.Execute();
+ }
+ }
+ return pSVData->mpResMgr;
}
ResId VclResId( sal_Int32 nId )
{
- ResMgr* pMgr = ImplGetResMgr();
- if( ! pMgr )
- throw std::bad_alloc();
-
- return ResId( nId, *pMgr );
+ ResMgr* pMgr = ImplGetResMgr();
+ if( ! pMgr )
+ throw std::bad_alloc();
+
+ return ResId( nId, *pMgr );
}
FieldUnitStringList* ImplGetFieldUnits()
{
- ImplSVData* pSVData = ImplGetSVData();
- if( ! pSVData->maCtrlData.mpFieldUnitStrings )
- {
- ResMgr* pResMgr = ImplGetResMgr();
- if( pResMgr )
- {
- ResStringArray aUnits( ResId (SV_FUNIT_STRINGS, *pResMgr) );
- sal_uInt32 nUnits = aUnits.Count();
- pSVData->maCtrlData.mpFieldUnitStrings = new FieldUnitStringList();
- pSVData->maCtrlData.mpFieldUnitStrings->reserve( nUnits );
- for( sal_uInt32 i = 0; i < nUnits; i++ )
- {
- std::pair< String, FieldUnit > aElement( aUnits.GetString(i),
static_cast<FieldUnit>(aUnits.GetValue(i)) );
- pSVData->maCtrlData.mpFieldUnitStrings->push_back( aElement );
- }
- }
- }
- return pSVData->maCtrlData.mpFieldUnitStrings;
+ ImplSVData* pSVData = ImplGetSVData();
+ if( ! pSVData->maCtrlData.mpFieldUnitStrings )
+ {
+ ResMgr* pResMgr = ImplGetResMgr();
+ if( pResMgr )
+ {
+ ResStringArray aUnits( ResId (SV_FUNIT_STRINGS,
*pResMgr) );
+ sal_uInt32 nUnits = aUnits.Count();
+ pSVData->maCtrlData.mpFieldUnitStrings = new
FieldUnitStringList();
+ pSVData->maCtrlData.mpFieldUnitStrings->reserve( nUnits
);
+ for( sal_uInt32 i = 0; i < nUnits; i++ )
+ {
+ std::pair< String, FieldUnit > aElement(
aUnits.GetString(i), static_cast<FieldUnit>(aUnits.GetValue(i)) );
+
pSVData->maCtrlData.mpFieldUnitStrings->push_back( aElement );
+ }
+ }
+ }
+ return pSVData->maCtrlData.mpFieldUnitStrings;
}
FieldUnitStringList* ImplGetCleanedFieldUnits()
{
- ImplSVData* pSVData = ImplGetSVData();
- if( ! pSVData->maCtrlData.mpCleanUnitStrings )
- {
- FieldUnitStringList* pUnits = ImplGetFieldUnits();
- if( pUnits )
- {
- size_t nUnits = pUnits->size();
- pSVData->maCtrlData.mpCleanUnitStrings = new FieldUnitStringList();
- pSVData->maCtrlData.mpCleanUnitStrings->reserve( nUnits );
- for( size_t i = 0; i < nUnits; i++ )
- {
- String aUnit( (*pUnits)[i].first );
- aUnit.EraseAllChars( sal_Unicode( ' ' ) );
- aUnit.ToLowerAscii();
- std::pair< String, FieldUnit > aElement( aUnit,
(*pUnits)[i].second );
- pSVData->maCtrlData.mpCleanUnitStrings->push_back( aElement );
- }
- }
- }
- return pSVData->maCtrlData.mpCleanUnitStrings;
+ ImplSVData* pSVData = ImplGetSVData();
+ if( ! pSVData->maCtrlData.mpCleanUnitStrings )
+ {
+ FieldUnitStringList* pUnits = ImplGetFieldUnits();
+ if( pUnits )
+ {
+ size_t nUnits = pUnits->size();
+ pSVData->maCtrlData.mpCleanUnitStrings = new
FieldUnitStringList();
+ pSVData->maCtrlData.mpCleanUnitStrings->reserve( nUnits
);
+ for( size_t i = 0; i < nUnits; i++ )
+ {
+ String aUnit( (*pUnits)[i].first );
+ aUnit.EraseAllChars( sal_Unicode( ' ' ) );
+ aUnit.ToLowerAscii();
+ std::pair< String, FieldUnit > aElement( aUnit,
(*pUnits)[i].second );
+
pSVData->maCtrlData.mpCleanUnitStrings->push_back( aElement );
+ }
+ }
+ }
+ return pSVData->maCtrlData.mpCleanUnitStrings;
}
DockingManager* ImplGetDockingManager()
{
- ImplSVData* pSVData = ImplGetSVData();
- if ( !pSVData->mpDockingManager )
- pSVData->mpDockingManager = new DockingManager();
+ ImplSVData* pSVData = ImplGetSVData();
+ if ( !pSVData->mpDockingManager )
+ pSVData->mpDockingManager = new DockingManager();
- return pSVData->mpDockingManager;
+ return pSVData->mpDockingManager;
}
class AccessBridgeCurrentContext: public cppu::WeakImplHelper1<
com::sun::star::uno::XCurrentContext >
{
public:
- AccessBridgeCurrentContext(
- const com::sun::star::uno::Reference<
com::sun::star::uno::XCurrentContext > &context ) :
- m_prevContext( context ) {}
-
- // XCurrentContext
- virtual com::sun::star::uno::Any SAL_CALL getValueByName( const
rtl::OUString& Name )
- throw (com::sun::star::uno::RuntimeException);
+ AccessBridgeCurrentContext(
+ const com::sun::star::uno::Reference<
com::sun::star::uno::XCurrentContext > &context ) :
+ m_prevContext( context ) {}
+
+ // XCurrentContext
+ virtual com::sun::star::uno::Any SAL_CALL getValueByName( const
rtl::OUString& Name )
+ throw (com::sun::star::uno::RuntimeException);
private:
- com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext >
m_prevContext;
+ com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext >
m_prevContext;
};
com::sun::star::uno::Any AccessBridgeCurrentContext::getValueByName( const
rtl::OUString & Name )
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException)
{
- com::sun::star::uno::Any ret;
- if( Name.equalsAscii( "java-vm.interaction-handler" ) )
- {
- // Currently, for accessbility no interaction handler shall be offered.
- // There may be introduced later on a handler using native toolkits
- // jbu->obr: Instantiate here your interaction handler
- }
- else if( m_prevContext.is() )
- {
- ret = m_prevContext->getValueByName( Name );
- }
- return ret;
+ com::sun::star::uno::Any ret;
+ if( Name.equalsAscii( "java-vm.interaction-handler" ) )
+ {
+ // Currently, for accessibility no interaction handler shall be
offered.
+ // There may be introduced later on a handler using native
toolkits
+ // jbu->obr: Instantiate here your interaction handler
+ }
+ else if( m_prevContext.is() )
+ {
+ ret = m_prevContext->getValueByName( Name );
+ }
+ return ret;
}
#ifdef WNT
void AccessBridgehandleExistingWindow(Window * pWindow, bool bShow)
{
- if ( pWindow )
- {
- css::uno::Reference< css::accessibility::XAccessible > xAccessible;
-
- // Test for combo box - drop down floating windows first
- Window * pParentWindow = pWindow->GetParent();
-
- if ( pParentWindow )
- {
- try
- {
- // The parent window of a combo box floating window should
have the role COMBO_BOX
- css::uno::Reference< css::accessibility::XAccessible >
xParentAccessible(pParentWindow->GetAccessible());
- if ( xParentAccessible.is() )
- {
- css::uno::Reference<
css::accessibility::XAccessibleContext > xParentAC(
xParentAccessible->getAccessibleContext() );
- if ( xParentAC.is() &&
(css::accessibility::AccessibleRole::COMBO_BOX ==
xParentAC->getAccessibleRole()) )
- {
- // O.k. - this is a combo box floating window
corresponding to the child of role LIST of the parent.
- // Let's not rely on a specific child order, just
search for the child with the role LIST
- sal_Int32 nCount =
xParentAC->getAccessibleChildCount();
- for ( sal_Int32 n = 0; (n < nCount) &&
!xAccessible.is(); n++)
- {
- css::uno::Reference<
css::accessibility::XAccessible > xChild = xParentAC->getAccessibleChild(n);
- if ( xChild.is() )
- {
- css::uno::Reference<
css::accessibility::XAccessibleContext > xChildAC =
xChild->getAccessibleContext();
- if ( xChildAC.is() &&
(css::accessibility::AccessibleRole::LIST == xChildAC->getAccessibleRole()) )
- {
- xAccessible = xChild;
- }
- }
- }
- }
- }
- }
- catch (::com::sun::star::uno::RuntimeException e)
- {
- // Ignore show events that throw DisposedExceptions in
getAccessibleContext(),
- // but keep revoking these windows in hide(s).
- if (bShow)
- return;
- }
- }
-
- // We have to rely on the fact that
Window::GetAccessible()->getAccessibleContext() returns a valid
XAccessibleContext
- // also for other menus than menubar or toplevel popup window.
Otherwise we had to traverse the hierarchy to find the
- // context object to this menu floater. This makes the call to
Window->IsMenuFloatingWindow() obsolete.
- if ( ! xAccessible.is() )
- xAccessible = pWindow->GetAccessible();
+ if ( pWindow )
+ {
+ css::uno::Reference< css::accessibility::XAccessible >
xAccessible;
+
+ // Test for combo box - drop down floating windows first
+ Window * pParentWindow = pWindow->GetParent();
+
+ if ( pParentWindow )
+ {
+ try
+ {
+ // The parent window of a combo box floating
window should have the role COMBO_BOX
+ css::uno::Reference<
css::accessibility::XAccessible >
xParentAccessible(pParentWindow->GetAccessible());
+ if ( xParentAccessible.is() )
+ {
+ css::uno::Reference<
css::accessibility::XAccessibleContext > xParentAC(
xParentAccessible->getAccessibleContext() );
+ if ( xParentAC.is() &&
(css::accessibility::AccessibleRole::COMBO_BOX ==
xParentAC->getAccessibleRole()) )
+ {
+ // O.k. - this is a combo box
floating window corresponding to the child of role LIST of the parent.
+ // Let's not rely on a specific
child order, just search for the child with the role LIST
+ sal_Int32 nCount =
xParentAC->getAccessibleChildCount();
+ for ( sal_Int32 n = 0; (n <
nCount) && !xAccessible.is(); n++)
+ {
+ css::uno::Reference<
css::accessibility::XAccessible > xChild = xParentAC->getAccessibleChild(n);
+ if ( xChild.is() )
+ {
+
css::uno::Reference< css::accessibility::XAccessibleContext > xChildAC =
xChild->getAccessibleContext();
+ if (
xChildAC.is() && (css::accessibility::AccessibleRole::LIST ==
xChildAC->getAccessibleRole()) )
+ {
+
xAccessible = xChild;
+ }
+ }
+ }
+ }
+ }
+ }
+ catch (::com::sun::star::uno::RuntimeException e)
+ {
+ // Ignore show events that throw
DisposedExceptions in getAccessibleContext(),
+ // but keep revoking these windows in hide(s).
+ if (bShow)
+ return;
+ }
+ }
+
+ // We have to rely on the fact that
Window::GetAccessible()->getAccessibleContext() returns a valid
XAccessibleContext
+ // also for other menus than menubar or toplevel popup window.
Otherwise we had to traverse the hierarchy to find the
+ // context object to this menu floater. This makes the call to
Window->IsMenuFloatingWindow() obsolete.
+ if ( ! xAccessible.is() )
+ xAccessible = pWindow->GetAccessible();
if ( xAccessible.is() && g_acc_manager1 )
- {
+ {
g_acc_manager1->handleWindowOpened(
(long)(xAccessible.get()));
- }
- }
+ }
+ }
}
void AccessBridgeupdateOldTopWindows()
@@ -423,286 +423,285 @@ void AccessBridgeupdateOldTopWindows()
for (sal_uInt16 i = 0; i < nTopWindowCount; i++)
{
Window* pTopWindow = Application::GetTopWindow( i );
- css::uno::Reference< css::accessibility::XAccessible > xAccessible =
pTopWindow->GetAccessible();
- if ( xAccessible.is() )
- {
+ css::uno::Reference< css::accessibility::XAccessible >
xAccessible = pTopWindow->GetAccessible();
+ if ( xAccessible.is() )
+ {
css::uno::Reference<
css::accessibility::XAccessibleContext >
xAC(xAccessible->getAccessibleContext());
- if ( xAC.is())
- {
- short role = xAC->getAccessibleRole();
- if(xAC->getAccessibleName().getLength() > 0)
+ if ( xAC.is())
+ {
+ short role = xAC->getAccessibleRole();
+ if(xAC->getAccessibleName().getLength() > 0)
AccessBridgehandleExistingWindow(pTopWindow, true);
- }
- }
+ }
+ }
}
}
#endif
bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
{
- rCancelled = sal_False;
+ rCancelled = sal_False;
+
+ sal_Bool bErrorMessage = sal_True;
+
+ // Note:
+ // if bAllowCancel is sal_True we were called from application startup
+ // where we will disable any Java errorboxes and show our own
accessibility dialog if Java throws an exception
+ // if bAllowCancel is sal_False we were called from Tools->Options
+ // where we will see Java errorboxes, so we do not show our dialogs in
addition to Java's
- sal_Bool bErrorMessage = sal_True;
+ try
+ {
+ 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 = sal_False;
+ }
- // Note:
- // if bAllowCancel is sal_True we were called from application startup
- // where we will disable any Java errorboxes and show our own
accessibility dialog if Java throws an exception
- // if bAllowCancel is sal_False we were called from Tools->Options
- // where we will see Java errorboxes, se we do not show our dialogs in
addition to Java's
-
- try
- {
- 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 = sal_False;
- }
-
- ImplSVData* pSVData = ImplGetSVData();
- if( ! pSVData->mxAccessBridge.is() )
- {
- css::uno::Reference< XMultiServiceFactory >
xFactory(vcl::unohelper::GetMultiServiceFactory());
+ ImplSVData* pSVData = ImplGetSVData();
+ if( ! pSVData->mxAccessBridge.is() )
+ {
+ css::uno::Reference< XMultiServiceFactory >
xFactory(vcl::unohelper::GetMultiServiceFactory());
- if( xFactory.is() )
- {
+ if( xFactory.is() )
+ {
#ifdef WNT
pSVData->mxAccessBridge =
xFactory->createInstance(
- OUString::createFromAscii(
"com.sun.star.accessibility.MSAAService" ) );
- if( pSVData->mxAccessBridge.is() )
- {
- css::uno::Reference< css::uno::XInterface >
pRManager= pSVData->mxAccessBridge;
- g_acc_manager1 =
(css::accessibility::XMSAAService*)(pRManager.get());
+ OUString::createFromAscii(
"com.sun.star.accessibility.MSAAService" ) );
+ if( pSVData->mxAccessBridge.is() )
+ {
+ css::uno::Reference<
css::uno::XInterface > pRManager= pSVData->mxAccessBridge;
+ g_acc_manager1 =
(css::accessibility::XMSAAService*)(pRManager.get());
AccessBridgeupdateOldTopWindows();
- }
-
- if( !pSVData->mxAccessBridge.is() )
- bSuccess = sal_False;
- return bSuccess;
+ }
+
+ if( !pSVData->mxAccessBridge.is() )
+ bSuccess = sal_False;
+ return bSuccess;
#endif
- css::uno::Reference< XExtendedToolkit > xToolkit =
- css::uno::Reference< XExtendedToolkit
>(Application::GetVCLToolkit(), UNO_QUERY);
+ css::uno::Reference< XExtendedToolkit >
xToolkit =
+ css::uno::Reference< XExtendedToolkit
>(Application::GetVCLToolkit(), UNO_QUERY);
- Sequence< Any > arguments(1);
- arguments[0] = makeAny(xToolkit);
+ Sequence< Any > arguments(1);
+ arguments[0] = makeAny(xToolkit);
- // Disable default java error messages on startup, because
they were probably unreadable
- // for a disabled user. Use native message boxes which
are accessible without java support.
- // No need to do this when activated by
Tools-Options dialog ..
- if( bAllowCancel )
- {
- // customize the
java-not-available-interaction-handler entry within the
- // current context when called at startup.
+ // Disable default java error messages on
startup, because they were probably unreadable
+ // for a disabled user. Use native message
boxes which are accessible without java support.
+ // No need to do this when activated by
Tools-Options dialog...
+ if( bAllowCancel )
+ {
+ // customize the
java-not-available-interaction-handler entry within the
+ // current context when called at
startup.
com::sun::star::uno::ContextLayer layer(
new AccessBridgeCurrentContext(
com::sun::star::uno::getCurrentContext() ) );
- pSVData->mxAccessBridge =
xFactory->createInstanceWithArguments(
- OUString::createFromAscii(
"com.sun.star.accessibility.AccessBridge" ),
- arguments
- );
+ pSVData->mxAccessBridge =
xFactory->createInstanceWithArguments(
+
OUString::createFromAscii( "com.sun.star.accessibility.AccessBridge" ),
+ arguments
+ );
}
else
{
- pSVData->mxAccessBridge =
xFactory->createInstanceWithArguments(
- OUString::createFromAscii(
"com.sun.star.accessibility.AccessBridge" ),
- arguments
- );
+ pSVData->mxAccessBridge =
xFactory->createInstanceWithArguments(
+
OUString::createFromAscii( "com.sun.star.accessibility.AccessBridge" ),
+ arguments
+ );
}
-
- if( !pSVData->mxAccessBridge.is() )
- bSuccess = sal_False;
- }
- }
-
- return bSuccess;
- }
-
- catch(::com::sun::star::java::JavaNotConfiguredException&)
- {
- ResMgr *pResMgr = ImplGetResMgr();
- if( bErrorMessage && bAllowCancel && pResMgr )
- {
- String aTitle(ResId(SV_ACCESSERROR_JAVA_NOT_CONFIGURED, *pResMgr));
- String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr));
-
- aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US);
- aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr));
-
- int ret = ImplGetSalSystem()->ShowNativeMessageBox(
- aTitle,
- ReplaceJavaErrorMessages(aMessage),
- SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL,
- SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL);
-
- // Do not change the setting in case the user chooses to cancel
- if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
- }
-
- return sal_False;
- }
-
- catch(::com::sun::star::java::JavaVMCreationFailureException&)
- {
- ResMgr *pResMgr = ImplGetResMgr();
- if( bErrorMessage && bAllowCancel && pResMgr )
- {
- String aTitle(ResId(SV_ACCESSERROR_FAULTY_JAVA, *pResMgr));
- String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr));
-
- aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US);
- aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr));
-
- int ret = ImplGetSalSystem()->ShowNativeMessageBox(
- aTitle,
- ReplaceJavaErrorMessages(aMessage),
- SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL,
- SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL);
-
- // Do not change the setting in case the user chooses to cancel
- if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
- }
-
- return sal_False;
- }
-
- catch(::com::sun::star::java::MissingJavaRuntimeException&)
- {
- ResMgr *pResMgr = ImplGetResMgr();
- if( bErrorMessage && bAllowCancel && pResMgr )
- {
- String aTitle(ResId(SV_ACCESSERROR_MISSING_JAVA, *pResMgr));
- String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr));
-
- aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US);
- aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr));
-
- int ret = ImplGetSalSystem()->ShowNativeMessageBox(
- aTitle,
- ReplaceJavaErrorMessages(aMessage),
- SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL,
- SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL);
-
- // Do not change the setting in case the user chooses to cancel
- if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
- }
-
- return sal_False;
- }
-
- catch(::com::sun::star::java::JavaDisabledException&)
- {
- ResMgr *pResMgr = ImplGetResMgr();
- if( bErrorMessage && bAllowCancel && pResMgr )
- {
- String aTitle(ResId(SV_ACCESSERROR_JAVA_DISABLED, *pResMgr));
- String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr));
-
- aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US);
- aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr));
-
- int ret = ImplGetSalSystem()->ShowNativeMessageBox(
- aTitle,
- ReplaceJavaErrorMessages(aMessage),
- SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL,
- SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL);
-
- // Do not change the setting in case the user chooses to cancel
- if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
- }
-
- return sal_False;
- }
-
-
- catch(::com::sun::star::uno::RuntimeException& e)
- {
- ResMgr *pResMgr = ImplGetResMgr();
- if( bErrorMessage && pResMgr )
- {
- String aTitle;
- String aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr));
-
- if( 0 ==
e.Message.compareTo(::rtl::OUString::createFromAscii("ClassNotFound"), 13) )
- {
- aTitle = String(ResId(SV_ACCESSERROR_MISSING_BRIDGE,
*pResMgr));
- }
- else if( 0 ==
e.Message.compareTo(::rtl::OUString::createFromAscii("NoSuchMethod"), 12) )
- {
- aTitle = String(ResId(SV_ACCESSERROR_WRONG_VERSION, *pResMgr));
- }
-
- if( aTitle.Len() != 0 )
- {
- if( bAllowCancel )
- {
- // Something went wrong initializing the Java AccessBridge
(on Windows) during the
- // startup. Since the office will be probably unusable for
a disabled user, we offer
- // to terminate directly.
- aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US);
- aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG,
*pResMgr));
-
- int ret = ImplGetSalSystem()->ShowNativeMessageBox(
- aTitle,
- ReplaceJavaErrorMessages(aMessage),
- SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL,
- SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL);
-
- // Do not change the setting in case the user chooses to
cancel
- if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
- }
- else
- {
- // The user tried to activate accessibility support using
Tools-Options dialog,
- // so we don't offer to terminate here !
- ImplGetSalSystem()->ShowNativeMessageBox(
- aTitle,
- ReplaceJavaErrorMessages(aMessage),
- SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK,
- SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK);
- }
- }
- }
-
- return sal_False;
- }
-
- catch (...)
- {
- return sal_False;
- }
+
+ if( !pSVData->mxAccessBridge.is() )
+ bSuccess = sal_False;
+ }
+ }
+
+ return bSuccess;
+ }
+
+ catch(::com::sun::star::java::JavaNotConfiguredException&)
+ {
+ ResMgr *pResMgr = ImplGetResMgr();
+ if( bErrorMessage && bAllowCancel && pResMgr )
+ {
+ String aTitle(ResId(SV_ACCESSERROR_JAVA_NOT_CONFIGURED,
*pResMgr));
+ String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG,
*pResMgr));
+
+ aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US);
+ aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG,
*pResMgr));
+
+ int ret = ImplGetSalSystem()->ShowNativeMessageBox(
+ aTitle,
+ ReplaceJavaErrorMessages(aMessage),
+ SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL,
+ SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL);
+
+ // Do not change the setting in case the user chooses
to cancel
+ if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
+ rCancelled = sal_True;
+ }
+
+ return sal_False;
+ }
+
+ catch(::com::sun::star::java::JavaVMCreationFailureException&)
+ {
+ ResMgr *pResMgr = ImplGetResMgr();
+ if( bErrorMessage && bAllowCancel && pResMgr )
+ {
+ String aTitle(ResId(SV_ACCESSERROR_FAULTY_JAVA,
*pResMgr));
+ String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG,
*pResMgr));
+
+ aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US);
+ aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG,
*pResMgr));
+
+ int ret = ImplGetSalSystem()->ShowNativeMessageBox(
+ aTitle,
+ ReplaceJavaErrorMessages(aMessage),
+ SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL,
+ SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL);
+
+ // Do not change the setting in case the user chooses
to cancel
+ if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
+ rCancelled = sal_True;
+ }
+
+ return sal_False;
+ }
+
+ catch(::com::sun::star::java::MissingJavaRuntimeException&)
+ {
+ ResMgr *pResMgr = ImplGetResMgr();
+ if( bErrorMessage && bAllowCancel && pResMgr )
+ {
+ String aTitle(ResId(SV_ACCESSERROR_MISSING_JAVA,
*pResMgr));
+ String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG,
*pResMgr));
+
+ aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US);
+ aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG,
*pResMgr));
+
+ int ret = ImplGetSalSystem()->ShowNativeMessageBox(
+ aTitle,
+ ReplaceJavaErrorMessages(aMessage),
+ SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL,
+ SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL);
+
+ // Do not change the setting in case the user chooses
to cancel
+ if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
+ rCancelled = sal_True;
+ }
+
+ return sal_False;
+ }
+
+ catch(::com::sun::star::java::JavaDisabledException&)
+ {
+ ResMgr *pResMgr = ImplGetResMgr();
+ if( bErrorMessage && bAllowCancel && pResMgr )
+ {
+ String aTitle(ResId(SV_ACCESSERROR_JAVA_DISABLED,
*pResMgr));
+ String aMessage(ResId(SV_ACCESSERROR_JAVA_MSG,
*pResMgr));
+
+ aMessage += String(" ", 1, RTL_TEXTENCODING_ASCII_US);
+ aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG,
*pResMgr));
+
+ int ret = ImplGetSalSystem()->ShowNativeMessageBox(
+ aTitle,
+ ReplaceJavaErrorMessages(aMessage),
+ SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL,
+ SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL);
+
+ // Do not change the setting in case the user chooses
to cancel
+ if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
+ rCancelled = sal_True;
+ }
+
+ return sal_False;
+ }
+
+
+ catch(::com::sun::star::uno::RuntimeException& e)
+ {
+ ResMgr *pResMgr = ImplGetResMgr();
+ if( bErrorMessage && pResMgr )
+ {
+ String aTitle;
+ String aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG,
*pResMgr));
+
+ if( 0 ==
e.Message.compareTo(::rtl::OUString::createFromAscii("ClassNotFound"), 13) )
+ {
+ aTitle =
String(ResId(SV_ACCESSERROR_MISSING_BRIDGE, *pResMgr));
+ }
+ else if( 0 ==
e.Message.compareTo(::rtl::OUString::createFromAscii("NoSuchMethod"), 12) )
+ {
+ aTitle =
String(ResId(SV_ACCESSERROR_WRONG_VERSION, *pResMgr));
+ }
+
+ if( aTitle.Len() != 0 )
+ {
+ if( bAllowCancel )
+ {
+ // Something went wrong initializing
the Java AccessBridge (on Windows) during the
+ // startup. Since the office will be
probably unusable for a disabled user, we offer
+ // to terminate directly.
+ aMessage += String(" ", 1,
RTL_TEXTENCODING_ASCII_US);
+ aMessage +=
String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr));
+
+ int ret =
ImplGetSalSystem()->ShowNativeMessageBox(
+ aTitle,
+
ReplaceJavaErrorMessages(aMessage),
+
SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL,
+
SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL);
+
+ // Do not change the setting in case
the user chooses to cancel
+ if(
SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
+ rCancelled = sal_True;
+ }
+ else
+ {
+ // The user tried to activate
accessibility support using Tools-Options dialog,
+ // so we don't offer to terminate here !
+
ImplGetSalSystem()->ShowNativeMessageBox(
+ aTitle,
+
ReplaceJavaErrorMessages(aMessage),
+
SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK,
+
SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK);
+ }
+ }
+ }
+
+ return sal_False;
+ }
+
+ catch (...)
+ {
+ return sal_False;
+ }
}
// -----------------------------------------------------------------------
Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos )
{
- ImplSVData* pSVData = ImplGetSVData();
- Window* pFrameWindow = pSVData->maWinData.mpFirstFrame;
- while ( pFrameWindow )
- {
- if ( pFrameWindow->ImplGetFrame() == pFrame )
- {
- Window* pWindow = pFrameWindow->ImplFindWindow( rSalFramePos );
- if ( !pWindow )
- pWindow = pFrameWindow->ImplGetWindow();
- rSalFramePos = pWindow->ImplFrameToOutput( rSalFramePos );
- return pWindow;
- }
- pFrameWindow = pFrameWindow->ImplGetFrameData()->mpNextFrame;
- }
+ ImplSVData* pSVData = ImplGetSVData();
+ Window* pFrameWindow = pSVData->maWinData.mpFirstFrame;
+ while ( pFrameWindow )
+ {
+ if ( pFrameWindow->ImplGetFrame() == pFrame )
+ {
+ Window* pWindow = pFrameWindow->ImplFindWindow(
rSalFramePos );
+ if ( !pWindow )
+ pWindow = pFrameWindow->ImplGetWindow();
+ rSalFramePos = pWindow->ImplFrameToOutput( rSalFramePos
);
+ return pWindow;
+ }
+ pFrameWindow = pFrameWindow->ImplGetFrameData()->mpNextFrame;
+ }
- return NULL;
+ return NULL;
}
void LocaleConfigurationListener::ConfigurationChanged(
utl::ConfigurationBroadcaster*, sal_uInt32 nHint )
{
AllSettings::LocaleSettingsChanged( nHint );
}
-
