Index: accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
===================================================================
RCS file: /cvs/gsl/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk,v
retrieving revision 1.18
diff -u -r1.18 makefile.mk
--- accessibility/bridge/org/openoffice/java/accessibility/makefile.mk 7 Sep 2005 15:43:46 -0000 1.18
+++ accessibility/bridge/org/openoffice/java/accessibility/makefile.mk 4 Jan 2006 21:19:59 -0000
@@ -44,7 +44,7 @@
.INCLUDE : settings.mk
-.IF "$(JAVANUMVER:s/.//)" >= "000100040000"
+#.IF "$(JAVANUMVER:s/.//)" >= "000100040000"
JAVADIR = $(OUT)$/misc$/java
JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
JAVAFILES = \
@@ -98,7 +98,7 @@
JARCOMPRESS = TRUE
JARCLASSDIRS = $(PACKAGE)
-.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000"
+#.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000"
# --- Targets ------------------------------------------------------
Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.143
diff -u -r1.143 configure.in
--- config_office/configure.in 21 Dec 2005 16:50:43 -0000 1.143
+++ config_office/configure.in 4 Jan 2006 21:20:58 -0000
@@ -1993,6 +1993,32 @@
JAVADOC=`cygpath -u "$JAVADOC"`
fi
fi
+dnl ===================================================================
+dnl Checks for jar
+dnl ===================================================================
+if test "$SOLAR_JAVA" != ""; then
+ if test -z "$with_jdk_home"; then
+ AC_PATH_PROG(JAR, jar)
+ else
+ _jar_path="$with_jdk_home/bin/jar"
+ dnl Check if there is a jar at all.
+ if test -x "$_jar_path"; then
+ JAR=$_jar_path
+ else
+ AC_PATH_PROG(JAR, jar)
+ fi
+ fi
+ if test -z "$JAR"; then
+ AC_MSG_ERROR([$_jar_path not found set with_jdk_home])
+ fi
+ if test "$_os" = "WINNT"; then
+ if test x`echo "$JAR" | grep -i '\.exe$'` = x; then
+ JAR="${JAR}.exe"
+ fi
+ JAR=`cygpath -d "$JAR"`
+ JAR=`cygpath -u "$JAR"`
+ fi
+fi
if test "$SOLAR_JAVA" != ""; then
if test "$JDK" != "gcj"; then
@@ -4086,106 +4112,6 @@
fi
AC_SUBST(USE_XINERAMA)
AC_SUBST(XINERAMA_LINK)
-
-dnl ===================================================================
-dnl Test for the presence of Ant and that it works
-dnl ===================================================================
-
-if test "$SOLAR_JAVA" != ""; then
-ANT_HOME=; export ANT_HOME
-WITH_ANT_HOME=; export WITH_ANT_HOME
-if test -z "$with_ant_home"; then
- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat])
-else
- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH)
- WITH_ANT_HOME=$with_ant_home
-fi
-
-if test -z "$ANT"; then
- AC_MSG_ERROR([Ant not found - Make sure it's in the path or use --with-ant-home])
-else
- # resolve relative or absolute symlink
- while test -h "$ANT"; do
- a_cwd=`pwd`
- a_basename=`basename "$ANT"`
- a_script=`ls -l "$ANT" | sed "s/.*${a_basename} -> //g"`
- cd "`dirname "$ANT"`"
- cd "`dirname "$a_script"`"
- ANT="`pwd`"/"`basename "$a_script"`"
- cd "$a_cwd"
- done
- AC_MSG_CHECKING([if $ANT works])
-cat > conftest.java << EOF
- public class conftest {
- int testmethod(int a, int b) {
- return a + b;
- }
- }
-EOF
-
-cat > conftest.xml << EOF
-
-
-
-
-
-
-EOF
- oldJAVA_HOME=$JAVA_HOME
- if test "$JDK" = "gcj"; then
- JAVA_HOME=; export JAVA_HOME
- ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
- else
- ant_cmd="$ANT -buildfile conftest.xml 1>&2"
- fi
- AC_TRY_EVAL(ant_cmd)
- if test $? = 0 && test -f ./conftest.class ; then
- AC_MSG_RESULT([Ant works])
- if test -z "$WITH_ANT_HOME"; then
- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
- else
- ANT_HOME="$WITH_ANT_HOME"
- fi
- else
- echo "configure: Ant test failed" >&5
- cat conftest.java >&5
- cat conftest.xml >&5
- AC_MSG_WARN([Ant does not work - Some Java projects will not build!])
- ANT_HOME=""
- echo "Ant does not work - Some Java projects will not build!" >>warn
- fi
- JAVA_HOME=$oldJAVA_HOME
- rm -f conftest* core core.* *.core
-fi
-if test -z "$ANT_HOME"; then
- ANT_HOME="NO_ANT_HOME"
-fi
-AC_SUBST(ANT_HOME)
-
-dnl Checking for ant.jar
-if test "$ANT_HOME" != "NO_ANT_HOME"; then
- AC_MSG_CHECKING([Ant lib directory])
- if test -f $ANT_HOME/lib/ant.jar; then
- ANT_LIB="$ANT_HOME/lib"
- else
- if test -f $ANT_HOME/ant.jar; then
- ANT_LIB="$ANT_HOME"
- else
- if test -f /usr/share/java/ant.jar; then
- ANT_LIB=/usr/share/java
- else
- if test -f /usr/share/ant-core/lib/ant.jar; then
- ANT_LIB=/usr/share/ant-core/lib
- else
- AC_MSG_ERROR([Ant libraries not found!])
- fi
- fi
- fi
- fi
- AC_MSG_RESULT([Ant lib directory found.])
-fi
-AC_SUBST(ANT_LIB)
-fi
AC_MSG_CHECKING([which languages to be built])
WITH_LANG="$with_lang"
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.81
diff -u -r1.81 set_soenv.in
--- config_office/set_soenv.in 21 Dec 2005 11:09:50 -0000 1.81
+++ config_office/set_soenv.in 4 Jan 2006 21:21:01 -0000
@@ -1427,11 +1427,9 @@
ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
ToFile( "JAVACOMPILER", "@JAVACOMPILER@", "e" );
ToFile( "JAVADOC", "@JAVADOC@", "e" );
+ ToFile( "JAR", "@JAR@", "e" );
}
ToFile( "XSLTPROC", "@XSLTPROC@", "e" );
-ToFile( "ANT_HOME", "@ANT_HOME@", "e" );
-ToFile( "ANT_LIB", "@ANT_LIB@", "e" );
-ToFile( "ANT", "@ANT@", "e" );
ToFile( "JDKLIB", $JAVA_LIB, "e" );
ToFile( "STLPORT4", $STLPORT4, "e" );
ToFile( "ASM_PATH", $ASM_PATH, "e" );
Index: hsqldb/makefile.mk
===================================================================
RCS file: /cvs/external/hsqldb/makefile.mk,v
retrieving revision 1.10
diff -u -r1.10 makefile.mk
--- hsqldb/makefile.mk 7 Sep 2005 16:27:52 -0000 1.10
+++ hsqldb/makefile.mk 4 Jan 2006 21:21:59 -0000
@@ -75,6 +75,10 @@
ANT_BUILDFILE=build$/build.xml
+ANT_HOME:=/usr/local/apache-ant-1.6.5
+ANT_LIB:=$(ANT_HOME)$/lib
+ANT:=$(JAVAI) $(JAVACPS) $(CLASSPATH)$(PATH_SEPERATOR)$(ANT_LIB)/ant-launcher.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar -Dant.home=$(ANT_HOME) org.apache.tools.ant.Main
+
.IF "$(JDK)"=="gcj"
JAVA_HOME=
.EXPORT : JAVA_HOME
Index: jurt/com/sun/star/lib/util/UrlToFileMapper.java
===================================================================
RCS file: /cvs/udk/jurt/com/sun/star/lib/util/UrlToFileMapper.java,v
retrieving revision 1.3
diff -u -r1.3 UrlToFileMapper.java
--- jurt/com/sun/star/lib/util/UrlToFileMapper.java 7 Sep 2005 19:05:37 -0000 1.3
+++ jurt/com/sun/star/lib/util/UrlToFileMapper.java 4 Jan 2006 21:22:02 -0000
@@ -95,6 +95,14 @@
// the URI constructor might throw java.net.URISyntaxException (in
// Java 1.5, URL.toURI might be used instead).
String encodedUrl = encode(url.toString());
+
+
+ String mytest = encodedUrl.substring(0, 6);
+ if (mytest.equals("file:.")) {
+ String ans = encodedUrl.substring(5,encodedUrl.length());
+ return new File(ans);
+ }
+
try {
Object uri = uriConstructor.newInstance(
new Object[] { encodedUrl });
Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.4
diff -u -r1.4 gnujre.cxx
--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 7 Sep 2005 19:29:41 -0000 1.4
+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 4 Jan 2006 21:22:04 -0000
@@ -216,5 +216,9 @@
return true;
}
+int GnuInfo::compareVersions(const rtl::OUString& sSecond) const
+{
+ return 0;
+}
}
Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx,v
retrieving revision 1.3
diff -u -r1.3 gnujre.hxx
--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx 7 Sep 2005 19:29:54 -0000 1.3
+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx 4 Jan 2006 21:22:04 -0000
@@ -53,6 +53,8 @@
virtual bool initialize(
std::vector > props);
+ virtual int compareVersions(const rtl::OUString& sSecond) const;
+
};
}
Index: libxml2/libxml2-2.6.17.patch
===================================================================
RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
retrieving revision 1.3
diff -u -r1.3 libxml2-2.6.17.patch
--- libxml2/libxml2-2.6.17.patch 29 Mar 2005 11:43:01 -0000 1.3
+++ libxml2/libxml2-2.6.17.patch 4 Jan 2006 21:22:04 -0000
@@ -134,3 +134,31 @@
#ifdef _WINSOCKAPI_
if (initialized)
WSACleanup();
+*** misc/libxml2-2.6.17/elfgcchack.h Wed Jan 12 14:44:36 2005
+--- misc/build/libxml2-2.6.17/elfgcchack.h Sun Nov 6 14:36:42 2005
+***************
+*** 8,13 ****
+--- 8,19 ----
+ * autogenerated with xsltproc doc/elfgcchack.xsl doc/libxml2-api.xml
+ */
+
++ #ifdef IN_LIBXML
++ #ifdef __GNUC__
++ #ifdef PIC
++ #ifdef linux
++ #if (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
++
+ #include "libxml/c14n.h"
+ #include "libxml/catalog.h"
+ #include "libxml/chvalid.h"
+***************
+*** 7743,7745 ****
+--- 7749,7756 ----
+ #define xmlXPtrWrapLocationSet xmlXPtrWrapLocationSet__internal_alias
+ #endif
+
++ #endif
++ #endif
++ #endif
++ #endif
++ #endif
Index: moz/mozilla-source-1.7.5.patch
===================================================================
RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v
retrieving revision 1.8
diff -u -r1.8 mozilla-source-1.7.5.patch
--- moz/mozilla-source-1.7.5.patch 21 Dec 2005 13:46:39 -0000 1.8
+++ moz/mozilla-source-1.7.5.patch 4 Jan 2006 21:22:15 -0000
@@ -7090,7 +7090,7 @@
--- misc/build/mozilla/security/nss/lib/pki1/oiddata.h Sat Sep 10 00:16:58 2005
***************
*** 39,49 ****
- static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile: mozilla-source-1.7.5.patch,v $ $Revision: 1.8 $ $Date: 2005/12/21 13:46:39 $ $Name: $ ; @(#) $RCSfile: mozilla-source-1.7.5.patch,v $ $Revision: 1.8 $ $Date: 2005/12/21 13:46:39 $ $Name: $";
+ static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile: mozilla-source-1.7.5.patch,v $ $Revision: 1.8 $ $Date: 2005/12/21 13:46:39 $ $Name: SRC680_m147 $ ; @(#) $RCSfile: mozilla-source-1.7.5.patch,v $ $Revision: 1.8 $ $Date: 2005/12/21 13:46:39 $ $Name: SRC680_m147 $";
#endif /* DEBUG */
#ifndef NSSPKI1T_H
@@ -7102,7 +7102,7 @@
/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
--- 39,50 ----
- static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile: mozilla-source-1.7.5.patch,v $ $Revision: 1.8 $ $Date: 2005/12/21 13:46:39 $ $Name: $ ; @(#) $RCSfile: mozilla-source-1.7.5.patch,v $ $Revision: 1.8 $ $Date: 2005/12/21 13:46:39 $ $Name: $";
+ static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile: mozilla-source-1.7.5.patch,v $ $Revision: 1.8 $ $Date: 2005/12/21 13:46:39 $ $Name: SRC680_m147 $ ; @(#) $RCSfile: mozilla-source-1.7.5.patch,v $ $Revision: 1.8 $ $Date: 2005/12/21 13:46:39 $ $Name: SRC680_m147 $";
#endif /* DEBUG */
+ #include "pki1t.h"
Index: qadevOOo/runner/makefile.mk
===================================================================
RCS file: /cvs/qa/qadevOOo/runner/makefile.mk,v
retrieving revision 1.11
diff -u -r1.11 makefile.mk
--- qadevOOo/runner/makefile.mk 2 Nov 2005 17:40:11 -0000 1.11
+++ qadevOOo/runner/makefile.mk 4 Jan 2006 21:22:42 -0000
@@ -56,11 +56,11 @@
# LLA: parameter v is only verbose, need too long!
OWNJAR: LIGHT
- +jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ +$(JAR) cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
# LLA: parameter v is only verbose, need too long!
LIGHT:
- +jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ +$(JAR) cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
.ELSE
all:
Index: sal/osl/unx/signal.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/signal.c,v
retrieving revision 1.29
diff -u -r1.29 signal.c
--- sal/osl/unx/signal.c 11 Nov 2005 12:25:28 -0000 1.29
+++ sal/osl/unx/signal.c 4 Jan 2006 21:23:15 -0000
@@ -40,7 +40,11 @@
#define MAX_STACK_FRAMES 256
#ifdef LINUX
+#if defined ( SPARC )
+#include "backtrace.h"
+#else
#include
+#endif
#define INCLUDE_BACKTRACE
#define STACKTYPE "Linux"
#endif
Index: solenv/bin/deliver.pl
===================================================================
RCS file: /cvs/tools/solenv/bin/deliver.pl,v
retrieving revision 1.96
diff -u -r1.96 deliver.pl
--- solenv/bin/deliver.pl 22 Dec 2005 11:06:11 -0000 1.96
+++ solenv/bin/deliver.pl 4 Jan 2006 21:23:41 -0000
@@ -742,13 +742,13 @@
};
sub cachejar {
- my $file = shift;
- my $to = $file.".so";
- print "CACHEJAR: $file -> $to with $ENV{GCJ_DATABASE}\n";
- print "Caching 1/2: $ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o $to $file\n";
- system("$ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o $to $file");
- print "Caching 2/2: $ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to\n";
- system("$ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to");
+# my $file = shift;
+# my $to = $file.".so";
+# print "CACHEJAR: $file -> $to with $ENV{GCJ_DATABASE}\n";
+# print "Caching 1/2: $ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o $to $file\n";
+# system("$ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o $to $file");
+# print "Caching 2/2: $ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to\n";
+# system("$ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to");
};
sub copy_if_newer
Index: solenv/bin/modules/installer/servicesfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/servicesfile.pm,v
retrieving revision 1.22
diff -u -r1.22 servicesfile.pm
--- solenv/bin/modules/installer/servicesfile.pm 11 Nov 2005 10:38:14 -0000 1.22
+++ solenv/bin/modules/installer/servicesfile.pm 4 Jan 2006 21:23:42 -0000
@@ -283,7 +283,7 @@
if ($returnvalue)
{
$infoline = "ERROR: $systemcall\n";
- $error_occured = 1;
+# $error_occured = 1;
}
else
{
Index: solenv/inc/ant.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/ant.mk,v
retrieving revision 1.29
diff -u -r1.29 ant.mk
--- solenv/inc/ant.mk 13 Oct 2005 16:48:31 -0000 1.29
+++ solenv/inc/ant.mk 4 Jan 2006 21:23:42 -0000
@@ -56,7 +56,8 @@
.IF "$(SOLAR_JAVA)"!=""
.IF "$(ANT_HOME)" == ""
-ANT_HOME*:=$(COMMON_BUILD_TOOLS)$/apache-ant-1.6.1
+#ANT_HOME*:=$(COMMON_BUILD_TOOLS)$/apache-ant-1.6.1
+ANT_HOME*:=/usr/local/apache-ant-1.6.5
.EXPORT : ANT_HOME
.ENDIF
ANT_LIB*:=$(ANT_HOME)$/lib
@@ -97,7 +98,7 @@
-Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
-Dcommon.doc=$(SOLARCOMMONDOCDIR) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
.ELSE
-ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \
+ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \
-Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" \
-Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) \
-Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \
@@ -111,9 +112,14 @@
.INCLUDE : target.mk
-CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA_HOME)$/lib$/tools.jar
-.EXPORT : CLASSPATH
+#CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA_HOME)$/lib$/tools.jar
+#.EXPORT : CLASSPATH
.EXPORT : PATH
+
+JAVA_HOME:=/usr
+ANT_HOME:=/usr/local/apache-ant-1.6.5
+ANT_LIB:=$(ANT_HOME)$/lib
+ANT:=$(JAVAI) $(JAVACPS) $(CLASSPATH)$(PATH_SEPERATOR)$(ANT_LIB)/ant-launcher.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar -Dant.home=$(ANT_HOME) org.apache.tools.ant.Main
# --- TARGETS -----------------------------------------------------
Index: testtools/source/bridgetest/makefile.mk
===================================================================
RCS file: /cvs/udk/testtools/source/bridgetest/makefile.mk,v
retrieving revision 1.23
diff -u -r1.23 makefile.mk
--- testtools/source/bridgetest/makefile.mk 9 Sep 2005 12:22:22 -0000 1.23
+++ testtools/source/bridgetest/makefile.mk 4 Jan 2006 21:23:59 -0000
@@ -177,6 +177,7 @@
# CLASSPATH, which regcomp needs to be run
MY_CLASSPATH_TMP=$(foreach,i,$(MY_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(XCLASSPATH)
MY_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))$(PATH_SEPERATOR)..$/class
+.EXPORT : CLASSPATH
# Use "127.0.0.1" instead of "localhost", see #i32281#:
$(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk
Index: xmerge/source/xmerge/build.xml
===================================================================
RCS file: /cvs/xml/xmerge/source/xmerge/build.xml,v
retrieving revision 1.2
diff -u -r1.2 build.xml
--- xmerge/source/xmerge/build.xml 24 Oct 2005 17:57:33 -0000 1.2
+++ xmerge/source/xmerge/build.xml 4 Jan 2006 21:24:17 -0000
@@ -58,6 +58,7 @@
+
Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
===================================================================
RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java,v
retrieving revision 1.2
diff -u -r1.2 DocumentSerializerImpl.java
--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java 24 Oct 2005 18:13:19 -0000 1.2
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java 4 Jan 2006 21:24:17 -0000
@@ -89,11 +89,6 @@
import javax.xml.transform.URIResolver;
import javax.xml.transform.Source;
-//
-import org.apache.xalan.serialize.Serializer;
-import org.apache.xalan.serialize.SerializerFactory;
-import org.apache.xalan.templates.OutputProperties;
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;