mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve the logging of resource loading failures

Browse Source 
this message was particularly unreadable in the unit test logs

Change-Id: I5faa5b33ae75488664d498232ec26c66f11361f3
This commit is contained in:
Noel Grandin
2016-05-26 13:33:19 +02:00
parent 3c65f07ede
commit 89d2ddacbb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/source/rc/resmgr.cxx
View File

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