diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-02-22 22:05:21 +0600 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-02-23 01:34:45 +0100 |
| commit | ff23937c34d8d6a0870bb326a52192535f7b4810 (patch) | |
| tree | 236bfe7695f0c7d6119dff985f5294b7ae406826 /basic | |
| parent | 33553540eb0109caac74bd8c401b5fa9f2528943 (diff) | |
Fix warning C4459 when building with MSVC without -Wv:18
Discovered by https://gerrit.libreoffice.org/c/core/+/163717
Like these:
C:/lo/core/oox/source/export/shapes.cxx(2411): warning C4459: declaration of 'XML_line' hides global declaration
Change-Id: I74738753254ad1c468025d25bfb0bfe21787180f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163779
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbunoobj.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index e2aaa1aa8f84..5fea3f14179f 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -2424,11 +2424,11 @@ void SbUnoObject::doIntrospection() // Start of a list of all SbUnoMethod-Instances -static SbUnoMethod* pFirst = nullptr; +static SbUnoMethod* s_pFirst = nullptr; void clearUnoMethodsForBasic( StarBASIC const * pBasic ) { - SbUnoMethod* pMeth = pFirst; + SbUnoMethod* pMeth = s_pFirst; while( pMeth ) { SbxObject* pObject = pMeth->GetParent(); @@ -2443,8 +2443,8 @@ void clearUnoMethodsForBasic( StarBASIC const * pBasic ) // set the new StarBASIC as the parent of the module // pObject->SetParent( NULL ); - if( pMeth == pFirst ) - pFirst = pMeth->pNext; + if( pMeth == s_pFirst ) + s_pFirst = pMeth->pNext; else if( pMeth->pPrev ) pMeth->pPrev->pNext = pMeth->pNext; if( pMeth->pNext ) @@ -2457,7 +2457,7 @@ void clearUnoMethodsForBasic( StarBASIC const * pBasic ) pObject->SbxValue::Clear(); // start from the beginning after object clearing, the cycle will end since the method is removed each time - pMeth = pFirst; + pMeth = s_pFirst; } else pMeth = pMeth->pNext; @@ -2469,7 +2469,7 @@ void clearUnoMethodsForBasic( StarBASIC const * pBasic ) void clearUnoMethods() { - SbUnoMethod* pMeth = pFirst; + SbUnoMethod* pMeth = s_pFirst; while( pMeth ) { pMeth->SbxValue::Clear(); @@ -2492,9 +2492,9 @@ SbUnoMethod::SbUnoMethod pParamInfoSeq = nullptr; // enregister the method in a list - pNext = pFirst; + pNext = s_pFirst; pPrev = nullptr; - pFirst = this; + s_pFirst = this; if( pNext ) pNext->pPrev = this; } @@ -2503,8 +2503,8 @@ SbUnoMethod::~SbUnoMethod() { pParamInfoSeq.reset(); - if( this == pFirst ) - pFirst = pNext; + if( this == s_pFirst ) + s_pFirst = pNext; else if( pPrev ) pPrev->pNext = pNext; if( pNext ) |