diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-02-13 15:13:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-01 07:34:02 +0000 |
| commit | 8c8fdb0a668d759adac11bd83203c8eeded390d5 (patch) | |
| tree | 0d32ea897828e7bc38e8de1411e653cd4bea941b /extensions/source/propctrlr/formcomponenthandler.cxx | |
| parent | bd66648fc2d361a9a18e62522c244cd245abf198 (diff) | |
sequence->vector in extensions
Change-Id: Iaf7feae5927795e8b5508f9ef49369fad802a57f
Reviewed-on: https://gerrit.libreoffice.org/23689
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'extensions/source/propctrlr/formcomponenthandler.cxx')
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index c44d3d9f74fa..09ec0ed9d895 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -277,9 +277,8 @@ namespace pcr const OUString* pStrings = aStrings.getConstArray(); sal_Int32 nCount = aStrings.getLength(); - Sequence< OUString > aResolvedStrings; - aResolvedStrings.realloc( nCount ); - OUString* pResolvedStrings = aResolvedStrings.getArray(); + std::vector< OUString > aResolvedStrings; + aResolvedStrings.resize( nCount ); try { for ( sal_Int32 i = 0; i < nCount; ++i ) @@ -287,14 +286,14 @@ namespace pcr OUString aIdStr = pStrings[i]; OUString aPureIdStr = aIdStr.copy( 1 ); if( xStringResourceResolver->hasEntryForId( aPureIdStr ) ) - pResolvedStrings[i] = xStringResourceResolver->resolveString( aPureIdStr ); + aResolvedStrings[i] = xStringResourceResolver->resolveString( aPureIdStr ); else - pResolvedStrings[i] = aIdStr; + aResolvedStrings[i] = aIdStr; } } catch( const resource::MissingResourceException & ) {} - aPropertyValue <<= aResolvedStrings; + aPropertyValue <<= comphelper::containerToSequence(aResolvedStrings); } } else @@ -2873,9 +2872,9 @@ namespace pcr const SfxItemSet* pOut = aDlg->GetOutputItemSet(); if ( pOut ) { - Sequence< NamedValue > aFontPropertyValues; + std::vector< NamedValue > aFontPropertyValues; ControlCharacterDialog::translateItemsToProperties( *pOut, aFontPropertyValues ); - _out_rNewValue <<= aFontPropertyValues; + _out_rNewValue <<= comphelper::containerToSequence(aFontPropertyValues); bSuccess = true; } } |