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

fdo#59405 fdo#60638: EMFWriter::ImplWrite: write EMF_PLUS "comments"

Browse Source 
When editing the Visio OLE object, there is a "preview" file generated,
which is apparently an EMF file (strangely initially inserting the Visio
object seems to result in a totally unproblematic WMF file).
The EMF file apparently has almost its entire content stored in
MetaCommentAction of type "EMF_PLUS", which is thrown away when writing
the file again.

Change-Id: I77a08454da673c1825aaa8421606737e7e8bc82c
This commit is contained in:
Michael Stahl
2013-02-25 13:22:07 +01:00
parent ec0d1440cf
commit bf8450cfa2
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vcl/source/filter/wmf/emfwr.cxx
View File

@@ -1601,12 +1601,25 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
break; break;
} }
case( META_COMMENT_ACTION ):
{
MetaCommentAction const*const pCommentAction(
static_cast<MetaCommentAction const*>(pAction));
if (pCommentAction->GetComment() == "EMF_PLUS")
{
ImplBeginCommentRecord(WIN_EMR_COMMENT_EMFPLUS);
m_rStm.Write(pCommentAction->GetData(),
pCommentAction->GetDataSize());
ImplEndCommentRecord();
}
}
break;
case( META_MASK_ACTION ): case( META_MASK_ACTION ):
case( META_MASKSCALE_ACTION ): case( META_MASKSCALE_ACTION ):
case( META_MASKSCALEPART_ACTION ): case( META_MASKSCALEPART_ACTION ):
case( META_WALLPAPER_ACTION ): case( META_WALLPAPER_ACTION ):
case( META_TEXTLINE_ACTION ): case( META_TEXTLINE_ACTION ):
case( META_COMMENT_ACTION ):
case( META_GRADIENTEX_ACTION ): case( META_GRADIENTEX_ACTION ):
{ {
// !!! >>> we don't want to support these actions // !!! >>> we don't want to support these actions