You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 22:44:38 UTC
svn commit: r1409444 - in
/incubator/ooo/branches/gbuild/main/writerfilter/source:
dmapper/DomainMapper_Impl.cxx ooxml/analyzemodel.xsl ooxml/model.xml
ooxml/todo.xsl
Author: arist
Date: Wed Nov 14 21:44:37 2012
New Revision: 1409444
URL: http://svn.apache.org/viewvc?rev=1409444&view=rev
Log:
writerfilter10_16_f248c5f07cdf.patch
# HG changeset patch
# User Henning Brinkmann <hb...@openoffice.org>
# Date 1297432841 -3600
# Node ID f248c5f07cdf21f4de6c9f996c0353aed3813918
# Parent 59fc6a13300d1e29698bb3c97e08e906d1d0cff4
create effort estimation while compiling
Modified:
incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/analyzemodel.xsl
incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/model.xml
incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/todo.xsl
Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1409444&r1=1409443&r2=1409444&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx Wed Nov 14 21:44:37 2012
@@ -1014,10 +1014,6 @@ void DomainMapper_Impl::finishParagraph(
lcl_CorrectIndents(*pPropSeq);
- ::std::string sTmp(pPropSeq->toString());
-
- ::std::clog << sTmp << ::std::endl;
-
uno::Reference< text::XTextRange > xTextRange =
xTextAppend->finishParagraph( pPropSeq->getSequence() );
getTableManager( ).handle(xTextRange);
Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/analyzemodel.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/analyzemodel.xsl?rev=1409444&r1=1409443&r2=1409444&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/analyzemodel.xsl (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/analyzemodel.xsl Wed Nov 14 21:44:37 2012
@@ -119,6 +119,7 @@
</xsl:when>
</xsl:choose>
<xsl:copy-of select="@tag"/>
+ <xsl:copy-of select="@supported"/>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>
\ No newline at end of file
Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/model.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/model.xml?rev=1409444&r1=1409443&r2=1409444&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/model.xml (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/model.xml Wed Nov 14 21:44:37 2012
@@ -21489,7 +21489,7 @@
<attribute name="val" tokenid="ooxml:CT_VerticalAlignRun_val" action="setValue"/>
<action name="start" action="setDefaultStringValue"/>
</resource>
- <resource name="CT_FitText" resource="Properties" tag="paragraph">
+ <resource name="CT_FitText" resource="Properties" tag="paragraph" supported="no">
<attribute name="val" tokenid="ooxml:CT_FitText_val"/>
<attribute name="id" tokenid="ooxml:CT_FitText_id"/>
</resource>
@@ -21610,7 +21610,7 @@
<value name="exact" tokenid="ooxml:Value_wordprocessingml_ST_LineSpacingRule_exact">exact</value>
<value name="atLeast" tokenid="ooxml:Value_wordprocessingml_ST_LineSpacingRule_atLeast">atLeast</value>
</resource>
- <resource name="CT_Spacing" resource="Properties" tag="paragraüh">
+ <resource name="CT_Spacing" resource="Properties" tag="paragraph">
<attribute name="before" tokenid="ooxml:CT_Spacing_before"/>
<attribute name="beforeLines" tokenid="ooxml:CT_Spacing_beforeLines"/>
<attribute name="beforeAutospacing" tokenid="ooxml:CT_Spacing_beforeAutospacing"/>
Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/todo.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/todo.xsl?rev=1409444&r1=1409443&r2=1409444&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/todo.xsl (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/todo.xsl Wed Nov 14 21:44:37 2012
@@ -21,29 +21,30 @@
***********************************************************-->
<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:rng="http://relaxng.org/ns/structure/1.0">
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:rng="http://relaxng.org/ns/structure/1.0">
-<xsl:output method="xml" indent="yes"/>
+ <xsl:output method="xml" indent="yes"/>
-<xsl:template match="/">
+ <xsl:template match="/">
<todo>
- <xsl:for-each select="/stage3">
+ <xsl:for-each select="/stage3">
<xsl:for-each select="attribute|element">
- <xsl:choose>
- <xsl:when test="@qname and @resource='Properties' and not(file)">
- <xsl:copy-of select="."/>
- </xsl:when>
- <xsl:when test="@qname and file/status[number(@done) < 100 and number(@planned) > 0]">
- <xsl:copy>
- <xsl:copy-of select="@*"/>
- <xsl:copy-of select="file[status[number(@done) < 100 and number(@planned) > 0]]"/>
- </xsl:copy>
- </xsl:when>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="@supported = 'no'"/>
+ <xsl:when test="@qname and @resource='Properties' and not(file)">
+ <xsl:copy-of select="."/>
+ </xsl:when>
+ <xsl:when test="@qname and file/status[number(@done) < 100 and number(@planned) > 0]">
+ <xsl:copy>
+ <xsl:copy-of select="@*"/>
+ <xsl:copy-of select="file[status[number(@done) < 100 and number(@planned) > 0]]"/>
+ </xsl:copy>
+ </xsl:when>
+ </xsl:choose>
</xsl:for-each>
- </xsl:for-each>
+ </xsl:for-each>
</todo>
-</xsl:template>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file