Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
	filter/source/graphicfilter/epict/epict.cxx
	filter/source/svg/svgexport.cxx
	filter/source/svg/svgfontexport.cxx
	filter/source/svg/svgwriter.cxx
	lotuswordpro/source/filter/lwpchartstreamtools.cxx
	lotuswordpro/source/filter/lwpfrib.cxx
	lotuswordpro/source/filter/lwpgrfobj.cxx
	lotuswordpro/source/filter/lwpidxmgr.cxx
	lotuswordpro/source/filter/lwpobjid.cxx
	lotuswordpro/source/filter/lwpparaproperty.cxx
	lotuswordpro/util/makefile.mk
	oox/prj/d.lst
	oox/source/drawingml/chart/chartdrawingfragment.cxx
	oox/source/drawingml/makefile.mk
	oox/source/drawingml/shape.cxx
	oox/source/ppt/slidepersist.cxx
	oox/source/token/namespaces.hxx.tail
	oox/source/xls/drawingfragment.cxx
	oox/source/xls/excelfilter.cxx
	oox/source/xls/makefile.mk
	oox/source/xls/workbookhelper.cxx
	writerfilter/source/ooxml/makefile.mk
	writerfilter/source/resourcemodel/makefile.mk

4 files changed, 72 insertions, 2 deletions

diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index ba362b3e2..9c9b8c5c2 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -47,6 +47,7 @@ enum ResourceType_t {
     RT_NoResource,
     RT_Table,
     RT_Stream,
+    RT_StreamProperties,
     RT_List,
     RT_Integer,
     RT_Properties,
diff --git a/writerfilter/source/ooxml/dummyannotate.xsl b/writerfilter/source/ooxml/dummyannotate.xsl
index 0fcc1e0dc..d457d0c07 100644
--- a/writerfilter/source/ooxml/dummyannotate.xsl
+++ b/writerfilter/source/ooxml/dummyannotate.xsl
@@ -838,7 +838,7 @@ sed "s/wml/</xsl:text>
 
   <xsl:template match="/">
     <out>
-      <xsl:apply-templates select="//rng:define[@name='CT_DocGrid']" 
+      <xsl:apply-templates select="//rng:define[@name='CT_SdtContentCell']" 
                            mode='resourcesPropertySetValue'/>
     </out>
   </xsl:template>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 1e1e0d9dc..742d5b363 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -21728,6 +21728,7 @@
       <value name="bestFit" tokenid="ooxml:Value_wordprocessingml_ST_Zoom_bestFit">bestFit</value>
       <value name="textFit" tokenid="ooxml:Value_wordprocessingml_ST_Zoom_textFit">textFit</value>
     </resource>
+    <resource name="ST_Percentage" resource="Integer" generated="yes"/>
     <resource name="CT_Zoom" resource="Properties" tag="settings">
       <attribute name="val" tokenid="ooxml:CT_Zoom_val"/>
       <attribute name="percent" tokenid="ooxml:CT_Zoom_percent"/>
@@ -22638,7 +22639,56 @@
       <attribute name="val" tokenid="ooxml:CT_CalendarType_val" action="setValue"/>
       <action name="start" action="setDefaultStringValue"/>
     </resource>
-    <resource name="CT_SdtContentRun" resource="Properties" tag="content"/>
+    <resource name="CT_SdtPr" resource="Properties" tag="field">
+      <element name="rPr" tokenid="ooxml:CT_SdtPr_rPr"/>
+      <element name="alias" tokenid="ooxml:CT_SdtPr_alias"/>
+      <element name="lock" tokenid="ooxml:CT_SdtPr_lock"/>
+      <element name="placeholder" tokenid="ooxml:CT_SdtPr_placeholder"/>
+      <element name="showingPlcHdr" tokenid="ooxml:CT_SdtPr_showingPlcHdr"/>
+      <element name="dataBinding" tokenid="ooxml:CT_SdtPr_dataBinding"/>
+      <element name="temporary" tokenid="ooxml:CT_SdtPr_temporary"/>
+      <element name="id" tokenid="ooxml:CT_SdtPr_id"/>
+      <element name="tag" tokenid="ooxml:CT_SdtPr_tag"/>
+      <element name="equation" tokenid="ooxml:CT_SdtPr_equation"/>
+      <element name="comboBox" tokenid="ooxml:CT_SdtPr_comboBox"/>
+      <element name="date" tokenid="ooxml:CT_SdtPr_date"/>
+      <element name="docPartObj" tokenid="ooxml:CT_SdtPr_docPartObj"/>
+      <element name="docPartList" tokenid="ooxml:CT_SdtPr_docPartList"/>
+      <element name="dropDownList" tokenid="ooxml:CT_SdtPr_dropDownList"/>
+      <element name="picture" tokenid="ooxml:CT_SdtPr_picture"/>
+      <element name="richText" tokenid="ooxml:CT_SdtPr_richText"/>
+      <element name="text" tokenid="ooxml:CT_SdtPr_text"/>
+      <element name="citation" tokenid="ooxml:CT_SdtPr_citation"/>
+      <element name="group" tokenid="ooxml:CT_SdtPr_group"/>
+      <element name="bibliography" tokenid="ooxml:CT_SdtPr_bibliography"/>
+    </resource>
+    <resource name="CT_SdtEndPr" resource="Properties" tag="field">
+      <element name="rPr" tokenid="ooxml:CT_SdtEndPr_rPr"/>
+    </resource>
+    <resource name="CT_SdtContentRun" resource="Stream" tag="field"/>
+    <resource name="CT_SdtContentBlock" resource="Stream" tag="field"/>
+    <resource name="CT_SdtContentRow" resource="Stream" tag="field"/>
+    <resource name="CT_SdtContentCell" resource="Stream" tag="field"/>
+    <resource name="CT_SdtBlock" resource="Stream" tag="field">
+      <element name="sdtPr" tokenid="ooxml:CT_SdtBlock_sdtPr"/>
+      <element name="sdtEndPr" tokenid="ooxml:CT_SdtBlock_sdtEndPr"/>
+      <element name="sdtContent" tokenid="ooxml:CT_SdtBlock_sdtContent"/>
+    </resource>
+    <resource name="CT_SdtRun" resource="Stream" tag="field">
+      <element name="sdtPr" tokenid="ooxml:CT_SdtRun_sdtPr"/>
+      <element name="sdtEndPr" tokenid="ooxml:CT_SdtRun_sdtEndPr"/>
+      <element name="sdtContent" tokenid="ooxml:CT_SdtRun_sdtContent"/>
+    </resource>
+    <resource name="CT_SdtCell" resource="Stream" tag="field">
+      <element name="sdtPr" tokenid="ooxml:CT_SdtCell_sdtPr"/>
+      <element name="sdtEndPr" tokenid="ooxml:CT_SdtCell_sdtEndPr"/>
+      <element name="sdtContent" tokenid="ooxml:CT_SdtCell_sdtContent"/>
+    </resource>
+    <resource name="CT_SdtRow" resource="Stream" tag="field">
+      <element name="sdtPr" tokenid="ooxml:CT_SdtRow_sdtPr"/>
+      <element name="sdtEndPr" tokenid="ooxml:CT_SdtRow_sdtEndPr"/>
+      <element name="sdtContent" tokenid="ooxml:CT_SdtRow_sdtContent"/>
+    </resource>
     <resource name="CT_Attr" resource="Properties" tag="content">
       <attribute name="uri" tokenid="ooxml:CT_Attr_uri"/>
       <attribute name="name" tokenid="ooxml:CT_Attr_name"/>
diff --git a/writerfilter/source/ooxml/modelcleanup.xsl b/writerfilter/source/ooxml/modelcleanup.xsl
index d7a9aec40..69e73d868 100644
--- a/writerfilter/source/ooxml/modelcleanup.xsl
+++ b/writerfilter/source/ooxml/modelcleanup.xsl
@@ -40,6 +40,9 @@
   <xsl:key name="resources"
            match="resource[not(@generated)]" use="@name" />
 
+  <xsl:key name="resourcetags"
+           match="resource/@tag" use="ancestor::resource/@name"/>
+
   <xsl:template name="generateresource">
     <xsl:param name="resource"/>
     <xsl:element name="resource">
@@ -52,6 +55,11 @@
       <xsl:attribute name="generated">
         <xsl:text>yes</xsl:text>
       </xsl:attribute>
+      <xsl:for-each select="key('resourcetags', @name)">
+        <xsl:attribute name="tag">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
     </xsl:element>
   </xsl:template>
 
@@ -66,6 +74,11 @@
       </xsl:attribute>
       <xsl:attribute name="resource">List</xsl:attribute>
       <xsl:attribute name="generated">yes</xsl:attribute>
+      <xsl:for-each select="key('resourcetags', @name)">
+        <xsl:attribute name="tag">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
       <xsl:for-each select=".//rng:value">
         <xsl:element name="value">
           <xsl:attribute name="name">
@@ -148,12 +161,18 @@
         
     <xsl:template name="generatevalueresource">
         <xsl:variable name="name" select="@name"/>
+        <xsl:variable name="ns_id" select="generate-id(ancestor::namespace)"/>
         <resource>
             <xsl:attribute name="name">
                 <xsl:value-of select="@name"/>
             </xsl:attribute>
             <xsl:attribute name="resource">Value</xsl:attribute>
             <xsl:attribute name="generated">yes</xsl:attribute>
+            <xsl:for-each select="key('resourcetags', @name)[generate-id(ancestor::namespace) = $ns_id]">
+              <xsl:attribute name="tag">
+                <xsl:value-of select="."/>
+              </xsl:attribute>
+            </xsl:for-each>
             <xsl:for-each select=".//rng:attribute">
                 <xsl:variable name="type">
                     <xsl:choose>