diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-10-27 18:20:13 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2016-11-01 04:11:44 +0000 |
commit | cb90f0976d20d0e9c61138f4572d14750ea3de07 (patch) | |
tree | 433e048782fb5b609ad560164bbef9bc23d65bae | |
parent | 9fa6dadc4e1e75b2fd7b7360995c524fa7a5d40e (diff) |
Omit the default comparator
Change-Id: Idea8ea8dab6a86d7be6394aef1cf7f25b75009e0
Reviewed-on: https://gerrit.libreoffice.org/30319
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
-rw-r--r-- | basctl/source/inc/dlgedobj.hxx | 2 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/main/FeatureCommandDispatchBase.hxx | 3 | ||||
-rw-r--r-- | comphelper/source/misc/accessibleeventnotifier.cxx | 3 | ||||
-rw-r--r-- | include/comphelper/IdPropArrayHelper.hxx | 2 | ||||
-rw-r--r-- | include/comphelper/propagg.hxx | 2 | ||||
-rw-r--r-- | reportdesign/inc/RptObject.hxx | 2 | ||||
-rw-r--r-- | scripting/source/basprov/basscript.cxx | 2 | ||||
-rw-r--r-- | svx/source/inc/fmtextcontrolshell.hxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/WW8TableInfo.hxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase.cxx | 2 | ||||
-rw-r--r-- | unodevtools/source/skeletonmaker/skeletoncommon.hxx | 3 |
12 files changed, 12 insertions, 15 deletions
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index c103b2f2b459..101a69523f76 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 79cfa649e18f..5acd71e9482c 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 07679b1d952f..0d6ed195b710 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 a84d0aad0031..9c7d89a12985 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 a8b2f4e93f5d..59c83f1f92ad 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 fa91130d48ae..6481dd85d777 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 8058bb2d472a..105273f03827 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 6e71cfbd223b..14a0d6fb4824 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 fb8027d91019..1ebc31654093 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 77e27e8efd96..2a79d3c207f9 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 9bf0b46e4512..3cf4abb36d26 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 5a33ebe20720..97c0e72a6324 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; |