incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject svn commit: r1364477 - in /incubator/ooo/trunk/main: filter/source/xmlfilterdetect/ filter/source/xslt/export/uof2/ filter/source/xslt/import/uof2/ filter/source/xsltfilter/ scp2/source/ooo/
Date Mon, 23 Jul 2012 02:26:36 GMT
Author: hyan
Date: Mon Jul 23 02:26:35 2012
New Revision: 1364477

URL: http://svn.apache.org/viewvc?rev=1364477&view=rev
Log:
clean the redundant comments about UOF v2.0
Review by Hongyun An from CS2C

Modified:
    incubator/ooo/trunk/main/filter/source/xmlfilterdetect/filterdetect.cxx
    incubator/ooo/trunk/main/filter/source/xslt/export/uof2/odf2uof.xsl
    incubator/ooo/trunk/main/filter/source/xslt/import/uof2/uof2odf.xsl
    incubator/ooo/trunk/main/filter/source/xsltfilter/XMLBase64Codec.cxx
    incubator/ooo/trunk/main/filter/source/xsltfilter/XMLBase64Codec.hxx
    incubator/ooo/trunk/main/filter/source/xsltfilter/XSLTFilter.cxx
    incubator/ooo/trunk/main/filter/source/xsltfilter/containerhelper.hxx
    incubator/ooo/trunk/main/filter/source/xsltfilter/uof2merge.cxx
    incubator/ooo/trunk/main/filter/source/xsltfilter/uof2merge.hxx
    incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splithandler.cxx
    incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splithandler.hxx
    incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splitter.cxx
    incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splitter.hxx
    incubator/ooo/trunk/main/filter/source/xsltfilter/uof2storage.cxx
    incubator/ooo/trunk/main/filter/source/xsltfilter/uof2storage.hxx
    incubator/ooo/trunk/main/scp2/source/ooo/directory_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp

Modified: incubator/ooo/trunk/main/filter/source/xmlfilterdetect/filterdetect.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xmlfilterdetect/filterdetect.cxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xmlfilterdetect/filterdetect.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/xmlfilterdetect/filterdetect.cxx Mon Jul 23 02:26:35 2012
@@ -55,10 +55,10 @@
 #include <unotools/ucbhelper.hxx>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
-// This is added by wangyumin from 2012-02-24 for UOF2 deep type detection
+//UOF v2 deep type detection
 #include "../xsltfilter/uof2storage.cxx"
 #include <rtl/string.hxx>
-/// end added
+
 
 using rtl::OUString;
 using com::sun::star::uno::Sequence;
@@ -103,7 +103,7 @@ Reference< com::sun::star::frame::XModel
         Sequence<PropertyValue > lProps ;
 
         com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xInStream;
-		com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xIn;//added by wangyumin on 2012-02-27
+		com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xIn;
         ::rtl::OUString temp;
 	    //OSL_ENSURE( sal_False, " starting Detect" );
 		const PropertyValue * pValue = aArguments.getConstArray();
@@ -132,7 +132,7 @@ Reference< com::sun::star::frame::XModel
 			else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
 			{
 				pValue[i].Value >>= xInStream ;
-				pValue[i].Value >>= xIn ;//added by wangyumin on 2012-02-27
+				pValue[i].Value >>= xIn ;
 			}
 
 		}
@@ -191,7 +191,7 @@ Reference< com::sun::star::frame::XModel
         if(sTypeName.equalsAscii(""))
         {
             //sTypeName=::rtl::OUString::createFromAscii("writer_Flat_XML_File");
-			/// begin added by wangyumin for uof2 deep type detection on 2012-02-27
+			//UOF v2.0 deep type detection
 			if(sUrl.indexOf( ::rtl::OUString::createFromAscii(".uot") ) != -1 ||
 				sUrl.indexOf( ::rtl::OUString::createFromAscii(".uos") ) != -1 ||
 				sUrl.indexOf( ::rtl::OUString::createFromAscii(".uop") ) != -1)
@@ -226,7 +226,6 @@ Reference< com::sun::star::frame::XModel
 					}
 				}
 			}
-			/// end added
         }
         else
         {

Modified: incubator/ooo/trunk/main/filter/source/xslt/export/uof2/odf2uof.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xslt/export/uof2/odf2uof.xsl?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xslt/export/uof2/odf2uof.xsl (original)
+++ incubator/ooo/trunk/main/filter/source/xslt/export/uof2/odf2uof.xsl Mon Jul 23 02:26:35 2012
@@ -18,7 +18,7 @@
 * under the License.  *  
 *************************************************************/-->
  <!--MARKER(update_precomp.py): autogen include statement, do not remove-->
- <!--//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.-->
+ <!--This file is about the conversion of the UOF v2.0 and ODF document format-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:html="http://www.w3.org/TR/REC-html40" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:offi
 ce="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:pzip="urn:cleverage:xmlns:post-processings:zip" xmlns:rdfa="http://docs.oasis-open.org/opendocument/meta/rdfa#" xmlns:fun="http://NSO.com" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:uof="http://schemas.uof.org/cn/2009/uof" xmlns:xdt="http://www.w3.org/2005/xpath-datatypes" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xlink="http://www.w3.org/1999/xlink" xm
 lns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:书签="http://schemas.uof.org/cn/2009/bookmarks" xmlns:元="http://schemas.uof.org/cn/2009/metadata" xmlns:公式="http://schemas.uof.org/cn/2009/equations" xmlns:图="http://schemas.uof.org/cn/2009/graph" xmlns:图形="http://schemas.uof.org/cn/2009/graphics" xmlns:图表="http://schemas.uof.org/cn/2009/chart" xmlns:字="http://schemas.uof.org/cn/2009/wordproc" xmlns:对象="http://schemas.uof.org/cn/2009/objects" xmlns:式样="http://schemas.uof.org/cn/2009/styles" xmlns:扩展="http://schemas.uof.org/cn/2009/extend" xmlns:数="http://www.w3.org/1998/Math/MathML" xmlns:数据="http://schemas.uof.org/cn/2009/usd" xmlns:演="http://schemas.uof.org/cn/2009/presentation" xmlns:表="http://schemas.uof.org/cn/2009/spreadsheet" xmlns:规则="http://schemas.uof.org
 /cn/2009/rules" xmlns:超链="http://schemas.uof.org/cn/2009/hyperlinks" exclude-result-prefixes="office style text table draw xlink dc meta number presentation chart dr3d form script config ooo ooow oooc dom smil fun anim pzip fo svg math xforms" office:version="1.0" version="2.0">
 	<xsl:output encoding="utf-8" indent="no" method="xml" omit-xml-declaration="no" standalone="no" version="1.0" name="xml"/>
 	<xsl:variable name="documentType">
@@ -2288,7 +2288,7 @@
 				</xsl:call-template>
 			</xsl:otherwise>
 		</xsl:choose>
-		<!--liyuan end 070921-->
+		
 	</xsl:template>
 	<xsl:template name="字:编号格式表示-list">
 		<xsl:variable name="jibie">
@@ -3686,7 +3686,7 @@
 						<xsl:variable name="angle">
 							<xsl:value-of select="@draw:angle div 10"/>
 						</xsl:variable>
-						<xsl:attribute name="渐变方向_8013"><xsl:choose><xsl:when test="0 &lt; number($angle) and number($angle) &lt; 25">0</xsl:when><xsl:when test="25 &lt; number($angle) and number($angle) &lt; 70">45</xsl:when><xsl:when test="70 &lt; number($angle) and number($angle) &lt; 115">90</xsl:when><xsl:when test="115 &lt; number($angle) and number($angle) &lt; 160">135</xsl:when><xsl:when test="160 &lt; number($angle) and number($angle)&lt;205">180</xsl:when><xsl:when test="205&lt;number($angle) and number($angle)&lt;250">225</xsl:when><xsl:when test="250&lt;number($angle) and number($angle)&lt;295">270</xsl:when><xsl:when test="295&lt;number($angle) and number($angle)&lt;340">315</xsl:when><xsl:when test="340&lt;number($angle) and number($angle)&lt;360">360</xsl:when><!--lijian 0926--><xsl:otherwise>0</xsl:otherwise><!--lijian 0926--></xsl:choose></xsl:attribute>
+						<xsl:attribute name="渐变方向_8013"><xsl:choose><xsl:when test="0 &lt; number($angle) and number($angle) &lt; 25">0</xsl:when><xsl:when test="25 &lt; number($angle) and number($angle) &lt; 70">45</xsl:when><xsl:when test="70 &lt; number($angle) and number($angle) &lt; 115">90</xsl:when><xsl:when test="115 &lt; number($angle) and number($angle) &lt; 160">135</xsl:when><xsl:when test="160 &lt; number($angle) and number($angle)&lt;205">180</xsl:when><xsl:when test="205&lt;number($angle) and number($angle)&lt;250">225</xsl:when><xsl:when test="250&lt;number($angle) and number($angle)&lt;295">270</xsl:when><xsl:when test="295&lt;number($angle) and number($angle)&lt;340">315</xsl:when><xsl:when test="340&lt;number($angle) and number($angle)&lt;360">360</xsl:when><xsl:otherwise>0</xsl:otherwise></xsl:choose></xsl:attribute>
 						<xsl:attribute name="边界_8014"><xsl:value-of select="substring-before(@draw:border,'%')"/></xsl:attribute>
 						<xsl:if test="@draw:cx">
 							<xsl:attribute name="种子X位置_8015"><xsl:value-of select="substring-before(@draw:cx,'%')"/></xsl:attribute>
@@ -3849,7 +3849,7 @@
 							<xsl:when test="key('markerSize',$graphproperty/@draw:marker-start)/@svg:viewBox = '0 0 350 140'">7</xsl:when>
 							<xsl:when test="key('markerSize',$graphproperty/@draw:marker-start)/@svg:viewBox = '0 0 350 210'">8</xsl:when>
 							<xsl:when test="key('markerSize',$graphproperty/@draw:marker-start)/@svg:viewBox = '0 0 350 350'">9</xsl:when>
-							<!--anhongyun 20111016 schema 校验问题,只允许整型-->
+							<!--schema 校验问题,只允许整型-->
 							<xsl:otherwise>10</xsl:otherwise>
 						</xsl:choose>
 					</图:大小_8001>
@@ -4684,7 +4684,7 @@
 				<!--暂时无法判断draw:modifiers中只有一个数值时,这个值是x坐标还是y坐标。目前统一记在x坐标中-->
 				<xsl:attribute name="x_C606"><xsl:choose><xsl:when test="contains($modifiers,' ')"><xsl:value-of select="substring-before($modifiers,' ')"/></xsl:when><xsl:otherwise><xsl:value-of select="$modifiers"/></xsl:otherwise></xsl:choose></xsl:attribute>
 				<xsl:if test="contains($modifiers,' ')">
-					<xsl:attribute name="y_C607"><!--anhongyun 20111016 schema校验问题--><xsl:value-of select="substring-before(substring-after($modifiers,' '),' ')"/></xsl:attribute>
+					<xsl:attribute name="y_C607"><!--schema校验问题--><xsl:value-of select="substring-before(substring-after($modifiers,' '),' ')"/></xsl:attribute>
 				</xsl:if>
 			</图:控制点_8039>
 		</xsl:if>
@@ -5866,7 +5866,7 @@
 			<xsl:variable name="rowStyleName" select="./@table:style-name"/>
 			<xsl:element name="字:表行属性_41BD">
 				<xsl:for-each select="key('RowStyle',$rowStyleName)/style:table-row-properties[@style:row-height or @style:min-row-height]">
-					<!--chenhao20081120-->
+					
 					<xsl:variable name="style_name">
 						<xsl:variable name="bb">
 							<xsl:for-each select="../preceding-sibling::*[@style:family = 'table-row']">
@@ -8040,7 +8040,6 @@
 						<xsl:value-of select="string(.)"/>
 					</xsl:otherwise>
 				</xsl:choose>
-				<!--end-->
 			</字:文本串_415B>
 		</字:句_419D>
 		<xsl:element name="字:域结束_41A0">
@@ -8137,7 +8136,6 @@
 						<xsl:value-of select="string(.)"/>
 					</xsl:otherwise>
 				</xsl:choose>
-				<!--end-->
 			</字:文本串_415B>
 		</字:句_419D>
 		<xsl:element name="字:域结束_41A0">
@@ -10287,9 +10285,6 @@
 	<xsl:template match="table:consolidation"/>
 	<xsl:template match="table:dde-links"/>
 	<xsl:template name="SpreadsheetCommonRule">
-		<!--插件中新增条件格式化预处理
-		<xsl:apply-templates mode="common" select="/office:document/office:body/office:spreadsheet/table:calculation-settings"/>
-		<xsl:apply-templates mode="common" select="/office:document/office:body/office:spreadsheet/table:content-validations"/>-->
 		<xsl:if test="/office:document/office:automatic-styles/style:style[@style:family='table-cell' and style:map]">
 			<xsl:element name="规则:条件格式化集_B618">
 				<xsl:call-template name="create-condition-format"/>
@@ -12349,7 +12344,6 @@
 					<xsl:attribute name="y_C607"><xsl:value-of select="fun:Convert2uofUnit(@svg:y)"/></xsl:attribute>
 				</xsl:if>
 			</图表:位置_E70A>
-			<!--anhongyun 20081222-->
 			<xsl:if test="@chart:legend-position">
 				<xsl:variable name="position">
 					<xsl:variable name="legend-position" select="@chart:legend-position"/>
@@ -12597,7 +12591,7 @@
 					<xsl:otherwise>A4</xsl:otherwise>
 				</xsl:choose>
 			</xsl:variable>
-			<!--wjk 去掉纸型 on 2011 05 11-->
+			<!--去掉纸型-->
 			<!--xsl:attribute name="纸型_C60C"><xsl:value-of select="$paperType"/></xsl:attribute-->
 			<xsl:variable name="uofwidth">
 				<xsl:choose>
@@ -15208,7 +15202,7 @@
 				</xsl:choose>
 			</xsl:variable>
 			<xsl:attribute name="对象引用_6C28"><xsl:value-of select="$targetName"/></xsl:attribute>
-			<!--适应最新序列号 wangzhenxing20111013-->
+			<!--适应最新序列号-->
 			<演:定时_6B2E>
 				<xsl:variable name="animationSpeed">
 					<!--very slow 5s	slow 3s medium 2s	fast 1s		very fast 0.5s-->
@@ -15898,11 +15892,9 @@
 					<xsl:when test="parent::anim:par/anim:animate/@smil:to='0.5pt' ">
 						<xsl:attribute name="预定义尺寸_6B92">smaller</xsl:attribute>
 					</xsl:when>
-					<!--from zhangyq modify 20090306-->
 					<xsl:when test="parent::anim:par/anim:animate/@smil:to='1.5pt' ">
 						<xsl:attribute name="预定义尺寸_6B92">larger</xsl:attribute>
 					</xsl:when>
-					<!--from zhangyq modify 20090306 end-->
 					<xsl:when test="parent::anim:par/anim:animate/@smil:to='4pt' ">
 						<xsl:attribute name="预定义尺寸_6B92">huge</xsl:attribute>
 					</xsl:when>
@@ -15944,7 +15936,7 @@
 						<xsl:attribute name="自定义透明度_6BA5"><xsl:value-of select="number(substring(../anim:set/@smil:to,1,4)) * 100"/></xsl:attribute>
 					</xsl:otherwise>
 				</xsl:choose>
-				<xsl:attribute name="期间_6BA6"><!--begin--><xsl:variable name="qijian" select="string(../anim:set[1]/@smil:dur)"/><xsl:choose><xsl:when test="$qijian='until next click'">until-next-click</xsl:when><xsl:when test="$qijian='indefinite'">until-end-of-slide</xsl:when><xsl:when test="$qijian='1.0s' or $qijian='1s'">1.0</xsl:when><xsl:when test="$qijian='2s' or $qijian='2.0s'">2.0</xsl:when><xsl:when test="$qijian='3s' or $qijian='3.0s'">3.0</xsl:when><xsl:when test="$qijian='4s' or $qijian='4.0s'">4.0</xsl:when><xsl:when test="$qijian='5s' or $qijian='5.0s'">5.0</xsl:when><xsl:when test="$qijian='0.5s'">0.5</xsl:when><xsl:otherwise>2.0</xsl:otherwise></xsl:choose></xsl:attribute>
+				<xsl:attribute name="期间_6BA6"><xsl:variable name="qijian" select="string(../anim:set[1]/@smil:dur)"/><xsl:choose><xsl:when test="$qijian='until next click'">until-next-click</xsl:when><xsl:when test="$qijian='indefinite'">until-end-of-slide</xsl:when><xsl:when test="$qijian='1.0s' or $qijian='1s'">1.0</xsl:when><xsl:when test="$qijian='2s' or $qijian='2.0s'">2.0</xsl:when><xsl:when test="$qijian='3s' or $qijian='3.0s'">3.0</xsl:when><xsl:when test="$qijian='4s' or $qijian='4.0s'">4.0</xsl:when><xsl:when test="$qijian='5s' or $qijian='5.0s'">5.0</xsl:when><xsl:when test="$qijian='0.5s'">0.5</xsl:when><xsl:otherwise>2.0</xsl:otherwise></xsl:choose></xsl:attribute>
 			</演:透明_6BA3>
 		</演:基本型_6B42>
 	</xsl:template>
@@ -16025,7 +16017,7 @@
 			</演:不饱和_6BAF>
 		</演:细微型_6B66>
 	</xsl:template>
-	<!--垂直突出显示 RO缺失-->
+	<!--垂直突出显示-->
 	<!--flash bulb	忽明忽暗	   -->
 	<xsl:template match="@presentation:preset-id[. = 'ooo-emphasis-flash-bulb']">
 		<演:细微型_6B66>

Modified: incubator/ooo/trunk/main/filter/source/xslt/import/uof2/uof2odf.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xslt/import/uof2/uof2odf.xsl?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xslt/import/uof2/uof2odf.xsl (original)
+++ incubator/ooo/trunk/main/filter/source/xslt/import/uof2/uof2odf.xsl Mon Jul 23 02:26:35 2012
@@ -18,7 +18,7 @@
 * under the License. *  
 *************************************************************/-->
  <!--MARKER(update_precomp.py): autogen include statement, do not remove-->
- <!--//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.-->
+ <!--//This file is about the conversion of the UOF v2.0 and ODF document format-->
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:html="http://www.w3.org/TR/REC-html40" xmlns:math="http://www.w3.org/1998/Math/
 MathML" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:nsof="http://neoshineoffice.com" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:pzip="urn:cleverage:xmlns:post-processings:zip" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:uof="http://schemas.uof.org/cn/2009/uof" xmlns:书签="http://schemas.uof.org/cn/20
 09/bookmarks" xmlns:元="http://schemas.uof.org/cn/2009/metadata" xmlns:公式="http://schemas.uof.org/cn/2009/equations" xmlns:图="http://schemas.uof.org/cn/2009/graph" xmlns:图形="http://schemas.uof.org/cn/2009/graphics" xmlns:图表="http://schemas.uof.org/cn/2009/chart" xmlns:字="http://schemas.uof.org/cn/2009/wordproc" xmlns:对象="http://schemas.uof.org/cn/2009/objects" xmlns:式样="http://schemas.uof.org/cn/2009/styles" xmlns:扩展="http://schemas.uof.org/cn/2009/extend" xmlns:数="http://www.w3.org/1998/Math/MathML" xmlns:数据="http://schemas.uof.org/cn/2009/usd" xmlns:演="http://schemas.uof.org/cn/2009/presentation" xmlns:表="http://schemas.uof.org/cn/2009/spreadsheet" xmlns:规则="http://schemas.uof.org/cn/2009/rules" xmlns:超链="http://schemas.uof.org/cn/2009/hyperlinks" exclude-result-prefixes="uof 表 演 字 图 数 pzip 元 超链 图形 对è
 ±¡ 公式 书签 数据 扩展 规则 式样">
 	<xsl:output omit-xml-declaration="no" encoding="utf-8" version="1.0" method="xml" standalone="yes" indent="no"/>
 	<xsl:strip-space elements="*"/>
@@ -2764,7 +2764,6 @@
 			<xsl:attribute name="fo:hyphenation-remain-char-count">2</xsl:attribute>
 			<xsl:attribute name="fo:hyphenation-push-char-count">2</xsl:attribute>
 		</xsl:if>
-		<!--baopengli 2011-03-03 alert end-->
 	</xsl:template>
 	<xsl:template match="字:是否取消行号_4193" mode="paragraph">
 		<xsl:attribute name="text:number-lines"><xsl:choose><xsl:when test="string(.)='1' or string(.)='true'">false</xsl:when><xsl:otherwise>true</xsl:otherwise></xsl:choose></xsl:attribute>
@@ -3680,7 +3679,7 @@
 				<xsl:attribute name="fo:width"><xsl:value-of select="concat($imagewidth,$uofUnit)"/></xsl:attribute>
 				<xsl:attribute name="fo:height"><xsl:value-of select="concat($imageheight,$uofUnit)"/></xsl:attribute>
 			</xsl:if>
-			<!--hsr 演中编号的对齐-->
+			<!--演中编号的对齐-->
 			<xsl:choose>
 				<xsl:when test="$document_type='presentation'">
 					<xsl:if test="字:缩进_411D/字:左_410E/字:绝对_4107">
@@ -8890,7 +8889,7 @@ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABL
 			<xsl:value-of select="@图形引用_C62E"/>
 		</xsl:variable>
 		<xsl:if test="../演:动画_6B1A/演:序列_6B1B[@对象引用_6C28 = $tuxing]">
-			<!--xuliehao yao.wang@cs2c.com.cn-->
+			
 			<xsl:attribute name="draw:id"><xsl:value-of select="$tuxing"/></xsl:attribute>
 		</xsl:if>
 	</xsl:template>
@@ -9542,7 +9541,7 @@ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABL
 		<xsl:param name="refobject"/>
 		<xsl:attribute name="xlink:href"><xsl:variable name="path"><xsl:value-of select="$refobject/对象:路径_D703"/></xsl:variable><xsl:choose><xsl:when test="starts-with( $path,'/data')"><xsl:value-of select="replace($refobject/对象:路径_D703,'/data','Pictures')"/></xsl:when><xsl:otherwise><xsl:choose><!--'/' is for maybe absolute path--><xsl:when test="starts-with($path,'.') or starts-with($path,'/')"><xsl:value-of select="$path"/></xsl:when><xsl:otherwise><xsl:choose><xsl:when test="substring($path,2,1)=':'"><xsl:value-of select="concat( '/',$path)"/></xsl:when><xsl:otherwise><xsl:value-of select="$path"/></xsl:otherwise></xsl:choose></xsl:otherwise></xsl:choose></xsl:otherwise></xsl:choose></xsl:attribute>
 	</xsl:template>
-	<!-- object data ending , yao.wang@cs2c.com.cn -->
+	
 	<xsl:template name="DrawFrame">
 		<xsl:param name="picstyle"/>
 		<xsl:element name="draw:frame">
@@ -9550,38 +9549,6 @@ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABL
 			<xsl:call-template name="DrawCommAttr">
 				<xsl:with-param name="picstyle" select="$picstyle"/>
 			</xsl:call-template>
-			<!-- yao.wang@cs2c.com.cn , starting -->
-			<!--xsl:if test="$picstyle/图:其他对象引用_8038">
-				<xsl:variable name="cs">
-					<xsl:value-of select="$picstyle/图:其他对象引用_8038"/>
-				</xsl:variable>
-				<xsl:choose>
-					<xsl:when test="/uof:UOF_0000/对象:对象数据集_D700/对象:对象数据_D701[@标识符_D704=$cs]">
-						<xsl:element name="draw:frame">
-							<xsl:for-each select="key('other-styles',$picstyle/图:其他对象引用_8038)">
-								<draw:image xlink:actuate="onLoad" xlink:show="embed" xlink:type="simple">
-									<xsl:attribute name="xlink:href"><xsl:value-of select="对象:路径_D703"/></xsl:attribute>
-								</draw:image>
-							</xsl:for-each>
-						</xsl:element>
-					</xsl:when>
-					<!-xsl:when test="/uof:UOF_0000/对象:对象数据集_D700/对象:对象数据_D701[@标识符_D704=$cs]">
-						<xsl:variable name="refobject" select="/uof:UOF_0000/对象:对象数据集_D700/对象:对象数据_D701[@标识符_D704=$cs]"/>
-						<xsl:call-template name="FrmContent">
-							<xsl:with-param name="refobject" select="$refobject"/>
-						</xsl:call-template>
-					</xsl:when->
-					<xsl:when test="/uof:UOF_0000/公式:公式集_C200/公式:数学公式_C201[@标识符_C202=$cs]">
-						<xsl:variable name="refobject" select="/uof:UOF_0000/公式:公式集_C200/公式:数学公式_C201[@标识符_C202=$cs]"/>
-						<xsl:element name="draw:object">
-							<xsl:element name="math:math">
-								<xsl:copy-of select="$refobject/公式:math_C203/*"/>
-							</xsl:element>
-						</xsl:element>
-					</xsl:when>
-				</xsl:choose>
-			</xsl:if-->
-			<!-- yao.wang@cs2c.com.cn , ending. -->
 			<xsl:if test="$picstyle/图:其他对象引用_8038">
 				<xsl:variable name="cs">
 					<xsl:value-of select="$picstyle/图:其他对象引用_8038"/>
@@ -9876,7 +9843,7 @@ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABL
 					</xsl:for-each>
 				</xsl:element>
 			</xsl:when-->
-			<!--integrated Conversion the customshape or frame by anhongyun -->
+			<!--integrated Conversion the customshape or frame -->
 			<!-- change this type to draw:frame -->
 			<xsl:when test="$picstyle/图:图片数据引用_8037">
 				<!--用‘图:预定义图形_8018/图:属性_801D/图:图片属性_801E’判断也可以-->
@@ -13152,91 +13119,6 @@ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABL
 	<!--xsl:key name="condtionalcells" match="/uof:UOF_0000/表:电子表格文档_E826/表:工作表_E825/表:工作表内容_E80E/表:行_E7F1/表:单元格_E7F2" use="@表:条件格式化"/>
 	<xsl:key name="cellstyles" match="/uof:UOF_0000/式样:式样集_990B/式样:单元格式样集_9915/式样:单元格式样_9916" use="@标识符_E7AC"/-->
 	<xsl:template match="规则:条件格式化_B629">
-		<!--xsl:variable name="var_ConditionName" select="@表:名称"/>
-		<xsl:variable name="var_ConditionMap">
-			<xsl:element name="style:map">
-				<xsl:variable name="condition-text">
-					<xsl:choose>
-						<xsl:when test="表:条件/@表:类型='cell value'">
-							<xsl:choose>
-								<xsl:when test="表:条件/表:操作码/text()='between' ">
-									<xsl:value-of select="concat('cell-content-is-between','(',表:第一操作数/text(),',',表:第二操作数/text(),')')"/>
-								</xsl:when>
-								<xsl:when test=" 表:条件/表:操作码/text()='not between'">
-									<xsl:value-of select="concat('cell-content-is-not-between','(',表:第一操作数/text(),',',表:第二操作数/text(),')')"/>
-								</xsl:when>
-								<xsl:when test=" 表:条件/表:操作码/text()='equal to'">
-									<xsl:value-of select="concat('cell-content()=', 表:条件/表:第一操作数/text())"/>
-								</xsl:when>
-								<xsl:when test=" 表:条件/表:操作码/text()='not equal to'">
-									<xsl:value-of select="concat('cell-content()!=',表:条件/表:第一操作数/text())"/>
-								</xsl:when>
-								<xsl:when test=" 表:条件/表:操作码/text()='greater than'">
-									<xsl:value-of select="concat('cell-content()&gt;',表:条件/表:第一操作数/text())"/>
-								</xsl:when>
-								<xsl:when test=" 表:条件/表:操作码/text()='less than'">
-									<xsl:value-of select="concat('cell-content()&lt;',表:条件/表:第一操作数/text())"/>
-								</xsl:when>
-								<xsl:when test=" 表:条件/表:操作码/text()='greater than or equal to'">
-									<xsl:value-of select="concat('cell-content()&gt;=',表:条件/表:第一操作数/text())"/>
-								</xsl:when>
-								<xsl:when test=" 表:条件/表:操作码/text()='less than or equal to'">
-									<xsl:value-of select="concat('cell-content()&lt;=',表:条件/表:第一操作数/text())"/>
-								</xsl:when>
-							</xsl:choose>
-						</xsl:when>
-						<xsl:when test="表:条件/@表:类型='formula'">
-							<xsl:value-of select="concat('is-true-formula','(',表:第一操作数/text(),')')"/>
-						</xsl:when>
-					</xsl:choose>
-				</xsl:variable>
-				<xsl:variable name="address">
-					<xsl:value-of select="表:区域集/表:区域"/>
-				</xsl:variable>
-				<xsl:variable name="apos">&apos;</xsl:variable>
-				<xsl:attribute name="style:condition"><xsl:value-of select="$condition-text"/></xsl:attribute>
-				<xsl:attribute name="style:apply-style-name"><xsl:value-of select="表:条件/表:格式/@表:式样引用"/></xsl:attribute>
-				<xsl:attribute name="style:base-cell-address">
-					<xsl:value-of select="concat(substring-before(substring-after($address,$apos),$apos),'.',substring-before(substring-after(substring-after($address,':'),'$'),'$'),substring-after(substring-after(substring-after($address,':'),'$'),'$'))"/></xsl:attribute>
-			</xsl:element>		
-		</xsl:variable>
-		<xsl:for-each-group select="key('condtionalcells', @名称_E822)" group-by="@表:式样引用">
-			<xsl:variable name="var_DefaultStyle" select="current-grouping-key()"/>
-			<xsl:element name="style:style">
-				<xsl:attribute name="style:name" select="concat($var_ConditionName, $var_DefaultStyle)"/>
-				<xsl:attribute name="style:family">table-cell</xsl:attribute>
-				<xsl:attribute name="style:display-name" select="concat($var_ConditionName, $var_DefaultStyle)"/>
-				<xsl:attribute name="style:parent-style-name">Default</xsl:attribute>
-				<xsl:for-each select="key('cellstyles', $var_DefaultStyle)">
-					<xsl:if test="表:数字格式_E7A9">
-						<xsl:attribute name="style:data-style-name"><xsl:value-of select="concat( @标识符_E7AC, 'F')"/></xsl:attribute>
-					</xsl:if>
-					<xsl:element name="style:table-cell-properties">
-						<xsl:call-template name="TableCellProperties"/>
-					</xsl:element>
-					<xsl:if test="表:对齐格式_E7A8">
-						<xsl:call-template name="TableParaProperties"/>
-					</xsl:if>
-					<xsl:if test="表:字体格式_E7A7">
-						<xsl:element name="style:text-properties">
-							<xsl:for-each select="表:字体格式_E7A7">
-								<xsl:call-template name="TextProperties"/>
-							</xsl:for-each>
-						</xsl:element>
-					</xsl:if>
-				</xsl:for-each>	
-				<xsl:copy-of select="$var_ConditionMap/style:map"/>
-			</xsl:element>
-		</xsl:for-each-group>
-		<xsl:if test="key('condtionalcells', @表:名称)[not(@表:式样引用)]">
-			<xsl:element name="style:style">
-				<xsl:attribute name="style:name" select="$var_ConditionName"/>
-				<xsl:attribute name="style:family">table-cell</xsl:attribute>
-				<xsl:attribute name="style:display-name" select="$var_ConditionName"/>
-				<xsl:attribute name="style:parent-style-name">Default</xsl:attribute>
-				<xsl:copy-of select="$var_ConditionMap/style:map"/>
-			</xsl:element>
-		</xsl:if-->
 		<xsl:for-each select="规则:条件_B62B">
 			<xsl:element name="style:map">
 				<xsl:variable name="condition-text">
@@ -16494,7 +16376,7 @@ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABL
 									<xsl:when test="@列号_E7ED != ''">
 										<xsl:value-of select="@列号_E7ED"/>
 									</xsl:when>
-									<!--wjk add 列中的列号和单元格中的列号编号不同-->
+									<!--列中的列号和单元格中的列号编号不同-->
 									<xsl:when test="@列号_E7BC != ''">
 										<xsl:value-of select="@列号_E7BC"/>
 									</xsl:when>

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/XMLBase64Codec.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/XMLBase64Codec.cxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/XMLBase64Codec.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/XMLBase64Codec.cxx Mon Jul 23 02:26:35 2012
@@ -20,7 +20,7 @@
  **************************************************************/
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
-//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.
+//This file is about the conversion of the UOF v2.0 and ODF document format
 #include "precompiled_filter.hxx"
 #include "XMLBase64Codec.hxx"
 #include <rtl/ustrbuf.hxx>

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/XMLBase64Codec.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/XMLBase64Codec.hxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/XMLBase64Codec.hxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/XMLBase64Codec.hxx Mon Jul 23 02:26:35 2012
@@ -20,7 +20,7 @@
  **************************************************************/
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
-//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.
+//This file is about the conversion of the UOF v2.0 and ODF document format
 
 #ifndef _FILTER_SOURCE_XSLTFILTER_XMLBASE64_CODEC_HXX
 #define _FILTER_SOURCE_XSLTFILTER_XMLBASE64_CODEC_HXX

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/XSLTFilter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/XSLTFilter.cxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/XSLTFilter.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/XSLTFilter.cxx Mon Jul 23 02:26:35 2012
@@ -20,7 +20,7 @@
  **************************************************************/
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
-//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.
+//This file is about the conversion of the UOF v2.0 and ODF document format
 #include "precompiled_filter.hxx"
 
 #include <stdio.h>
@@ -65,22 +65,17 @@
 #include <com/sun/star/util/XStringSubstitution.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 
-// for test added by wangyao
+
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/stream.hxx>
-// end for test added
-// added by wangyao
 #include "uof2splitter.hxx"
-// end added
 
 #include <xmloff/attrlist.hxx>
-//Begin added by wangyumin for uof2 doc import on 2012-02-13
 #include "uof2storage.hxx"
 #include "uof2merge.hxx"
 #include <tools/stream.hxx>
 #include <string>
-//End added
 
 using namespace ::rtl;
 using namespace ::cppu;
@@ -113,7 +108,8 @@ private:
     Reference< XActiveDataControl > m_tcontrol;
     oslCondition  m_cTransformed;
 
-	Reference< XActiveDataControl > m_splitControl;// added by wangyao for uof2 doc export
+	//UOF v2.0 export
+	Reference< XActiveDataControl > m_splitControl;
 
     sal_Bool m_bTerminated;
     sal_Bool m_bError;
@@ -167,11 +163,11 @@ public:
         throw (com::sun::star::xml::sax::SAXException,RuntimeException);
     virtual void SAL_CALL setDocumentLocator(const Reference<XLocator>& doclocator)
         throw (SAXException,RuntimeException);
-	// begin added by wangyao for uof2 doc export
+	// UOF v2.0 export
 private:
 	Reference< XStream > m_rStream;
 	UOF2Splitter * pSplitter;
-	// end added
+	
 };
 
 XSLTFilter::XSLTFilter( const Reference< XMultiServiceFactory > &r )
@@ -313,32 +309,15 @@ sal_Bool XSLTFilter::importer(
 
             // connect input to transformer
             Reference< XActiveDataSink > tsink(m_tcontrol, UNO_QUERY);
-			//Begin Added by wangyumin for uof2 doc import on 2012-02-13
+			//UOF v2 import
 			UOF2Storage aUOF2Storage(m_rServiceFactory, xInputStream);
 			if(aUOF2Storage.isValidUOF2Doc())
 			{
 				UOF2Merge aUOF2Merge(aUOF2Storage, m_rServiceFactory);
 				aUOF2Merge.merge();
-				/*Reference< XInputStream > aTestInStrm = aUOF2Merge.getMergedInStream();
-				SvFileStream aFileStream( String::CreateFromAscii("file:///f:/test.xml"), STREAM_STD_READWRITE | STREAM_TRUNC);
-				while(true)
-				{
-					Sequence< sal_Int8 > aSeq;
-					if( aTestInStrm->readBytes(aSeq, 512) )
-					{
-						sal_Int32 nLen = aSeq.getLength();
-						for(sal_Int32 i = 0; i < nLen; ++i)
-						{
-							aFileStream << static_cast< signed char >(aSeq[i]);
-						}
-					}
-					else
-						break;
-				}*/
 				tsink->setInputStream(aUOF2Merge.getMergedInStream());
 			}
 			else
-			//End Added
             tsink->setInputStream(xInputStream);
 
             // create pipe
@@ -423,10 +402,9 @@ sal_Bool XSLTFilter::exporter(
 	        aSourceData[i].Value >>= m_rOutputStream;
         else if ( aName.equalsAscii("URL" ))
             aSourceData[i].Value >>= sURL;
-		// add by wangyao for uof2 doc export, get Stream for constructing UOF2Storage
+		//UOF v2.0 export, get Stream for constructing UOF2Storage
 		if ( aName.equalsAscii("StreamForOutput"))
 			aSourceData[i].Value >>= m_rStream;
-		// end adding.
     }
 
     if (!m_rDocumentHandler.is()) {
@@ -479,13 +457,8 @@ sal_Bool XSLTFilter::exporter(
         Reference< XActiveDataSink > tsink(m_tcontrol, UNO_QUERY);
         tsink->setInputStream(pipein);
 
-        // Begin comment by wangyao for changing transformer to connect to a new pipe
-		//// connect transformer to output
-        //Reference< XActiveDataSource > tsource(m_tcontrol, UNO_QUERY);
-        //tsource->setOutputStream(m_rOutputStream);
-		// End comment
 		
-		// Added by wangyao for creating pipe2
+		//creating pipe2
 		Reference< XOutputStream > x_Pipeout( m_rServiceFactory->createInstance(
 			OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY );
 		Reference< XInputStream > x_Pipein( x_Pipeout, UNO_QUERY );
@@ -504,7 +477,6 @@ sal_Bool XSLTFilter::exporter(
 		Reference< XActiveDataStreamer > splitout( m_splitControl, UNO_QUERY );
 		splitout->setStream( m_rStream );
 		m_rOutputStream = m_rStream->getOutputStream();
-		// End added
 
         // we will start receiving events after returning 'true'.
         // we will start the transformation as soon as we receive the startDocument 
@@ -530,9 +502,8 @@ void XSLTFilter::endDocument() throw (SA
     OSL_ASSERT(m_rDocumentHandler.is());
     m_rDocumentHandler->endDocument();
 
-	// add by wangyao, when the inputStream(outputStream of filter) was closed, start to parse it.
+	//when the inputStream(outputStream of filter) was closed, start to parse it.
 	m_splitControl->start();
-	// end adding.
 
     // wait for the transformer to finish
     osl_waitCondition(m_cTransformed, 0);

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/containerhelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/containerhelper.hxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/containerhelper.hxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/containerhelper.hxx Mon Jul 23 02:26:35 2012
@@ -20,7 +20,7 @@
  **************************************************************/
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
-//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.
+//This file is about the conversion of the UOF v2.0 and ODF document format
 #ifndef FILTER_SOURCE_XSLTFILTER_CONTAINERHELPER_HXX
 #define FILTER_SOURCE_XSLTFILTER_CONTAINERHELPER_HXX
 

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/uof2merge.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/uof2merge.cxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/uof2merge.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/uof2merge.cxx Mon Jul 23 02:26:35 2012
@@ -20,9 +20,10 @@
  **************************************************************/
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
+//This file is about the conversion of the UOF v2.0 and ODF document format
 #include "precompiled_filter.hxx"
 
-//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.
+
 #include "uof2merge.hxx"
 
 #include <cppuhelper/implbase1.hxx>

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/uof2merge.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/uof2merge.hxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/uof2merge.hxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/uof2merge.hxx Mon Jul 23 02:26:35 2012
@@ -20,7 +20,7 @@
  **************************************************************/
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
-//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.
+//This file is about the conversion of the UOF v2.0 and ODF document format
 #ifndef FILTER_SOURCE_XSLTFILTER_UOF2MERGE_HXX
 #define FILTER_SOURCE_XSLTFILTER_UOF2MERGE_HXX
 

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splithandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splithandler.cxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splithandler.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splithandler.cxx Mon Jul 23 02:26:35 2012
@@ -22,7 +22,7 @@
  // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_filter.hxx"
 
-//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.
+//This file is about the conversion of the UOF v2.0 and ODF document format
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splithandler.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splithandler.hxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splithandler.hxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splithandler.hxx Mon Jul 23 02:26:35 2012
@@ -20,7 +20,7 @@
  **************************************************************/
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
-//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.
+//This file is about the conversion of the UOF v2.0 and ODF document format
 #ifndef _UOF2_SPLIT_HELPER_HXX_
 #define _UOF2_SPLIT_HELPER_HXX_
 

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splitter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splitter.cxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splitter.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splitter.cxx Mon Jul 23 02:26:35 2012
@@ -20,9 +20,10 @@
  **************************************************************/
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
+//This file is about the conversion of the UOF v2.0 and ODF document format
 #include "precompiled_filter.hxx"
 
-//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.
+
 #include <cppuhelper/implbase4.hxx>
 #include <com/sun/star/xml/sax/XParser.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splitter.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splitter.hxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splitter.hxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/uof2splitter.hxx Mon Jul 23 02:26:35 2012
@@ -1,3 +1,26 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ **************************************************************/
+ 
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+//This file is about the conversion of the UOF v2.0 and ODF document format
 #ifndef _UOF2_SPLITER_HXX_
 #define _UOF2_SPLITER_HXX_
 

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/uof2storage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/uof2storage.cxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/uof2storage.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/uof2storage.cxx Mon Jul 23 02:26:35 2012
@@ -20,9 +20,10 @@
  **************************************************************/
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
+//This file is about the conversion of the UOF v2.0 and ODF document format
 #include "precompiled_filter.hxx"
 
-//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.
+
 #include "uof2storage.hxx"
 
 #include <com/sun/star/io/XInputStream.hpp>

Modified: incubator/ooo/trunk/main/filter/source/xsltfilter/uof2storage.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xsltfilter/uof2storage.hxx?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xsltfilter/uof2storage.hxx (original)
+++ incubator/ooo/trunk/main/filter/source/xsltfilter/uof2storage.hxx Mon Jul 23 02:26:35 2012
@@ -20,7 +20,7 @@
  **************************************************************/
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
-//This file is about the conversion of the UOF v2.0 and ODF document format from CS2C 20120610.
+//This file is about the conversion of the UOF v2.0 and ODF document format
 #ifndef FILTER_SOURCE_XSLTFILTER_UOF2STORAGE_HXX
 #define FILTER_SOURCE_XSLTFILTER_UOF2STORAGE_HXX
 

Modified: incubator/ooo/trunk/main/scp2/source/ooo/directory_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/directory_ooo.scp?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/directory_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/directory_ooo.scp Mon Jul 23 02:26:35 2012
@@ -420,7 +420,7 @@ Directory gid_Dir_Share_Xslt_Import_uof
     ParentID = gid_Dir_Share_Xslt_Import;
     DosName = "uof";
 End
-///Begin Added by wangyumin for uof2-filter from cs2c yumin.wang@cs2c.com.cn on 2012-2-22 14:32:18
+/// Begin for uof2-filter
 Directory gid_Dir_Share_Xslt_Export_uof2
     ParentID = gid_Dir_Share_Xslt_Export;
     DosName = "uof2";
@@ -429,7 +429,7 @@ Directory gid_Dir_Share_Xslt_Import_uof2
     ParentID = gid_Dir_Share_Xslt_Import;
     DosName = "uof2";
 End
-/// End Added by wangyumin on 2012-2-22 14:32:18
+/// End
 Directory gid_Dir_Share_Xslt_Export_Wordml
     ParentID = gid_Dir_Share_Xslt_Export;
     DosName = "wordml";

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp Mon Jul 23 02:26:35 2012
@@ -1445,7 +1445,7 @@ File gid_File_Xsl_Import_uof_uof2odf_pre
     Dir = gid_Dir_Share_Xslt_Import_uof;
     Name = "/xslt/import/uof/uof2odf_presentation.xsl";
 End
-/// This is added by wangyumin for uof2-filter from cs2c yumin.wang@cs2c.com.cn on 2012-5-22 14:23:39
+///Begin for uof2-filter
 File  gid_File_Xsl_Export_uof2_odf2uof
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -1459,7 +1459,7 @@ File gid_File_Xsl_Import_uof2_uof2odf
     Dir = gid_Dir_Share_Xslt_Import_uof2;
     Name = "/xslt/import/uof2/uof2odf.xsl";
 End
-/// End added by wangyumin on 2012-5-22 14:23:39
+/// End
 File gid_File_Xsl_Export_Wordml_Ooo2wordml_Border
     TXT_FILE_BODY;
     Styles = (PACKED);

Modified: incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1364477&r1=1364476&r2=1364477&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Mon Jul 23 02:26:35 2012
@@ -186,7 +186,7 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Lng,
 	gid_File_Lib_Offacc,
 	gid_File_Lib_Oox,
-	gid_File_Lib_Uof,/** This is added by wangyumin from on 2012-05-20. */
+	gid_File_Lib_Uof,
 	gid_File_Lib_Pcr,
 	gid_File_Lib_Pdffilter,
 	gid_File_Lib_Pk,



Mime
View raw message