Avoid getTokenCount in favor of getToken

Order of token extraction is inverted, but since elements are inserted
in a set their final order won't be affected.

Change-Id: I7f22a518e3d6a9a53951aa89159a36b398af5f46

1 files changed, 8 insertions, 3 deletions

diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index 67e35e638d48..cdb606f0d67d 100644
--- a/cui/source/dialogs/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -20,7 +20,6 @@
 #include <set>
 #include <map>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/string.hxx>
 
 #include <vcl/stdtext.hxx>
 
@@ -64,16 +63,22 @@ void fillNetscapePluginFilters( Sequence< OUString >& rPluginNames, Sequence< OU
     {
         const PluginDescription & rDescr = pDescriptions[nPos];
 
+        // consistency check for the do {} while loop below
+        if (rDescr.Extension.isEmpty())
+            continue;
+
         StrSet& rTypes = aMap[ rDescr.Description ];
         OUString aExtension( rDescr.Extension );
 
-        for ( sal_uInt16 nCnt = comphelper::string::getTokenCount(aExtension,  ';'); nCnt--; )
+        sal_Int32 nIndex = 0;
+        do
         {
             // no default plugins anymore
-            OUString aExt( aExtension.getToken( nCnt, ';' ) );
+            const OUString aExt( aExtension.getToken( 0, ';', nIndex ) );
             if ( aExt != "*.*" )
                 rTypes.insert( aExt );
         }
+        while ( nIndex >= 0 );
     }
 
     rPluginNames = Sequence< OUString >( aMap.size() );