mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BASIC: Remove useless static_cast from basmgr.cxx

Browse Source 
Change-Id: If389aaabd22751908beba7dee9dbc79460692524
Reviewed-on: https://gerrit.libreoffice.org/23958
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Arnaud Versini
2016-04-10 10:34:48 +02:00
committed by Caolán McNamara
parent 0207ed2a00
commit d036e4df85
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
basic/source/basmgr/basmgr.cxx
View File

@@ -179,9 +179,8 @@ void BasMgrContainerListenerImpl::insertLibraryImpl( const uno::Reference< scrip
if( !pMgr->GetLib( aLibName ) ) if( !pMgr->GetLib( aLibName ) )
{ {
BasicManager* pBasMgr = static_cast< BasicManager* >( pMgr );
StarBASIC* pLib = StarBASIC* pLib =
pBasMgr->CreateLibForLibContainer( aLibName, xScriptCont ); pMgr->CreateLibForLibContainer( aLibName, xScriptCont );
DBG_ASSERT( pLib, "XML Import: Basic library could not be created"); DBG_ASSERT( pLib, "XML Import: Basic library could not be created");
} }
@@ -190,8 +189,7 @@ void BasMgrContainerListenerImpl::insertLibraryImpl( const uno::Reference< scrip
{ {
// Register listener for library // Register listener for library
Reference< container::XContainerListener > xLibraryListener Reference< container::XContainerListener > xLibraryListener
= static_cast< container::XContainerListener* > = new BasMgrContainerListenerImpl( pMgr, aLibName );
( new BasMgrContainerListenerImpl( pMgr, aLibName ) );
xLibContainer->addContainerListener( xLibraryListener ); xLibContainer->addContainerListener( xLibraryListener );
} }
@@ -534,7 +532,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, Star
// in an 6.0+ office. So also the old basic dialogs can be saved. // in an 6.0+ office. So also the old basic dialogs can be saved.
tools::SvRef<SotStorageStream> xManagerStream = rStorage.OpenSotStream( szManagerStream, eStreamReadMode ); tools::SvRef<SotStorageStream> xManagerStream = rStorage.OpenSotStream( szManagerStream, eStreamReadMode );
mpImpl->mpManagerStream = new SvMemoryStream(); mpImpl->mpManagerStream = new SvMemoryStream();
static_cast<SvStream*>(&xManagerStream)->ReadStream( *mpImpl->mpManagerStream ); xManagerStream->ReadStream( *mpImpl->mpManagerStream );
tools::SvRef<SotStorage> xBasicStorage = rStorage.OpenSotStorage( szBasicStorage, eStorageReadMode, false ); tools::SvRef<SotStorage> xBasicStorage = rStorage.OpenSotStorage( szBasicStorage, eStorageReadMode, false );
if( xBasicStorage.Is() && !xBasicStorage->GetError() ) if( xBasicStorage.Is() && !xBasicStorage->GetError() )
@@ -546,7 +544,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, Star
BasicLibInfo& rInfo = *mpImpl->aLibs[nL]; BasicLibInfo& rInfo = *mpImpl->aLibs[nL];
tools::SvRef<SotStorageStream> xBasicStream = xBasicStorage->OpenSotStream( rInfo.GetLibName(), eStreamReadMode ); tools::SvRef<SotStorageStream> xBasicStream = xBasicStorage->OpenSotStream( rInfo.GetLibName(), eStreamReadMode );
mpImpl->mppLibStreams[nL] = new SvMemoryStream(); mpImpl->mppLibStreams[nL] = new SvMemoryStream();
static_cast<SvStream*>(&xBasicStream)->ReadStream( *( mpImpl->mppLibStreams[nL] ) ); xBasicStream->ReadStream( *( mpImpl->mppLibStreams[nL] ) );
} }
} }
} }
@@ -607,8 +605,7 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
// Register listener for lib container // Register listener for lib container
OUString aEmptyLibName; OUString aEmptyLibName;
uno::Reference< container::XContainerListener > xLibContainerListener uno::Reference< container::XContainerListener > xLibContainerListener
= static_cast< container::XContainerListener* > = new BasMgrContainerListenerImpl( this, aEmptyLibName );
( new BasMgrContainerListenerImpl( this, aEmptyLibName ) );
uno::Reference< container::XContainer> xLibContainer( xScriptCont, uno::UNO_QUERY ); uno::Reference< container::XContainer> xLibContainer( xScriptCont, uno::UNO_QUERY );
xLibContainer->addContainerListener( xLibContainerListener ); xLibContainer->addContainerListener( xLibContainerListener );
@@ -1801,8 +1798,7 @@ uno::Any ModuleContainer_Impl::getByName( const OUString& aName )
SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : nullptr; SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : nullptr;
if( !pMod ) if( !pMod )
throw container::NoSuchElementException(); throw container::NoSuchElementException();
uno::Reference< script::XStarBasicModuleInfo > xMod = static_cast<XStarBasicModuleInfo*>(new ModuleInfo_Impl uno::Reference< script::XStarBasicModuleInfo > xMod = new ModuleInfo_Impl( aName, "StarBasic", pMod->GetSource32() );
( aName, "StarBasic", pMod->GetSource32() ));
uno::Any aRetAny; uno::Any aRetAny;
aRetAny <<= xMod; aRetAny <<= xMod;
return aRetAny; return aRetAny;
@@ -1941,7 +1937,8 @@ sal_Bool DialogContainer_Impl::hasElements()
for( sal_Int16 nObj = 0; nObj < nCount ; nObj++ ) for( sal_Int16 nObj = 0; nObj < nCount ; nObj++ )
{ {
SbxVariable* pVar = mpLib->GetObjects()->Get( nObj ); SbxVariable* pVar = mpLib->GetObjects()->Get( nObj );
if ( nullptr != dynamic_cast<const SbxObject*>( pVar) && ( static_cast<SbxObject*>(pVar)->GetSbxId() == SBXID_DIALOG ) ) SbxObject* pObj = dynamic_cast<SbxObject*>(pVar);
if ( pObj && (pObj->GetSbxId() == SBXID_DIALOG ) )
{ {
bRet = true; bRet = true;
break; break;
@@ -1955,15 +1952,14 @@ uno::Any DialogContainer_Impl::getByName( const OUString& aName )
throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{ {
SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxCLASS_DONTCARE ); SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxCLASS_DONTCARE );
if( !( pVar && nullptr != dynamic_cast<const SbxObject*>( pVar) && SbxObject* pObj = dynamic_cast<SbxObject*>(pVar);
( static_cast<SbxObject*>(pVar)->GetSbxId() == SBXID_DIALOG ) ) ) if( !( pObj && pObj->GetSbxId() == SBXID_DIALOG ) )
{ {
throw container::NoSuchElementException(); throw container::NoSuchElementException();
} }
uno::Reference< script::XStarBasicDialogInfo > xDialog = uno::Reference< script::XStarBasicDialogInfo > xDialog =
static_cast<XStarBasicDialogInfo*>(new DialogInfo_Impl new DialogInfo_Impl(aName, implGetDialogData(pObj));
( aName, implGetDialogData( static_cast<SbxObject*>(pVar) ) ));
uno::Any aRetAny; uno::Any aRetAny;
aRetAny <<= xDialog; aRetAny <<= xDialog;
@@ -1981,7 +1977,8 @@ uno::Sequence< OUString > DialogContainer_Impl::getElementNames()
for( sal_Int16 nObj = 0; nObj < nCount ; nObj++ ) for( sal_Int16 nObj = 0; nObj < nCount ; nObj++ )
{ {
SbxVariable* pVar = mpLib->GetObjects()->Get( nObj ); SbxVariable* pVar = mpLib->GetObjects()->Get( nObj );
if ( nullptr != dynamic_cast<const SbxObject*>( pVar) && ( static_cast<SbxObject*>(pVar)->GetSbxId() == SBXID_DIALOG ) ) SbxObject* pObj = dynamic_cast<SbxObject*> (pVar);
if ( pObj && ( pObj->GetSbxId() == SBXID_DIALOG ) )
{ {
pRetSeq[ nDialogCounter ] = pVar->GetName(); pRetSeq[ nDialogCounter ] = pVar->GetName();
nDialogCounter++; nDialogCounter++;
@@ -1996,8 +1993,8 @@ sal_Bool DialogContainer_Impl::hasByName( const OUString& aName )
{ {
bool bRet = false; bool bRet = false;
SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxCLASS_DONTCARE ); SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxCLASS_DONTCARE );
if( pVar && nullptr != dynamic_cast<const SbxObject*>( pVar) && SbxObject* pObj = dynamic_cast<SbxObject*>(pVar);
( static_cast<SbxObject*>(pVar)->GetSbxId() == SBXID_DIALOG ) ) if( pObj && ( pObj->GetSbxId() == SBXID_DIALOG ) )
{ {
bRet = true; bRet = true;
} }
@@ -2036,8 +2033,8 @@ void DialogContainer_Impl::removeByName( const OUString& Name )
{ {
(void)Name; (void)Name;
SbxVariable* pVar = mpLib->GetObjects()->Find( Name, SbxCLASS_DONTCARE ); SbxVariable* pVar = mpLib->GetObjects()->Find( Name, SbxCLASS_DONTCARE );
if( !( pVar && nullptr != dynamic_cast<const SbxObject*>( pVar) && SbxObject* pObj = dynamic_cast<SbxObject*>(pVar);
( static_cast<SbxObject*>(pVar)->GetSbxId() == SBXID_DIALOG ) ) ) if( !( pObj && ( pObj->GetSbxId() == SBXID_DIALOG ) ) )
{ {
throw container::NoSuchElementException(); throw container::NoSuchElementException();
} }
@@ -2105,10 +2102,10 @@ uno::Any LibraryContainer_Impl::getByName( const OUString& aName )
StarBASIC* pLib = mpMgr->GetLib( aName ); StarBASIC* pLib = mpMgr->GetLib( aName );
uno::Reference< container::XNameContainer > xModuleContainer = uno::Reference< container::XNameContainer > xModuleContainer =
static_cast<container::XNameContainer*>(new ModuleContainer_Impl( pLib )); new ModuleContainer_Impl( pLib );
uno::Reference< container::XNameContainer > xDialogContainer = uno::Reference< container::XNameContainer > xDialogContainer =
static_cast<container::XNameContainer*>(new DialogContainer_Impl( pLib )); new DialogContainer_Impl( pLib );
BasicLibInfo* pLibInfo = mpMgr->FindLibInfo( pLib ); BasicLibInfo* pLibInfo = mpMgr->FindLibInfo( pLib );
@@ -2220,7 +2217,7 @@ uno::Reference< container::XNameContainer > SAL_CALL StarBasicAccess_Impl::getLi
throw(uno::RuntimeException, std::exception) throw(uno::RuntimeException, std::exception)
{ {
if( !mxLibContainer.is() ) if( !mxLibContainer.is() )
mxLibContainer = static_cast<container::XNameContainer*>(new LibraryContainer_Impl( mpMgr )); mxLibContainer = new LibraryContainer_Impl( mpMgr );
return mxLibContainer; return mxLibContainer;
} }