diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-07 21:44:02 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-07 21:44:02 +0200 |
commit | 4be81de0d623571d81c167f326dfb913fdb08df6 (patch) | |
tree | d84424c73163aa6901a733939190d5af4e613d41 /framework/inc | |
parent | 02041335d89cfb23b59218c9201ff16baf423b81 (diff) |
Resolve OUStringList typedef
Change-Id: Ifb5dc5128b5619abb83eea427c7fb1115fd825f3
Diffstat (limited to 'framework/inc')
-rw-r--r-- | framework/inc/classes/converter.hxx | 2 | ||||
-rw-r--r-- | framework/inc/classes/filtercachedata.hxx | 14 | ||||
-rw-r--r-- | framework/inc/classes/protocolhandlercache.hxx | 2 | ||||
-rw-r--r-- | framework/inc/stdtypes.h | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx index 340940395164..cf8adf1b8546 100644 --- a/framework/inc/classes/converter.hxx +++ b/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 ); }; diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index e16b73a57a3f..5f7f6a3a76b3 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/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 > { }; diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 930ce1768f6f..69e9c9217b58 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/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; }; /** diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index c58c2b71bd4a..dd0afe91f710 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -79,8 +79,6 @@ struct KeyEventEqualsFunc } }; -typedef ::std::vector< OUString > OUStringList; - /** Basic OUString hash. Key and values are OUStrings. |