[Libreoffice-commits] core.git: tools/source

[Noel Grandin]

 tools/source/rc/resmgr.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 89d2ddacbb29377b97a8479a105f1a27c513cd5a
Author: Noel Grandin <noel at peralex.com>
Date:   Thu May 26 13:33:19 2016 +0200

    improve the logging of resource loading failures
    
    this message was particularly unreadable in the unit test logs
    
    Change-Id: I5faa5b33ae75488664d498232ec26c66f11361f3

diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 2b46d4b..fb3ed92 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -667,30 +667,30 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr,
 
     ResMgr* pNewResMgr = new ResMgr( pImp );
 
-    OStringBuffer aStr(OUStringToOString(pResMgr->GetFileName(),
+    OString aFilename(OUStringToOString(pResMgr->GetFileName(),
         RTL_TEXTENCODING_UTF8));
+    OStringBuffer aStr(pMessage);
+    aStr.append(aFilename);
+    aStr.append('\n');
 
-    if (aStr.getLength())
-        aStr.append('\n');
-
-    aStr.append("Class: ");
+    aStr.append("    Class: ");
     aStr.append(OUStringToOString(GetTypeRes_Impl(ResId(nRT, *pNewResMgr)),
         RTL_TEXTENCODING_UTF8));
     aStr.append(", Id: ");
     aStr.append(static_cast<sal_Int32>(nId));
     aStr.append(". ");
-    aStr.append(pMessage);
 
-    aStr.append("\nResource Stack\n");
+    aStr.append("    Resource Stack:");
     while( nDepth > 0 )
     {
-        aStr.append("Class: ");
+        aStr.append(" [ Class: ");
         aStr.append(OUStringToOString(GetTypeRes_Impl(
             ResId(rResStack[nDepth].pResource->GetRT(), *pNewResMgr)),
             RTL_TEXTENCODING_UTF8));
         aStr.append(", Id: ");
         aStr.append(static_cast<sal_Int32>(
             rResStack[nDepth].pResource->GetId()));
+        aStr.append("]");
         nDepth--;
     }