Hello community,
here is the log from the commit of package OpenOffice_org
checked in at Sat Apr 15 11:41:42 CEST 2006.
--------
--- arch/i386/OpenOffice_org/OpenOffice_org.changes 2006-04-05 19:11:37.000000000 +0200
+++ STABLE/OpenOffice_org/OpenOffice_org.changes 2006-04-14 20:13:43.000000000 +0200
@@ -1,0 +2,21 @@
+Fri Apr 14 20:11:54 CEST 2006 - pmladek@suse.cz
+
+- updated ooo-build to version 2.0.2.7:
+ * better fix for crash when selecting email application [#154458]
+ * avoids strange 2.6 specific hacks
+
+-------------------------------------------------------------------
+Thu Apr 13 21:11:25 CEST 2006 - pmladek@suse.cz
+
+- updated ooo-build to version 2.0.2.6:
+ * crash when selecting email application
+ * allow right-click if focus is set to mouse in Metacity
+ * prefer Calc over Gnumeric in KDE, set InitialPreference=6 in calc.desktop
+ * enable Math MIME type setting; use NoDisplay=true instead of Hidden=true
+ in math.desktop
+ * crash with a11y [#165538]
+ * -display and other options with ooqstart [#160296]
+ * expression evaluation changed between 1.x and 2.0 [#164294]
+ * disable use of fontconfig to enable/disable bitmaps again [#164868]
+
+-------------------------------------------------------------------
Old:
----
minmem
ooo-build-2.0.2.5.tar.gz
New:
----
ooo-build-2.0.2.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenOffice_org.spec ++++++
--- /var/tmp/diff_new_pack.w612Ja/_old 2006-04-15 11:39:26.000000000 +0200
+++ /var/tmp/diff_new_pack.w612Ja/_new 2006-04-15 11:39:26.000000000 +0200
@@ -54,12 +54,12 @@
%define ooo_prefix /usr/lib
%define ooo_home ooo-2.0
%define ooo_build_dir build
-%define ooo_build_version 2.0.2.5
+%define ooo_build_version 2.0.2.7
%define ooo_build_tag OOO_2_0_2
License: LGPL, BSD
Group: Productivity/Office/Suite
Version: 2.0.2
-Release: 13
+Release: 16
Autoreqprov: on
PreReq: coreutils /usr/bin/update-mime-database
Prereq: %suseconfig_fonts_prereq
@@ -1856,6 +1856,21 @@
%endif
%changelog -n OpenOffice_org
+* Fri Apr 14 2006 - pmladek@suse.cz
+- updated ooo-build to version 2.0.2.7:
+ * better fix for crash when selecting email application [#154458]
+ * avoids strange 2.6 specific hacks
+* Thu Apr 13 2006 - pmladek@suse.cz
+- updated ooo-build to version 2.0.2.6:
+ * crash when selecting email application
+ * allow right-click if focus is set to mouse in Metacity
+ * prefer Calc over Gnumeric in KDE, set InitialPreference=6 in calc.desktop
+ * enable Math MIME type setting; use NoDisplay=true instead of Hidden=true
+ in math.desktop
+ * crash with a11y [#165538]
+ * -display and other options with ooqstart [#160296]
+ * expression evaluation changed between 1.x and 2.0 [#164294]
+ * disable use of fontconfig to enable/disable bitmaps again [#164868]
* Wed Apr 05 2006 - pmladek@suse.cz
- updated ooo-build to version 2.0.2.5:
* use fontconfig to enable/disable bitmaps
++++++ ooo-build-2.0.2.5.tar.gz -> ooo-build-2.0.2.7.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/ChangeLog new/ooo-build-2.0.2.7/ChangeLog
--- old/ooo-build-2.0.2.5/ChangeLog 2006-04-05 19:07:18.000000000 +0200
+++ new/ooo-build-2.0.2.7/ChangeLog 2006-04-14 19:41:42.000000000 +0200
@@ -1,3 +1,57 @@
+2006-04-14 Petr Mladek
+
+ * Version 2.0.2.7
+
+ * patches/src680/fix_filedlghelper.diff: better fix for crash when
+ selecting email application, provided by Giuseppe Ghibò,
+ Ubuntu #33767, n#154458
+
+2006-04-13 Petr Mladek
+
+ * Version 2.0.2.6
+
+2006-04-13 Radek Doulik
+
+ * patches/src680/xmloff/source/draw/ximpstyl.cxx: updated with
+ changes from cl
+
+2006-04-13 Jody Goldberg
+
+ * patches/src680/sc-string-arg.diff : Return errCellNoValue rather than
+ errNoValue. The former is a cheesy internal hack to return out of band
+ data that the value did not exist. The wrappers catch it. errNoValue
+ is an actual error. This weakens the XL compatibility which does
+ return a real error on failure, even for cases like "" and " ". n#164294
+
+2006-04-12 Jan Holesovsky
+
+ * patches/src680/speed-ooqstart-options.diff,
+ patches/src680/apply: Fix -display and other options.
+
+2006-04-12 Michael Meeks
+
+ * patches/src680/crash-sd-a11y.diff,
+ * patches/src680/apply: fix a11y crasher i#64334, n#165538
+
+2006-04-09 Petr Mladek
+
+ * desktop/calc.desktop.in: add InitialPreference=6 to be prefered
+ over gnumeric in KDE
+
+ * desktop/math.desktop.in: use NoDisplay=true instead of Hidden=true;
+ finally, works as expected (is not visible in menu, only provides
+ the MIME type info)
+
+2006-04-09 Matthias Klose
+
+ * patches/src680/vcl-metacity-focus.diff: New.
+ * patches/src680/apply: Apply in Fixes.
+
+2006-04-09 Martin Kretzschmar
+
+ * patches/src680/fix_filedlghelper.diff: New.
+ * patches/src680/apply: Apply in Fixes.
+
2006-04-05 Petr Mladek
* Version 2.0.2.5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/NEWS new/ooo-build-2.0.2.7/NEWS
--- old/ooo-build-2.0.2.5/NEWS 2006-04-05 19:09:24.000000000 +0200
+++ new/ooo-build-2.0.2.7/NEWS 2006-04-14 19:48:02.000000000 +0200
@@ -1,3 +1,22 @@
+ooo-build-2.0.2.7
+
+ + bug fixes:
+ + crash when selecting email application (Giuseppe)
+ + build bits:
+ + problems with checkdll.sh (Petr, Andreas)
+
+ooo-build-2.0.2.6
+
+ + bug fixes:
+ + crash when selecting email application (Martin)
+ + allow right-click if focus is set to mouse in Metacity (Matthias)
+ + prefer Calc over Gnumeric in KDE (Petr)
+ + enable Math MIME type setting (Petr)
+ + crash with a11y (Michael)
+ + -display and other options with ooqstart (Jan)
+ + expression evaluation changed between 1.x and 2.0 (Jody)
+ + disable use of fontconfig to enable/disable bitmaps again (Petr)
+
ooo-build-2.0.2.5
+ bug fixes:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/configure new/ooo-build-2.0.2.7/configure
--- old/ooo-build-2.0.2.5/configure 2006-04-05 19:38:19.000000000 +0200
+++ new/ooo-build-2.0.2.7/configure 2006-04-14 20:08:16.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for ooo-build 2.0.2.5.
+# Generated by GNU Autoconf 2.59 for ooo-build 2.0.2.7.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@
# Identity of this package.
PACKAGE_NAME='ooo-build'
PACKAGE_TARNAME='ooo-build'
-PACKAGE_VERSION='2.0.2.5'
-PACKAGE_STRING='ooo-build 2.0.2.5'
+PACKAGE_VERSION='2.0.2.7'
+PACKAGE_STRING='ooo-build 2.0.2.7'
PACKAGE_BUGREPORT=''
ac_unique_file="bin/build-ooo"
@@ -807,7 +807,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.0.2.5 to adapt to many kinds of systems.
+\`configure' configures ooo-build 2.0.2.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -869,7 +869,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ooo-build 2.0.2.5:";;
+ short | recursive ) echo "Configuration of ooo-build 2.0.2.7:";;
esac
cat <<\_ACEOF
@@ -1143,7 +1143,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-ooo-build configure 2.0.2.5
+ooo-build configure 2.0.2.7
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1157,7 +1157,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.0.2.5, which was
+It was created by ooo-build $as_me 2.0.2.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1809,7 +1809,7 @@
# Define the identity of the package.
PACKAGE='ooo-build'
- VERSION='2.0.2.5'
+ VERSION='2.0.2.7'
cat >>confdefs.h <<_ACEOF
@@ -2021,7 +2021,7 @@
-OOO_BUILDVERSION=2.0.2.5
+OOO_BUILDVERSION=2.0.2.7
PROPAGATED_ARGS=$ac_configure_args
@@ -5944,7 +5944,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by ooo-build $as_me 2.0.2.5, which was
+This file was extended by ooo-build $as_me 2.0.2.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6002,7 +6002,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-ooo-build config.status 2.0.2.5
+ooo-build config.status 2.0.2.7
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/configure.in new/ooo-build-2.0.2.7/configure.in
--- old/ooo-build-2.0.2.5/configure.in 2006-04-05 19:06:47.000000000 +0200
+++ new/ooo-build-2.0.2.7/configure.in 2006-04-14 19:12:38.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT(ooo-build, 2.0.2.5)
+AC_INIT(ooo-build, 2.0.2.7)
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.0.2.5/desktop/calc.desktop.in new/ooo-build-2.0.2.7/desktop/calc.desktop.in
--- old/ooo-build-2.0.2.5/desktop/calc.desktop.in 2006-03-09 15:31:34.000000000 +0100
+++ new/ooo-build-2.0.2.7/desktop/calc.desktop.in 2006-04-11 14:34:19.000000000 +0200
@@ -6,6 +6,7 @@
Exec=oocalc@BINSUFFIX@ %U
Icon=ooo-calc@BINSUFFIX@.png
Type=Application
+InitialPreference=6
Categories=Office;Spreadsheet
StartupNotify=@STARTUPNOTIFY@
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;text/x-comma-separated-values;text/x-csv;application/vnd.lotus-1-2-3;text/spreadsheet;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/desktop/math.desktop.in new/ooo-build-2.0.2.7/desktop/math.desktop.in
--- old/ooo-build-2.0.2.5/desktop/math.desktop.in 2006-03-09 15:31:34.000000000 +0100
+++ new/ooo-build-2.0.2.7/desktop/math.desktop.in 2006-04-10 14:10:30.000000000 +0200
@@ -2,7 +2,7 @@
Version=0.92
Encoding=UTF-8
Terminal=0
-Hidden=true
+NoDisplay=true
TryExec=oomath@BINSUFFIX@
Exec=oomath@BINSUFFIX@ %U
Icon=ooo-math@BINSUFFIX@.png
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/apply new/ooo-build-2.0.2.7/patches/src680/apply
--- old/ooo-build-2.0.2.5/patches/src680/apply 2006-04-05 18:00:10.000000000 +0200
+++ new/ooo-build-2.0.2.7/patches/src680/apply 2006-04-13 20:52:06.000000000 +0200
@@ -255,7 +255,9 @@
# run crash_report only when it is built, i#54121
sal-when-to-run-crash-report.diff
# use fontconfig to enable/disable bitmaps i#61841, n#16082
-vcl-fontconfig-hints.diff
+#vcl-fontconfig-hints.diff
+# fix a11y crasher i#64334, n#165538
+crash-sd-a11y.diff
# Fix the print error dialog and pop-up when unable to print. BINC 64010 Issue 44695
print-error.diff
@@ -328,10 +330,19 @@
# validator.w3.org; Ubuntu 20294, i#63081
sw-html-export-style-type.diff
+# fix problems with styles containing dashes i#63107, https://bugzilla.novell.com/show_bug.cgi?id=160120
+styles-dash.diff
+
# i#63766 hang on import of ms doc with vba
# containing the characters "Attribute"
svx-vbaimport-basic-hang.diff
+# outsmart Metacity's "focus:mouse" mode, i#63086
+vcl-metacity-focus.diff
+
+# fix crash when selecting email application, Ubuntu #33767
+fix_filedlghelper.diff
+
[ Leaks ]
# silly leaks around the place i#50726
leak-sal-file.diff
@@ -366,6 +377,8 @@
speed-ooqstart-more-steps.diff
# Make it X11+glib-only
speed-ooqstart-x11-only.diff
+# Fix -display and other options, n#160296
+speed-ooqstart-options.diff
# make the office socket name more predictable for external re-use
@@ -914,7 +927,7 @@
win32-msvs-2003-configure.diff
# Minor build fixes for win32
win32-build-fixes.diff
-# This is a pretty nasty IE problem #19510
+# This is a pretty nasty IE problem i#19510
win32-activex-disable.diff
# This enables building libIDL, glib and buildtools for mozilla from source
mozilla-buildlibs-win32.diff
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/crash-sd-a11y.diff new/ooo-build-2.0.2.7/patches/src680/crash-sd-a11y.diff
--- old/ooo-build-2.0.2.5/patches/src680/crash-sd-a11y.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/ooo-build-2.0.2.7/patches/src680/crash-sd-a11y.diff 2006-04-12 16:20:02.000000000 +0200
@@ -0,0 +1,17 @@
+Index: sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx,v
+retrieving revision 1.20
+diff -u -p -u -r1.20 SlideSorterViewShell.cxx
+--- sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx 19 Jan 2006 12:53:55 -0000 1.20
++++ sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx 12 Apr 2006 14:16:00 -0000
+@@ -274,6 +275,9 @@ DrawController* SlideSorterViewShell::Ge
+ ::com::sun::star::accessibility::XAccessible>
+ SlideSorterViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow)
+ {
++ if (mpSlideSorterController.get() == NULL)
++ return ViewShell::CreateAccessibleDocumentView (pWindow);
++
+ return new ::accessibility::AccessibleSlideSorterView (
+ *mpSlideSorterController.get(),
+ pWindow->GetAccessibleParentWindow()->GetAccessible(),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/fix_filedlghelper.diff new/ooo-build-2.0.2.7/patches/src680/fix_filedlghelper.diff
--- old/ooo-build-2.0.2.5/patches/src680/fix_filedlghelper.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/ooo-build-2.0.2.7/patches/src680/fix_filedlghelper.diff 2006-04-14 19:25:49.000000000 +0200
@@ -0,0 +1,31 @@
+--- sfx2/source/dialog/filedlghelper.cxx.old 2006-04-14 19:21:26.000000000 +0200
++++ sfx2/source/dialog/filedlghelper.cxx 2006-04-14 19:21:43.000000000 +0200
+@@ -102,6 +102,12 @@
+ #ifndef _COM_SUN_STAR_UCB_INTERACTIVEAUGMENTEDIOEXCEPTION_HPP_
+ #include
+ #endif
++#ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKGENERALEXCEPTION_HPP_
++#include
++#endif
++#ifndef _COM_SUN_STAR_IO_IOEXCEPTION_HPP_
++#include
++#endif
+
+ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+ #include
+@@ -2404,6 +2410,15 @@ int impl_isFolder( const OUString& rPath
+ catch ( star::ucb::InteractiveAugmentedIOException const & )
+ {
+ }
++ catch ( star::uno::RuntimeException const & )
++ {
++ }
++ catch ( star::ucb::InteractiveNetworkGeneralException const & )
++ {
++ }
++ catch ( star::io::IOException const & )
++ {
++ }
+
+ return -1;
+ }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/framework-nofocussteal.diff new/ooo-build-2.0.2.7/patches/src680/framework-nofocussteal.diff
--- old/ooo-build-2.0.2.5/patches/src680/framework-nofocussteal.diff 2006-04-04 16:12:58.000000000 +0200
+++ new/ooo-build-2.0.2.7/patches/src680/framework-nofocussteal.diff 2006-02-24 18:37:30.000000000 +0100
@@ -605,9 +605,14 @@
// fill XLFD aliases from fonts.alias files
initFontsAlias();
---- psprint/source/fontmanager/fontconfig.cxx 2006-04-02 11:06:33.000000000 +0200
-+++ psprint/source/fontmanager/fontconfig.cxx 2006-04-02 11:26:22.000000000 +0200
-@@ -44,10 +44,12 @@
+Index: source/fontmanager/fontconfig.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
+retrieving revision 1.14
+diff -u -p -u -r1.14 fontconfig.cxx
+--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 27 Oct 2005 07:55:13 -0000 1.14
++++ psprint/source/fontmanager/fontconfig.cxx 5 Nov 2005 11:22:58 -0000
+@@ -44,10 +44,12 @@ typedef void FcConfig;
typedef void FcObjectSet;
typedef void FcPattern;
typedef void FcFontSet;
@@ -620,7 +625,7 @@
#endif
#include <cstdio>
-@@ -80,6 +82,7 @@
+@@ -80,6 +82,7 @@ class FontCfgWrapper
{
void* m_pLib;
FcConfig* m_pDefConfig;
@@ -628,14 +633,14 @@
FcBool (*m_pFcInit)();
FcConfig* (*m_pFcConfigGetCurrent)();
-@@ -88,18 +91,24 @@
+@@ -88,17 +91,23 @@ class FontCfgWrapper
FcPattern* (*m_pFcPatternCreate)();
void (*m_pFcPatternDestroy)(FcPattern*);
FcFontSet* (*m_pFcFontList)(FcConfig*,FcPattern*,FcObjectSet*);
+ FcFontSet* (*m_pFcConfigGetFonts)(FcConfig*,FcSetName);
FcFontSet* (*m_pFcFontSetCreate)();
-+ FcCharSet* (*m_pFcCharSetCreate)();
-+ FcBool (*m_pFcCharSetAddChar)(FcCharSet *, FcChar32);
++ FcCharSet* (*m_pFcCharSetCreate)();
++ FcBool (*m_pFcCharSetAddChar)(FcCharSet *, FcChar32);
void (*m_pFcFontSetDestroy)(FcFontSet*);
FcBool (*m_pFcFontSetAdd)(FcFontSet*,FcPattern*);
+ void (*m_pFcPatternReference)(FcPattern*);
@@ -645,16 +650,15 @@
FcResult (*m_pFcPatternGetBool)(const FcPattern*,const char*,int,FcBool*);
void (*m_pFcDefaultSubstitute)(FcPattern *);
- FcPattern* (*m_pFcFontMatch)(FcConfig*,FcPattern*,FcResult*);
- FcPattern* (*m_pFcFontSetMatch)(FcConfig*,FcFontSet**, int, FcPattern*,FcResult*);
++ FcPattern* (*m_pFcFontSetMatch)(FcConfig*,FcFontSet**, int, FcPattern*,FcResult*);
FcBool (*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind);
FcBool (*m_pFcPatternAddInteger)(FcPattern*,const char*,int);
-+ FcBool (*m_pFcPatternAddBool)(FcPattern*,const char*,FcBool);
-+ FcBool (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*);
-+
++ FcBool (*m_pFcPatternAddBool)(FcPattern*,const char*,FcBool);
++ FcBool (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*);
FcBool (*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*);
void* loadSymbol( const char* );
-@@ -115,6 +124,7 @@
+@@ -114,6 +123,7 @@ public:
{ return m_pLib != NULL;}
FcConfig* getDefConfig() { return m_pDefConfig; }
@@ -662,7 +666,7 @@
FcBool FcInit()
{ return m_pFcInit(); }
-@@ -144,14 +154,28 @@
+@@ -143,14 +153,28 @@ public:
FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
{ return m_pFcFontList( pConfig, pPattern, pSet ); }
@@ -692,14 +696,14 @@
FcResult FcPatternGetString( const FcPattern* pPattern, const char* object, int n, FcChar8** s )
{ return m_pFcPatternGetString( pPattern, object, n, s ); }
-@@ -165,14 +189,17 @@
+@@ -164,12 +188,16 @@ public:
{ return m_pFcPatternGetBool( pPattern, object, n, s ); }
void FcDefaultSubstitute( FcPattern* pPattern )
{ m_pFcDefaultSubstitute( pPattern ); }
- FcPattern* FcFontMatch( FcConfig* pConfig, FcPattern* pPattern, FcResult* pResult )
- { return m_pFcFontMatch( pConfig, pPattern, pResult ); }
- FcPattern* FcFontSetMatch( FcConfig* pConfig, FcFontSet **ppFontSet, int nset, FcPattern* pPattern, FcResult* pResult )
- { return m_pFcFontSetMatch ? m_pFcFontSetMatch( pConfig, ppFontSet, nset, pPattern, pResult ) : 0; }
++ FcPattern* FcFontSetMatch(FcConfig* pConfig, FcFontSet** ppFontSet, int nset, FcPattern *pPattern, FcResult *pResult)
++ { return m_pFcFontSetMatch( pConfig, ppFontSet, nset, pPattern, pResult ); }
FcBool FcConfigSubstitute( FcConfig* pConfig, FcPattern* pPattern, FcMatchKind eKind )
{ return m_pFcConfigSubstitute( pConfig, pPattern, eKind ); }
FcBool FcPatternAddInteger( FcPattern* pPattern, const char* pObject, int nValue )
@@ -708,11 +712,10 @@
+ { return m_pFcPatternAddBool( pPattern, pObject, b ); }
+ FcBool FcPatternAddCharSet( FcPattern* pPattern, const char* pObject, const FcCharSet *c)
+ { return m_pFcPatternAddCharSet( pPattern, pObject, c ); }
-+
FcBool FcPatternAddString( FcPattern* pPattern, const char* pObject, const FcChar8* pString )
{ return m_pFcPatternAddString( pPattern, pObject, pString ); }
};
-@@ -189,7 +216,8 @@
+@@ -186,7 +214,8 @@ void* FontCfgWrapper::loadSymbol( const
FontCfgWrapper::FontCfgWrapper()
: m_pLib( NULL ),
@@ -722,7 +725,7 @@
{
#ifdef ENABLE_FONTCONFIG
OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libfontconfig.so.1" ) );
-@@ -223,12 +251,20 @@
+@@ -220,12 +249,20 @@ FontCfgWrapper::FontCfgWrapper()
loadSymbol( "FcPatternDestroy" );
m_pFcFontList = (FcFontSet*(*)(FcConfig*,FcPattern*,FcObjectSet*))
loadSymbol( "FcFontList" );
@@ -743,26 +746,26 @@
m_pFcPatternGetString = (FcResult(*)(const FcPattern*,const char*,int,FcChar8**))
loadSymbol( "FcPatternGetString" );
m_pFcPatternGetInteger = (FcResult(*)(const FcPattern*,const char*,int,int*))
-@@ -239,7 +275,6 @@
+@@ -236,12 +273,16 @@ FontCfgWrapper::FontCfgWrapper()
loadSymbol( "FcPatternGetBool" );
m_pFcDefaultSubstitute = (void(*)(FcPattern *))
loadSymbol( "FcDefaultSubstitute" );
- m_pFcFontMatch = (FcPattern*(*)(FcConfig*,FcPattern*,FcResult*))
- loadSymbol( "FcFontMatch" );
- m_pFcFontSetMatch = (FcPattern*(*)(FcConfig*,FcFontSet**,int,FcPattern*,FcResult*))
- loadSymbol( "FcFontSetMatch" );
-@@ -247,6 +282,10 @@
+- loadSymbol( "FcFontMatch" );
++ m_pFcFontSetMatch = (FcPattern*(*)(FcConfig*,FcFontSet**, int, FcPattern*,FcResult*))
++ loadSymbol( "FcFontSetMatch" );
+ m_pFcConfigSubstitute = (FcBool(*)(FcConfig*,FcPattern*,FcMatchKind))
loadSymbol( "FcConfigSubstitute" );
m_pFcPatternAddInteger = (FcBool(*)(FcPattern*,const char*,int))
loadSymbol( "FcPatternAddInteger" );
+ m_pFcPatternAddBool = (FcBool(*)(FcPattern*,const char*,FcBool))
-+ loadSymbol( "FcPatternAddBool" );
++ loadSymbol( "FcPatternAddBool" );
+ m_pFcPatternAddCharSet = (FcBool(*)(FcPattern*,const char*,const FcCharSet *))
-+ loadSymbol( "FcPatternAddCharSet" );
++ loadSymbol( "FcPatternAddCharSet" );
m_pFcPatternAddString = (FcBool(*)(FcPattern*,const char*,const FcChar8*))
loadSymbol( "FcPatternAddString" );
-@@ -258,17 +297,23 @@
+@@ -253,17 +294,23 @@ FontCfgWrapper::FontCfgWrapper()
m_pFcPatternCreate &&
m_pFcPatternDestroy &&
m_pFcFontList &&
@@ -787,7 +790,7 @@
m_pFcPatternAddString
) )
{
-@@ -286,10 +331,35 @@
+@@ -281,10 +328,35 @@ FontCfgWrapper::FontCfgWrapper()
osl_unloadModule( (oslModule)m_pLib );
m_pLib = NULL;
}
@@ -823,7 +826,7 @@
if( m_pLib )
osl_unloadModule( (oslModule)m_pLib );
}
-@@ -328,18 +398,7 @@
+@@ -319,18 +391,7 @@ bool PrintFontManager::initFontconfig()
if( ! rWrapper.isValid() )
return false;
@@ -843,7 +846,7 @@
if( pFSet )
{
-@@ -400,6 +459,8 @@
+@@ -373,6 +434,8 @@ bool PrintFontManager::initFontconfig()
);
#endif
@@ -852,7 +855,7 @@
// only outline fonts are usable to psprint anyway
if( eOutRes == FcResultMatch && ! outline )
continue;
-@@ -551,14 +612,6 @@
+@@ -515,14 +578,6 @@ bool PrintFontManager::initFontconfig()
}
}
@@ -867,7 +870,7 @@
// how does one get rid of the config ?
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "inserted %d fonts from fontconfig\n", nFonts );
-@@ -572,39 +625,14 @@
+@@ -536,39 +591,14 @@ void PrintFontManager::deinitFontconfig(
FontCfgWrapper::release();
}
@@ -911,7 +914,7 @@
{
case italic::Italic: nSlant = FC_SLANT_ITALIC;break;
case italic::Oblique: nSlant = FC_SLANT_OBLIQUE;break;
-@@ -613,10 +641,10 @@
+@@ -577,10 +607,10 @@ bool PrintFontManager::matchFont( FastPr
}
rWrapper.FcPatternAddInteger( pPattern, FC_SLANT, nSlant );
}
@@ -924,7 +927,7 @@
{
case weight::Thin: nWeight = FC_WEIGHT_THIN;break;
case weight::UltraLight: nWeight = FC_WEIGHT_ULTRALIGHT;break;
-@@ -633,10 +661,10 @@
+@@ -597,10 +627,10 @@ bool PrintFontManager::matchFont( FastPr
}
rWrapper.FcPatternAddInteger( pPattern, FC_WEIGHT, nWeight );
}
@@ -937,7 +940,7 @@
{
case width::UltraCondensed: nWidth = FC_WIDTH_ULTRACONDENSED;break;
case width::ExtraCondensed: nWidth = FC_WIDTH_EXTRACONDENSED;break;
-@@ -652,10 +680,10 @@
+@@ -616,10 +646,10 @@ bool PrintFontManager::matchFont( FastPr
}
rWrapper.FcPatternAddInteger( pPattern, FC_WIDTH, nWidth );
}
@@ -950,7 +953,7 @@
{
case pitch::Fixed: nSpacing = FC_MONO;break;
case pitch::Variable: nSpacing = FC_PROPORTIONAL;break;
-@@ -663,12 +691,123 @@
+@@ -627,12 +657,123 @@ bool PrintFontManager::matchFont( FastPr
break;
}
rWrapper.FcPatternAddInteger( pPattern, FC_SPACING, nSpacing );
@@ -1016,8 +1019,8 @@
+ // info: destroying the pSet destroys pResult implicitly
+ // since pResult was "added" to pSet
+ rWrapper.FcFontSetAdd( pSet, pResult );
-+ }
-+
+ }
+
+ if( pSet )
+ {
+ if( pSet->nfont > 0 )
@@ -1056,7 +1059,7 @@
+ aLang.append( rLocale.Country );
+ }
+ aLangAttrib = OUStringToOString( aLang.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
- }
++ }
+ if( aLangAttrib.getLength() )
+ rWrapper.FcPatternAddString( pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr() );
+
@@ -1065,7 +1068,7 @@
+ rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)aFamily.getStr() );
+
+ addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
-
++
rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchPattern );
rWrapper.FcDefaultSubstitute( pPattern );
FcResult eResult = FcResultNoMatch;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/sc-string-arg.diff new/ooo-build-2.0.2.7/patches/src680/sc-string-arg.diff
--- old/ooo-build-2.0.2.5/patches/src680/sc-string-arg.diff 2005-04-20 13:52:54.000000000 +0200
+++ new/ooo-build-2.0.2.7/patches/src680/sc-string-arg.diff 2006-04-13 15:34:12.000000000 +0200
@@ -1,22 +1,23 @@
--- sc/source/core/tool/interpr4.cxx 2005-04-14 09:50:06.000000000 +0530
+++ sc/source/core/tool/interpr4.cxx 2005-04-19 13:12:20.678272373 +0530
-@@ -283,8 +283,6 @@ double ScInterpreter::GetCellValueOrZero
+@@ -257,7 +257,7 @@ double ScInterpreter::GetCellValueOrZero
break;
case CELLTYPE_STRING:
case CELLTYPE_EDIT:
-#if 0
--// Xcl does it, but SUM(A1:A2) differs from A1+A2. No good.
++#if 1 /* JEG : re-enable because compatibility is more important than consistency for this */
+ // Xcl does it, but SUM(A1:A2) differs from A1+A2. No good.
{
String aStr;
- if ( eType == CELLTYPE_STRING )
-@@ -299,7 +297,6 @@ double ScInterpreter::GetCellValueOrZero
+@@ -268,7 +268,7 @@ double ScInterpreter::GetCellValueOrZero
+ sal_uInt32 nFIndex = 0; // damit default Land/Spr.
+ if ( !pFormatter->IsNumberFormat( aStr, nFIndex, fValue ) )
+ {
+- SetError(errNoValue);
++ SetError(errCellNoValue); /* CellNoValue is not really an error */
+ fValue = 0.0;
}
}
- break;
--#endif
- default:
- SetError(errCellNoValue);
- fValue = 0.0;
--- sc/source/core/tool/interpr1.cxx 2005-04-14 09:50:06.000000000 +0530
+++ sc/source/core/tool/interpr1.cxx 2005-04-19 12:08:07.486080311 +0530
@@ -2685,12 +2685,13 @@ double ScInterpreter::IterateParameters(
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/speed-ooqstart-options.diff new/ooo-build-2.0.2.7/patches/src680/speed-ooqstart-options.diff
--- old/ooo-build-2.0.2.5/patches/src680/speed-ooqstart-options.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/ooo-build-2.0.2.7/patches/src680/speed-ooqstart-options.diff 2006-04-12 17:03:44.000000000 +0200
@@ -0,0 +1,18 @@
+--- desktop/unx/source/start.c 2006-04-10 17:33:14.000000000 +0000
++++ desktop/unx/source/start.c 2006-04-12 13:29:35.000000000 +0000
+@@ -415,10 +415,13 @@ setup_args (int argc, char **argv, const
+
+ else if (arg_check (argv[i], "nologo") ||
+ arg_check (argv[i], "headless") ||
+- arg_check (argv[i], "invisible"))
++ arg_check (argv[i], "invisible") ||
++ arg_check (argv[i], "help") || arg_check (argv[i], "h") || arg_check (argv[i], "?") ||
++ arg_check (argv[i], "minimized"))
+ *inhibit_splash = TRUE;
+
+- else if (arg_check (argv[i], "-pt"))
++ else if (arg_check (argv[i], "pt") ||
++ arg_check (argv[i], "display"))
+ next_arg_not_filename = TRUE;
+ }
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/styles-dash.diff new/ooo-build-2.0.2.7/patches/src680/styles-dash.diff
--- old/ooo-build-2.0.2.5/patches/src680/styles-dash.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/ooo-build-2.0.2.7/patches/src680/styles-dash.diff 2006-04-13 18:46:21.000000000 +0200
@@ -0,0 +1,273 @@
+Index: xmloff/source/draw/ximpstyl.cxx
+===================================================================
+RCS file: /cvs/xml/xmloff/source/draw/ximpstyl.cxx,v
+retrieving revision 1.46
+retrieving revision 1.46.100.1
+diff -u -p -r1.46 -r1.46.100.1
+--- xmloff/source/draw/ximpstyl.cxx 9 Sep 2005 14:02:13 -0000 1.46
++++ xmloff/source/draw/ximpstyl.cxx 3 Apr 2006 12:24:56 -0000 1.46.100.1
+@@ -208,8 +208,7 @@ SvXMLImportContext *SdXMLDrawingPageProp
+
+ if( (nPrefix == XML_NAMESPACE_XLINK) && IsXMLToken( aLocalName, XML_HREF ) )
+ {
+- uno::Any aAny;
+- aAny <<= GetImport().GetAbsoluteReference( xAttrList->getValueByIndex(i) );
++ uno::Any aAny( GetImport().GetAbsoluteReference( xAttrList->getValueByIndex(i) ) );
+ XMLPropertyState aPropState( rProp.mnIndex, aAny );
+ rProperties.push_back( aPropState );
+ }
+@@ -392,10 +391,7 @@ void SdXMLDrawingPageStyleContext::FillP
+ xInfo = rPropSet->getPropertySetInfo();
+ if ( xInfo->hasPropertyByName( rPropertyName ) )
+ {
+- Any aAny;
+- aAny <<= sStyleName;
+-
+- rPropSet->setPropertyValue( rPropertyName, aAny );
++ rPropSet->setPropertyValue( rPropertyName, Any( sStyleName ) );
+ }
+ }
+ }
+@@ -1336,10 +1332,7 @@ void SdXMLStylesContext::SetMasterPageSt
+
+ if(GetSdImport().GetLocalDocStyleFamilies().is() && GetSdImport().GetLocalDocStyleFamilies()->hasByName(rMaster.GetDisplayName()))
+ {
+- uno::Any aAny(GetSdImport().GetLocalDocStyleFamilies()->getByName(rMaster.GetDisplayName()));
+- uno::Reference< container::XNameAccess > xMasterPageStyles;
+- aAny >>= xMasterPageStyles;
+-
++ uno::Reference< container::XNameAccess > xMasterPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(rMaster.GetDisplayName()), UNO_QUERY );
+ if(xMasterPageStyles.is())
+ {
+ ImpSetGraphicStyles(xMasterPageStyles, XML_STYLE_FAMILY_SD_PRESENTATION_ID, sPrefix);
+@@ -1385,7 +1378,6 @@ void SdXMLStylesContext::ImpSetGraphicSt
+ const UniString& rPrefix) const
+ {
+ xub_StrLen nPrefLen(rPrefix.Len());
+- uno::Any aAny;
+
+ sal_uInt32 a;
+
+@@ -1408,88 +1400,85 @@ void SdXMLStylesContext::ImpSetGraphicSt
+ const SvXMLStyleContext* pStyle = GetStyle(a);
+ if(nFamily == pStyle->GetFamily() && !pStyle->IsDefaultStyle())
+ {
+- const UniString aStyleName(pStyle->GetDisplayName(), (sal_uInt16)pStyle->GetDisplayName().getLength());
+- sal_uInt16 nStylePrefLen = aStyleName.SearchBackward( sal_Unicode('-') ) + 1;
+-
+- if(!nPrefLen || ((nPrefLen == nStylePrefLen) && aStyleName.Equals(rPrefix, 0, nPrefLen)))
++ OUString aStyleName(pStyle->GetDisplayName());
++ if( nPrefLen )
+ {
+- uno::Reference< style::XStyle > xStyle;
+- const OUString aPureStyleName = nStylePrefLen ?
+- pStyle->GetDisplayName().copy((sal_Int32)nStylePrefLen) : pStyle->GetDisplayName();
+-
+- if(xPageStyles->hasByName(aPureStyleName))
+- {
+- aAny = xPageStyles->getByName(aPureStyleName);
+- aAny >>= xStyle;
++ sal_Int32 nStylePrefLen = aStyleName.lastIndexOf( sal_Unicode('-') ) + 1;
++ if( (nPrefLen != nStylePrefLen) || (aStyleName.compareTo( rPrefix, nPrefLen ) != 0) )
++ continue;
+
+- // set properties of existing styles to default
+- uno::Reference< beans::XPropertySet > xPropSet( xStyle, uno::UNO_QUERY );
+- uno::Reference< beans::XPropertySetInfo > xPropSetInfo;
+- if( xPropSet.is() )
+- xPropSetInfo = xPropSet->getPropertySetInfo();
++ aStyleName = aStyleName.copy( nPrefLen );
++ }
+
+- uno::Reference< beans::XPropertyState > xPropState( xStyle, uno::UNO_QUERY );
++ uno::Reference< style::XStyle > xStyle;
++ if(xPageStyles->hasByName(aStyleName))
++ {
++ xPageStyles->getByName(aStyleName) >>= xStyle;
+
+- if( xPropState.is() )
++ // set properties of existing styles to default
++ uno::Reference< beans::XPropertySet > xPropSet( xStyle, uno::UNO_QUERY );
++ uno::Reference< beans::XPropertySetInfo > xPropSetInfo;
++ if( xPropSet.is() )
++ xPropSetInfo = xPropSet->getPropertySetInfo();
++
++ uno::Reference< beans::XPropertyState > xPropState( xStyle, uno::UNO_QUERY );
++
++ if( xPropState.is() )
++ {
++ UniReference < XMLPropertySetMapper > xPrMap;
++ UniReference < SvXMLImportPropertyMapper > xImpPrMap = GetImportPropertyMapper( nFamily );
++ DBG_ASSERT( xImpPrMap.is(), "There is the import prop mapper" );
++ if( xImpPrMap.is() )
++ xPrMap = xImpPrMap->getPropertySetMapper();
++ if( xPrMap.is() )
+ {
+- UniReference < XMLPropertySetMapper > xPrMap;
+- UniReference < SvXMLImportPropertyMapper > xImpPrMap = GetImportPropertyMapper( nFamily );
+- DBG_ASSERT( xImpPrMap.is(), "There is the import prop mapper" );
+- if( xImpPrMap.is() )
+- xPrMap = xImpPrMap->getPropertySetMapper();
+- if( xPrMap.is() )
++ const sal_Int32 nCount = xPrMap->GetEntryCount();
++ for( sal_Int32 i = 0; i < nCount; i++ )
+ {
+- const sal_Int32 nCount = xPrMap->GetEntryCount();
+- for( sal_Int32 i = 0; i < nCount; i++ )
++ const OUString& rName = xPrMap->GetEntryAPIName( i );
++ if( xPropSetInfo->hasPropertyByName( rName ) && beans::PropertyState_DIRECT_VALUE == xPropState->getPropertyState( rName ) )
+ {
+- const OUString& rName = xPrMap->GetEntryAPIName( i );
+- if( xPropSetInfo->hasPropertyByName( rName ) && beans::PropertyState_DIRECT_VALUE == xPropState->getPropertyState( rName ) )
+- {
+- xPropState->setPropertyToDefault( rName );
+- }
++ xPropState->setPropertyToDefault( rName );
+ }
+ }
+ }
+ }
+- else
+- {
+- // graphics style does not exist, create and add it
+- uno::Reference< lang::XMultiServiceFactory > xServiceFact(GetSdImport().GetModel(), uno::UNO_QUERY);
+- if(xServiceFact.is())
+- {
+- uno::Reference< style::XStyle > xNewStyle(
+- xServiceFact->createInstance(
+- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.Style"))),
+- uno::UNO_QUERY);
++ }
++ else
++ {
++ // graphics style does not exist, create and add it
++ uno::Reference< lang::XMultiServiceFactory > xServiceFact(GetSdImport().GetModel(), uno::UNO_QUERY);
++ if(xServiceFact.is())
++ {
++ uno::Reference< style::XStyle > xNewStyle(
++ xServiceFact->createInstance(
++ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.Style"))),
++ uno::UNO_QUERY);
+
+- if(xNewStyle.is())
+- {
+- // remember style
+- xStyle = xNewStyle;
++ if(xNewStyle.is())
++ {
++ // remember style
++ xStyle = xNewStyle;
+
+- // add new style to graphics style pool
+- uno::Reference< container::XNameContainer > xInsertContainer(xPageStyles, uno::UNO_QUERY);
+- if(xInsertContainer.is())
+- {
+- aAny <<= xStyle;
+- xInsertContainer->insertByName(aPureStyleName, aAny);
+- }
+- }
++ // add new style to graphics style pool
++ uno::Reference< container::XNameContainer > xInsertContainer(xPageStyles, uno::UNO_QUERY);
++ if(xInsertContainer.is())
++ xInsertContainer->insertByName(aStyleName, uno::Any( xStyle ) );
+ }
+ }
++ }
+
+- if(xStyle.is())
+- {
+- // set properties at style
+- XMLShapeStyleContext* pPropStyle =
+- (pStyle->ISA(XMLShapeStyleContext)) ? (XMLShapeStyleContext*)pStyle : 0L;
+- uno::Reference< beans::XPropertySet > xPropSet(xStyle, uno::UNO_QUERY);
++ if(xStyle.is())
++ {
++ // set properties at style
++ XMLShapeStyleContext* pPropStyle =
++ (pStyle->ISA(XMLShapeStyleContext)) ? (XMLShapeStyleContext*)pStyle : 0L;
++ uno::Reference< beans::XPropertySet > xPropSet(xStyle, uno::UNO_QUERY);
+
+- if(xPropSet.is() && pPropStyle)
+- {
+- pPropStyle->FillPropertySet(xPropSet);
+- pPropStyle->SetStyle(xStyle);
+- }
++ if(xPropSet.is() && pPropStyle)
++ {
++ pPropStyle->FillPropertySet(xPropSet);
++ pPropStyle->SetStyle(xStyle);
+ }
+ }
+ }
+@@ -1507,35 +1496,40 @@ void SdXMLStylesContext::ImpSetGraphicSt
+ {
+ const SvXMLStyleContext* pStyle = GetStyle(a);
+
+- if(pStyle && nFamily == pStyle->GetFamily())
++ if(pStyle && pStyle->GetName().getLength() && (nFamily == pStyle->GetFamily())) try
+ {
+- const UniString aStyleName(pStyle->GetDisplayName(), (sal_uInt16)pStyle->GetDisplayName().getLength());
+- sal_uInt16 nStylePrefLen = aStyleName.SearchBackward( sal_Unicode('-') ) + 1;
+-
+- if(pStyle->GetName().getLength() && (!nPrefLen || ((nPrefLen == nStylePrefLen) && aStyleName.Equals(rPrefix, 0, nPrefLen))))
++ OUString aStyleName(pStyle->GetDisplayName());
++ if( nPrefLen )
+ {
+- try
+- {
++ sal_Int32 nStylePrefLen = aStyleName.lastIndexOf( sal_Unicode('-') ) + 1;
++ if( (nPrefLen != nStylePrefLen) || (aStyleName.compareTo( rPrefix, nPrefLen ) != 0) )
++ continue;
+
+- uno::Reference< style::XStyle > xStyle;
+- const OUString aPureStyleName = nPrefLen ? pStyle->GetDisplayName().copy((sal_Int32)nPrefLen) : pStyle->GetDisplayName();
+- xPageStyles->getByName(aPureStyleName) >>= xStyle;
++ aStyleName = aStyleName.copy( nPrefLen );
++ }
+
+- if(xStyle.is())
+- {
+- // set parent style name
+- ::rtl::OUString sParentStyleDisplayName = const_cast< SvXMLImport& >( GetImport() ).GetStyleDisplayName( pStyle->GetFamily(), pStyle->GetParentName() );
+- xStyle->setParentStyle( sParentStyleDisplayName );
+- }
+- }
+- catch( Exception& e )
++ uno::Reference< style::XStyle > xStyle( xPageStyles->getByName(aStyleName), UNO_QUERY );
++ if(xStyle.is())
++ {
++ // set parent style name
++ ::rtl::OUString sParentStyleDisplayName( const_cast< SvXMLImport& >( GetImport() ).GetStyleDisplayName( pStyle->GetFamily(), pStyle->GetParentName() ) );
++ if( nPrefLen )
+ {
+- (void)e;
+- uno::Sequence<OUString> aSeq(0);
+- const_cast(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
++ sal_Int32 nStylePrefLen = sParentStyleDisplayName.lastIndexOf( sal_Unicode('-') ) + 1;
++ if( (nPrefLen != nStylePrefLen) || (sParentStyleDisplayName.compareTo( rPrefix, nPrefLen ) != 0) )
++ continue;
++
++ sParentStyleDisplayName = sParentStyleDisplayName.copy( nPrefLen );
+ }
++ xStyle->setParentStyle( sParentStyleDisplayName );
+ }
+ }
++ catch( Exception& e )
++ {
++ (void)e;
++ uno::Sequence<OUString> aSeq(0);
++ const_cast(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
++ }
+ }
+ }
+
+@@ -1603,8 +1597,7 @@ SvXMLImportContext* SdXMLMasterStylesCon
+ else
+ {
+ // existing page, use it
+- uno::Any aAny(xMasterPages->getByIndex(GetSdImport().GetNewMasterPageCount()));
+- aAny >>= xNewMasterPage;
++ xMasterPages->getByIndex(GetSdImport().GetNewMasterPageCount()) >>= xNewMasterPage;
+ }
+
+ // increment global import page counter
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/vcl-metacity-focus.diff new/ooo-build-2.0.2.7/patches/src680/vcl-metacity-focus.diff
--- old/ooo-build-2.0.2.5/patches/src680/vcl-metacity-focus.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/ooo-build-2.0.2.7/patches/src680/vcl-metacity-focus.diff 2006-04-10 20:50:52.000000000 +0200
@@ -0,0 +1,51 @@
+From: pl@openoffice.org
+To: cvs@gsl.openoffice.org
+Subject: [gsl-cvs] CVS update [cws_src680_vcl56]: /gsl/vcl/unx/gtk/window/
+
+Tag: cws_src680_vcl56
+User: pl
+Date: 06/03/16 04:28:11
+
+Modified:
+ /gsl/vcl/unx/gtk/window/
+ gtkframe.cxx
+
+Log:
+ #i63086# workaround another metacity bug
+
+File Changes:
+
+Directory: /gsl/vcl/unx/gtk/window/
+===================================
+
+File [changed]: gtkframe.cxx
+Url: http://gsl.openoffice.org/source/browse/gsl/vcl/unx/gtk/window/gtkframe.cxx?r1=1.42&r2=1.42.88.1
+Delta lines: +17 -3
+--------------------
+--- vcl/unx/gtk/window/gtkframe.cxx 25 Jan 2006 11:40:22 -0000 1.42
++++ vcl/unx/gtk/window/gtkframe.cxx 16 Mar 2006 12:28:08 -0000 1.42.88.1
+@@ -1005,6 +1005,20 @@
+ if( m_pParent && m_pParent->m_nWorkArea != m_nWorkArea )
+ getDisplay()->getWMAdaptor()->switchToWorkArea( m_pParent->m_nWorkArea );
+
++ if( isFloatGrabWindow() &&
++ m_pParent &&
++ m_nFloats == 0 &&
++ ! getDisplay()->GetCaptureFrame() )
++ {
++ /* #i63086#
++ * outsmart Metacity's "focus:mouse" mode
++ * which insists on taking the focus from the document
++ * to the new float. Grab focus to parent frame BEFORE
++ * showing the float (cannot grab it to the float
++ * before show).
++ */
++ m_pParent->grabPointer( TRUE, TRUE );
++ }
+ gtk_widget_show( GTK_WIDGET(m_pWindow) );
+ if( isFloatGrabWindow() )
+ {
+
+
+
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/src/Novell.dic new/ooo-build-2.0.2.7/src/Novell.dic
--- old/ooo-build-2.0.2.5/src/Novell.dic 2006-02-22 15:42:02.000000000 +0100
+++ new/ooo-build-2.0.2.7/src/Novell.dic 2006-04-13 15:34:13.000000000 +0200
@@ -14,6 +14,7 @@
NetMail
NetStorage
NetWare
+Novell
OnDemand
PolyServe
SecretStore
@@ -29,4 +30,6 @@
iManager
iPrint
Ximian
-SUSE
+SLES
+SLED
+SUSE
\ No newline at end of file
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...