Kaydet (Commit) 1a0b8d8e authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Caolán McNamara

Resolves: #i124825# secure usage of object ID...

in preparation of names for line start/end geometry

(cherry picked from commit 246d1ce4)

Conflicts:
	filter/source/svg/svgwriter.cxx

Change-Id: I1a267b33f87cbb935c783670a51853832d483b1a
üst 7c4fb287
......@@ -3168,7 +3168,11 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if(aStartArrow.Count())
{
mapCurShape->maShapePolyPoly = aStartArrow;
mapCurShape->maId = *pElementId + "_" + OUString::number(nEntryCount++);
if( pElementId ) // #i124825# pElementId is optinal, may be zero
{
mapCurShape->maId = *pElementId + "_" + OUString::number(nEntryCount++);
}
ImplWriteShape( *mapCurShape );
}
......@@ -3176,7 +3180,11 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if(aEndArrow.Count())
{
mapCurShape->maShapePolyPoly = aEndArrow;
mapCurShape->maId = *pElementId + "_" + OUString::number(nEntryCount++);
if( pElementId ) // #i124825# pElementId is optinal, may be zero
{
mapCurShape->maId = *pElementId + "_" + OUString::number(nEntryCount++);
}
ImplWriteShape( *mapCurShape );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment