1 files changed, 8 insertions, 7 deletions
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index ebe45c028207..381afa606e08 100644
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <connectivity/dbcharset.hxx>
+#include <utility>
 #include <osl/diagnose.h>
 #include <rtl/tencinfo.h>
 
@@ -92,15 +93,15 @@ namespace dbtools
     }
 
 
-    OCharsetMap::CharsetIterator    OCharsetMap::findIanaName(const OUString& _rIanaName) const
+    OCharsetMap::CharsetIterator    OCharsetMap::findIanaName(std::u16string_view _rIanaName) const
     {
         ensureConstructed( );
 
         rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW;
-        if ( !_rIanaName.isEmpty() )
+        if ( !_rIanaName.empty() )
         {
             // byte string conversion
-            OString sMimeByteString( _rIanaName.getStr(), _rIanaName.getLength(), RTL_TEXTENCODING_ASCII_US );
+            OString sMimeByteString = OUStringToOString( _rIanaName, RTL_TEXTENCODING_ASCII_US );
             // look up
             eEncoding = rtl_getTextEncodingFromMimeCharset( sMimeByteString.getStr() );
 
@@ -129,15 +130,15 @@ namespace dbtools
     }
 
 
-    CharsetIteratorDerefHelper:: CharsetIteratorDerefHelper(const rtl_TextEncoding _eEncoding, const OUString& _rIanaName )
+    CharsetIteratorDerefHelper:: CharsetIteratorDerefHelper(const rtl_TextEncoding _eEncoding, OUString _aIanaName )
         :m_eEncoding( _eEncoding )
-        ,m_aIanaName( _rIanaName )
+        ,m_aIanaName(std::move( _aIanaName ))
     {
     }
 
-    OCharsetMap::CharsetIterator::CharsetIterator(const OCharsetMap* _pContainer, OCharsetMap::TextEncBag::const_iterator const & _aPos )
+    OCharsetMap::CharsetIterator::CharsetIterator(const OCharsetMap* _pContainer, OCharsetMap::TextEncBag::const_iterator _aPos )
         :m_pContainer( _pContainer )
-        ,m_aPos( _aPos )
+        ,m_aPos(std::move( _aPos ))
     {
         OSL_ENSURE( m_pContainer, "OCharsetMap::CharsetIterator::CharsetIterator : invalid container!" );
     }