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

drawinglayer: better logging for brushes in EmfPlusRecordTypeDrawString

Browse Source 
Change-Id: I8ac039fd81767a52593721f211f3887276230ccf
Reviewed-on: https://gerrit.libreoffice.org/84841
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
This commit is contained in:
Chris Sherlock
2019-12-10 18:04:59 +11:00
committed by Bartosz Kosiorek
parent 1bd303a4c3
commit 2d46f14fa0
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drawinglayer/source/tools/emfphelperdata.cxx
View File

@@ -195,6 +195,23 @@ namespace emfplushelper
return ""; return "";
} }
static bool IsBrush(sal_uInt16 flags)
{
return (!((flags >> 15) & 0x0001));
}
static OUString BrushIDToString(sal_uInt16 flags, sal_uInt32 brushid)
{
OUString sBrushId;
if (IsBrush(flags))
sBrushId = sBrushId.concat("EmfPlusBrush ID: ").concat(OUString::number(brushid));
else
sBrushId = sBrushId.concat("ARGB: 0x").concat(OUString::number(brushid, 16));
return sBrushId;
}
EMFPObject::~EMFPObject() EMFPObject::~EMFPObject()
{ {
} }
@@ -1477,7 +1494,8 @@ namespace emfplushelper
sal_uInt32 formatId; sal_uInt32 formatId;
sal_uInt32 stringLength; sal_uInt32 stringLength;
rMS.ReadUInt32(brushId).ReadUInt32(formatId).ReadUInt32(stringLength); rMS.ReadUInt32(brushId).ReadUInt32(formatId).ReadUInt32(stringLength);
SAL_INFO("drawinglayer", "EMF+\t DrawString brushId: " << brushId); SAL_INFO("drawinglayer", "EMF+\t FontId: " << OUString::number(flags & 0xFF));
SAL_INFO("drawinglayer", "EMF+\t BrushId: " << BrushIDToString(flags, brushId));
SAL_INFO("drawinglayer", "EMF+\t FormatId: " << formatId); SAL_INFO("drawinglayer", "EMF+\t FormatId: " << formatId);
SAL_INFO("drawinglayer", "EMF+\t Length: " << stringLength); SAL_INFO("drawinglayer", "EMF+\t Length: " << stringLength);