diff options
Diffstat (limited to 'connectivity/source/commontools/dbcharset.cxx')
| -rw-r--r-- | connectivity/source/commontools/dbcharset.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx index a51cc0eeef02..bee593f44758 100644 --- a/connectivity/source/commontools/dbcharset.cxx +++ b/connectivity/source/commontools/dbcharset.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,15 +50,15 @@ namespace dbtools void OCharsetMap::lateConstruct() { const rtl_TextEncoding eFirstEncoding = RTL_TEXTENCODING_DONTKNOW; - const rtl_TextEncoding eLastEncoding = 100; // TODO: a define in rtl/textenc.h would be fine here ... + const rtl_TextEncoding eLastEncoding = 100; // TODO: a define in rtl/textenc.h would be fine here ... OSL_ENSURE( 0 == eFirstEncoding, "OCharsetMap::OCharsetMap: somebody changed the numbers!" ); rtl_TextEncodingInfo aInfo; aInfo.StructSize = sizeof( rtl_TextEncodingInfo ); for ( rtl_TextEncoding eEncoding = eFirstEncoding; eEncoding < eLastEncoding; ++eEncoding ) { - if ( ( RTL_TEXTENCODING_DONTKNOW == eEncoding ) // this is always allowed - it has the special meaning "system encoding" - || ( rtl_getTextEncodingInfo( eEncoding, &aInfo ) - && approveEncoding( eEncoding, aInfo ) + if ( ( RTL_TEXTENCODING_DONTKNOW == eEncoding ) // this is always allowed - it has the special meaning "system encoding" + || ( rtl_getTextEncodingInfo( eEncoding, &aInfo ) + && approveEncoding( eEncoding, aInfo ) ) ) { @@ -103,14 +103,14 @@ namespace dbtools } //------------------------------------------------------------------------- - OCharsetMap::CharsetIterator OCharsetMap::find(const rtl_TextEncoding _eEncoding) const + OCharsetMap::CharsetIterator OCharsetMap::find(const rtl_TextEncoding _eEncoding) const { ensureConstructed( ); return CharsetIterator( this, m_aEncodings.find( _eEncoding ) ); } //------------------------------------------------------------------------- - OCharsetMap::CharsetIterator OCharsetMap::find(const ::rtl::OUString& _rIanaName, const IANA&) const + OCharsetMap::CharsetIterator OCharsetMap::find(const ::rtl::OUString& _rIanaName, const IANA&) const { ensureConstructed( ); @@ -123,7 +123,7 @@ namespace dbtools eEncoding = rtl_getTextEncodingFromMimeCharset( sMimeByteString.getStr() ); if ( RTL_TEXTENCODING_DONTKNOW == eEncoding ) - { // if we're here, the name is not empty, but unknown -> this is an invalid name + { // if we're here, the name is not empty, but unknown -> this is an invalid name return end(); } } @@ -194,7 +194,7 @@ namespace dbtools ::rtl::OUString sIanaName; if ( RTL_TEXTENCODING_DONTKNOW != eEncoding ) - { // it's not the virtual "system charset" + { // it's not the virtual "system charset" const char* pIanaName = rtl_getMimeCharsetFromTextEncoding( eEncoding ); OSL_ENSURE( pIanaName, "OCharsetMap::CharsetIterator: invalid mime name!" ); if ( pIanaName ) @@ -204,7 +204,7 @@ namespace dbtools } //------------------------------------------------------------------------- - const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator++() + const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator++() { OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.end(), "OCharsetMap::CharsetIterator::operator++ : invalid position!" ); if ( m_aPos != m_pContainer->m_aEncodings.end()) @@ -213,7 +213,7 @@ namespace dbtools } //------------------------------------------------------------------------- - const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator--() + const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator--() { OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.begin(), "OCharsetMap::CharsetIterator::operator-- : invalid position!" ); if ( m_aPos != m_pContainer->m_aEncodings.begin() ) @@ -228,7 +228,7 @@ namespace dbtools } //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |