diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-10-29 12:43:54 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2016-10-31 03:48:49 +0000 |
commit | b589c4cd8765b0611afe435354364df891d78852 (patch) | |
tree | 4dbfacf74480e2154a2e38c3fd41fe9d34f08fc3 | |
parent | 3d83c42008ab51202c0577f493e8ed3fde0310b7 (diff) |
Omit comparator which is the same as default std::less<key_type>
Change-Id: I72a0b618577caececaaf3eb4df53d4cb192251da
Reviewed-on: https://gerrit.libreoffice.org/30369
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
-rw-r--r-- | editeng/source/misc/splwrap.cxx | 10 | ||||
-rw-r--r-- | include/svx/xmleohlp.hxx | 4 | ||||
-rw-r--r-- | sdext/source/minimizer/configurationaccess.cxx | 2 | ||||
-rw-r--r-- | sdext/source/minimizer/configurationaccess.hxx | 9 | ||||
-rw-r--r-- | sdext/source/minimizer/optimizationstats.cxx | 4 | ||||
-rw-r--r-- | sdext/source/minimizer/optimizationstats.hxx | 9 | ||||
-rw-r--r-- | svx/source/inc/GraphCtlAccessibleContext.hxx | 9 | ||||
-rw-r--r-- | svx/source/xml/xmleohlp.cxx | 8 | ||||
-rw-r--r-- | sw/inc/unochart.hxx | 9 | ||||
-rw-r--r-- | sw/source/core/doc/dbgoutsw.cxx | 12 | ||||
-rw-r--r-- | sw/source/uibase/docvw/frmsidebarwincontainer.cxx | 22 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_docmgr.hxx | 11 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonLockStore.hxx | 10 | ||||
-rw-r--r-- | vcl/win/gdi/salbmp.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 10 |
16 files changed, 18 insertions, 131 deletions
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index ba8dbf1bc0f0..2ddb12877a2d 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -79,15 +79,7 @@ void SvxPrepareAutoCorrect( OUString &rOldText, const OUString &rNewText ) #define SVX_LANG_MISSING 2 #define SVX_LANG_MISSING_DO_WARN 3 -struct lt_LanguageType -{ - bool operator()( LanguageType n1, LanguageType n2 ) const - { - return n1 < n2; - } -}; - -typedef std::map< LanguageType, sal_uInt16, lt_LanguageType > LangCheckState_map_t; +typedef std::map< LanguageType, sal_uInt16 > LangCheckState_map_t; static LangCheckState_map_t & GetLangCheckState() { diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index 24f9d30b0662..1f5d47e66da1 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -37,15 +37,13 @@ enum class SvXMLEmbeddedObjectHelperMode namespace comphelper { class IEmbeddedHelper; } class SvGlobalName; -struct OUStringLess; class OutputStorageWrapper_Impl; class SVX_DLLPUBLIC SvXMLEmbeddedObjectHelper : public ::cppu::WeakComponentImplHelper2< css::document::XEmbeddedObjectResolver, css::container::XNameAccess > { - typedef ::std::map< OUString, OutputStorageWrapper_Impl*, - OUStringLess > SvXMLEmbeddedObjectHelper_Impl; + typedef ::std::map< OUString, OutputStorageWrapper_Impl* > SvXMLEmbeddedObjectHelper_Impl; private: ::osl::Mutex maMutex; diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 49f34809e93a..f87acfa1908a 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -162,7 +162,7 @@ ConfigurationAccess::~ConfigurationAccess() OUString ConfigurationAccess::getString( const PPPOptimizerTokenEnum eToken ) const { - std::map< PPPOptimizerTokenEnum, OUString, Compare >::const_iterator aIter( maStrings.find( eToken ) ); + std::map< PPPOptimizerTokenEnum, OUString >::const_iterator aIter( maStrings.find( eToken ) ); return aIter != maStrings.end() ? ((*aIter).second) : OUString(); } diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index 8cae507ecea9..72bc1034ba1e 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.hxx @@ -102,14 +102,7 @@ class ConfigurationAccess private: - struct Compare - { - bool operator()( const PPPOptimizerTokenEnum s1, const PPPOptimizerTokenEnum s2 ) const - { - return s1 < s2; - } - }; - std::map < PPPOptimizerTokenEnum, OUString, Compare > maStrings; + std::map < PPPOptimizerTokenEnum, OUString > maStrings; std::vector< OptimizerSettings > maSettings; std::vector< OptimizerSettings > maInitialSettings; diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx index 04567a19e36c..b3f25bdd9a17 100644 --- a/sdext/source/minimizer/optimizationstats.cxx +++ b/sdext/source/minimizer/optimizationstats.cxx @@ -45,7 +45,7 @@ void OptimizationStats::SetStatusValue( const PPPOptimizerTokenEnum eStat, const const uno::Any* OptimizationStats::GetStatusValue( const PPPOptimizerTokenEnum eStat ) const { - std::map< PPPOptimizerTokenEnum, uno::Any, Compare >::const_iterator aIter( maStats.find( eStat ) ); + std::map< PPPOptimizerTokenEnum, uno::Any >::const_iterator aIter( maStats.find( eStat ) ); return aIter != maStats.end() ? &((*aIter).second) : nullptr; } @@ -54,7 +54,7 @@ css::beans::PropertyValues OptimizationStats::GetStatusSequence() { int i = 0; uno::Sequence< PropertyValue > aStatsSequence( maStats.size() ); - std::map< PPPOptimizerTokenEnum, uno::Any, Compare >::iterator aIter( maStats.begin() ); + std::map< PPPOptimizerTokenEnum, uno::Any >::iterator aIter( maStats.begin() ); while( aIter != maStats.end() ) { aStatsSequence[ i ].Name = TKGet( (*aIter).first ); diff --git a/sdext/source/minimizer/optimizationstats.hxx b/sdext/source/minimizer/optimizationstats.hxx index 29a15aa0afa2..29824dae06be 100644 --- a/sdext/source/minimizer/optimizationstats.hxx +++ b/sdext/source/minimizer/optimizationstats.hxx @@ -28,14 +28,7 @@ class OptimizationStats { - struct Compare - { - bool operator()( const PPPOptimizerTokenEnum s1, const PPPOptimizerTokenEnum s2 ) const - { - return s1 < s2; - } - }; - std::map < PPPOptimizerTokenEnum, css::uno::Any, Compare > maStats; + std::map < PPPOptimizerTokenEnum, css::uno::Any > maStats; public: diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 4e271d930a30..c0f3454a930e 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -208,14 +208,7 @@ private: OUString msName; /// map of accessible shapes - struct SdrObjectCompareLess - { - bool operator()(const SdrObject* p1, const SdrObject* p2) const - { - return p1 < p2; - } - }; - typedef ::std::map< const SdrObject*, rtl::Reference<accessibility::AccessibleShape>, SdrObjectCompareLess > ShapesMapType; + typedef ::std::map< const SdrObject*, rtl::Reference<accessibility::AccessibleShape> > ShapesMapType; ShapesMapType mxShapes; VclPtr<GraphCtrl> mpControl; diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index a993cb704061..eaba0c99f22f 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -126,14 +126,6 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput() bStreamClosed = true; } -struct OUStringLess -{ - bool operator() ( const OUString& r1, const OUString& r2 ) const - { - return r1 < r2; - } -}; - SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() : WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ), maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ), diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 2d419708ab44..8c67a48e7540 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -120,14 +120,7 @@ class SwChartDataProvider : typedef std::set< css::uno::WeakReference < css::chart2::data::XDataSequence >, lt_DataSequenceRef > Set_DataSequenceRef_t; // map of data-sequence sets for each table - struct lt_SwTable_Ptr - { - bool operator()( const SwTable *p1, const SwTable *p2 ) const - { - return p1 < p2; - } - }; - typedef std::map< const SwTable *, Set_DataSequenceRef_t, lt_SwTable_Ptr > Map_Set_DataSequenceRef_t; + typedef std::map< const SwTable *, Set_DataSequenceRef_t > Map_Set_DataSequenceRef_t; // map of all data-sequences provided directly or indirectly (e.g. via // data-source) by this object. Since there is only one object of this type diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 23770384b36e..f86ee1c116ae 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -93,17 +93,9 @@ const char * dbg_out(const OUString & aStr) return aDbgOutResult.getStr(); } -struct CompareUShort +map<sal_uInt16,OUString> & GetItemWhichMap() { - bool operator()(sal_uInt16 a, sal_uInt16 b) const - { - return a < b; - } -}; - -map<sal_uInt16,OUString,CompareUShort> & GetItemWhichMap() -{ - static map<sal_uInt16,OUString,CompareUShort> aItemWhichMap; + static map<sal_uInt16,OUString> aItemWhichMap; static bool bInitialized = false; if (! bInitialized) diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx index 228dbf1523f8..722ca6068a8f 100644 --- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx +++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx @@ -39,16 +39,7 @@ namespace { } }; - struct SidebarWinOrder - { - bool operator()( const SidebarWinKey& rSidebarWinKeyA, - const SidebarWinKey& rSidebarWinKeyB ) const - { - return rSidebarWinKeyA < rSidebarWinKeyB; - } - }; - - typedef std::map < SidebarWinKey, VclPtr<sw::sidebarwindows::SwSidebarWin>, SidebarWinOrder > SidebarWinContainer; + typedef std::map < SidebarWinKey, VclPtr<sw::sidebarwindows::SwSidebarWin> > SidebarWinContainer; struct FrameKey { @@ -64,16 +55,7 @@ namespace { } }; - struct FrameOrder - { - bool operator()( const FrameKey& rFrameKeyA, - const FrameKey& rFrameKeyB ) const - { - return rFrameKeyA < rFrameKeyB; - } - }; - - typedef std::map < FrameKey, SidebarWinContainer, FrameOrder > FrameSidebarWinContainer_; + typedef std::map < FrameKey, SidebarWinContainer > FrameSidebarWinContainer_; } namespace sw { namespace sidebarwindows { diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index 1cace6937fe6..7dd5a07459ec 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -54,16 +54,7 @@ namespace tdoc_ucp { }; - struct ltref - { - bool operator()( - const OUString & r1, const OUString & r2 ) const - { - return r1 < r2; - } - }; - - typedef std::map< OUString, StorageInfo, ltref > DocumentList; + typedef std::map< OUString, StorageInfo > DocumentList; class OfficeDocumentsManager : diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx index 8a52f1872f49..b0f968a9f208 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx @@ -43,14 +43,6 @@ namespace webdav_ucp class TickerThread; class NeonSession; -struct ltptr -{ - bool operator()( const NeonLock * p1, const NeonLock * p2 ) const - { - return p1 < p2; - } -}; - struct LockInfo { rtl::Reference< NeonSession > xSession; @@ -66,7 +58,7 @@ struct LockInfo }; -typedef std::map< NeonLock *, LockInfo, ltptr > LockInfoMap; +typedef std::map< NeonLock *, LockInfo > LockInfoMap; class NeonLockStore { diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx index 73d3d78362bf..4470576edfd7 100644 --- a/vcl/win/gdi/salbmp.cxx +++ b/vcl/win/gdi/salbmp.cxx @@ -62,15 +62,7 @@ inline void ImplSetPixel4( sal_uInt8* pScanline, long nX, const BYTE cIndex ) // Helper class to manage Gdiplus::Bitmap instances inside of // WinSalBitmap -struct Comparator -{ - bool operator()(WinSalBitmap* pA, WinSalBitmap* pB) const - { - return pA < pB; - } -}; - -typedef ::std::map< WinSalBitmap*, sal_uInt32, Comparator > EntryMap; +typedef ::std::map< WinSalBitmap*, sal_uInt32 > EntryMap; static const sal_uInt32 nDefaultCycles(60); class GdiPlusBuffer : protected cppu::BaseMutex, public Timer diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index f36da5f7d3ff..121ab34fd6bf 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -49,14 +49,6 @@ using namespace ::std; using namespace ::com::sun::star; using namespace ::xmloff::token; -struct ltint32 -{ - bool operator()(const sal_Int32 p, sal_Int32 q) const - { - return p < q; - } -}; - struct ConnectionHint { css::uno::Reference< css::drawing::XShape > mxConnector; @@ -76,7 +68,7 @@ struct XShapeCompareHelper /** this map store all glue point id mappings for shapes that had user defined glue points. This is needed because on insertion the glue points will get a new and unique id */ -typedef std::map<sal_Int32,sal_Int32,ltint32> GluePointIdMap; +typedef std::map<sal_Int32,sal_Int32> GluePointIdMap; typedef std::map< css::uno::Reference < css::drawing::XShape >, GluePointIdMap, XShapeCompareHelper > ShapeGluePointsMap; /** this struct is created for each startPage() call and stores information that is needed during diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 98b5c4690539..11c05c6ee154 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -52,15 +52,7 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; using namespace ::svt; -struct LessuInt32 -{ - bool operator() (const sal_uInt32 rValue1, const sal_uInt32 rValue2) const - { - return rValue1 < rValue2; - } -}; - -typedef std::set< sal_uInt32, LessuInt32 > SvXMLuInt32Set; +typedef std::set< sal_uInt32 > SvXMLuInt32Set; struct SvXMLEmbeddedTextEntry { |