diff options
| author | Arnold Dumas <arnold@dumas.at> | 2016-02-15 22:32:15 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-16 12:47:55 +0000 |
| commit | fd3cb8d8222113cbc7bf472060ac77233706ea1f (patch) | |
| tree | 18101abe775445d30e6c0db6d131b4dc280bee55 | |
| parent | ab199e4748b45384602479c735dbac538e714d34 (diff) | |
tdf#39440: reduce scope of local variables
Change-Id: I6ba411d2e07240821518281996d543f71acf3259
Reviewed-on: https://gerrit.libreoffice.org/22378
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | basic/source/sbx/sbxdec.cxx | 5 | ||||
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 3 | ||||
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index 1616771bc4c3..b073ea12dc2d 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -354,15 +354,12 @@ void SbxDecimal::getString( OUString& rString ) #ifdef _WIN32 static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); - bool bRet = false; - OLECHAR sz[100]; BSTR aBStr = SysAllocString( sz ); if( aBStr != NULL ) { HRESULT hResult = VarBstrFromDec( &maDec, nLANGID, 0, &aBStr ); - bRet = ( hResult == S_OK ); - if( bRet ) + if( hResult == S_OK ) { // Convert delimiter sal_Unicode cDecimalSep; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 1ee99db17f67..79108f71b3a3 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1347,7 +1347,6 @@ bool EscherPropertyContainer::ImplCreateEmbeddedBmp( const OString& rUniqueId ) void EscherPropertyContainer::CreateEmbeddedBitmapProperties( const OUString& rBitmapUrl, css::drawing::BitmapMode eBitmapMode ) { - bool bRetValue = false; OUString aVndUrl( "vnd.sun.star.GraphicObject:" ); OUString aBmpUrl( rBitmapUrl ); sal_Int32 nIndex = aBmpUrl.indexOf( aVndUrl ); @@ -1357,7 +1356,7 @@ void EscherPropertyContainer::CreateEmbeddedBitmapProperties( if( aBmpUrl.getLength() > nIndex ) { OString aUniqueId(OUStringToOString(aBmpUrl.copy(nIndex, aBmpUrl.getLength() - nIndex), RTL_TEXTENCODING_UTF8)); - bRetValue = ImplCreateEmbeddedBmp( aUniqueId ); + bool bRetValue = ImplCreateEmbeddedBmp( aUniqueId ); if( bRetValue ) { // bitmap mode property diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 163bbbfc69cc..c89a5775460e 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -485,14 +485,14 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem GlobalSettings* &rGlobalSettings, bool &bInGlobalSettings, const Reference< XComponentContext > &rComponentContext ) { - bool bGetSettingsState( false ); - SolarMutexResettableGuard aWriteLock; Reference< XNameAccess > xPersistentWindowState( rPersistentWindowState ); aWriteLock.clear(); if ( xPersistentWindowState.is() ) { + bool bGetSettingsState( false ); + aWriteLock.reset(); bool bGlobalSettings( bInGlobalSettings ); GlobalSettings* pGlobalSettings( nullptr ); |