[Libreoffice-commits] .: 2 commits - reportdesign/source uui/source

[Libreoffice Gerrit user]

 reportdesign/source/filter/xml/xmlControlProperty.cxx |    1 +
 uui/source/iahndl.cxx                                 |    9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 44ecabdbb367fc5ed84990540e5810d6bbbb6be6
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 30 14:24:48 2012 +0300

    #include <rtl/strbuf.hxx>

diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 85248f1..346451d 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -28,6 +28,7 @@
 
 #include "xmlControlProperty.hxx"
 
+#include <rtl/strbuf.hxx>
 #include <sax/tools/converter.hxx>
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
commit 863a82a369b797e920687ffd05c7ddf959ba9f83
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 30 14:22:33 2012 +0300

    Revert "no member named 'OStringBuffer' in namespace 'rtl'"
    
    Instead just #include <rtl/strbuf.hxx> then.
    
    This reverts commit 15768dac2b0a326cb1f8b7985f18a6ab54d1a664.
    
    Change-Id: Ib6aed3f73bf106b4804fb418af80fefa6d662c79

diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index f444516..127f7d4 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -60,6 +60,7 @@
 #include "com/sun/star/xforms/InvalidDataOnSubmitException.hpp"
 #include "com/sun/star/loader/CannotActivateFactoryException.hpp"
 
+#include <rtl/strbuf.hxx>
 #include "osl/conditn.hxx"
 #include "tools/rcid.h" // RSC_STRING
 #include "tools/errinf.hxx" // ErrorHandler, ErrorContext, ...
@@ -342,10 +343,10 @@ namespace
         if ( !pTypeDesc || !pTypeDesc->pWeakRef )
         {
 #if OSL_DEBUG_LEVEL > 0
-            ::rtl::OUStringBuffer aMessage;
-            aMessage.appendAscii( "no type found for '" );
-            aMessage.append( i_rTypeName );
-            aMessage.appendAscii( "'" );
+            ::rtl::OStringBuffer aMessage;
+            aMessage.append( "no type found for '" );
+            aMessage.append( ::rtl::OUStringToOString( i_rTypeName, RTL_TEXTENCODING_UTF8 ) );
+            aMessage.append( "'" );
             OSL_FAIL( aMessage.makeStringAndClear().getStr() );
 #endif
             return false;