[Libreoffice-commits] core.git: desktop/source filter/source framework/inc framework/source include/osl include/svtools include/vcl pyuno/source sc/inc scripting/source sc/source sfx2/source svgio/inc svx/source sw/source unotools/source
tymyjan
tymyjan at yahoo.co.uk
Mon Apr 4 05:46:59 UTC 2016
desktop/source/migration/migration_impl.hxx | 2 +-
filter/source/config/cache/cacheitem.hxx | 6 ++----
filter/source/config/cache/querytokenizer.hxx | 3 +--
framework/inc/classes/filtercachedata.hxx | 6 ++----
framework/inc/stdtypes.h | 3 +--
framework/inc/uiconfiguration/imagetype.hxx | 6 ++----
framework/inc/uielement/uicommanddescription.hxx | 6 ++----
framework/inc/uifactory/factoryconfiguration.hxx | 3 +--
framework/inc/xml/imagesdocumenthandler.hxx | 3 +--
framework/inc/xml/statusbardocumenthandler.hxx | 3 +--
framework/source/inc/accelerators/keymapping.hxx | 3 +--
framework/source/uiconfiguration/imagemanagerimpl.hxx | 3 +--
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 2 +-
include/osl/diagnose.hxx | 2 +-
include/svtools/framestatuslistener.hxx | 3 +--
include/svtools/statusbarcontroller.hxx | 3 +--
include/vcl/CommandImageResolver.hxx | 2 +-
pyuno/source/module/pyuno_impl.hxx | 11 ++++-------
sc/inc/formulaparserpool.hxx | 3 +--
sc/inc/lookupcache.hxx | 4 ++--
sc/inc/macromgr.hxx | 2 +-
sc/source/ui/view/dbfunc3.cxx | 2 +-
scripting/source/dlgprov/dlgevtatt.hxx | 3 +--
scripting/source/provider/ActiveMSPList.hxx | 2 +-
scripting/source/provider/ProviderCache.hxx | 3 +--
sfx2/source/appl/imagemgr.cxx | 3 +--
svgio/inc/svgio/svgreader/svgdocument.hxx | 5 ++---
svx/source/table/propertyset.hxx | 2 +-
sw/source/core/doc/swstylemanager.cxx | 3 +--
unotools/source/config/optionsdlg.cxx | 2 +-
30 files changed, 39 insertions(+), 65 deletions(-)
New commits:
commit bfb9612226314cd037c8eda30cc6ebbb46dc8512
Author: tymyjan <tymyjan at yahoo.co.uk>
Date: Sun Apr 3 15:53:23 2016 +0200
tdf#97499 Fixed containers parameters clearing #3
Change-Id: I1c105de7e1df251533179fba77e3797ef1c4e2d4
Reviewed-on: https://gerrit.libreoffice.org/23752
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 329414af1..95e63d0 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -135,7 +135,7 @@ struct MigrationItem
};
typedef std::unordered_map< OUString, std::vector< MigrationItem >,
- OUStringHash, std::equal_to< OUString > > MigrationHashMap;
+ OUStringHash > MigrationHashMap;
/**
information for the UI elements to be migrated for one module
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index e890f3a..4e66650 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -150,8 +150,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
*/
typedef std::unordered_map< OUString ,
CacheItem ,
- OUStringHash ,
- std::equal_to< OUString > > CacheItemList;
+ OUStringHash > CacheItemList;
/** @short supports registration of multiple key to
@@ -168,8 +167,7 @@ typedef std::unordered_map< OUString ,
*/
typedef std::unordered_map< OUString ,
OUStringList ,
- OUStringHash ,
- std::equal_to< OUString > > CacheItemRegistration;
+ OUStringHash > CacheItemRegistration;
/** @short is used to collect all matching types of an URL
diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx
index 9a25efa..42f2574 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -47,8 +47,7 @@ namespace filter{
*/
class QueryTokenizer : public std::unordered_map< OUString ,
OUString ,
- OUStringHash ,
- std::equal_to< OUString > >
+ OUStringHash >
{
// member
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 8e1e53d..f671678 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -310,8 +310,7 @@ struct ContentHandler
template< class HashType >
class SetNodeHash : public std::unordered_map< OUString ,
HashType ,
- OUStringHash ,
- std::equal_to< OUString > >
+ OUStringHash >
{
};
@@ -321,8 +320,7 @@ class SetNodeHash : public std::unordered_map< OUString ,
class PerformanceHash : public std::unordered_map< OUString,
OUStringList,
- OUStringHash,
- std::equal_to< OUString > >
+ OUStringHash >
{
};
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index b748ced..407ecfa 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -95,8 +95,7 @@ void free(std::vector<T>& vec)
template< class TType >
class BaseHash : public std::unordered_map< OUString ,
TType ,
- OUStringHash ,
- std::equal_to< OUString > >
+ OUStringHash >
{
public:
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index 6c3cf32..219eb9a 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -35,12 +35,10 @@ enum ImageType
typedef std::unordered_map< OUString,
OUString,
- OUStringHash,
- std::equal_to< OUString > > CommandToImageNameMap;
+ OUStringHash > CommandToImageNameMap;
typedef std::unordered_map< OUString,
bool,
- OUStringHash,
- std::equal_to< OUString > > CommandMap;
+ OUStringHash > CommandMap;
}
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index 9e837cb..083cffe 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -83,13 +83,11 @@ private:
public:
typedef std::unordered_map< OUString,
OUString,
- OUStringHash,
- std::equal_to< OUString > > ModuleToCommandFileMap;
+ OUStringHash > ModuleToCommandFileMap;
typedef std::unordered_map< OUString,
css::uno::Reference< css::container::XNameAccess >,
- OUStringHash,
- std::equal_to< OUString > > UICommandsHashMap;
+ OUStringHash > UICommandsHashMap;
protected:
UICommandDescription( const css::uno::Reference< css::uno::XComponentContext>& rxContext, bool );
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index 37a24de..183b09c 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -75,8 +75,7 @@ private:
};
class MenuControllerMap : public std::unordered_map< OUString,
ControllerInfo,
- OUStringHash,
- std::equal_to< OUString > >
+ OUStringHash >
{
};
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 552e211..3e1b84c 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -111,8 +111,7 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax:
class ImageHashMap : public std::unordered_map< OUString ,
Image_XML_Entry ,
- OUStringHash,
- std::equal_to< OUString > >
+ OUStringHash >
{
};
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 8e3528c..141e559 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -106,8 +106,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :
class StatusBarHashMap : public std::unordered_map<OUString,
StatusBar_XML_Entry,
- OUStringHash,
- std::equal_to< OUString > >
+ OUStringHash >
{
};
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index 3b6b7a2..d51046f 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -57,8 +57,7 @@ class KeyMapping
/** @short hash structure to map key codes to identifier. */
typedef std::unordered_map< sal_Int16 ,
OUString ,
- ShortHashCode ,
- std::equal_to< sal_Int16 > > Code2IdentifierHash;
+ ShortHashCode > Code2IdentifierHash;
// member
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 9b4af25..f1f71b0 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -127,8 +127,7 @@ namespace framework
typedef std::unordered_map< OUString,
sal_Bool,
- OUStringHash,
- std::equal_to< OUString > > ImageNameMap;
+ OUStringHash > ImageNameMap;
enum Layer
{
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 59b5cc1..ebdf827 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -91,7 +91,7 @@ public:
private:
virtual void SAL_CALL disposing() override;
- typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 >, OUStringHash, std::equal_to< OUString > > ModuleToModuleCfgMgr;
+ typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 >, OUStringHash > ModuleToModuleCfgMgr;
//TODO_AS void impl_initStorages();
diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx
index ece1e16..facccf9 100644
--- a/include/osl/diagnose.hxx
+++ b/include/osl/diagnose.hxx
@@ -93,7 +93,7 @@ struct VoidPtrHash : ::std::unary_function<void const*, ::std::size_t> {
}
};
-typedef ::std::unordered_set<void const*, VoidPtrHash, ::std::equal_to<void const*> > VoidPointerSet;
+typedef ::std::unordered_set<void const*, VoidPtrHash > VoidPointerSet;
struct ObjectRegistryData {
ObjectRegistryData( ::std::type_info const& rTypeInfo )
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index dbf2218..5597f7d 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -83,8 +83,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public css::frame::XStatusListener,
typedef std::unordered_map< OUString,
css::uno::Reference< css::frame::XDispatch >,
- OUStringHash,
- std::equal_to< OUString > > URLToDispatchMap;
+ OUStringHash > URLToDispatchMap;
bool m_bInitialized : 1,
m_bDisposed : 1;
diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx
index 2ae4481..f7f16d9 100644
--- a/include/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
@@ -103,8 +103,7 @@ class SVT_DLLPUBLIC StatusbarController :
typedef std::unordered_map< OUString,
css::uno::Reference< css::frame::XDispatch >,
- OUStringHash,
- std::equal_to< OUString > > URLToDispatchMap;
+ OUStringHash > URLToDispatchMap;
// methods to support status forwarder, known by the old sfx2 toolbox controller implementation
void addStatusListener( const OUString& aCommandURL );
diff --git a/include/vcl/CommandImageResolver.hxx b/include/vcl/CommandImageResolver.hxx
index ad09df1..875f658 100644
--- a/include/vcl/CommandImageResolver.hxx
+++ b/include/vcl/CommandImageResolver.hxx
@@ -31,7 +31,7 @@ enum ImageType
class VCL_DLLPUBLIC CommandImageResolver
{
private:
- typedef std::unordered_map<OUString, OUString, OUStringHash, std::equal_to<OUString>> CommandToImageNameMap;
+ typedef std::unordered_map<OUString, OUString, OUStringHash > CommandToImageNameMap;
CommandToImageNameMap m_aCommandToImageNameMap;
std::vector<OUString> m_aImageCommandNameVector;
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index 69e254c..ca618ed 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -184,8 +184,7 @@ typedef std::unordered_map
<
PyRef,
css::uno::WeakReference< css::script::XInvocation >,
- PyRef::Hash,
- std::equal_to< PyRef >
+ PyRef::Hash
> PyRef2Adapter;
@@ -193,19 +192,17 @@ typedef std::unordered_map
<
OUString,
PyRef,
-OUStringHash,
-std::equal_to<OUString>
+OUStringHash
> ExceptionClassMap;
typedef std::unordered_map
<
OUString,
css::uno::Sequence< sal_Int16 >,
- OUStringHash,
- std::equal_to< OUString >
+ OUStringHash
> MethodOutIndexMap;
-typedef std::unordered_set< PyRef , PyRef::Hash , std::equal_to<PyRef> > ClassSet;
+typedef std::unordered_set< PyRef , PyRef::Hash > ClassSet;
int PyUNO_initType();
int PyUNOStruct_initType();
diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx
index 28e8a73..ba8b1c5 100644
--- a/sc/inc/formulaparserpool.hxx
+++ b/sc/inc/formulaparserpool.hxx
@@ -44,8 +44,7 @@ private:
typedef std::unordered_map<
OUString,
css::uno::Reference< css::sheet::XFormulaParser >,
- OUStringHash,
- ::std::equal_to< OUString > > ParserMap;
+ OUStringHash > ParserMap;
const ScDocument& mrDoc;
ParserMap maParsers;
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 9412de3..9e33c2b 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -185,7 +185,7 @@ private:
}
};
- typedef std::unordered_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash, ::std::equal_to< QueryKey > > QueryMap;
+ typedef std::unordered_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash > QueryMap;
QueryMap maQueryMap;
ScRange maRange;
ScDocument * mpDoc;
@@ -195,7 +195,7 @@ private:
};
-typedef std::unordered_map< ScRange, ScLookupCache*, ScLookupCache::Hash, ::std::equal_to< ScRange > > ScLookupCacheMap;
+typedef std::unordered_map< ScRange, ScLookupCache*, ScLookupCache::Hash > ScLookupCacheMap;
#endif
diff --git a/sc/inc/macromgr.hxx b/sc/inc/macromgr.hxx
index afe803e..9906b55 100644
--- a/sc/inc/macromgr.hxx
+++ b/sc/inc/macromgr.hxx
@@ -38,7 +38,7 @@ public:
void BroadcastModuleUpdate(const OUString& aModuleName);
private:
- typedef std::unordered_map< OUString, bool, OUStringHash, ::std::equal_to< OUString > > NameBoolMap;
+ typedef std::unordered_map< OUString, bool, OUStringHash > NameBoolMap;
NameBoolMap mhFuncToVolatile;
css::uno::Reference< css::container::XContainerListener > mxContainerListener;
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 4e90c19..576c349 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -1761,7 +1761,7 @@ bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
bool bValid = ( aDestData.Dimension >= 0 ); // dropping onto a field
// look through the source range
- std::unordered_set< OUString, OUStringHash, std::equal_to<OUString> > aMembersSet; // for lookup
+ std::unordered_set< OUString, OUStringHash > aMembersSet; // for lookup
std::vector< OUString > aMembersVector; // members in original order, for inserting
aMembersVector.reserve( std::max( static_cast<SCSIZE>( rSource.aEnd.Col() - rSource.aStart.Col() + 1 ),
static_cast<SCSIZE>( rSource.aEnd.Row() - rSource.aStart.Row() + 1 ) ) );
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index 1bd7f6b..0e2660d 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -39,8 +39,7 @@ namespace dlgprov
// class DialogEventsAttacherImpl
typedef std::unordered_map< OUString,
css::uno::Reference< css::script::XScriptListener >,
- OUStringHash,
- std::equal_to< OUString > > ListenerHash;
+ OUStringHash > ListenerHash;
typedef ::cppu::WeakImplHelper<
css::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE;
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 2403600..6590d80 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -47,7 +47,7 @@ typedef std::map < css::uno::Reference< css::uno::XInterface >
typedef std::unordered_map< OUString,
css::uno::Reference< css::script::provider::XScriptProvider >,
- OUStringHash, std::equal_to< OUString > > Msp_hash;
+ OUStringHash > Msp_hash;
class NonDocMSPCreator;
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index 3a07daa..af24479 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -45,8 +45,7 @@ struct ProviderDetails
css::uno::Reference< css::lang::XSingleComponentFactory > factory;
css::uno::Reference< css::script::provider::XScriptProvider > provider;
};
-typedef std::unordered_map < OUString, ProviderDetails , OUStringHash,
- ::std::equal_to< OUString > > ProviderDetails_hash;
+typedef std::unordered_map < OUString, ProviderDetails , OUStringHash > ProviderDetails_hash;
class ProviderCache
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index dadab28..d6d3fe8 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -52,8 +52,7 @@ using namespace ::com::sun::star::ui;
typedef std::unordered_map< OUString,
WeakReference< XImageManager >,
- OUStringHash,
- ::std::equal_to< OUString > > ModuleIdToImagegMgr;
+ OUStringHash > ModuleIdToImagegMgr;
Image SAL_CALL GetImage(
diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx
index 46aee7a..274360c 100644
--- a/svgio/inc/svgio/svgreader/svgdocument.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocument.hxx
@@ -39,13 +39,12 @@ namespace svgio
/// hash mapper to find nodes by their id
typedef std::unordered_map< OUString, const SvgNode*,
- OUStringHash,
- ::std::equal_to< OUString > > IdTokenMapper;
+ OUStringHash > IdTokenMapper;
typedef std::pair< const OUString, const SvgNode* > IdTokenValueType;
IdTokenMapper maIdTokenMapperList;
/// hash mapper to find css styles by their id
- typedef std::unordered_map< OUString, const SvgStyleAttributes*, OUStringHash, ::std::equal_to< OUString > > IdStyleTokenMapper;
+ typedef std::unordered_map< OUString, const SvgStyleAttributes*, OUStringHash > IdStyleTokenMapper;
typedef std::pair< const OUString, const SvgStyleAttributes* > IdStyleTokenValueType;
IdStyleTokenMapper maIdStyleTokenMapperList;
diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index 5a27fbf..3649d28 100644
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
@@ -34,7 +34,7 @@
namespace sdr { namespace table {
typedef std::vector< css::beans::Property > PropertyVector;
-typedef std::unordered_map< OUString, ::sal_uInt32, OUStringHash, std::equal_to< OUString > > PropertyMap;
+typedef std::unordered_map< OUString, ::sal_uInt32, OUStringHash > PropertyMap;
class FastPropertySetInfo : public ::cppu::WeakAggImplHelper1< css::beans::XPropertySetInfo >
{
diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx
index 58165a1..e1b47cd 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -28,8 +28,7 @@
typedef std::unordered_map< OUString,
StylePool::SfxItemSet_Pointer_t,
- OUStringHash,
- std::equal_to< OUString > > SwStyleNameCache;
+ OUStringHash > SwStyleNameCache;
class SwStyleCache
{
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index da75f1e..0b81911 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -43,7 +43,7 @@ static sal_Int32 nRefCount = 0;
class SvtOptionsDlgOptions_Impl : public utl::ConfigItem
{
private:
- typedef std::unordered_map< OUString, sal_Bool, OUStringHash, std::equal_to< OUString > > OptionNodeList;
+ typedef std::unordered_map< OUString, sal_Bool, OUStringHash > OptionNodeList;
OUString m_sPathDelimiter;
OptionNodeList m_aOptionNodeList;
More information about the Libreoffice-commits
mailing list