diff options
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 13 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 9 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.cxx | 4 |
3 files changed, 8 insertions, 18 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx index f7092dfc6761..7c027680abaa 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx @@ -73,10 +73,7 @@ Name { #ifdef DEBUG_WRITERFILTER clog << this << ":start unknown element:" - << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr() - << ":" - << OUStringToOString(Name, RTL_TEXTENCODING_ASCII_US).getStr() - << endl; + << Namespace << ":" << Name << endl; #endif } @@ -106,9 +103,7 @@ Name { #ifdef DEBUG_WRITERFILTER clog << this << ":end unknown element:" - << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr() - << ":" - << OUStringToOString(Name, RTL_TEXTENCODING_ASCII_US).getStr() + << Namespace << ":" << Name << endl; #endif } @@ -158,9 +153,7 @@ Name { #ifdef DEBUG_WRITERFILTER clog << this << ":createUnknownChildContext:" - << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr() - << ":" - << OUStringToOString(Name, RTL_TEXTENCODING_ASCII_US).getStr() + << Namespace << ":"<< Name << endl; #endif diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c49ae29af150..0d81c1986229 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -764,10 +764,9 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS // Feed the destination text to a stream. OString aStr = OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); - const char* str = aStr.getStr(); for (int i = 0; i < aStr.getLength(); ++i) { - char ch = str[i]; + char ch = aStr[i]; if (ch != 0x0d && ch != 0x0a && ch != 0x20) { b = b << 4; @@ -2184,11 +2183,10 @@ RTFError RTFDocumentImpl::popState() OString aStr = OUStringToOString(m_aStates.top().pDestinationText->makeStringAndClear(), aState.nCurrentEncoding); // decode hex dump OStringBuffer aBuf; - const char* str = aStr.getStr(); int b = 0, count = 2; for (int i = 0; i < aStr.getLength(); ++i) { - char ch = str[i]; + char ch = aStr[i]; if (ch != 0x0d && ch != 0x0a) { b = b << 4; @@ -3093,10 +3091,9 @@ RTFError RTFDocumentImpl::handleEmbeddedObject() // Feed the destination text to a stream. OString aStr = OUStringToOString(m_aStates.top().pDestinationText->makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); - const char* str = aStr.getStr(); for (int i = 0; i < aStr.getLength(); ++i) { - char ch = str[i]; + char ch = aStr[i]; if (ch != 0x0d && ch != 0x0a) { b = b << 4; diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index e5e1087d3645..5734c8e1282e 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -282,7 +282,7 @@ RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, bool bParam, int nPara Strm().SeekRel(nParam); return RTFError::OK; } - SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << ": keyword '\\" << rKeyword.getStr() << + SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << ": keyword '\\" << rKeyword << "' with param? " << (bParam ? 1 : 0) <<" param val: '" << (bParam ? nParam : 0) << "'"); RTFSymbol aSymbol; aSymbol.sKeyword = rKeyword.getStr(); @@ -290,7 +290,7 @@ RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, bool bParam, int nPara int i = low - s_aRTFControlWords.begin(); if (low == s_aRTFControlWords.end() || aSymbol < *low) { - SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << ": unknown keyword '\\" << rKeyword.getStr() << "'"); + SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << ": unknown keyword '\\" << rKeyword << "'"); RTFSkipDestination aSkip(m_rImport); aSkip.setParsed(false); return RTFError::OK; |