diff options
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index f320e7014c74..5457ebcce376 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -2373,7 +2373,7 @@ void WatchWindow::UpdateWatches(bool bBasicStopped) eEnableChildren = TRISTATE_TRUE; } - if (SbxVariable const* pVar = dynamic_cast<SbxVariable*>(pSBX)) + if (SbxVariable const* pVar = IsSbxVariable(pSBX)) { // extra treatment of arrays SbxDataType eType = pVar->GetType(); diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index b6e64fbb3c35..2d7b988d7647 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -3754,17 +3754,9 @@ SbxBase* SbiRuntime::FindElementExtern( const OUString& rName ) } if ( !pElem && pMeth ) { - const OUString aMethName = pMeth->GetName(); - // tdf#57308 - check if the name is the current method instance - if (pMeth->GetName() == rName) - { - pElem = pMeth; - } - else - { - // for statics, set the method's name in front - pElem = pMod->Find(aMethName + ":" + rName, SbxClassType::DontCare); - } + // for statics, set the method's name in front + OUString aMethName = pMeth->GetName() + ":" + rName; + pElem = pMod->Find(aMethName, SbxClassType::DontCare); } // search in parameter list |