Author: hyan
Date: Fri Jul 20 08:24:50 2012
New Revision: 1363673
URL: http://svn.apache.org/viewvc?rev=1363673&view=rev
Log: (empty)
Added:
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Calc_UOF2.xcu
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Calc_UOF2_ui.xcu
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Impress_UOF2.xcu
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Impress_UOF2_ui.xcu
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Writer_UOF2.xcu
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Writer_UOF2_ui.xcu
incubator/ooo/trunk/main/filter/source/config/fragments/types/calc_NSO_UOF2.xcu
incubator/ooo/trunk/main/filter/source/config/fragments/types/impress_NSO_UOF2.xcu
incubator/ooo/trunk/main/filter/source/config/fragments/types/writer_NSO_UOF2.xcu
incubator/ooo/trunk/main/filter/source/xslt/export/uof2/odf2uof.xsl
incubator/ooo/trunk/main/filter/source/xslt/import/uof2/
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/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
Modified:
incubator/ooo/trunk/main/filter/prj/d.lst
incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_calc.mk
incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_impress.mk
incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_writer.mk
incubator/ooo/trunk/main/filter/source/xmlfilterdetect/filterdetect.cxx
incubator/ooo/trunk/main/filter/source/xmlfilterdetect/makefile.mk
incubator/ooo/trunk/main/filter/source/xsltfilter/XSLTFilter.cxx
incubator/ooo/trunk/main/filter/source/xsltfilter/makefile.mk
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/prj/d.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/prj/d.lst?rev=1363673&r1=1363672&r2=1363673&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/prj/d.lst (original)
+++ incubator/ooo/trunk/main/filter/prj/d.lst Fri Jul 20 08:24:50 2012
@@ -19,11 +19,13 @@ mkdir: %_DEST%\bin%_EXT%\xslt\export\spr
mkdir: %_DEST%\bin%_EXT%\xslt\export\wiki
mkdir: %_DEST%\bin%_EXT%\xslt\export\wordml
mkdir: %_DEST%\bin%_EXT%\xslt\export\uof
+mkdir: %_DEST%\bin%_EXT%\xslt\export\uof2
mkdir: %_DEST%\bin%_EXT%\xslt\export\xhtml
mkdir: %_DEST%\bin%_EXT%\xslt\import
mkdir: %_DEST%\bin%_EXT%\xslt\import\common
mkdir: %_DEST%\bin%_EXT%\xslt\import\spreadsheetml
mkdir: %_DEST%\bin%_EXT%\xslt\import\uof
+mkdir: %_DEST%\bin%_EXT%\xslt\import\uof2
mkdir: %_DEST%\bin%_EXT%\xslt\import\wordml
mkdir: %_DEST%\xml%_EXT%\registry
mkdir: %_DEST%\xml%_EXT%\registry\spool
@@ -38,12 +40,14 @@ mkdir: %_DEST%\bin%_EXT%\pdfimport
..\source\xslt\export\wiki\*.ott %_DEST%\bin%_EXT%\xslt\export\wiki\*.ott
..\source\xslt\export\wordml\*.xsl %_DEST%\bin%_EXT%\xslt\export\wordml\*.xsl
..\source\xslt\export\uof\*.xsl %_DEST%\bin%_EXT%\xslt\export\uof\*.xsl
+..\source\xslt\export\uof2\*.xsl %_DEST%\bin%_EXT%\xslt\export\uof2\*.xsl
..\source\xslt\export\xhtml\*.xsl %_DEST%\bin%_EXT%\xslt\export\xhtml\*.xsl
..\source\xslt\odf2xhtml\export\xhtml\*.xsl
%_DEST%\bin%_EXT%\xslt\export\xhtml\*.xsl
..\source\xslt\import\common\*.xsl %_DEST%\bin%_EXT%\xslt\import\common\*.xsl
..\source\xslt\import\spreadsheetml\*.xsl
%_DEST%\bin%_EXT%\xslt\import\spreadsheetml\*.xsl
..\source\xslt\import\wordml\*.xsl %_DEST%\bin%_EXT%\xslt\import\wordml\*.xsl
..\source\xslt\import\uof\*.xsl %_DEST%\bin%_EXT%\xslt\import\uof\*.xsl
+..\source\xslt\import\uof2\*.xsl %_DEST%\bin%_EXT%\xslt\import\uof2\*.xsl
..\%__SRC%\bin\*.xsl %_DEST%\bin%_EXT%\*.xsl
..\%__SRC%\bin\*.stw %_DEST%\bin%_EXT%\*.stw
..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
Modified: incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_calc.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_calc.mk?rev=1363673&r1=1363672&r2=1363673&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_calc.mk
(original)
+++ incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_calc.mk Fri
Jul 20 08:24:50 2012
@@ -43,6 +43,7 @@ T4_CALC = \
pdf_Portable_Document_Format \
calc_dBase\
calc8\
+ calc_NSO_UOF2 \
calc8_template \
calc_MS_Excel_2003_XML \
MS_Excel_2007_XML \
@@ -73,6 +74,7 @@ F4_CALC = \
calc_pdf_Export \
dBase \
calc8 \
+ NSO_Calc_UOF2 \
calc8_template \
MS_Excel_2003_XML \
calc_MS_Excel_2007_XML \
@@ -92,6 +94,7 @@ F4_UI_CALC = \
calc_HTML_WebQuery_ui \
calc_StarOffice_XML_Calc_Template_ui \
calc8_ui \
+ NSO_Calc_UOF2_ui \
calc8_template_ui \
MS_Excel_2003_XML_ui \
calc_MS_Excel_2007_XML_ui \
Modified:
incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_impress.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_impress.mk?rev=1363673&r1=1363672&r2=1363673&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_impress.mk
(original)
+++ incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_impress.mk Fri
Jul 20 08:24:50 2012
@@ -31,6 +31,7 @@ T4_IMPRESS = \
pdf_Portable_Document_Format \
pwp_PlaceWare\
impress8\
+ impress_NSO_UOF2 \
impress8_template\
draw8\
MS_PowerPoint_2007_XML\
@@ -47,6 +48,7 @@ F4_IMPRESS = \
impress_pdf_Export \
placeware_Export\
impress8\
+ NSO_Impress_UOF2 \
impress8_template\
impress8_draw\
impress_MS_PowerPoint_2007_XML\
@@ -60,6 +62,7 @@ F4_UI_IMPRESS = \
StarOffice_XML__Impress__ui \
impress_StarOffice_XML_Impress_Template_ui \
impress8_ui \
+ NSO_Impress_UOF2_ui \
impress8_template_ui \
impress8_draw_ui \
impress_MS_PowerPoint_2007_XML_ui \
Modified: incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_writer.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_writer.mk?rev=1363673&r1=1363672&r2=1363673&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_writer.mk
(original)
+++ incubator/ooo/trunk/main/filter/source/config/fragments/fcfg_writer.mk Fri
Jul 20 08:24:50 2012
@@ -45,6 +45,7 @@ T4_WRITER = \
pdf_Portable_Document_Format\
writer8_template\
writer8 \
+ writer_NSO_UOF2 \
writer_MS_Word_2003_XML \
writer_MS_Word_2007_XML \
writer_MS_Word_2007_XML_Template
@@ -77,6 +78,7 @@ F4_WRITER = \
writer_StarOffice_XML_Writer_Template \
writer_pdf_Export\
writer8\
+ NSO_Writer_UOF2 \
writer8_template \
MS_Word_2003_XML \
MS_Word_2007_XML \
@@ -98,6 +100,7 @@ F4_UI_WRITER = \
Text__encoded__ui \
writer_StarOffice_XML_Writer_Template_ui \
writer8_ui \
+ NSO_Writer_UOF2_ui \
writer8_template_ui \
MS_Word_2003_XML_ui \
MS_Word_2007_XML_ui \
Added:
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Calc_UOF2.xcu
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Calc_UOF2.xcu?rev=1363673&view=auto
==============================================================================
---
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Calc_UOF2.xcu
(added)
+++
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Calc_UOF2.xcu
Fri Jul 20 08:24:50 2012
@@ -0,0 +1,10 @@
+ <node oor:name="NSO Calc UOF2" oor:op="replace">
+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN
3RDPARTYFILTER</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop
oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="UserData"><value
oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../share/xslt/import/uof2/uof2odf.xsl,../share/xslt/export/uof2/odf2uof.xsl</value></prop>
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>calc_NSO_UOF2</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop
oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+ </node>
Added:
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Calc_UOF2_ui.xcu
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Calc_UOF2_ui.xcu?rev=1363673&view=auto
==============================================================================
---
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Calc_UOF2_ui.xcu
(added)
+++
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Calc_UOF2_ui.xcu
Fri Jul 20 08:24:50 2012
@@ -0,0 +1,14 @@
+ <node oor:name="NSO Calc UOF2">
+ <prop oor:name="UIName">
+ <value xml:lang="el">Uniform Office Format 2
spreadsheet</value>
+ <value xml:lang="en-US">Uniform Office Format 2
spreadsheet</value>
+ <value xml:lang="hu">Uniform Office Format 2
spreadsheet</value>
+ <value xml:lang="cs">Uniform Office Format 2
spreadsheet</value>
+ <value xml:lang="sk">Uniform Office Format 2
spreadsheet</value>
+ <value xml:lang="sl">Uniform Office Format 2
spreadsheet</value>
+ <value xml:lang="nl">Uniform Office Format 2
spreadsheet</value>
+ <value xml:lang="da">Uniform Office Format 2
spreadsheet</value>
+ <value xml:lang="de">Uniform Office Format 2
spreadsheet</value>
+ <value xml:lang="zh-CN">ä¸æåå
¬è½¯ä»¶ææ¡£æ ¼å¼2
å·¥ä½ç°¿</value>
+ </prop>
+ </node>
Added:
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Impress_UOF2.xcu
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Impress_UOF2.xcu?rev=1363673&view=auto
==============================================================================
---
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Impress_UOF2.xcu
(added)
+++
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Impress_UOF2.xcu
Fri Jul 20 08:24:50 2012
@@ -0,0 +1,10 @@
+ <node oor:name="NSO Impress UOF2" oor:op="replace">
+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN
3RDPARTYFILTER</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop
oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="UserData"><value
oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,../share/xslt/import/uof2/uof2odf.xsl,../share/xslt/export/uof2/odf2uof.xsl</value></prop>
+ <prop oor:name="FileFormatVersion"><value>1</value></prop>
+ <prop oor:name="Type"><value>impress_NSO_UOF2</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop
oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+ </node>
Added:
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Impress_UOF2_ui.xcu
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Impress_UOF2_ui.xcu?rev=1363673&view=auto
==============================================================================
---
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Impress_UOF2_ui.xcu
(added)
+++
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Impress_UOF2_ui.xcu
Fri Jul 20 08:24:50 2012
@@ -0,0 +1,14 @@
+ <node oor:name="NSO Impress UOF2">
+ <prop oor:name="UIName">
+ <value xml:lang="el">Uniform Office Format 2
presentation</value>
+ <value xml:lang="en-US">Uniform Office Format 2
presentation</value>
+ <value xml:lang="hu">Uniform Office Format 2
presentation</value>
+ <value xml:lang="cs">Uniform Office Format 2
presentation</value>
+ <value xml:lang="sk">Uniform Office Format 2
presentation</value>
+ <value xml:lang="sl">Uniform Office Format 2
presentation</value>
+ <value xml:lang="nl">Uniform Office Format 2
presentation</value>
+ <value xml:lang="da">Uniform Office Format 2
presentation</value>
+ <value xml:lang="de">Uniform Office Format 2
presentation</value>
+ <value xml:lang="zh-CN">ä¸æåå
¬è½¯ä»¶ææ¡£æ ¼å¼2
æ¼ç¤ºæ稿</value>
+ </prop>
+ </node>
Added:
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Writer_UOF2.xcu
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Writer_UOF2.xcu?rev=1363673&view=auto
==============================================================================
---
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Writer_UOF2.xcu
(added)
+++
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Writer_UOF2.xcu
Fri Jul 20 08:24:50 2012
@@ -0,0 +1,10 @@
+ <node oor:name="NSO Writer UOF2" oor:op="replace">
+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN
3RDPARTYFILTER</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop
oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="UserData"><value
oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../share/xslt/import/uof2/uof2odf.xsl,../share/xslt/export/uof2/odf2uof.xsl</value></prop>
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>writer_NSO_UOF2</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop
oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+ </node>
Added:
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Writer_UOF2_ui.xcu
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Writer_UOF2_ui.xcu?rev=1363673&view=auto
==============================================================================
---
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Writer_UOF2_ui.xcu
(added)
+++
incubator/ooo/trunk/main/filter/source/config/fragments/filters/NSO_Writer_UOF2_ui.xcu
Fri Jul 20 08:24:50 2012
@@ -0,0 +1,14 @@
+ <node oor:name="NSO Writer UOF2">
+ <prop oor:name="UIName">
+ <value xml:lang="el">Uniform Office Format 2
Text</value>
+ <value xml:lang="en-US">Uniform Office Format 2
Text</value>
+ <value xml:lang="hu">Uniform Office Format 2
Text</value>
+ <value xml:lang="cs">Uniform Office Format 2
Text</value>
+ <value xml:lang="sk">Uniform Office Format 2
Text</value>
+ <value xml:lang="sl">Uniform Office Format 2
Text</value>
+ <value xml:lang="nl">Uniform Office Format 2
Text</value>
+ <value xml:lang="da">Uniform Office Format 2
Text</value>
+ <value xml:lang="de">Uniform Office Format 2
Text</value>
+ <value xml:lang="zh-CN">ä¸æåå
¬è½¯ä»¶ææ¡£æ ¼å¼2
åå¤çææ¡£</value>
+ </prop>
+ </node>
Added:
incubator/ooo/trunk/main/filter/source/config/fragments/types/calc_NSO_UOF2.xcu
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/types/calc_NSO_UOF2.xcu?rev=1363673&view=auto
==============================================================================
---
incubator/ooo/trunk/main/filter/source/config/fragments/types/calc_NSO_UOF2.xcu
(added)
+++
incubator/ooo/trunk/main/filter/source/config/fragments/types/calc_NSO_UOF2.xcu
Fri Jul 20 08:24:50 2012
@@ -0,0 +1,13 @@
+ <node oor:name="calc_NSO_UOF2" oor:op="replace">
+ <prop
oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>uos</value></prop>
+ <prop oor:name="MediaType"><value>application/xml</value></prop>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"><value>NSO Calc
UOF2</value></prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">Uniform Office Format 2
spreadsheet</value>
+ <value xml:lang="zh-CN">ä¸æåå
¬è½¯ä»¶ææ¡£æ ¼å¼2
å·¥ä½ç°¿</value>
+ </prop>
+ <prop
oor:name="ClipboardFormat"><value>doctype:uos:UOF2</value></prop>
+ </node>
Added:
incubator/ooo/trunk/main/filter/source/config/fragments/types/impress_NSO_UOF2.xcu
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/types/impress_NSO_UOF2.xcu?rev=1363673&view=auto
==============================================================================
---
incubator/ooo/trunk/main/filter/source/config/fragments/types/impress_NSO_UOF2.xcu
(added)
+++
incubator/ooo/trunk/main/filter/source/config/fragments/types/impress_NSO_UOF2.xcu
Fri Jul 20 08:24:50 2012
@@ -0,0 +1,13 @@
+ <node oor:name="impress_NSO_UOF2" oor:op="replace">
+ <prop
oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>uop</value></prop>
+ <prop oor:name="MediaType"><value>application/xml</value></prop>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"><value>NSO Impress
UOF2</value></prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">Uniform Office Format 2
presentation</value>
+ <value xml:lang="zh-CN">ä¸æåå
¬è½¯ä»¶ææ¡£æ ¼å¼2
æ¼ç¤ºæ稿</value>
+ </prop>
+ <prop
oor:name="ClipboardFormat"><value>doctype:uop:UOF2</value></prop>
+ </node>
Added:
incubator/ooo/trunk/main/filter/source/config/fragments/types/writer_NSO_UOF2.xcu
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/config/fragments/types/writer_NSO_UOF2.xcu?rev=1363673&view=auto
==============================================================================
---
incubator/ooo/trunk/main/filter/source/config/fragments/types/writer_NSO_UOF2.xcu
(added)
+++
incubator/ooo/trunk/main/filter/source/config/fragments/types/writer_NSO_UOF2.xcu
Fri Jul 20 08:24:50 2012
@@ -0,0 +1,13 @@
+ <node oor:name="writer_NSO_UOF2" oor:op="replace">
+ <prop
oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>uot</value></prop>
+ <prop oor:name="MediaType"><value>application/xml</value></prop>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"><value>NSO Writer
UOF2</value></prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">Uniform Office Format 2
text</value>
+ <value xml:lang="zh-CN">ä¸æåå
¬è½¯ä»¶ææ¡£æ ¼å¼2
åå¤çææ¡£</value>
+ </prop>
+ <prop
oor:name="ClipboardFormat"><value>doctype:uot:UOF2</value></prop>
+ </node>
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=1363673&r1=1363672&r2=1363673&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xmlfilterdetect/filterdetect.cxx
(original)
+++ incubator/ooo/trunk/main/filter/source/xmlfilterdetect/filterdetect.cxx Fri
Jul 20 08:24:50 2012
@@ -55,7 +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
+#include "../xsltfilter/uof2storage.cxx"
+#include <rtl/string.hxx>
+/// end added
using rtl::OUString;
using com::sun::star::uno::Sequence;
@@ -100,6 +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
::rtl::OUString temp;
//OSL_ENSURE( sal_False, " starting Detect" );
const PropertyValue * pValue = aArguments.getConstArray();
@@ -128,9 +132,9 @@ 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
}
-
}
try{
Reference< com::sun::star::ucb::XCommandEnvironment > xEnv;
@@ -187,6 +191,42 @@ 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
+ if(sUrl.indexOf(
::rtl::OUString::createFromAscii(".uot") ) != -1 ||
+ sUrl.indexOf(
::rtl::OUString::createFromAscii(".uos") ) != -1 ||
+ sUrl.indexOf(
::rtl::OUString::createFromAscii(".uop") ) != -1)
+ {
+ if(xIn.is())
+ {
+ XSLT::UOF2Storage aUOF2Storage(mxMSF,
xIn);
+ if(aUOF2Storage.isValidUOF2Doc())
+ {
+ xIn->skipBytes(0);
+ Reference< XInputStream >
xUOFInputStream =
aUOF2Storage.getMainStorageRef()->openInputStream(XSLT::UOFELEMNAME);
+ if(xUOFInputStream.is())
+ {
+ Sequence< sal_Int8 >
aSeq;
+
xUOFInputStream->readBytes(aSeq, 2000);
+ ::rtl::OString sUOFXML(
reinterpret_cast< sal_Char* >(aSeq.getArray()));
+ OUString sOUSUOFXML(
OStringToOUString(sUOFXML, RTL_TEXTENCODING_UTF8));
+
if(sOUSUOFXML.getLength())
+ {
+ const OUString
sText( OUString::createFromAscii("vnd.uof.text"));
+ const OUString
sCalc( OUString::createFromAscii("vnd.uof.spreadsheet"));
+ const OUString
sImpress( OUString::createFromAscii("vnd.uof.presentation"));
+
+
if(sOUSUOFXML.indexOf(sText) != -1)
+
sTypeName = OUString::createFromAscii("writer_NSO_UOF2");
+ else
if(sOUSUOFXML.indexOf(sCalc) != -1)
+
sTypeName = OUString::createFromAscii("calc_NSO_UOF2");
+ else
if(sOUSUOFXML.indexOf(sImpress) != -1)
+
sTypeName = OUString::createFromAscii("impress_NSO_UOF2");
+ }
+ }
+ }
+ }
+ }
+ /// end added
}
else
{
Modified: incubator/ooo/trunk/main/filter/source/xmlfilterdetect/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xmlfilterdetect/makefile.mk?rev=1363673&r1=1363672&r2=1363673&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/xmlfilterdetect/makefile.mk
(original)
+++ incubator/ooo/trunk/main/filter/source/xmlfilterdetect/makefile.mk Fri Jul
20 08:24:50 2012
@@ -51,7 +51,8 @@ SHL1OBJS= $(SLO)$/fdcomp.obj \
SHL1STDLIBS= $(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(SALLIB)
+ $(SALLIB) \
+ $(COMPHELPERLIB)
.INCLUDE : target.mk
