diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2015-12-19 15:18:01 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-07 12:18:40 +0000 |
| commit | 5e0d36adc3f7f245edfc79230d0871017ba15d5d (patch) | |
| tree | b26f52373a20adb65041a79da23803503abad030 /basctl | |
| parent | a8b10c2841bf38e0f4393594de9b61d9bd3cd842 (diff) | |
BASIC : use std::vector instead of SbArray for Modules.
Change-Id: I9594efb13b3dccc637ccd61eea4b42255c2a775c
Reviewed-on: https://gerrit.libreoffice.org/20817
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/basides1.cxx | 4 | ||||
| -rw-r--r-- | basctl/source/basicide/macrodlg.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index df3021bb79aa..7315853aefeb 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -302,7 +302,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) SbModule* pModule = pBasic->FindModule( rInfo.GetModule() ); if ( !pModule ) { - if ( !rInfo.GetModule().isEmpty() || !pBasic->GetModules()->Count() ) + if ( !rInfo.GetModule().isEmpty() || pBasic->GetModules().empty() ) { OUString aModName = rInfo.GetModule(); @@ -311,7 +311,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) pModule = pBasic->FindModule( aModName ); } else - pModule = static_cast<SbModule*>( pBasic->GetModules()->Get(0) ); + pModule = pBasic->GetModules().front(); } DBG_ASSERT( pModule, "Kein Modul!" ); if ( pModule && !pModule->GetMethods()->Find( rInfo.GetMethod(), SbxCLASS_METHOD ) ) diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 83a5ed471076..8979d4df2eba 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -371,8 +371,8 @@ SbMethod* MacroChooser::CreateMacro() } pModule = pBasic->FindModule( aModName ); } - else if ( pBasic->GetModules()->Count() ) - pModule = static_cast<SbModule*>(pBasic->GetModules()->Get( 0 )); + else if ( !pBasic->GetModules().empty() ) + pModule = pBasic->GetModules().front(); if ( !pModule ) { |