[Libreoffice-commits] core.git: basctl/source basic/source chart2/source comphelper/source include/comphelper reportdesign/inc scripting/source svx/source sw/source toolkit/source unodevtools/source
Takeshi Abe
tabe at fixedpoint.jp
Tue Nov 1 04:12:08 UTC 2016
basctl/source/inc/dlgedobj.hxx | 2 +-
basic/source/classes/sbxmod.cxx | 2 +-
chart2/source/controller/main/FeatureCommandDispatchBase.hxx | 3 +--
comphelper/source/misc/accessibleeventnotifier.cxx | 3 +--
include/comphelper/IdPropArrayHelper.hxx | 2 +-
include/comphelper/propagg.hxx | 2 +-
reportdesign/inc/RptObject.hxx | 2 +-
scripting/source/basprov/basscript.cxx | 2 +-
svx/source/inc/fmtextcontrolshell.hxx | 2 +-
sw/source/filter/ww8/WW8TableInfo.hxx | 2 +-
toolkit/source/controls/controlmodelcontainerbase.cxx | 2 +-
unodevtools/source/skeletonmaker/skeletoncommon.hxx | 3 +--
12 files changed, 12 insertions(+), 15 deletions(-)
New commits:
commit cb90f0976d20d0e9c61138f4572d14750ea3de07
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Thu Oct 27 18:20:13 2016 +0900
Omit the default comparator
Change-Id: Idea8ea8dab6a86d7be6394aef1cf7f25b75009e0
Reviewed-on: https://gerrit.libreoffice.org/30319
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index c103b2f..101a695 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -31,7 +31,7 @@
namespace basctl
{
-typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexToNameMap;
+typedef ::std::multimap< sal_Int16, OUString > IndexToNameMap;
class DlgEdForm;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 79cfa64..5acd71e 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -84,7 +84,7 @@ using namespace com::sun::star::script;
using namespace com::sun::star::uno;
typedef ::cppu::WeakImplHelper< XInvocation > DocObjectWrapper_BASE;
-typedef ::std::map< sal_Int16, Any, ::std::less< sal_Int16 > > OutParamMap;
+typedef ::std::map< sal_Int16, Any > OutParamMap;
class DocObjectWrapper : public DocObjectWrapper_BASE
{
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
index 07679b1..0d6ed19 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
@@ -34,8 +34,7 @@ struct ControllerFeature: public css::frame::DispatchInformation
};
typedef ::std::map< OUString,
- ControllerFeature,
- ::std::less< OUString > > SupportedFeatures;
+ ControllerFeature > SupportedFeatures;
struct FeatureState
{
diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx
index a84d0aa..9c7d89a 100644
--- a/comphelper/source/misc/accessibleeventnotifier.cxx
+++ b/comphelper/source/misc/accessibleeventnotifier.cxx
@@ -37,8 +37,7 @@ namespace
AccessibleEventObject > ClientEvent;
typedef ::std::map< AccessibleEventNotifier::TClientId,
- ::comphelper::OInterfaceContainerHelper2*,
- ::std::less< AccessibleEventNotifier::TClientId > > ClientMap;
+ ::comphelper::OInterfaceContainerHelper2* > ClientMap;
/// key is the end of the interval, value is the start of the interval
typedef ::std::map<AccessibleEventNotifier::TClientId,
diff --git a/include/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx
index a8b2f4e..59c83f1 100644
--- a/include/comphelper/IdPropArrayHelper.hxx
+++ b/include/comphelper/IdPropArrayHelper.hxx
@@ -40,7 +40,7 @@ namespace comphelper
template <typename TYPE> struct OIdPropertyArrayUsageHelperMutex
: public rtl::Static< ::osl::Mutex, OIdPropertyArrayUsageHelperMutex<TYPE> > {};
- typedef std::map< sal_Int32, ::cppu::IPropertyArrayHelper*, std::less< sal_Int32 > > OIdPropertyArrayMap;
+ typedef std::map< sal_Int32, ::cppu::IPropertyArrayHelper* > OIdPropertyArrayMap;
template <class TYPE>
class OIdPropertyArrayUsageHelper
{
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index fa91130..6481dd8 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -55,7 +55,7 @@ namespace internal
bool operator <(const OPropertyAccessor& rOb) const { return nPos < rOb.nPos; }
};
- typedef std::map< sal_Int32, OPropertyAccessor, ::std::less< sal_Int32 > > PropertyAccessorMap;
+ typedef std::map< sal_Int32, OPropertyAccessor > PropertyAccessorMap;
typedef PropertyAccessorMap::iterator PropertyAccessorMapIterator;
typedef PropertyAccessorMap::const_iterator ConstPropertyAccessorMapIterator;
}
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 8058bb2..105273f 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -36,7 +36,7 @@
namespace rptui
{
-typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexToNameMap;
+typedef ::std::multimap< sal_Int16, OUString > IndexToNameMap;
enum DlgEdHintKind
{
RPTUI_HINT_WINDOWSCROLLED,
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 6e71cfb..14a0d6f 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -50,7 +50,7 @@ namespace basprov
#define BASSCRIPT_DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT
- typedef ::std::map< sal_Int16, Any, ::std::less< sal_Int16 > > OutParamMap;
+ typedef ::std::map< sal_Int16, Any > OutParamMap;
// BasicScriptImpl
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index fb8027d..1ebc316 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -101,7 +101,7 @@ namespace svx
// translating between "slots" of the framework and "features" of the active control
typedef rtl::Reference<FmTextControlFeature> ControlFeature;
- typedef ::std::map< SfxSlotId, ControlFeature, ::std::less< SfxSlotId > > ControlFeatures;
+ typedef ::std::map< SfxSlotId, ControlFeature > ControlFeatures;
ControlFeatures m_aControlFeatures;
SfxViewFrame* m_pViewFrame;
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index 77e27e8..2a79d3c 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -156,7 +156,7 @@ public:
#endif
};
-typedef std::multiset<CellInfo, std::less<CellInfo> > CellInfoMultiSet;
+typedef std::multiset<CellInfo> CellInfoMultiSet;
typedef std::map<sal_uInt32, WW8TableNodeInfoInner*,
std::greater<sal_uInt32> > RowEndInners_t;
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 9bf0b46..3cf4abb 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -705,7 +705,7 @@ void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Refer
}
-typedef ::std::multimap< sal_Int32, Reference< XControlModel >, ::std::less< sal_Int32 > > MapIndexToModel;
+typedef ::std::multimap< sal_Int32, Reference< XControlModel > > MapIndexToModel;
Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getControlModels( ) throw (RuntimeException, std::exception)
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.hxx b/unodevtools/source/skeletonmaker/skeletoncommon.hxx
index 5a33ebe..97c0e72 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.hxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.hxx
@@ -33,8 +33,7 @@
namespace skeletonmaker {
-typedef ::std::map< OString, ::std::vector< OString >,
- ::std::less< OString > > ProtocolCmdMap;
+typedef ::std::map< OString, ::std::vector< OString > > ProtocolCmdMap;
typedef ::std::vector< unoidl::AccumulationBasedServiceEntity::Property >
AttributeInfo;
More information about the Libreoffice-commits
mailing list