Hello community,
here is the log from the commit of package OpenOffice_org
checked in at Fri May 18 17:42:07 CEST 2007.
--------
--- arch/i386/OpenOffice_org/OpenOffice_org.changes 2007-05-10 21:22:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org.changes 2007-05-17 20:39:30.000000000 +0200
@@ -1,0 +2,14 @@
+Thu May 17 20:31:14 CEST 2007 - pmladek@suse.cz
+
+- updated to milestone oof680-m16 (2.2.1rc1)
+- updated ooo-build to 2.2.0.1:
+ * target oof680-m16
+ * libpaper support
+ * printing with Trim and Tile options [n#237134]
+ * javaunohelper build dependency [i#77465]
+- updated the prebuilt cli_types.dll for openSUSE < 10.3 builds
+- fixed BuildRequires for the Build Service:
+ * added j2sdk update-alternatives for SLED10 (temporary workaround)
+ * added mozilla-devel mozilla-nss-devel mozilla-nss for SL 10.0
+
+-------------------------------------------------------------------
Old:
----
minmem
oof680-m14-binfilter.tar.bz2
oof680-m14-core.tar.bz2
oof680-m14-lang.tar.bz2
oof680-m14-sdk_oo.tar.bz2
oof680-m14-system.tar.bz2
ooo-build-2.2.0.0.tar.gz
New:
----
oof680-m16-binfilter.tar.bz2
oof680-m16-core.tar.bz2
oof680-m16-lang.tar.bz2
oof680-m16-sdk_oo.tar.bz2
oof680-m16-system.tar.bz2
ooo-build-2.2.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenOffice_org.spec ++++++
--- /var/tmp/diff_new_pack.g31642/_old 2007-05-18 17:39:49.000000000 +0200
+++ /var/tmp/diff_new_pack.g31642/_new 2007-05-18 17:39:49.000000000 +0200
@@ -13,7 +13,13 @@
Name: OpenOffice_org
BuildRequires: ImageMagick ant bison boost-devel ccache cups-devel curl-devel db-devel db-java flac-devel flex gnome-vfs2-devel gtk2-devel kdelibs3-devel krb5 libexif libsndfile-devel mono-devel neon-devel openclipart openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode startup-notification-devel unixODBC-devel unzip xml-commons-apis xorg-x11 xorg-x11-Xvfb zip
%ifarch %ix86
+%if %sles_version == 10
+# FIXME: workaround for Build Service; it substitutes java2-devel-packages to
+# java-1_5_0 which is not available for SLED10
+BuildRequires: j2sdk update-alternatives
+%else
BuildRequires: java2-devel-packages
+%endif
%else
BuildRequires: gcc-java java-1_4_2-gcj-compat-devel
%if %suse_version > 1010
@@ -24,7 +30,13 @@
%if %suse_version > 1010
BuildRequires: mozilla-xulrunner181-devel
%else
+%if %suse_version > 1000
+# for SL 10.1
BuildRequires: gecko-sdk mozilla-xulrunner
+%else
+# for BuildService on SL 10.0
+BuildRequires: mozilla-devel mozilla-nss mozilla-nss-devel
+%endif
%endif
# CODE10 features
%if %suse_version > 1000
@@ -95,12 +107,12 @@
%define ooo_prefix %_libdir
%define ooo_home ooo-2.0
%define ooo_build_dir build
-%define ooo_build_version 2.2.0.0
-%define ooo_build_tag oof680-m14
+%define ooo_build_version 2.2.0.1
+%define ooo_build_tag oof680-m16
License: Artistic License, BSD License and BSD-like
Group: Productivity/Office/Suite
Version: 2.2
-Release: 1
+Release: 5
Autoreqprov: on
PreReq: coreutils /usr/bin/update-mime-database
Prereq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq}
@@ -2119,6 +2131,17 @@
%endif
%changelog
+* Thu May 17 2007 - pmladek@suse.cz
+- updated to milestone oof680-m16 (2.2.1rc1)
+- updated ooo-build to 2.2.0.1:
+ * target oof680-m16
+ * libpaper support
+ * printing with Trim and Tile options [n#237134]
+ * javaunohelper build dependency [i#77465]
+- updated the prebuilt cli_types.dll for openSUSE < 10.3 builds
+- fixed BuildRequires for the Build Service:
+ * added j2sdk update-alternatives for SLED10 (temporary workaround)
+ * added mozilla-devel mozilla-nss-devel mozilla-nss for SL 10.0
* Thu May 10 2007 - pmladek@suse.cz
- updated to version 2.2
- updated ooo-build to 2.2.0.0:
++++++ cli_types.dll ++++++
Files arch/i386/OpenOffice_org/cli_types.dll and /mounts/work_src_done/STABLE/OpenOffice_org/cli_types.dll differ
++++++ oof680-m14-binfilter.tar.bz2 -> oof680-m16-binfilter.tar.bz2 ++++++
arch/i386/OpenOffice_org/oof680-m14-binfilter.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/oof680-m16-binfilter.tar.bz2 differ: byte 11, line 1
++++++ oof680-m14-core.tar.bz2 -> oof680-m16-core.tar.bz2 ++++++
arch/i386/OpenOffice_org/oof680-m14-core.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/oof680-m16-core.tar.bz2 differ: byte 11, line 1
++++++ oof680-m14-lang.tar.bz2 -> oof680-m16-lang.tar.bz2 ++++++
arch/i386/OpenOffice_org/oof680-m14-lang.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/oof680-m16-lang.tar.bz2 differ: byte 11, line 1
++++++ oof680-m14-sdk_oo.tar.bz2 -> oof680-m16-sdk_oo.tar.bz2 ++++++
arch/i386/OpenOffice_org/oof680-m14-sdk_oo.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/oof680-m16-sdk_oo.tar.bz2 differ: byte 11, line 1
++++++ oof680-m14-system.tar.bz2 -> oof680-m16-system.tar.bz2 ++++++
arch/i386/OpenOffice_org/oof680-m14-system.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/oof680-m16-system.tar.bz2 differ: byte 11, line 1
++++++ ooo-build-2.2.0.0.tar.gz -> ooo-build-2.2.0.1.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/ChangeLog new/ooo-build-2.2.0.1/ChangeLog
--- old/ooo-build-2.2.0.0/ChangeLog 2007-05-10 20:37:12.000000000 +0200
+++ new/ooo-build-2.2.0.1/ChangeLog 2007-05-17 20:41:12.000000000 +0200
@@ -1,3 +1,49 @@
+2007-05-17 Petr Mladek
+
+ * Version 2.2.0.1
+
+ * patches/src680/javaunohelper-deps.diff, patches/src680/apply: fix
+ build dependency; JavaUNOHelperServices.class must be built before
+ juh.jar, i#77465
+
+2007-05-16 Petr Mladek
+
+ * patches/src680/build-wizard-bitmap-scp.diff, patches/src680/apply:
+ the patch does actually nothing => bin it, i#77351
+
+2007-05-16 Radek Doulik
+
+ * patches/src680/apply: added fix for i#73014, fixes printing with
+ Trim option and Tile one as well
+
+2006-05-15 Rene Engelhard
+
+ * patches/src680/cws-l10n77316fix.diff: add, fix "~Insert slide"
+ localization in m16
+
+2007-05-15 Rene Engelhard
+
+ * patches/src680/libpaper-support.diff: use version from
+ cws vcl78 (thanks pl!) which uses the paperconf command
+
+2007-05-15 Rene Engelhard
+
+ * patches/src680/libpaper-link.diff: remove
+ * distro-configs/{Debian,Ubuntu}*.conf.in: remove
+ --enable-libpaper-link
+
+ libpaper is GPL...
+
+2007-05-12 Rene Engelhard
+
+ * patches/src680/apply,
+ patches/src680/community-splash-m15.diff,
+ patches/src680/community-splash.diff,
+ patches/src680/intros-svx-m15.diff.
+ patches/src680/intros-svx.diff,
+ patches/src680/config-unix-wrapper-m15.diff,
+ patches/src680/config-unix-wrapper.diff: oof680-m16
+
2007-05-10 Petr Mladek
* Version 2.2.0.0 (openSUSE-10.3-alpha4)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/configure new/ooo-build-2.2.0.1/configure
--- old/ooo-build-2.2.0.0/configure 2007-05-10 21:17:43.000000000 +0200
+++ new/ooo-build-2.2.0.1/configure 2007-05-17 20:43:32.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for ooo-build 2.2.0.0.
+# Generated by GNU Autoconf 2.60 for ooo-build 2.2.0.1.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -557,8 +557,8 @@
# Identity of this package.
PACKAGE_NAME='ooo-build'
PACKAGE_TARNAME='ooo-build'
-PACKAGE_VERSION='2.2.0.0'
-PACKAGE_STRING='ooo-build 2.2.0.0'
+PACKAGE_VERSION='2.2.0.1'
+PACKAGE_STRING='ooo-build 2.2.0.1'
PACKAGE_BUGREPORT=''
ac_unique_file="bin/build-ooo"
@@ -1272,7 +1272,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ooo-build 2.2.0.0 to adapt to many kinds of systems.
+\`configure' configures ooo-build 2.2.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1338,7 +1338,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ooo-build 2.2.0.0:";;
+ short | recursive ) echo "Configuration of ooo-build 2.2.0.1:";;
esac
cat <<\_ACEOF
@@ -1600,7 +1600,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ooo-build configure 2.2.0.0
+ooo-build configure 2.2.0.1
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1614,7 +1614,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ooo-build $as_me 2.2.0.0, which was
+It was created by ooo-build $as_me 2.2.0.1, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2295,7 +2295,7 @@
# Define the identity of the package.
PACKAGE='ooo-build'
- VERSION='2.2.0.0'
+ VERSION='2.2.0.1'
cat >>confdefs.h <<_ACEOF
@@ -2523,7 +2523,7 @@
-OOO_BUILDVERSION=2.2.0.0
+OOO_BUILDVERSION=2.2.0.1
PROPAGATED_ARGS=$ac_configure_args
@@ -6906,7 +6906,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ooo-build $as_me 2.2.0.0, which was
+This file was extended by ooo-build $as_me 2.2.0.1, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6953,7 +6953,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-ooo-build config.status 2.2.0.0
+ooo-build config.status 2.2.0.1
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/configure.in new/ooo-build-2.2.0.1/configure.in
--- old/ooo-build-2.2.0.0/configure.in 2007-05-02 14:38:58.000000000 +0200
+++ new/ooo-build-2.2.0.1/configure.in 2007-05-17 19:57:34.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT(ooo-build, 2.2.0.0)
+AC_INIT(ooo-build, 2.2.0.1)
AC_PREREQ(2.51)
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/Debian64.conf.in new/ooo-build-2.2.0.1/distro-configs/Debian64.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/Debian64.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/Debian64.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -16,4 +16,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/Debian.conf.in new/ooo-build-2.2.0.1/distro-configs/Debian.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/Debian.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/Debian.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -16,4 +16,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/DebianEtch64.conf.in new/ooo-build-2.2.0.1/distro-configs/DebianEtch64.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/DebianEtch64.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/DebianEtch64.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -16,4 +16,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/DebianEtch.conf.in new/ooo-build-2.2.0.1/distro-configs/DebianEtch.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/DebianEtch.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/DebianEtch.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -16,4 +16,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/Ubuntu64.conf.in new/ooo-build-2.2.0.1/distro-configs/Ubuntu64.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/Ubuntu64.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/Ubuntu64.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -17,4 +17,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/Ubuntu.conf.in new/ooo-build-2.2.0.1/distro-configs/Ubuntu.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/Ubuntu.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/Ubuntu.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -17,4 +17,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuDapper64.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuDapper64.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/UbuntuDapper64.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/UbuntuDapper64.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -17,4 +17,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuDapper.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuDapper.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/UbuntuDapper.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/UbuntuDapper.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -17,4 +17,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuEdgy64.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuEdgy64.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/UbuntuEdgy64.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/UbuntuEdgy64.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -17,4 +17,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuEdgy.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuEdgy.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/UbuntuEdgy.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/UbuntuEdgy.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -17,4 +17,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuFeisty64.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuFeisty64.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/UbuntuFeisty64.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/UbuntuFeisty64.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -17,4 +17,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuFeisty.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuFeisty.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/UbuntuFeisty.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/UbuntuFeisty.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -17,4 +17,3 @@
--enable-pam-link
--with-dynamic-xinerama
--enable-xsltproc
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/distro-configs/UbuntuL10n.conf.in new/ooo-build-2.2.0.1/distro-configs/UbuntuL10n.conf.in
--- old/ooo-build-2.2.0.0/distro-configs/UbuntuL10n.conf.in 2007-05-02 14:38:57.000000000 +0200
+++ new/ooo-build-2.2.0.1/distro-configs/UbuntuL10n.conf.in 2007-05-15 19:24:08.000000000 +0200
@@ -18,4 +18,3 @@
--with-dynamic-xinerama
--enable-xsltproc
--disable-qadevooo
---enable-libpaper-link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/NEWS new/ooo-build-2.2.0.1/NEWS
--- old/ooo-build-2.2.0.0/NEWS 2007-05-10 20:34:39.000000000 +0200
+++ new/ooo-build-2.2.0.1/NEWS 2007-05-17 20:24:39.000000000 +0200
@@ -1,3 +1,14 @@
+ooo-build-2.2.0.1
+
+ + features:
+ + target oof680-m16 (Rene)
+ + libpaper support (Rene)
+ + bug fixes:
+ + printing with Trim and Tile options (Radek)
+ + build bits:
+ + javaunohelper build dependency (Petr)
+ + updated Debian bits (Rene)
+
ooo-build-2.2.0.0
+ features:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/apply new/ooo-build-2.2.0.1/patches/src680/apply
--- old/ooo-build-2.2.0.0/patches/src680/apply 2007-05-09 17:43:32.000000000 +0200
+++ new/ooo-build-2.2.0.1/patches/src680/apply 2007-05-17 19:47:09.000000000 +0200
@@ -184,7 +184,7 @@
# hack for n#240776
sw-graphic-save-problem.diff, flr, n#240776
-
+[ TemporaryHacks < oof680-m16 < OOF680_m16 ]
# fixes build with gcc-3.3; required by MacOSX build
# we will move to gcc-4.x within a year, so it does not make sense to push
# it upstream
@@ -277,9 +277,6 @@
# Make debugging easier by allowing cerr << aOUString << endl
sal-oustring-debug.diff, i#65920, jholesov
-# Default to splash without the Sun logo
-community-splash.diff, jholesov
-
# Tell the desktop we support the VFS
uses-vfs.diff, i#43504, michael
@@ -289,9 +286,19 @@
# add mozilla certificate dir detection to soffice
soffice-detect-mozilla-certificates.diff
+[ FixesNotForUpstream >= oof680-m16 >= OOF680_m16 ]
+# Default to splash without the Sun logo
+community-splash.diff, jholesov
+
+[ FixesNotForUpstream < oof680-m16 < OOF680_m16 ]
+# Default to splash without the Sun logo
+community-splash-m15.diff, jholesov
[ Fixes ]
+# sd printing fixes
+printing-bugfix-73014.diff, i#73014, rodo
+
# let sd accept uri-list drop, n#183719
sd-accept-uri-list-drop.diff, n#183719, rodo
@@ -394,16 +401,10 @@
# backport from cws vcl75, honour /etc/papersize
libpaper-support.diff
-# add option to link against libpaper
-libpaper-link.diff
# Don't add system path to LD_LIBRARY_PATH
soffice-ldlibpath.diff, i#76122, mklose
-# Make opening by double-clicking in Windows Explorer work on files
-# with any Unicode chars in name
-issue-59251.diff, i#59251.diff
-
# find locked certs, fix by Jacob Berkman
libxmlsec-findcerts.diff, i#76870, pmladek
# allow other types of signing certs, fix by Jacob Berkman
@@ -412,6 +413,11 @@
# database fields with leading 0 vanish from tables derived from xls documents
connectivity-vanishing-fields.diff, i#76668, tml
+[ Fixes < oof680-m16 < OOF680_m16 ]
+# Make opening by double-clicking in Windows Explorer work on files
+# with any Unicode chars in name
+issue-59251.diff, i#59251.diff
+
[ Fixes < oof680-m15 < OOF680_m15 ]
# HZ will no longer defined by glibc because the value is architecture dependent.
# sysconf(_SC_CLK_TCK) must be used instead, i#68616
@@ -688,7 +694,6 @@
pushfont-psstream.diff
scp2-user-config-ooo-2.0.diff
-build-wizard-bitmap-scp.diff
[ MandrivaOnly ]
@@ -705,7 +710,6 @@
SectionOwner => gghibo
help-support-mdv.diff
-build-wizard-bitmap-scp.diff, michael
# change user config dir name from ~/.openoffice.org2.0 to ~/.ooo-2.0
scp2-user-config-ooo-2.0.diff, pmladek
@@ -714,8 +718,6 @@
# Help Support page
help-support.diff, michael
-# mark the files in share/template/<lang>/wizard/bitmap as lang specific
-build-wizard-bitmap-scp.diff, michael
# change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre
scp2-user-config-ooo-2.0.diff, pmladek
# Push fonts into the ps stream always
@@ -806,6 +808,10 @@
# fix pa-IN translation
ooo75790.sc.pa-IN-translate.diff
+[ SDFPatches == oof680-m16 == OOF680_m16 ]
+# fix Insert slide in m16
+cws-l10n77316fix.diff, i#77316
+
[ Features ]
# ask user on logout/shutdown to save documents
session-management.diff, i#63156, rodo
@@ -867,6 +873,9 @@
# add --with-seamonkey configure flag to link with seamonkey-*.pc
config_with-seamonkey.diff, i#73440, hmth
+# JavaUNOHelperServices.class must be built before juh.jar is created
+javaunohelper-deps.diff, i#77465, pmladek
+
[ MandrivaOnly ]
SectionOwner => gghibo
@@ -1000,10 +1009,17 @@
# Easier branding of OOo intro
intros-config_office.diff
intros-scp2.diff
-intros-svx.diff
abouts-sfx2.diff
intros-desktop.diff
+[ Branding < oof680-m16 < OOF680_m16 ]
+intros-svx-m15.diff
+# allows to redefine the name of the UNIX wrapper that will be used
+# in the desktop files; needed for qstart
+config-unix-wrapper-m15.diff, i#75366, n#252242, pmladek
+
+[ Branding >= oof680-m16 >= OOF680_m16 ]
+intros-svx.diff
# allows to redefine the name of the UNIX wrapper that will be used
# in the desktop files; needed for qstart
config-unix-wrapper.diff, i#75366, n#252242, pmladek
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/build-wizard-bitmap-scp.diff new/ooo-build-2.2.0.1/patches/src680/build-wizard-bitmap-scp.diff
--- old/ooo-build-2.2.0.0/patches/src680/build-wizard-bitmap-scp.diff 2007-05-02 14:38:26.000000000 +0200
+++ new/ooo-build-2.2.0.1/patches/src680/build-wizard-bitmap-scp.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-Index: scp2/source/ooo/file_extra_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_extra_ooo.scp,v
-retrieving revision 1.8
-diff -u -r1.8 file_extra_ooo.scp
---- scp2/source/ooo/file_extra_ooo.scp 9 Nov 2004 16:51:18 -0000 1.8
-+++ scp2/source/ooo/file_extra_ooo.scp 7 Dec 2004 10:22:18 -0000
-@@ -332,7 +332,7 @@
- EXTRA_ALL_LANG(tplpresntimpr);
- End
-
--File gid_File_Extra_Tplwizbitmap
-+File gid_File_Extra_Tplwizbitmap_Lang
- Dir = gid_Dir_Template_Wizard_Bitmap;
- TXT_FILE_BODY;
- Styles = (ARCHIVE, DONT_OVERWRITE);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/community-splash.diff new/ooo-build-2.2.0.1/patches/src680/community-splash.diff
--- old/ooo-build-2.2.0.0/patches/src680/community-splash.diff 2007-05-02 14:38:26.000000000 +0200
+++ new/ooo-build-2.2.0.1/patches/src680/community-splash.diff 2007-05-15 19:24:08.000000000 +0200
@@ -11,6 +11,6 @@
..\res\soffice.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\intro.bmp
-..\res\ooointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
+..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
+ ..\res\oooabout.bmp %COMMON_DEST%\pck%_EXT%\openoffice\about.bmp
..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp
..\res\ooodevintro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.bmp
- ..\res\ooodevnologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\nologointro.bmp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/community-splash-m15.diff new/ooo-build-2.2.0.1/patches/src680/community-splash-m15.diff
--- old/ooo-build-2.2.0.0/patches/src680/community-splash-m15.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/ooo-build-2.2.0.1/patches/src680/community-splash-m15.diff 2007-05-15 19:24:08.000000000 +0200
@@ -0,0 +1,16 @@
+Index: svx/prj/d.lst
+===================================================================
+RCS file: /cvs/graphics/svx/prj/d.lst,v
+retrieving revision 1.108
+diff -u -r1.108 d.lst
+--- svx/prj/d.lst 9 Dec 2004 16:36:45 -0000 1.108
++++ svx/prj/d.lst 16 Dec 2004 12:43:47 -0000
+@@ -55,7 +55,7 @@
+ ..\res\cjkintro.bmp %COMMON_DEST%\pck%_EXT%\starsuite_bitmap\intro.bmp
+ ..\res\ofaabout.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\about.bmp
+ ..\res\soffice.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\intro.bmp
+-..\res\ooointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
++..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
+ ..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp
+ ..\res\ooodevintro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.bmp
+ ..\res\ooodevnologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\nologointro.bmp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/config-unix-wrapper.diff new/ooo-build-2.2.0.1/patches/src680/config-unix-wrapper.diff
--- old/ooo-build-2.2.0.0/patches/src680/config-unix-wrapper.diff 2007-05-02 14:38:26.000000000 +0200
+++ new/ooo-build-2.2.0.1/patches/src680/config-unix-wrapper.diff 2007-05-15 19:24:08.000000000 +0200
@@ -42,12 +42,19 @@
ToFile( "CALL_CDECL", $CALL_CDECL, "e" );
--- sysui/desktop/productversion.mk.old 2006-11-17 10:25:46.000000000 +0100
+++ sysui/desktop/productversion.mk 2007-03-12 19:25:04.000000000 +0100
-@@ -36,7 +36,7 @@
- PRODUCTNAME = OpenOffice.org
- PRODUCTVERSION = 2.2
- LONGPRODUCTNAME = OpenOffice.org 2.2
--UNIXFILENAME = openoffice.org2.2
-+UNIXFILENAME *= openoffice.org2.2
- PKGVERSION = 2.2
- .IF "$(OS)"=="LINUX"
- PKGREV = $(BUILD)
+@@ -66,13 +66,13 @@
+ PRODUCTNAME.openoffice.org = OpenOffice.org
+ PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
+ PKGVERSION.openoffice.org = $(PKGVERSION)
+-UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSION.openoffice.org)
++UNIXFILENAME.openoffice.org *= $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSION.openoffice.org)
+ ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)
+
+ PRODUCTNAME.broffice.org = BrOffice.org
+ PRODUCTVERSION.broffice.org = $(PRODUCTVERSION)
+ PKGVERSION.broffice.org = $(PKGVERSION)
+-UNIXFILENAME.broffice.org = $(PRODUCTNAME.broffice.org:l)$(PRODUCTVERSION.broffice.org)
++UNIXFILENAME.broffice.org *= $(PRODUCTNAME.broffice.org:l)$(PRODUCTVERSION.broffice.org)
+ ICONPREFIX.broffice.org = $(UNIXFILENAME.broffice.org:s/.//g)
+
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/config-unix-wrapper-m15.diff new/ooo-build-2.2.0.1/patches/src680/config-unix-wrapper-m15.diff
--- old/ooo-build-2.2.0.0/patches/src680/config-unix-wrapper-m15.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/ooo-build-2.2.0.1/patches/src680/config-unix-wrapper-m15.diff 2007-05-15 19:24:08.000000000 +0200
@@ -0,0 +1,53 @@
+--- config_office/configure.in.old 2007-03-12 17:57:08.000000000 +0100
++++ config_office/configure.in 2007-03-12 19:57:39.000000000 +0100
+@@ -584,6 +584,12 @@
+
+ Usage: --with-about-bitmaps=/path/my_ooo_about.bmp
+ ],,)
++AC_ARG_WITH(unix-wrapper,
++[ --with-unix-wrapper Redefines the name of the UNIX wrapper that will be used
++ in the desktop files and in the desktop-integration RPMs.
++
++ Usage: --with-unix-wrapper=ooffice
++],,)
+ AC_ARG_WITH(vendor,
+ [ --with-vendor Set vendor of the build.
+
+@@ -5439,6 +5445,16 @@
+ AC_SUBST(ABOUT_BITMAPS)
+ AC_SUBST(ABOUT_BITMAP_NAMES)
+
++UNIXFILENAME=
++AC_MSG_CHECKING([for UNIX wrapper name])
++if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no" -o "$with_unix_wrapper" = "yes" ; then
++ AC_MSG_RESULT([not set])
++else
++ UNIXFILENAME="$with_unix_wrapper"
++ AC_MSG_RESULT([$UNIXFILENAME])
++fi
++AC_SUBST(UNIXFILENAME)
++
+ OOO_VENDOR=
+ AC_MSG_CHECKING([for vendor])
+ if test -z "$with_vendor" -o "$with_vendor" = "no" ; then
+--- config_office/set_soenv.in.old 2007-03-12 17:57:08.000000000 +0100
++++ config_office/set_soenv.in 2007-03-13 17:16:02.000000000 +0100
+@@ -1503,6 +1503,7 @@
+ ToFile( "INTRO_BITMAP_NAMES","@INTRO_BITMAP_NAMES@","e" );
+ ToFile( "ABOUT_BITMAPS", "@ABOUT_BITMAPS@", "e" );
+ ToFile( "ABOUT_BITMAP_NAMES","@ABOUT_BITMAP_NAMES@","e" );
++ToFile( "UNIXFILENAME", "@UNIXFILENAME@", "e" );
+ ToFile( "OOO_VENDOR", "@OOO_VENDOR@", "e" );
+
+ ToFile( "CALL_CDECL", $CALL_CDECL, "e" );
+--- sysui/desktop/productversion.mk.old 2006-11-17 10:25:46.000000000 +0100
++++ sysui/desktop/productversion.mk 2007-03-12 19:25:04.000000000 +0100
+@@ -36,7 +36,7 @@
+ PRODUCTNAME = OpenOffice.org
+ PRODUCTVERSION = 2.2
+ LONGPRODUCTNAME = OpenOffice.org 2.2
+-UNIXFILENAME = openoffice.org2.2
++UNIXFILENAME *= openoffice.org2.2
+ PKGVERSION = 2.2
+ .IF "$(OS)"=="LINUX"
+ PKGREV = $(BUILD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/cws-l10n77316fix.diff new/ooo-build-2.2.0.1/patches/src680/cws-l10n77316fix.diff
--- old/ooo-build-2.2.0.0/patches/src680/cws-l10n77316fix.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/ooo-build-2.2.0.1/patches/src680/cws-l10n77316fix.diff 2007-05-15 19:24:08.000000000 +0200
@@ -0,0 +1,92 @@
+Index: source/ui/app/localize.sdf
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/app/localize.sdf,v
+retrieving revision 1.30.40.1
+retrieving revision 1.30.40.1.16.1
+diff -u -u -r1.30.40.1 -r1.30.40.1.16.1
+--- sd/source/ui/app/localize.sdf 2 Feb 2007 10:34:36 -0000 1.30.40.1
++++ sd/source/ui/app/localize.sdf 15 May 2007 10:26:47 -0000 1.30.40.1.16.1
+@@ -22030,6 +22030,83 @@
+ sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE SID_INSERTPAGE 0 zh-CN 插入幻灯片(~I) 2002-02-02 02:02:02
+ sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE SID_INSERTPAGE 0 zh-TW 插入投影片(~I) 2002-02-02 02:02:02
+ sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE SID_INSERTPAGE 0 zu ~Faka Islaydi 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 af ~Voeg skyfie in! 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ar ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 as ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 be-BY Уставіць слайд 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 bg ~Вмъкване на кадър 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 bn ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 br ~Enlakaat un dreyonenn 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 bs ~Ubaci slajd 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ca ~Insereix una diapositiva 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 cs Vložit snímek 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 cy Mewnosod Tryloyw 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 da ~Indsæt dias 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 el Ε~ισαγωγή διαφάνειας 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 en-GB ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 en-ZA ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 eo ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 es ~Insertar diapositiva 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 et Lisa slaid 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 eu ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 fa ~درج اسلاید 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 fi ~Lisää dia 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 fr ~Insérer une diapo 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ga ~Ionsáigh Sleamhnán 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 gl-ES ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 gu-IN સ્લાઈડ ઉમેરો (~I) 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 he הכנסת שקף 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 hi-IN जोड़ें स्लाइड (~I) 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 hr ~Umetni slajd 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 hu ~Dia beszúrása 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 it ~Inserisci diapositiva 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ja スライドの挿入(~I) 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ka ~სლაიდების ჩასმა 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 km បញ្ចូលស្លាយ 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 kn ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ko 슬라이드 삽입(~I) 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ku Slaytan ~Lê Zêde Bike 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 lt Įterpti ~lapą 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 mk ~Вметни слајд 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ml ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 mr ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 nb Sett ~inn lysbilde 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ne स्लाईड घुसाउनुहोस् 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 nl Dia ~invoegen 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 nn Set ~inn lysbilete 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 nr ~Faka Isilayidi 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ns ~Tsenya Selaete 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 or ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 pa-IN ਸਲਾਈਡ ਸ਼ਾਮਲ(~i) 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 pl ~Wstaw slajd 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 pt ~Inserir diapositivo 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 pt-BR Inserir página 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ru Вставить слайд 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 rw Kongeramo Igice 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sh-YU U~metni slajd 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sk Vlož~iť snímok 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sl ~Vstavi prosojnico 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sr-CS У~метни слајд 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ss ~Faka Bomsheleletane 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 st ~Kenya Selaete 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sv Infoga sida 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 sw-TZ ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ta ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 te ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 tg Иловакунии слайд 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 th แ~ทรกภาพนิ่ง 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ti ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 tn ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 tr Slayt ~Ekle 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ts ~Nghenisa Slayidi 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 uk ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ur ~Insert Slide 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 ve ~Longelani Siḽaidi 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 vi Chèn ảnh ch~iếu 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 xh ~Faka Islayidi 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 zh-CN 插入幻灯片(~I) 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 zh-TW 插入投影片(~I) 2002-02-02 02:02:02
++sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_INSERTPAGE_LAYOUT_MENU SID_INSERTPAGE 0 zu ~Faka Islaydi 2002-02-02 02:02:02
+ sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_TP_APPLY_TO_SELECTED_SLIDES SID_TP_APPLY_TO_SELECTED_SLIDES 0 af Pas op ~geselekteerde skyfies toe 2002-02-02 02:02:02
+ sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_TP_APPLY_TO_SELECTED_SLIDES SID_TP_APPLY_TO_SELECTED_SLIDES 0 as-IN নিৰ্বাচিত শ্লাইডবোৰলৈ প্ৰয়োগ কৰক 2002-02-02 02:02:02
+ sd source\ui\app\popup.src 0 menuitem RID_TASKPANE_LAYOUTMENU_POPUP SID_TP_APPLY_TO_SELECTED_SLIDES SID_TP_APPLY_TO_SELECTED_SLIDES 13691 be-BY Ужыць над азначанымі слайдамі 2002-02-02 02:02:02
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/intros-svx.diff new/ooo-build-2.2.0.1/patches/src680/intros-svx.diff
--- old/ooo-build-2.2.0.0/patches/src680/intros-svx.diff 2007-05-02 14:38:26.000000000 +0200
+++ new/ooo-build-2.2.0.1/patches/src680/intros-svx.diff 2007-05-15 19:24:08.000000000 +0200
@@ -1,9 +1,9 @@
--- svx/prj/d.lst 2006-05-29 16:01:51.000000000 +0000
+++ svx/prj/d.lst 2006-05-31 14:00:22.000000000 +0000
@@ -48,6 +48,7 @@ mkdir: %COMMON_DEST%\pck%_EXT%\openoffic
- ..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp
- ..\res\ooodevintro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.bmp
- ..\res\ooodevnologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\nologointro.bmp
+ ..\res\brabout.bmp %COMMON_DEST%\pck%_EXT%\broffice\about.bmp
+ ..\res\brintro.bmp %COMMON_DEST%\pck%_EXT%\broffice\intro.bmp
+ ..\res\brdevintro.bmp %COMMON_DEST%\pck%_EXT%\broffice_dev\intro.bmp
+..\%__SRC%\bin\intros.zip %_DEST%\bin%_EXT%\intros.zip
mkdir: %_DEST%\inc%_EXT%\svx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/intros-svx-m15.diff new/ooo-build-2.2.0.1/patches/src680/intros-svx-m15.diff
--- old/ooo-build-2.2.0.0/patches/src680/intros-svx-m15.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/ooo-build-2.2.0.1/patches/src680/intros-svx-m15.diff 2007-05-15 19:24:08.000000000 +0200
@@ -0,0 +1,22 @@
+--- svx/prj/d.lst 2006-05-29 16:01:51.000000000 +0000
++++ svx/prj/d.lst 2006-05-31 14:00:22.000000000 +0000
+@@ -48,6 +48,7 @@ mkdir: %COMMON_DEST%\pck%_EXT%\openoffic
+ ..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp
+ ..\res\ooodevintro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.bmp
+ ..\res\ooodevnologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice_dev\nologointro.bmp
++..\%__SRC%\bin\intros.zip %_DEST%\bin%_EXT%\intros.zip
+
+ mkdir: %_DEST%\inc%_EXT%\svx
+ hedabu: ..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx
+--- svx/source/intro/makefile.mk 2006-05-29 16:01:51.000000000 +0000
++++ svx/source/intro/makefile.mk 2006-05-31 13:40:14.000000000 +0000
+@@ -72,6 +72,9 @@ RESLIB4IMAGES=$(PRJ)$/res
+ RESLIB2SRSFILES= \
+ $(SRS)$/$(SRS2NAME).srs
+
++ZIP1TARGET=intros
++ZIP1LIST=$(INTRO_BITMAPS)
++
+ .INCLUDE : target.mk
+
+ $(SRS)$/iso.srs: $(INCCOM)$/intro.hrc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/javaunohelper-deps.diff new/ooo-build-2.2.0.1/patches/src680/javaunohelper-deps.diff
--- old/ooo-build-2.2.0.0/patches/src680/javaunohelper-deps.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/ooo-build-2.2.0.1/patches/src680/javaunohelper-deps.diff 2007-05-17 19:10:31.000000000 +0200
@@ -0,0 +1,8 @@
+--- javaunohelper/prj/build.lst.old 2006-12-14 15:59:01.000000000 +0100
++++ javaunohelper/prj/build.lst 2007-05-17 19:09:24.000000000 +0200
+@@ -7,4 +7,4 @@
+ jh javaunohelper\com\sun\star\lib\uno\adapter nmake - all jh_adapter jh_libhelp jh_inc NULL
+ jh javaunohelper\com\sun\star\lib\uno\helper nmake - all jh_libhelp jh_inc NULL
+ jh javaunohelper\source nmake - all jh_source jh_inc NULL
+-jh javaunohelper\util nmake - all jh_util jh_helper jh_source jh_adapter jh_libhelp NULL
++jh javaunohelper\util nmake - all jh_util jh_helper jh_comp jh_source jh_adapter jh_libhelp NULL
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/libpaper-link.diff new/ooo-build-2.2.0.1/patches/src680/libpaper-link.diff
--- old/ooo-build-2.2.0.0/patches/src680/libpaper-link.diff 2007-05-02 14:38:25.000000000 +0200
+++ new/ooo-build-2.2.0.1/patches/src680/libpaper-link.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,121 +0,0 @@
---- psprint/source/printer/makefile.mk-old 2007-03-26 16:03:15.000000000 +0200
-+++ psprint/source/printer/makefile.mk 2007-03-26 16:04:21.000000000 +0200
-@@ -47,6 +47,10 @@
- CDEFS += -DENABLE_CUPS
- .ENDIF
-
-+.IF "$(LIBPAPER_LINK)" == "YES"
-+CDEFS += -DLIBPAPER_LINK
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
-
- .IF "$(GUIBASE)"=="aqua"
---- psprint/source/printer/printerinfomanager.cxx-old 2007-03-26 16:25:28.000000000 +0200
-+++ psprint/source/printer/printerinfomanager.cxx 2007-03-26 16:29:56.000000000 +0200
-@@ -64,6 +64,10 @@
-
- #include
-
-+#ifdef LIBPAPER_LINK
-+#include
-+#endif
-+
- using namespace psp;
- using namespace rtl;
- using namespace osl;
-@@ -142,6 +146,9 @@
-
- void PrinterInfoManager::initSystemDefaultPaper()
- {
-+ bool bSuccess = false;
-+ const char* pPaper;
-+#ifndef LIBPAPER_LINK
- // try libpaper
- OUString aModName( RTL_CONSTASCII_USTRINGPARAM( "libpaper.so.1" ) );
- OUString aInitName( RTL_CONSTASCII_USTRINGPARAM( "paperinit" ) );
-@@ -150,14 +157,17 @@
- oslModule hMod = osl_loadModule( aModName.pData, SAL_LOADMODULE_NOW );
- if( hMod )
- {
-- bool bSuccess = false;
- int (*init)() = (int(*)())osl_getFunctionSymbol( hMod, aInitName.pData );
- int (*done)() = (int(*)())osl_getFunctionSymbol( hMod, aDoneName.pData );
- const char* (*sys)() = (const char*(*)())osl_getFunctionSymbol( hMod, aSystemName.pData );
- if( init && done && sys )
- {
- init();
-- const char* pPaper = sys();
-+ pPaper = sys();
-+#else
-+ paperinit();
-+ pPaper = systempapername();
-+#endif
- if( pPaper && *pPaper )
- {
- m_aSystemDefaultPaper = OUString( OStringToOUString( pPaper, osl_getThreadTextEncoding() ) );
-@@ -166,12 +176,18 @@
- fprintf( stderr, "paper from libpaper = %s\n", pPaper );
- #endif
- }
-+#ifndef LIBPAPER_LINK
- done();
- }
- osl_unloadModule( hMod );
-+#else
-+ paperdone();
-+#endif
- if( bSuccess )
- return;
-+#ifndef LIBPAPER_LINK
- }
-+#endif
-
- // default value is Letter for US (en_US), Cannada (en_CA, fr_CA); else A4
- // en will be interpreted as en_US
---- psprint/util/makefile.mk-old 2006-04-07 15:44:51.000000000 +0200
-+++ psprint/util/makefile.mk 2007-03-26 16:10:34.000000000 +0200
-@@ -82,6 +82,10 @@
- SHL1STDLIBS+=$(JVMFWKLIB)
- .ENDIF
-
-+.IF "$(LIBPAPER_LINK)" == "YES"
-+SHL1STDLIBS += -lpaper
-+.ENDIF
-+
- SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
- .ENDIF # "$(OS)"=="WNT"
---- config_office/configure.in-old 2007-03-26 16:11:32.000000000 +0200
-+++ config_office/configure.in 2007-03-26 16:14:40.000000000 +0200
-@@ -1880,6 +1880,20 @@
- fi
- AC_SUBST(CRYPT_LINK)
-
-+AC_MSG_CHECKING([whether to link to libpaper])
-+if test -n "$enable_libpaper_link"; then
-+ AC_MSG_RESULT([yes])
-+ LIBPAPER_LINK=YES
-+ AC_CHECK_HEADER(paper.h, [],
-+ [AC_MSG_ERROR([paper.h needed. install libpaper headers])], [])
-+ AC_CHECK_LIB(paper, systempapername, [],
-+ [AC_MSG_ERROR([libpaper not found or functional])], [])
-+else
-+ AC_MSG_RESULT([no])
-+ LIBPAPER_LINK=NO
-+fi
-+AC_SUBST(LIBPAPER_LINK)
-+
- dnl ===================================================================
- dnl Testing for c++ compiler and version...
- dnl ===================================================================
---- config_office/set_soenv.in-old 2007-03-26 16:14:48.000000000 +0200
-+++ config_office/set_soenv.in 2007-03-26 16:15:14.000000000 +0200
-@@ -1903,6 +1903,7 @@
- ToFile( "NEW_SHADOW_API", "@NEW_SHADOW_API@", "e" );
- ToFile( "PAM_LINK", "@PAM_LINK@", "e" );
- ToFile( "CRYPT_LINK", "@CRYPT_LINK@", "e" );
-+ToFile( "LIBPAPER_LINK", "@LIBPAPER_LINK@", "e" );
- ToFile( "XAU_LIBS", "@XAU_LIBS@", "e" );
- ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@", "e" );
- ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/libpaper-support.diff new/ooo-build-2.2.0.1/patches/src680/libpaper-support.diff
--- old/ooo-build-2.2.0.0/patches/src680/libpaper-support.diff 2007-05-02 14:38:25.000000000 +0200
+++ new/ooo-build-2.2.0.1/patches/src680/libpaper-support.diff 2007-05-15 19:24:08.000000000 +0200
@@ -80,39 +80,33 @@
}
// -----------------------------------------------------------------
-@@ -138,6 +140,87 @@
+@@ -138,6 +140,81 @@
// -----------------------------------------------------------------
+void PrinterInfoManager::initSystemDefaultPaper()
+{
++ bool bSuccess = false;
++
+ // try libpaper
-+ OUString aModName( RTL_CONSTASCII_USTRINGPARAM( "libpaper.so.1" ) );
-+ OUString aInitName( RTL_CONSTASCII_USTRINGPARAM( "paperinit" ) );
-+ OUString aDoneName( RTL_CONSTASCII_USTRINGPARAM( "paperdone" ) );
-+ OUString aSystemName( RTL_CONSTASCII_USTRINGPARAM( "systempapername" ) );
-+ oslModule hMod = osl_loadModule( aModName.pData, SAL_LOADMODULE_NOW );
-+ if( hMod )
++ FILE* pPipe = popen( "paperconf", "r" );
++ if( pPipe )
+ {
-+ bool bSuccess = false;
-+ int (*init)() = (int(*)())osl_getFunctionSymbol( hMod, aInitName.pData );
-+ int (*done)() = (int(*)())osl_getFunctionSymbol( hMod, aDoneName.pData );
-+ const char* (*sys)() = (const char*(*)())osl_getFunctionSymbol( hMod, aSystemName.pData );
-+ if( init && done && sys )
-+ {
-+ init();
-+ const char* pPaper = sys();
-+ if( pPaper && *pPaper )
-+ {
-+ m_aSystemDefaultPaper = OUString( OStringToOUString( pPaper, osl_getThreadTextEncoding() ) );
-+ bSuccess = true;
-+ #if OSL_DEBUG_LEVEL > 1
-+ fprintf( stderr, "paper from libpaper = %s\n", pPaper );
-+ #endif
-+ }
-+ done();
++ char pBuffer[ 1024 ];
++ *pBuffer = 0;
++ fgets( pBuffer, sizeof(pBuffer)-1, pPipe );
++ pclose( pPipe );
++
++ ByteString aPaper( pBuffer );
++ aPaper = WhitespaceToSpace( aPaper );
++ if( aPaper.Len() )
++ {
++ m_aSystemDefaultPaper = OUString( OStringToOUString( aPaper, osl_getThreadTextEncoding() ) );
++ bSuccess = true;
++ #if OSL_DEBUG_LEVEL > 1
++ fprintf( stderr, "paper from paperconf = %s\n", aPaper.GetBuffer() );
++ #endif
+ }
-+ osl_unloadModule( hMod );
+ if( bSuccess )
+ return;
+ }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.2.0.0/patches/src680/printing-bugfix-73014.diff new/ooo-build-2.2.0.1/patches/src680/printing-bugfix-73014.diff
--- old/ooo-build-2.2.0.0/patches/src680/printing-bugfix-73014.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/ooo-build-2.2.0.1/patches/src680/printing-bugfix-73014.diff 2007-05-16 19:51:22.000000000 +0200
@@ -0,0 +1,45 @@
+Index: sd/source/ui/view/PrintManager.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/view/PrintManager.cxx,v
+retrieving revision 1.15
+diff -u -p -r1.15 PrintManager.cxx
+--- sd/source/ui/view/PrintManager.cxx 3 Apr 2007 16:27:36 -0000 1.15
++++ sd/source/ui/view/PrintManager.cxx 15 May 2007 12:27:20 -0000
+@@ -1543,15 +1543,20 @@ void PrintManager::PrintStdOrNotes (
+ // printable area.
+ if (bPrint)
+ {
+- if (bScalePage
+- || (rInfo.mpPrintOpts && rInfo.mpPrintOpts->GetOptionsPrint().IsCutPage()))
++ bool bCutPage = (rInfo.mpPrintOpts && rInfo.mpPrintOpts->GetOptionsPrint().IsCutPage());
++ if (bScalePage || bCutPage)
+ {
+ // Handlee 1 and 2.
++
++ // if CutPage is set then do not move
++ // it, otherwise move the scaled page
++ // to printable area
++
+ PrintPagePart(
+ rInfo,
+ pPage,
+ *pPrintView,
+- Point(0,0),
++ bCutPage ? Point(-aPageOfs.X(), -aPageOfs.Y()) : Point(0,0),
+ bPrintMarkedOnly,
+ aPageStr,
+ aPageOfs);
+@@ -1561,7 +1566,12 @@ void PrintManager::PrintStdOrNotes (
+ // Handle 3. Print parts of the page in the
+ // size of the printable area until the
+ // whole page is covered.
+- Point aOrigin (-aPageOfs.X(), -aPageOfs.Y());
++
++ // keep the page content at its
++ // position if it fits, otherwise move
++ // it to the printable area
++
++ Point aOrigin (aPageWidth < aPrintWidth ? -aPageOfs.X() : 0, aPageHeight < aPrintHeight ? -aPageOfs.Y() : 0);
+ for (aPageOrigin = aOrigin;
+ -aPageOrigin.Y()