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

Clarify warning in graphicsfilter

Browse Source 
In GraphicFilter::LoadGraphic() it reports an error code, but that's
particularly unhelpful. Change the warning to actually make sense: I
decode the error code to English.

Change-Id: I3ead54295eda63a8808bb24732d23aa95db0f5fb
This commit is contained in:
Chris Sherlock
2014-03-30 17:11:01 +11:00
parent 654cea3304
commit b6a43bcbbf
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
vcl/source/filter/graphicfilter.cxx
View File

@@ -2280,7 +2280,37 @@ int GraphicFilter::LoadGraphic( const OUString &rPath, const OUString &rFilterNa
else
nRes = pFilter->ImportGraphic( rGraphic, rPath, *pStream, nFilter, pDeterminedFormat );
SAL_WARN_IF( nRes, "vcl.filter", "GrafikFehler [" << nRes << "] - [" << rPath << "]" );
OUString aReturnString;
switch (nRes)
{
case GRFILTER_OPENERROR:
aReturnString="open error";
break;
case GRFILTER_IOERROR:
aReturnString="IO error";
break;
case GRFILTER_FORMATERROR:
aReturnString="format error";
break;
case GRFILTER_VERSIONERROR:
aReturnString="version error";
break;
case GRFILTER_FILTERERROR:
aReturnString="filter error";
break;
case GRFILTER_ABORT:
aReturnString="import aborted";
break;
case GRFILTER_TOOBIG:
aReturnString="graphic is too big";
break;
default:
// nothing more to do
break;
}
SAL_WARN_IF( nRes, "vcl.filter", "Problem importing graphic " << rPath << ". Reason: " << aReturnString );
return nRes;
}