Author: damjan
Date: Wed Feb 24 02:06:29 2016
New Revision: 1732009
URL: http://svn.apache.org/viewvc?rev=1732009&view=rev
Log:
Merge r1409444 from branches/gbuild:
create effort estimation while compiling
BUILDS
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/analyzemodel.xsl
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/model.xml
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/todo.xsl
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 02:06:29 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409432-1409436,1409438,1409440,1409442,1409470
+/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409432-1409436,1409438,1409440,1409442,1409444,1409470
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1732009&r1=1732008&r2=1732009&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
Wed Feb 24 02:06:29 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/analyzemodel.xsl
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/analyzemodel.xsl?rev=1732009&r1=1732008&r2=1732009&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/analyzemodel.xsl
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/analyzemodel.xsl
Wed Feb 24 02:06:29 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/model.xml
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/model.xml?rev=1732009&r1=1732008&r2=1732009&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/model.xml
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/model.xml
Wed Feb 24 02:06:29 2016
@@ -21487,7 +21487,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>
@@ -21608,7 +21608,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:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/todo.xsl
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/todo.xsl?rev=1732009&r1=1732008&r2=1732009&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/todo.xsl
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/todo.xsl
Wed Feb 24 02:06:29 2016
@@ -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
