diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2009-09-29 23:07:37 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2009-09-29 23:07:37 -0400 |
| commit | 0e6e69d56b9823faa1cb98fb6b8bde74904854a5 (patch) | |
| tree | e4932a4fa573f12e2076e93329e27833c53be21d /filter/source/config/fragments | |
| parent | 2c2adca4add478b1fa7609955bc508acf327aabd (diff) | |
| parent | 39f317ff5b64c9a00484921c5dda290ef33b03d1 (diff) | |
rebased to DEV300_m60.
Diffstat (limited to 'filter/source/config/fragments')
5 files changed, 9 insertions, 9 deletions
diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk index 6f76c1d60d6b..d398e03e5a7d 100644 --- a/filter/source/config/fragments/makefile.mk +++ b/filter/source/config/fragments/makefile.mk @@ -187,7 +187,7 @@ $(ALL_FLAGS) : $(INCLUDE_FRAGMENTS) #cmc, hack to workaround the java build requirement MERGE:=python ../tools/merge/pyAltFCFGMerge .ELSE -MERGE := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar +MERGE := $(JAVAI) -jar $(SOLARBINDIR)$/FCFGMerge.jar .ENDIF PACKLANG := $(XSLTPROC) --nonet diff --git a/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu b/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu index aa1f68e2d302..516d9da0eeaf 100644 --- a/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu +++ b/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu @@ -1,12 +1,12 @@ <node oor:name="writer_AportisDoc_PalmDB_File" oor:op="replace" > - <prop oor:name="DetectService"/> + <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop> <prop oor:name="URLPattern"/> <prop oor:name="Extensions"><value>pdb</value></prop> - <prop oor:name="MediaType"/> + <prop oor:name="MediaType"><value>application/x-aportisdoc</value></prop> <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>AportisDoc Palm DB</value></prop> <prop oor:name="UIName"> <value>AportisDoc (Palm)</value> </prop> - <prop oor:name="ClipboardFormat"/> + <prop oor:name="ClipboardFormat"><value>doctype:TEXt</value></prop> </node> diff --git a/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu b/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu index 9efffbea65c5..53a7f5b74ead 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu @@ -1,5 +1,5 @@ <node oor:name="writer_MS_Word_2007" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.WriterFilterDetector</value></prop> + <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop> <prop oor:name="URLPattern"/> <prop oor:name="Extensions"><value>docx docm</value></prop> <prop oor:name="MediaType"><value>application/msword</value></prop> diff --git a/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu b/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu index 84e652587920..c0ec68200f22 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu @@ -1,5 +1,5 @@ <node oor:name="writer_MS_Word_2007_Template" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.WriterFilterDetector</value></prop> + <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop> <prop oor:name="URLPattern"/> <prop oor:name="Extensions"><value>dotx dotm</value></prop> <prop oor:name="MediaType"><value>application/msword</value></prop> diff --git a/filter/source/config/fragments/types/writer_PocketWord_File.xcu b/filter/source/config/fragments/types/writer_PocketWord_File.xcu index 3e2e4d28583a..61c50a935dbc 100644 --- a/filter/source/config/fragments/types/writer_PocketWord_File.xcu +++ b/filter/source/config/fragments/types/writer_PocketWord_File.xcu @@ -1,12 +1,12 @@ <node oor:name="writer_PocketWord_File" oor:op="replace" > - <prop oor:name="DetectService"/> + <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop> <prop oor:name="URLPattern"/> <prop oor:name="Extensions"><value>psw</value></prop> - <prop oor:name="MediaType"/> + <prop oor:name="MediaType"><value>application/x-pocket-word</value></prop> <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>PocketWord File</value></prop> <prop oor:name="UIName"> <value>Pocket Word</value> </prop> - <prop oor:name="ClipboardFormat"/> + <prop oor:name="ClipboardFormat"><value>doctype:pwi</value></prop> </node> |