strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Simplify ImplRepository::impl_getLocationForModel return type"

Browse source 
This reverts commit 72305ed49d, which was bogus,
cf. the comment in ImplRepository::getDocumentBasicManager about recursive
calls.
This commit is contained in:
Stephan Bergmann 2014-08-22 09:10:40 +02:00
parent 73b2ea1dfa
commit c319ccfc37
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
basic/source/basmgr/basicmanagerrepository.cxx
View file

@ -107,7 +107,7 @@ namespace basic
@precond
our mutex is locked
*/
BasicManager*
BasicManager*&
impl_getLocationForModel( const Reference< XModel >& _rxDocumentModel );
/** creates a new BasicManager instance for the given model
@ -232,7 +232,7 @@ namespace basic
thus a recursive call of this function will find and return it
without creating another instance.
*/
BasicManager* pBasicManager = impl_getLocationForModel( _rxDocumentModel );
BasicManager*& pBasicManager = impl_getLocationForModel( _rxDocumentModel );
if ( pBasicManager == NULL )
impl_createManagerForModel( pBasicManager, _rxDocumentModel );
@ -363,12 +363,12 @@ namespace basic
}
BasicManager* ImplRepository::impl_getLocationForModel( const Reference< XModel >& _rxDocumentModel )
BasicManager*& ImplRepository::impl_getLocationForModel( const Reference< XModel >& _rxDocumentModel )
{
Reference< XInterface > xNormalized( _rxDocumentModel, UNO_QUERY );
DBG_ASSERT( _rxDocumentModel.is(), "ImplRepository::impl_getLocationForModel: invalid model!" );
BasicManager* location = m_aStore[ xNormalized ];
BasicManager*& location = m_aStore[ xNormalized ];
return location;
}