[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/doc/docfmt.cxx     |   10 +++++-----
 sw/source/core/txtnode/chrfmt.cxx |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 83000b23e3e5817e0d3b44caf775edc3c5c97082
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 10 16:41:29 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Aug 10 20:24:16 2021 +0200

    boost::make_tuple->std::make_tuple
    
    Change-Id: I3c4fb707aace43c1ea75a313fcdef6df17e007c1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120279
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index aa9d21c9015c..dd39a58237c3 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2067,27 +2067,27 @@ SwFrameFormats::~SwFrameFormats()
 SwFrameFormats::const_iterator SwFrameFormats::find( const value_type& x ) 
const
 {
     ByTypeAndName::iterator it = m_TypeAndNameIndex.find(
-        boost::make_tuple(x->GetName(), x->Which(), x) );
+        std::make_tuple(x->GetName(), x->Which(), x) );
     return m_Array.project<0>( it );
 }
 
 SwFrameFormats::ByTypeAndName::const_iterator
 SwFrameFormats::findByTypeAndName( sal_uInt16 type, const OUString& name ) 
const
 {
-    return m_TypeAndNameIndex.find( boost::make_tuple(name, type) );
+    return m_TypeAndNameIndex.find( std::make_tuple(name, type) );
 }
 
 std::pair<SwFrameFormats::ByTypeAndName::const_iterator, 
SwFrameFormats::ByTypeAndName::const_iterator>
 SwFrameFormats::findRangeByName( const OUString& rName ) const
 {
-    auto it = m_TypeAndNameIndex.lower_bound( boost::make_tuple(rName, 
sal_uInt16(0)) );
-    auto itEnd = m_TypeAndNameIndex.upper_bound( boost::make_tuple(rName, 
SAL_MAX_UINT16) );
+    auto it = m_TypeAndNameIndex.lower_bound( std::make_tuple(rName, 
sal_uInt16(0)) );
+    auto itEnd = m_TypeAndNameIndex.upper_bound( std::make_tuple(rName, 
SAL_MAX_UINT16) );
     return { it, itEnd };
 }
 
 SwFrameFormat* SwFrameFormats::FindFormatByName( const OUString& rName ) const
 {
-    auto it = m_TypeAndNameIndex.lower_bound( boost::make_tuple(rName, 
sal_uInt16(0)) );
+    auto it = m_TypeAndNameIndex.lower_bound( std::make_tuple(rName, 
sal_uInt16(0)) );
     if (it != m_TypeAndNameIndex.end() && (*it)->GetName() == rName)
         return *it;
     return nullptr;
diff --git a/sw/source/core/txtnode/chrfmt.cxx 
b/sw/source/core/txtnode/chrfmt.cxx
index fc434e953d54..321e28c16e94 100644
--- a/sw/source/core/txtnode/chrfmt.cxx
+++ b/sw/source/core/txtnode/chrfmt.cxx
@@ -54,13 +54,13 @@ SwCharFormats::~SwCharFormats()
 SwCharFormats::const_iterator SwCharFormats::find(const SwCharFormat* x) const
 {
     ByName::iterator it
-        = m_NameIndex.find(boost::make_tuple(x->GetName(), 
const_cast<SwCharFormat*>(x)));
+        = m_NameIndex.find(std::make_tuple(x->GetName(), 
const_cast<SwCharFormat*>(x)));
     return m_Array.project<0>(it);
 }
 
 SwCharFormats::ByName::const_iterator SwCharFormats::findByName(const 
OUString& name) const
 {
-    return m_NameIndex.find(boost::make_tuple(name));
+    return m_NameIndex.find(std::make_tuple(name));
 }
 
 SwCharFormat* SwCharFormats::FindFormatByName(const OUString& rName) const