Kaydet (Commit) c319ccfc authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Revert "Simplify ImplRepository::impl_getLocationForModel return type"

This reverts commit 72305ed4, which was bogus,
cf. the comment in ImplRepository::getDocumentBasicManager about recursive
calls.
üst 73b2ea1d
...@@ -107,7 +107,7 @@ namespace basic ...@@ -107,7 +107,7 @@ namespace basic
@precond @precond
our mutex is locked our mutex is locked
*/ */
BasicManager* BasicManager*&
impl_getLocationForModel( const Reference< XModel >& _rxDocumentModel ); impl_getLocationForModel( const Reference< XModel >& _rxDocumentModel );
/** creates a new BasicManager instance for the given model /** creates a new BasicManager instance for the given model
...@@ -232,7 +232,7 @@ namespace basic ...@@ -232,7 +232,7 @@ namespace basic
thus a recursive call of this function will find and return it thus a recursive call of this function will find and return it
without creating another instance. without creating another instance.
*/ */
BasicManager* pBasicManager = impl_getLocationForModel( _rxDocumentModel ); BasicManager*& pBasicManager = impl_getLocationForModel( _rxDocumentModel );
if ( pBasicManager == NULL ) if ( pBasicManager == NULL )
impl_createManagerForModel( pBasicManager, _rxDocumentModel ); impl_createManagerForModel( pBasicManager, _rxDocumentModel );
...@@ -363,12 +363,12 @@ namespace basic ...@@ -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 ); Reference< XInterface > xNormalized( _rxDocumentModel, UNO_QUERY );
DBG_ASSERT( _rxDocumentModel.is(), "ImplRepository::impl_getLocationForModel: invalid model!" ); DBG_ASSERT( _rxDocumentModel.is(), "ImplRepository::impl_getLocationForModel: invalid model!" );
BasicManager* location = m_aStore[ xNormalized ]; BasicManager*& location = m_aStore[ xNormalized ];
return location; return location;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment