diff options
| author | Armin Le Grand <alg@apache.org> | 2014-07-04 12:15:15 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-04 16:17:07 +0100 |
| commit | 1a0b8d8e6cc09e457f1820a8d812d03940caf858 (patch) | |
| tree | e2ee077303714d852e36628f99fa6831ea69ad79 /filter | |
| parent | 7c4fb287bb1e69725560cd4688e1d1d99d4498e0 (diff) | |
Resolves: #i124825# secure usage of object ID...
in preparation of names for line start/end geometry
(cherry picked from commit 246d1ce469c155b81743cb6eaa065da2b19d7dcc)
Conflicts:
filter/source/svg/svgwriter.cxx
Change-Id: I1a267b33f87cbb935c783670a51853832d483b1a
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/svg/svgwriter.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 80e90acd9743..baea39f073f4 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -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 ); } |