svn commit: r1607862 - in /openoffice/branches/AOO410/main/filter: ./ source/svg/svgwriter.cxx

[alg]

Author: alg
Date: Fri Jul  4 14:18:03 2014
New Revision: 1607862

URL: http://svn.apache.org/r1607862
Log:
i124825 secure usage of object ID in preparation of names for line start/end 
geometry

Modified:
    openoffice/branches/AOO410/main/filter/   (props changed)
    openoffice/branches/AOO410/main/filter/source/svg/svgwriter.cxx

Propchange: openoffice/branches/AOO410/main/filter/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul  4 14:18:03 2014
@@ -0,0 +1,5 @@
+/openoffice/branches/AOO400/main/filter:1503684
+/openoffice/branches/ia2/main/filter:1417739-1541842
+/openoffice/branches/ooxml-osba/main/filter:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
+/openoffice/branches/rejuvenate01/main/filter:1480411,1534063,1534098,1536312,1549902,1560617
+/openoffice/trunk/main/filter:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1607839

Modified: openoffice/branches/AOO410/main/filter/source/svg/svgwriter.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/filter/source/svg/svgwriter.cxx?rev=1607862&r1=1607861&r2=1607862&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/filter/source/svg/svgwriter.cxx (original)
+++ openoffice/branches/AOO410/main/filter/source/svg/svgwriter.cxx Fri Jul  4 
14:18:03 2014
@@ -1647,7 +1647,11 @@ void SVGActionWriter::ImplWriteActions( 
                         if(aStartArrow.Count())
                         {
                             mapCurShape->maShapePolyPoly = aStartArrow;
-                            mapCurShape->maId = *pElementId + B2UCONST("_") + 
::rtl::OUString::valueOf(nEntryCount++);
+
+                            if( pElementId ) // #i124825# pElementId is 
optinal, may be zero
+                            {
+                                mapCurShape->maId = *pElementId + 
B2UCONST("_") + ::rtl::OUString::valueOf(nEntryCount++);
+                            }
 
                             ImplWriteShape( *mapCurShape );
                         }
@@ -1655,7 +1659,11 @@ void SVGActionWriter::ImplWriteActions( 
                         if(aEndArrow.Count())
                         {
                             mapCurShape->maShapePolyPoly = aEndArrow;
-                            mapCurShape->maId = *pElementId + B2UCONST("_") + 
::rtl::OUString::valueOf(nEntryCount++);
+
+                            if( pElementId ) // #i124825# pElementId is 
optinal, may be zero
+                            {
+                                mapCurShape->maId = *pElementId + 
B2UCONST("_") + ::rtl::OUString::valueOf(nEntryCount++);
+                            }
 
                             ImplWriteShape( *mapCurShape );
                         }