diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-10-05 10:49:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-05 10:49:52 +0100 |
| commit | 06a68d190f35fdc116cda593157446b87afe5f6b (patch) | |
| tree | 2dbc2ceb05ebd9a0bdb365a0893ef53052ebbaf9 | |
| parent | 06ae02404e0d4d72f4150e8b33b491457255428e (diff) | |
use rtl::OStringBuffer::getStr()
| -rw-r--r-- | filter/source/xsltfilter/LibXSLTTransformer.cxx | 10 | ||||
| -rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index 4c2d5f498787..f12d0f208ba3 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -305,16 +305,16 @@ namespace XSLT OSL_ASSERT(m_transformer != NULL); OSL_ASSERT(m_transformer->getInputStream().is()); OSL_ASSERT(m_transformer->getOutputStream().is()); - OSL_ASSERT(m_transformer->getStyleSheetURL()); + OSL_ASSERT(!m_transformer->getStyleSheetURL().isEmpty()); ::std::map<const char*, OString>::iterator pit; ::std::map<const char*, OString> pmap = m_transformer->getParameters(); ::std::vector< const char* > params( pmap.size() * 2 + 1 ); // build parameters int paramIndex = 0; for (pit = pmap.begin(); pit != pmap.end(); ++pit) - { - params[paramIndex++] = (*pit).first; - params[paramIndex++] = (*pit).second.getStr(); - } + { + params[paramIndex++] = (*pit).first; + params[paramIndex++] = (*pit).second.getStr(); + } params[paramIndex] = NULL; xmlDocPtr doc = xmlReadIO(&ParserInputBufferCallback::on_read, &ParserInputBufferCallback::on_close, diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 9d17c05d3ada..099a1ea49707 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -40,6 +40,7 @@ #include <osl/time.h> #include <osl/conditn.h> +#include <rtl/strbuf.hxx> #include <tools/urlobj.hxx> #include <comphelper/interaction.hxx> @@ -220,12 +221,11 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) { Exception e; if (a >>= e) - { - OString aMessage("XSLTFilter::error was called: "); - aMessage += OUStringToOString(e.Message, - RTL_TEXTENCODING_ASCII_US); - OSL_FAIL(aMessage); - } + { + rtl::OStringBuffer aMessage(RTL_CONSTASCII_STRINGPARAM("XSLTFilter::error was called: ")); + aMessage.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL(aMessage.getStr()); + } m_bError = sal_True; osl_setCondition(m_cTransformed); } |