diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2015-06-07 17:44:13 +0200 |
|---|---|---|
| committer | Arnaud Versini <arnaud.versini@libreoffice.org> | 2015-06-13 11:53:03 +0000 |
| commit | 0766db041e17a7cb1ba2659f88f7e94fec720f67 (patch) | |
| tree | aa1d5cfc0f217cb15716b0b9b1d12f9db46772c2 /basic/source/comp/symtbl.cxx | |
| parent | 2181f936c88811d5b6eb6081355a99a727261a8f (diff) | |
BASIC: Don't use SbiStringPool to pass SbiParser.
Change-Id: I15949e604285d804de1554d36acf36e8a407ebd9
Reviewed-on: https://gerrit.libreoffice.org/16137
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Arnaud Versini <arnaud.versini@libreoffice.org>
Diffstat (limited to 'basic/source/comp/symtbl.cxx')
| -rw-r--r-- | basic/source/comp/symtbl.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx index bc3862847ab5..7a79de8d3fa6 100644 --- a/basic/source/comp/symtbl.cxx +++ b/basic/source/comp/symtbl.cxx @@ -38,10 +38,8 @@ |* ***************************************************************************/ -SbiStringPool::SbiStringPool( SbiParser* p ) -{ - pParser = p; -} +SbiStringPool::SbiStringPool( ) +{} SbiStringPool::~SbiStringPool() {} @@ -89,9 +87,8 @@ short SbiStringPool::Add( double n, SbxDataType t ) |* ***************************************************************************/ -SbiSymPool::SbiSymPool( SbiStringPool& r, SbiSymScope s ) : rStrings( r ) +SbiSymPool::SbiSymPool( SbiStringPool& r, SbiSymScope s, SbiParser* pP ) : rStrings( r ), pParser( pP ) { - pParser = r.GetParser(); eScope = s; pParent = NULL; nCur = @@ -375,7 +372,7 @@ SbiSymPool& SbiSymDef::GetPool() { if( !pPool ) { - pPool = new SbiSymPool( pIn->pParser->aGblStrings, SbLOCAL ); // is dumped + pPool = new SbiSymPool( pIn->pParser->aGblStrings, SbLOCAL, pIn->pParser ); // is dumped } return *pPool; } @@ -396,12 +393,12 @@ SbiSymScope SbiSymDef::GetScope() const SbiProcDef::SbiProcDef( SbiParser* pParser, const OUString& rName, bool bProcDecl ) : SbiSymDef( rName ) - , aParams( pParser->aGblStrings, SbPARAM ) // is dumped - , aLabels( pParser->aLclStrings, SbLOCAL ) // is not dumped + , aParams( pParser->aGblStrings, SbPARAM, pParser ) // is dumped + , aLabels( pParser->aLclStrings, SbLOCAL, pParser ) // is not dumped , mbProcDecl( bProcDecl ) { aParams.SetParent( &pParser->aPublics ); - pPool = new SbiSymPool( pParser->aGblStrings, SbLOCAL ); + pPool = new SbiSymPool( pParser->aGblStrings, SbLOCAL, pParser ); pPool->SetParent( &aParams ); nLine1 = nLine2 = 0; |