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 /sw | |
| 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>
Diffstat (limited to 'sw')
| -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 |
3 files changed, 5 insertions, 38 deletions
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 { |