This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8130eb4fe0 Finish the hash_map to unordered_map change in vcl,
framework and desktop
8130eb4fe0 is described below
commit 8130eb4fe02ca63dcb4de04f2fca56de984582b9
Author: Jim Jagielski <[email protected]>
AuthorDate: Fri Nov 6 14:53:42 2026 -0500
Finish the hash_map to unordered_map change in vcl, framework and desktop
8cd8d3120d switched the headers but left files that still name
std::hash_map and got the include through them. The macOS build threw-up on
these.
---
main/desktop/source/deployment/manager/dp_extensionmanager.hxx | 2 +-
main/desktop/source/deployment/manager/dp_managerfac.cxx | 2 +-
main/desktop/source/deployment/registry/executable/dp_executable.cxx | 2 +-
main/framework/inc/services/tabwindowservice.hxx | 2 +-
main/framework/inc/uielement/controlmenucontroller.hxx | 2 +-
main/framework/inc/uielement/menubarmanager.hxx | 2 +-
main/framework/inc/uielement/toolbarmanager.hxx | 4 ++--
main/framework/inc/uifactory/factoryconfiguration.hxx | 2 +-
main/framework/inc/uifactory/uielementfactorymanager.hxx | 2 +-
main/framework/inc/xml/toolboxdocumenthandler.hxx | 2 +-
main/framework/source/inc/accelerators/acceleratorcache.hxx | 2 +-
main/framework/source/inc/accelerators/keymapping.hxx | 2 +-
main/framework/source/inc/accelerators/storageholder.hxx | 2 +-
main/vcl/source/gdi/jobset.cxx | 4 ++--
14 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/main/desktop/source/deployment/manager/dp_extensionmanager.hxx
b/main/desktop/source/deployment/manager/dp_extensionmanager.hxx
index cf9f1204e3..84bb211835 100644
--- a/main/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/main/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -42,7 +42,7 @@ namespace css = ::com::sun::star;
namespace dp_manager {
-typedef ::std::hash_map<
+typedef ::std::unordered_map<
::rtl::OUString,
::std::vector<css::uno::Reference<css::deployment::XPackage> >,
::rtl::OUStringHash > id2extensions;
diff --git a/main/desktop/source/deployment/manager/dp_managerfac.cxx
b/main/desktop/source/deployment/manager/dp_managerfac.cxx
index 2329877685..1a334bf8e7 100644
--- a/main/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/main/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -52,7 +52,7 @@ class PackageManagerFactoryImpl : private MutexHolder, public
t_pmfac_helper
Reference<deployment::XPackageManager> m_xBundledMgr;
Reference<deployment::XPackageManager> m_xTmpMgr;
Reference<deployment::XPackageManager> m_xBakMgr;
- typedef ::std::hash_map<
+ typedef ::std::unordered_map<
OUString, WeakReference<deployment::XPackageManager>,
::rtl::OUStringHash > t_string2weakref;
t_string2weakref m_managers;
diff --git
a/main/desktop/source/deployment/registry/executable/dp_executable.cxx
b/main/desktop/source/deployment/registry/executable/dp_executable.cxx
index 7b29d2081e..e33c551d4c 100644
--- a/main/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/main/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -80,7 +80,7 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
};
friend class ExecutablePackageImpl;
- typedef ::std::hash_map< OUString, Reference<XInterface>,
+ typedef ::std::unordered_map< OUString, Reference<XInterface>,
::rtl::OUStringHash > t_string2object;
// PackageRegistryBackend
diff --git a/main/framework/inc/services/tabwindowservice.hxx
b/main/framework/inc/services/tabwindowservice.hxx
index ff25d42fe6..bf132434c7 100644
--- a/main/framework/inc/services/tabwindowservice.hxx
+++ b/main/framework/inc/services/tabwindowservice.hxx
@@ -99,7 +99,7 @@ struct TTabPageInfo
css::uno::Sequence< css::beans::NamedValue > m_lProperties;
};
-typedef ::std::hash_map< ::sal_Int32 ,
+typedef ::std::unordered_map< ::sal_Int32 ,
TTabPageInfo ,
Int32HashCode ,
::std::equal_to< ::sal_Int32 > > TTabPageInfoHash;
diff --git a/main/framework/inc/uielement/controlmenucontroller.hxx
b/main/framework/inc/uielement/controlmenucontroller.hxx
index 6115231f58..15ff8a9dfc 100644
--- a/main/framework/inc/uielement/controlmenucontroller.hxx
+++ b/main/framework/inc/uielement/controlmenucontroller.hxx
@@ -86,7 +86,7 @@ namespace framework
virtual void impl_setPopupMenu();
virtual void impl_select(const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatch >& _xDispatch,const
::com::sun::star::util::URL& aURL);
- class UrlToDispatchMap : public ::std::hash_map< ::rtl::OUString,
+ class UrlToDispatchMap : public ::std::unordered_map<
::rtl::OUString,
com::sun::star::uno::Reference<
com::sun::star::frame::XDispatch >,
rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > >
diff --git a/main/framework/inc/uielement/menubarmanager.hxx
b/main/framework/inc/uielement/menubarmanager.hxx
index 0e03363ed6..f7ce07f648 100644
--- a/main/framework/inc/uielement/menubarmanager.hxx
+++ b/main/framework/inc/uielement/menubarmanager.hxx
@@ -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, rtl::OUStringHash,
::std::equal_to< rtl::OUString > > PopupControllerCache;
+typedef std::unordered_map< rtl::OUString, PopupControllerEntry,
rtl::OUStringHash, ::std::equal_to< rtl::OUString > > PopupControllerCache;
class BmkMenu;
class AddonMenu;
diff --git a/main/framework/inc/uielement/toolbarmanager.hxx
b/main/framework/inc/uielement/toolbarmanager.hxx
index 9556fe543b..5d7420ad17 100644
--- a/main/framework/inc/uielement/toolbarmanager.hxx
+++ b/main/framework/inc/uielement/toolbarmanager.hxx
@@ -204,11 +204,11 @@ class ToolBarManager : public
::com::sun::star::frame::XFrameActionListener
bool RetrieveShortcut( const rtl::OUString& rCommandURL,
rtl::OUString& rShortCut );
protected:
- typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference<
com::sun::star::frame::XStatusListener > > ToolBarControllerMap;
+ typedef ::std::unordered_map< sal_uInt16,
::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > >
ToolBarControllerMap;
typedef ::std::vector< ::com::sun::star::uno::Reference<
::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector;
typedef BaseHash< SubToolBarControllerVector >
SubToolBarToSubToolBarControllerMap;
- typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference<
com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
+ typedef ::std::unordered_map< sal_uInt16,
::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > >
MenuDescriptionMap;
sal_Bool
m_bDisposed : 1,
m_bIsHiContrast : 1,
m_bSmallSymbols : 1,
diff --git a/main/framework/inc/uifactory/factoryconfiguration.hxx
b/main/framework/inc/uifactory/factoryconfiguration.hxx
index ac8b815f88..c4b0b6e27e 100644
--- a/main/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/main/framework/inc/uifactory/factoryconfiguration.hxx
@@ -89,7 +89,7 @@ private:
ControllerInfo(const ::rtl::OUString& _aImplementationName,const
::rtl::OUString& _aValue) :
m_aImplementationName(_aImplementationName),m_aValue(_aValue){}
ControllerInfo(){}
};
- class MenuControllerMap : public std::hash_map< rtl::OUString,
+ class MenuControllerMap : public std::unordered_map< rtl::OUString,
ControllerInfo,
rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > >
diff --git a/main/framework/inc/uifactory/uielementfactorymanager.hxx
b/main/framework/inc/uifactory/uielementfactorymanager.hxx
index dfb5e9c297..86c0608ae0 100644
--- a/main/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/main/framework/inc/uifactory/uielementfactorymanager.hxx
@@ -86,7 +86,7 @@ namespace framework
virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& Source );
private:
- class FactoryManagerMap : public std::hash_map< rtl::OUString,
+ class FactoryManagerMap : public std::unordered_map< rtl::OUString,
rtl::OUString,
rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > >
diff --git a/main/framework/inc/xml/toolboxdocumenthandler.hxx
b/main/framework/inc/xml/toolboxdocumenthandler.hxx
index 9f14a44b2d..333a9a8088 100644
--- a/main/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/main/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -109,7 +109,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private
ThreadHelpBase, // S
private:
::rtl::OUString getErrorLineString();
- class ToolBoxHashMap : public ::std::hash_map< ::rtl::OUString
,
+ class ToolBoxHashMap : public ::std::unordered_map< ::rtl::OUString
,
ToolBox_XML_Entry
,
rtl::OUStringHash,
::std::equal_to<
::rtl::OUString > >
diff --git a/main/framework/source/inc/accelerators/acceleratorcache.hxx
b/main/framework/source/inc/accelerators/acceleratorcache.hxx
index a3b56c099f..904ed6b676 100644
--- a/main/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/main/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -76,7 +76,7 @@ class AcceleratorCache : public ThreadHelpBase // attention!
Must be the first b
/** TODO document me
keys -> commands
*/
- typedef ::std::hash_map< css::awt::KeyEvent ,
+ typedef ::std::unordered_map< css::awt::KeyEvent ,
::rtl::OUString ,
KeyEventHashCode ,
KeyEventEqualsFunc > TKey2Commands;
diff --git a/main/framework/source/inc/accelerators/keymapping.hxx
b/main/framework/source/inc/accelerators/keymapping.hxx
index 7c5d5295bb..20877ffddd 100644
--- a/main/framework/source/inc/accelerators/keymapping.hxx
+++ b/main/framework/source/inc/accelerators/keymapping.hxx
@@ -72,7 +72,7 @@ class KeyMapping
//---------------------------------------
/** @short hash structure to map key codes to identifier. */
- typedef ::std::hash_map< sal_Int16 ,
+ typedef ::std::unordered_map< sal_Int16 ,
::rtl::OUString ,
ShortHashCode ,
::std::equal_to< sal_Int16 > >
Code2IdentifierHash;
diff --git a/main/framework/source/inc/accelerators/storageholder.hxx
b/main/framework/source/inc/accelerators/storageholder.hxx
index 29418c7425..9029477388 100644
--- a/main/framework/source/inc/accelerators/storageholder.hxx
+++ b/main/framework/source/inc/accelerators/storageholder.hxx
@@ -90,7 +90,7 @@ class StorageHolder : private ThreadHelpBase // attention!
Must be the first bas
};
/** @short TODO */
- typedef ::std::hash_map< ::rtl::OUString ,
+ typedef ::std::unordered_map< ::rtl::OUString ,
TStorageInfo ,
::rtl::OUStringHash ,
::std::equal_to< ::rtl::OUString > >
TPath2StorageInfo;
diff --git a/main/vcl/source/gdi/jobset.cxx b/main/vcl/source/gdi/jobset.cxx
index d6f2eeeb56..f3e3ca0500 100644
--- a/main/vcl/source/gdi/jobset.cxx
+++ b/main/vcl/source/gdi/jobset.cxx
@@ -211,7 +211,7 @@ String JobSetup::GetValue( const String& rKey ) const
{
if( mpData )
{
- ::std::hash_map< ::rtl::OUString, ::rtl::OUString,
::rtl::OUStringHash >::const_iterator it;
+ ::std::unordered_map< ::rtl::OUString, ::rtl::OUString,
::rtl::OUStringHash >::const_iterator it;
it = mpData->maValueMap.find( rKey );
return it != mpData->maValueMap.end() ? String( it->second ) :
String();
}
@@ -429,7 +429,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup&
rJobSetup )
rOStream.Write( (char*)&aOldData, sizeof( aOldData ) );
rOStream.Write( (char*)&aOldJobData, nOldJobDataSize );
rOStream.Write( (char*)pJobData->mpDriverData,
pJobData->mnDriverDataLen );
- ::std::hash_map< ::rtl::OUString, ::rtl::OUString,
::rtl::OUStringHash >::const_iterator it;
+ ::std::unordered_map< ::rtl::OUString, ::rtl::OUString,
::rtl::OUStringHash >::const_iterator it;
for( it = pJobData->maValueMap.begin(); it !=
pJobData->maValueMap.end(); ++it )
{
rOStream.WriteByteString( it->first,
RTL_TEXTENCODING_UTF8 );
