incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1341723 - in /incubator/ooo/trunk/main/framework: inc/ inc/classes/ inc/dispatch/ inc/services/ inc/uiconfiguration/ inc/uielement/ inc/uifactory/ inc/xml/ source/fwe/classes/ source/fwi/classes/ source/uiconfiguration/ source/uielement/
Date Wed, 23 May 2012 02:00:42 GMT
Author: arielch
Date: Wed May 23 02:00:41 2012
New Revision: 1341723

URL: http://svn.apache.org/viewvc?rev=1341723&view=rev
Log:
i118556 - replace framework::OUStringHashCode with rtl::OUStringHash

The framework module uses its own hash functions with rtl::OUString's.
It can be replaced by rtl::OUStringHash.  The class
framework::OUStringHash can be renamed to framework::OUStringHashMap,
for the sake of clarity only (there is no risk of name clash because of
different namespaces).

Modified:
    incubator/ooo/trunk/main/framework/inc/classes/converter.hxx
    incubator/ooo/trunk/main/framework/inc/classes/filtercachedata.hxx
    incubator/ooo/trunk/main/framework/inc/dispatch/menudispatcher.hxx
    incubator/ooo/trunk/main/framework/inc/dispatch/popupmenudispatcher.hxx
    incubator/ooo/trunk/main/framework/inc/services/substitutepathvars.hxx
    incubator/ooo/trunk/main/framework/inc/stdtypes.h
    incubator/ooo/trunk/main/framework/inc/uiconfiguration/imagetype.hxx
    incubator/ooo/trunk/main/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
    incubator/ooo/trunk/main/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
    incubator/ooo/trunk/main/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
    incubator/ooo/trunk/main/framework/inc/uiconfiguration/windowstateconfiguration.hxx
    incubator/ooo/trunk/main/framework/inc/uielement/controlmenucontroller.hxx
    incubator/ooo/trunk/main/framework/inc/uielement/menubarmanager.hxx
    incubator/ooo/trunk/main/framework/inc/uielement/uicommanddescription.hxx
    incubator/ooo/trunk/main/framework/inc/uifactory/factoryconfiguration.hxx
    incubator/ooo/trunk/main/framework/inc/uifactory/uielementfactorymanager.hxx
    incubator/ooo/trunk/main/framework/inc/xml/eventsdocumenthandler.hxx
    incubator/ooo/trunk/main/framework/inc/xml/imagesdocumenthandler.hxx
    incubator/ooo/trunk/main/framework/inc/xml/statusbardocumenthandler.hxx
    incubator/ooo/trunk/main/framework/inc/xml/toolboxdocumenthandler.hxx
    incubator/ooo/trunk/main/framework/source/fwe/classes/addonsoptions.cxx
    incubator/ooo/trunk/main/framework/source/fwi/classes/converter.cxx
    incubator/ooo/trunk/main/framework/source/uiconfiguration/imagemanagerimpl.hxx
    incubator/ooo/trunk/main/framework/source/uiconfiguration/uicategorydescription.cxx
    incubator/ooo/trunk/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
    incubator/ooo/trunk/main/framework/source/uiconfiguration/windowstateconfiguration.cxx
    incubator/ooo/trunk/main/framework/source/uielement/toolbarsmenucontroller.cxx
    incubator/ooo/trunk/main/framework/source/uielement/uicommanddescription.cxx

Modified: incubator/ooo/trunk/main/framework/inc/classes/converter.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/classes/converter.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/classes/converter.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/classes/converter.hxx Wed May 23 02:00:41 2012
@@ -74,8 +74,8 @@ class FWI_DLLPUBLIC Converter
         static OUStringList                                    convert_seqOUString2OUStringList(
const css::uno::Sequence< ::rtl::OUString >&           lSource );
         static css::uno::Sequence< ::rtl::OUString >           convert_OUStringList2seqOUString(
const OUStringList&                                    lSource );
 
-        static css::uno::Sequence< css::beans::PropertyValue > convert_OUStringHash2seqProp
   ( const OUStringHash&                                    lSource );
-        static OUStringHash                                    convert_seqProp2OUStringHash
   ( const css::uno::Sequence< css::beans::PropertyValue >& lSource );
+        static css::uno::Sequence< css::beans::PropertyValue > convert_OUStringHash2seqProp
   ( const OUStringHashMap&                                    lSource );
+        static OUStringHashMap                                 convert_seqProp2OUStringHash
   ( const css::uno::Sequence< css::beans::PropertyValue >& lSource );
 
         // String <=> tools.DateTime
         static DateTime                                        convert_String2DateTime  
      ( const ::rtl::OUString&                                 sSource );

Modified: incubator/ooo/trunk/main/framework/inc/classes/filtercachedata.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/classes/filtercachedata.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/classes/filtercachedata.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/classes/filtercachedata.hxx Wed May 23 02:00:41
2012
@@ -241,7 +241,7 @@ struct FileType
 
 		sal_Bool			bPreferred			;
 		::rtl::OUString		sName				;
-        OUStringHash        lUINames            ;
+        OUStringHashMap     lUINames            ;
 		::rtl::OUString		sMediaType			;
 		::rtl::OUString		sClipboardFormat	;
 		sal_Int32			nDocumentIconID		;
@@ -312,7 +312,7 @@ struct Filter
         sal_Int32           nOrder              ;
         ::rtl::OUString     sName               ;
 		::rtl::OUString		sType				;
-        OUStringHash        lUINames            ;
+        OUStringHashMap     lUINames            ;
 		::rtl::OUString		sDocumentService	;
 		::rtl::OUString		sFilterService		;
         ::rtl::OUString     sUIComponent        ;
@@ -411,7 +411,7 @@ struct Loader
 	public:
 
 		::rtl::OUString	sName		;
-        OUStringHash    lUINames    ;
+        OUStringHashMap lUINames    ;
         OUStringList    lTypes      ;
 };
 
@@ -467,7 +467,7 @@ struct ContentHandler
 template< class HashType >
 class SetNodeHash : public ::std::hash_map< ::rtl::OUString                    ,
                                             HashType                           ,
-                                            OUStringHashCode                   ,
+                                            rtl::OUStringHash                  ,
                                             ::std::equal_to< ::rtl::OUString > >
 {
     //-------------------------------------------------------------------------------------------------------------
@@ -508,7 +508,7 @@ class SetNodeHash : public ::std::hash_m
 //*****************************************************************************************************************
 class PerformanceHash   :   public  ::std::hash_map<    ::rtl::OUString              
      ,
                                                         OUStringList                    
   ,
-                                                        OUStringHashCode                
   ,
+                                                        rtl::OUStringHash               
    ,
 														::std::equal_to< ::rtl::OUString >	>
 {
 	public:
@@ -563,7 +563,7 @@ typedef SetNodeHash< Filter >           
 typedef SetNodeHash< Detector >                                     DetectorHash  
             ;
 typedef SetNodeHash< Loader >                                       LoaderHash    
             ;
 typedef SetNodeHash< ContentHandler >                               ContentHandlerHash
         ;
-typedef OUStringHash                                                PreferredHash       
       ;
+typedef OUStringHashMap                                             PreferredHash       
       ;
 typedef OUStringList                                                OrderList           
       ;
 
 typedef CheckedIterator< OUStringList >                             CheckedStringListIterator
  ;
@@ -673,14 +673,14 @@ class DataContainer : private ThreadHelp
                                                                              const ::rtl::OUString&
                                   sCurrentLocale  );
         static void             extractLocalizedStrings                    ( const ::rtl::OUString&
                                   sCurrentLocale  ,
                                                                              const css::uno::Any&
                                     aCFGValue       ,
-                                                                                   OUStringHash&
                                      lLocales        );
+                                                                                   OUStringHashMap&
                                      lLocales        );
         static void             packLocalizedStrings                       (       sal_Int16
                                          nMode           ,
                                                                              const ::rtl::OUString&
                                   sCurrentLocale  ,
                                                                                    css::uno::Any&
                                     aCFGValue       ,
-                                                                             const OUStringHash&
                                      lLocales        );
-        static ::rtl::OUString  getLocalelizedString                       ( const OUStringHash&
                                      lLocales        ,
+                                                                             const OUStringHashMap&
                                      lLocales        );
+        static ::rtl::OUString  getLocalelizedString                       ( const OUStringHashMap&
                                      lLocales        ,
                                                                              const ::rtl::OUString&
                                   sLocale         );
-        static void             setLocalelizedString                       (       OUStringHash&
                                      lLocales        ,
+        static void             setLocalelizedString                       (       OUStringHashMap&
                                      lLocales        ,
                                                                              const ::rtl::OUString&
                                   sLocale         ,
                                                                              const ::rtl::OUString&
                                   sValue          );
         static void             correctExtensions                          (       OUStringList&
                                      lExtensions     );
@@ -745,8 +745,8 @@ class FilterCFGAccess : public ::utl::Co
         static   ::rtl::OUString    encodeStringList( const OUStringList&    lList  
                               ); // build own formated string of OUStringList
         static   OUStringList       decodeStringList( const ::rtl::OUString& sValue 
                               );
 
-        void             setProductName                             (       OUStringHash&
                                      lUINames        );
-        void             resetProductName                           (       OUStringHash&
                                      lUINames        );
+        void             setProductName                             (       OUStringHashMap&
                                      lUINames        );
+        void             resetProductName                           (       OUStringHashMap&
                                      lUINames        );
 
     //-------------------------------------------------------------------------------------------------------------
     //  internal helper

Modified: incubator/ooo/trunk/main/framework/inc/dispatch/menudispatcher.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/dispatch/menudispatcher.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/dispatch/menudispatcher.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/dispatch/menudispatcher.hxx Wed May 23 02:00:41
2012
@@ -82,7 +82,7 @@ namespace framework{
 *//*-*************************************************************************************************************/
 
 typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<	::rtl::OUString			,
-														OUStringHashCode		,
+														rtl::OUStringHash,
 														std::equal_to< ::rtl::OUString > > IMPL_ListenerHashContainer;
 
 

Modified: incubator/ooo/trunk/main/framework/inc/dispatch/popupmenudispatcher.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/dispatch/popupmenudispatcher.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/dispatch/popupmenudispatcher.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/dispatch/popupmenudispatcher.hxx Wed May 23 02:00:41
2012
@@ -94,7 +94,7 @@ namespace framework{
 *//*-*************************************************************************************************************/
 
 typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<	::rtl::OUString			,
-														OUStringHashCode		,
+														rtl::OUStringHash,
 														std::equal_to< ::rtl::OUString > > IMPL_ListenerHashContainer;
 
 

Modified: incubator/ooo/trunk/main/framework/inc/services/substitutepathvars.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/services/substitutepathvars.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/services/substitutepathvars.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/services/substitutepathvars.hxx Wed May 23 02:00:41
2012
@@ -108,7 +108,7 @@ struct SubstitutePathNotify
 
 class SubstituteVariables : public ::std::hash_map< ::rtl::OUString,
                                                     SubstituteRule,
-                                                    OUStringHashCode,
+                                                    rtl::OUStringHash,
                                                     ::std::equal_to< ::rtl::OUString >
>
 {
     public:
@@ -276,7 +276,7 @@ class SubstitutePathVariables : private 
         private:
             class VarNameToIndexMap : public std::hash_map< ::rtl::OUString,
                                                             PreDefVariable,
-                                                            OUStringHashCode,
+                                                            rtl::OUStringHash,
                                                             ::std::equal_to< ::rtl::OUString
> >
             {
                 inline void free()

Modified: incubator/ooo/trunk/main/framework/inc/stdtypes.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/stdtypes.h?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/stdtypes.h (original)
+++ incubator/ooo/trunk/main/framework/inc/stdtypes.h Wed May 23 02:00:41 2012
@@ -58,16 +58,6 @@ namespace framework{
 //  definitions
 //_________________________________________________________________________________________________________________
 
-/**
-    Own hash functions used for stl-structures ... e.g. hash tables/maps ...
-*/
-struct OUStringHashCode
-{
-    size_t operator()( const ::rtl::OUString& sString ) const
-	{
-		return sString.hashCode();
-	}
-};
 
 struct ShortHashCode
 {
@@ -164,7 +154,7 @@ typedef ::std::queue< ::rtl::OUString > 
 template< class TType >
 class BaseHash : public ::std::hash_map< ::rtl::OUString                    ,
                                          TType                              ,
-                                         OUStringHashCode                   ,
+                                         rtl::OUStringHash                  ,
                                          ::std::equal_to< ::rtl::OUString > >
 {
 	public:
@@ -182,7 +172,7 @@ class BaseHash : public ::std::hash_map<
     Basic OUString hash.
     Key and values are OUStrings.
 */
-typedef BaseHash< ::rtl::OUString > OUStringHash;
+typedef BaseHash< ::rtl::OUString > OUStringHashMap;
 
 //_________________________________________________________________________________________________________________
 
@@ -201,7 +191,7 @@ typedef BaseHash< sal_Int32 > NameToHand
     So it's better to declare it one times only!
 */
 typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<  ::rtl::OUString              
     ,
-                                                        OUStringHashCode                
  ,
+                                                        rtl::OUStringHash,
                                                         ::std::equal_to< ::rtl::OUString
> >    ListenerHash;
 
 }       // namespace framework

Modified: incubator/ooo/trunk/main/framework/inc/uiconfiguration/imagetype.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/uiconfiguration/imagetype.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/uiconfiguration/imagetype.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/uiconfiguration/imagetype.hxx Wed May 23 02:00:41
2012
@@ -41,11 +41,11 @@ enum ImageType
 
 typedef std::hash_map< rtl::OUString, 
                        rtl::OUString, 
-                       OUStringHashCode,
+                       rtl::OUStringHash,
                        ::std::equal_to< ::rtl::OUString > > CommandToImageNameMap;
 typedef std::hash_map< rtl::OUString,
                        bool,
-                       OUStringHashCode,
+                       rtl::OUStringHash,
                        ::std::equal_to< ::rtl::OUString > > CommandMap;
 
 }

Modified: incubator/ooo/trunk/main/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx Wed May
23 02:00:41 2012
@@ -93,7 +93,7 @@ namespace framework
                 throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
 
         private:
-            typedef ::std::hash_map< rtl::OUString, com::sun::star::uno::Reference<
::com::sun::star::ui::XUIConfigurationManager >, OUStringHashCode, ::std::equal_to<
rtl::OUString > > ModuleToModuleCfgMgr;
+            typedef ::std::hash_map< rtl::OUString, com::sun::star::uno::Reference<
::com::sun::star::ui::XUIConfigurationManager >, rtl::OUStringHash, ::std::equal_to<
rtl::OUString > > ModuleToModuleCfgMgr;
 
 //TODO_AS            void impl_initStorages();
 

Modified: incubator/ooo/trunk/main/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
(original)
+++ incubator/ooo/trunk/main/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
Wed May 23 02:00:41 2012
@@ -164,7 +164,7 @@ namespace framework
 
 		    struct UIElementType;
             friend struct UIElementType;
-		    typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to<
rtl::OUString > > UIElementDataHashMap;
+		    typedef ::std::hash_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to<
rtl::OUString > > UIElementDataHashMap;
             
             struct UIElementType
             {
@@ -184,7 +184,7 @@ namespace framework
 
             typedef ::std::vector< UIElementType > UIElementTypesVector;
             typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-            typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to<
rtl::OUString > > UIElementInfoHashMap;
+            typedef ::std::hash_map< rtl::OUString, UIElementInfo, rtl::OUStringHash,
::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
 
             // private methods
             void            impl_Initialize();

Modified: incubator/ooo/trunk/main/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/uiconfiguration/uiconfigurationmanager.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/uiconfiguration/uiconfigurationmanager.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/uiconfiguration/uiconfigurationmanager.hxx Wed
May 23 02:00:41 2012
@@ -152,7 +152,7 @@ namespace framework
 
 		    struct UIElementType;
             friend struct UIElementType;
-		    typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to<
rtl::OUString > > UIElementDataHashMap;
+		    typedef ::std::hash_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to<
rtl::OUString > > UIElementDataHashMap;
             
             struct UIElementType
             {
@@ -172,7 +172,7 @@ namespace framework
 
             typedef ::std::vector< UIElementType > UIElementTypesVector;
             typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-            typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to<
rtl::OUString > > UIElementInfoHashMap;
+            typedef ::std::hash_map< rtl::OUString, UIElementInfo, rtl::OUStringHash,
::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
 
             // private methods
             void            impl_Initialize();

Modified: incubator/ooo/trunk/main/framework/inc/uiconfiguration/windowstateconfiguration.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/uiconfiguration/windowstateconfiguration.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/uiconfiguration/windowstateconfiguration.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/uiconfiguration/windowstateconfiguration.hxx Wed
May 23 02:00:41 2012
@@ -106,12 +106,12 @@ class WindowStateConfiguration :  privat
 
         typedef ::std::hash_map< ::rtl::OUString,
                                  ::rtl::OUString,
-                                 OUStringHashCode,
+                                 rtl::OUStringHash,
                                  ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateFileMap;
         
         typedef ::std::hash_map< ::rtl::OUString,
                                  ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess
>,
-                                 OUStringHashCode,
+                                 rtl::OUStringHash,
 								 ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateConfigHashMap;
 
     private:

Modified: incubator/ooo/trunk/main/framework/inc/uielement/controlmenucontroller.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/uielement/controlmenucontroller.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/uielement/controlmenucontroller.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/uielement/controlmenucontroller.hxx Wed May 23
02:00:41 2012
@@ -88,7 +88,7 @@ namespace framework
         
             class UrlToDispatchMap : public ::std::hash_map< ::rtl::OUString,
 													         com::sun::star::uno::Reference< com::sun::star::frame::XDispatch
>,
-                                                             OUStringHashCode,
+                                                             rtl::OUStringHash,
 													         ::std::equal_to< ::rtl::OUString > >
             {
 	            public:

Modified: incubator/ooo/trunk/main/framework/inc/uielement/menubarmanager.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/uielement/menubarmanager.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/uielement/menubarmanager.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/uielement/menubarmanager.hxx Wed May 23 02:00:41
2012
@@ -78,7 +78,7 @@ struct PopupControllerEntry
     ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider >
m_xDispatchProvider;
 };
 
-typedef std::hash_map< rtl::OUString, PopupControllerEntry, OUStringHashCode, ::std::equal_to<
rtl::OUString > > PopupControllerCache;
+typedef std::hash_map< rtl::OUString, PopupControllerEntry, rtl::OUStringHash, ::std::equal_to<
rtl::OUString > > PopupControllerCache;
 
 class BmkMenu;
 class AddonMenu;

Modified: incubator/ooo/trunk/main/framework/inc/uielement/uicommanddescription.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/uielement/uicommanddescription.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/uielement/uicommanddescription.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/uielement/uicommanddescription.hxx Wed May 23 02:00:41
2012
@@ -87,12 +87,12 @@ private:
 public:
         typedef ::std::hash_map< ::rtl::OUString,
                                  ::rtl::OUString,
-                                 OUStringHashCode,
+                                 rtl::OUStringHash,
                                  ::std::equal_to< ::rtl::OUString > > ModuleToCommandFileMap;
-        
+
         typedef ::std::hash_map< ::rtl::OUString,
                                  ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess
>,
-                                 OUStringHashCode,
+                                 rtl::OUStringHash,
 								 ::std::equal_to< ::rtl::OUString > > UICommandsHashMap;
 
     protected:

Modified: incubator/ooo/trunk/main/framework/inc/uifactory/factoryconfiguration.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/uifactory/factoryconfiguration.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/uifactory/factoryconfiguration.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/uifactory/factoryconfiguration.hxx Wed May 23 02:00:41
2012
@@ -92,7 +92,7 @@ private:
     };
     class MenuControllerMap : public std::hash_map< rtl::OUString,
                                                          ControllerInfo,
-                                                         OUStringHashCode,
+                                                         rtl::OUStringHash,
                                                          ::std::equal_to< ::rtl::OUString
> >
     {
         inline void free()

Modified: incubator/ooo/trunk/main/framework/inc/uifactory/uielementfactorymanager.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/uifactory/uielementfactorymanager.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/uifactory/uielementfactorymanager.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/uifactory/uielementfactorymanager.hxx Wed May 23
02:00:41 2012
@@ -88,7 +88,7 @@ namespace framework
     private:
         class FactoryManagerMap : public std::hash_map< rtl::OUString,
                                                      rtl::OUString,
-                                                     OUStringHashCode,
+                                                     rtl::OUStringHash,
                                                      ::std::equal_to< ::rtl::OUString
> >
         {
             inline void free()

Modified: incubator/ooo/trunk/main/framework/inc/xml/eventsdocumenthandler.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/xml/eventsdocumenthandler.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/xml/eventsdocumenthandler.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/xml/eventsdocumenthandler.hxx Wed May 23 02:00:41
2012
@@ -128,7 +128,7 @@ class FWE_DLLPUBLIC OReadEventsDocumentH
 
 		class EventsHashMap : public ::std::hash_map<	::rtl::OUString					,
 														Events_XML_Entry				,
-														OUStringHashCode				,
+														rtl::OUStringHash,
 														::std::equal_to< ::rtl::OUString >	>
 		{
 			public:

Modified: incubator/ooo/trunk/main/framework/inc/xml/imagesdocumenthandler.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/xml/imagesdocumenthandler.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/xml/imagesdocumenthandler.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/xml/imagesdocumenthandler.hxx Wed May 23 02:00:41
2012
@@ -127,7 +127,7 @@ class OReadImagesDocumentHandler : priva
 
 		class ImageHashMap : public ::std::hash_map< ::rtl::OUString		,
 													 Image_XML_Entry		,
-													 OUStringHashCode		,
+													 rtl::OUStringHash,
 													 ::std::equal_to< ::rtl::OUString >	>
 		{
 			public:

Modified: incubator/ooo/trunk/main/framework/inc/xml/statusbardocumenthandler.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/xml/statusbardocumenthandler.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/xml/statusbardocumenthandler.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/xml/statusbardocumenthandler.hxx Wed May 23 02:00:41
2012
@@ -127,7 +127,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocume
 
 		class StatusBarHashMap : public ::std::hash_map< ::rtl::OUString				,
 														 StatusBar_XML_Entry			,
-														 OUStringHashCode				,
+														 rtl::OUStringHash,
 														 ::std::equal_to< ::rtl::OUString >	>
 		{
 			public:

Modified: incubator/ooo/trunk/main/framework/inc/xml/toolboxdocumenthandler.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/inc/xml/toolboxdocumenthandler.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/inc/xml/toolboxdocumenthandler.hxx (original)
+++ incubator/ooo/trunk/main/framework/inc/xml/toolboxdocumenthandler.hxx Wed May 23 02:00:41
2012
@@ -127,7 +127,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocument
 
         class ToolBoxHashMap : public ::std::hash_map<  ::rtl::OUString              
  ,
                                                         ToolBox_XML_Entry               ,
-                                                        OUStringHashCode                ,
+                                                        rtl::OUStringHash,
                                                         ::std::equal_to< ::rtl::OUString
>  >
         {
             public:

Modified: incubator/ooo/trunk/main/framework/source/fwe/classes/addonsoptions.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/fwe/classes/addonsoptions.cxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/fwe/classes/addonsoptions.cxx (original)
+++ incubator/ooo/trunk/main/framework/source/fwe/classes/addonsoptions.cxx Wed May 23 02:00:41
2012
@@ -275,13 +275,6 @@ class AddonsOptions_Impl : public Config
 	//-------------------------------------------------------------------------------------------------------------
 
 	private:
-		struct OUStringHashCode
-		{
-			size_t operator()( const ::rtl::OUString& sString ) const
-			{
-				return sString.hashCode();
-			}
-		};
 
 		struct ImageEntry
 		{
@@ -296,10 +289,10 @@ class AddonsOptions_Impl : public Config
             Image   aImageBigHCNoScale;
 		};
 
-		typedef std::hash_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to<
::rtl::OUString > > ImageManager;
-        typedef std::hash_map< ::rtl::OUString, sal_uInt32, OUStringHashCode, ::std::equal_to<
::rtl::OUString > > StringToIndexMap;
+		typedef std::hash_map< ::rtl::OUString, ImageEntry, rtl::OUStringHash, ::std::equal_to<
::rtl::OUString > > ImageManager;
+        typedef std::hash_map< ::rtl::OUString, sal_uInt32, rtl::OUStringHash, ::std::equal_to<
::rtl::OUString > > StringToIndexMap;
         typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars;
-        typedef ::std::hash_map< ::rtl::OUString, MergeToolbarInstructionContainer, OUStringHashCode,
::std::equal_to< ::rtl::OUString > > ToolbarMergingInstructions;
+        typedef ::std::hash_map< ::rtl::OUString, MergeToolbarInstructionContainer, rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > ToolbarMergingInstructions;
 
         enum ImageSize
         {

Modified: incubator/ooo/trunk/main/framework/source/fwi/classes/converter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/fwi/classes/converter.cxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/fwi/classes/converter.cxx (original)
+++ incubator/ooo/trunk/main/framework/source/fwi/classes/converter.cxx Wed May 23 02:00:41
2012
@@ -147,12 +147,12 @@ css::uno::Sequence< ::rtl::OUString > Co
 /**
  * converts an unicode string hash to a sequence<PropertyValue>, where names and values
match to key and values.
  */
-css::uno::Sequence< css::beans::PropertyValue > Converter::convert_OUStringHash2seqProp(
const OUStringHash& lSource )
+css::uno::Sequence< css::beans::PropertyValue > Converter::convert_OUStringHash2seqProp(
const OUStringHashMap& lSource )
 {
     css::uno::Sequence< css::beans::PropertyValue > lDestination (lSource.size());
 	css::beans::PropertyValue*						pDestination = lDestination.getArray();
     sal_Int32 nItem = 0;
-    for (OUStringHash::const_iterator pItem=lSource.begin(); pItem!=lSource.end(); ++pItem)
+    for (OUStringHashMap::const_iterator pItem=lSource.begin(); pItem!=lSource.end(); ++pItem)
     {
         pDestination[nItem].Name  =   pItem->first ;
         pDestination[nItem].Value <<= pItem->second;
@@ -165,9 +165,9 @@ css::uno::Sequence< css::beans::Property
 /**
  * converts a sequence<PropertyValue> to an unicode string hash, where keys and values
match to names and values.
  */
-OUStringHash Converter::convert_seqProp2OUStringHash( const css::uno::Sequence< css::beans::PropertyValue
>& lSource )
+OUStringHashMap Converter::convert_seqProp2OUStringHash( const css::uno::Sequence< css::beans::PropertyValue
>& lSource )
 {
-    OUStringHash lDestination;
+    OUStringHashMap lDestination;
     sal_Int32						 nCount  = lSource.getLength();
 	const css::beans::PropertyValue* pSource = lSource.getConstArray();
     for (sal_Int32 nItem=0; nItem<nCount; ++nItem)

Modified: incubator/ooo/trunk/main/framework/source/uiconfiguration/imagemanagerimpl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/uiconfiguration/imagemanagerimpl.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/uiconfiguration/imagemanagerimpl.hxx (original)
+++ incubator/ooo/trunk/main/framework/source/uiconfiguration/imagemanagerimpl.hxx Wed May
23 02:00:41 2012
@@ -159,7 +159,7 @@ namespace framework
 
             typedef std::hash_map< rtl::OUString, 
                                    sal_Bool, 
-                                   OUStringHashCode,
+                                   rtl::OUStringHash,
                                    ::std::equal_to< ::rtl::OUString > > ImageNameMap;
             
             enum Layer

Modified: incubator/ooo/trunk/main/framework/source/uiconfiguration/uicategorydescription.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/uiconfiguration/uicategorydescription.cxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/uiconfiguration/uicategorydescription.cxx (original)
+++ incubator/ooo/trunk/main/framework/source/uiconfiguration/uicategorydescription.cxx Wed
May 23 02:00:41 2012
@@ -136,7 +136,7 @@ class ConfigurationAccess_UICategory : /
     private:
         typedef ::std::hash_map< ::rtl::OUString,
                                  ::rtl::OUString,
-                                 OUStringHashCode,
+                                 rtl::OUStringHash,
                                  ::std::equal_to< ::rtl::OUString > > IdToInfoCache;
 
         sal_Bool initializeConfigAccess();

Modified: incubator/ooo/trunk/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
(original)
+++ incubator/ooo/trunk/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
Wed May 23 02:00:41 2012
@@ -154,7 +154,7 @@ namespace framework
 
 		    struct UIElementType;
             friend struct UIElementType;
-		    typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to<
rtl::OUString > > UIElementDataHashMap;
+		    typedef ::std::hash_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to<
rtl::OUString > > UIElementDataHashMap;
             
             struct UIElementType
             {
@@ -174,7 +174,7 @@ namespace framework
 
             typedef ::std::vector< UIElementType > UIElementTypesVector;
             typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-            typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to<
rtl::OUString > > UIElementInfoHashMap;
+            typedef ::std::hash_map< rtl::OUString, UIElementInfo, rtl::OUStringHash,
::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
 
             // private methods
             void            impl_Initialize();

Modified: incubator/ooo/trunk/main/framework/source/uiconfiguration/windowstateconfiguration.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/uiconfiguration/windowstateconfiguration.cxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/uiconfiguration/windowstateconfiguration.cxx
(original)
+++ incubator/ooo/trunk/main/framework/source/uiconfiguration/windowstateconfiguration.cxx
Wed May 23 02:00:41 2012
@@ -252,7 +252,7 @@ class ConfigurationAccess_WindowState : 
     private:
         typedef ::std::hash_map< ::rtl::OUString,
                                  WindowStateInfo,
-                                 OUStringHashCode,
+                                 rtl::OUStringHash,
                                  ::std::equal_to< ::rtl::OUString > > ResourceURLToInfoCache;
 
         rtl::OUString                     m_aConfigWindowAccess;

Modified: incubator/ooo/trunk/main/framework/source/uielement/toolbarsmenucontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/uielement/toolbarsmenucontroller.cxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/uielement/toolbarsmenucontroller.cxx (original)
+++ incubator/ooo/trunk/main/framework/source/uielement/toolbarsmenucontroller.cxx Wed May
23 02:00:41 2012
@@ -108,7 +108,7 @@ static const char STATIC_INTERNAL_CMD_PA
 namespace framework
 {
 
-typedef std::hash_map< rtl::OUString, rtl::OUString, OUStringHashCode, ::std::equal_to<
::rtl::OUString > > ToolbarHashMap;
+typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash, ::std::equal_to<
::rtl::OUString > > ToolbarHashMap;
 
 struct ToolBarEntry
 {

Modified: incubator/ooo/trunk/main/framework/source/uielement/uicommanddescription.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/uielement/uicommanddescription.cxx?rev=1341723&r1=1341722&r2=1341723&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/uielement/uicommanddescription.cxx (original)
+++ incubator/ooo/trunk/main/framework/source/uielement/uicommanddescription.cxx Wed May 23
02:00:41 2012
@@ -171,7 +171,7 @@ class ConfigurationAccess_UICommand : //
     private:
         typedef ::std::hash_map< ::rtl::OUString,
                                  CmdToInfoMap,
-                                 OUStringHashCode,
+                                 rtl::OUStringHash,
                                  ::std::equal_to< ::rtl::OUString > > CommandToInfoCache;
 
         sal_Bool initializeConfigAccess();



Mime
View raw message