Merge commit 'ooo/DEV300_m106' into integration/dev300_m106

Conflicts:
binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpegc.c
filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu
filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu
filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu
filter/source/graphicfilter/eos2met/eos2met.cxx
filter/source/msfilter/msvbahelper.cxx
filter/source/svg/makefile.mk
filter/source/svg/svgexport.cxx
filter/source/svg/svgfilter.cxx
filter/source/svg/svgfilter.hxx
filter/source/svg/svgfontexport.cxx
filter/source/svg/svgfontexport.hxx
filter/source/svg/svgwriter.cxx
filter/source/svg/svgwriter.hxx
oox/inc/oox/core/relations.hxx
oox/inc/oox/core/relationshandler.hxx
oox/inc/oox/dump/biffdumper.hxx
oox/inc/oox/dump/dffdumper.hxx
oox/inc/oox/dump/dumperbase.hxx
oox/inc/oox/dump/oledumper.hxx
oox/inc/oox/dump/pptxdumper.hxx
oox/inc/oox/helper/containerhelper.hxx
oox/inc/oox/helper/propertyset.hxx
oox/inc/oox/xls/commentsbuffer.hxx
oox/inc/oox/xls/sharedformulabuffer.hxx
oox/source/drawingml/shape.cxx
oox/source/dump/oledumper.cxx
oox/source/helper/binaryinputstream.cxx
oox/source/helper/binaryoutputstream.cxx
oox/source/helper/binarystreambase.cxx
oox/source/helper/propertyset.cxx
oox/source/ole/vbacontrol.cxx
oox/source/ole/vbaproject.cxx
oox/source/token/namespaces.hxx.tail
oox/source/vml/vmlshape.cxx
oox/source/xls/commentsbuffer.cxx
oox/source/xls/condformatbuffer.cxx
oox/source/xls/drawingfragment.cxx
oox/source/xls/formulaparser.cxx
oox/source/xls/pivotcachebuffer.cxx
oox/source/xls/richstring.cxx
oox/source/xls/sharedformulabuffer.cxx
oox/source/xls/sheetdatacontext.cxx
oox/source/xls/worksheethelper.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx

3 files changed, 24 insertions, 16 deletions

diff --git a/oox/source/token/makefile.mk b/oox/source/token/makefile.mk
index ff42967f0bb1..ff42967f0bb1 100644..100755
--- a/oox/source/token/makefile.mk
+++ b/oox/source/token/makefile.mk
diff --git a/oox/source/token/namespaces.hxx.tail b/oox/source/token/namespaces.hxx.tail
index 2261c307adf2..90c2a4e6a33e 100644
--- a/oox/source/token/namespaces.hxx.tail
+++ b/oox/source/token/namespaces.hxx.tail
@@ -10,23 +10,26 @@ inline sal_Int32 getBaseToken( sal_Int32 nToken ) { return nToken & TOKEN_MASK;
 /** Returns the namespace without token identifier of the passed token. */
 inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; }
 
+
 // defines for tokens with specific namespaces
-#define A_TOKEN( token )            (::oox::NMSP_dml | XML_##token)
-#define AX_TOKEN( token )           (::oox::NMSP_ax | XML_##token)
-#define C_TOKEN( token )            (::oox::NMSP_dmlChart | XML_##token)
-#define CDR_TOKEN( token )          (::oox::NMSP_dmlChartDr | XML_##token)
-#define DGM_TOKEN( token )          (::oox::NMSP_dmlDiagram | XML_##token)
-#define O_TOKEN( token )            (::oox::NMSP_vmlOffice | XML_##token)
-#define PC_TOKEN( token )           (::oox::NMSP_packageContentTypes | XML_##token)
-#define PPT_TOKEN( token )          (::oox::NMSP_ppt | XML_##token)
-#define PR_TOKEN( token )           (::oox::NMSP_packageRel | XML_##token)
-#define R_TOKEN( token )            (::oox::NMSP_officeRel | XML_##token)
-#define VML_TOKEN( token )          (::oox::NMSP_vml | XML_##token)
-#define VMLX_TOKEN( token )         (::oox::NMSP_vmlExcel | XML_##token)
-#define XDR_TOKEN( token )          (::oox::NMSP_dmlSpreadDr | XML_##token)
-#define XLS_TOKEN( token )          (::oox::NMSP_xls | XML_##token)
-#define XM_TOKEN( token )           (::oox::NMSP_xm | XML_##token)
-#define XML_TOKEN( token )          (::oox::NMSP_xml | XML_##token)
+#define OOX_TOKEN( namespace, token ) (::oox::NMSP_##namespace | ::oox::XML_##token)
+
+#define A_TOKEN( token )        OOX_TOKEN( dml, token )
+#define AX_TOKEN( token )       OOX_TOKEN( ax, token )
+#define C_TOKEN( token )        OOX_TOKEN( dmlChart, token )
+#define CDR_TOKEN( token )      OOX_TOKEN( dmlChartDr, token )
+#define DGM_TOKEN( token )      OOX_TOKEN( dmlDiagram, token )
+#define O_TOKEN( token )        OOX_TOKEN( vmlOffice, token )
+#define PC_TOKEN( token )       OOX_TOKEN( packageContentTypes, token )
+#define PPT_TOKEN( token )      OOX_TOKEN( ppt, token )
+#define PR_TOKEN( token )       OOX_TOKEN( packageRel, token )
+#define R_TOKEN( token )        OOX_TOKEN( officeRel, token )
+#define VML_TOKEN( token )      OOX_TOKEN( vml, token )
+#define VMLX_TOKEN( token )     OOX_TOKEN( vmlExcel, token )
+#define XDR_TOKEN( token )      OOX_TOKEN( dmlSpreadDr, token )
+#define XLS_TOKEN( token )      OOX_TOKEN( xls, token )
+#define XM_TOKEN( token )       OOX_TOKEN( xm, token )
+#define XML_TOKEN( token )      OOX_TOKEN( xml, token )
 
 // ============================================================================
 
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index f8447b64a4a7..0790701d05c5 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -20,6 +20,7 @@ AutoShowInfo
 Autocomplete
 BackGraphicLocation
 BackGraphicURL
+Background
 BackgroundColor
 BasicLibraries
 BlackDay
@@ -81,6 +82,9 @@ CharUnderlineHasColor
 CharWeight
 CharWeightAsian
 CharWeightComplex
+CircleEndAngle
+CircleKind
+CircleStartAngle
 CodeName
 Color
 ColumnGrand
@@ -317,6 +321,7 @@ PercentageNumberFormat
 PersistName
 Perspective
 PolyPolygon
+PolygonKind
 Position
 PositionBottom
 PositionLeft