Index: wizards/com/sun/star/wizards/ui/FilterComponent.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/ui/FilterComponent.java,v
retrieving revision 1.8
diff -u -r1.8 FilterComponent.java
--- wizards/com/sun/star/wizards/ui/FilterComponent.java 28 Dec 2005 17:25:36 -0000 1.8
+++ wizards/com/sun/star/wizards/ui/FilterComponent.java 27 Jan 2006 22:55:38 -0000
@@ -261,10 +261,7 @@
case DataType.BOOLEAN:
double dblvalue = ((Double) curValue).doubleValue();
curValue = new Boolean(dblvalue == 1.0);
- /**TODO: 1) Datei SingleSelectQueryComposer modifizieren:
- / Zeilen 1525ff in Methode auslagern und Aufruf in Zeile 1356 ändern TypeConverter is parameter
- * 2) setDisplayCondition ändern
- */
+ /* */
break;
default:
curValue = String.valueOf(curValue);
Index: solenv/inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.185
diff -u -r1.185 settings.mk
--- solenv/inc/settings.mk 20 Jan 2006 12:09:20 -0000 1.185
+++ solenv/inc/settings.mk 27 Jan 2006 23:11:31 -0000
@@ -187,7 +187,8 @@
#required arguments
.IF "$(JAVACACHE)" != ""
-JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+#JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+JAVAC=$(JAVACOMPILER) --encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
.ELSE
JAVAC=$(JAVACOMPILER)
Index: source/ui/slidesorter/cache/SlsQueueProcessor.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx,v
retrieving revision 1.10
diff -u -p -u -r1.10 SlsQueueProcessor.hxx
--- sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 19 Jan 2006 12:52:20 -0000 1.10
+++ sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 26 Jan 2006 08:29:38 -0000
@@ -164,7 +164,7 @@ template <class Queue, class RequestData
while ( ! mrQueue.IsEmpty())
{
// Determine whether the system is idle.
- sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrView.GetWindow()));
+ sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(static_cast< ::Window* >(mrView.GetWindow())));
if (nIdleState != tools::IdleDetection::IDET_IDLE)
{
if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0)
Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.150
diff -u -r1.150 configure.in
--- config_office/configure.in 20 Jan 2006 13:28:25 -0000 1.150
+++ config_office/configure.in 2 Feb 2006 05:13:30 -0000
@@ -1975,6 +1975,7 @@
dnl Checks for javadoc
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
+ if test "$JDK" != "gcj"; then
if test -z "$with_jdk_home"; then
AC_PATH_PROG(JAVADOC, javadoc)
else
@@ -1996,6 +1997,9 @@
JAVADOC=`cygpath -d "$JAVADOC"`
JAVADOC=`cygpath -u "$JAVADOC"`
fi
+ else
+ AC_PATH_PROG(JAVADOC, gjdoc)
+ fi
fi
if test "$SOLAR_JAVA" != ""; then
@@ -2032,8 +2036,14 @@
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
- CFLAGS="$CFLAGS -I$JAVA_HOME/include"
- LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
+ CFLAGS="$CFLAGS -I$JAVA_HOME/include -pthread"
+ LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj -pthread"
+ JAR="$JAVA_HOME/bin/fastjar"
+ JAVACMD="$JAVA_HOME/bin/gij"
+ JAVA="$JAVA_HOME/bin/gij"
+ AC_SUBST(JAVA)
+ AC_SUBST(JAVACMD)
+ AC_SUBST(JAR)
AC_CHECK_HEADER(jni.h, [],
[AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], [])
@@ -4214,7 +4224,7 @@
EOF
oldJAVA_HOME=$JAVA_HOME
if test "$JDK" = "gcj"; then
- JAVA_HOME=; export JAVA_HOME
+ JAVACMD="$JAVA_HOME/bin/gij"; export JAVACMD
ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
else
ant_cmd="$ANT -buildfile conftest.xml 1>&2"
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.86
diff -u -r1.86 set_soenv.in
--- config_office/set_soenv.in 13 Jan 2006 16:37:16 -0000 1.86
+++ config_office/set_soenv.in 2 Feb 2006 05:13:31 -0000
@@ -68,7 +68,7 @@
#
# Help variables.
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
- $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
+ $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $JAVACMD, $JAVA, $JAR,
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
$CYGWIN_PATH, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
$STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
@@ -1679,6 +1679,9 @@
ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
ToFile( "JAVACOMPILER", "@JAVACOMPILER@", "e" );
ToFile( "JAVADOC", "@JAVADOC@", "e" );
+ ToFile( "JAVA", "@JAVA@", "e" );
+ ToFile( "JAVACMD", "@JAVACMD@", "e" );
+ ToFile( "JAR", "@JAR@", "e" );
}
if ( $platform =~ m/darwin/ )
{ ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH, "e" );
Javadoc@xmerge http://qa.openoffice.org/issues/show_bug.cgi?id=57286
JAVA@berkeleydb http://qa.openoffice.org/issues/show_bug.cgi?id=54657
JAVACMD@ant
JAR@berkeleydb
