mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use rtl::OStringBuffer::getStr()

Browse Source
This commit is contained in:
Caolán McNamara
2011-10-05 10:49:52 +01:00
parent 06ae02404e
commit 06a68d190f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
filter/source/xsltfilter/LibXSLTTransformer.cxx
View File

@@ -305,16 +305,16 @@ namespace XSLT
OSL_ASSERT(m_transformer != NULL); OSL_ASSERT(m_transformer != NULL);
OSL_ASSERT(m_transformer->getInputStream().is()); OSL_ASSERT(m_transformer->getInputStream().is());
OSL_ASSERT(m_transformer->getOutputStream().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>::iterator pit;
::std::map<const char*, OString> pmap = m_transformer->getParameters(); ::std::map<const char*, OString> pmap = m_transformer->getParameters();
::std::vector< const char* > params( pmap.size() * 2 + 1 ); // build parameters ::std::vector< const char* > params( pmap.size() * 2 + 1 ); // build parameters
int paramIndex = 0; int paramIndex = 0;
for (pit = pmap.begin(); pit != pmap.end(); ++pit) for (pit = pmap.begin(); pit != pmap.end(); ++pit)
{ {
params[paramIndex++] = (*pit).first; params[paramIndex++] = (*pit).first;
params[paramIndex++] = (*pit).second.getStr(); params[paramIndex++] = (*pit).second.getStr();
} }
params[paramIndex] = NULL; params[paramIndex] = NULL;
xmlDocPtr doc = xmlReadIO(&ParserInputBufferCallback::on_read, xmlDocPtr doc = xmlReadIO(&ParserInputBufferCallback::on_read,
&ParserInputBufferCallback::on_close, &ParserInputBufferCallback::on_close,

12
filter/source/xsltfilter/XSLTFilter.cxx
View File

@@ -40,6 +40,7 @@
#include <osl/time.h> #include <osl/time.h>
#include <osl/conditn.h> #include <osl/conditn.h>
#include <rtl/strbuf.hxx>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <comphelper/interaction.hxx> #include <comphelper/interaction.hxx>
@@ -220,12 +221,11 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
{ {
Exception e; Exception e;
if (a >>= e) if (a >>= e)
{ {
OString aMessage("XSLTFilter::error was called: "); rtl::OStringBuffer aMessage(RTL_CONSTASCII_STRINGPARAM("XSLTFilter::error was called: "));
aMessage += OUStringToOString(e.Message, aMessage.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US));
RTL_TEXTENCODING_ASCII_US); OSL_FAIL(aMessage.getStr());
OSL_FAIL(aMessage); }
}
m_bError = sal_True; m_bError = sal_True;
osl_setCondition(m_cTransformed); osl_setCondition(m_cTransformed);
} }