mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename OCharsetMap::find overload to findIanaName

Browse Source 
Change-Id: Id3fe81b41b92d6ad4e3f7127331d859a7b3c7f54
Reviewed-on: https://gerrit.libreoffice.org/50779
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2018-03-05 17:42:40 +01:00
parent c40afac8a3
commit ebb41767f3
6 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connectivity/source/commontools/dbcharset.cxx
View File

@@ -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( ); ensureConstructed( );

2
connectivity/source/drivers/file/FConnection.cxx
View File

@@ -109,7 +109,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
OSL_VERIFY( pIter->Value >>= sIanaName ); OSL_VERIFY( pIter->Value >>= sIanaName );
::dbtools::OCharsetMap aLookupIanaName; ::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()) if (aLookup != aLookupIanaName.end())
m_nTextEncoding = (*aLookup).getEncoding(); m_nTextEncoding = (*aLookup).getEncoding();
else else

2
connectivity/source/drivers/mysql/YDriver.cxx
View File

@@ -265,7 +265,7 @@ namespace connectivity
if ( !sIanaName.isEmpty() ) if ( !sIanaName.isEmpty() )
{ {
::dbtools::OCharsetMap aLookupIanaName; ::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() ) if (aLookup != aLookupIanaName.end() )
{ {
OUString sAdd; OUString sAdd;

2
connectivity/source/drivers/odbc/OConnection.cxx
View File

@@ -231,7 +231,7 @@ SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyVal
OSL_VERIFY( pBegin->Value >>= sIanaName ); OSL_VERIFY( pBegin->Value >>= sIanaName );
::dbtools::OCharsetMap aLookupIanaName; ::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()) if (aLookup != aLookupIanaName.end())
m_nTextEncoding = (*aLookup).getEncoding(); m_nTextEncoding = (*aLookup).getEncoding();
else else

2
dbaccess/source/ui/misc/charsets.cxx
View File

@@ -63,7 +63,7 @@ namespace dbaui
OCharsetDisplay::const_iterator OCharsetDisplay::findIanaName(const OUString& _rIanaName) const OCharsetDisplay::const_iterator OCharsetDisplay::findIanaName(const OUString& _rIanaName) const
{ {
OCharsetMap::const_iterator aBaseIter = OCharsetMap::find(_rIanaName, OCharsetMap::IANA()); OCharsetMap::const_iterator aBaseIter = OCharsetMap::findIanaName(_rIanaName);
return const_iterator( this, aBaseIter ); return const_iterator( this, aBaseIter );
} }

4
include/connectivity/dbcharset.hxx
View File

@@ -67,8 +67,6 @@ namespace dbtools
OCharsetMap(); OCharsetMap();
virtual ~OCharsetMap(); virtual ~OCharsetMap();
struct IANA { };
/** find the given text encoding in the map. /** find the given text encoding in the map.
@return the <em>end</em> iterator if the encoding could not be found. @return the <em>end</em> iterator if the encoding could not be found.
*/ */
@@ -76,7 +74,7 @@ namespace dbtools
/** find the given IANA name in the map. /** find the given IANA name in the map.
@return the <em>end</em> iterator if the IANA name could not be found. @return the <em>end</em> iterator if the IANA name could not be found.
*/ */
CharsetIterator find(const OUString& _rIanaName, const IANA&) const; CharsetIterator findIanaName(const OUString& _rIanaName) const;
/// get access to the first element of the charset collection /// get access to the first element of the charset collection
CharsetIterator begin() const; CharsetIterator begin() const;