diff options
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 6 | ||||
| -rw-r--r-- | extensions/source/bibliography/framectr.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/ole/unoconversionutilities.hxx | 2 | ||||
| -rw-r--r-- | extensions/source/scanner/sane.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 5 |
6 files changed, 11 insertions, 10 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 9bb8581e9ea2..b720f0e9a286 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -695,11 +695,11 @@ bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLay } catch( const uno::Exception& ){} - // make sure that lock state of LM is correct even if an exception is thrown in between - bool bUnlock = false; - bool bLock = false; if ( xOwnLM.is() && xDocAreaAcc.is() ) { + // make sure that lock state of LM is correct even if an exception is thrown in between + bool bUnlock = false; + bool bLock = false; try { // take over the control over the containers window diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 812406335365..ba2f7a8747da 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -323,7 +323,6 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) { const CmdToInfoCache& rCmdCache = GetCommandToInfoCache(); - bool bGroupFound( false ); frame::DispatchInformation aDispatchInfo; std::list< frame::DispatchInformation > aDispatchInfoList; @@ -332,6 +331,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) ( nCommandGroup == frame::CommandGroup::DATA ) || ( nCommandGroup == frame::CommandGroup::VIEW )) { + bool bGroupFound = false; CmdToInfoCache::const_iterator pIter = rCmdCache.begin(); while ( pIter != rCmdCache.end() ) { diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index b263dbed3b21..d0ab45276bec 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -686,9 +686,9 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny, template<class T> void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny) { - bool bIllegal = false; try { + bool bIllegal = false; switch (rAny.getValueTypeClass()) { case TypeClass_INTERFACE: diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 84475d572b5c..ccc597c9b598 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -559,12 +559,13 @@ bool Sane::Start( BitmapTransporter& rBitmap ) int nWidthMM = 0; int nHeightMM = 0; - double fTLx, fTLy, fBRx, fBRy, fResl = 0.0; + double fTLx, fTLy, fResl = 0.0; int nOption; if( ( nOption = GetOptionByName( "tl-x" ) ) != -1 && GetOptionValue( nOption, fTLx, 0 ) && GetOptionUnit( nOption ) == SANE_UNIT_MM ) { + double fBRx; if( ( nOption = GetOptionByName( "br-x" ) ) != -1 && GetOptionValue( nOption, fBRx, 0 ) && GetOptionUnit( nOption ) == SANE_UNIT_MM ) @@ -576,6 +577,7 @@ bool Sane::Start( BitmapTransporter& rBitmap ) GetOptionValue( nOption, fTLy, 0 ) && GetOptionUnit( nOption ) == SANE_UNIT_MM ) { + double fBRy; if( ( nOption = GetOptionByName( "br-y" ) ) != -1 && GetOptionValue( nOption, fBRy, 0 ) && GetOptionUnit( nOption ) == SANE_UNIT_MM ) diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index bc7ee8e4a978..9a4e50cf5484 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -761,11 +761,11 @@ IMPL_LINK( SaneDlg, ModifyHdl, Edit*, pEdit ) } else if( pEdit == mpVectorBox ) { - char pBuf[256]; mnCurrentElement = mpVectorBox->GetValue()-1; double fValue; if( mrSane.GetOptionValue( mnCurrentOption, fValue, mnCurrentElement )) { + char pBuf[256]; sprintf( pBuf, "%g", fValue ); OUString aValue( pBuf, strlen(pBuf), osl_getThreadTextEncoding() ); mpNumericEdit->SetText( aValue ); diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 0ec35467ac31..bf7b6a52a07c 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -465,7 +465,6 @@ UpdateCheckThread::run() { osl_setThreadName("UpdateCheckThread"); - bool bExtensionsChecked = false; TimeValue systime; TimeValue nExtCheckTime; osl_getSystemTime( &nExtCheckTime ); @@ -477,6 +476,7 @@ UpdateCheckThread::run() aResult = m_aCondition.wait(&tv); try { + bool bExtensionsChecked = false; while( schedule() ) { @@ -569,9 +569,8 @@ UpdateCheckThread::run() void SAL_CALL ManualUpdateCheckThread::run() { - bool bExtensionsChecked = false; - try { + bool bExtensionsChecked = false; runCheck( bExtensionsChecked ); m_aCondition.reset(); } |