ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

related tdf#148806 flatten filter/source/msfilter/msvbahelper.cxx

Browse Source 
I don't like mixing big formatting changes with logic changes.

Change-Id: Id2dbdfd751ac86918fe39d6627aa9ce15c794323
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141113
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
This commit is contained in:
Justin Luth
2022-10-09 01:10:59 +02:00
committed by Justin Luth
parent e2abb5bbc0
commit d72571fdd4
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filter/source/msfilter/msvbahelper.cxx
+31 -32
View File
@@ -179,40 +179,39 @@ static bool hasMacro( SfxObjectShell const * pShell, const OUString& sLibrary, O
(void) sMod;
(void) sMacro;
#else
if ( !sLibrary.isEmpty() && !sMacro.isEmpty() )
if (sLibrary.isEmpty() || sMacro.isEmpty())
return false;
BasicManager* pBasicMgr = pShell->GetBasicManager();
if (!pBasicMgr)
return false;
StarBASIC* pBasic = pBasicMgr->GetLib(sLibrary);
if (!pBasic)
{
BasicManager* pBasicMgr = pShell-> GetBasicManager();
if ( pBasicMgr )
sal_uInt16 nId = pBasicMgr->GetLibId(sLibrary);
pBasicMgr->LoadLib(nId);
pBasic = pBasicMgr->GetLib(sLibrary);
}
if (!pBasic)
return false;
if (!sMod.isEmpty()) // we wish to find the macro is a specific module
{
SbModule* pModule = pBasic->FindModule(sMod);
if (!pModule)
return false;
SbMethod* pMeth = pModule->FindMethod(sMacro, SbxClassType::Method);
return pMeth;
}
for (auto const& rModuleRef : pBasic->GetModules())
{
SbMethod* pMeth = rModuleRef->FindMethod(sMacro, SbxClassType::Method);
if (pMeth)
{
StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
if ( !pBasic )
{
sal_uInt16 nId = pBasicMgr->GetLibId( sLibrary );
pBasicMgr->LoadLib( nId );
pBasic = pBasicMgr->GetLib( sLibrary );
}
if ( pBasic )
{
if ( !sMod.isEmpty() ) // we wish to find the macro is a specific module
{
SbModule* pModule = pBasic->FindModule( sMod );
if ( pModule && pModule->FindMethod( sMacro, SbxClassType::Method ))
{
return true;
}
}
else
{
for (auto const& rModuleRef : pBasic->GetModules())
{
if (rModuleRef && rModuleRef->FindMethod(sMacro, SbxClassType::Method))
{
sMod = rModuleRef->GetName();
return true;
}
}
}
}
sMod = rModuleRef->GetName();
return true;
}
}
#endif