diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-02-24 14:17:11 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-24 16:46:46 +0000 |
commit | 1dc601f1b62485e50fe43a8037aa5eb59c60cfe9 (patch) | |
tree | fe11c6fe160235027f06e457aa1247508bf6634b | |
parent | 9cbef2656e07867fd84c9350d8b9e9baeb9bcef5 (diff) |
basic: remove un-used return value indicating failure
-rw-r--r-- | basic/source/inc/namecont.hxx | 8 | ||||
-rw-r--r-- | basic/source/uno/namecont.cxx | 26 |
2 files changed, 15 insertions, 19 deletions
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 26f04f847b4c..8f585b502502 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -348,8 +348,8 @@ protected: BasicManager* getBasicManager( void ); ::rtl::OUString createAppLibraryFolder( SfxLibrary* pLib, const ::rtl::OUString& aName ); - sal_Bool init( const ::rtl::OUString& rInitialDocumentURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage ); + void init( const ::rtl::OUString& rInitialDocumentURL, + const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage ); virtual const sal_Char* SAL_CALL getInfoFileName() const = 0; virtual const sal_Char* SAL_CALL getOldInfoFileName() const = 0; @@ -383,8 +383,8 @@ protected: virtual void SAL_CALL disposing(); private: - sal_Bool init_Impl( const ::rtl::OUString& rInitialDocumentURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage ); + void init_Impl( const ::rtl::OUString& rInitialDocumentURL, + const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage ); void implScanExtensions( void ); public: diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index db72a4fc640a..a76ff93faf39 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -586,20 +586,18 @@ static void createVariableURL( OUString& rStr, const OUString& rLibName, rStr += OUString(RTL_CONSTASCII_USTRINGPARAM(".xlb/")); } -sal_Bool SfxLibraryContainer::init( const OUString& rInitialDocumentURL, const uno::Reference< embed::XStorage >& rxInitialStorage ) +void SfxLibraryContainer::init( const OUString& rInitialDocumentURL, const uno::Reference< embed::XStorage >& rxInitialStorage ) { // this might be called from within the ctor, and the impl_init might (indirectly) create // an UNO reference to ourself. // Ensure that we're not destroyed while we're in here osl_incrementInterlockedCount( &m_refCount ); - sal_Bool bSuccess = init_Impl( rInitialDocumentURL, rxInitialStorage ); + init_Impl( rInitialDocumentURL, rxInitialStorage ); osl_decrementInterlockedCount( &m_refCount ); - - return bSuccess; } -sal_Bool SfxLibraryContainer::init_Impl( - const OUString& rInitialDocumentURL, const uno::Reference< embed::XStorage >& rxInitialStorage ) +void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, + const uno::Reference< embed::XStorage >& rxInitialStorage ) { uno::Reference< embed::XStorage > xStorage = rxInitialStorage; @@ -632,8 +630,8 @@ sal_Bool SfxLibraryContainer::init_Impl( meInitMode = LIBRARY_INIT_FILE; uno::Reference< embed::XStorage > xDummyStor; ::xmlscript::LibDescriptor aLibDesc; - sal_Bool bReadIndexFile = implLoadLibraryIndexFile( NULL, aLibDesc, xDummyStor, aInitFileName ); - return bReadIndexFile; + implLoadLibraryIndexFile( NULL, aLibDesc, xDummyStor, aInitFileName ); + return; } else { @@ -643,7 +641,7 @@ sal_Bool SfxLibraryContainer::init_Impl( { meInitMode = OLD_BASIC_STORAGE; importFromOldStorage( aInitFileName ); - return sal_True; + return; } else { @@ -670,7 +668,7 @@ sal_Bool SfxLibraryContainer::init_Impl( if( !xParser.is() ) { SAL_WARN("basic", "couldn't create sax parser component"); - return sal_False; + return; } uno::Reference< io::XInputStream > xInput; @@ -821,12 +819,12 @@ sal_Bool SfxLibraryContainer::init_Impl( catch ( const xml::sax::SAXException& e ) { SAL_WARN("basic", e.Message); - return sal_False; + return; } catch ( const io::IOException& e ) { SAL_WARN("basic", e.Message); - return sal_False; + return; } sal_Int32 nLibCount = pLibArray->mnLibCount; @@ -962,7 +960,7 @@ sal_Bool SfxLibraryContainer::init_Impl( // Only in the first pass it's an error when no index file is found else if( nPass == 0 ) { - return sal_False; + return; } } @@ -1225,8 +1223,6 @@ sal_Bool SfxLibraryContainer::init_Impl( {} } } - - return sal_True; } void SfxLibraryContainer::implScanExtensions( void ) |