diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-25 10:01:42 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-25 10:01:42 +0000 |
| commit | 4ce1f84b006235f3472cf0b8aa2cc10b882212f5 (patch) | |
| tree | cf9af39606d5fc0525a83b2e5f8a234ea3346b2e /svx/source/dialog/txencbox.cxx | |
| parent | INTEGRATION: CWS sw017 (1.14.2); FILE MERGED (diff) | |
| download | core-4ce1f84b006235f3472cf0b8aa2cc10b882212f5.tar.gz core-4ce1f84b006235f3472cf0b8aa2cc10b882212f5.zip | |
INTEGRATION: CWS dba08 (1.6.106); FILE MERGED
2003/06/19 16:50:16 er 1.6.106.1: #110342# FillFromDbTextEncodingMap: don't use loop counter as encoding value ... and detect resource string not present
Diffstat (limited to 'svx/source/dialog/txencbox.cxx')
| -rw-r--r-- | svx/source/dialog/txencbox.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 62257795864a..092512e3ec2b 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txencbox.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2003-04-08 16:12:49 $ + * last change: $Author: vg $ $Date: 2003-06-25 11:01:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -214,7 +214,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( // makes no sense here and would result in an empty string as list // entry. if ( bInsert && nEnc != RTL_TEXTENCODING_DONTKNOW ) - InsertTextEncoding( nEnc, m_pEncTable->GetString( j ) ); + InsertTextEncoding( nEnc ); } } } @@ -268,7 +268,16 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, USHORT nPos ) { const String& rEntry = m_pEncTable->GetTextString( nEnc ); - InsertTextEncoding( nEnc, rEntry, nPos ); + if ( rEntry.Len() ) + InsertTextEncoding( nEnc, rEntry, nPos ); + else + { +#ifdef DBG_UTIL + ByteString aMsg( "SvxTextEncodingBox::InsertTextEncoding: no resource string for text encoding: " ); + aMsg += ByteString::CreateFromInt32( nEnc ); + DBG_ERRORFILE( aMsg.GetBuffer() ); +#endif + } } //------------------------------------------------------------------------ |