Revert "tdf#57308 - Basic IDE: Watching of a variable does not work"
This reverts commit f9ce4b2d04b58843d7986acd9382864b0b30d617.
Reason for revert: Cast to SbxVsriable instead of SbxMethod causes the code to start over
Change-Id: I8f00f8f13faef8cb8c6db4e8c2a096a921f8714b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124187
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index f320e70..5457ebc 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 b6e64fb..2d7b988 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
