[Libreoffice-commits] .: dbaccess/source

[Julien Nabet]

 dbaccess/source/ui/dlg/directsql.cxx |    3 +++
 dbaccess/source/ui/inc/directsql.hxx |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 15f8fce9860100505c4c6a54f5f003375fbd8275
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Dec 11 16:36:38 2011 +0100

    Remove ByteString

diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index f0d6f0d..e650fb3 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -36,6 +36,7 @@
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <tools/diagnose_ex.h>
+#include <rtl/strbuf.hxx>
 
 //........................................................................
 namespace dbaui
@@ -46,6 +47,8 @@ namespace dbaui
     using namespace ::com::sun::star::sdbc;
     using namespace ::com::sun::star::lang;
 
+    using ::rtl::OStringBuffer;
+
     //====================================================================
     //= LargeEntryListBox
     //====================================================================
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index 250c667..96c2ebc 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -126,7 +126,7 @@ namespace dbaui
     {   \
         const sal_Char* pError = impl_CheckInvariants();    \
         if (pError) \
-            OSL_FAIL((ByteString(methodname) += ByteString(": ") += ByteString(pError)).GetBuffer());   \
+            OSL_FAIL(rtl::OStringBuffer(methodname).append(": ").append(pError). makeStringAndClear().getStr());   \
     }
 #else
 #define CHECK_INVARIANTS(methodname)