[Libreoffice-commits] .: filter/source

[Caolán McNamara]

 filter/source/xsltfilter/LibXSLTTransformer.cxx |   10 +++++-----
 filter/source/xsltfilter/XSLTFilter.cxx         |   12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 06a68d190f35fdc116cda593157446b87afe5f6b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 5 10:49:52 2011 +0100

    use rtl::OStringBuffer::getStr()

diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 4c2d5f4..f12d0f2 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 9d17c05..099a1ea 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);
     }