diff options
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/classes/filtercachedata.hxx | 23 | ||||
| -rw-r--r-- | framework/inc/recording/dispatchrecorder.hxx | 4 |
2 files changed, 7 insertions, 20 deletions
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index b01fbbc51667..813940752247 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -355,17 +355,6 @@ class PerformanceHash : public std::unordered_map< OUString, { }; -// Define easy usable types - -typedef SetNodeHash< FileType > FileTypeHash; -typedef SetNodeHash< Filter > FilterHash; -typedef SetNodeHash< Detector > DetectorHash; -typedef SetNodeHash< Loader > LoaderHash; -typedef SetNodeHash< ContentHandler > ContentHandlerHash; -typedef OUStringHashMap PreferredHash; -typedef OUStringList OrderList; - - // Use private static data container to hold all values of configuration! @@ -398,16 +387,16 @@ class DataContainer DataContainer(); - FileTypeHash m_aTypeCache; /// hold all information about registered file types - FilterHash m_aFilterCache; /// hold all information about registered filters - DetectorHash m_aDetectorCache; /// hold all information about registered detect services - LoaderHash m_aLoaderCache; /// hold all information about registered loader services - ContentHandlerHash m_aContentHandlerCache; /// hold all information about registered content handler services + SetNodeHash< FileType > m_aTypeCache; /// hold all information about registered file types + SetNodeHash< Filter > m_aFilterCache; /// hold all information about registered filters + SetNodeHash< Detector > m_aDetectorCache; /// hold all information about registered detect services + SetNodeHash< Loader > m_aLoaderCache; /// hold all information about registered loader services + SetNodeHash< ContentHandler > m_aContentHandlerCache; /// hold all information about registered content handler services PerformanceHash m_aFastFilterCache; /// hold all registered filter for a special file type PerformanceHash m_aFastDetectorCache; /// hold all registered detect services for a special file type PerformanceHash m_aFastLoaderCache; /// hold all registered loader services for a special file type PerformanceHash m_aFastContentHandlerCache; /// hold all registered content handler services for a special file type - PreferredHash m_aPreferredTypesCache; /// assignment of extensions to preferred types for it + OUStringHashMap m_aPreferredTypesCache; /// assignment of extensions to preferred types for it Loader m_aGenericLoader; /// information about our default frame loader OUString m_sLocale; /// current set locale of configuration to handle right UIName from set of all UINames! bool m_bTypesModified; diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index 80128e748d9d..abe2c91ab627 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -45,8 +45,6 @@ namespace framework{ -typedef ::std::vector < com::sun::star::frame::DispatchStatement > DispatchStatementList; - class DispatchRecorder : public ::cppu::WeakImplHelper3< css::lang::XServiceInfo @@ -55,7 +53,7 @@ class DispatchRecorder { // private member private: - DispatchStatementList m_aStatements; + ::std::vector < css::frame::DispatchStatement > m_aStatements; sal_Int32 m_nRecordingID; css::uno::Reference< css::script::XTypeConverter > m_xConverter; |