diff options
Diffstat (limited to 'vcl/source/app/svdata.cxx')
| -rw-r--r-- | vcl/source/app/svdata.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index db166af1b295..269ca4700cab 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ using namespace rtl; namespace { - struct private_aImplSVData : + struct private_aImplSVData : public rtl::Static<ImplSVData, private_aImplSVData> {}; } @@ -178,7 +178,7 @@ Window* ImplGetDefaultWindow() // 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 neccessary + // because then we might have to wait for the solar mutex what is not neccessary // if we already have a default window. if ( !pSVData->mpDefaultWin ) @@ -211,7 +211,7 @@ ResMgr* ImplGetResMgr() { ::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 ) { @@ -232,7 +232,7 @@ ResId VclResId( sal_Int32 nId ) ResMgr* pMgr = ImplGetResMgr(); if( ! pMgr ) throw std::bad_alloc(); - + return ResId( nId, *pMgr ); } @@ -251,7 +251,7 @@ 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); @@ -307,7 +307,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled) if( xFactory.is() ) { - Reference< XExtendedToolkit > xToolkit = + Reference< XExtendedToolkit > xToolkit = Reference< XExtendedToolkit >(Application::GetVCLToolkit(), UNO_QUERY); Sequence< Any > arguments(1); @@ -317,7 +317,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled) // 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( @@ -325,22 +325,22 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled) pSVData->mxAccessBridge = xFactory->createInstanceWithArguments( OUString::createFromAscii( "com.sun.star.accessibility.AccessBridge" ), - arguments + arguments ); } else { pSVData->mxAccessBridge = xFactory->createInstanceWithArguments( OUString::createFromAscii( "com.sun.star.accessibility.AccessBridge" ), - arguments + arguments ); } - + if( !pSVData->mxAccessBridge.is() ) bSuccess = false; } } - + return bSuccess; } @@ -365,7 +365,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled) if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret ) rCancelled = TRUE; } - + return false; } @@ -390,7 +390,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled) if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret ) rCancelled = TRUE; } - + return false; } @@ -415,7 +415,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled) if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret ) rCancelled = TRUE; } - + return false; } @@ -440,7 +440,7 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled) if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret ) rCancelled = TRUE; } - + return false; } @@ -473,8 +473,8 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled) aMessage += String(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr)); int ret = ImplGetSalSystem()->ShowNativeMessageBox( - aTitle, - ReplaceJavaErrorMessages(aMessage), + aTitle, + ReplaceJavaErrorMessages(aMessage), SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL); @@ -487,14 +487,14 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled) // The user tried to activate accessibility support using Tools-Options dialog, // so we don't offer to terminate here ! ImplGetSalSystem()->ShowNativeMessageBox( - aTitle, - ReplaceJavaErrorMessages(aMessage), + aTitle, + ReplaceJavaErrorMessages(aMessage), SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK); } } } - + return false; } |