diff options
Diffstat (limited to 'drawinglayer')
-rw-r--r-- | drawinglayer/source/tools/emfphelperdata.cxx | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx index b7a0c893c7af..3dbb663a6f82 100644 --- a/drawinglayer/source/tools/emfphelperdata.cxx +++ b/drawinglayer/source/tools/emfphelperdata.cxx @@ -195,6 +195,23 @@ namespace emfplushelper 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() { } @@ -1477,7 +1494,8 @@ namespace emfplushelper sal_uInt32 formatId; sal_uInt32 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 Length: " << stringLength); |