Resolve OUStringList typedef

Change-Id: Ifb5dc5128b5619abb83eea427c7fb1115fd825f3

framework/inc/classes/converter.hxx

@@ -39,7 +39,7 @@ class FWI_DLLPUBLIC Converter
         static css::uno::Sequence< css::beans::NamedValue >    convert_seqPropVal2seqNamedVal  ( const css::uno::Sequence< css::beans::PropertyValue >& lSource );
 
         // Seq<String> => Vector<String>
-        static OUStringList                                    convert_seqOUString2OUStringList( const css::uno::Sequence< OUString >&           lSource );
+        static std::vector<OUString> convert_seqOUString2OUStringList( const css::uno::Sequence< OUString >&           lSource );
 
         static OUString                                 convert_DateTime2ISO8601        ( const DateTime&                                        aSource );
 };

framework/inc/classes/filtercachedata.hxx

@@ -113,8 +113,8 @@ struct FileType
         OUString            sMediaType;
         OUString            sClipboardFormat;
         sal_Int32           nDocumentIconID;
-        OUStringList        lURLPattern;
-        OUStringList        lExtensions;
+        std::vector<OUString> lURLPattern;
+        std::vector<OUString> lExtensions;
 };
 
 // These struct describe a filter which is registered for one type.
@@ -179,7 +179,7 @@ struct Filter
         OUString     sFilterService;
         OUString     sUIComponent;
         sal_Int32           nFlags;
-        OUStringList        lUserData;
+        std::vector<OUString> lUserData;
         sal_Int32           nFileFormatVersion;
         OUString     sTemplateName;
 };
@@ -220,7 +220,7 @@ struct Detector
     public:
 
         OUString     sName;
-        OUStringList        lTypes;
+        std::vector<OUString> lTypes;
 };
 
 // Programmer can register his own services for loading documents in a frame.
@@ -262,7 +262,7 @@ struct Loader
 
         OUString sName;
         OUStringHashMap lUINames;
-        OUStringList    lTypes;
+        std::vector<OUString> lTypes;
 };
 
 // Programmer can register his own services to handle a FileType and intercept dispatches.
@@ -300,7 +300,7 @@ struct ContentHandler
     public:
 
         OUString     sName;
-        OUStringList        lTypes;
+        std::vector<OUString> lTypes;
 };
 
 // We need different hash maps for different tables of our configuration management.
@@ -319,7 +319,7 @@ class SetNodeHash : public std::unordered_map< OUString                    ,
 // The preferred hash maps file extensions to preferred types to find these ones faster.
 
 class PerformanceHash   :   public  std::unordered_map< OUString,
-                                                        OUStringList,
+                                                        std::vector<OUString>,
                                                         OUStringHash >
 {
 };

framework/inc/classes/protocolhandlercache.hxx

@@ -52,7 +52,7 @@ struct FWI_DLLPUBLIC ProtocolHandler
         /// the uno implementation name of this handler
         OUString m_sUNOName;
         /// list of URL pattern which defines the protocols which this handler is registered for
-        OUStringList m_lProtocols;
+        std::vector<OUString> m_lProtocols;
 };
 
 /**

framework/inc/stdtypes.h

@@ -79,8 +79,6 @@ struct KeyEventEqualsFunc
     }
 };
 
-typedef ::std::vector< OUString > OUStringList;
-
 /**
     Basic OUString hash.
     Key and values are OUStrings.

framework/source/accelerators/presethandler.cxx

@@ -462,8 +462,8 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
     const OUString*                                   pNames;
           sal_Int32                                          c;
           sal_Int32                                          i;
-          OUStringList                                       lPresets;
-          OUStringList                                       lTargets;
+          std::vector<OUString> lPresets;
+          std::vector<OUString> lTargets;
 
     // read preset names of share layer
     xAccess.set(xShare, css::uno::UNO_QUERY);

framework/source/accelerators/storageholder.cxx

@@ -87,7 +87,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri
                                                                           sal_Int32        nOpenMode)
 {
     OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
-    OUStringList    lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
+    std::vector<OUString> lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
 
     // SAFE -> ----------------------------------
     osl::ResettableMutexGuard aReadLock(m_mutex);
@@ -97,7 +97,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri
 
     css::uno::Reference< css::embed::XStorage > xChild;
     OUString                             sRelPath;
-    OUStringList::const_iterator                pIt;
+    std::vector<OUString>::const_iterator                pIt;
 
     for (  pIt  = lFolders.begin();
            pIt != lFolders.end();
@@ -167,11 +167,11 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri
 StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sPath)
 {
     OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
-    OUStringList    lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
+    std::vector<OUString> lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
 
     StorageHolder::TStorageList  lStoragesOfPath;
     OUString              sRelPath;
-    OUStringList::const_iterator pIt;
+    std::vector<OUString>::const_iterator pIt;
 
     osl::MutexGuard g(m_mutex);
 
@@ -229,14 +229,14 @@ void StorageHolder::commitPath(const OUString& sPath)
 void StorageHolder::closePath(const OUString& rPath)
 {
     OUString sNormedPath = StorageHolder::impl_st_normPath(rPath);
-    OUStringList    lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
+    std::vector<OUString> lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
 
     /* convert list of paths in the following way:
         [0] = "path_1" => "path_1
         [1] = "path_2" => "path_1/path_2"
         [2] = "path_3" => "path_1/path_2/path_3"
     */
-    OUStringList::iterator pIt1;
+    std::vector<OUString>::iterator pIt1;
     OUString        sParentPath;
     for (  pIt1  = lFolders.begin();
            pIt1 != lFolders.end();
@@ -249,7 +249,7 @@ void StorageHolder::closePath(const OUString& rPath)
 
     osl::MutexGuard g(m_mutex);
 
-    OUStringList::reverse_iterator pIt2;
+    std::vector<OUString>::reverse_iterator pIt2;
     for (  pIt2  = lFolders.rbegin();
            pIt2 != lFolders.rend();
          ++pIt2                     )
@@ -355,7 +355,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons
 {
     // normed path = "a/b/c/" ... we search for "a/b/"
     OUString sNormedPath = StorageHolder::impl_st_normPath(sChildPath);
-    OUStringList    lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
+    std::vector<OUString> lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
     sal_Int32       c           = lFolders.size();
 
     // a) ""       => -       => no parent
@@ -498,9 +498,9 @@ OUString StorageHolder::impl_st_normPath(const OUString& sPath)
     return sNormedPath;
 }
 
-OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath)
+std::vector<OUString> StorageHolder::impl_st_parsePath(const OUString& sPath)
 {
-    OUStringList lToken;
+    std::vector<OUString> lToken;
     sal_Int32    i  = 0;
     while (true)
     {

framework/source/fwi/classes/converter.cxx

@@ -40,9 +40,9 @@ css::uno::Sequence< css::beans::NamedValue > Converter::convert_seqPropVal2seqNa
 /**
  * converts a sequence of unicode strings into a vector of such items
  */
-OUStringList Converter::convert_seqOUString2OUStringList( const css::uno::Sequence< OUString >& lSource )
+std::vector<OUString> Converter::convert_seqOUString2OUStringList( const css::uno::Sequence< OUString >& lSource )
 {
-    OUStringList lDestination;
+    std::vector<OUString> lDestination;
     sal_Int32 nCount = lSource.getLength();
 
     for (sal_Int32 nItem=0; nItem<nCount; ++nItem )

framework/source/fwi/classes/protocolhandlercache.cxx

@@ -240,7 +240,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
         aHandler.m_lProtocols = Converter::convert_seqOUString2OUStringList(lTemp);
 
         // register his pattern into the performance search hash
-        for (OUStringList::iterator pItem =aHandler.m_lProtocols.begin();
+        for (std::vector<OUString>::iterator pItem =aHandler.m_lProtocols.begin();
                                     pItem!=aHandler.m_lProtocols.end();
                                     ++pItem                             )
         {

framework/source/inc/accelerators/presethandler.hxx

@@ -126,11 +126,11 @@ class PresetHandler
 
         /** @short  knows the names of all presets inside the current
                     working storage of the share layer. */
-        OUStringList m_lPresets;
+        std::vector<OUString> m_lPresets;
 
         /** @short  knows the names of all targets inside the current
                     working storage of the user layer. */
-        OUStringList m_lTargets;
+        std::vector<OUString> m_lTargets;
 
         /** @short  its the current office locale and will be used
                     to handle localized presets.

framework/source/inc/accelerators/storageholder.hxx

@@ -183,7 +183,7 @@ class StorageHolder
 
             /** @short  TODO
              */
-            static OUStringList impl_st_parsePath(const OUString& sPath);
+            static std::vector<OUString> impl_st_parsePath(const OUString& sPath);
 };
 
 } // namespace framework

framework/source/jobs/jobexecutor.cxx

@@ -71,7 +71,7 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
     /** cached list of all registered event names of cfg for call optimization. */
-    OUStringList m_lEvents;
+    std::vector<OUString> m_lEvents;
 
     /** we listen at the configuration for changes at the event list. */
     ConfigAccess m_aConfig;
@@ -343,7 +343,7 @@ void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent
         OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue);
         if (!sEvent.isEmpty())
         {
-            OUStringList::iterator pEvent = std::find(m_lEvents.begin(), m_lEvents.end(), sEvent);
+            std::vector<OUString>::iterator pEvent = std::find(m_lEvents.begin(), m_lEvents.end(), sEvent);
             if (pEvent == m_lEvents.end())
                 m_lEvents.push_back(sEvent);
         }
@@ -358,7 +358,7 @@ void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent
         OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue);
         if (!sEvent.isEmpty())
         {
-            OUStringList::iterator pEvent = std::find(m_lEvents.begin(), m_lEvents.end(), sEvent);
+            std::vector<OUString>::iterator pEvent = std::find(m_lEvents.begin(), m_lEvents.end(), sEvent);
             if (pEvent != m_lEvents.end())
                 m_lEvents.erase(pEvent);
         }