diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-02-06 16:06:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-08 12:31:10 +0000 |
| commit | 4c411636d9f3e8be085ca02af6fad448838834b1 (patch) | |
| tree | 155932e717fe95d2237c37d18f164fd93c5a50c9 /basic | |
| parent | 310b65e5e93c500ac5ae3981120809df09230e56 (diff) | |
sequence->vector in basic
Change-Id: Ic42f7218bda81effe870d950f666ba7653d60c66
Reviewed-on: https://gerrit.libreoffice.org/22177
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/basmgr/basmgr.cxx | 7 | ||||
| -rw-r--r-- | basic/source/uno/modsizeexceeded.cxx | 4 | ||||
| -rw-r--r-- | basic/source/uno/scriptcont.cxx | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index fce79cabb7f0..c558e8b09e37 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1508,7 +1508,7 @@ uno::Any BasicManager::SetGlobalUNOConstant( const sal_Char* _pAsciiName, const return aOldValue; } -bool BasicManager::LegacyPsswdBinaryLimitExceeded( uno::Sequence< OUString >& _out_rModuleNames ) +bool BasicManager::LegacyPsswdBinaryLimitExceeded( std::vector< OUString >& _out_rModuleNames ) { try { @@ -1531,7 +1531,7 @@ bool BasicManager::LegacyPsswdBinaryLimitExceeded( uno::Sequence< OUString >& _o uno::Sequence< OUString > aElementNames( xScriptLibrary->getElementNames() ); sal_Int32 nLen = aElementNames.getLength(); - uno::Sequence< OUString > aBigModules( nLen ); + std::vector< OUString > aBigModules( nLen ); sal_Int32 nBigModules = 0; const OUString* pElementNames = aElementNames.getConstArray(); @@ -1545,8 +1545,7 @@ bool BasicManager::LegacyPsswdBinaryLimitExceeded( uno::Sequence< OUString >& _o if ( nBigModules ) { - aBigModules.realloc( nBigModules ); - _out_rModuleNames = aBigModules; + _out_rModuleNames.swap(aBigModules); return true; } } diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx index 37235112ba55..a0cf139b8ee2 100644 --- a/basic/source/uno/modsizeexceeded.cxx +++ b/basic/source/uno/modsizeexceeded.cxx @@ -26,10 +26,10 @@ using namespace com::sun::star; using namespace cppu; using namespace osl; -ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< OUString >& sModules ) +ModuleSizeExceeded::ModuleSizeExceeded( const std::vector< OUString >& sModules ) { script::ModuleSizeExceededRequest aReq; - aReq.Names = sModules; + aReq.Names = comphelper::containerToSequence(sModules); m_aRequest <<= aReq; diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index f548c0ad0c79..ab49180eeafd 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -574,7 +574,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons // Only need to handle the export case here, // save/saveas etc are handled in sfxbasemodel::storeSelf & // sfxbasemodel::impl_store - uno::Sequence<OUString> aNames; + std::vector<OUString> aNames; if ( bExport && pBasicMgr->LegacyPsswdBinaryLimitExceeded(aNames) ) { if ( xHandler.is() ) |