[Libreoffice-commits] .: connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/macab/MacabDriver.cxx  |    2 +-
 connectivity/source/drivers/macab/MacabRecords.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 32728f7192906af04f3a1362360097f8475bcfd0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Dec 4 09:43:45 2012 +0200

    No member named 'getStr' in 'rtl::OStringConcat<rtl::OString, rtl::OString>'
    
    Change-Id: I6e2570569d8f8b6ae55d66e2d99fe1ac4d69a7bc

diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index be82f62..ea60ded 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -71,7 +71,7 @@ namespace
 
             if ( !_rFunction )
             {   // did not find the symbol
-                OSL_FAIL( ( ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) ).getStr() );
+                OSL_FAIL( ::rtl::OString( ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) ).getStr() );
                 osl_unloadModule( _rModule );
                 _rModule = NULL;
             }
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 42e1c1e..5ecb54f 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -437,8 +437,8 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records,
         else
         {
             // Couldn't find a required property...
-            OSL_FAIL((::rtl::OString("MacabRecords::createHeaderForRecordType: could not find required property: ") +
-                      ::rtl::OUStringToOString(CFStringToOUString(requiredProperties[i]), RTL_TEXTENCODING_ASCII_US)).getStr());
+            OSL_FAIL(::rtl::OString(::rtl::OString("MacabRecords::createHeaderForRecordType: could not find required property: ") +
+                                    ::rtl::OUStringToOString(CFStringToOUString(requiredProperties[i]), RTL_TEXTENCODING_ASCII_US)).getStr());
         }
     }