diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-03-05 17:42:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-03-05 19:49:43 +0100 |
| commit | ebb41767f3669cd2ad3f8208f012f70654bbceb7 (patch) | |
| tree | ccf8527c662550c51221bea24cbeb4a020c6c9f4 /connectivity | |
| parent | c40afac8a39403f1c785151c9066becccf79078b (diff) | |
Rename OCharsetMap::find overload to findIanaName
Change-Id: Id3fe81b41b92d6ad4e3f7127331d859a7b3c7f54
Reviewed-on: https://gerrit.libreoffice.org/50779
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/dbcharset.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/file/FConnection.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/mysql/YDriver.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/odbc/OConnection.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx index 48a7c6817c89..9fc7923dbc70 100644 --- a/connectivity/source/commontools/dbcharset.cxx +++ b/connectivity/source/commontools/dbcharset.cxx @@ -92,7 +92,7 @@ namespace dbtools } - OCharsetMap::CharsetIterator OCharsetMap::find(const OUString& _rIanaName, const IANA&) const + OCharsetMap::CharsetIterator OCharsetMap::findIanaName(const OUString& _rIanaName) const { ensureConstructed( ); diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index a0b5884e1ca2..a109c6fa6645 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -109,7 +109,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& OSL_VERIFY( pIter->Value >>= sIanaName ); ::dbtools::OCharsetMap aLookupIanaName; - ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.find(sIanaName, ::dbtools::OCharsetMap::IANA()); + ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.findIanaName(sIanaName); if (aLookup != aLookupIanaName.end()) m_nTextEncoding = (*aLookup).getEncoding(); else diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 25f436d5ac32..95094265e508 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -265,7 +265,7 @@ namespace connectivity if ( !sIanaName.isEmpty() ) { ::dbtools::OCharsetMap aLookupIanaName; - ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.find(sIanaName, ::dbtools::OCharsetMap::IANA()); + ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.findIanaName(sIanaName); if (aLookup != aLookupIanaName.end() ) { OUString sAdd; diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index d2fbcb436693..cc474837bb52 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -231,7 +231,7 @@ SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyVal OSL_VERIFY( pBegin->Value >>= sIanaName ); ::dbtools::OCharsetMap aLookupIanaName; - ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.find(sIanaName, ::dbtools::OCharsetMap::IANA()); + ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.findIanaName(sIanaName); if (aLookup != aLookupIanaName.end()) m_nTextEncoding = (*aLookup).getEncoding(); else |