[Libreoffice-commits] core.git: basctl/source
Noel Power
noel.power at suse.com
Thu Jun 27 07:53:35 PDT 2013
basctl/source/basicide/basobj2.cxx | 37 ++++++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 9 deletions(-)
New commits:
commit 21eeeccfa64a4c03554c1fe3715d38c1695245ab
Author: Noel Power <noel.power at suse.com>
Date: Thu Jun 27 13:58:48 2013 +0100
tweak object catalog to improve switching modules in large Libraries
object catalog when updated updates ( all ) entries and was parsing
the source for every method in every module
Change-Id: Id68e3c24d597d29a86d3507a7dc20745c96dd2a2
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 7e62558..1b1689b 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -42,7 +42,7 @@
#include <vector>
#include <algorithm>
#include <memory>
-
+#include "basic/basmgr.hxx"
namespace basctl
{
@@ -405,13 +405,23 @@ Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUSt
OUString aOUSource;
if ( rDocument.getModule( rLibName, rModName, aOUSource ) )
{
- SbModuleRef xModule = new SbModule( rModName );
- xModule->SetSource32( aOUSource );
- sal_uInt16 nCount = xModule->GetMethods()->Count();
+ BasicManager* pBasMgr = rDocument.getBasicManager();
+ StarBASIC* pSb = pBasMgr ? pBasMgr->GetLib( rLibName ) : NULL;
+ SbModule* pMod = pSb ? pSb->FindModule( rModName ) : NULL;
+
+ SbModuleRef xModule;
+ if ( !pMod )
+ {
+ xModule = new SbModule( rModName );
+ xModule->SetSource32( aOUSource );
+ pMod = xModule;
+ }
+
+ sal_uInt16 nCount = pMod->GetMethods()->Count();
sal_uInt16 nRealCount = nCount;
for ( sal_uInt16 i = 0; i < nCount; i++ )
{
- SbMethod* pMethod = (SbMethod*)xModule->GetMethods()->Get( i );
+ SbMethod* pMethod = (SbMethod*)pMod->GetMethods()->Get( i );
if( pMethod->IsHidden() )
--nRealCount;
}
@@ -420,7 +430,7 @@ Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUSt
sal_uInt16 iTarget = 0;
for ( sal_uInt16 i = 0 ; i < nCount; ++i )
{
- SbMethod* pMethod = (SbMethod*)xModule->GetMethods()->Get( i );
+ SbMethod* pMethod = (SbMethod*)pMod->GetMethods()->Get( i );
if( pMethod->IsHidden() )
continue;
SAL_WARN_IF( !pMethod, "basctl.basicide","Method not found! (NULL)" );
@@ -445,9 +455,18 @@ bool HasMethod (
OUString aOUSource;
if ( rDocument.hasModule( rLibName, rModName ) && rDocument.getModule( rLibName, rModName, aOUSource ) )
{
- SbModuleRef xModule = new SbModule( rModName );
- xModule->SetSource32( aOUSource );
- SbxArray* pMethods = xModule->GetMethods();
+ // Check if we really need to scan the source ( again )
+ BasicManager* pBasMgr = rDocument.getBasicManager();
+ StarBASIC* pSb = pBasMgr ? pBasMgr->GetLib( rLibName ) : NULL;
+ SbModule* pMod = pSb ? pSb->FindModule( rModName ) : NULL;
+ SbModuleRef xModule;
+ if ( !pMod )
+ {
+ xModule = new SbModule( rModName );
+ xModule->SetSource32( aOUSource );
+ pMod = xModule;
+ }
+ SbxArray* pMethods = pMod->GetMethods();
if ( pMethods )
{
SbMethod* pMethod = (SbMethod*)pMethods->Find( rMethName, SbxCLASS_METHOD );
More information about the Libreoffice-commits
mailing list