diff options
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/sbx/sbxscan.cxx | 3 | ||||
| -rw-r--r-- | basic/source/uno/scriptcont.cxx | 29 |
2 files changed, 14 insertions, 18 deletions
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index dc598bb05d0f..c725aff2397d 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -90,8 +90,7 @@ ErrCode ImpScan( const OUString& rWSrc, double& nVal, SbxDataType& rType, if( bOnlyIntntl ) { ImpGetIntntlSep( cIntntlDecSep, cIntntlGrpSep, cIntntlDecSepAlt ); - if( bOnlyIntntl ) - cNonIntntlDecSep = cIntntlDecSep; + cNonIntntlDecSep = cIntntlDecSep; // Ensure that the decimal separator alternative is really one. if (cIntntlDecSepAlt && cIntntlDecSepAlt == cNonIntntlDecSep) cIntntlDecSepAlt = 0; diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 3f391e81b03f..aba9aabbee01 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -861,26 +861,23 @@ bool SfxScriptLibraryContainer::implLoadPasswordLibrary { uno::Reference< embed::XStorage > xLibrariesStor; uno::Reference< embed::XStorage > xLibraryStor; - if( bStorage ) - { - try { - xLibrariesStor = mxStorage->openStorageElement( maLibrariesDir, embed::ElementModes::READ ); - if ( !xLibrariesStor.is() ) - { - throw uno::RuntimeException("null returned from openStorageElement"); - } - xLibraryStor = xLibrariesStor->openStorageElement( Name, embed::ElementModes::READ ); - if ( !xLibraryStor.is() ) - { - throw uno::RuntimeException("null returned from openStorageElement"); - } + try { + xLibrariesStor = mxStorage->openStorageElement( maLibrariesDir, embed::ElementModes::READ ); + if ( !xLibrariesStor.is() ) + { + throw uno::RuntimeException("null returned from openStorageElement"); } - catch(const uno::Exception& ) + xLibraryStor = xLibrariesStor->openStorageElement( Name, embed::ElementModes::READ ); + if ( !xLibraryStor.is() ) { - OSL_FAIL( "### couldn't open sub storage for library" ); - return false; + throw uno::RuntimeException("null returned from openStorageElement"); } } + catch(const uno::Exception& ) + { + OSL_FAIL( "### couldn't open sub storage for library" ); + return false; + } for( sal_Int32 i = 0 ; i < nNameCount ; i++ ) { |