diff options
Diffstat (limited to 'sax/source/expatwrap/xml2utf.cxx')
| -rw-r--r-- | sax/source/expatwrap/xml2utf.cxx | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx index 0c3e96564ab7..361e02fc99b0 100644 --- a/sax/source/expatwrap/xml2utf.cxx +++ b/sax/source/expatwrap/xml2utf.cxx @@ -92,7 +92,7 @@ sal_Int32 XMLFile2UTFConverter::readAndConvert( Sequence<sal_Int8> &seq , sal_In // do the encoding if( m_pText2Unicode && m_pUnicode2Text && - m_pText2Unicode->canContinue() && m_pUnicode2Text->canContinue() ) { + m_pText2Unicode->canContinue() ) { Sequence<sal_Unicode> seqUnicode = m_pText2Unicode->convert( seq ); seq = m_pUnicode2Text->convert( seqUnicode.getConstArray(), seqUnicode.getLength() ); @@ -447,16 +447,16 @@ Sequence<sal_Unicode> Text2UnicodeConverter::convert( const Sequence<sal_Int8> & Unicode2TextConverter::Unicode2TextConverter( rtl_TextEncoding encoding ) { - init( encoding ); + m_convUnicode2Text = rtl_createUnicodeToTextConverter( encoding ); + m_contextUnicode2Text = rtl_createUnicodeToTextContext( m_convUnicode2Text ); + m_rtlEncoding = encoding; } Unicode2TextConverter::~Unicode2TextConverter() { - if( m_bInitialized ) { - rtl_destroyUnicodeToTextContext( m_convUnicode2Text , m_contextUnicode2Text ); - rtl_destroyUnicodeToTextConverter( m_convUnicode2Text ); - } + rtl_destroyUnicodeToTextContext( m_convUnicode2Text , m_contextUnicode2Text ); + rtl_destroyUnicodeToTextConverter( m_convUnicode2Text ); } @@ -536,17 +536,6 @@ Sequence<sal_Int8> Unicode2TextConverter::convert(const sal_Unicode *puSource , return seqText; } -void Unicode2TextConverter::init( rtl_TextEncoding encoding ) -{ - m_bCanContinue = true; - m_bInitialized = true; - - m_convUnicode2Text = rtl_createUnicodeToTextConverter( encoding ); - m_contextUnicode2Text = rtl_createUnicodeToTextContext( m_convUnicode2Text ); - m_rtlEncoding = encoding; -}; - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |