mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#97499 Fixed containers parameters clearing #4

Browse Source 
Change-Id: I7c96181399f4d7e62d4aceca404b22d68f903513
Reviewed-on: https://gerrit.libreoffice.org/23754
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
tymyjan 2016-04-03 17:42:53 +02:00 committed by Noel Grandin
parent bfb9612226
commit c20cc7e79b
42 changed files with 52 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
View File

@ -384,8 +384,7 @@ private:
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
css::beans::PropertyValue, css::beans::PropertyValue,
OUStringHash, OUStringHash > tPropValMap;
::std::equal_to< OUString > > tPropValMap;
class Document: public ::VCLXAccessibleComponent, public ::SfxListener class Document: public ::VCLXAccessibleComponent, public ::SfxListener
{ {

2
basic/source/classes/sb.cxx
View File

@ -1148,7 +1148,7 @@ struct ClassModuleRunInitItem
// to allow forward declaration in sbmod.hxx // to allow forward declaration in sbmod.hxx
class ModuleInitDependencyMap : public class ModuleInitDependencyMap : public
std::unordered_map< OUString, ClassModuleRunInitItem, std::unordered_map< OUString, ClassModuleRunInitItem,
OUStringHash, ::std::equal_to< OUString > > OUStringHash >
{}; {};
void SbModule::implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassModuleRunInitItem& rItem ) void SbModule::implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassModuleRunInitItem& rItem )

2
basic/source/inc/sbunoobj.hxx
View File

@ -366,7 +366,7 @@ public:
virtual void Clear() override; virtual void Clear() override;
}; };
typedef std::unordered_map< OUString, css::uno::Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash; typedef std::unordered_map< OUString, css::uno::Any, OUStringHash > VBAConstantsHash;
typedef std::vector< OUString > VBAConstantsVector; typedef std::vector< OUString > VBAConstantsVector;

4
connectivity/source/drivers/postgresql/pq_connection.hxx
View File

@ -147,9 +147,7 @@ struct HashByteSequence
typedef std::unordered_map< typedef std::unordered_map<
::rtl::ByteSequence, ::rtl::ByteSequence,
::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable >, ::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable >,
HashByteSequence, HashByteSequence > WeakHashMap;
::std::equal_to< ::rtl::ByteSequence >
> WeakHashMap;
typedef ::std::vector< OString > OStringVector; typedef ::std::vector< OString > OStringVector;

4
connectivity/source/drivers/postgresql/pq_tools.hxx
View File

@ -129,9 +129,7 @@ typedef std::unordered_map
< <
OString, OString,
OString, OString,
OStringHash, OStringHash > String2StringMap;
::std::equal_to< OString >
> String2StringMap;
OUString querySingleValue( OUString querySingleValue(
const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &connection, const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &connection,

3
connectivity/source/drivers/postgresql/pq_xcontainer.hxx
View File

@ -89,8 +89,7 @@ typedef std::unordered_map
< <
OUString, OUString,
sal_Int32, sal_Int32,
OUStringHash, OUStringHash
::std::equal_to< OUString >
> String2IntMap; > String2IntMap;
typedef ::cppu::WeakComponentImplHelper typedef ::cppu::WeakComponentImplHelper

3
cppu/source/uno/lbenv.cxx
View File

@ -107,8 +107,7 @@ typedef std::unordered_map<
// mapping from ptr to object entry // mapping from ptr to object entry
typedef std::unordered_map< typedef std::unordered_map<
void *, ObjectEntry *, FctPtrHash, void *, ObjectEntry *, FctPtrHash > Ptr2ObjectMap;
std::equal_to< void * > > Ptr2ObjectMap;
// mapping from oid to object entry // mapping from oid to object entry
typedef std::unordered_map< typedef std::unordered_map<
OUString, ObjectEntry *, OUStringHash > OId2ObjectMap; OUString, ObjectEntry *, OUStringHash > OId2ObjectMap;

6
cui/source/customize/cfg.cxx
View File

@ -1387,7 +1387,7 @@ SvxEntries* ContextMenuSaveInData::GetEntries()
{ {
if ( !m_pRootEntry ) if ( !m_pRootEntry )
{ {
typedef std::unordered_map< OUString, bool, OUStringHash, std::equal_to< OUString > > MenuInfo; typedef std::unordered_map< OUString, bool, OUStringHash > MenuInfo;
MenuInfo aMenuInfo; MenuInfo aMenuInfo;
m_pRootEntry.reset( new SvxConfigEntry( "ContextMenus", OUString(), true ) ); m_pRootEntry.reset( new SvxConfigEntry( "ContextMenus", OUString(), true ) );
@ -3899,7 +3899,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL )
SvxEntries* ToolbarSaveInData::GetEntries() SvxEntries* ToolbarSaveInData::GetEntries()
{ {
typedef std::unordered_map<OUString, bool, typedef std::unordered_map<OUString, bool,
OUStringHash, std::equal_to< OUString > > ToolbarInfo; OUStringHash > ToolbarInfo;
ToolbarInfo aToolbarInfo; ToolbarInfo aToolbarInfo;
@ -4965,7 +4965,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,
pTbSymbol->SetStyle(pTbSymbol->GetStyle() | WB_SCROLL | WB_LINESPACING); pTbSymbol->SetStyle(pTbSymbol->GetStyle() | WB_SCROLL | WB_LINESPACING);
typedef std::unordered_map< OUString, bool, typedef std::unordered_map< OUString, bool,
OUStringHash, std::equal_to< OUString > > ImageInfo; OUStringHash > ImageInfo;
pTbSymbol->SetPageScroll( true ); pTbSymbol->SetPageScroll( true );

2
cui/source/inc/scriptdlg.hxx
View File

@ -39,7 +39,7 @@
#define OBJTYPE_SFROOT 4L #define OBJTYPE_SFROOT 4L
typedef std::unordered_map < OUString, OUString, typedef std::unordered_map < OUString, OUString,
OUStringHash, std::equal_to< OUString > > Selection_hash; OUStringHash > Selection_hash;
class SFEntry; class SFEntry;

2
extensions/source/bibliography/framectr.cxx
View File

@ -100,7 +100,7 @@ static const DispatchInfo SupportedCommandsArray[] =
{ nullptr , 0 , false } { nullptr , 0 , false }
}; };
typedef std::unordered_map< OUString, CacheDispatchInfo, OUStringHash, ::std::equal_to< OUString > > CmdToInfoCache; typedef std::unordered_map< OUString, CacheDispatchInfo, OUStringHash > CmdToInfoCache;
const CmdToInfoCache& GetCommandToInfoCache() const CmdToInfoCache& GetCommandToInfoCache()
{ {

2
framework/inc/uielement/menubarmanager.hxx
View File

@ -64,7 +64,7 @@ struct PopupControllerEntry
css::uno::WeakReference< css::frame::XDispatchProvider > m_xDispatchProvider; css::uno::WeakReference< css::frame::XDispatchProvider > m_xDispatchProvider;
}; };
typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash, std::equal_to< OUString > > PopupControllerCache; typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash > PopupControllerCache;
class BmkMenu; class BmkMenu;
class AddonMenu; class AddonMenu;

3
framework/inc/xml/toolboxdocumenthandler.hxx
View File

@ -106,8 +106,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
class ToolBoxHashMap : public std::unordered_map<OUString, class ToolBoxHashMap : public std::unordered_map<OUString,
ToolBox_XML_Entry, ToolBox_XML_Entry,
OUStringHash, OUStringHash >
std::equal_to< OUString > >
{ {
}; };

6
framework/source/fwe/classes/addonsoptions.cxx
View File

@ -229,10 +229,10 @@ class AddonsOptions_Impl : public ConfigItem
void addImage(ImageSize eSize, const Image &rImage, const OUString &rURL); void addImage(ImageSize eSize, const Image &rImage, const OUString &rURL);
}; };
typedef std::unordered_map< OUString, ImageEntry, OUStringHash, std::equal_to< OUString > > ImageManager; typedef std::unordered_map< OUString, ImageEntry, OUStringHash > ImageManager;
typedef std::unordered_map< OUString, sal_uInt32, OUStringHash, std::equal_to< OUString > > StringToIndexMap; typedef std::unordered_map< OUString, sal_uInt32, OUStringHash > StringToIndexMap;
typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars; typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars;
typedef std::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash, std::equal_to< OUString > > ToolbarMergingInstructions; typedef std::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash > ToolbarMergingInstructions;
/*-**************************************************************************************************** /*-****************************************************************************************************
@short return list of key names of our configuration management which represent oue module tree @short return list of key names of our configuration management which represent oue module tree

3
framework/source/inc/accelerators/storageholder.hxx
View File

@ -58,8 +58,7 @@ class StorageHolder
/** @short TODO */ /** @short TODO */
typedef std::unordered_map< OUString , typedef std::unordered_map< OUString ,
TStorageInfo , TStorageInfo ,
OUStringHash , OUStringHash > TPath2StorageInfo;
std::equal_to< OUString > > TPath2StorageInfo;
// member // member
private: private:

3
framework/source/services/tabwindowservice.cxx
View File

@ -71,8 +71,7 @@ struct TTabPageInfo
typedef std::unordered_map< ::sal_Int32 , typedef std::unordered_map< ::sal_Int32 ,
TTabPageInfo , TTabPageInfo ,
Int32HashCode , Int32HashCode > TTabPageInfoHash;
std::equal_to< ::sal_Int32 > > TTabPageInfoHash;
/*-************************************************************************************************************ /*-************************************************************************************************************
@short implements a helper service providing a dockable tab control window @short implements a helper service providing a dockable tab control window

4
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
View File

@ -168,7 +168,7 @@ private:
css::uno::Reference< css::container::XIndexAccess > xSettings; css::uno::Reference< css::container::XIndexAccess > xSettings;
}; };
typedef std::unordered_map< OUString, UIElementData, OUStringHash, std::equal_to< OUString > > UIElementDataHashMap; typedef std::unordered_map< OUString, UIElementData, OUStringHash > UIElementDataHashMap;
struct UIElementType struct UIElementType
{ {
@ -187,7 +187,7 @@ private:
typedef std::vector< UIElementType > UIElementTypesVector; typedef std::vector< UIElementType > UIElementTypesVector;
typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer; typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
typedef std::unordered_map< OUString, UIElementInfo, OUStringHash, std::equal_to< OUString > > UIElementInfoHashMap; typedef std::unordered_map< OUString, UIElementInfo, OUStringHash > UIElementInfoHashMap;
void impl_Initialize(); void impl_Initialize();
void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp ); void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );

3
framework/source/uiconfiguration/uicategorydescription.cxx
View File

@ -97,8 +97,7 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess
private: private:
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
OUString, OUString,
OUStringHash, OUStringHash > IdToInfoCache;
std::equal_to< OUString > > IdToInfoCache;
void initializeConfigAccess(); void initializeConfigAccess();

4
framework/source/uiconfiguration/uiconfigurationmanager.cxx
View File

@ -150,7 +150,7 @@ private:
struct UIElementType; struct UIElementType;
friend struct UIElementType; friend struct UIElementType;
typedef std::unordered_map< OUString, UIElementData, OUStringHash, std::equal_to< OUString > > UIElementDataHashMap; typedef std::unordered_map< OUString, UIElementData, OUStringHash > UIElementDataHashMap;
struct UIElementType struct UIElementType
{ {
@ -169,7 +169,7 @@ private:
typedef std::vector< UIElementType > UIElementTypesVector; typedef std::vector< UIElementType > UIElementTypesVector;
typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer; typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
typedef std::unordered_map< OUString, UIElementInfo, OUStringHash, std::equal_to< OUString > > UIElementInfoHashMap; typedef std::unordered_map< OUString, UIElementInfo, OUStringHash > UIElementInfoHashMap;
void impl_Initialize(); void impl_Initialize();
void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp ); void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );

9
framework/source/uiconfiguration/windowstateconfiguration.cxx
View File

@ -218,8 +218,7 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon
private: private:
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
WindowStateInfo, WindowStateInfo,
OUStringHash, OUStringHash > ResourceURLToInfoCache;
std::equal_to< OUString > > ResourceURLToInfoCache;
osl::Mutex m_aMutex; osl::Mutex m_aMutex;
OUString m_aConfigWindowAccess; OUString m_aConfigWindowAccess;
@ -1317,13 +1316,11 @@ public:
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
OUString, OUString,
OUStringHash, OUStringHash > ModuleToWindowStateFileMap;
std::equal_to< OUString > > ModuleToWindowStateFileMap;
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
css::uno::Reference< css::container::XNameAccess >, css::uno::Reference< css::container::XNameAccess >,
OUStringHash, OUStringHash > ModuleToWindowStateConfigHashMap;
std::equal_to< OUString > > ModuleToWindowStateConfigHashMap;
private: private:
css::uno::Reference< css::uno::XComponentContext> m_xContext; css::uno::Reference< css::uno::XComponentContext> m_xContext;

3
framework/source/uielement/controlmenucontroller.cxx
View File

@ -221,8 +221,7 @@ private:
class UrlToDispatchMap : public std::unordered_map< OUString, class UrlToDispatchMap : public std::unordered_map< OUString,
uno::Reference< frame::XDispatch >, uno::Reference< frame::XDispatch >,
OUStringHash, OUStringHash >
std::equal_to< OUString > >
{ {
public: public:
inline void free() inline void free()

2
framework/source/uielement/toolbarsmenucontroller.cxx
View File

@ -83,7 +83,7 @@ static const char STATIC_INTERNAL_CMD_PART[] = ".cmd:";
namespace framework namespace framework
{ {
typedef std::unordered_map< OUString, OUString, OUStringHash, std::equal_to< OUString > > ToolbarHashMap; typedef std::unordered_map< OUString, OUString, OUStringHash > ToolbarHashMap;
struct ToolBarEntry struct ToolBarEntry
{ {

3
framework/source/uielement/uicommanddescription.cxx
View File

@ -145,8 +145,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
private: private:
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
CmdToInfoMap, CmdToInfoMap,
OUStringHash, OUStringHash > CommandToInfoCache;
std::equal_to< OUString > > CommandToInfoCache;
void initializeConfigAccess(); void initializeConfigAccess();

3
include/comphelper/sequenceashashmap.hxx
View File

@ -43,8 +43,7 @@ namespace comphelper{
struct SequenceAsHashMapBase : public std::unordered_map< struct SequenceAsHashMapBase : public std::unordered_map<
OUString , OUString ,
css::uno::Any , css::uno::Any ,
OUStringHash , OUStringHash >
::std::equal_to< OUString > >
{ {
}; };

4
include/formula/FormulaCompiler.hxx
View File

@ -60,8 +60,8 @@ struct FormulaArrayStack
}; };
typedef std::unordered_map< OUString, OpCode, OUStringHash, ::std::equal_to< OUString > > OpCodeHashMap; typedef std::unordered_map< OUString, OpCode, OUStringHash > OpCodeHashMap;
typedef std::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< OUString > > ExternalHashMap; typedef std::unordered_map< OUString, OUString, OUStringHash > ExternalHashMap;
class FORMULA_DLLPUBLIC FormulaCompiler class FORMULA_DLLPUBLIC FormulaCompiler
{ {

3
include/svtools/toolboxcontroller.hxx
View File

@ -153,8 +153,7 @@ class SVT_DLLPUBLIC ToolboxController :
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
css::uno::Reference< css::frame::XDispatch >, css::uno::Reference< css::frame::XDispatch >,
OUStringHash, OUStringHash > URLToDispatchMap;
std::equal_to< OUString > > URLToDispatchMap;
// methods to support status forwarder, known by the old sfx2 toolbox controller implementation // methods to support status forwarder, known by the old sfx2 toolbox controller implementation
void addStatusListener( const OUString& aCommandURL ); void addStatusListener( const OUString& aCommandURL );

2
sal/rtl/bootstrap.cxx
View File

@ -581,7 +581,7 @@ namespace {
struct bootstrap_map: private boost::noncopyable { struct bootstrap_map: private boost::noncopyable {
typedef std::unordered_map< typedef std::unordered_map<
rtl::OUString, Bootstrap_Impl *, rtl::OUString, Bootstrap_Impl *,
rtl::OUStringHash, std::equal_to< rtl::OUString > > t; rtl::OUStringHash > t;
// get and release must only be called properly synchronized via some mutex // get and release must only be called properly synchronized via some mutex
// (e.g., osl::Mutex::getGlobalMutex()): // (e.g., osl::Mutex::getGlobalMutex()):

2
sax/source/fastparser/fastparser.cxx
View File

@ -68,7 +68,7 @@ struct NamespaceDefine;
struct Entity; struct Entity;
typedef std::unordered_map< OUString, sal_Int32, typedef std::unordered_map< OUString, sal_Int32,
OUStringHash, std::equal_to< OUString > > NamespaceMap; OUStringHash > NamespaceMap;
typedef std::vector<Event> EventList; typedef std::vector<Event> EventList;

2
sc/source/core/tool/formulaparserpool.cxx
View File

@ -48,7 +48,7 @@ public:
private: private:
typedef std::unordered_map< typedef std::unordered_map<
OUString, Reference< XSingleComponentFactory >, OUString, Reference< XSingleComponentFactory >,
OUStringHash, std::equal_to< OUString > > FactoryMap; OUStringHash > FactoryMap;
Reference< XComponentContext > mxContext; /// Global component context. Reference< XComponentContext > mxContext; /// Global component context.
FactoryMap maFactories; /// All parser factories, mapped by formula namespace. FactoryMap maFactories; /// All parser factories, mapped by formula namespace.

3
sc/source/filter/excel/excimp8.cxx
View File

@ -113,8 +113,7 @@ using namespace ::comphelper;
class OleNameOverrideContainer : public ::cppu::WeakImplHelper< container::XNameContainer > class OleNameOverrideContainer : public ::cppu::WeakImplHelper< container::XNameContainer >
{ {
private: private:
typedef std::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash, typedef std::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash > NamedIndexToOleName;
std::equal_to< OUString > > NamedIndexToOleName;
NamedIndexToOleName IdToOleNameHash; NamedIndexToOleName IdToOleNameHash;
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
public: public:

3
sc/source/ui/vba/vbawindow.cxx
View File

@ -50,8 +50,7 @@ using namespace ::ooo::vba;
using namespace ::ooo::vba::excel::XlWindowState; using namespace ::ooo::vba::excel::XlWindowState;
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
SCTAB, OUStringHash, SCTAB, OUStringHash > NameIndexHash;
::std::equal_to< OUString > > NameIndexHash;
typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets; typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets;

3
sc/source/ui/vba/vbawindows.cxx
View File

@ -33,8 +33,7 @@ using namespace ::com::sun::star;
using namespace ::ooo::vba; using namespace ::ooo::vba;
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
sal_Int32, OUStringHash, sal_Int32, OUStringHash > NameIndexHash;
std::equal_to< OUString > > NameIndexHash;
static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ) static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication )
{ {

2
scripting/source/provider/BrowseNodeFactoryImpl.cxx
View File

@ -157,7 +157,7 @@ public:
//typedef std::map< OUString, Reference< browse::XBrowseNode > > //typedef std::map< OUString, Reference< browse::XBrowseNode > >
typedef std::unordered_map< OUString, Reference< browse::XBrowseNode >, typedef std::unordered_map< OUString, Reference< browse::XBrowseNode >,
OUStringHash, ::std::equal_to< OUString > > OUStringHash >
BrowseNodeAggregatorHash; BrowseNodeAggregatorHash;
typedef std::vector< OUString > vString; typedef std::vector< OUString > vString;

6
scripting/source/vbaevents/eventhelper.cxx
View File

@ -190,8 +190,7 @@ struct TranslateInfo
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
std::list< TranslateInfo >, std::list< TranslateInfo >,
OUStringHash, OUStringHash > EventInfoHash;
::std::equal_to< OUString > > EventInfoHash;
struct TranslatePropMap struct TranslatePropMap
@ -487,8 +486,7 @@ public:
{ return !m_hEvents.empty(); } { return !m_hEvents.empty(); }
private: private:
typedef std::unordered_map< OUString, Any, OUStringHash, typedef std::unordered_map< OUString, Any, OUStringHash > EventSupplierHash;
::std::equal_to< OUString > > EventSupplierHash;
EventSupplierHash m_hEvents; EventSupplierHash m_hEvents;
}; };

2
svgio/source/svgreader/svgtoken.cxx
View File

@ -167,7 +167,7 @@ namespace svgio
SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent) SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent)
{ {
typedef std::unordered_map< OUString, SVGToken, OUStringHash, std::equal_to< OUString > > SVGTokenMapper; typedef std::unordered_map< OUString, SVGToken, OUStringHash > SVGTokenMapper;
typedef std::pair< OUString, SVGToken > SVGTokenValueType; typedef std::pair< OUString, SVGToken > SVGTokenValueType;
static SVGTokenMapper aSVGTokenMapperList; static SVGTokenMapper aSVGTokenMapperList;

4
svgio/source/svgreader/svgtools.cxx
View File

@ -638,9 +638,7 @@ namespace svgio
bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName, bool bCaseIndependent) bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName, bool bCaseIndependent)
{ {
typedef std::unordered_map< OUString, Color, typedef std::unordered_map< OUString, Color,
OUStringHash, OUStringHash > ColorTokenMapper;
::std::equal_to< OUString >
> ColorTokenMapper;
typedef std::pair< OUString, Color > ColorTokenValueType; typedef std::pair< OUString, Color > ColorTokenValueType;
ColorTokenMapper aColorTokenMapperList; ColorTokenMapper aColorTokenMapperList;

3
sw/source/core/access/accpara.hxx
View File

@ -51,8 +51,7 @@ namespace com { namespace sun { namespace star {
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
css::beans::PropertyValue, css::beans::PropertyValue,
OUStringHash, OUStringHash > tAccParaPropValMap;
::std::equal_to< OUString > > tAccParaPropValMap;
class SwAccessibleParagraph : class SwAccessibleParagraph :
public SwClient, // #i108125# public SwClient, // #i108125#

2
sw/source/ui/vba/vbadocumentproperties.cxx
View File

@ -657,7 +657,7 @@ public:
} }
}; };
typedef std::unordered_map< OUString, uno::Reference< XDocumentProperty >, OUStringHash, ::std::equal_to< OUString > > DocPropsByName; typedef std::unordered_map< OUString, uno::Reference< XDocumentProperty >, OUStringHash > DocPropsByName;
class BuiltInPropertiesImpl : public PropertiesImpl_BASE class BuiltInPropertiesImpl : public PropertiesImpl_BASE
{ {

3
toolkit/source/controls/dialogcontrol.cxx
View File

@ -76,8 +76,7 @@ using namespace ::com::sun::star::util;
template< typename T > template< typename T >
class SimpleNamedThingContainer : public ::cppu::WeakImplHelper< container::XNameContainer > class SimpleNamedThingContainer : public ::cppu::WeakImplHelper< container::XNameContainer >
{ {
typedef std::unordered_map< OUString, Reference< T >, OUStringHash, typedef std::unordered_map< OUString, Reference< T >, OUStringHash > NamedThingsHash;
std::equal_to< OUString > > NamedThingsHash;
NamedThingsHash things; NamedThingsHash things;
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
public: public:

2
unotools/source/config/eventcfg.cxx
View File

@ -77,7 +77,7 @@ static o3tl::enumarray<GlobalEventId, const char*> pEventAsciiNames =
"OnStorageChanged" "OnStorageChanged"
}; };
typedef std::unordered_map< OUString, OUString, OUStringHash, std::equal_to< OUString > > EventBindingHash; typedef std::unordered_map< OUString, OUString, OUStringHash > EventBindingHash;
typedef std::vector< css::uno::WeakReference< css::frame::XFrame > > FrameVector; typedef std::vector< css::uno::WeakReference< css::frame::XFrame > > FrameVector;
typedef o3tl::enumarray< GlobalEventId, OUString > SupportedEventsVector; typedef o3tl::enumarray< GlobalEventId, OUString > SupportedEventsVector;

3
vbahelper/source/msforms/vbacontrols.cxx
View File

@ -38,8 +38,7 @@ using namespace com::sun::star;
using namespace ooo::vba; using namespace ooo::vba;
typedef std::unordered_map< OUString, sal_Int32, OUStringHash, typedef std::unordered_map< OUString, sal_Int32, OUStringHash > ControlIndexMap;
std::equal_to< OUString > > ControlIndexMap;
typedef std::vector< uno::Reference< awt::XControl > > ControlVec; typedef std::vector< uno::Reference< awt::XControl > > ControlVec;
class ControlArrayWrapper : public ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess > class ControlArrayWrapper : public ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess >

2
vbahelper/source/vbahelper/vbaapplicationbase.cxx
View File

@ -143,7 +143,7 @@ struct VbaTimerInfoHash
}; };
// ====VbaTimerHashMap================================== // ====VbaTimerHashMap==================================
typedef std::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash, std::equal_to< VbaTimerInfo > > VbaTimerHashMap; typedef std::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash > VbaTimerHashMap;
// ====VbaApplicationBase_Impl================================== // ====VbaApplicationBase_Impl==================================
struct VbaApplicationBase_Impl struct VbaApplicationBase_Impl

3
vbahelper/source/vbahelper/vbadocumentsbase.cxx
View File

@ -59,8 +59,7 @@ static const char aSpreadsheetDocument[] = "com.sun.star.sheet.SpreadsheetDocume
static const char aTextDocument[] = "com.sun.star.text.TextDocument"; static const char aTextDocument[] = "com.sun.star.text.TextDocument";
typedef std::unordered_map< OUString, typedef std::unordered_map< OUString,
sal_Int32, OUStringHash, sal_Int32, OUStringHash > NameIndexHash;
::std::equal_to< OUString > > NameIndexHash;
typedef std::vector < uno::Reference< frame::XModel > > Documents; typedef std::vector < uno::Reference< frame::XModel > > Documents;