[ooo-build-commit] Branch 'ooo/master' - writer2latex/download writer2latex/makefile.mk writer2latex/prj writer2latex/writer2latex05.patch
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Jun 15 17:27:56 PDT 2009
dev/null |binary
writer2latex/makefile.mk | 70 -----------------------------
writer2latex/prj/build.lst | 2
writer2latex/prj/d.lst | 1
writer2latex/writer2latex05.patch | 91 --------------------------------------
5 files changed, 164 deletions(-)
New commits:
commit e09e93a54b1f5e17e5cd5b9ef6d17fabd17ad659
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Jun 15 09:26:05 2009 +0000
#i10000# readded by accident. removed ....
diff --git a/writer2latex/download/writer2latex0502.zip b/writer2latex/download/writer2latex0502.zip
deleted file mode 100644
index 33f3c9f..0000000
Binary files a/writer2latex/download/writer2latex0502.zip and /dev/null differ
diff --git a/writer2latex/makefile.mk b/writer2latex/makefile.mk
deleted file mode 100755
index ea0a129..0000000
--- a/writer2latex/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=writer2latex
-TARGET=so_writer2latex
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : antsettings.mk
-
-.IF "$(WITH_WRITER2LATEX)" == "NO"
- at all:
- echo "building without writer2latex"
-.ELSE
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=writer2latex0502
-
-TARFILE_ROOTDIR=writer2latex05
-
-PATCH_FILES=writer2latex05.patch
-
-CONVERTFILES=build.xml
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar
-BUILD_ACTION=$(ANT) $(ANT_FLAGS) -DSOLVER=$(SOLARVER)/$(INPATH) -Dsolarbindir=$(SOLARBINDIR) oxt
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-.ENDIF
-
diff --git a/writer2latex/prj/build.lst b/writer2latex/prj/build.lst
deleted file mode 100755
index 2c15793..0000000
--- a/writer2latex/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-w2l writer2latex : solenv jurt unoil javaunohelper NULL
-w2l writer2latex nmake - all w2l_mkout NULL
diff --git a/writer2latex/prj/d.lst b/writer2latex/prj/d.lst
deleted file mode 100755
index 765096c..0000000
--- a/writer2latex/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-..\%__SRC%\misc\build\writer2latex05\target\lib/writer2latex.oxt %_DEST%\bin%_EXT%\writer2latex.oxt
diff --git a/writer2latex/writer2latex05.patch b/writer2latex/writer2latex05.patch
deleted file mode 100644
index 9d9da31..0000000
--- a/writer2latex/writer2latex05.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- misc/build/writer2latex05/build.xml-old 2008-06-12 00:53:19.000000000 +0200
-+++ misc/build/writer2latex05/build.xml 2008-06-12 00:53:38.000000000 +0200
-@@ -7,9 +7,6 @@
- -->
- <project name="w2l" default="help" basedir=".">
-
-- <!-- set this property to the location of your SO/OOo installation -->
-- <property name="OFFICE_HOME" location="c:/programmer/sun/staroffice 8"/>
--
- <description>writer2latex - build file</description>
-
- <target name="help" description="Displays usage information">
-@@ -40,7 +37,7 @@
- <property name="target.lib" location="target/lib"/>
- <!-- classpath for the application; needs java-uno classes -->
- <path id="main.class.path">
-- <filelist dir="${OFFICE_HOME}/program/classes"
-+ <filelist dir="${solar.jar}"
- files="jurt.jar,unoil.jar,ridl.jar,juh.jar"/>
- </path>
-
-@@ -85,7 +85,7 @@
- <attribute name="Main-Class" value="writer2latex.Application"/>
- <!-- OOo needs this to register the filter: -->
- <attribute name="RegistrationClassName" value="writer2latex.filter.W2LExportFilter" />
-- <attribute name="Class-Path" value="jaxp.jar parser.jar"/>
-+ <attribute name="Class-Path" value="jaxp.jar jaxp_parser_impl.jar"/>
- </manifest>
- </jar>
- </target>
---- misc/build/writer2latex05/source/writer2latex/office/ImageLoader.java 2007-04-17 09:30:42.000000000 +0200
-+++ misc/build/writer2latex05/source/writer2latex/office/ImageLoader.java 2007-11-20 21:18:32.000000000 +0100
-@@ -107,8 +107,8 @@
- }
- // TODO: Use another base64 decoder. This one is "nonstandard"
- try {
-- blob = new sun.misc.BASE64Decoder().decodeBuffer(buf.toString());
-- } catch (IOException e) {
-+ blob = org.apache.xerces.impl.dv.util.Base64.decode(buf.toString());
-+ } catch (Exception e) {
- System.err.println("Oops - error converting base64");
- }
- sMIME = MIMETypes.getMagicMIMEType(blob);
-diff --git source/oxt/writer2latex/w2l_types.xcu source/oxt/writer2latex/w2l_types.xcu
-index 99b5b32..dfce54c 100644
---- misc/build/writer2latex05/source/oxt/writer2latex/w2l_types.xcu
-+++ misc/build/writer2latex05/source/oxt/writer2latex/w2l_types.xcu
-@@ -9,7 +9,6 @@
- <prop oor:name="Extensions"><value>bib</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
-- <prop oor:name="PreferredFilter"><value>BibTeX Data File</value></prop>
- <prop oor:name="UIName">
- <value>BibTeX Data File</value>
- </prop>
-@@ -22,7 +21,6 @@
- <prop oor:name="Extensions"><value>tex</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
-- <prop oor:name="PreferredFilter"><value>LaTeX File</value></prop>
- <prop oor:name="UIName">
- <value>LaTeX 2e</value>
- </prop>
-diff --git source/oxt/writer2xhtml/w2x_types.xcu source/oxt/writer2xhtml/w2x_types.xcu
-index ee4d4fd..c9dad65 100644
---- misc/build/writer2latex05/source/oxt/writer2xhtml/w2x_types.xcu
-+++ misc/build/writer2latex05/source/oxt/writer2xhtml/w2x_types.xcu
-@@ -9,7 +9,6 @@
- <prop oor:name="Extensions"><value>html</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
-- <prop oor:name="PreferredFilter"><value>XHTML 1.0 strict File</value></prop>
- <prop oor:name="UIName">
- <value>XHTML 1.0 strict</value>
- </prop>
-@@ -22,7 +21,6 @@
- <prop oor:name="Extensions"><value>xhtml</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
-- <prop oor:name="PreferredFilter"><value>XHTML 1.1 plus MathML 2.0 File</value></prop>
- <prop oor:name="UIName">
- <value>XHTML 1.1 + MathML 2.0</value>
- </prop>
-@@ -35,7 +33,6 @@
- <prop oor:name="Extensions"><value>xml</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
-- <prop oor:name="PreferredFilter"><value>XHTML 1.1 plus MathML 2.0 (xsl) File</value></prop>
- <prop oor:name="UIName">
- <value>XHTML 1.1 + MathML 2.0 (xsl)</value>
- </prop>
More information about the ooo-build-commit
mailing list