[Libreoffice-commits] core.git: filter/source

[Armin Le Grand]

 filter/source/svg/svgwriter.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 1a0b8d8e6cc09e457f1820a8d812d03940caf858
Author: Armin Le Grand <alg at apache.org>
Date:   Fri Jul 4 12:15:15 2014 +0000

    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

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 80e90ac..baea39f 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 );
                         }