[Libreoffice-commits] core.git: vcl/source

[Noel Grandin (via logerrit)]

 vcl/source/filter/FilterConfigCache.cxx |   18 ++++++++++--------
 vcl/source/filter/FilterConfigCache.hxx |    2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit c1c596b2d9a2f06af384805a95f3a7d072eca447
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Jun 9 08:23:28 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Jun 9 12:07:38 2019 +0200

    Sequence->vector in FilterConfigCache
    
    Change-Id: Iabcad25980977e31e8800a0d2086d097f38037de
    Reviewed-on: https://gerrit.libreoffice.org/73728
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index 4e18ac06a8a1..0f9ab8bae3c9 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -24,6 +24,7 @@
 #include <tools/svlibrary.h>
 #include <com/sun/star/uno/Any.h>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -87,7 +88,7 @@ void FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUString
 OUString FilterConfigCache::FilterConfigCacheEntry::GetShortName()
 {
     OUString aShortName;
-    if ( lExtensionList.hasElements() )
+    if ( !lExtensionList.empty() )
     {
         aShortName = lExtensionList[ 0 ];
         if ( aShortName.startsWith( "*." ) )
@@ -192,7 +193,9 @@ void FilterConfigCache::ImplInit()
                 continue;
 
             xTypeSet->getPropertyValue(SMEDIATYPE) >>= aEntry.sMediaType;
-            xTypeSet->getPropertyValue(SEXTENSIONS) >>= aEntry.lExtensionList;
+            css::uno::Sequence<OUString> tmp;
+            if (xTypeSet->getPropertyValue(SEXTENSIONS) >>= tmp)
+                aEntry.lExtensionList = comphelper::sequenceToContainer<std::vector<OUString>>(tmp);
 
             // The first extension will be used
             // to generate our internal FilterType ( BMP, WMF ... )
@@ -264,8 +267,7 @@ void FilterConfigCache::ImplInitSmart()
 
         OUString    sExtension( OUString::createFromAscii( *pPtr++ ) );
 
-        aEntry.lExtensionList.realloc( 1 );
-        aEntry.lExtensionList[ 0 ] = sExtension;
+        aEntry.lExtensionList.push_back(sExtension);
 
         aEntry.sType = sExtension;
         aEntry.sUIName = sExtension;
@@ -322,9 +324,9 @@ sal_uInt16 FilterConfigCache::GetImportFormatNumberForExtension( const OUString&
     sal_uInt16 nPos = 0;
     for (auto const& elem : aImport)
     {
-        for ( sal_Int32 i = 0; i < elem.lExtensionList.getLength(); i++ )
+        for ( OUString const & s : elem.lExtensionList )
         {
-            if ( elem.lExtensionList[i].equalsIgnoreAsciiCase( rExt ) )
+            if ( s.equalsIgnoreAsciiCase( rExt ) )
                 return nPos;
         }
         ++nPos;
@@ -379,7 +381,7 @@ OUString FilterConfigCache::GetImportFormatShortName( sal_uInt16 nFormat )
 
 OUString FilterConfigCache::GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry )
 {
-    if ( (nFormat < aImport.size()) && (nEntry < aImport[ nFormat ].lExtensionList.getLength()) )
+    if ( (nFormat < aImport.size()) && (size_t(nEntry) < aImport[ nFormat ].lExtensionList.size()) )
         return aImport[ nFormat ].lExtensionList[ nEntry ];
     return OUString();
 }
@@ -504,7 +506,7 @@ OUString FilterConfigCache::GetExportFormatShortName( sal_uInt16 nFormat )
 
 OUString FilterConfigCache::GetExportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry )
 {
-    if ( (nFormat < aExport.size()) && (nEntry < aExport[ nFormat ].lExtensionList.getLength()) )
+    if ( (nFormat < aExport.size()) && (size_t(nEntry) < aExport[ nFormat ].lExtensionList.size()) )
         return aExport[ nFormat ].lExtensionList[ nEntry ];
     return OUString();
 }
diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index 5dc81367e330..5e6e3f1935db 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -33,7 +33,7 @@ class FilterConfigCache
     {
         OUString sInternalFilterName;
         OUString sType;
-        css::uno::Sequence< OUString > lExtensionList;
+        std::vector< OUString > lExtensionList;
         OUString sUIName;
         OUString sExternalFilterName;