diff options
author | Noel Grandin <noel@peralex.com> | 2014-10-02 14:37:06 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-03 05:25:41 +0000 |
commit | c625525ddcc5bd1ceb1be95031da6047280d623c (patch) | |
tree | f3469c6d418dadd723d4b91b8166015b3f6442b9 /basic | |
parent | 4a0fc2fb026ee46f7ef8e75135e2ae9b411ae134 (diff) |
rename SvRef::AddRef to AddFirstRef
to make it's intended purpose clearly distinguishable from AddNextRef
Change-Id: I5da780b48b19fd873667b648031bc394113f953b
Reviewed-on: https://gerrit.libreoffice.org/11763
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 4 | ||||
-rw-r--r-- | basic/source/runtime/runtime.cxx | 6 | ||||
-rw-r--r-- | basic/source/sbx/sbxexec.cxx | 12 | ||||
-rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 5ff07672600b..351508c6490e 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2103,11 +2103,11 @@ ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller ) } // RefCount vom Modul hochzaehlen SbModule* pMod_ = static_cast<SbModule*>(GetParent()); - pMod_->AddRef(); + pMod_->AddFirstRef(); // Increment the RefCount of the Basic StarBASIC* pBasic = static_cast<StarBASIC*>(pMod_->GetParent()); - pBasic->AddRef(); + pBasic->AddFirstRef(); // Establish the values to get the return value SbxValues aVals; diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index e8354d69ddf5..8cae088a738f 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1406,7 +1406,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp ) { pNULL = new SbxVariable; pNULL->PutNull(); - pNULL->AddRef(); + pNULL->AddFirstRef(); } PushVar( pNULL ); } @@ -1416,7 +1416,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp ) { pTRUE = new SbxVariable; pTRUE->PutBool( true ); - pTRUE->AddRef(); + pTRUE->AddFirstRef(); } PushVar( pTRUE ); } @@ -1426,7 +1426,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp ) { pFALSE = new SbxVariable; pFALSE->PutBool( false ); - pFALSE->AddRef(); + pFALSE->AddFirstRef(); } PushVar( pFALSE ); } diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx index c77719326f25..1afee5726b89 100644 --- a/basic/source/sbx/sbxexec.cxx +++ b/basic/source/sbx/sbxexec.cxx @@ -108,7 +108,7 @@ static SbxVariable* QualifiedName SbxBase::SetError( SbxERR_SYNTAX ); *ppBuf = p; if( refVar.Is() ) - refVar->AddRef(); + refVar->AddFirstRef(); return refVar; } @@ -166,7 +166,7 @@ static SbxVariable* Operand } *ppBuf = p; if( refVar.Is() ) - refVar->AddRef(); + refVar->AddFirstRef(); return refVar; } @@ -201,7 +201,7 @@ static SbxVariable* MulDiv( SbxObject* pObj, SbxObject* pGbl, const sal_Unicode* } *ppBuf = p; if( refVar.Is() ) - refVar->AddRef(); + refVar->AddFirstRef(); return refVar; } @@ -233,7 +233,7 @@ static SbxVariable* PlusMinus( SbxObject* pObj, SbxObject* pGbl, const sal_Unico } *ppBuf = p; if( refVar.Is() ) - refVar->AddRef(); + refVar->AddFirstRef(); return refVar; } @@ -271,7 +271,7 @@ static SbxVariable* Assign( SbxObject* pObj, SbxObject* pGbl, const sal_Unicode* } *ppBuf = p; if( refVar.Is() ) - refVar->AddRef(); + refVar->AddFirstRef(); return refVar; } @@ -339,7 +339,7 @@ static SbxVariable* Element } *ppBuf = p; if( refVar.Is() ) - refVar->AddRef(); + refVar->AddFirstRef(); return refVar; } diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index be6bd871d000..605cfe3b33e0 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -68,7 +68,7 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase() case SbxOBJECT: aData.pObj = (SbxBase*) p; if( p ) - aData.pObj->AddRef(); + aData.pObj->AddFirstRef(); break; case SbxDECIMAL: aData.pDecimal = (SbxDecimal*) p; @@ -107,7 +107,7 @@ SbxValue::SbxValue( const SbxValue& r ) break; case SbxOBJECT: if( aData.pObj ) - aData.pObj->AddRef(); + aData.pObj->AddFirstRef(); break; case SbxDECIMAL: if( aData.pDecimal ) @@ -542,7 +542,7 @@ bool SbxValue::Put( const SbxValues& rVal ) bool bParentProp = pThisVar && 5345 == ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) ); if ( !bParentProp ) - p->aData.pObj->AddRef(); + p->aData.pObj->AddFirstRef(); } } else |