diff options
| author | nobody <nobody@gnome.org> | 2005-03-18 17:03:14 +0000 |
|---|---|---|
| committer | nobody <nobody@gnome.org> | 2005-03-18 17:03:14 +0000 |
| commit | c62a0fd6046dc4d5bb34f6dd5184b356f0260a02 (patch) | |
| tree | 6e6c0d24ec9e26061de15ace0070882b3aff9bf9 | |
| parent | 8664279fbe156672917e85602bad7b74f1ffa078 (diff) | |
This commit was manufactured by cvs2svn to create tagOOO_BUILD_1_9_79_2_3
'OOO_BUILD_1_9_79_2_3'.
58 files changed, 2612 insertions, 3559 deletions
@@ -1,3 +1,77 @@ +ooo-build-1.9.79.2.3 + + + bug fixes + + more printing-related crashes (Michael) + + pspfontcache updating (Jan) + +ooo-build-1.9.79.2.2 + + + bug fixes + + XHTML export fix correction (Raul) + + more interoperability problems between 2.0 and 1.1 (Michael) + + mail merge defaults to Evo (Jayant, Michael) + + multiple components defining ColRowSettings (Michael) + + printing-related memory corruptions (Srinivasa, Michael) + + man page + + misc + + update custom images to version 13 (Michael) + +ooo-build-1.9.79.2.1 + + + bug fixes + + libwpd filter (Michael) + + spellcheck crasher (Michael) + + XHTML export (Raul) + + look of toolbar in several KDE styles (Jan) + + interoperability between 2.0 and 1.1.4 (Michael) + + XIM input method (Martin) + + size of some fields in create table wizard (Petr) + + URL handling in KDE fpicker (Jan) + + misc + + update crystal images to version 5 (Jan) + +ooo-build-1.9.79.2 + + + bug fixes + + many backported CWSs (Nicel, Rene, Michael) + + top left toolbar handle (Martin) + + linking with mozilla libs (Bernhard) + + bash completion (Petr) + + GNOME vfs (Caolan) + + GTK fpicker: + + constructor (Raul) + + case insensitive patterns (Michael) + + crash in Euro converter (Raul) + + allow saving xml files (Srinivasa) + + no send email dialog during crash recovery (Michael, Jayant) + + canvas polyline (Michael) + + do not show help button without related help (Michael) + + better font resolving in KDE vclplug (Jan) + + crash with double lock (Rene) + + wrong condition (Michael) + + Email attachement (Jayant) + + show popup on print error (Srinivasa) + + better window title (Raul,Michael) + + remove non-fuctional starformats from save dialogs + + wizards crash (Raul) + + a crash in impress (Michael,Shreyas,Jayant) + + better fonts for help (Petr) + + build bits + + preparing for m82 target (Bernhard) + + install dictionaries from ooinstall (Petr) + + build without dictionaries (Bernhard) + + disable qadevOOo (Rene) + + better check for system mozilla (Rene) + + build with java (Rene) + + allow to update default java CLASSPATH (Petr) + + various bulid fixes (Michael) + + documentation + + HelpButton and help (Michael) + + misc + + NovellTeam easteregg (Michael,Shreyas) + + new custom images, version 12 + + new crystal images, version 4 + ooo-build-1.9.79.1 + bug fixes diff --git a/bin/cws-extract b/bin/cws-extract index 0fc273e95..b2a750e1f 100755 --- a/bin/cws-extract +++ b/bin/cws-extract @@ -25,6 +25,6 @@ print STDERR "Modules: '" . join (",", @mod_list) . "'\n"; for my $module (@mod_list) { my $tag = "cws_src680_$cws"; my $anchor = uc ("$tag" . "_ANCHOR"); - print STDERR "cvs -d '$cvsroot' diff -kk -upN -r$anchor -r$tag $module >> $outfile 2>&1\n"; + print STDERR "cvs -d '$cvsroot' diff -kk -upN -w -r$anchor -r$tag $module >> $outfile 2>&1\n"; system ("cvs -d '$cvsroot' diff -kk -upN -r$anchor -r$tag $module >> $outfile 2>&1"); } diff --git a/bin/unpack b/bin/unpack index d173bbe40..8f6c39a28 100755 --- a/bin/unpack +++ b/bin/unpack @@ -166,3 +166,6 @@ if test "x$OOO_EXTRA_ARTWORK" != "x"; then cd $OOBUILDDIR tar xjf $SRCDIR/$OOO_EXTRA_ARTWORK || exit 1; fi + +echo "Copying default evolution database into tree" +cp -af $SRCDIR/evolocal.odb $OOBUILDDIR/extras/source/database diff --git a/configure.in b/configure.in index 57eba0977..fae2c41fc 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ OOO_BUILDMAJOR_VERSION=1 OOO_BUILDMINOR_VERSION=9 OOO_BUILDMICRO_VERSION=79 dnl this includes pre-pended period. -OOO_BUILDSTRIKE_VERSION=.1 +OOO_BUILDSTRIKE_VERSION=.2.3 OOO_BUILDVERSION="$OOO_BUILDMAJOR_VERSION.$OOO_BUILDMINOR_VERSION.$OOO_BUILDMICRO_VERSION$OOO_BUILDSTRIKE_VERSION" AM_INIT_AUTOMAKE(ooo-build, $OOO_BUILDVERSION) @@ -500,9 +500,9 @@ if test "$enable_gtk" != "no"; then fi fi fi -OOO_CUSTOM_IMAGES=ooo_custom_images-12.tar.bz2 +OOO_CUSTOM_IMAGES=ooo_custom_images-13.tar.bz2 OOO_EXTRA_ARTWORK=extras-1.tar.bz2 -OOO_CRYSTAL_IMAGES=ooo_crystal_images-3.tar.bz2 +OOO_CRYSTAL_IMAGES=ooo_crystal_images-5.tar.bz2 AC_SUBST(OOO_CUSTOM_IMAGES) AC_SUBST(OOO_EXTRA_ARTWORK) AC_SUBST(OOO_CRYSTAL_IMAGES) @@ -626,7 +626,6 @@ fonts/Makefile patches/Makefile patches/evo2/Makefile patches/src680/Makefile -patches/src680-m78/Makefile patches/src680-m79/Makefile po/Makefile doc/Makefile diff --git a/doc/fontcrash.txt b/doc/fontcrash.txt new file mode 100644 index 000000000..d5ed4473f --- /dev/null +++ b/doc/fontcrash.txt @@ -0,0 +1,100 @@ +Changed files: +namespacing: sc/inc/scextopt.hxx + sc/source/filter/ + +corrupt.doc fails to load independant of linkoo + +Valgrind can't do much on the stack: allocating on the heap instead gives: + +~RootData 0x2354ce58 +==11251== +==11251== Invalid read of size 2 +==11251== at 0x24579381: XclRoot::GetCharSet() const (xlroot.hxx:179) +==11251== by 0x2456370F: ImportExcel8::~ImportExcel8() (excimp8.cxx:186) +==11251== by 0x245597E3: _STL::auto_ptr<ImportExcel>::~auto_ptr() (_auto_ptr.h:109) +==11251== by 0x24558FF8: ScImportExcel(SfxMedium&, ScDocument*, EXCIMPFORMAT) (excel.cxx:235) +==11251== by 0x240B91E2: ScDocShell::ConvertFrom(SfxMedium&) (in /opt/OpenOffice/src680-m79/sc/unxlngi4.pro/lib/libsc680li.so) +==11251== by 0x1FB9EBFD: SfxObjectShell::DoLoad(SfxMedium*) (in /opt/OpenOffice/src680-m79/sfx2/unxlngi4.pro/lib/libsfx680li.so) +... +==11251== Address 0x2493514C is 36 bytes inside a block of size 160 free'd +==11251== at 0x1B902391: free (vg_replace_malloc.c:153) +==11251== by 0x1C77D7C9: rtl_freeMemory_SYSTEM (alloc.c:1457) +==11251== by 0x1C77D80C: rtl_freeMemory (alloc.c:1468) +==11251== by 0x80A95BE: (within /opt/OOInstall/program/soffice.bin) +==11251== by 0x80A9626: operator delete(void*) (in /opt/OOInstall/program/soffice.bin) +==11251== by 0x24622457: XclImpRootData::~XclImpRootData() (xiroot.cxx:108) +==11251== by 0x24558FEA: ScImportExcel(SfxMedium&, ScDocument*, EXCIMPFORMAT) (excel.cxx:235) +==11251== by 0x240B91E2: ScDocShell::ConvertFrom(SfxMedium&) (in /opt/OpenOffice/src680-m79/sc/unxlngi4.pro/lib/libsc680li.so) +==11251== by 0x1FB9EBFD: SfxObjectShell::DoLoad(SfxMedium*) (in /opt/OpenOffice/src680-m79/sfx2/unxlngi4.pro/lib/libsfx680li.so) +==11251== by 0x1FBE6BB9: SfxBaseModel::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (in /opt/OpenOffice/src680-m79/sfx2/unxlngi4.pro/lib/libsfx680li.so) +==11251== by 0x23B92B0C: OCommonEmbeddedObject::CreateDocFromMediaDescr_Impl(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (in /opt/OpenOffice/src680-m79/embeddedobj/unxlngi4.pro/lib/libembobj.so) +==11251== by 0x23B94057: _ZN21OCommonEmbeddedObject18setPersistentEntryERKN3com3sun4star3uno9ReferenceINS2_5embed8XStorageEEERKN3rtl8OUStringElRKNS3_8SequenceINS2_5beans13PropertyValueEEESJ_ (in /opt/OpenOffice/src680-m79/embeddedobj/unxlngi4.pro/lib/libembobj.so) +==11251== by 0x23BA0B06: _ZN24OOoEmbeddedObjectFactory37createInstanceInitFromMediaDescriptorERKN3com3sun4star3uno9ReferenceINS2_5embed8XStorageEEERKN3rtl8OUStringERKNS3_8SequenceINS2_5beans13PropertyValueEEESJ_ (in /opt/OpenOffice/src680-m79/embeddedobj/unxlngi4.pro/lib/libembobj.so) +==11251== by 0x23B9D9A1: _ZN24UNOEmbeddedObjectCreator37createInstanceInitFromMediaDescriptorERKN3com3sun4star3uno9ReferenceINS2_5embed8XStorageEEERKN3rtl8OUStringERKNS3_8SequenceINS2_5beans13PropertyValueEEESJ_ (in /opt/OpenOffice/src680-m79/embeddedobj/unxlngi4.pro/lib/libembobj.so) +==11251== by 0x1C574433: comphelper::EmbeddedObjectContainer::InsertEmbeddedObject(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, rtl::OUString&) (in /opt/OpenOffice/src680-m79/comphelper/unxlngi4.pro/lib/libcomphelp4gcc3.so) +==11251== by 0x21926154: SvxMSDffManager::CheckForConvertToSOObj(unsigned long, SotStorage&, com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, Graphic const&) (in /opt/OpenOffice/src680-m79/svx/unxlngi4.pro/lib/libsvx680li.so) +==11251== +==11251== Invalid read of size 4 +==11251== at 0x24537E29: XclRoot::GetDoc() const (xlroot.hxx:218) +==11251== by 0x2456370F: ImportExcel8::~ImportExcel8() (excimp8.cxx:186) +==11251== by 0x245597E3: _STL::auto_ptr<ImportExcel>::~auto_ptr() (_auto_ptr.h:109) +==11251== by 0x24558FF8: ScImportExcel(SfxMedium&, ScDocument*, EXCIMPFORMAT) (excel.cxx:235) +==11251== by 0x240B91E2: ScDocShell::ConvertFrom(SfxMedium&) (in /opt/OpenOffice/src680-m79/sc/unxlngi4.pro/lib/libsc680li.so) +... +==11251== Address 0x2493513C is 20 bytes inside a block of size 160 free'd +==11251== at 0x1B902391: free (vg_replace_malloc.c:153) +==11251== by 0x1C77D7C9: rtl_freeMemory_SYSTEM (alloc.c:1457) +==11251== by 0x1C77D80C: rtl_freeMemory (alloc.c:1468) +==11251== by 0x80A95BE: (within /opt/OOInstall/program/soffice.bin) +==11251== by 0x80A9626: operator delete(void*) (in /opt/OOInstall/program/soffice.bin) +==11251== by 0x24622457: XclImpRootData::~XclImpRootData() (xiroot.cxx:108) +==11251== by 0x24558FEA: ScImportExcel(SfxMedium&, ScDocument*, EXCIMPFORMAT) (excel.cxx:235) +==11251== by 0x240B91E2: ScDocShell::ConvertFrom(SfxMedium&) (in /opt/OpenOffice/src680-m79/sc/unxlngi4.pro/lib/libsc680li.so) + +This is really all from: + +ImportExcel::~ImportExcel( void ) +{ + GetDoc().SetSrcCharSet( GetCharSet() ); + + delete pExtNameBuff; + + delete pOutlineListBuffer; + + delete pFormConv; +} + +Getting the order of freeing stuff right is critical. + +Secondly: + +==16434== Invalid free() / delete / delete[] +==16434== at 0x1B902391: free (vg_replace_malloc.c:153) +==16434== by 0x1C77D7C9: rtl_freeMemory_SYSTEM (alloc.c:1457) +==16434== by 0x1C77D80C: rtl_freeMemory (alloc.c:1468) +==16434== by 0x80A95BE: (within /opt/OOInstall/program/soffice.bin) +==16434== by 0x80A9626: operator delete(void*) (in /opt/OOInstall/program/soffice.bin) +==16434== by 0x2463F7EF: _STL::auto_ptr<RootData>::~auto_ptr() (_auto_ptr.h:109) +==16434== by 0x2463E129: XclRootData::~XclRootData() (xlroot.cxx:200) +==16434== by 0x24622624: XclImpRootData::~XclImpRootData() (xiroot.cxx:107) +==16434== by 0x24559000: ScImportExcel(SfxMedium&, ScDocument*, EXCIMPFORMAT) (excel.cxx:241) +==16434== by 0x240B91E2: ScDocShell::ConvertFrom(SfxMedium&) (in /opt/OpenOffice/src680-m79/sc/unxlngi4.pro/lib/libsc680li.so) +... +==16434== Address 0x2497CDB0 is 0 bytes inside a block of size 96 free'd +==16434== at 0x1B902391: free (vg_replace_malloc.c:153) +==16434== by 0x1C77D7C9: rtl_freeMemory_SYSTEM (alloc.c:1457) +==16434== by 0x1C77D80C: rtl_freeMemory (alloc.c:1468) +==16434== by 0x80A95BE: (within /opt/OOInstall/program/soffice.bin) +==16434== by 0x80A96FC: operator delete[](void*) (in /opt/OOInstall/program/soffice.bin) +==16434== by 0x22EA9E84: ColRowSettings::~ColRowSettings() (in /opt/OpenOffice/src680-m79/sw/unxlngi4.pro/lib/libsw680li.so) +==16434== by 0x24579334: _STL::auto_ptr<ColRowSettings>::~auto_ptr() (_auto_ptr.h:109) +==16434== by 0x24578E4F: OutlineDataBuffer::~OutlineDataBuffer() (impop.cxx:1692) +==16434== by 0x24579D10: ScfDelList<OutlineDataBuffer>::Clear() (ftools.hxx:457) +==16434== by 0x24579CA6: ScfDelList<OutlineDataBuffer>::~ScfDelList() (ftools.hxx:451) +==16434== by 0x245744C8: ImportExcel::~ImportExcel() (impop.cxx:263) +==16434== by 0x24563727: ImportExcel8::~ImportExcel8() (excimp8.cxx:186) +==16434== by 0x2455983F: _STL::auto_ptr<ImportExcel>::reset(ImportExcel*) (_auto_ptr.h:56) +==16434== by 0x24558F68: ScImportExcel(SfxMedium&, ScDocument*, EXCIMPFORMAT) (excel.cxx:233) +==16434== by 0x240B91E2: ScDocShell::ConvertFrom(SfxMedium&) (in /opt/OpenOffice/src680-m79/sc/unxlngi4.pro/lib/libsc680li.so) + +ie. the XclRoot derived object is freeing it's parent via a derived autoptr. diff --git a/man/openoffice.1.in b/man/openoffice.1.in index 33ffa5c69..5c9e03335 100644 --- a/man/openoffice.1.in +++ b/man/openoffice.1.in @@ -1,26 +1,57 @@ -.TH openoffice "1" "2002-11-11" "OpenOffice.org 1.0.1" "User Commands" +.TH ooffice "1" "2005-03-16" "OpenOffice.org 2.0-pre" "User Commands" .SH "Name" -openoffice@BINSUFFIX@ \- OpenOffice.org office suite +ooffice@BINSUFFIX@ \- OpenOffice.org office suite .SH SYNOPSIS -.B openoffice@BINSUFFIX@ -[\-accept=] [\-display DISPLAYNAME] [\-invisible] [\-minimized] -[\-norestore] [\-p] [\-pt] [\-quickstart] [\-server] [\-terminate_after_init] -[FILE]... -.br .B ooffice@BINSUFFIX@ +[\fB\-\-version\fR] [\fB\-\-widgets\-set\fI widgetsset\fR] +[\fB\-accept\=\fIaccept\-string\fR] [\fB\-calc\fR] [\fB\-display \fIdisplay\fR] +[\fB\-draw\fR] [\fB\-global\fR] [\fB\-headless\fR] +[\fB\-help\fR|\fB\-h\fR|\fB\-?\fR] [\fB\-impress\fR] [\fB\-invisible\fR] +[\fB\-math\fR] [\fB\-minimized\fR] [\fB\-n \fIfilename\fR] [\fB\-nodefault\fR] +[\fB\-nolockcheck\fR] [\fB\-nologo\fR] [\fB\-norestore\fR] +[\fB\-o \fIfilename\fR] [\fB\-p \fIfilename\fR...] +[\fB\-pt \fIprintername\fR \fIfilename\fR...] [\fB\-quickstart\fR] +[\fB\-show \fIpresentation\fR] [\fB\-unaccept=\fIaccept\-sring\fR] +[\fB\-terminate_after_init\fR] [\fB\-view \fIfilename\fR] [\fB\-web\fR] +[\fB\-writer\fR] [\fIfilename\fR...] +.br +.B oobase@BINSUFFIX@ .br .B oocalc@BINSUFFIX@ .br .B oodraw@BINSUFFIX@ .br -.B oohtml@BINSUFFIX@ +.B oofromtemplate@BINSUFFIX@ .br .B ooimpress@BINSUFFIX@ .br .B oomath@BINSUFFIX@ .br +.B ooweb@BINSUFFIX@ +.br .B oowriter@BINSUFFIX@ +.br +Obsolete: +.br +.B OOo@BINSUFFIX@ +.br +.B OOo\-wrapper@BINSUFFIX@ +.br +.B OOo\-calc@BINSUFFIX@ +.br +.B OOo\-impress@BINSUFFIX@ +.br +.B OOo\-math@BINSUFFIX@ +.br +.B OOo\-padmin@BINSUFFIX@ +.br +.B OOo\-setup@BINSUFFIX@ +.br +.B OOo\-template@BINSUFFIX@ +.br +.B OOo\-web@BINSUFFIX@ +.br .SH DESCRIPTION OpenOffice.org is a fully featured office suite for the daily use with all features you'd normally expect in a office suite. @@ -28,51 +59,110 @@ features you'd normally expect in a office suite. This script runs OpenOffice with the arguments <args> given on the command line There are also some wrapper scripts in /usr/bin which are calling the "normal" -openoffice script and run the wanted OpenOffice.org module. +ooffice script and run the wanted OpenOffice.org module. + +Do not use the obsolete wrappers, please. They will be removed in a future release +of the product. .SH OPTIONS +These arguments are processed by the wrapper itself. +.TP +\fB\-\-version\fR +This option displays the version of this OpenOffice.org build. +.TP +\fB\-\-widgets\-set \fIwidgetsset\fR +This option allows to start the application with an other widgets set. +Note that the support for \fIgtk\fR resp. \fIkde\fR widgets set is +included in the package \fIOpenOffice_org\-gnome\fR resp. +\fIOpenOffice_org\-kde\fR. +.TP + These arguments are passed directly to the real start binary by the wrapper. .TP -\fB[FILE]...\fR -Files to operate on. Opening them is the default behaviour, which can be +\fIfilename\fR... +Files to operate on. Opening them is the default behavior, which can be influenced by command line arguments. \fB\-p\fP will print the files instead. .TP -\fB\-accept=\fR -This command line parameter provides an uno accept string to the -office. The accept string is used to create an acceptor thread. +\fB\-accept=\fIaccept\-string\fR +Notifies the OpenOffice.org software that upon the creation of "UNO Acceptor +Threads", a "UNO Accept String" will be used. +.TP +\fB\-calc\fR +Starts with an empty Calc document. +.TP +\fB\-display \fIdisplay\fR +This option specifies the X server to contact; see \fBX\fR(7) +.TP +\fB\-draw\fR +Starts with an empty Draw document. +.TP +\fB\-global\fR +Starts with an empty Global document. +.TP +\fB\-headless\fR +Starts in "headless mode", which allows using the application without user +interface. -"socket," = Uses the socket implementation to create an acceptor. -Currently used by scripting clients to access the OpenOffice.org API. +This special mode can be used when the application is controlled by external +clients via the API. .TP -\fB\-display \fIDISPLAYNAME\fR -This option specifies the X server to contact; see \fBX\fR(7x) +\fB\-help\fR|\fB\-h\fR|\fB\-?\fR +Lists the available OOo\-native command line parameters to the console. .TP -\fB\-invisible\fB -The office doesn't show the intro bitmap during startup and doesn't -open the first default document. After startup there is no visible UI -although using the Office API it is possible to open visible -documents/dialogs. The only way to shutdown the office is through the -Office API or using the task manager / kill command. +\fB\-impress\fR +Starts with an empty Impress document. +.TP +\fB\-invisible\fR +Starts in invisible mode. + +Neither the start\-up logo nor the initial program window will be visible. +However, the OpenOffice.org software can be controlled and documents and +dialogs opened via the API. + +When the OpenOffice.org software has been started with this parameter, it can +only be ended using the taskmanager (Windows) or the kill command +(UNIX based systems). + +It cannot be used in conjunction with \-quickstart. +.TP +\fB\-math\fR +Starts with an empty Math document. .TP \fB\-minimized\fR -This argument only controls the visibility of the intro bitmap during startup. -There is no code that minimizes the first window after startup. -If you never want the intro to show up, you can set Logo=0 in -\fI/etc/openoffice/sofficerc\fP +Starts minimized. The splash screen is not displayed. +.TP +\fB\-n \fIfilename\fR +Creates a new document using \fIfilename\fR as a template. +.TP +\fB\-nodefault\fR +Opens the backing window. The backing window opens also when you call +\fBooffice\fR wrapper without any start parameter. +.TP +\fB\-nolockcheck\fR +Disables the check for remote instances using the installation. +.TP +\fB\-nologo\fR +Disables the splash screen at program start. .TP \fB\-norestore\fR -Don't restart office and restore all opened documents automatically after an -exception. It is possible OOo will try to restore a file it keeps crashing on, -if that happens \-norestore is the only way to start OOo. +Disables restart and file recovery after a system crash. It is possible OOo +will try to restore a file it keeps crashing on, if that happens \fB\-norestore\fR +is the only way to start OOo. .TP -\fB\-p ...\fR -.br -"Print" command to print all following files on the default printer. -The office doesn't show the intro bitmap during startup. +\fB\-o \fIfilename\fR +Opens \fIfilename\fR for editing, even if it is a template. .TP -\fB\-pt ...\fR -"Print to" command to specify an additional printer for output. The -office doesn't show the intro bitmap during startup. +\fB\-p \fIfilename\fR... +Prints the given files to the default printer and ends. The splash screen +does not appear. + +If the file name contains spaces, then it must be enclosed in quotation marks. +.TP +\fB\-pt \fIprintername\fR \fIfilename\fR... +Prints the given files to the printer \fIprintername\fR and ends. The splash +screen does not appear. + +If the file name contains spaces, then it must be enclosed in quotation marks. .TP \fB\-quickstart\fR Specifies that the quickstarter service should be activated during @@ -80,37 +170,35 @@ startup. The office doesn't show the intro bitmap during startup. If you use this option for a 2nd office this command is send to the running office and activates the quickstarter. .TP -\fB\-server\fR -This argument is like -invisible, additionally the ucb component is -configured using the configuration key -/org.openoffice.ucb.Configuration/ContentProviders/['Server']/SecondaryKeys/['Office']/ProviderData -instead of -/org.openoffice.ucb.Configuration/ContentProviders/['Local']/SecondaryKeys/['Office']/ProviderData -to support a remote file system. This configuration data is NOT included -in OpenOffice so normally you cannot use it. Please use -invisible -instead. +\fB\-show \fIpresentation\fR +Starts with the given Impress file and starts the presentation. Enters edit +mode after the presentation. +.TP +\fB\-unaccept=\fIaccept\-sring\fR +Closes an acceptor that was created with \fB\-accept\fR option. -There are some limitations for this command line argument. All "open", -"print", "print to" commands on the command line are ignored. No default -document is opened. After startup there is no visible UI although using -the Office API it is possible to open visible documents/dialogs. The -only way to shutdown the office is through the Office API or using the -task manager / kill command. +Use \fB\-unnaccept\fR=\fIall\fR to close all open acceptors. .TP \fB\-terminate_after_init\fR The office terminates after it registers some uno services. The office doesn't show the intro bitmap during startup. +.TP +\fB\-view \fIfilename\fR +Creates a temporary copy of the given file and opens it read\-only. +.TP +\fB\-web\fR +Starts with an empty HTML document. +.TP +\fB\-writer\fR +Starts with an empty Writer document. .SH TROUBLESHOOTING PROBLEMS If OOo crashes, you should get a GUI bug reporting tool, please use -that to file a helpful bug report, or see http://ooo.ximian.com/hackers-guide.html +that to file a helpful bug report, or see \fBhttp://go\-ooo.org/hackers\-guide.html\fR for more information on debugging OOo. -.SH FILES -.TP -\fI/etc/openoffice/\fP .SH SEE ALSO -.BR http://ooo.ximian.com/ +.BR http://go\-ooo.org/ .SH AUTHOR This manual page was created by Rene Engelhard <rene@debian.org> for the Debian GNU/Linux Distribution, because the original package does not have -one. +one. It was updated for Novell by Petr Mladek <pmladek@suse.cz>. diff --git a/patches/Makefile.am b/patches/Makefile.am index 20295b24e..37a120527 100644 --- a/patches/Makefile.am +++ b/patches/Makefile.am @@ -1,7 +1,6 @@ SUBDIRS=\ evo2 \ src680 \ - src680-m78 \ src680-m79 EXTRA_DIST=README apply.pl order $(wildcard *.diff) diff --git a/patches/OOO_1_1/.cvsignore b/patches/OOO_1_1/.cvsignore deleted file mode 100644 index 282522db0..000000000 --- a/patches/OOO_1_1/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/patches/OOO_1_1/Makefile.am b/patches/OOO_1_1/Makefile.am deleted file mode 100644 index c0f3d72f5..000000000 --- a/patches/OOO_1_1/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = $(wildcard *.diff) $(wildcard *.patch) diff --git a/patches/OOO_1_1/gui-interop-warnings.diff b/patches/OOO_1_1/gui-interop-warnings.diff deleted file mode 100644 index 1a7d1aaf4..000000000 --- a/patches/OOO_1_1/gui-interop-warnings.diff +++ /dev/null @@ -1,181 +0,0 @@ -diff -u -r1.2 misccfg.hxx ---- svtools/inc/misccfg.hxx -+++ svtools/inc/misccfg.hxx -@@ -76,6 +76,8 @@ - BOOL bPaperOrientation; - BOOL bNotFound; - sal_Int32 nYear2000; // two digit year representation -+ BOOL bSaveAsNative; -+ BOOL bShowLoss; - - const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames(); - void Load(); -@@ -100,6 +102,11 @@ - sal_Int32 GetYear2000() const { return nYear2000; } - void SetYear2000( sal_Int32 nSet ); - -+ // Interop warnings -+ BOOL IsSaveAsNativeWarning() const { return bSaveAsNative; } -+ void SetSaveAsNativeWarning( BOOL bSet ); -+ BOOL IsShowLossOfInformation() const { return bShowLoss; } -+ void SetShowLossOfInformation( BOOL bSet ); - }; - - #endif // _MISCCFG_HXX - - -diff -u -r1.2 misccfg.cxx ---- svtools/source/config/misccfg.cxx -+++ svtools/source/config/misccfg.cxx -@@ -138,6 +138,20 @@ - SetModified(); - nYear2000 = nSet; - } -+ -+void SfxMiscCfg::SetSaveAsNativeWarning( BOOL bSet ) -+{ -+ if(!bSaveAsNative != !bSet) -+ SetModified(); -+ bSaveAsNative = bSet; -+} -+void SfxMiscCfg::SetShowLossOfInformation( BOOL bSet ) -+{ -+ if(!bShowLoss != !bSet) -+ SetModified(); -+ bShowLoss = bSet; -+} -+ - /* -----------------------------02.03.01 15:31-------------------------------- - - ---------------------------------------------------------------------------*/ -@@ -152,8 +166,10 @@ - "Print/Warning/PaperOrientation", // 1 - "Print/Warning/NotFound", // 2 - "DateFormat/TwoDigitYear", // 3 -+ "Filter/Warning/SaveAsNative", // 4 -+ "Filter/Warning/ShowLossOfInformation" // 5 - }; -- const int nCount = 4; -+ const int nCount = 6; - aNames.realloc(nCount); - OUString* pNames = aNames.getArray(); - for(int i = 0; i < nCount; i++) -@@ -183,6 +199,8 @@ - case 1: bPaperOrientation = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/PaperOrientation", - case 2: bNotFound = *(sal_Bool*)pValues[nProp].getValue() ; break; //"Print/Warning/NotFound", - case 3: pValues[nProp] >>= nYear2000;break; //"DateFormat/TwoDigitYear", -+ case 4: bSaveAsNative = *(sal_Bool *)pValues[nProp].getValue(); break; //"Filter/Warning/SaveAsNative", -+ case 5: bShowLoss = *(sal_Bool *)pValues[nProp].getValue(); break; //"Filter/Warning/ShowLossOfInformation" - } - } - } -@@ -214,6 +232,8 @@ - case 1: pValues[nProp].setValue(&bPaperOrientation, rType);break; //"Print/Warning/PaperOrientation", - case 2: pValues[nProp].setValue(&bNotFound, rType);break; //"Print/Warning/NotFound", - case 3: pValues[nProp] <<= nYear2000;break; //"DateFormat/TwoDigitYear", -+ case 4: pValues[nProp].setValue(&bSaveAsNative, rType); break; //"Filter/Warning/SaveAsNative", -+ case 5: pValues[nProp].setValue(&bShowLoss, rType); break; //"Filter/Warning/ShowLossOfInformation" - } - } - PutProperties(aNames, aValues); - ---- sfx2/source/doc/objserv.cxx -+++ sfx2/source/doc/objserv.cxx -@@ -190,6 +190,7 @@ - #include "doc.hrc" - #include "docfac.hxx" - #include "fcontnr.hxx" -+#include "misccfg.hxx" - #include "filedlghelper.hxx" - #include "sfxhelp.hxx" - #include "msgpool.hxx" -@@ -973,13 +974,17 @@ - while ( pFrame && (pFrame->GetFrameType() & SFXFRAME_SERVER ) ) - pFrame = SfxViewFrame::GetNext( *pFrame, this ); - -- if ( pFrame ) -+ SfxApplication *pSfxApp = SFX_APP(); -+ -+ if ( pFrame && pSfxApp && pSfxApp->GetMiscConfig()->IsSaveAsNativeWarning() ) - { - SfxFrame* pTop = pFrame->GetTopFrame(); - SFX_APP()->SetViewFrame( pTop->GetCurrentViewFrame() ); - pFrame->GetFrame()->Appear(); - - QueryBox aWarnBox(&pFrame->GetWindow(),WB_YES_NO_CANCEL|WB_DEF_YES,aWarn); -+ aWarnBox.SetDefaultCheckBoxText(); -+ aWarnBox.SetCheckBoxState( FALSE ); - switch(aWarnBox.Execute()) - { - case RET_YES: -@@ -999,6 +1004,7 @@ - return; - } - -+ pSfxApp->GetMiscConfig()->SetSaveAsNativeWarning( !aWarnBox.GetCheckBoxState() ); - pImp->bDidWarnFormat=TRUE; - } - } - ---- sfx2/source/doc/objxtor.cxx -+++ sfx2/source/doc/objxtor.cxx -@@ -153,6 +153,7 @@ - #include "scriptcont.hxx" - #include "imgmgr.hxx" - #include "tbxconf.hxx" -+#include "misccfg.hxx" - #include "accmgr.hxx" - #include "helpid.hrc" - -@@ -618,14 +619,19 @@ - if( pIgnoreInformationLost && pIgnoreInformationLost->GetValue() ) - bUI = sal_False; - } -- if ( bUI && !bClose && IsInformationLost() ) -+ -+ if ( bUI && !bClose && IsInformationLost() && pSfxApp->GetMiscConfig()->IsShowLossOfInformation() ) - { - // minimierte restoren - SfxFrame* pTop = pFrame->GetTopFrame(); - pSfxApp->SetViewFrame( pTop->GetCurrentViewFrame() ); - pFrame->GetFrame()->Appear(); - QueryBox aBox( &pFrame->GetWindow(), SfxResId(MSG_CONFIRM_FILTER)); -- if ( RET_NO == aBox.Execute() ) -+ aBox.SetDefaultCheckBoxText(); -+ aBox.SetCheckBoxState( FALSE ); -+ int ret = aBox.Execute(); -+ pSfxApp->GetMiscConfig()->SetShowLossOfInformation( !aBox.GetCheckBoxState() ); -+ if ( ret == RET_NO ) - return sal_False; - } - - ---- officecfg/registry/schema/org/openoffice/Office/Common.xcs 2004-09-01 13:17:57.531731760 +0100 -+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2004-09-01 13:17:17.176866632 +0100 -@@ -22632,5 +22632,25 @@ - </info> -+ <group oor:name="Warning"> -+ <info> -+ <author>mmeeks</author> -+ <desc xml:lang="en-US">Whether to warn in various scenarios.</desc> -+ </info> -+ <prop oor:name="SaveAsNative" oor:type="xs:boolean"> -+ <info> -+ <author>mmeeks</author> -+ <desc xml:lang="en-US">Specifies whether to warn if not saving as native.</desc> -+ </info> -+ <value>true</value> -+ </prop> -+ <prop oor:name="ShowLossOfInformation" oor:type="xs:boolean"> -+ <info> -+ <author>mmeeks</author> -+ <desc xml:lang="en-US">Specifies whether to warn of potential information loss.</desc> -+ </info> -+ <value>true</value> -+ </prop> -+ </group> - <group oor:name="Microsoft"> - <info> - <author>SJ</author> -- <desc xml:lang="en-US">Specifies default settings of Microsoft filters.</desc> -+ <desc xml:lang="en-US">Specifies default settings of Microsoft filters.</desc> <!-- dummy --> diff --git a/patches/OOO_1_1_3/.cvsignore b/patches/OOO_1_1_3/.cvsignore deleted file mode 100644 index 282522db0..000000000 --- a/patches/OOO_1_1_3/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/patches/OOO_1_1_3/Makefile.am b/patches/OOO_1_1_3/Makefile.am deleted file mode 100644 index 9c7adf699..000000000 --- a/patches/OOO_1_1_3/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = apply ${wildcard *.diff} ${wildcard *.patch} diff --git a/patches/OOO_1_1_3/apply b/patches/OOO_1_1_3/apply deleted file mode 100644 index 5677ee2ad..000000000 --- a/patches/OOO_1_1_3/apply +++ /dev/null @@ -1,4 +0,0 @@ -# prompt for save options - X#62182, #33686 -# This is really nasty - need to re-validate & re-write -# the sfx2 & xml config part of this seemingly. -gui-interop-warnings.diff diff --git a/patches/order b/patches/order index 9b697da79..674534111 100644 --- a/patches/order +++ b/patches/order @@ -1,2 +1 @@ src680-m79 1.9 buildable -src680-m78 1.9 buildable diff --git a/patches/src680-m78/.cvsignore b/patches/src680-m78/.cvsignore deleted file mode 100644 index 282522db0..000000000 --- a/patches/src680-m78/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/patches/src680-m78/Makefile.am b/patches/src680-m78/Makefile.am deleted file mode 100644 index e35678a76..000000000 --- a/patches/src680-m78/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = apply ${wildcard *.diff} diff --git a/patches/src680-m78/apply b/patches/src680-m78/apply deleted file mode 100644 index f4ab06d2a..000000000 --- a/patches/src680-m78/apply +++ /dev/null @@ -1,583 +0,0 @@ -# -# The format of this file is: -# - -# -------- Options -------- - -PATCHPATH=.:../src680:../evo2:../64bit - -# -------- Functional sub-sets -------- -Common : BuildBits, ParallelMake, TemporaryHacks, Fixes, \ - Defaults, Features, VCL, SystemMozilla, Misc, \ - Icons, Fpickers, i18n \ - VBABits, QPro, Evo2 -LinuxCommon : Common, LinuxOnly -Win32Common : Common -# Novell -NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix -#NLD64 : NovellBase, NLDOnly, 64bit, JDK150 - java modules cannot register on AMD64 atm, let's disable it -NLD64 : NovellBase, NLDOnly, 64bit -NLD : NovellBase, NLDOnly -SUSE : NovellBase, SUSEOnly -# Debian -DebianBase : DebianOnly, LinuxCommon -Debian : DebianBase -# Ark Linux -Ark: LinuxCommon, 64bit, ArkOnly -# www.pld-linux.org -PLDBase: LinuxCommon -PLD: PLDBase -PLD64: PLDBase, 64bit -# Win32 -Win32 : Win32Common, NovellOnly, NovellOnlyWin32 - -# -------- [ Tag ], patch sets -------- - -[ TemporaryHacks ] -# Ugly hack to fix compilation of svtools with system jpeg #37002 -buildfix-system-jpeg.diff -# Temporary disable mozab FIXME no IZ, fix that together with --system-mozilla -buildfix-disable-mozab.diff -# De Sun-ify the recovery report dialog - FIXME file up-stream -# recovery-report.diff - FIXME -# A really ugly vcl hack while we sort our icons out #39358 -vcl-alpha-fix.diff -# Make libidn compile on sane Linux systems #40006 -buildfix-curl-libidn.diff -# Add custom build version bits #41391 -build-versioning.diff -# Fix neon build <up-stream> -cws-pj18-neon.diff -# Fix scp2 with system python #42050 -buildfix-scp2-python.diff -# Fix for librecentfile.so #24253, CWS kendy01 -linkoo-recentfile.diff -# Fix helpcontent2 compilation without java #42057 -buildfix-helpcontent2-nojava.diff -# Don't do a package phase if we disable EPM #42265 -no-epm-no-package.diff -# Add STAR_RESOURCEPATH to the 'env' script, so that OOo does not crash #41034, CWS kendy01 -linkoo-resources.diff -# fix the gpc warning #42409, CWS kendy02 -gpc-warning.diff -# fix build with non-interactive shell, without tty input, #42418 -# it is a backport from src680_m74 until a correct solution is found -buildfix-odk-non-interactive-build.diff -# Stop scp2 re-building frequently #42566 -scp2-rebuild.diff -# Fix filter build without java #42125 -filter-nojava.diff -# Crystal iconset does not get industrial fallback #42760, CWS kendy02 -packimages-respect-alternative.diff - -[ Fixes ] -# fix the wizards crasher n#10512 -wizards-crasher-fix.diff -# Disable the printer properties which are unused IZ#14036, n#583 -printer-properties-disable.diff -# Make debugging nicer under unix #35336 -debug-bits.diff -# The world need not see that I can't spell #21440 -sd-export-no-spell-check.diff -# get interactivity right during slow updates #42221 -vcl-gtk-yield.diff -# Fix mind-mangled evo. addressbook path #26309 -evo-addrbook.diff -# make menu layout prettier #17937 -vcl-menu-fixes.diff -# File->New->Spreadsheet freezes on some versions of GCC # FIXME: shres -svx-freeze-fix.diff -# update pyuno docs from www.oo.o -pyuno-update-docs.diff -# Fix doc load crasher X#64030 - still in src680-m55 -sw-import-crash.diff -# Fix impress spellcheck #32320 -crash-sd-spellcheck.diff -# Make the scroll-wheel / page popup more sane #20826 -gui-sw-scroll.diff -# Re-size over-large icons to 24x24 - #15208 -sfx2-toolbox-size.diff -# disable font management dialog in padmin -padmin-nofontconfig.diff -# Improve the web bullet export / export to png not gif. #23353 -sd-export-html-theme.diff -sd-export-html.diff -sd-export-html-translations.diff -sd-export-html-descr.diff -# A potential trouble-spot #38037 -jvmfwk-eintr.diff -# configure some Japanese fonts used on Novell products -# (patch by Mike Fabian mfabian@suse.de) -novell-cjk-fonts.diff -# fix gtk+ / XIM - forward-port #38671 -xim-fixes.diff -xim-fixes3.diff -# <ctrl> +/‑ to insert/delete a complete line in calc (X#62530) #38108 -calc-new-acceleration.diff -# Send e-mail in MS format as attachment (X#62200) -# ms-interoperability-email-attachment-as-xls-ppt.diff - FIXME -# Escape should cancel the print preview X#67133 #35777 -sw-escape-print-preview.diff -sc-escape-print-preview.diff -# adds to Autofilter Empty-NonEmpty options bxc #62165 Issue#35578 -sc-autofilter-empty-nonempty.diff -# Improves the standard filter options and menu. bxc #62187 #62495 Issue#35579 -sc-standard-filter-options.diff -# Build helpcontent2 without java #35639 -helpcontent2-nojava.diff -# Hides the filtered rows when height of rows are changed bxc #62161 Issue #35581 -sc-filter-hide-filteredrows.diff -# allows not to delete nonfiltered rows while deleting the filtered ones bxc #62186 Issue 35582 -sc-no-delete-filteredrows.diff -# Autofill doesnt fill filtered rows bxc 62499 -sc-filters-fill-fix.diff -# Provision for dynamic range in data pilot issue #23658 bxc 62522 -sc-datapilot-dynamic-range.diff -# Provision for data-pilot to give autoformat Issue #37388 bxc #62162 -sc-datapilot-autoformat.diff -# Make SAL compile on Linux systems that use NPTL without compat hacks -# (pthread_kill_other_threads_np is dead) -sal-compile-with-nptl.diff -# don't bloat the toolbars beyond belief #41833 -vcl-toolbox-height.diff -# actually build the Gnome VFS integration #42053 -config-vfs.diff -# fix +/- key syms #42077 -vcl-keys.diff -# Don't barf if rpm 4.4.x is used -rpm-4.4-compat.diff -# BXC 62488 : Allows insertion of rows by shifting down -sc-paste-insert-rows.diff -# Fix KDE VCL compilation with gcc visibility #41591 -kde-visibility.diff -# Fix for datapilot crash when clicking outside dialog -sc-datapilot-crash-fix.diff -# Fix for datapilot crash on remote databases -sc-dp-database-crash.diff -# Fix for autotriming of autofilter choices bxc 65945 Issue FIXME -sc-autofilter-autotrim-choices.diff -# Take DESKTOP_LAUNCH into account in File->Send->Document as E-mail #42841, CWS kendy03 -shell-senddoc-desktop-launch.diff -# Improve gtk nwf toolbar toggle button rendering. #43720. In vcl37 -vcl-nwf-gtk-toggle-toolitems.diff - -[ LinuxOnly ] -# Optimize linkage of some xmlhelp libraries # FIXME: shres -xmlhelp-optimize-linkage.diff -# Modify the fpicker makefile causing problems in the win32 build -fpicker-common-build.diff - -[ XineramaPIC ] -# use libXinerama_pic.a on all archs -xinerama-pic-on-all-archs.diff - - -[ Misc ] -# Make the default writer bullet larger i#10549 -# sw-default-bullet.diff -# Insert symbol defaults to the Symbol font - not a random one #15512 -gui-sw-insert-symbol.diff -# Address data source ordering X#62860 -addrbk-datasrc-ordering.diff -# Add an ooo-build version in ProductExtension - FIXME - improve & add to configure. -version-strike.diff -# Try to get the font mapping right -gui-metric-fonts.diff -# Describe the metric compatible fonts for export mappings -gui-metric-fonts-descr.diff -# Some of the new help & other icons we need #FIXME copy OOO_1_1_incons -#gui-new-icons.diff -# Make the delete key happy again in starcalc #17965 - wontfix [!] -gui-sc-delete.diff -# Autodetect HAVE_GCC_VISIBILITY_FEATURE -- it's currently used but never -# set -detect-gcc-visibility.diff -#Review comments implemented for #34909 -dbaccess-evo-changes.diff -# E-mail attachment file name append with "_1" X#67684 #35780 -email-attachment-underscore-zero.diff - -[ NovellOnlyUnix ] -# Use bug buddy -bug-buddy.diff -# save everything to ~/Documents by default -default-save-path.diff -# Help Support page -help-support.diff -# mark the files in share/template/<lang>/wizard/bitmap as lang specific -build-wizard-bitmap-scp.diff -# change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre -scp2-user-config-ooo-2-0-pre.diff - -[ NovellOnlyWin32 ] -filebug-support.diff - -[ i18n ] -# shrink exported ISO_8859_2 & MS_1250 html -# most people will use UTF-8 and never see this, #19514 -html-8bit-export-shrink.diff - -# ( mmp@oo.o deals with defaults apparently ) -[ Defaults ] -# stop the user having to fight ooimpress constantly #35338 -capitalization.diff -# default to large icons in the toolbar -gui-toolbox-large-icons.diff -# Use nicer colors for the charts X#64359 -sc-default-color-modify.diff -# make tri-state toolbars less confusing #35563 -gui-toolbox-tristate.diff -# default to anti-alias at point size of 1 point -default-font-aasize.diff -# set default font size to 10pt #35565 -default-font-size.diff -# don't use any slow / nasty X fonts #35641 -default-no-x-fonts.diff -# use more normal hinting parameters #35714 -default-glyph-light.diff -# Dramatically improve MS import / export cf. #8276 et. al. -default-ms-filter-convert.diff -# improve keybindings #35738 -default-keybindings.diff -# use pair kerning in new documents #35873 -default-pairkerning-on.diff -# Optimal Page Wrap should be default for graphics insertion (X#59831) #38108 -writer-default-as-optimal-page-wrap.diff - -# -# Controversial bits - no use filing up-stream -# -# pestering people serves no useful purpose -default-no-registration.diff -# automatically do any migration we can, with no wizard -default-no-startup-wizard.diff -# don't throw up the style dialog on 1st run -default-no-style-dialog.diff -# no Help->registration dialog by default -default-no-registration-menu.diff - -[ Features ] -# Make cut and paste nicer #15509 -sc-paste-dialog.diff -# Save as menuitem for image context menus in impress #13816 -sd-save-image-context-menu.diff -# Make insensitive toolbar icons look far nicer #35555 -gui-insensitive.diff - -[ BuildBits ] -# do an optimizing link -build-optimized-link.diff -# do not build extras for icu, workaround for http://bugs.debian.org/210608 -icu-build-no-extras.diff -# package all libcurl related files if the internal one is used, #41883 -scp-add-libcurl.diff -# do not have GnomeVfs module listed in two file lists, #42525 -scp-gnomevfs-only-once.diff - -# Allow the non-building of misc. modules #35742 -# Fix scp2 with system python #36764 -# Without myspell bits #29937 -cws-buildcond02.diff - -# Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3) -sal-cxa-guard.diff -# do not pack any potential .orig files with ppds -psprint_config-no-orig.diff -# Fix ODK Java bits -odk-java-wizpanel.diff -# add possibility to set ARCH_FLAGS when building libnas -nas-use-arch-flags.diff -# fix build with GNOME 2.9.91, #42718, CWS kendy03 -buildfix-gnome-2.9.91.diff - -[ ParallelMake ] -# Fixes for distributed building (with icecream) #35627 -parallel-solenv-target-mk.diff -parallel-solenv-tg_sdi-mk.diff -# 3 more makefiles in sysui are seriously broken #35628 -parallel-sysui-makefiles.diff - -# Fix/workaround race condition with .REMOVE rule #16752 -parallel-dmake-dont-remove.diff - -[ VCL ] -# Don't let the splash screen take over #23609 -no-splash-takeover.diff -# Ensure window title is "OpenOffice.org..." rather than "Untitled window" #rh120696# -# splash-title.diff - -# Cleanup of old kdeint pieces - part of #36763 -# FIXME: #36763 is marked as fixed; create a new issue for this -cleanup-vcl-kdeint.diff - -# Implementation of KDE/Qt NWF toolbars and menus -# FIXME Not ready for upstreaming yet, crashes on exit for some styles -vcl-nwf-toolbars.diff -vcl-nwf-menus.diff -vcl-nwf-kde-toolbars-menus.diff - -# Use nwf for menu item check boxes instead of ugly symbols -vcl-nwf-menu-checkmarks.diff - -[ SystemMozilla ] -# -# Snarfed from Caolan, unknown status. -# http://people.redhat.com/caolanm/SRC680_m58 -# -system-mozilla-config_office.diff -system-mozilla-connectivity.diff -system-mozilla-extensions.diff -system-mozilla-libxmlsec.diff -system-mozilla-scp2.diff -system-mozilla-xmlsecurity.diff -system-mozilla-xmlsecurity-libnss.diff -# FIXME: this is an UGLY hack. -# It sets LD_LIBRARY_PATH in soffice wrapper to system mozilla (only -# the SUSE specific path /opt/mozilla/lib -system-mozilla-desktop.diff -# Teach linkoo about the evil under the sun: -linkoo-moz-hack.diff - -[ Icons ] -# Installation & appearance of multiple icon sets (Industrial and Crystal) #36518 -icons-vcl-according-to-desktop.diff -icons-xmlhelp-according-to-desktop.diff -# Theme & add alpha to the WM icons #41225 -wm-icons.diff - -[ Fpickers ] -# Out-of-process implementation of KDE fpicker -# FIXME: No IZ number for this, because it is necessary to do it internal first -fpicker-kde-service.diff -fpicker-kde-dialog.diff -# Let the KDE and Gtk+ fpickers build and install FIXME IZ number -fpicker-common-scp2.diff -# Show "Use OpenOffice.org dialogs" check box only if the system fpicker is -# available (better implementation) FIXME IZ number -fpicker-show-checkbox.diff -# add in an extra combobox to make filter selection easier i#10545, i#66075 -fpicker-fixes.diff -# fix for the gtk critical error n#66349 -fpicker-gnome-crash-fix.diff -# temportary fix to enable filter detection to work properly i#10545 -sfx2-fpicker-gnome-filter-fix.diff -# fix for the fpicker hanging on accessible desktop -fpicker-accessibility-fix.diff -# fix for the fpicker crashing in the Euro converter n#67124 -fpicker-euro-converter-fix.diff - -[ Evo2 ] - -# evolution addressbook driver version 2 #34909 -connectivity-source-drivers-evoab1-5-dataaccess-xcu.diff -connectivity-source-drivers-evoab1-5-evoab1-5-map.diff -connectivity-source-drivers-evoab1-5-evoab-xml.diff -connectivity-source-drivers-evoab1-5-makefile-mk.diff -connectivity-source-drivers-evoab1-5-nconnection-cxx.diff -connectivity-source-drivers-evoab1-5-nconnection-hxx.diff -connectivity-source-drivers-evoab1-5-ndatabasemetadata-cxx.diff -connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff -connectivity-source-drivers-evoab1-5-ndebug-cxx.diff -connectivity-source-drivers-evoab1-5-ndebug-hxx.diff -connectivity-source-drivers-evoab1-5-ndriver-cxx.diff -connectivity-source-drivers-evoab1-5-ndriver-hxx.diff -connectivity-source-drivers-evoab1-5-npreparedstatement-cxx.diff -connectivity-source-drivers-evoab1-5-npreparedstatement-hxx.diff -connectivity-source-drivers-evoab1-5-nresultset-cxx.diff -connectivity-source-drivers-evoab1-5-nresultset-hxx.diff -connectivity-source-drivers-evoab1-5-nresultsetmetadata-cxx.diff -connectivity-source-drivers-evoab1-5-nresultsetmetadata-hxx.diff -connectivity-source-drivers-evoab1-5-nservices-cxx.diff -connectivity-source-drivers-evoab1-5-nstatement-cxx.diff -connectivity-source-drivers-evoab1-5-nstatement-hxx.diff -connectivity-source-drivers-evoab1-5-ncatalog-cxx.diff -connectivity-source-drivers-evoab1-5-ncatalog-hxx.diff -connectivity-source-drivers-evoab1-5-ntables-cxx.diff -connectivity-source-drivers-evoab1-5-ntables-hxx.diff -evoab2_prj.diff -evoab2_scp.diff -connectivity-source-drivers-evoab1-5-EApi-cxx.diff -connectivity-source-drivers-evoab1-5-EApi-h.diff - -[ QPro ] -# Quattro Pro 6.0 import filter: IZ #41688 -formel-hxx.diff -qpro-build.diff -qpro-detect.diff -qproform-hxx.diff -frmbase-cxx.diff -qpro-cxx.diff -qproform-cxx.diff -qpro-hxx.diff - -[ Win32Common ] -# 2 more makefiles in sysui are seriously broken #35628 -# parallel-python-makefile_mk.diff # looks to be upstream -# Work around G/W mail component crasher bug #34264 -win32-gw-send-mail.diff -# use bin/oowintool for the win32 configure stage -win32-msvs-2003-configure.diff -# Minor build fixes for win32 -win32-build-fixes.diff -# This is a pretty nasty IE problem #19510 -# win32-activex-disable.diff # commented out as it breaks instsetoo_native - -[ VBABits ] -# Alt-F11 does something useful #29138 -vba-keybinding-f11.diff -# Parse (& ignore) 'Attribute' statements #37347 -vba-attribute.diff -# Add foreach statement - #33807 -vba-foreach.diff -# Prefer interoperability over marginal compatibility -default-vba-compatible.diff -vba-not-comments.diff - -[ NLDOnly ] -# Push fonts into the ps stream always -pushfont-psstream.diff - -# in case the system is panicing; registry/data/org/openoffice/VCL.xcu is -# not installed or broken; used for example if OOo is installed from an -# installation set by ./install --interactive -gui-font-paranoid-fallback.diff - -[ NLDOnly ] -# some branding action cf. doc/splash.txt -nld-splash.diff - -[ SUSEOnly ] -# some branding action cf. doc/splash.txt -suse-splash.diff - -[ ArkOnly ] -# Ark Linux splits Qt into qt-mt and qt-base-mt so text mode apps etc. -# can use Qt base functionality without linking in the whole GUI. -# vclplug needs to add -lqt-base-mt here. -ark-handle-split-qt.diff -# If /usr/bin/java is a gcj wrapper, javadoc doesn't exist -- and -# configure shouldn't barf. -missing-javadoc-nonfatal.diff - -[ RedhatOnly ] -# Some palette loving -redhat-standard-colors.diff - -[ 64bit ] -# -# NOTE: 64 bit OOo is work in progress! -# - -# The following is a result of: -# cvs -d :pserver:anoncvs@anoncvs.services.openoffice.org:/cvs checkout -r cws_src680_ooo64bit02 OpenOffice -# for I in * ; do cvs -d :pserver:anoncvs@anoncvs.services.openoffice.org:/cvs diff -N -r CWS_SRC680_OOO64BIT02_ANCHOR -r cws_src680_ooo64bit02 $I > $I.diff ; done -# (and a bin/cvsclean) -64bit-basegfx.diff -64bit-basic.diff -#64bit-binfilter.diff -64bit-boost.diff -64bit-bridges.diff -#64bit-canvas.diff -64bit-comphelper.diff -64bit-configmgr.diff -64bit-connectivity.diff -#64bit-cppcanvas.diff -64bit-cppu.diff -64bit-cppuhelper.diff -#64bit-dbaccess.diff -64bit-desktop.diff -64bit-extensions.diff -64bit-extras.diff -64bit-framework.diff -64bit-goodies.diff -64bit-idlc.diff -64bit-i18npool.diff -64bit-jvmfwk.diff -64bit-nas.diff -64bit-psprint.diff -64bit-rdbmaker.diff -64bit-registry.diff -#64bit-rsc.diff -64bit-sal.diff -64bit-sc.diff -#64bit-setup2.diff -64bit-sfx2.diff -64bit-sch.diff -64bit-solenv.diff -64bit-so3.diff -64bit-starmath.diff -64bit-stlport.diff -64bit-stoc.diff -64bit-store.diff -64bit-svtools.diff -64bit-svx.diff -64bit-sw.diff -64bit-toolkit.diff -64bit-tools.diff -64bit-vcl.diff -64bit-vos.diff -64bit-xmloff.diff - -# Additional build fixes that need upstreaming to ooo64bit02 -buildfix-64bit-automation.diff -buildfix-64bit-basic.diff -buildfix-64bit-canvas.diff -buildfix-64bit-chart2.diff -buildfix-64bit-config_office.diff -buildfix-64bit-cppcanvas.diff -buildfix-64bit-dbaccess.diff -buildfix-64bit-extensions.diff -buildfix-64bit-filter.diff -buildfix-64bit-framework.diff -# TODO file to IZ -buildfix-64bit-rsc.diff -buildfix-64bit-sc.diff -buildfix-64bit-sch.diff -buildfix-64bit-sd.diff -buildfix-64bit-sfx2.diff -buildfix-64bit-solenv.diff -buildfix-64bit-starmath.diff -buildfix-64bit-svtools.diff -buildfix-64bit-svx.diff -buildfix-64bit-sw.diff -buildfix-64bit-tools.diff -buildfix-64bit-vcl.diff -buildfix-64bit-xmloff.diff - -# Other build fixes -buildfix-64bit-system-jpeg.diff - -# res32bit related fixes -# TODO file to IZ -buildfix-64bit-padmin-res32bit.diff -buildfix-64bit-extensions-res32bit.diff - -# 64-bit related fixes for run-time -# Correct reading of resources IZ#40338 -#fix-64bit-tools.diff -# Fix crash while initializing fontconfig -fix-64bit-psprint.diff - -# Fix ambiguous invocations of Min()/Max()/Abs() when OOo with 64 bit patches -# is built on 32 bit platforms -buildfix-64bit-on-32bit-systems.diff - -[ JDK150 ] -# You need 64bit java, e.g. JDK 1.5.0 for AMD64: -# http://java.sun.com/j2se/1.5.0/download.jsp -# This JDK needs -# ln -s motif21/libmawt.so /usr/java/jdk1.5.0_01/jre/lib/amd64/libmawt.so -# to let OOo compile well -# -# FIXME No IZ for this one yet -buildfix-jdk150-berkeleydb.diff -buildfix-jdk150-jurt.diff -buildfix-jdk150-jvmfwk.diff -buildfix-jdk150-qadevOOo.diff -buildfix-jdk150-rhino.diff -buildfix-jdk150-sandbox.diff -buildfix-jdk150-scripting.diff -buildfix-jdk150-sj2.diff -buildfix-jdk150-xmerge.diff -buildfix-jdk150-xmlhelp.diff -buildfix-jdk150-XmlSearch.diff diff --git a/patches/src680-m78/buildfix-disable-mozab.diff b/patches/src680-m78/buildfix-disable-mozab.diff deleted file mode 100644 index ea47b2274..000000000 --- a/patches/src680-m78/buildfix-disable-mozab.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- connectivity/prj/build.lst 2004-12-07 13:46:29.133991528 +0100 -+++ connectivity/prj/build.lst 2004-12-07 13:47:26.976198176 +0100 -@@ -8,8 +8,6 @@ cn connectivity\source\cpool nmake - a - cn connectivity\source\resource nmake - all cn_res NULL - cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL - cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL --cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL --cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL - cn connectivity\source\drivers\evoab nmake - all cn_evoab cn_dbtools cn_file NULL - cn connectivity\source\drivers\evoab1.5 nmake - all cn_evoab1.5 cn_dbtools cn_file NULL - cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL ---- scp2/source/ooo/file_library_ooo.scp 2004-12-07 17:00:39.479869744 +0100 -+++ scp2/source/ooo/file_library_ooo.scp 2004-12-07 17:01:22.174379192 +0100 -@@ -1125,6 +1125,8 @@ File gid_File_Lib_Mcnttype - - #if !defined(MACOSX) && !defined(WITHOUT_MOZILLA) - -+#endif -+#if 0 - File gid_File_Lib_Mozab_2 - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); -@@ -1143,6 +1143,8 @@ End - - #if !defined(MACOSX) && !defined(WITHOUT_MOZILLA) - -+#endif -+#if 0 - File gid_File_Lib_Mozabdrv - TXT_FILE_BODY; - #ifdef UNX diff --git a/patches/src680-m78/buildfix-helpcontent2-nojava.diff b/patches/src680-m78/buildfix-helpcontent2-nojava.diff deleted file mode 100644 index 7eef95ec9..000000000 --- a/patches/src680-m78/buildfix-helpcontent2-nojava.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- helpcontent2/util/sdatabase/makefile.mk 2005-02-04 13:45:01.621269920 +0100 -+++ helpcontent2/util/sdatabase/makefile.mk 2005-02-04 13:45:18.349379434 +0100 -@@ -26,6 +26,7 @@ TARGET = util - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/settings.pmk - -+.IF "$(SOLAR_JAVA)"!="" - common_build_zip:= - zip1generatedlangs=TRUE - zip1langdirs=$(aux_alllangiso) -@@ -33,6 +34,7 @@ ZIP1TARGET=xhp_sdatabase - ZIP1FLAGS= -u -r - ZIP1DIR=$(MISC)$/$(LANGDIR) - ZIP1LIST=$(LANGDIR)$/text$/shared$/explorer$/database$/main.xhp -+.ENDIF - - LINKNAME=sdatabase - LINKADDEDFILES= \ diff --git a/patches/src680-m78/buildfix-scp2-python.diff b/patches/src680-m78/buildfix-scp2-python.diff deleted file mode 100644 index b3482459a..000000000 --- a/patches/src680-m78/buildfix-scp2-python.diff +++ /dev/null @@ -1,20 +0,0 @@ -Index: scp2/source/python/makefile.mk -=================================================================== -RCS file: /cvs/installation/scp2/source/python/makefile.mk,v -retrieving revision 1.8 -diff -u -r1.8 makefile.mk ---- scp2/source/python/makefile.mk 25 Jan 2005 13:01:01 -0000 1.8 -+++ scp2/source/python/makefile.mk 4 Feb 2005 11:52:27 -0000 -@@ -71,10 +71,11 @@ - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk --.INCLUDE : pyversion.mk - - .IF "$(SYSTEM_PYTHON)" == "YES" - SCPDEFS+=-DSYSTEM_PYTHON -+.ELSE -+.INCLUDE : pyversion.mk - .ENDIF - - SCPDEFS+=\ diff --git a/patches/src680-m78/config-vfs.diff b/patches/src680-m78/config-vfs.diff deleted file mode 100644 index 35f1b53b3..000000000 --- a/patches/src680-m78/config-vfs.diff +++ /dev/null @@ -1,62 +0,0 @@ -Index: config_office/configure.in -=================================================================== -RCS file: /cvs/tools/config_office/configure.in,v -retrieving revision 1.85 -diff -u -r1.85 configure.in ---- config_office/configure.in 18 Jan 2005 16:13:20 -0000 1.85 -+++ config_office/configure.in 4 Feb 2005 12:06:30 -0000 -@@ -113,6 +120,10 @@ - [ --enable-gtk Determines whether to use Gtk+ vclplug on platforms - where Gtk+ is available. - ],,) -+AC_ARG_ENABLE(gnome-vfs, -+[ --enable-gnome-vfs Determines whether to use the Gnome Virtual Filing -+ System on platforms where that VFS is available -+],,) - AC_ARG_ENABLE(static-gtk, - [ --enable-static-gtk: Modules that are linked against gtk libraries use - the static libraries instead of the dynamic ones. -@@ -2502,6 +2605,23 @@ - AC_SUBST(ENABLE_KDE) - - dnl =================================================================== -+dnl Gnome VFS check -+dnl =================================================================== -+ -+ENABLE_GNOMEVFS="" -+AC_MSG_CHECKING([whether to enable GNOME VFS support]) -+if test "x$enable_gnome_vfs" == "xyes"; then -+ ENABLE_GNOMEVFS="TRUE" -+ AC_MSG_RESULT([yes]) -+ PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 ) -+else -+ AC_MSG_RESULT([no]) -+fi -+AC_SUBST(ENABLE_GNOMEVFS) -+AC_SUBST(GNOMEVFS_CFLAGS) -+AC_SUBST(GNOMEVFS_LIBS) -+ -+dnl =================================================================== - dnl Check whether the gtk 2.0 libraries are available. - dnl =================================================================== - - - - -Index: config_office/set_soenv.in -=================================================================== -RCS file: /cvs/tools/config_office/set_soenv.in,v -retrieving revision 1.37 -diff -u -r1.37 set_soenv.in ---- config_office/set_soenv.in 18 Jan 2005 16:13:37 -0000 1.37 -+++ config_office/set_soenv.in 4 Feb 2005 12:09:35 -0000 -@@ -1429,6 +1436,9 @@ - ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" ); - ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" ); - ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" ); -+ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" ); -+ToFile( "GNOMEVFS_CFLAGS", "@GNOMEVFS_CFLAGS@", "e" ); -+ToFile( "GNOMEVFS_LIBS", "@GNOMEVFS_LIBS@", "e" ); - ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" ); - ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" ); - ToFile( "KDE_LIBS", "@KDE_LIBS@", "e" ); diff --git a/patches/src680-m78/cws-buildcond02.diff b/patches/src680-m78/cws-buildcond02.diff deleted file mode 100644 index 86d327af0..000000000 --- a/patches/src680-m78/cws-buildcond02.diff +++ /dev/null @@ -1,591 +0,0 @@ -Index: config_office/configure.in -=================================================================== -RCS file: /cvs/tools/config_office/configure.in,v -retrieving revision 1.77 -retrieving revision 1.77.8.3 -diff -u -r1.77 -r1.77.8.3 ---- config_office/configure.in 15 Nov 2004 14:11:17 -0000 1.77 -+++ config_office/configure.in 9 Dec 2004 16:47:27 -0000 1.77.8.3 -@@ -116,9 +116,18 @@ - [ --enable-kde Determines whether to use Qt/KDE vclplug on platforms - where Qt and KDE are available. - ],,) -+AC_ARG_ENABLE(binfilter, -+[ --disable-binfilter: Disable legacy binary file formats filters -+],,) - AC_ARG_ENABLE(rpath, - [ --disable-rpath: Disable the use of relative paths in shared libraries - ],,) -+AC_ARG_WITH(myspell-dicts, -+[ --without-myspell-dicts Removes myspell dictionaries from openoffice.org -+ installation set, for people building for specific -+ distributions where the myspell dictionaries are -+ installed from other sources -+],,) - AC_ARG_WITH(system-libs, - [ --with-system-libs Use libs already on system -- enables all - --with-system-* flags except mozilla, python and -@@ -372,6 +381,9 @@ - - Usage: --enable-check-only=yes - ],,) -+ -+BUILD_TYPE="OOo EXT" -+ - dnl =================================================================== - dnl Message. - dnl =================================================================== -@@ -639,6 +651,17 @@ - fi - AC_SUBST(ENABLE_FONTCONFIG) - -+dnl =================================================================== -+dnl Disable legacy binary file formats filters -+dnl =================================================================== -+if test "$enable_binfilter" = "no"; then -+ WITH_BINFILTER="NO" -+else -+ WITH_BINFILTER="YES" -+ BUILD_TYPE="$BUILD_TYPE BINFILTER" -+fi -+AC_SUBST(WITH_BINFILTER) -+ - if test "$_os" = "WINNT"; then - AC_MSG_CHECKING([whether to use DirectX]) - if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then -@@ -657,6 +680,19 @@ - fi - AC_SUBST(ENABLE_RPATH) - -+dnl Test whether to include MySpell dictionaries -+dnl =================================================================== -+AC_MSG_CHECKING([whether to include MySpell dictionaries]) -+if test -z "$with_myspell_dicts"; then -+ AC_MSG_RESULT([yes]) -+ WITH_MYSPELL_DICTS=YES -+ BUILD_TYPE="$BUILD_TYPE DICTIONARIES" -+else -+ AC_MSG_RESULT([no]) -+ WITH_MYSPELL_DICTS=NO -+fi -+AC_SUBST(WITH_MYSPELL_DICTS) -+ - dnl =================================================================== - dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh. - dnl The following sets the with_use_shell variable. -@@ -1769,6 +1805,7 @@ - else - AC_MSG_RESULT([internal]) - SYSTEM_ZLIB=NO -+ BUILD_TYPE="$BUILD_TYPE ZLIB" - fi - AC_SUBST(SYSTEM_ZLIB) - -@@ -1787,6 +1824,7 @@ - else - AC_MSG_RESULT([internal]) - SYSTEM_JPEG=NO -+ BUILD_TYPE="$BUILD_TYPE JPEG" - fi - AC_SUBST(SYSTEM_JPEG) - -@@ -1805,6 +1843,7 @@ - else - AC_MSG_RESULT([internal]) - SYSTEM_EXPAT=NO -+ BUILD_TYPE="$BUILD_TYPE EXPAT" - fi - AC_SUBST(SYSTEM_EXPAT) - -@@ -1820,6 +1859,7 @@ - else - AC_MSG_RESULT([internal]) - SYSTEM_FREETYPE=NO -+ BUILD_TYPE="$BUILD_TYPE FREETYPE" - fi - AC_SUBST(SYSTEM_FREETYPE) - AC_SUBST(FREETYPE_CFLAGS) -@@ -1834,9 +1874,11 @@ - AC_MSG_RESULT([external]) - SYSTEM_LIBXML=YES - PKG_CHECK_MODULES( LIBXML, libxml-2.0 >= 2.0 ) -+ BUILD_TYPE="$BUILD_TYPE LIBXMLSEC" - else - AC_MSG_RESULT([internal]) - SYSTEM_LIBXML=NO -+ BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC" - fi - AC_SUBST(SYSTEM_LIBXML) - AC_SUBST(LIBXML_CFLAGS) -@@ -1863,6 +1905,7 @@ - CPPFLAGS="$save_CPPFLAGS" - else - SYSTEM_PYTHON=NO -+ BUILD_TYPE="$BUILD_TYPE PYTHON" - AC_MSG_RESULT([internal]) - fi - AC_SUBST(SYSTEM_PYTHON) -@@ -1928,6 +1971,7 @@ - else - AC_MSG_RESULT([internal]) - SYSTEM_CURL=NO -+ BUILD_TYPE="$BUILD_TYPE CURL" - fi - AC_SUBST(SYSTEM_CURL) - AC_SUBST(CURL_CFLAGS) -@@ -2087,6 +2132,7 @@ - else - AC_MSG_RESULT([internal]) - SYSTEM_NAS=NO -+ BUILD_TYPE="$BUILD_TYPE NAS" - fi - AC_SUBST(SYSTEM_NAS) - AC_SUBST(NAS_INCLUDES) -@@ -2120,6 +2166,7 @@ - SYSTEM_NEON=NO - NEON_LIBS=-lneon - NEON_CFLAGS= -+ BUILD_TYPE="$BUILD_TYPE NEON" - fi - AC_SUBST(SYSTEM_NEON) - AC_SUBST(NEON_LIBS) -@@ -1968,6 +2012,7 @@ - else - AC_MSG_RESULT([internal]) - SYSTEM_MOZILLA=NO -+ BUILD_TYPE="$BUILD_TYPE MOZ" - fi - AC_SUBST(SYSTEM_MOZILLA) - AC_SUBST(MOZILLA_CFLAGS) -@@ -2683,6 +2730,7 @@ - if test "$with_fonts" != "no" ; then - AC_MSG_RESULT([yes]) - WITH_FONTS=YES -+ BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS" - else - AC_MSG_RESULT([no]) - WITH_FONTS=NO -@@ -2883,6 +2931,8 @@ - fi - AC_SUBST(CUSTOM_IMAGE_SETS) - -+AC_SUBST(BUILD_TYPE) -+ - dnl =================================================================== - dnl Setting up the environment. - dnl =================================================================== -Index: config_office/set_soenv.in -=================================================================== -RCS file: /cvs/tools/config_office/set_soenv.in,v -retrieving revision 1.26 -retrieving revision 1.26.8.2 -diff -u -r1.26 -r1.26.8.2 ---- config_office/set_soenv.in 15 Nov 2004 14:11:32 -0000 1.26 -+++ config_office/set_soenv.in 9 Dec 2004 14:44:29 -0000 1.26.8.2 -@@ -1701,6 +1701,7 @@ - ToFile( "WITH_GPC", "@WITH_GPC@", "e" ); - ToFile( "WITH_LIBART", "@WITH_LIBART@", "e" ); - ToFile( "LIBART_CFLAGS", "@LIBART_CFLAGS@", "e" ); -+ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e"); - ToFile( "LIBART_LIBS", "@LIBART_LIBS@", "e" ); - ToFile( "WITH_LIBSN", "@WITH_LIBSN@", "e" ); - ToFile( "LIBSN_CFLAGS", "@LIBSN_CFLAGS@", "e" ); -@@ -1708,6 +1709,8 @@ - ToFile( "WITH_MOZILLA", "@WITH_MOZILLA@", "e" ); - ToFile( "WITH_OPENLDAP", "@WITH_OPENLDAP@", "e" ); - ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" ); -+ToFile( "WITH_BINFILTER", "@WITH_BINFILTER@", "e" ); -+ToFile( "BUILD_TYPE", "@BUILD_TYPE@", "e" ); - ToFile( "WITH_FONTOOO", "@WITH_FONTOOO@", "e" ); - ToFile( "SYSTEM_MSPACK", "@SYSTEM_MSPACK@", "e" ); - if ( '@ENABLE_RPATH@' eq "no" ) { - ---- connectivity/prj/build.lst 19 Jan 2004 10:57:17 -0000 -+++ connectivity/prj/build.lst 9 Dec 2004 16:43:34 -0000 -@@ -1,4 +1,4 @@ --cn connectivity : comphelper moz svtools unixODBC unoil jurt javaunohelper hsqldb NULL -+cn connectivity : comphelper MOZ:moz svtools unixODBC unoil jurt javaunohelper hsqldb NULL - cn connectivity usr1 - all cn_mkout NULL - cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb NULL - cn connectivity\source\types nmake - all cn_types NULL -Index: hwpfilter/prj/build.lst -=================================================================== -RCS file: /cvs/sw/hwpfilter/prj/build.lst,v -retrieving revision 1.3 -retrieving revision 1.3.24.1 -diff -u -r1.3 -r1.3.24.1 ---- hwpfilter/prj/build.lst 19 Jan 2004 10:57:17 -0000 1.3 -+++ hwpfilter/prj/build.lst 9 Dec 2004 16:43:34 -0000 1.3.24.1 -@@ -1,4 +1,4 @@ --hw hwpfilter : offuh cppuhelper zlib NULL -+hw hwpfilter : offuh cppuhelper ZLIB:zlib NULL - hw hwpfilter usr1 - all hw_mkout NULL - hw hwpfilter\prj get - all hw_prj NULL - hw hwpfilter\source nmake - all hw_source NULL -Index: jvmfwk/prj/build.lst -=================================================================== -RCS file: /cvs/udk/jvmfwk/prj/build.lst,v -retrieving revision 1.9 -retrieving revision 1.9.30.1 -diff -u -r1.9 -r1.9.30.1 ---- jvmfwk/prj/build.lst 1 Jun 2004 12:11:15 -0000 1.9 -+++ jvmfwk/prj/build.lst 9 Dec 2004 16:19:08 -0000 1.9.30.1 -@@ -1,4 +1,4 @@ --jv jvmfwk : cppu cppuhelper sal libxml2 NULL -+jv jvmfwk : cppu cppuhelper sal LIBXML2:libxml2 NULL - jv jvmfwk\source nmake - all jf_framework NULL - jv jvmfwk\plugins\sunmajor\pluginlib nmake - all jf_sunmajorlib NULL - jv jvmfwk\plugins\sunmajor\javaenvsetup nmake - u jf_sunjavaldx jf_framework NULL -Index: libxmlsec/prj/build.lst -=================================================================== -RCS file: /cvs/external/libxmlsec/prj/build.lst,v -retrieving revision 1.5 -retrieving revision 1.5.6.1 -diff -u -r1.5 -r1.5.6.1 ---- libxmlsec/prj/build.lst 28 Oct 2004 16:07:00 -0000 1.5 -+++ libxmlsec/prj/build.lst 9 Dec 2004 16:34:34 -0000 1.5.6.1 -@@ -1,3 +1,3 @@ --ls libxmlsec : libxml2 moz NULL -+ls libxmlsec : stlport soltools LIBXML2:libxml2 MOZ:moz NULL - ls libxmlsec usr1 - all ls_mkout NULL - ls libxmlsec nmake - all ls_xmlsec1 NULL -Index: package/prj/build.lst -=================================================================== -RCS file: /cvs/xml/package/prj/build.lst,v -retrieving revision 1.5 -retrieving revision 1.5.68.1 -diff -u -r1.5 -r1.5.68.1 ---- package/prj/build.lst 25 Feb 2004 15:27:32 -0000 1.5 -+++ package/prj/build.lst 9 Dec 2004 16:43:09 -0000 1.5.68.1 -@@ -1,4 +1,4 @@ --pk package : cppu cppuhelper comphelper ucbhelper sal zlib NULL -+pk package : cppu cppuhelper comphelper ucbhelper sal ZLIB:zlib NULL - pk package usr1 - all pk_mkout NULL - pk package\source\zipapi nmake - all pk_zipapi NULL - pk package\source\zippackage nmake - all pk_zippackage NULL -Index: postprocess/prj/build.lst -=================================================================== -RCS file: /cvs/installation/postprocess/prj/build.lst,v -retrieving revision 1.8 -retrieving revision 1.8.2.1 -diff -u -r1.8 -r1.8.2.1 ---- postprocess/prj/build.lst 29 Nov 2004 08:42:37 -0000 1.8 -+++ postprocess/prj/build.lst 9 Dec 2004 14:46:49 -0000 1.8.2.1 -@@ -1,4 +1,4 @@ --po postprocess :: accessibility automation basctl bean binfilter chart2 configmgr crashrep dbaccess desktop dtrans embeddedobj embedserv eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MathMLDTD msfontextract odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml unzip wizards xmlsecurity OOo:bitstream_vera_fonts OOo:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL -+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr crashrep dbaccess desktop dtrans embeddedobj embedserv eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MathMLDTD msfontextract odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml unzip wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL - po postprocess usr1 - all po_mkout NULL - po postprocess\packconfig nmake - all po_packconfig NULL - po postprocess\rebase nmake - w po_rebase NULL -Index: pyuno/prj/build.lst -=================================================================== -RCS file: /cvs/udk/pyuno/prj/build.lst,v -retrieving revision 1.4 -retrieving revision 1.4.76.1 -diff -u -r1.4 -r1.4.76.1 ---- pyuno/prj/build.lst 13 Jun 2003 07:51:26 -0000 1.4 -+++ pyuno/prj/build.lst 9 Dec 2004 14:52:16 -0000 1.4.76.1 -@@ -1,4 +1,4 @@ --pu pyuno : stoc cpputools cppuhelper python NULL -+pu pyuno : stoc cpputools cppuhelper PYTHON:python NULL - pu pyuno usr1 - all br_mkout NULL - pu pyuno\zipcore nmake - all pu_zipcore NULL - pu pyuno\unotypes nmake - all pu_unotypes NULL -Index: scp2/source/calc/file_calc.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/calc/file_calc.scp,v -retrieving revision 1.11 -retrieving revision 1.11.24.1 -diff -u -r1.11 -r1.11.24.1 ---- scp2/source/calc/file_calc.scp 18 Nov 2004 08:53:53 -0000 1.11 -+++ scp2/source/calc/file_calc.scp 9 Dec 2004 14:35:22 -0000 1.11.24.1 -@@ -77,8 +77,10 @@ - // start binfilter #110743# - // - -+#ifndef WITHOUT_BINFILTER - STD_LIB_FILE( gid_File_Lib_Bf_Sc, bf_sc) - STD_RES_FILE( gid_File_Res_Bf_Sc, bf_sc) -+#endif - - // - // end binfilter #110743# -Index: scp2/source/calc/makefile.mk -=================================================================== -RCS file: /cvs/installation/scp2/source/calc/makefile.mk,v -retrieving revision 1.4 -retrieving revision 1.4.192.1 -diff -u -r1.4 -r1.4.192.1 ---- scp2/source/calc/makefile.mk 5 Jul 2004 13:11:28 -0000 1.4 -+++ scp2/source/calc/makefile.mk 9 Dec 2004 14:35:23 -0000 1.4.192.1 -@@ -71,6 +71,10 @@ - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk -+ -+.IF "$(WITH_BINFILTER)" == "NO" -+SCPDEFS+=-DWITHOUT_BINFILTER -+.ENDIF - - SCP_PRODUCT_TYPE=osl - PARFILES= \ -Index: scp2/source/lingu/file_lingu.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/lingu/file_lingu.scp,v -retrieving revision 1.2 -retrieving revision 1.2.302.1 -diff -u -r1.2 -r1.2.302.1 ---- scp2/source/lingu/file_lingu.scp 11 Feb 2004 08:48:24 -0000 1.2 -+++ scp2/source/lingu/file_lingu.scp 9 Dec 2004 14:35:23 -0000 1.2.302.1 -@@ -77,9 +77,11 @@ - Dir = gid_Dir_Program; - End - -+#ifndef WITHOUT_MYSPELL_DICTS - File gid_File_Zip_Writingaids - TXT_FILE_BODY; - Styles = (ARCHIVE); - Dir = gid_Dir_Share_Dict_Ooo; - Name = "writingaids.zip"; - End -+#endif -Index: scp2/source/lingu/makefile.mk -=================================================================== -RCS file: /cvs/installation/scp2/source/lingu/makefile.mk,v -retrieving revision 1.3 -retrieving revision 1.3.200.1 -diff -u -r1.3 -r1.3.200.1 ---- scp2/source/lingu/makefile.mk 25 Jun 2004 16:22:25 -0000 1.3 -+++ scp2/source/lingu/makefile.mk 9 Dec 2004 14:35:23 -0000 1.3.200.1 -@@ -71,6 +71,10 @@ - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk -+ -+.IF "$(WITH_MYSPELL_DICTS)" != "YES" -+SCPDEFS+=-DWITHOUT_MYSPELL_DICTS -+.ENDIF - - SCP_PRODUCT_TYPE=osl - -Index: scp2/source/math/file_math.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/math/file_math.scp,v -retrieving revision 1.10 -retrieving revision 1.10.24.1 -diff -u -r1.10 -r1.10.24.1 ---- scp2/source/math/file_math.scp 18 Nov 2004 08:58:10 -0000 1.10 -+++ scp2/source/math/file_math.scp 9 Dec 2004 14:35:24 -0000 1.10.24.1 -@@ -85,8 +85,10 @@ - // start binfilter #110743# - // - -+#ifndef WITHOUT_BINFILTER - STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm) - STD_RES_FILE( gid_File_Res_Bf_Sm, bf_sm) -+#endif - - // - // end binfilter #110743# -Index: scp2/source/math/makefile.mk -=================================================================== -RCS file: /cvs/installation/scp2/source/math/makefile.mk,v -retrieving revision 1.6 -retrieving revision 1.6.24.1 -diff -u -r1.6 -r1.6.24.1 ---- scp2/source/math/makefile.mk 18 Nov 2004 08:58:51 -0000 1.6 -+++ scp2/source/math/makefile.mk 9 Dec 2004 14:35:24 -0000 1.6.24.1 -@@ -71,6 +71,10 @@ - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk -+ -+.IF "$(WITH_BINFILTER)" == "NO" -+SCPDEFS+=-DWITHOUT_BINFILTER -+.ENDIF - - SCP_PRODUCT_TYPE=osl - PARFILES= \ -Index: scp2/source/ooo/file_library_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v -retrieving revision 1.71 -retrieving revision 1.71.10.1 -diff -u -r1.71 -r1.71.10.1 ---- scp2/source/ooo/file_library_ooo.scp 26 Nov 2004 21:52:02 -0000 1.71 -+++ scp2/source/ooo/file_library_ooo.scp 9 Dec 2004 14:35:25 -0000 1.71.10.1 -@@ -1505,6 +1505,7 @@ - // start binfilter #110743# - // - -+#ifndef WITHOUT_BINFILTER - STD_LIB_FILE( gid_File_Lib_Bf_Sch, bf_sch) - STD_LIB_FILE( gid_File_Lib_Bf_Lng, bf_lng) - STD_LIB_FILE( gid_File_Lib_Bf_Xo, bf_xo) -@@ -1517,6 +1518,7 @@ - STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters) - STD_UNO_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter) - STD_UNO_LIB_FILE( gid_File_Lib_Bindet, bindet) -+#endif - - // - // end binfilter #110743# -Index: scp2/source/ooo/file_resource_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_resource_ooo.scp,v -retrieving revision 1.14 -retrieving revision 1.14.10.1 -diff -u -r1.14 -r1.14.10.1 ---- scp2/source/ooo/file_resource_ooo.scp 30 Nov 2004 12:47:40 -0000 1.14 -+++ scp2/source/ooo/file_resource_ooo.scp 9 Dec 2004 14:35:25 -0000 1.14.10.1 -@@ -142,6 +142,7 @@ - // start binfilter #110743# - // - -+#ifndef WITHOUT_BINFILTER - STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch ) - STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx ) - STD_RES_FILE( gid_File_Res_Bf_Frm, bf_frm ) -@@ -149,6 +150,7 @@ - STD_RES_FILE( gid_File_Res_Bf_Sd, bf_sd ) - STD_RES_FILE( gid_File_Res_Bf_Sw, bf_sw ) - STD_RES_FILE( gid_File_Res_Bf_Sfx, bf_sfx ) -+#endif - - // - // end binfilter #110743# - ---- scp2/source/ooo/file_ooo.scp 31 Jan 2005 11:49:51 -0000 1.71 -+++ scp2/source/ooo/file_ooo.scp 8 Feb 2005 12:48:13 -0000 -@@ -2387,12 +2385,14 @@ - End - #endif - -+#ifndef WITHOUT_BINFILTER - File gid_Starregistry_Legacy_Binfilters_Rdb - TXT_FILE_BODY; - Name = "legacy_binfilters.rdb"; - Dir = gid_Dir_Program; - Styles = (PACKED, STARREGISTRY); - End -+#endif - - File gid_Starregistry_Services_Rdb - TXT_FILE_BODY; -Index: scp2/source/ooo/makefile.mk -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/makefile.mk,v -retrieving revision 1.13 -retrieving revision 1.13.10.1 -diff -u -r1.13 -r1.13.10.1 ---- scp2/source/ooo/makefile.mk 26 Nov 2004 22:25:05 -0000 1.13 -+++ scp2/source/ooo/makefile.mk 9 Dec 2004 14:35:26 -0000 1.13.10.1 -@@ -124,6 +124,10 @@ - - .IF "$(SYSTEM_CURL)" == "YES" - SCPDEFS+=-DSYSTEM_CURL -+.ENDIF -+ -+.IF "$(WITH_BINFILTER)" == "NO" -+SCPDEFS+=-DWITHOUT_BINFILTER - .ENDIF - - SCP_PRODUCT_TYPE=osl -Index: svtools/prj/build.lst -=================================================================== -RCS file: /cvs/util/svtools/prj/build.lst,v -retrieving revision 1.28 -retrieving revision 1.28.10.1 -diff -u -r1.28 -r1.28.10.1 ---- svtools/prj/build.lst 26 Nov 2004 20:38:27 -0000 1.28 -+++ svtools/prj/build.lst 9 Dec 2004 15:58:07 -0000 1.28.10.1 -@@ -1,4 +1,4 @@ --st svtools : offuh toolkit ucbhelper unotools jpeg cppu cppuhelper sal NULL -+st svtools : offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper sal NULL - st svtools usr1 - all st_mkout NULL - st svtools\inc get - all st_inc NULL - st svtools\inc\sane get - all st_incsa NULL -Index: tools/prj/build.lst -=================================================================== -RCS file: /cvs/util/tools/prj/build.lst,v -retrieving revision 1.19 -retrieving revision 1.19.42.1 -diff -u -r1.19 -r1.19.42.1 ---- tools/prj/build.lst 4 Oct 2004 20:00:08 -0000 1.19 -+++ tools/prj/build.lst 9 Dec 2004 16:41:54 -0000 1.19.42.1 -@@ -1,4 +1,4 @@ --tl tools : cppu external offuh vos zlib expat basegfx comphelper NULL -+tl tools : cppu external offuh vos ZLIB:zlib expat basegfx comphelper NULL - tl tools usr1 - all tl_mkout NULL - tl tools\bootstrp\isdll get - all tl_bsisdll NULL - tl tools\bootstrp\addexes get - all tl_bsexes NULL -Index: ucb/prj/build.lst -=================================================================== -RCS file: /cvs/ucb/ucb/prj/build.lst,v -retrieving revision 1.17 -retrieving revision 1.17.26.1 -diff -u -r1.17 -r1.17.26.1 ---- ucb/prj/build.lst 13 Oct 2004 15:04:57 -0000 1.17 -+++ ucb/prj/build.lst 9 Dec 2004 14:50:54 -0000 1.17.26.1 -@@ -1,4 +1,4 @@ --uc ucb : unotools tools cppuhelper curl neon offapi sal salhelper ucbhelper udkapi vos NULL -+uc ucb : unotools tools cppuhelper CURL:curl NEON:neon offapi sal salhelper ucbhelper udkapi vos NULL - uc ucb usr1 - all uc_mkout NULL - uc ucb\unotypes nmake - all uc_unotypes NULL - uc ucb\source\regexp nmake - all uc_regexp uc_unotypes NULL -Index: unoxml/prj/build.lst -=================================================================== -RCS file: /cvs/framework/unoxml/prj/build.lst,v -retrieving revision 1.5 -retrieving revision 1.5.20.1 -diff -u -r1.5 -r1.5.20.1 ---- unoxml/prj/build.lst 30 Mar 2004 09:58:22 -0000 1.5 -+++ unoxml/prj/build.lst 9 Dec 2004 16:33:43 -0000 1.5.20.1 -@@ -1,4 +1,4 @@ --ux unoxml : offuh cppuhelper libxml2 sfx2 NULL -+ux unoxml : offuh cppuhelper LIBXML2:libxml2 sfx2 NULL - ux unoxml\source\dom nmake - all ux_dom NULL - ux unoxml\source\xpath nmake - all ux_xpath ux_dom NULL - ux unoxml\source\events nmake - all ux_events ux_dom NULL -Index: vcl/prj/build.lst -=================================================================== -RCS file: /cvs/gsl/vcl/prj/build.lst,v -retrieving revision 1.35 -retrieving revision 1.35.34.1 -diff -u -r1.35 -r1.35.34.1 ---- vcl/prj/build.lst 9 Nov 2004 16:43:11 -0000 1.35 -+++ vcl/prj/build.lst 9 Dec 2004 16:16:54 -0000 1.35.34.1 -@@ -1,4 +1,4 @@ --vc vcl : boost nas freetype psprint rsc sot ucbhelper unotools rvpapi icu i18npool unoil ridljar x11_extensions offuh basegfx SO:sndfile SO:portaudio transex3 NULL -+vc vcl : boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools rvpapi icu i18npool unoil ridljar x11_extensions offuh basegfx SO:sndfile SO:portaudio transex3 NULL - vc vcl usr1 - all vc_mkout NULL - vc vcl\source\unotypes nmake - all vc_unot NULL - vc vcl\source\glyphs nmake - all vc_glyphs vc_unot NULL -Index: xmlsecurity/prj/build.lst -=================================================================== -RCS file: /cvs/xml/xmlsecurity/prj/build.lst,v -retrieving revision 1.3 -retrieving revision 1.3.18.1 -diff -u -r1.3 -r1.3.18.1 ---- xmlsecurity/prj/build.lst 30 Sep 2004 16:06:29 -0000 1.3 -+++ xmlsecurity/prj/build.lst 9 Dec 2004 16:33:42 -0000 1.3.18.1 -@@ -1,4 +1,4 @@ --xs xmlsecurity : xmloff unotools offapi unoil svx moz libxmlsec NULL -+xs xmlsecurity : xmloff unotools offapi unoil svx MOZ:moz LIBXMLSEC:libxmlsec NULL - xs xmlsecurity usr1 - all xs_mkout NULL - xs xmlsecurity\source\framework nmake - all xs_fw NULL - xs xmlsecurity\source\xmlsec\nss nmake - all xs_nss NULL -Index: scp2/prj/build.lst -=================================================================== -RCS file: /cvs/installation/scp2/prj/build.lst,v -retrieving revision 1.8 -diff -u -p -u -r1.8 build.lst ---- scp2/prj/build.lst 15 Nov 2004 13:15:48 -0000 1.8 -+++ scp2/prj/build.lst 9 Dec 2004 19:50:18 -0000 -@@ -1,4 +1,4 @@ --cp scp2 : setup_native python NULL -+cp scp2 : setup_native PYTHON:python NULL - cp scp2 usr1 - all cp_mkout NULL - cp scp2\source\activex nmake - all cp_activex NULL - cp scp2\source\calc nmake - all cp_calc NULL - diff --git a/patches/src680-m78/cws-pj18-neon.diff b/patches/src680-m78/cws-pj18-neon.diff deleted file mode 100644 index 5a6071781..000000000 --- a/patches/src680-m78/cws-pj18-neon.diff +++ /dev/null @@ -1,72 +0,0 @@ -Index: neon/neon.patch -=================================================================== -RCS file: /cvs/external/neon/neon.patch,v -retrieving revision 1.10 -retrieving revision 1.10.2.2 -diff -u -r1.10 -r1.10.2.2 ---- neon/neon.patch 27 Jan 2005 12:00:18 -0000 1.10 -+++ neon/neon.patch 3 Feb 2005 12:53:15 -0000 1.10.2.2 -@@ -1,5 +1,5 @@ --*** misc/neon-0.24.7/src/config.h Thu Jan 6 16:11:45 2005 ----- misc/build/neon-0.24.7/src/config.h Thu Jan 6 16:11:36 2005 -+*** misc/neon-0.24.7/src/config.h 2005-02-03 13:50:25.367553574 +0100 -+--- misc/build/neon-0.24.7/src/config.h 2005-02-03 13:49:45.132999224 +0100 - *************** - *** 1 **** - ! dummy -@@ -382,15 +382,15 @@ - ! - ! #endif - ! --*** misc/neon-0.24.7/src/makefile.mk Thu Jan 6 16:11:45 2005 ----- misc/build/neon-0.24.7/src/makefile.mk Thu Jan 6 16:10:14 2005 -+*** misc/neon-0.24.7/src/makefile.mk 2005-02-03 13:50:25.354554687 +0100 -+--- misc/build/neon-0.24.7/src/makefile.mk 2005-02-03 13:50:14.522482326 +0100 - *************** - *** 1 **** - ! dummy ----- 1,47 ---- -+--- 1,52 ---- - ! PRJ=..$/..$/..$/..$/.. - ! --! PRJNAME=external -+! PRJNAME=neon - ! TARGET=neon - ! LIBTARGET=NO - ! -@@ -404,6 +404,11 @@ - ! - ! CDEFS+=-DHAVE_CONFIG_H - ! -+! .IF "$(SYSTEM_LIBXML)" == "YES" -+! CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) -+! .ENDIF -+! -+! - ! SLOFILES= \ - ! $(SLO)$/ne_207.obj \ - ! $(SLO)$/ne_acl.obj \ -@@ -435,8 +440,8 @@ - ! # --- Targets ------------------------------------------------------ - ! - ! .INCLUDE : target.mk --*** misc/neon-0.24.7/src/ne_socket.c Fri Mar 26 14:07:50 2004 ----- misc/build/neon-0.24.7/src/ne_socket.c Thu Jan 6 16:10:14 2005 -+*** misc/neon-0.24.7/src/ne_socket.c 2004-03-26 14:07:50.000000000 +0100 -+--- misc/build/neon-0.24.7/src/ne_socket.c 2005-02-03 13:49:45.134999052 +0100 - *************** - *** 63,68 **** - --- 63,71 ---- -Index: neon/prj/build.lst -=================================================================== -RCS file: /cvs/external/neon/prj/build.lst,v -retrieving revision 1.4 -retrieving revision 1.4.98.1 -diff -u -r1.4 -r1.4.98.1 ---- neon/prj/build.lst 27 Aug 2002 12:23:56 -0000 1.4 -+++ neon/prj/build.lst 29 Jan 2005 20:32:45 -0000 1.4.98.1 -@@ -1,3 +1,3 @@ --xh neon : soltools external expat NULL -+xh neon : soltools external expat LIBXML2:libxml2 NULL - xh neon usr1 - all xh_mkout NULL - xh neon nmake - all xh_neon NULL diff --git a/patches/src680-m78/helpcontent2-nojava.diff b/patches/src680-m78/helpcontent2-nojava.diff deleted file mode 100644 index 9996361ad..000000000 --- a/patches/src680-m78/helpcontent2-nojava.diff +++ /dev/null @@ -1,207 +0,0 @@ -Index: helpcontent2/helpers/linkmakefile.template -=================================================================== -RCS file: /cvs/documentation/helpcontent2/helpers/linkmakefile.template,v -retrieving revision 1.4 -diff -u -3 -p -r1.4 linkmakefile.template ---- helpcontent2/helpers/linkmakefile.template 16 Dec 2004 12:28:11 -0000 1.4 -+++ helpcontent2/helpers/linkmakefile.template 7 Jan 2005 12:21:42 -0000 -@@ -26,6 +26,7 @@ TARGET = util - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/settings.pmk - -+.IF "$(SOLAR_JAVA)"!="" - common_build_zip:= - zip1generatedlangs=TRUE - zip1langdirs=$(aux_alllangiso) -@@ -33,6 +34,7 @@ ZIP1TARGET=xhp_%module% - ZIP1FLAGS= -u -r - ZIP1DIR=$(MISC)$/$(LANGDIR) - ZIP1LIST=$(LANGDIR)$/text$/%module%$/* -x "*.dphh*" -x "*.hzip" -+.ENDIF - - - LINKNAME=%module% -Index: helpcontent2/util/sbasic/makefile.mk -=================================================================== -RCS file: /cvs/documentation/helpcontent2/util/sbasic/makefile.mk,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 makefile.mk ---- helpcontent2/util/sbasic/makefile.mk 16 Dec 2004 13:00:37 -0000 1.10 -+++ helpcontent2/util/sbasic/makefile.mk 7 Jan 2005 12:21:43 -0000 -@@ -26,6 +26,7 @@ TARGET = util - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/settings.pmk - -+.IF "$(SOLAR_JAVA)"!="" - common_build_zip:= - zip1generatedlangs=TRUE - zip1langdirs=$(aux_alllangiso) -@@ -33,6 +34,7 @@ ZIP1TARGET=xhp_sbasic - ZIP1FLAGS= -u -r - ZIP1DIR=$(MISC)$/$(LANGDIR) - ZIP1LIST=$(LANGDIR)$/text$/sbasic$/* -x "*.dphh*" -x "*.hzip" -+.ENDIF - - - LINKNAME=sbasic -Index: helpcontent2/util/scalc/makefile.mk -=================================================================== -RCS file: /cvs/documentation/helpcontent2/util/scalc/makefile.mk,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 makefile.mk ---- helpcontent2/util/scalc/makefile.mk 16 Dec 2004 13:00:51 -0000 1.10 -+++ helpcontent2/util/scalc/makefile.mk 7 Jan 2005 12:21:43 -0000 -@@ -26,6 +26,7 @@ TARGET = util - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/settings.pmk - -+.IF "$(SOLAR_JAVA)"!="" - common_build_zip:= - zip1generatedlangs=TRUE - zip1langdirs=$(aux_alllangiso) -@@ -33,6 +34,7 @@ ZIP1TARGET=xhp_scalc - ZIP1FLAGS= -u -r - ZIP1DIR=$(MISC)$/$(LANGDIR) - ZIP1LIST=$(LANGDIR)$/text$/scalc$/* -x "*.dphh*" -x "*.hzip" -+.ENDIF - - - LINKNAME=scalc -Index: helpcontent2/util/schart/makefile.mk -=================================================================== -RCS file: /cvs/documentation/helpcontent2/util/schart/makefile.mk,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 makefile.mk ---- helpcontent2/util/schart/makefile.mk 16 Dec 2004 13:01:03 -0000 1.10 -+++ helpcontent2/util/schart/makefile.mk 7 Jan 2005 12:21:43 -0000 -@@ -26,6 +26,7 @@ TARGET = util - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/settings.pmk - -+.IF "$(SOLAR_JAVA)"!="" - common_build_zip:= - zip1generatedlangs=TRUE - zip1langdirs=$(aux_alllangiso) -@@ -33,6 +34,7 @@ ZIP1TARGET=xhp_schart - ZIP1FLAGS= -u -r - ZIP1DIR=$(MISC)$/$(LANGDIR) - ZIP1LIST=$(LANGDIR)$/text$/schart$/* -x "*.dphh*" -x "*.hzip" -+.ENDIF - - - LINKNAME=schart -Index: helpcontent2/util/sdraw/makefile.mk -=================================================================== -RCS file: /cvs/documentation/helpcontent2/util/sdraw/makefile.mk,v -retrieving revision 1.9 -diff -u -3 -p -r1.9 makefile.mk ---- helpcontent2/util/sdraw/makefile.mk 16 Dec 2004 13:01:21 -0000 1.9 -+++ helpcontent2/util/sdraw/makefile.mk 7 Jan 2005 12:21:44 -0000 -@@ -26,6 +26,7 @@ TARGET = util - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/settings.pmk - -+.IF "$(SOLAR_JAVA)"!="" - common_build_zip:= - zip1generatedlangs=TRUE - zip1langdirs=$(aux_alllangiso) -@@ -33,6 +34,7 @@ ZIP1TARGET=xhp_sdraw - ZIP1FLAGS= -u -r - ZIP1DIR=$(MISC)$/$(LANGDIR) - ZIP1LIST=$(LANGDIR)$/text$/sdraw$/* -x "*.dphh*" -x "*.hzip" -+.ENDIF - - - LINKNAME=sdraw -Index: helpcontent2/util/shared/makefile.mk -=================================================================== -RCS file: /cvs/documentation/helpcontent2/util/shared/makefile.mk,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 makefile.mk ---- helpcontent2/util/shared/makefile.mk 16 Dec 2004 13:01:34 -0000 1.10 -+++ helpcontent2/util/shared/makefile.mk 7 Jan 2005 12:21:44 -0000 -@@ -26,6 +26,7 @@ TARGET = util - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/settings.pmk - -+.IF "$(SOLAR_JAVA)"!="" - common_build_zip:= - zip1generatedlangs=TRUE - zip1langdirs=$(aux_alllangiso) -@@ -33,6 +34,7 @@ ZIP1TARGET=xhp_shared - ZIP1FLAGS= -u -r - ZIP1DIR=$(MISC)$/$(LANGDIR) - ZIP1LIST=$(LANGDIR)$/text$/shared$/* -x "*.dphh*" -x "*.hzip" -+.ENDIF - - - LINKNAME=shared -Index: helpcontent2/util/simpress/makefile.mk -=================================================================== -RCS file: /cvs/documentation/helpcontent2/util/simpress/makefile.mk,v -retrieving revision 1.9 -diff -u -3 -p -r1.9 makefile.mk ---- helpcontent2/util/simpress/makefile.mk 16 Dec 2004 13:01:46 -0000 1.9 -+++ helpcontent2/util/simpress/makefile.mk 7 Jan 2005 12:21:44 -0000 -@@ -26,6 +26,7 @@ TARGET = util - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/settings.pmk - -+.IF "$(SOLAR_JAVA)"!="" - common_build_zip:= - zip1generatedlangs=TRUE - zip1langdirs=$(aux_alllangiso) -@@ -33,6 +34,7 @@ ZIP1TARGET=xhp_simpress - ZIP1FLAGS= -u -r - ZIP1DIR=$(MISC)$/$(LANGDIR) - ZIP1LIST=$(LANGDIR)$/text$/simpress$/* -x "*.dphh*" -x "*.hzip" -+.ENDIF - - - LINKNAME=simpress -Index: helpcontent2/util/smath/makefile.mk -=================================================================== -RCS file: /cvs/documentation/helpcontent2/util/smath/makefile.mk,v -retrieving revision 1.9 -diff -u -3 -p -r1.9 makefile.mk ---- helpcontent2/util/smath/makefile.mk 16 Dec 2004 13:01:59 -0000 1.9 -+++ helpcontent2/util/smath/makefile.mk 7 Jan 2005 12:21:44 -0000 -@@ -26,6 +26,7 @@ TARGET = util - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/settings.pmk - -+.IF "$(SOLAR_JAVA)"!="" - common_build_zip:= - zip1generatedlangs=TRUE - zip1langdirs=$(aux_alllangiso) -@@ -33,6 +34,7 @@ ZIP1TARGET=xhp_smath - ZIP1FLAGS= -u -r - ZIP1DIR=$(MISC)$/$(LANGDIR) - ZIP1LIST=$(LANGDIR)$/text$/smath$/* -x "*.dphh*" -x "*.hzip" -+.ENDIF - - - LINKNAME=smath -Index: helpcontent2/util/swriter/makefile.mk -=================================================================== -RCS file: /cvs/documentation/helpcontent2/util/swriter/makefile.mk,v -retrieving revision 1.9 -diff -u -3 -p -r1.9 makefile.mk ---- helpcontent2/util/swriter/makefile.mk 16 Dec 2004 13:02:13 -0000 1.9 -+++ helpcontent2/util/swriter/makefile.mk 7 Jan 2005 12:21:44 -0000 -@@ -26,6 +26,7 @@ TARGET = util - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/settings.pmk - -+.IF "$(SOLAR_JAVA)"!="" - common_build_zip:= - zip1generatedlangs=TRUE - zip1langdirs=$(aux_alllangiso) -@@ -33,6 +34,7 @@ ZIP1TARGET=xhp_swriter - ZIP1FLAGS= -u -r - ZIP1DIR=$(MISC)$/$(LANGDIR) - ZIP1LIST=$(LANGDIR)$/text$/swriter$/* -x "*.dphh*" -x "*.hzip" -+.ENDIF - - - LINKNAME=swriter diff --git a/patches/src680-m78/linkoo-recentfile.diff b/patches/src680-m78/linkoo-recentfile.diff deleted file mode 100644 index 4d25d2836..000000000 --- a/patches/src680-m78/linkoo-recentfile.diff +++ /dev/null @@ -1,30 +0,0 @@ -Index: solenv/bin/linkoo -=================================================================== -RCS file: /cvs/tools/solenv/bin/linkoo,v -retrieving revision 1.3 -diff -u -r1.3 linkoo ---- solenv/bin/linkoo 23 Dec 2004 10:52:43 -0000 1.3 -+++ solenv/bin/linkoo 4 Feb 2005 12:47:34 -0000 -@@ -234,6 +236,16 @@ - print "\n"; - } - -+sub fixup_evilness -+{ -+ my $name = 'librecentfile.so'; -+ my $src = "$OOO_BUILD/shell/$TARGET/lib/$name"; -+ if (-f $src) { -+ print " link $name\n"; -+ symlink $src, "$OOO_BUILD/sfx2/$TARGET/lib/$name"; -+ } -+} -+ - my $a; - my $usage = 0; - for $a (@ARGV) { -@@ -296,3 +308,5 @@ - print $env $env_script; - close ($env); - } -+ -+fixup_evilness(); diff --git a/patches/src680-m78/linkoo-resources.diff b/patches/src680-m78/linkoo-resources.diff deleted file mode 100644 index 88924ebb1..000000000 --- a/patches/src680-m78/linkoo-resources.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- solenv/bin/linkoo 9 Feb 2005 14:34:45 -0000 -+++ solenv/bin/linkoo 9 Feb 2005 15:03:18 -0000 -@@ -73,6 +73,7 @@ - export PATH=".:$PATH" - export LD_LIBRARY_PATH=".:$LD_LIBRARY_PATH" - export GNOME_DISABLE_CRASH_DIALOG=1 -+export STAR_RESOURCEPATH=`pwd`/resource - '; - - my @exceptions = ( 'cppuhelper', 'configmgr', 'cfgmgr' ); diff --git a/patches/src680-m78/no-epm-no-package.diff b/patches/src680-m78/no-epm-no-package.diff deleted file mode 100644 index 14752bab3..000000000 --- a/patches/src680-m78/no-epm-no-package.diff +++ /dev/null @@ -1,30 +0,0 @@ -Index: instsetoo_native/util/makefile.mk -=================================================================== -RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v -retrieving revision 1.14 -diff -u -r1.14 makefile.mk ---- instsetoo_native/util/makefile.mk 31 Jan 2005 10:38:15 -0000 1.14 -+++ instsetoo_native/util/makefile.mk 8 Feb 2005 12:19:41 -0000 -@@ -72,8 +72,6 @@ - - INSTALLDIR=$(OUT) - --.INCLUDE: target.mk -- - .IF "$(OS)" == "LINUX" - FORMAT*=-format rpm - .ENDIF -@@ -99,6 +97,13 @@ - # native - "Native" software distribution for the platform - # portable - Portable software distribution - -+.IF "$(FORMAT)"!="" && "$(EPM)"=="" -+dummy: -+ @echo "No EPM: do no packaging at this stage" -+.ENDIF -+ -+.INCLUDE: target.mk -+ - .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" - ALLTAR : openoffice - .ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" diff --git a/patches/src680-m79/apply b/patches/src680-m79/apply index 3e99457fe..2ec5975f0 100644 --- a/patches/src680-m79/apply +++ b/patches/src680-m79/apply @@ -78,8 +78,9 @@ wpd-detection-fix.diff odk-disable.diff # We have a 'more information' button with no euqivalent help section n#71049 hack-alienwarn.diff -# Clobber the viewshell crasher in an ugly way n#66809 -hack-sd-viewshell.diff +# fixes size of some fields in the create table wizard, n#72184; it is already fixed in m84 +# add a missing period i#45103 +wizard-table-filed-sizes.diff [ Fixes ] # fix the wizards crasher n#10512 @@ -180,7 +181,7 @@ crash-vcl-gtk-exit.diff vcl-nwf-gtk-toggle-toolitems.diff # Make template document open / creation synchronous i#43741 crash-template.diff -# Gnome 2.6 has totally different authentication (sigh) +# Gnome 2.6 has totally different authentication (sigh) i#45279 vfs-2.6-auth.diff # New writer doc comes with modified flag (i#42080) save-only-modified-doc.diff @@ -195,6 +196,18 @@ doublelockcrashonexit.diff # Fix broken condition implementation & it's mis-use i#44627 vcl-gtk-condition.diff sal-condition.diff +# Fix for spellcheck crasher i#43451, n#71931 +crash-sd-spell-selection.diff +# Fix for partial libwpd filter removal n#72313, i#45007 +crash-iodetect.diff +# Fix for sd SfxShell ordering crasher/problem n#66809, i#44830 +crash-sd-shell.diff +# Fix for multiple components defining ColRowSettings n#72869, i#45209 +crash-sc-excel.diff +# Fix for memory corrupting crasher n#66353, i#45267 +crash-print.diff +# Fix font caching n#72012, i#45298 +psprint-timestamp.diff [ LinuxOnly ] # Optimize linkage of some xmlhelp libraries # FIXME: shres @@ -227,7 +240,7 @@ gui-sc-delete.diff # Autodetect HAVE_GCC_VISIBILITY_FEATURE -- it's currently used but never # set detect-gcc-visibility.diff -#Review comments implemented for #34909 +# Review comments implemented for #34909 dbaccess-evo-changes.diff # E-mail attachment file name append with "_1" X#67684 #35780 email-attachment-underscore-zero.diff @@ -366,6 +379,7 @@ cleanup-vcl-kdeint.diff vcl-nwf-toolbars.diff vcl-nwf-menus.diff vcl-nwf-kde-toolbars-menus.diff +vcl-nwf-kde-toolbars-handle.diff # Ask the theme for the size of checkboxes and radiobuttons in KDE #43392, CWS kendy04 vcl-nwf-kde-checkboxes.diff @@ -420,8 +434,8 @@ fpicker-show-checkbox.diff fpicker-fixes.diff # fix for the gtk critical error n#66349 fpicker-gnome-crash-fix.diff -# temporary fix to enable filter detection to work properly i#10545 -sfx2-fpicker-gnome-filter-fix.diff +# Fix for the XHTML export not working against the older temporary fix n#66586 +fpicker-csv-filter-open-fix.diff # fix for the fpicker hanging on accessible desktop fpicker-accessibility-fix.diff # fix for the fpicker crashing in the Euro converter n#67124 @@ -465,6 +479,9 @@ connectivity-source-drivers-evoab1-5-EApi-cxx.diff connectivity-source-drivers-evoab1-5-EApi-h.diff # Evolution in wizards -> addressbook X#66214 wizard-evo-local.diff +# Evolution should also be default database(n#66217). +default-evolution-database.diff + [ QPro ] # Quattro Pro 6.0 import filter: IZ #41688 formel-hxx.diff @@ -668,6 +685,8 @@ cws-swqcore06.diff cws-impress35.diff # vcl36 minus check/radio size calculation patches above cws-vcl36.diff +# more XIM fixes from vcl36 IZ#44062 IZ#44068 +cws-vcl36-part2-xim.diff cws-impress34.diff cws-presfixes.diff @@ -685,6 +704,9 @@ cws-sch07.diff cws-mav16.diff cws-tbe19.diff +# A partial / hacked version of this cws: +cws-presfixes02.diff + # # Tier 3 - m83 backports # @@ -694,6 +716,13 @@ cws-os52.diff [ DependantFixes ] # Fix the print error dialog and pop-up when unable to print. BINC 64010 Issue 44695 print-error.diff +# Fix XML slide export to OO.o 1.1 ... n#71105, i#45092, i#44798 +sd-interop-1.1.diff +# Fix probably memory corruption with printer timeout n#73034, i#45318 +cups-threading.diff +# undo some of the deeply cunning delayed init i#45389 +psprint-early-init.diff + [ Mono ] mono-build.diff diff --git a/patches/src680-m79/crash-sd-spell-selection.diff b/patches/src680-m79/crash-sd-spell-selection.diff new file mode 100644 index 000000000..ddfcc4ba7 --- /dev/null +++ b/patches/src680-m79/crash-sd-spell-selection.diff @@ -0,0 +1,28 @@ +--- sd/source/ui/view/Outliner.cxx ++++ sd/source/ui/view/Outliner.cxx +@@ -501,17 +501,19 @@ void Outliner::HandleOutsideChange (Chan + bool bFoundNextSentence = false; + while ( ! bFoundNextSentence) + { +- ESelection aCurrentSelection (GetView(0)->GetSelection()); +- if ( ! mbMatchMayExist +- && maStartSelection.IsLess(aCurrentSelection)) +- EndOfSearch(); +- +- // Advance to the next sentence. + OutlinerView* pOutlinerView = GetView(0); + if (pOutlinerView != NULL) ++ { ++ ESelection aCurrentSelection (pOutlinerView->GetSelection()); ++ if ( ! mbMatchMayExist ++ && maStartSelection.IsLess(aCurrentSelection)) ++ EndOfSearch(); ++ ++ // Advance to the next sentence. + bFoundNextSentence = SpellSentence ( + pOutlinerView->GetEditView(), + aResult); ++ } + + // When no sentence with spelling errors has been found in the + // currently selected text shape or there is no selected text diff --git a/patches/src680-m79/cws-presfixes02.diff b/patches/src680-m79/cws-presfixes02.diff new file mode 100644 index 000000000..e0c2381dc --- /dev/null +++ b/patches/src680-m79/cws-presfixes02.diff @@ -0,0 +1,1568 @@ +Index: source/mtfrenderer/mtftools.cxx +=================================================================== +RCS file: /cvs/gsl/cppcanvas/source/mtfrenderer/mtftools.cxx,v +retrieving revision 1.3.6.1 +diff -u -r1.3.6.1 mtftools.cxx +--- cppcanvas/source/mtfrenderer/mtftools.cxx 16 Feb 2005 11:14:28 -0000 1.3.6.1 ++++ cppcanvas/source/mtfrenderer/mtftools.cxx 10 Mar 2005 14:25:17 -0000 +@@ -59,27 +59,67 @@ + * + ************************************************************************/ + ++#include <canvas/debug.hxx> ++#include <canvas/verbosetrace.hxx> ++ + #include <mtftools.hxx> + #include <outdevstate.hxx> ++#include <polypolyaction.hxx> + + #ifndef _COM_SUN_STAR_RENDERING_RENDERSTATE_HPP__ + #include <com/sun/star/rendering/RenderState.hpp> + #endif ++#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP__ ++#include <com/sun/star/rendering/XCanvas.hpp> ++#endif + ++#ifndef _BGFX_NUMERIC_FTOOLS_HXX ++#include <basegfx/numeric/ftools.hxx> ++#endif ++#ifndef _BGFX_TOOLS_CANVASTOOLS_HXX ++#include <basegfx/tools/canvastools.hxx> ++#endif ++#ifndef _BGFX_POLYGON_B2DPOLYGONTOOLS_HXX ++#include <basegfx/polygon/b2dpolygontools.hxx> ++#endif ++#ifndef _BGFX_POLYGON_B2DPOLYGON_HXX ++#include <basegfx/polygon/b2dpolygon.hxx> ++#endif ++#ifndef _BGFX_RANGE_B2DRECTANGLE_HXX ++#include <basegfx/range/b2drectangle.hxx> ++#endif ++#ifndef _BGFX_VECTOR_B2DVECTOR_HXX ++#include <basegfx/vector/b2dvector.hxx> ++#endif + #ifndef _CANVAS_CANVASTOOLS_HXX + #include <canvas/canvastools.hxx> + #endif + ++#ifndef _SV_GDIMTF_HXX ++#include <vcl/gdimtf.hxx> ++#endif ++#ifndef _SV_METAACT_HXX ++#include <vcl/metaact.hxx> ++#endif ++#ifndef _SV_VIRDEV_HXX ++#include <vcl/virdev.hxx> ++#endif ++#ifndef _SV_METRIC_HXX ++#include <vcl/metric.hxx> ++#endif ++#ifndef _TL_POLY_HXX ++#include <tools/poly.hxx> ++#endif ++ + + using namespace ::com::sun::star; + + namespace cppcanvas + { +- + namespace tools + { +- void initRenderState( ::com::sun::star::rendering::RenderState& renderState, +- const struct ::cppcanvas::internal::OutDevState& outdevState ) ++ void initRenderState( rendering::RenderState& renderState, ++ const ::cppcanvas::internal::OutDevState& outdevState ) + { + ::canvas::tools::initRenderState( renderState ); + ::canvas::tools::setRenderStateTransform( renderState, +@@ -87,6 +127,422 @@ + renderState.Clip = outdevState.xClipPoly; + } + +- } ++ ++ ::basegfx::B2DHomMatrix& calcLogic2PixelLinearTransform( ::basegfx::B2DHomMatrix& o_rMatrix, ++ const VirtualDevice& rVDev ) ++ { ++ // select size value in the middle of the available range, ++ // to have headroom both when map mode scales up, and when ++ // it scales down. ++ const ::Size aSizeLogic( 0x00010000L, ++ 0x00010000L ); ++ ++ const ::Size aSizePixel( rVDev.LogicToPixel( aSizeLogic ) ); ++ ++ o_rMatrix.identity(); ++ o_rMatrix.scale( aSizePixel.Width() / (double)aSizeLogic.Width(), ++ aSizePixel.Height() / (double)aSizeLogic.Height() ); ++ ++ return o_rMatrix; ++ } ++ ++ bool modifyClip( rendering::RenderState& o_rRenderState, ++ const struct ::cppcanvas::internal::OutDevState& rOutdevState, ++ const CanvasSharedPtr& rCanvas, ++ const ::basegfx::B2DPoint& rOffset, ++ const ::basegfx::B2DVector* pScaling ) ++ { ++ const ::Point aEmptyPoint; ++ ++ const bool bOffsetting( !rOffset.equalZero() ); ++ const bool bScaling( pScaling && ++ pScaling->getX() != 1.0 && ++ pScaling->getY() != 1.0 ); ++ ++ if( !bOffsetting && !bScaling ) ++ return false; // nothing to do ++ ++ if( rOutdevState.clip.count() ) ++ { ++ // general polygon case ++ ++ ::basegfx::B2DPolyPolygon aLocalClip( rOutdevState.clip ); ++ ::basegfx::B2DHomMatrix aTransform; ++ ++ if( bOffsetting ) ++ aTransform.translate( -rOffset.getX(), ++ -rOffset.getY() ); ++ if( bScaling ) ++ aTransform.scale( 1.0/pScaling->getX(), 1.0/pScaling->getY() ); ++ ++ aLocalClip.transform( aTransform ); ++ ++ o_rRenderState.Clip = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( ++ rCanvas->getUNOCanvas()->getDevice(), ++ aLocalClip ); ++ ++ return true; ++ } ++ else if( !rOutdevState.clipRect.IsEmpty() ) ++ { ++ // simple rect case ++ ++ const ::Rectangle aLocalClipRect( rOutdevState.clipRect ); ++ ++ if( bScaling ) ++ { ++ // scale and offset - do it on the fly, have to ++ // convert to float anyway. ++ o_rRenderState.Clip = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( ++ rCanvas->getUNOCanvas()->getDevice(), ++ ::basegfx::B2DPolyPolygon( ++ ::basegfx::tools::createPolygonFromRect( ++ ::basegfx::B2DRectangle( ++ (double)(aLocalClipRect.Left() - rOffset.getX())/pScaling->getX(), ++ (double)(aLocalClipRect.Top() - rOffset.getY())/pScaling->getY(), ++ (double)(aLocalClipRect.Right() - rOffset.getX())/pScaling->getX(), ++ (double)(aLocalClipRect.Bottom() - rOffset.getY())/pScaling->getY() ) ) ) ); ++ } ++ else ++ { ++ // offset only - do it on the fly, have to convert ++ // to float anyway. ++ o_rRenderState.Clip = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( ++ rCanvas->getUNOCanvas()->getDevice(), ++ ::basegfx::B2DPolyPolygon( ++ ::basegfx::tools::createPolygonFromRect( ++ ::basegfx::B2DRectangle( aLocalClipRect.Left() - rOffset.getX(), ++ aLocalClipRect.Top() - rOffset.getY(), ++ aLocalClipRect.Right() - rOffset.getX(), ++ aLocalClipRect.Bottom() - rOffset.getY() ) ) ) ); ++ } ++ ++ return true; ++ } ++ ++ // empty clip, nothing to do ++ return false; ++ } ++ ++ bool modifyClip( rendering::RenderState& o_rRenderState, ++ const struct ::cppcanvas::internal::OutDevState& rOutdevState, ++ const CanvasSharedPtr& rCanvas, ++ const ::Point& rOffset, ++ const ::basegfx::B2DVector* pScaling ) ++ { ++ return modifyClip( o_rRenderState, ++ rOutdevState, ++ rCanvas, ++ ::basegfx::B2DPoint( rOffset.X(), ++ rOffset.Y() ), ++ pScaling ); ++ } ++ ++ bool modifyClip( rendering::RenderState& o_rRenderState, ++ const struct ::cppcanvas::internal::OutDevState& rOutdevState, ++ const CanvasSharedPtr& rCanvas, ++ const ::basegfx::B2DHomMatrix& rTransform ) ++ { ++ if( !rTransform.isIdentity() || ++ !rTransform.isInvertible() ) ++ return false; // nothing to do ++ ++ ::basegfx::B2DPolyPolygon aLocalClip; ++ ++ if( rOutdevState.clip.count() ) ++ { ++ aLocalClip = rOutdevState.clip; ++ } ++ else if( !rOutdevState.clipRect.IsEmpty() ) ++ { ++ const ::Rectangle aLocalClipRect( rOutdevState.clipRect ); + ++ aLocalClip = ::basegfx::B2DPolyPolygon( ++ ::basegfx::tools::createPolygonFromRect( ++ ::basegfx::B2DRectangle( ++ aLocalClipRect.Left(), ++ aLocalClipRect.Top(), ++ aLocalClipRect.Right(), ++ aLocalClipRect.Bottom() ) ) ); ++ } ++ else ++ { ++ // empty clip, nothing to do ++ return false; ++ } ++ ++ // invert transformation and modify ++ ::basegfx::B2DHomMatrix aLocalTransform( rTransform ); ++ aLocalTransform.invert(); ++ ++ aLocalClip.transform( aLocalTransform ); ++ ++ o_rRenderState.Clip = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( ++ rCanvas->getUNOCanvas()->getDevice(), ++ aLocalClip ); ++ ++ return true; ++ } ++ ++ // create underline/strikeout line info struct ++ TextLineInfo createTextLineInfo( const ::VirtualDevice& rVDev, ++ const ::cppcanvas::internal::OutDevState& rState ) ++ { ++ const BOOL bOldMode( rVDev.IsMapModeEnabled() ); ++ ++ // will restore map mode below ++ const_cast< ::VirtualDevice& >(rVDev).EnableMapMode( FALSE ); ++ ++ const ::FontMetric aMetric = rVDev.GetFontMetric(); ++ ++ TextLineInfo aTextInfo( ++ (aMetric.GetDescent() + 2) / 4.0, ++ aMetric.GetDescent() / 2.0, ++ (aMetric.GetIntLeading() - aMetric.GetAscent()) / 3.0, ++ rState.textUnderlineStyle, ++ rState.textStrikeoutStyle ); ++ ++ const_cast< ::VirtualDevice& >(rVDev).EnableMapMode( bOldMode ); ++ ++ return aTextInfo; ++ } ++ ++ namespace ++ { ++ void appendRect( ::basegfx::B2DPolyPolygon& o_rPoly, ++ const ::basegfx::B2DPoint& rStartPos, ++ const double nX1, ++ const double nY1, ++ const double nX2, ++ const double nY2 ) ++ { ++ const double x( rStartPos.getX() ); ++ const double y( rStartPos.getY() ); ++ ++ o_rPoly.append( ++ ::basegfx::tools::createPolygonFromRect( ++ ::basegfx::B2DRectangle( x + nX1, y + nY1, x + nX2, y + nY2 ) ) ); ++ } ++ ++ void appendRect( ::basegfx::B2DPolyPolygon& o_rPoly, ++ const double nX1, ++ const double nY1, ++ const double nX2, ++ const double nY2 ) ++ { ++ o_rPoly.append( ++ ::basegfx::tools::createPolygonFromRect( ++ ::basegfx::B2DRectangle( nX1, nY1, nX2, nY2 ) ) ); ++ } ++ ++ void appendDashes( ::basegfx::B2DPolyPolygon& o_rPoly, ++ const double nX, ++ const double nY, ++ const double nLineWidth, ++ const double nLineHeight, ++ const double nDashWidth, ++ const double nDashSkip ) ++ { ++ const sal_Int32 nNumLoops( ++ static_cast< sal_Int32 >( ++ ::std::max( 1.0, ++ nLineWidth / nDashSkip ) + .5) ); ++ ++ double x = nX; ++ for( sal_Int32 i=0; i<nNumLoops; ++i ) ++ { ++ appendRect( o_rPoly, ++ x, nY, ++ x + nDashWidth, nY + nLineHeight ); ++ ++ x += nDashSkip; ++ } ++ } ++ } ++ ++ // create line actions for text such as underline and ++ // strikeout ++ ::basegfx::B2DPolyPolygon createTextLinesPolyPolygon( const ::basegfx::B2DPoint rStartPos, ++ const double& rLineWidth, ++ const TextLineInfo& rTextLineInfo ) ++ { ++ // fill the polypolygon with all text lines ++ ::basegfx::B2DPolyPolygon aTextLinesPolyPoly; ++ ++ switch( rTextLineInfo.mnUnderlineStyle ) ++ { ++ case UNDERLINE_NONE: // nothing to do ++ // FALLTHROUGH intended ++ case UNDERLINE_DONTKNOW: ++ break; ++ ++ case UNDERLINE_SMALLWAVE: // TODO(F3): NYI ++ // FALLTHROUGH intended ++ case UNDERLINE_WAVE: // TODO(F3): NYI ++ // FALLTHROUGH intended ++ case UNDERLINE_SINGLE: ++ appendRect( ++ aTextLinesPolyPoly, ++ rStartPos, ++ 0, ++ rTextLineInfo.mnUnderlineOffset, ++ rLineWidth, ++ rTextLineInfo.mnUnderlineOffset + rTextLineInfo.mnLineHeight ); ++ break; ++ ++ case UNDERLINE_BOLDDOTTED: // TODO(F3): NYI ++ // FALLTHROUGH intended ++ case UNDERLINE_BOLDDASH: // TODO(F3): NYI ++ // FALLTHROUGH intended ++ case UNDERLINE_BOLDLONGDASH: // TODO(F3): NYI ++ // FALLTHROUGH intended ++ case UNDERLINE_BOLDDASHDOT: // TODO(F3): NYI ++ // FALLTHROUGH intended ++ case UNDERLINE_BOLDDASHDOTDOT:// TODO(F3): NYI ++ // FALLTHROUGH intended ++ case UNDERLINE_BOLDWAVE: // TODO(F3): NYI ++ // FALLTHROUGH intended ++ case UNDERLINE_BOLD: ++ appendRect( ++ aTextLinesPolyPoly, ++ rStartPos, ++ 0, ++ rTextLineInfo.mnUnderlineOffset, ++ rLineWidth, ++ rTextLineInfo.mnUnderlineOffset + 2*rTextLineInfo.mnLineHeight ); ++ break; ++ ++ case UNDERLINE_DOUBLEWAVE: // TODO(F3): NYI ++ // FALLTHROUGH intended ++ case UNDERLINE_DOUBLE: ++ appendRect( ++ aTextLinesPolyPoly, ++ rStartPos, ++ 0, ++ rTextLineInfo.mnUnderlineOffset - rTextLineInfo.mnLineHeight, ++ rLineWidth, ++ rTextLineInfo.mnUnderlineOffset ); ++ ++ appendRect( ++ aTextLinesPolyPoly, ++ rStartPos, ++ 0, ++ rTextLineInfo.mnUnderlineOffset + 2*rTextLineInfo.mnLineHeight, ++ rLineWidth, ++ rTextLineInfo.mnUnderlineOffset + 3*rTextLineInfo.mnLineHeight ); ++ break; ++ ++ case UNDERLINE_DASHDOTDOT: // TODO(F3): NYI ++ // FALLTHROUGH intended ++ case UNDERLINE_DOTTED: ++ appendDashes( ++ aTextLinesPolyPoly, ++ rStartPos.getX(), ++ rStartPos.getY() + rTextLineInfo.mnUnderlineOffset, ++ rLineWidth, ++ rTextLineInfo.mnLineHeight, ++ rTextLineInfo.mnLineHeight, ++ 2*rTextLineInfo.mnLineHeight ); ++ break; ++ ++ case UNDERLINE_DASHDOT: // TODO(F3): NYI ++ // FALLTHROUGH intended ++ case UNDERLINE_DASH: ++ appendDashes( ++ aTextLinesPolyPoly, ++ rStartPos.getX(), ++ rStartPos.getY() + rTextLineInfo.mnUnderlineOffset, ++ rLineWidth, ++ rTextLineInfo.mnLineHeight, ++ 3*rTextLineInfo.mnLineHeight, ++ 6*rTextLineInfo.mnLineHeight ); ++ break; ++ ++ case UNDERLINE_LONGDASH: ++ appendDashes( ++ aTextLinesPolyPoly, ++ rStartPos.getX(), ++ rStartPos.getY() + rTextLineInfo.mnUnderlineOffset, ++ rLineWidth, ++ rTextLineInfo.mnLineHeight, ++ 6*rTextLineInfo.mnLineHeight, ++ 12*rTextLineInfo.mnLineHeight ); ++ break; ++ ++ default: ++ ENSURE_AND_THROW( false, ++ "::cppcanvas::internal::createTextLinesPolyPolygon(): Unexpected underline case" ); ++ } ++ ++ switch( rTextLineInfo.mnStrikeoutStyle ) ++ { ++ case STRIKEOUT_NONE: // nothing to do ++ // FALLTHROUGH intended ++ case STRIKEOUT_DONTKNOW: ++ break; ++ ++ case STRIKEOUT_SLASH: // TODO(Q1): we should handle this in the text layer ++ // FALLTHROUGH intended ++ case STRIKEOUT_X: ++ break; ++ ++ case STRIKEOUT_SINGLE: ++ appendRect( ++ aTextLinesPolyPoly, ++ rStartPos, ++ 0, ++ rTextLineInfo.mnStrikeoutOffset, ++ rLineWidth, ++ rTextLineInfo.mnStrikeoutOffset + rTextLineInfo.mnLineHeight ); ++ break; ++ ++ case STRIKEOUT_BOLD: ++ appendRect( ++ aTextLinesPolyPoly, ++ rStartPos, ++ 0, ++ rTextLineInfo.mnStrikeoutOffset, ++ rLineWidth, ++ rTextLineInfo.mnStrikeoutOffset + 2*rTextLineInfo.mnLineHeight ); ++ break; ++ ++ case STRIKEOUT_DOUBLE: ++ appendRect( ++ aTextLinesPolyPoly, ++ rStartPos, ++ 0, ++ rTextLineInfo.mnStrikeoutOffset - rTextLineInfo.mnLineHeight, ++ rLineWidth, ++ rTextLineInfo.mnStrikeoutOffset ); ++ ++ appendRect( ++ aTextLinesPolyPoly, ++ rStartPos, ++ 0, ++ rTextLineInfo.mnStrikeoutOffset + 2*rTextLineInfo.mnLineHeight, ++ rLineWidth, ++ rTextLineInfo.mnStrikeoutOffset + 3*rTextLineInfo.mnLineHeight ); ++ break; ++ ++ default: ++ ENSURE_AND_THROW( false, ++ "::cppcanvas::internal::createTextLinesPolyPolygon(): Unexpected strikeout case" ); ++ } ++ ++ return aTextLinesPolyPoly; ++ } ++ ++ // create line actions for text such as underline and ++ // strikeout ++ ::basegfx::B2DPolyPolygon createTextLinesPolyPolygon( const double& rStartOffset, ++ const double& rLineWidth, ++ const TextLineInfo& rTextLineInfo ) ++ { ++ return createTextLinesPolyPolygon( ++ ::basegfx::B2DPoint( rStartOffset, ++ 0.0 ), ++ rLineWidth, ++ rTextLineInfo ); ++ } ++ } + } + +Index: source/mtfrenderer/mtftools.hxx +=================================================================== +RCS file: /cvs/gsl/cppcanvas/source/mtfrenderer/mtftools.hxx,v +retrieving revision 1.2.22.1 +diff -u -r1.2.22.1 mtftools.hxx +--- cppcanvas/source/mtfrenderer/mtftools.hxx 16 Feb 2005 11:14:28 -0000 1.2.22.1 ++++ cppcanvas/source/mtfrenderer/mtftools.hxx 10 Mar 2005 14:25:17 -0000 +@@ -62,10 +62,19 @@ + #ifndef _CPPCANVAS_RENDERER_MTFTOOLS_HXX + #define _CPPCANVAS_RENDERER_MTFTOOLS_HXX + +-#ifndef _SAL_TYPES_H_ +-# include <sal/types.h> +-#endif ++#include <action.hxx> ++#include <cppcanvas/canvas.hxx> + ++ ++class VirtualDevice; ++class Point; ++class Size; ++ ++namespace basegfx ++{ ++ class B2DVector; ++ class B2DPoint; ++} + namespace com { namespace sun { namespace star { namespace rendering + { + struct RenderState; +@@ -81,8 +90,159 @@ + + namespace tools + { ++ /** Init render state from OutDevState ++ ++ This method initializes the given render state object, ++ sets up the transformation and the clip from the ++ OutDevState. ++ */ + void initRenderState( ::com::sun::star::rendering::RenderState& renderState, + const ::cppcanvas::internal::OutDevState& outdevState ); ++ ++ /** Construct a matrix that converts from logical to pixel ++ coordinate system. ++ ++ This method calculates a matrix that approximates the ++ VirtualDevice's LogicToPixel conversion (disregarding any ++ offset components, thus the 'linear' in the method name - ++ the returned matrix is guaranteed to be linear). ++ ++ @param o_rMatrix ++ This matrix will receive the calculated transform, and is ++ also returned from this method. ++ ++ @return the calculated transformation matrix. ++ */ ++ ::basegfx::B2DHomMatrix& calcLogic2PixelLinearTransform( ::basegfx::B2DHomMatrix& o_rMatrix, ++ const VirtualDevice& rVDev ); ++ ++ /** This method modifies the clip, to cancel the given ++ transformation. ++ ++ As the clip is relative to the render state ++ transformation, offsetting or scaling the render state ++ must modify the clip, to keep it at the same position ++ relative to the primitive at hand ++ ++ @param o_rRenderState ++ Render state to change the clip in ++ ++ @param rOutdevState ++ Input state. Is used to retrieve the original clip from ++ ++ @param rOffset ++ The clip is offsetted by the negative of this value. ++ ++ @param pScaling ++ The clip is inversely scaled by this value (if given) ++ ++ @return true, if the clip has changed, false if not ++ */ ++ bool modifyClip( ::com::sun::star::rendering::RenderState& o_rRenderState, ++ const struct ::cppcanvas::internal::OutDevState& rOutdevState, ++ const CanvasSharedPtr& rCanvas, ++ const ::Point& rOffset, ++ const ::basegfx::B2DVector* pScaling ); ++ ++ /** This method modifies the clip, to cancel the given ++ transformation. ++ ++ As the clip is relative to the render state ++ transformation, offsetting or scaling the render state ++ must modify the clip, to keep it at the same position ++ relative to the primitive at hand ++ ++ @param o_rRenderState ++ Render state to change the clip in ++ ++ @param rOutdevState ++ Input state. Is used to retrieve the original clip from ++ ++ @param rOffset ++ The clip is offsetted by the negative of this value. ++ ++ @param pScaling ++ The clip is inversely scaled by this value (if given) ++ ++ @return true, if the clip has changed, false if not ++ */ ++ bool modifyClip( ::com::sun::star::rendering::RenderState& o_rRenderState, ++ const struct ::cppcanvas::internal::OutDevState& rOutdevState, ++ const CanvasSharedPtr& rCanvas, ++ const ::basegfx::B2DPoint& rOffset, ++ const ::basegfx::B2DVector* pScaling ); ++ ++ /** This method modifies the clip, to cancel the given ++ transformation. ++ ++ As the clip is relative to the render state ++ transformation, transforming the render state further must ++ modify the clip, to keep it at the same position relative ++ to the primitive at hand ++ ++ @param o_rRenderState ++ Render state to change the clip in ++ ++ @param rOutdevState ++ Input state. Is used to retrieve the original clip from ++ ++ @param rTransform ++ The clip is transformed by the inverse of this value. ++ ++ @return true, if the clip has changed, false if not ++ */ ++ bool modifyClip( ::com::sun::star::rendering::RenderState& o_rRenderState, ++ const struct ::cppcanvas::internal::OutDevState& rOutdevState, ++ const CanvasSharedPtr& rCanvas, ++ const ::basegfx::B2DHomMatrix& rTransform ); ++ ++ struct TextLineInfo ++ { ++ TextLineInfo( const double& rLineHeight, ++ const double& rUnderlineOffset, ++ const double& rStrikeoutOffset, ++ sal_Int8 nUnderlineStyle, ++ sal_Int8 nStrikeoutStyle ) : ++ mnLineHeight( rLineHeight ), ++ mnUnderlineOffset( rUnderlineOffset ), ++ mnStrikeoutOffset( rStrikeoutOffset ), ++ mnUnderlineStyle( nUnderlineStyle ), ++ mnStrikeoutStyle( nStrikeoutStyle ) ++ { ++ } ++ ++ double mnLineHeight; ++ double mnUnderlineOffset; ++ double mnStrikeoutOffset; ++ sal_Int8 mnUnderlineStyle; ++ sal_Int8 mnStrikeoutStyle; ++ }; ++ ++ /** Generate text underline/strikeout info struct from OutDev ++ state. ++ */ ++ TextLineInfo createTextLineInfo( const ::VirtualDevice& rVDev, ++ const ::cppcanvas::internal::OutDevState& rState ); ++ ++ /** Create a poly-polygon representing the given combination ++ of strikeout and underline. ++ ++ @param rStartOffset ++ Offset in X direction, where the underline starts ++ ++ @param rLineWidth ++ Width of the line of text to underline/strikeout ++ ++ @param rTextLineInfo ++ Common info needed for strikeout/underline generation ++ */ ++ ::basegfx::B2DPolyPolygon createTextLinesPolyPolygon( const double& rStartOffset, ++ const double& rLineWidth, ++ const TextLineInfo& rTextLineInfo ); ++ ++ ::basegfx::B2DPolyPolygon createTextLinesPolyPolygon( const ::basegfx::B2DPoint rStartPos, ++ const double& rLineWidth, ++ const TextLineInfo& rTextLineInfo ); + } + } + + +Index: cppcanvas/source/inc/action.hxx +=================================================================== +RCS file: /cvs/gsl/cppcanvas/source/inc/action.hxx,v +retrieving revision 1.4 +diff -u -r1.4 action.hxx +--- cppcanvas/source/inc/action.hxx 26 Nov 2004 20:53:15 -0000 1.4 ++++ cppcanvas/source/inc/action.hxx 10 Mar 2005 14:25:16 -0000 +@@ -62,8 +62,8 @@ + #ifndef _CPPCANVAS_ACTION_HXX + #define _CPPCANVAS_ACTION_HXX + +-#ifndef _SAL_CONFIG_H_ +-#include <sal/config.h> ++#ifndef _SAL_TYPES_H_ ++#include <sal/types.h> + #endif + + #ifndef BOOST_SHARED_PTR_HPP_INCLUDED +@@ -75,16 +75,55 @@ + class B2DHomMatrix; + } + ++ + /* Definition of Action interface */ + + namespace cppcanvas + { + namespace internal + { ++ /** Interface for internal render actions + ++ This interface is implemented by all objects generated ++ from the metafile renderer, and corresponds roughly to the ++ VCL meta action. ++ */ + class Action + { + public: ++ /** Used for rendering action subsets ++ ++ There are several cases where an Action might have ++ subsettable content, e.g. text, or referenced ++ metafiles, like the transparent action. ++ ++ Generally, at the metafile renderer, all actions are ++ 'flattened' out, i.e. a meta action rendering the ++ string "Hello" counts five indices, and a transparent ++ action containing a metafile with 100 actions counts ++ at least 100 indices (contained transparency or text ++ actions recursively add to this value). From the ++ outside, the subset to render is referenced via this ++ flat index range ++ */ ++ struct Subset ++ { ++ /** Denotes start of the subset. ++ ++ The index given here specifies the first subaction ++ to render. ++ */ ++ sal_Int32 mnSubsetBegin; ++ ++ /** Denotes end of the subset ++ ++ The index given here specifies the first subaction ++ <em>not<em> to render, i.e. one action behind the ++ subset to be rendered ++ */ ++ sal_Int32 mnSubsetEnd; ++ }; ++ + virtual ~Action() {} + + /** Render this action to the associated canvas +@@ -93,6 +132,7 @@ + Transformation matrix to apply before rendering + */ + virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const = 0; ++ virtual sal_Int32 getActionCount() { return 1; } + }; + + typedef ::boost::shared_ptr< Action > ActionSharedPtr; + + +Index: cppcanvas/source/mtfrenderer/bitmapaction.cxx +=================================================================== +RCS file: /cvs/gsl/cppcanvas/source/mtfrenderer/bitmapaction.cxx,v +retrieving revision 1.3.6.1 +diff -u -r1.3.6.1 bitmapaction.cxx +--- cppcanvas/source/mtfrenderer/bitmapaction.cxx 16 Feb 2005 11:14:26 -0000 1.3.6.1 ++++ cppcanvas/source/mtfrenderer/bitmapaction.cxx 10 Mar 2005 14:25:16 -0000 +@@ -86,10 +86,15 @@ + #ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX + #include <basegfx/matrix/b2dhommatrix.hxx> + #endif ++#ifndef _BGFX_VECTOR_B2DSIZE_HXX ++#include <basegfx/vector/b2dsize.hxx> ++#endif + #ifndef _BGFX_TOOLS_CANVASTOOLS_HXX + #include <basegfx/tools/canvastools.hxx> + #endif + ++#include <boost/utility.hpp> ++ + #include <mtftools.hxx> + + +@@ -99,127 +104,143 @@ + { + namespace internal + { +- // free support functions +- // ====================== + namespace + { +- /** Setup transformation such that the next render call is +- moved rPoint away. +- */ +- void implSetupTransform( rendering::RenderState& rRenderState, +- const Point& rPoint ) +- { +- ::basegfx::B2DHomMatrix aLocalTransformation; +- +- aLocalTransformation.translate( rPoint.X(), +- rPoint.Y() ); +- ::canvas::tools::appendToRenderState( rRenderState, +- aLocalTransformation ); +- } + +- /** Setup transformation such that the next render call is +- moved rPoint away, and scaled according to the ratio +- given by src and dst size. +- */ +- void implSetupTransform( rendering::RenderState& rRenderState, +- const Point& rPoint, +- const Size& rSrcSize, +- const Size& rDstSize ) ++ class BitmapAction : public Action, private ::boost::noncopyable ++ { ++ public: ++ BitmapAction( const ::BitmapEx&, ++ const ::Point& rDstPoint, ++ const CanvasSharedPtr&, ++ const OutDevState& ); ++ BitmapAction( const ::BitmapEx&, ++ const ::Point& rDstPoint, ++ const ::Size& rDstSize, ++ const CanvasSharedPtr&, ++ const OutDevState& ); ++ ++ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; ++ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, ++ const Subset& rSubset ) const; ++ ++ virtual sal_Int32 getActionCount() const; ++ ++ private: ++ uno::Reference< rendering::XBitmap > mxBitmap; ++ CanvasSharedPtr mpCanvas; ++ rendering::RenderState maState; ++ }; ++ ++ ++ BitmapAction::BitmapAction( const ::BitmapEx& rBmpEx, ++ const ::Point& rDstPoint, ++ const CanvasSharedPtr& rCanvas, ++ const OutDevState& rState ) : ++ mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), ++ rBmpEx ) ), ++ mpCanvas( rCanvas ), ++ maState() + { ++ tools::initRenderState(maState,rState); ++ ++ // Setup transformation such that the next render call is ++ // moved rPoint away. + ::basegfx::B2DHomMatrix aLocalTransformation; +- +- aLocalTransformation.scale( static_cast<double>(rDstSize.Width()) / rSrcSize.Width(), +- static_cast<double>(rDstSize.Height()) / rSrcSize.Height() ); +- aLocalTransformation.translate( rPoint.X(), +- rPoint.Y() ); +- ::canvas::tools::appendToRenderState( rRenderState, ++ aLocalTransformation.translate( rDstPoint.X(), ++ rDstPoint.Y() ); ++ ::canvas::tools::appendToRenderState( maState, + aLocalTransformation ); ++ ++ // correct clip (which is relative to original transform) ++ tools::modifyClip( maState, rState, rCanvas, rDstPoint, NULL ); + } + +- /** Setup transformation such that the next render call +- paints the content given by the src area into the dst +- area. No clipping is set whatsoever. +- */ +- void implSetupTransform( rendering::RenderState& rRenderState, +- const Point& rSrcPoint, +- const Size& rSrcSize, +- const Point& rDstPoint, +- const Size& rDstSize ) ++ BitmapAction::BitmapAction( const ::BitmapEx& rBmpEx, ++ const ::Point& rDstPoint, ++ const ::Size& rDstSize, ++ const CanvasSharedPtr& rCanvas, ++ const OutDevState& rState ) : ++ mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), ++ rBmpEx ) ), ++ mpCanvas( rCanvas ), ++ maState() + { ++ tools::initRenderState(maState,rState); ++ ++ // Setup transformation such that the next render call is ++ // moved rPoint away, and scaled according to the ratio ++ // given by src and dst size. ++ const ::Size aBmpSize( rBmpEx.GetSizePixel() ); + ::basegfx::B2DHomMatrix aLocalTransformation; + +- aLocalTransformation.scale( static_cast<double>(rDstSize.Width()) / rSrcSize.Width(), +- static_cast<double>(rDstSize.Height()) / rSrcSize.Height() ); +- aLocalTransformation.translate( rDstPoint.X() - rSrcPoint.X(), +- rDstPoint.Y() - rSrcPoint.Y() ); +- ::canvas::tools::appendToRenderState( rRenderState, ++ const ::basegfx::B2DSize aScale( static_cast<double>(rDstSize.Width()) / aBmpSize.Width(), ++ static_cast<double>(rDstSize.Height()) / aBmpSize.Height() ); ++ aLocalTransformation.scale( aScale.getX(), aScale.getY() ); ++ aLocalTransformation.translate( rDstPoint.X(), ++ rDstPoint.Y() ); ++ ::canvas::tools::appendToRenderState( maState, + aLocalTransformation ); ++ ++ // correct clip (which is relative to original transform) ++ tools::modifyClip( maState, rState, rCanvas, rDstPoint, &aScale ); + } +- } + +- BitmapAction::BitmapAction( const ::BitmapEx& rBmpEx, +- const ::Point& rDstPoint, +- const CanvasSharedPtr& rCanvas, +- const OutDevState& rState ) : +- mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), +- rBmpEx ) ), +- mpCanvas( rCanvas ), +- maState() +- { +- tools::initRenderState(maState,rState); +- implSetupTransform( maState, rDstPoint ); +- } +- +- BitmapAction::BitmapAction( const ::BitmapEx& rBmpEx, +- const ::Point& rDstPoint, +- const ::Size& rDstSize, +- const CanvasSharedPtr& rCanvas, +- const OutDevState& rState ) : +- mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), +- rBmpEx ) ), +- mpCanvas( rCanvas ), +- maState() +- { +- tools::initRenderState(maState,rState); +- implSetupTransform( maState, rDstPoint, rBmpEx.GetSizePixel(), rDstSize ); +- } +- +- BitmapAction::BitmapAction( const ::BitmapEx& rBmpEx, +- const ::Point& rSrcPoint, +- const ::Size& rSrcSize, +- const ::Point& rDstPoint, +- const ::Size& rDstSize, +- const CanvasSharedPtr& rCanvas, +- const OutDevState& rState ) : +- mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), +- rBmpEx ) ), +- mpCanvas( rCanvas ), +- maState() +- { +- tools::initRenderState(maState,rState); ++ bool BitmapAction::render( const ::basegfx::B2DHomMatrix& rTransformation ) const ++ { ++ RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::BitmapAction::render()" ); ++ RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::BitmapAction: 0x%X", this ); + +- // TODO(F2): setup clipping/extract only part of the bitmap +- implSetupTransform( maState, rSrcPoint, rSrcSize, rDstPoint, rDstSize ); +- } ++ rendering::RenderState aLocalState( maState ); ++ ::canvas::tools::prependToRenderState(aLocalState, rTransformation); + +- BitmapAction::~BitmapAction() +- { +- } ++ mpCanvas->getUNOCanvas()->drawBitmap( mxBitmap, ++ mpCanvas->getViewState(), ++ aLocalState ); + +- bool BitmapAction::render( const ::basegfx::B2DHomMatrix& rTransformation ) const +- { +- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::BitmapAction::render()" ); +- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::BitmapAction: 0x%X", this ); +- +- rendering::RenderState aLocalState( maState ); +- ::canvas::tools::prependToRenderState(aLocalState, rTransformation); ++ return true; ++ } + +- mpCanvas->getUNOCanvas()->drawBitmap( mxBitmap, +- mpCanvas->getViewState(), +- aLocalState ); ++ bool BitmapAction::render( const ::basegfx::B2DHomMatrix& rTransformation, ++ const Subset& rSubset ) const ++ { ++ // bitmap only contains a single action, fail if subset ++ // requests different range ++ if( rSubset.mnSubsetBegin != 0 || ++ rSubset.mnSubsetEnd != 1 ) ++ return false; + +- return true; +- } ++ return render( rTransformation ); ++ } + ++ sal_Int32 BitmapAction::getActionCount() const ++ { ++ return 1; ++ } ++ } ++ ++ ActionSharedPtr BitmapActionFactory::createBitmapAction( const ::BitmapEx& rBmpEx, ++ const ::Point& rDstPoint, ++ const CanvasSharedPtr& rCanvas, ++ const OutDevState& rState ) ++ { ++ return ActionSharedPtr( new BitmapAction(rBmpEx, ++ rDstPoint, ++ rCanvas, ++ rState ) ); ++ } ++ ++ ActionSharedPtr BitmapActionFactory::createBitmapAction( const ::BitmapEx& rBmpEx, ++ const ::Point& rDstPoint, ++ const ::Size& rDstSize, ++ const CanvasSharedPtr& rCanvas, ++ const OutDevState& rState ) ++ { ++ return ActionSharedPtr( new BitmapAction(rBmpEx, ++ rDstPoint, ++ rDstSize, ++ rCanvas, ++ rState ) ); ++ } + } + } +Index: cppcanvas/source/mtfrenderer/bitmapaction.hxx +=================================================================== +RCS file: /cvs/gsl/cppcanvas/source/mtfrenderer/bitmapaction.hxx,v +retrieving revision 1.3.6.1 +diff -u -r1.3.6.1 bitmapaction.hxx +--- cppcanvas/source/mtfrenderer/bitmapaction.hxx 16 Feb 2005 11:14:27 -0000 1.3.6.1 ++++ cppcanvas/source/mtfrenderer/bitmapaction.hxx 10 Mar 2005 14:25:16 -0000 +@@ -62,28 +62,14 @@ + #ifndef _CPPCANVAS_BITMAPACTION_HXX + #define _CPPCANVAS_BITMAPACTION_HXX + +-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_ +-#include <com/sun/star/uno/Reference.hxx> +-#endif +- +-#ifndef _COM_SUN_STAR_RENDERING_RENDERSTATE_HPP__ +-#include <com/sun/star/rendering/RenderState.hpp> +-#endif +- + #include <cppcanvas/canvas.hxx> + #include <action.hxx> + + class Point; + class Size; + class BitmapEx; +-class Color; +- +-namespace com { namespace sun { namespace star { namespace rendering +-{ +- class XBitmap; +-} } } } + +-/* Definition of internal::BitmapAction class */ ++/* Definition of internal::BitmapActionFactory class */ + + namespace cppcanvas + { +@@ -91,47 +77,37 @@ + { + struct OutDevState; + +- /** Encapsulated converter between GDIMetaFile and ++ /** Creates encapsulated converters between GDIMetaFile and + XCanvas. The Canvas argument is deliberately placed at the + constructor, to force reconstruction of this object for a + new canvas. This considerably eases internal state +- handling, since a lot of the internal state +- (e.g. deviceColor) is Canvas-dependent. ++ handling, since a lot of the internal state (e.g. fonts, ++ text layout) is Canvas-dependent. + */ +- class BitmapAction : public Action +- { +- public: +- BitmapAction( const ::BitmapEx&, +- const ::Point& rDstPoint, +- const CanvasSharedPtr&, +- const OutDevState& ); +- BitmapAction( const ::BitmapEx&, +- const ::Point& rDstPoint, +- const ::Size& rDstSize, +- const CanvasSharedPtr&, +- const OutDevState& ); +- BitmapAction( const ::BitmapEx&, +- const ::Point& rSrcPoint, +- const ::Size& rSrcSize, +- const ::Point& rDstPoint, +- const ::Size& rDstSize, +- const CanvasSharedPtr&, +- const OutDevState& ); +- virtual ~BitmapAction(); +- +- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; ++ class BitmapActionFactory ++ { ++ public: ++ /// Unscaled bitmap action, only references destination point ++ static ActionSharedPtr createBitmapAction( const ::BitmapEx&, ++ const ::Point& rDstPoint, ++ const CanvasSharedPtr&, ++ const OutDevState& ); ++ ++ /// Scaled bitmap action, dest point and dest size ++ static ActionSharedPtr createBitmapAction( const ::BitmapEx&, ++ const ::Point& rDstPoint, ++ const ::Size& rDstSize, ++ const CanvasSharedPtr&, ++ const OutDevState& ); + + private: +- // default: disabled copy/assignment +- BitmapAction(const BitmapAction&); +- BitmapAction& operator = ( const BitmapAction& ); +- +- ::com::sun::star::uno::Reference< +- ::com::sun::star::rendering::XBitmap > mxBitmap; +- CanvasSharedPtr mpCanvas; +- ::com::sun::star::rendering::RenderState maState; ++ // static factory, disable big four ++ BitmapActionFactory(); ++ ~BitmapActionFactory(); ++ BitmapActionFactory(const BitmapActionFactory&); ++ BitmapActionFactory& operator=( const BitmapActionFactory& ); + }; +- } ++ } + } + + #endif /*_CPPCANVAS_BITMAPACTION_HXX */ + + +--- cppcanvas/source/mtfrenderer/implrenderer.cxx 24 Feb 2005 20:29:02 -0000 1.4.4.4 ++++ cppcanvas/source/mtfrenderer/implrenderer.cxx 10 Mar 2005 14:25:17 -0000 +@@ -832,11 +831,11 @@ namespace cppcanvas + // setup state-local text transformation, + // if the font be rotated + const short nFontAngle( rFont.GetOrientation() ); ++ o_rFontMatrix.identity(); + if( nFontAngle != 0 ) + { + // set to unity transform rotated by font angle + const double rAngle( nFontAngle * (F_PI / 1800.0) ); +- o_rFontMatrix.identity(); + o_rFontMatrix.rotate( -rAngle ); + } + +@@ -1277,7 +1071,21 @@ + + if( rState.clip.count() == 0 ) + { +- rState.xClipPoly.clear(); ++ if( rState.clipRect.IsEmpty() ) ++ { ++ rState.xClipPoly.clear(); ++ } ++ else ++ { ++ rState.xClipPoly = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( ++ rCanvas->getUNOCanvas()->getDevice(), ++ ::basegfx::B2DPolyPolygon( ++ ::basegfx::tools::createPolygonFromRect( ++ ::basegfx::B2DRectangle( rState.clipRect.Left(), ++ rState.clipRect.Top(), ++ rState.clipRect.Right(), ++ rState.clipRect.Bottom() ) ) ) ); ++ } + } + else + { +@@ -2045,15 +1962,22 @@ + { + MetaBmpAction* pAct = static_cast<MetaBmpAction*>(pCurrAct); + +- maActions.push_back( +- MtfAction( +- ActionSharedPtr( +- new internal::BitmapAction( +- pAct->GetBitmap(), +- rVDev.LogicToPixel( pAct->GetPoint() ), +- rCanvas, +- getState( rStates ) ) ), +- io_rCurrActionIndex ) ); ++ ActionSharedPtr pBmpAction( ++ internal::BitmapActionFactory::createBitmapAction( ++ pAct->GetBitmap(), ++ rVDev.LogicToPixel( pAct->GetPoint() ), ++ rCanvas, ++ getState( rStates ) ) ); ++ ++ if( pBmpAction ) ++ { ++ maActions.push_back( ++ MtfAction( ++ pBmpAction, ++ io_rCurrActionIndex ) ); ++ ++ io_rCurrActionIndex += pBmpAction->getActionCount()-1; ++ } + } + break; + +@@ -2061,16 +1985,23 @@ + { + MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pCurrAct); + +- maActions.push_back( +- MtfAction( +- ActionSharedPtr( +- new internal::BitmapAction( +- pAct->GetBitmap(), +- rVDev.LogicToPixel( pAct->GetPoint() ), +- rVDev.LogicToPixel( pAct->GetSize() ), +- rCanvas, +- getState( rStates ) ) ), +- io_rCurrActionIndex ) ); ++ ActionSharedPtr pBmpAction( ++ internal::BitmapActionFactory::createBitmapAction( ++ pAct->GetBitmap(), ++ rVDev.LogicToPixel( pAct->GetPoint() ), ++ rVDev.LogicToPixel( pAct->GetSize() ), ++ rCanvas, ++ getState( rStates ) ) ); ++ ++ if( pBmpAction ) ++ { ++ maActions.push_back( ++ MtfAction( ++ pBmpAction, ++ io_rCurrActionIndex ) ); ++ ++ io_rCurrActionIndex += pBmpAction->getActionCount()-1; ++ } + } + break; + +@@ -2078,18 +2009,30 @@ + { + MetaBmpScalePartAction* pAct = static_cast<MetaBmpScalePartAction*>(pCurrAct); + +- maActions.push_back( +- MtfAction( +- ActionSharedPtr( +- new internal::BitmapAction( +- pAct->GetBitmap(), +- pAct->GetSrcPoint(), +- pAct->GetSrcSize(), +- rVDev.LogicToPixel( pAct->GetDestPoint() ), +- rVDev.LogicToPixel( pAct->GetDestSize() ), +- rCanvas, +- getState( rStates ) ) ), +- io_rCurrActionIndex ) ); ++ // crop bitmap to given source rectangle (no ++ // need to copy and convert the whole bitmap) ++ Bitmap aBmp( pAct->GetBitmap() ); ++ const Rectangle aCropRect( pAct->GetSrcPoint(), ++ pAct->GetSrcSize() ); ++ aBmp.Crop( aCropRect ); ++ ++ ActionSharedPtr pBmpAction( ++ internal::BitmapActionFactory::createBitmapAction( ++ aBmp, ++ rVDev.LogicToPixel( pAct->GetDestPoint() ), ++ rVDev.LogicToPixel( pAct->GetDestSize() ), ++ rCanvas, ++ getState( rStates ) ) ); ++ ++ if( pBmpAction ) ++ { ++ maActions.push_back( ++ MtfAction( ++ pBmpAction, ++ io_rCurrActionIndex ) ); ++ ++ io_rCurrActionIndex += pBmpAction->getActionCount()-1; ++ } + } + break; + +@@ -2097,15 +2040,22 @@ + { + MetaBmpExAction* pAct = static_cast<MetaBmpExAction*>(pCurrAct); + +- maActions.push_back( +- MtfAction( +- ActionSharedPtr( +- new internal::BitmapAction( +- pAct->GetBitmapEx(), +- rVDev.LogicToPixel( pAct->GetPoint() ), +- rCanvas, +- getState( rStates ) ) ), +- io_rCurrActionIndex ) ); ++ ActionSharedPtr pBmpAction( ++ internal::BitmapActionFactory::createBitmapAction( ++ pAct->GetBitmapEx(), ++ rVDev.LogicToPixel( pAct->GetPoint() ), ++ rCanvas, ++ getState( rStates ) ) ); ++ ++ if( pBmpAction ) ++ { ++ maActions.push_back( ++ MtfAction( ++ pBmpAction, ++ io_rCurrActionIndex ) ); ++ ++ io_rCurrActionIndex += pBmpAction->getActionCount()-1; ++ } + } + break; + +@@ -2113,16 +2063,23 @@ + { + MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pCurrAct); + +- maActions.push_back( +- MtfAction( +- ActionSharedPtr( +- new internal::BitmapAction( +- pAct->GetBitmapEx(), +- rVDev.LogicToPixel( pAct->GetPoint() ), +- rVDev.LogicToPixel( pAct->GetSize() ), +- rCanvas, +- getState( rStates ) ) ), +- io_rCurrActionIndex ) ); ++ ActionSharedPtr pBmpAction( ++ internal::BitmapActionFactory::createBitmapAction( ++ pAct->GetBitmapEx(), ++ rVDev.LogicToPixel( pAct->GetPoint() ), ++ rVDev.LogicToPixel( pAct->GetSize() ), ++ rCanvas, ++ getState( rStates ) ) ); ++ ++ if( pBmpAction ) ++ { ++ maActions.push_back( ++ MtfAction( ++ pBmpAction, ++ io_rCurrActionIndex ) ); ++ ++ io_rCurrActionIndex += pBmpAction->getActionCount()-1; ++ } + } + break; + +@@ -2130,18 +2087,30 @@ + { + MetaBmpExScalePartAction* pAct = static_cast<MetaBmpExScalePartAction*>(pCurrAct); + +- maActions.push_back( +- MtfAction( +- ActionSharedPtr( +- new internal::BitmapAction( +- pAct->GetBitmapEx(), +- pAct->GetSrcPoint(), +- pAct->GetSrcSize(), +- rVDev.LogicToPixel( pAct->GetDestPoint() ), +- rVDev.LogicToPixel( pAct->GetDestSize() ), +- rCanvas, +- getState( rStates ) ) ), +- io_rCurrActionIndex ) ); ++ // crop bitmap to given source rectangle (no ++ // need to copy and convert the whole bitmap) ++ BitmapEx aBmp( pAct->GetBitmapEx() ); ++ const Rectangle aCropRect( pAct->GetSrcPoint(), ++ pAct->GetSrcSize() ); ++ aBmp.Crop( aCropRect ); ++ ++ ActionSharedPtr pBmpAction( ++ internal::BitmapActionFactory::createBitmapAction( ++ aBmp, ++ rVDev.LogicToPixel( pAct->GetDestPoint() ), ++ rVDev.LogicToPixel( pAct->GetDestSize() ), ++ rCanvas, ++ getState( rStates ) ) ); ++ ++ if( pBmpAction ) ++ { ++ maActions.push_back( ++ MtfAction( ++ pBmpAction, ++ io_rCurrActionIndex ) ); ++ ++ io_rCurrActionIndex += pBmpAction->getActionCount()-1; ++ } + } + break; + +@@ -2149,16 +2118,31 @@ + { + MetaMaskAction* pAct = static_cast<MetaMaskAction*>(pCurrAct); + +- // TODO(F2): masking NYI. Further members: mask color +- maActions.push_back( +- MtfAction( +- ActionSharedPtr( +- new internal::BitmapAction( +- pAct->GetBitmap(), +- rVDev.LogicToPixel( pAct->GetPoint() ), +- rCanvas, +- getState( rStates ) ) ), +- io_rCurrActionIndex ) ); ++ // create masked BitmapEx right here, as the ++ // canvas does not provide equivalent ++ // functionality ++ Bitmap aMask( pAct->GetBitmap().CreateMask( pAct->GetColor() ) ); ++ aMask.Invert(); ++ ++ BitmapEx aBmp( pAct->GetBitmap(), ++ aMask ); ++ ++ ActionSharedPtr pBmpAction( ++ internal::BitmapActionFactory::createBitmapAction( ++ aBmp, ++ rVDev.LogicToPixel( pAct->GetPoint() ), ++ rCanvas, ++ getState( rStates ) ) ); ++ ++ if( pBmpAction ) ++ { ++ maActions.push_back( ++ MtfAction( ++ pBmpAction, ++ io_rCurrActionIndex ) ); ++ ++ io_rCurrActionIndex += pBmpAction->getActionCount()-1; ++ } + } + break; + +@@ -2166,17 +2150,32 @@ + { + MetaMaskScaleAction* pAct = static_cast<MetaMaskScaleAction*>(pCurrAct); + +- // TODO(F2): masking NYI. Further members: mask color +- maActions.push_back( +- MtfAction( +- ActionSharedPtr( +- new internal::BitmapAction( +- pAct->GetBitmap(), +- rVDev.LogicToPixel( pAct->GetPoint() ), +- rVDev.LogicToPixel( pAct->GetSize() ), +- rCanvas, +- getState( rStates ) ) ), +- io_rCurrActionIndex ) ); ++ // create masked BitmapEx right here, as the ++ // canvas does not provide equivalent ++ // functionality ++ Bitmap aMask( pAct->GetBitmap().CreateMask( pAct->GetColor() ) ); ++ aMask.Invert(); ++ ++ BitmapEx aBmp( pAct->GetBitmap(), ++ aMask ); ++ ++ ActionSharedPtr pBmpAction( ++ internal::BitmapActionFactory::createBitmapAction( ++ aBmp, ++ rVDev.LogicToPixel( pAct->GetPoint() ), ++ rVDev.LogicToPixel( pAct->GetSize() ), ++ rCanvas, ++ getState( rStates ) ) ); ++ ++ if( pBmpAction ) ++ { ++ maActions.push_back( ++ MtfAction( ++ pBmpAction, ++ io_rCurrActionIndex ) ); ++ ++ io_rCurrActionIndex += pBmpAction->getActionCount()-1; ++ } + } + break; + +@@ -2184,19 +2183,38 @@ + { + MetaMaskScalePartAction* pAct = static_cast<MetaMaskScalePartAction*>(pCurrAct); + +- // TODO(F2): masking NYI. Further members: mask color +- maActions.push_back( +- MtfAction( +- ActionSharedPtr( +- new internal::BitmapAction( +- pAct->GetBitmap(), +- pAct->GetSrcPoint(), +- pAct->GetSrcSize(), +- rVDev.LogicToPixel( pAct->GetDestPoint() ), +- rVDev.LogicToPixel( pAct->GetDestSize() ), +- rCanvas, +- getState( rStates ) ) ), +- io_rCurrActionIndex ) ); ++ // create masked BitmapEx right here, as the ++ // canvas does not provide equivalent ++ // functionality ++ Bitmap aMask( pAct->GetBitmap().CreateMask( pAct->GetColor() ) ); ++ aMask.Invert(); ++ ++ BitmapEx aBmp( pAct->GetBitmap(), ++ aMask ); ++ ++ // crop bitmap to given source rectangle (no ++ // need to copy and convert the whole bitmap) ++ const Rectangle aCropRect( pAct->GetSrcPoint(), ++ pAct->GetSrcSize() ); ++ aBmp.Crop( aCropRect ); ++ ++ ActionSharedPtr pBmpAction( ++ internal::BitmapActionFactory::createBitmapAction( ++ aBmp, ++ rVDev.LogicToPixel( pAct->GetDestPoint() ), ++ rVDev.LogicToPixel( pAct->GetDestSize() ), ++ rCanvas, ++ getState( rStates ) ) ); ++ ++ if( pBmpAction ) ++ { ++ maActions.push_back( ++ MtfAction( ++ pBmpAction, ++ io_rCurrActionIndex ) ); ++ ++ io_rCurrActionIndex += pBmpAction->getActionCount()-1; ++ } + } + break; + +@@ -2511,10 +2584,11 @@ + // create a single action for the provided BitmapEx + maActions.push_back( + MtfAction( +- ActionSharedPtr( new BitmapAction(rBmpEx, +- Point(), +- rCanvas, +- aState) ), ++ BitmapActionFactory::createBitmapAction( ++ rBmpEx, ++ Point(), ++ rCanvas, ++ aState), + 0 ) ); + } + diff --git a/patches/src680-m79/cws-vcl36-part2-xim.diff b/patches/src680-m79/cws-vcl36-part2-xim.diff new file mode 100644 index 000000000..144713913 --- /dev/null +++ b/patches/src680-m79/cws-vcl36-part2-xim.diff @@ -0,0 +1,163 @@ +=================================================================== +RCS file: /var/cvsup/gsl/vcl/unx/gtk/window gtkframe.cxx,v +retrieving revision 1.19.2.9 +retrieving revision 1.19.2.10 +diff -u -r1.19.2.9 -r1.19.2.10 +--- vcl/unx/gtk/window/gtkframe.cxx 2005/03/08 14:32:06 1.19.2.9 ++++ vcl/unx/gtk/window/gtkframe.cxx 2005/03/15 14:22:29 1.19.2.10 +@@ -262,12 +262,7 @@ + None ); + XFreePixmap( getDisplay()->GetDisplay(), m_hBackgroundPixmap ); + } +- +- if( m_pIMContext ) +- { +- hardIMReset(); +- gtk_im_context_set_client_window( m_pIMContext, NULL ); +- g_object_unref( m_pIMContext ); +- } ++ ++ deleteIMContext(); + if( m_pFixedContainer ) + gtk_widget_destroy( GTK_WIDGET(m_pFixedContainer) ); +@@ -289,7 +284,9 @@ + + if( m_pIMContext ) + { ++ m_bIgnoreCommit = true; + gtk_im_context_reset( m_pIMContext ); ++ m_bIgnoreCommit = false; + + // a correctly implemented _reset method will + // emit a 'commit' signal if pending pre-edit +@@ -348,6 +345,7 @@ + m_bSendModChangeOnRelease = false; + m_pIMContext = NULL; + m_bWasPreedit = false; ++ m_bIgnoreCommit = false; + m_aPrevKeyPresses.clear(); + m_nPrevKeyPresses = 0; + m_hBackgroundPixmap = None; +@@ -771,6 +769,9 @@ + m_nFloats++; + if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 1 ) + grabPointer( TRUE, TRUE ); ++ // #i44068# reset parent's IM context ++ if( m_pParent ) ++ m_pParent->EndExtTextInput(0); + } + } + else +@@ -1281,15 +1282,30 @@ + } + } + ++void GtkSalFrame::deleteIMContext() ++{ ++ if( m_pIMContext ) ++ { ++ // first give IC a chance to deinitialize ++ hardIMReset(); ++ gtk_im_context_set_client_window( m_pIMContext, NULL ); ++ // destroy old IC ++ g_object_unref( m_pIMContext ); ++ m_pIMContext = NULL; ++ } ++} ++ + void GtkSalFrame::SetInputContext( SalInputContext* pContext ) + { ++ #if OSL_DEBUG_LEVEL > 1 ++ fprintf( stderr, ":SetInputContext( 0x%x )\n", pContext ); ++ #endif + if( ! pContext ) + return; + + if( ! (pContext->mnOptions & SAL_INPUTCONTEXT_TEXT) ) + { +- if( m_pIMContext ) +- gtk_im_context_focus_out( m_pIMContext ); ++ deleteIMContext(); + return; + } + +@@ -1301,6 +1317,9 @@ + { + if( m_pIMContext ) + { ++ #if OSL_DEBUG_LEVEL > 1 ++ fprintf( stderr, ":EndExtTextInput\n" ); ++ #endif + // since some IMs won't do a reset on gtk_im_context_reset + // and not empty their preedit buffer, there does not + // seem to be another choice than to create a completely +@@ -1308,12 +1327,8 @@ + // here (which disables the preedit state) since gtk + // does not give us that much control + +- // first give IC a chance to deinitialize +- hardIMReset(); +- gtk_im_context_set_client_window( m_pIMContext, NULL ); + // destroy old IC +- g_object_unref( m_pIMContext ); +- m_pIMContext = NULL; ++ deleteIMContext(); + // create new IC + createIMContext(); + } +@@ -2096,16 +2111,17 @@ + + SalExtTextInputEvent aTextEvent; + ++ GTK_YIELD_GRAB(); ++ + aTextEvent.mnTime = 0; + aTextEvent.mpTextAttr = 0; +- aTextEvent.maText = String( pText, RTL_TEXTENCODING_UTF8 ); ++ if( ! pThis->m_bIgnoreCommit ) ++ aTextEvent.maText = String( pText, RTL_TEXTENCODING_UTF8 ); + aTextEvent.mnCursorPos = aTextEvent.maText.Len(); + aTextEvent.mnCursorFlags = 0; + aTextEvent.mnDeltaStart = 0; + aTextEvent.mbOnlyCursor = False; + +- GTK_YIELD_GRAB(); +- + vcl::DeletionListener aDel( pThis ); + + /* necessary HACK: all keyboard input comes in here as soon as a IMContext is set +@@ -2131,6 +2147,10 @@ + pThis->doKeyCallback( rKP.state, rKP.keyval, rKP.hardware_keycode, rKP.group, rKP.time, true, true ); + return; + } ++ ++ #if OSL_DEBUG_LEVEL > 1 ++ fprintf( stderr, ":signalIMCommit '%s'\n", pText ); ++ #endif + + pThis->m_bWasPreedit = false; + pThis->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aTextEvent); + +=================================================================== +RCS file: /var/cvsup/gsl/vcl/unx/inc/plugins/gtk gtkframe.hxx,v +retrieving revision 1.11.2.2 +retrieving revision 1.11.2.3 +diff -u -r1.11.2.2 -r1.11.2.3 +--- vcl/unx/inc/plugins/gtk/gtkframe.hxx 2005/02/15 15:04:22 1.11.2.2 ++++ vcl/unx/inc/plugins/gtk/gtkframe.hxx 2005/03/15 14:22:29 1.11.2.3 +@@ -182,6 +182,7 @@ + bool m_bDefaultSize; + bool m_bSendModChangeOnRelease; + bool m_bWasPreedit; ++ bool m_bIgnoreCommit; + + Size m_aMaxSize; + Size m_aMinSize; +@@ -225,6 +226,7 @@ + void setScreenSaverTimeout( int nTimeout ); + void hardIMReset(); + void createIMContext(); ++ void deleteIMContext(); + + void doKeyCallback( guint state, + guint keyval, diff --git a/patches/src680-m80/.cvsignore b/patches/src680-m80/.cvsignore deleted file mode 100644 index 282522db0..000000000 --- a/patches/src680-m80/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/patches/src680-m80/Makefile.am b/patches/src680-m80/Makefile.am deleted file mode 100644 index e35678a76..000000000 --- a/patches/src680-m80/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = apply ${wildcard *.diff} diff --git a/patches/src680-m80/apply b/patches/src680-m80/apply deleted file mode 100644 index e3ce67814..000000000 --- a/patches/src680-m80/apply +++ /dev/null @@ -1,618 +0,0 @@ -# -# The format of this file is: -# - -# -------- Options -------- - -PATCHPATH=.:../src680:../evo2:../64bit - -# -------- Functional sub-sets -------- -Common : BuildBits, ParallelMake, TemporaryHacks, Fixes, \ - Defaults, Features, VCL, SystemMozilla, Misc, \ - Icons, Fpickers, i18n \ - VBABits, Evo2 -LinuxCommon : Common, LinuxOnly, CWSBackports -Win32Common : Common -# Novell -NLDBase : NLDOnly, LinuxCommon, NovellOnly, NovellOnlyUnix -SUSEBase : SUSEOnly, LinuxCommon, NovellOnly, NovellOnlyUnix -#NLD64 : NLDBase, 64bit, JDK150 - java modules cannot register on AMD64 atm, let's disable it -NLD64 : NLDBase, 64bit -NLD : NLDBase -SUSE : SUSEBase -# Debian -DebianBase : DebianOnly, LinuxCommon -Debian : DebianBase -Debian64 : DebianBase, 64bit -# Ark Linux -Ark: LinuxCommon, ArkOnly -# www.pld-linux.org -PLDBase: LinuxCommon -PLD: PLDBase -PLD64: PLDBase, 64bit -# Win32 -Win32 : Win32Common, NovellOnly, NovellOnlyWin32 - -# -------- [ Tag ], patch sets -------- - -[ TemporaryHacks ] -# Ugly hack to fix compilation of svtools with system jpeg #37002 -buildfix-system-jpeg.diff -# Temporary disable mozab FIXME no IZ, fix that together with --system-mozilla -buildfix-disable-mozab.diff -# De Sun-ify the recovery report dialog - FIXME file up-stream -# recovery-report.diff - FIXME -# A really ugly vcl hack while we sort our icons out #39358 -vcl-alpha-fix.diff -# Make libidn compile on sane Linux systems #40006 -buildfix-curl-libidn.diff -# quote filename that can include 'C#' in the filename #43561 -buildfix-odk-quoting.diff -# usage of fprintf without including stdio.h #43560 -buildfix-jvmfwk-stdio.diff -# Add custom build version bits #41391 -build-versioning.diff -# Don't do a package phase if we disable EPM #42265, CWS kendy02 -no-epm-no-package.diff -# fix the gpc warning #42409, CWS kendy02 -gpc-warning.diff -# fix build with non-interactive shell, without tty input, #42418 -# it is a backport from src680_m74 until a correct solution is found -buildfix-odk-non-interactive-build.diff -# Stop scp2 re-building frequently #42566 -scp2-rebuild.diff -# Fix filter build without java #42125 -filter-nojava.diff -# Crystal iconset does not get industrial fallback #42760, CWS kendy02 -packimages-respect-alternative.diff -# Fix build in libxmlsec #43079, CWS systemmozilla -buildfix-libxmlsec.diff -# Additional system python fixes #41994, CWS systempython2 -cws-systempython2.diff -# Fix size of check boxes #41741, CWS vcl36 -cws-vcl36-checkboxes.diff -# update libwpd, CWS libwpdupgrade -cws-libwpdupgrade.diff -# The odk has a horribly slow & buggy build & we don't package it -odk-disable.diff - -[ Fixes ] -# Disable the printer properties which are unused IZ#14036, n#583 -printer-properties-disable.diff -# Make debugging nicer under unix #35336 -debug-bits.diff -# The world need not see that I can't spell #21440 -sd-export-no-spell-check.diff -# get interactivity right during slow updates #42221 -vcl-gtk-yield.diff -# Fix mind-mangled evo. addressbook path #26309 -evo-addrbook.diff -# make menu layout prettier #17937 -vcl-menu-fixes.diff -# File->New->Spreadsheet freezes on some versions of GCC # FIXME: shres -svx-freeze-fix.diff -# update pyuno docs from www.oo.o -pyuno-update-docs.diff -# Fix doc load crasher X#64030 - still in src680-m55 -sw-import-crash.diff -# Fix impress spellcheck #32320 -crash-sd-spellcheck.diff -# Make the scroll-wheel / page popup more sane #20826 -gui-sw-scroll.diff -# Re-size over-large icons to 24x24 - #15208 -sfx2-toolbox-size.diff -# disable font management dialog in padmin -padmin-nofontconfig.diff -# Improve the web bullet export / export to png not gif. #23353 -sd-export-html-theme.diff -sd-export-html.diff -sd-export-html-translations.diff -sd-export-html-descr.diff -# A potential trouble-spot #38037 -jvmfwk-eintr.diff -# configure some Japanese fonts used on Novell products -# (patch by Mike Fabian mfabian@suse.de) -novell-cjk-fonts.diff -# fix gtk+ / XIM - forward-port #38671 -# -# FIXME - disabled for now cf. cws-vcl36 backport -# -# xim-fixes.diff -# xim-fixes3.diff -# <ctrl> +/‑ to insert/delete a complete line in calc (X#62530) #38108 -calc-new-acceleration.diff -# Send e-mail in MS format as attachment (X#62200) -# ms-interoperability-email-attachment-as-xls-ppt.diff -# Escape should cancel the print preview X#67133 #35777 -sw-escape-print-preview.diff -sc-escape-print-preview.diff -# adds to Autofilter Empty-NonEmpty options bxc #62165 Issue#35578 -sc-autofilter-empty-nonempty.diff -# Improves the standard filter options and menu. bxc #62187 #62495 Issue#35579 -sc-standard-filter-options.diff -# Hides the filtered rows when height of rows are changed bxc #62161 Issue #35581 -sc-filter-hide-filteredrows.diff -# allows not to delete nonfiltered rows while deleting the filtered ones bxc #62186 Issue 35582 -sc-no-delete-filteredrows.diff -# Autofill doesnt fill filtered rows bxc 62499 -sc-filters-fill-fix.diff -# Provision for dynamic range in data pilot issue #23658 bxc 62522 -sc-datapilot-dynamic-range.diff -# Provision for data-pilot to give autoformat Issue #37388 bxc #62162 -sc-datapilot-autoformat.diff -# Make SAL compile on Linux systems that use NPTL without compat hacks -# (pthread_kill_other_threads_np is dead) -sal-compile-with-nptl.diff -# don't bloat the toolbars beyond belief #41833 -vcl-toolbox-height.diff -# fix +/- key syms #42077 -vcl-keys.diff -# Don't barf if rpm 4.4.x is used -rpm-4.4-compat.diff -# BXC 62488 : Allows insertion of rows by shifting down -sc-paste-insert-rows.diff -# Fix KDE VCL compilation with gcc visibility #41591 -kde-visibility.diff -# Fix for datapilot crash when clicking outside dialog -sc-datapilot-crash-fix.diff -# Fix for datapilot crash on remote databases -sc-dp-database-crash.diff -# Fix for autotriming of autofilter choices bxc 65945 Issue FIXME -sc-autofilter-autotrim-choices.diff -# Take DESKTOP_LAUNCH into account in File->Send->Document as E-mail #42841, CWS kendy03 -shell-senddoc-desktop-launch.diff -# fix conditional deps again #43314 -cws-mmeeks05.diff -# fix alpha in gallery #43341 -gallery-icons.diff -# Replace usability numb Zoom dialog with a Combo Box -zoom-combobox.diff -# Protect generic URIs from overly zealous absolutizer #43485 -url-relative.diff -# Tell the desktop we want URIs & we support the VFS #43504 -uses-vfs.diff -# Stop impress wizard crashing n#66187, i#43546 -crash-sd-wizard.diff -# Fix crash-on-exit snafu #43549 -crash-vcl-gtk-exit.diff -# Improve gtk nwf toolbar toggle button rendering. #43720, In vcl37 -vcl-nwf-gtk-toggle-toolitems.diff -# Make template document open / creation synchronous i#43741 -crash-template.diff -# Gnome 2.6 has totally different authentication (sigh) -vfs-2.6-auth.diff - -[ LinuxOnly ] -# Optimize linkage of some xmlhelp libraries # FIXME: shres -xmlhelp-optimize-linkage.diff -# Modify the fpicker makefile causing problems in the win32 build -fpicker-common-build.diff - -[ XineramaPIC ] -# use libXinerama_pic.a on all archs -xinerama-pic-on-all-archs.diff - - -[ Misc ] -# Make the default writer bullet larger i#10549 -# sw-default-bullet.diff -# Insert symbol defaults to the Symbol font - not a random one #15512 -gui-sw-insert-symbol.diff -# Address data source ordering X#62860 -addrbk-datasrc-ordering.diff -# Add an ooo-build version in ProductExtension - FIXME - improve & add to configure. -version-strike.diff -# Try to get the font mapping right -gui-metric-fonts.diff -# Describe the metric compatible fonts for export mappings -gui-metric-fonts-descr.diff -# Some of the new help & other icons we need #FIXME copy OOO_1_1_incons -# gui-new-icons.diff - SMALL REGRESSION -# Make the delete key happy again in starcalc #17965 - wontfix [!] -gui-sc-delete.diff -# Autodetect HAVE_GCC_VISIBILITY_FEATURE -- it's currently used but never -# set -detect-gcc-visibility.diff -#Review comments implemented for #34909 -dbaccess-evo-changes.diff -# E-mail attachment file name append with "_1" X#67684 #35780 -email-attachment-underscore-zero.diff -# removing multimedia menu's X66608 -remove-default-multimedia-menu.diff - -[ NovellOnlyUnix ] -# Use bug buddy -bug-buddy.diff -# save everything to ~/Documents by default -default-save-path.diff -# Help Support page -help-support.diff -# mark the files in share/template/<lang>/wizard/bitmap as lang specific -build-wizard-bitmap-scp.diff -# change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre -scp2-user-config-ooo-2-0-pre.diff - -[ NovellOnlyWin32 ] -filebug-support.diff - -[ i18n ] -# shrink exported ISO_8859_2 & MS_1250 html -# most people will use UTF-8 and never see this, #19514 -html-8bit-export-shrink.diff - -# ( mmp@oo.o deals with defaults apparently ) -[ Defaults ] -# stop the user having to fight ooimpress constantly #35338 -capitalization.diff -# default to large icons in the toolbar -gui-toolbox-large-icons.diff -# Use nicer colors for the charts X#64359 -sc-default-color-modify.diff -# make tri-state toolbars less confusing #35563 -gui-toolbox-tristate.diff -# default to anti-alias at point size of 1 point -default-font-aasize.diff -# set default font size to 10pt #35565 -default-font-size.diff -# don't use any slow / nasty X fonts #35641 -default-no-x-fonts.diff -# use more normal hinting parameters #35714 -default-glyph-light.diff -# Dramatically improve MS import / export cf. #8276 et. al. -default-ms-filter-convert.diff -# improve keybindings #35738 -default-keybindings.diff -# use pair kerning in new documents #35873 -default-pairkerning-on.diff -# Optimal Page Wrap should be default for graphics insertion (X#59831) #38108 -writer-default-as-optimal-page-wrap.diff - -# -# Controversial bits - no use filing up-stream -# -# pestering people serves no useful purpose -default-no-registration.diff -# automatically do any migration we can, with no wizard -default-no-startup-wizard.diff -# don't throw up the style dialog on 1st run -default-no-style-dialog.diff -# no Help->registration dialog by default -default-no-registration-menu.diff -# Use the Gnome VFS on KDE as well if it's there (better than nothing) -vfs-kde-too.diff -# Trade speed for reliability with valgrind -valgrind-alloc.diff - -[ Features ] -# Make cut and paste nicer #15509 -sc-paste-dialog.diff -# Save as menuitem for image context menus in impress #13816 -# sd-save-image-context-menu.diff - FIXME - Raul working on this. -# Make insensitive toolbar icons look far nicer #35555 -gui-insensitive.diff - -[ BuildBits ] -# do an optimizing link -build-optimized-link.diff -# do not build extras for icu, workaround for http://bugs.debian.org/210608 -icu-build-no-extras.diff -# package all libcurl related files if the internal one is used, #41883 -scp-add-libcurl.diff -# do not have GnomeVfs module listed in two file lists, #42525 -scp-gnomevfs-only-once.diff - -# fix installation with --disable-binfilter, #43457 -# it is a hunk from patches/src680-m79/cws-buildcond02.diff that was not send -# upstream -scp2-binfilter.diff - -# allows to do not pack libstdc++ and libgcc_s; #42902 -system-stdlibs.diff - -# Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3) -sal-cxa-guard.diff -# do not pack any potential .orig files with ppds -psprint_config-no-orig.diff -# Fix ODK Java bits -odk-java-wizpanel.diff -# add possibility to set ARCH_FLAGS when building libnas -nas-use-arch-flags.diff -# fix build with GNOME 2.9.91, #42718, CWS kendy03 -buildfix-gnome-2.9.91.diff - -[ ParallelMake ] -# Fixes for distributed building (with icecream) #35627 -parallel-solenv-target-mk.diff -parallel-solenv-tg_sdi-mk.diff -# 3 more makefiles in sysui are seriously broken #35628 -parallel-sysui-makefiles.diff - -# Fix/workaround race condition with .REMOVE rule #16752 -parallel-dmake-dont-remove.diff - -[ VCL ] -# Don't let the splash screen take over #23609 -no-splash-takeover.diff - -# Cleanup of old kdeint pieces - part of #36763 -# FIXME: #36763 is marked as fixed; create a new issue for this -cleanup-vcl-kdeint.diff - -# Implementation of KDE/Qt NWF toolbars and menus -# FIXME Not ready for upstreaming yet, crashes on exit for some styles -vcl-nwf-toolbars.diff -vcl-nwf-menus.diff -vcl-nwf-kde-toolbars-menus.diff - -# Ask the theme for the size of checkboxes and radiobuttons in KDE #43392, CWS kendy04 -vcl-nwf-kde-checkboxes.diff - -# Use nwf for menu item check boxes instead of ugly symbols -vcl-nwf-menu-checkmarks.diff - -[ SystemMozilla ] -# -# Snarfed from Caolan, unknown status. -# http://people.redhat.com/caolanm/SRC680_m58 -# -system-mozilla-config_office.diff -system-mozilla-connectivity.diff -system-mozilla-extensions.diff -system-mozilla-libxmlsec.diff -system-mozilla-scp2.diff -system-mozilla-xmlsecurity.diff -system-mozilla-xmlsecurity-libnss.diff -# FIXME: this is an UGLY hack. -# It sets LD_LIBRARY_PATH in soffice wrapper to system mozilla (only -# the SUSE specific path /opt/mozilla/lib -system-mozilla-desktop.diff -# Teach linkoo about the evil under the sun: -linkoo-moz-hack.diff - -[ Icons ] -# Installation & appearance of multiple icon sets (Industrial and Crystal) #36518 -icons-vcl-according-to-desktop.diff -icons-xmlhelp-according-to-desktop.diff -# Theme & add alpha to the WM icons #41225 -wm-icons.diff - -[ Fpickers ] -# Out-of-process implementation of KDE fpicker -# FIXME: No IZ number for this, because it is necessary to do it internal first -fpicker-kde-service.diff -fpicker-kde-dialog.diff -# Let the KDE and Gtk+ fpickers build and install FIXME IZ number -fpicker-common-scp2.diff -# Show "Use OpenOffice.org dialogs" check box only if the system fpicker is -# available (better implementation) FIXME IZ number -fpicker-show-checkbox.diff -# add in an extra combobox to make filter selection easier i#10545, i#66075 -fpicker-fixes.diff -# fix for the gtk critical error n#66349 -fpicker-gnome-crash-fix.diff -# temportary fix to enable filter detection to work properly i#10545 -sfx2-fpicker-gnome-filter-fix.diff -# fix for the fpicker hanging on accessible desktop -fpicker-accessibility-fix.diff -# fix for the fpicker crashing in the Euro converter n#67124 -# fpicker-euro-converter-fix.diff - -[ Evo2 ] - -# evolution addressbook driver version 2 #34909 -connectivity-source-drivers-evoab1-5-dataaccess-xcu.diff -connectivity-source-drivers-evoab1-5-evoab1-5-map.diff -connectivity-source-drivers-evoab1-5-evoab-xml.diff -connectivity-source-drivers-evoab1-5-makefile-mk.diff -connectivity-source-drivers-evoab1-5-nconnection-cxx.diff -connectivity-source-drivers-evoab1-5-nconnection-hxx.diff -connectivity-source-drivers-evoab1-5-ndatabasemetadata-cxx.diff -connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff -connectivity-source-drivers-evoab1-5-ndebug-cxx.diff -connectivity-source-drivers-evoab1-5-ndebug-hxx.diff -connectivity-source-drivers-evoab1-5-ndriver-cxx.diff -connectivity-source-drivers-evoab1-5-ndriver-hxx.diff -connectivity-source-drivers-evoab1-5-npreparedstatement-cxx.diff -connectivity-source-drivers-evoab1-5-npreparedstatement-hxx.diff -connectivity-source-drivers-evoab1-5-nresultset-cxx.diff -connectivity-source-drivers-evoab1-5-nresultset-hxx.diff -connectivity-source-drivers-evoab1-5-nresultsetmetadata-cxx.diff -connectivity-source-drivers-evoab1-5-nresultsetmetadata-hxx.diff -connectivity-source-drivers-evoab1-5-nservices-cxx.diff -connectivity-source-drivers-evoab1-5-nstatement-cxx.diff -connectivity-source-drivers-evoab1-5-nstatement-hxx.diff -connectivity-source-drivers-evoab1-5-ncatalog-cxx.diff -connectivity-source-drivers-evoab1-5-ncatalog-hxx.diff -connectivity-source-drivers-evoab1-5-ntables-cxx.diff -connectivity-source-drivers-evoab1-5-ntables-hxx.diff -evoab2_prj.diff -evoab2_scp.diff -connectivity-source-drivers-evoab1-5-EApi-cxx.diff -connectivity-source-drivers-evoab1-5-EApi-h.diff -# Evolution in wizards -> addressbook X#66214 -wizard-evo-local.diff -[ QPro ] -# Quattro Pro 6.0 import filter: IZ #41688 -formel-hxx.diff -qpro-build.diff -qpro-detect.diff -qproform-hxx.diff -frmbase-cxx.diff -qpro-cxx.diff -qproform-cxx.diff -qpro-hxx.diff - -[ Win32Common ] -# 2 more makefiles in sysui are seriously broken #35628 -# parallel-python-makefile_mk.diff # looks to be upstream -# Work around G/W mail component crasher bug #34264 -win32-gw-send-mail.diff -# use bin/oowintool for the win32 configure stage -win32-msvs-2003-configure.diff -# Minor build fixes for win32 -win32-build-fixes.diff -# This is a pretty nasty IE problem #19510 -# win32-activex-disable.diff # commented out as it breaks instsetoo_native - -[ VBABits ] -# Alt-F11 does something useful #29138 -vba-keybinding-f11.diff -# Parse (& ignore) 'Attribute' statements #37347 -vba-attribute.diff -# Add foreach statement - #33807 -vba-foreach.diff -# Prefer interoperability over marginal compatibility -default-vba-compatible.diff -vba-not-comments.diff - -[ NLDOnly ] -# Push fonts into the ps stream always -pushfont-psstream.diff - -# in case the system is panicing; registry/data/org/openoffice/VCL.xcu is -# not installed or broken; used for example if OOo is installed from an -# installation set by ./install --interactive -gui-font-paranoid-fallback.diff - -[ NLDOnly ] -# some branding action cf. doc/splash.txt -nld-splash.diff - -[ SUSEOnly ] -# some branding action cf. doc/splash.txt -suse-splash.diff - -[ ArkOnly ] -# Ark Linux splits Qt into qt-mt and qt-base-mt so text mode apps etc. -# can use Qt base functionality without linking in the whole GUI. -# vclplug needs to add -lqt-base-mt here. -ark-handle-split-qt.diff -# If /usr/bin/java is a gcj wrapper, javadoc doesn't exist -- and -# configure shouldn't barf. -missing-javadoc-nonfatal.diff -# Don't barf with "unresolved symbol PL_InitArenaPool" whenever something -# links to libnss3 -libxmlsec-nssckbi.diff - -[ RedhatOnly ] -# Some palette loving -redhat-standard-colors.diff - -[ 64bit ] -# -# NOTE: 64 bit OOo is work in progress! -# - -# The following is a result of: -# cvs -d :pserver:anoncvs@anoncvs.services.openoffice.org:/cvs checkout -r cws_src680_ooo64bit02 OpenOffice -# for I in * ; do cvs -d :pserver:anoncvs@anoncvs.services.openoffice.org:/cvs diff -N -r CWS_SRC680_OOO64BIT02_ANCHOR -r cws_src680_ooo64bit02 $I > $I.diff ; done -# (and a bin/cvsclean) -64bit-basegfx.diff -64bit-basic.diff -#64bit-binfilter.diff -64bit-boost.diff -64bit-bridges.diff -#64bit-canvas.diff -64bit-comphelper.diff -64bit-configmgr.diff -64bit-connectivity.diff -#64bit-cppcanvas.diff -64bit-cppu.diff -64bit-cppuhelper.diff -#64bit-dbaccess.diff -64bit-desktop.diff -64bit-extensions.diff -64bit-extras.diff -64bit-framework.diff -64bit-goodies.diff -64bit-idlc.diff -64bit-i18npool.diff -64bit-jvmfwk.diff -64bit-nas.diff -64bit-psprint.diff -64bit-rdbmaker.diff -64bit-registry.diff -#64bit-rsc.diff -64bit-sal.diff -64bit-sc.diff -#64bit-setup2.diff -64bit-sfx2.diff -64bit-sch.diff -64bit-solenv.diff -64bit-so3.diff -64bit-starmath.diff -64bit-stlport.diff -64bit-stoc.diff -64bit-store.diff -64bit-svtools.diff -64bit-svx.diff -64bit-sw.diff -64bit-toolkit.diff -64bit-tools.diff -64bit-vcl.diff -64bit-vos.diff -64bit-xmloff.diff - -# Additional build fixes that need upstreaming to ooo64bit02 -buildfix-64bit-automation.diff -buildfix-64bit-basic.diff -buildfix-64bit-canvas.diff -buildfix-64bit-chart2.diff -buildfix-64bit-config_office.diff -buildfix-64bit-cppcanvas.diff -buildfix-64bit-dbaccess.diff -buildfix-64bit-extensions.diff -buildfix-64bit-filter.diff -buildfix-64bit-framework.diff -# TODO file to IZ -buildfix-64bit-rsc.diff -buildfix-64bit-sc.diff -buildfix-64bit-sch.diff -buildfix-64bit-sd.diff -buildfix-64bit-sfx2.diff -buildfix-64bit-solenv.diff -buildfix-64bit-starmath.diff -buildfix-64bit-svtools.diff -buildfix-64bit-svx.diff -buildfix-64bit-sw.diff -buildfix-64bit-tools.diff -buildfix-64bit-vcl.diff -buildfix-64bit-xmloff.diff - -# Other build fixes -buildfix-64bit-system-jpeg.diff - -# res32bit related fixes -# TODO file to IZ -buildfix-64bit-padmin-res32bit.diff -buildfix-64bit-extensions-res32bit.diff - -# 64-bit related fixes for run-time -# Correct reading of resources IZ#40338 -#fix-64bit-tools.diff -# Fix crash while initializing fontconfig -fix-64bit-psprint.diff - -# Fix ambiguous invocations of Min()/Max()/Abs() when OOo with 64 bit patches -# is built on 32 bit platforms -buildfix-64bit-on-32bit-systems.diff - -[ JDK150 ] -# You need 64bit java, e.g. JDK 1.5.0 for AMD64: -# http://java.sun.com/j2se/1.5.0/download.jsp -# This JDK needs -# ln -s motif21/libmawt.so /usr/java/jdk1.5.0_01/jre/lib/amd64/libmawt.so -# to let OOo compile well -# -# FIXME No IZ for this one yet -buildfix-jdk150-berkeleydb.diff -buildfix-jdk150-jurt.diff -buildfix-jdk150-jvmfwk.diff -buildfix-jdk150-qadevOOo.diff -buildfix-jdk150-rhino.diff -buildfix-jdk150-sandbox.diff -buildfix-jdk150-scripting.diff -buildfix-jdk150-sj2.diff -buildfix-jdk150-xmerge.diff -buildfix-jdk150-xmlhelp.diff -buildfix-jdk150-XmlSearch.diff diff --git a/patches/src680-m80/buildfix-disable-mozab.diff b/patches/src680-m80/buildfix-disable-mozab.diff deleted file mode 100644 index ea47b2274..000000000 --- a/patches/src680-m80/buildfix-disable-mozab.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- connectivity/prj/build.lst 2004-12-07 13:46:29.133991528 +0100 -+++ connectivity/prj/build.lst 2004-12-07 13:47:26.976198176 +0100 -@@ -8,8 +8,6 @@ cn connectivity\source\cpool nmake - a - cn connectivity\source\resource nmake - all cn_res NULL - cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL - cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL --cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL --cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL - cn connectivity\source\drivers\evoab nmake - all cn_evoab cn_dbtools cn_file NULL - cn connectivity\source\drivers\evoab1.5 nmake - all cn_evoab1.5 cn_dbtools cn_file NULL - cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL ---- scp2/source/ooo/file_library_ooo.scp 2004-12-07 17:00:39.479869744 +0100 -+++ scp2/source/ooo/file_library_ooo.scp 2004-12-07 17:01:22.174379192 +0100 -@@ -1125,6 +1125,8 @@ File gid_File_Lib_Mcnttype - - #if !defined(MACOSX) && !defined(WITHOUT_MOZILLA) - -+#endif -+#if 0 - File gid_File_Lib_Mozab_2 - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); -@@ -1143,6 +1143,8 @@ End - - #if !defined(MACOSX) && !defined(WITHOUT_MOZILLA) - -+#endif -+#if 0 - File gid_File_Lib_Mozabdrv - TXT_FILE_BODY; - #ifdef UNX diff --git a/patches/src680-m80/no-epm-no-package.diff b/patches/src680-m80/no-epm-no-package.diff deleted file mode 100644 index ce2a746c7..000000000 --- a/patches/src680-m80/no-epm-no-package.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- instsetoo_native/util/makefile.mk 31 Jan 2005 10:38:15 -0000 1.14 -+++ instsetoo_native/util/makefile.mk 8 Feb 2005 12:19:41 -0000 -@@ -112,7 +112,10 @@ - # native - "Native" software distribution for the platform - # portable - Portable software distribution - --.IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" -+.IF "$(FORMAT)"!="" && "$(EPM)"=="" -+ALLTAR : $(LOCALPYFILES) -+ @echo "No EPM: do no packaging at this stage" -+.ELIF "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" - ALLTAR : openoffice - .ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" - ALLTAR : updatepack diff --git a/patches/src680-m80/system-stdlibs.diff b/patches/src680-m80/system-stdlibs.diff deleted file mode 100644 index 5fa22115b..000000000 --- a/patches/src680-m80/system-stdlibs.diff +++ /dev/null @@ -1,122 +0,0 @@ -Index: gcc3_specific/makefile.mk -=================================================================== -RCS file: /cvs/util/external/gcc3_specific/makefile.mk,v -retrieving revision 1.3 -diff -u -u -r1.3 makefile.mk ---- external/gcc3_specific/makefile.mk 18 Jun 2003 12:44:10 -0000 1.3 -+++ external/gcc3_specific/makefile.mk 13 Feb 2005 21:15:28 -0000 -@@ -12,6 +12,7 @@ - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" - .IF "$(OS)"!="FREEBSD" -+.IF "$(SYSTEM_STDLIBS)" != "YES" - - - all : $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libgcc_s.so -@@ -27,6 +28,10 @@ - -rm -f $@ - +ln -s libgcc_s.so.1 $@ - -+.ELSE -+@all: -+ @echo "Using libstdc++ and libgcc_s from system..." -+.ENDIF - .ENDIF - .ENDIF - .ENDIF -Index: configure.in -=================================================================== -RCS file: /cvs/tools/config_office/configure.in,v -retrieving revision 1.80.12.7 -diff -u -u -r1.80.12.7 configure.in ---- config_office/configure.in 11 Feb 2005 18:06:37 -0000 1.80.12.7 -+++ config_office/configure.in 13 Feb 2005 21:24:39 -0000 -@@ -57,6 +57,9 @@ - [ --disable-fontooo disable FontOOo - (useful for distributions using fontconfig for OOo) - ],,enable_fontooo="yes") -+AC_ARG_WITH(system-stdlibs, -+[ --with-system-stdlibs use libstdc++/libgcc_s already on system -+],,) - AC_ARG_WITH(system-mspack, - [ --with-system-mspack use libmspack already installed on system - ],,) -@@ -1884,6 +1887,20 @@ - fi - - dnl =================================================================== -+dnl Check for system stdlibs -+dnl =================================================================== -+AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset]) -+if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \ -+ test "$with_system_stdlibs" != "no"; then -+ AC_MSG_RESULT([no]) -+ SYSTEM_STDLIBS=YES -+else -+ AC_MSG_RESULT([yes]) -+ SYSTEM_STDLIBS=NO -+fi -+AC_SUBST(SYSTEM_STDLIBS) -+ -+dnl =================================================================== - dnl Check for system zlib - dnl =================================================================== - AC_MSG_CHECKING([which zlib to use]) -Index: set_soenv.in -=================================================================== -RCS file: /cvs/tools/config_office/set_soenv.in,v -retrieving revision 1.29.12.6 -diff -u -u -r1.29.12.6 set_soenv.in ---- config_office/set_soenv.in 27 Jan 2005 19:02:08 -0000 1.29.12.6 -+++ config_office/set_soenv.in 13 Feb 2005 21:24:52 -0000 -@@ -1749,6 +1749,7 @@ - ToFile( "LINKFLAGSRUNPATH",'', "e" ); - } - ToFile( "EPM", "@EPM@", "e" ); -+ToFile( "SYSTEM_STDLIBS", "@SYSTEM_STDLIBS@", "e" ); - ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" ); - ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" ); - ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" ); -Index: source/ooo/file_library_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v -retrieving revision 1.74.6.5 -diff -u -u -r1.74.6.5 file_library_ooo.scp ---- scp2/source/ooo/file_library_ooo.scp 11 Feb 2005 18:08:37 -0000 1.74.6.5 -+++ scp2/source/ooo/file_library_ooo.scp 13 Feb 2005 21:27:10 -0000 -@@ -697,7 +697,7 @@ - - STD_UNO_LIB_FILE( gid_File_Lib_Fwl , fwl) - --#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) ) -+#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS)) - #if defined( _gcc3 ) - - File gid_File_Lib_Gcc -@@ -711,7 +711,7 @@ - - #endif - --#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) ) -+#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS)) - #if defined( _gcc3 ) - - File gid_File_Lib_Stdc -Index: source/ooo/makefile.mk -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/makefile.mk,v -retrieving revision 1.13.46.4 -diff -u -u -r1.13.46.4 makefile.mk ---- scp2/source/ooo/makefile.mk 11 Feb 2005 18:09:02 -0000 1.13.46.4 -+++ scp2/source/ooo/makefile.mk 13 Feb 2005 21:28:30 -0000 -@@ -126,6 +126,10 @@ - SCPDEFS+=-DSYSTEM_CURL - .ENDIF - -+.IF "$(SYSTEM_STDLIBS)" == "YES" -+SCPDEFS+=-DSYSTEM_STDLIBS -+.ENDIF -+ - .IF "$(JDK)" == "gcj" - SCPDEFS+=-DGCJ - .ENDIF diff --git a/patches/src680-m82/.cvsignore b/patches/src680-m82/.cvsignore deleted file mode 100644 index 282522db0..000000000 --- a/patches/src680-m82/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/patches/src680-m82/Makefile.am b/patches/src680-m82/Makefile.am deleted file mode 100644 index e35678a76..000000000 --- a/patches/src680-m82/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = apply ${wildcard *.diff} diff --git a/patches/src680-m82/apply b/patches/src680-m82/apply deleted file mode 100644 index 481e95918..000000000 --- a/patches/src680-m82/apply +++ /dev/null @@ -1,622 +0,0 @@ -# -# The format of this file is: -# - -# -------- Options -------- - -PATCHPATH=.:../src680:../evo2:../64bit - -# -------- Functional sub-sets -------- -Common : BuildBits, ParallelMake, TemporaryHacks, Fixes, \ - Defaults, Features, VCL, SystemMozilla, Misc, \ - Icons, Fpickers, i18n, VBABits, Evo2 -LinuxCommon : Common, LinuxOnly, CWSBackports, GCJ -Win32Common : Common -# Novell -NLDBase : NLDOnly, LinuxCommon, NovellOnly, NovellOnlyUnix -SUSEBase : SUSEOnly, LinuxCommon, NovellOnly, NovellOnlyUnix -#NLD64 : NLDBase, 64bit, JDK150 - java modules cannot register on AMD64 atm, let's disable it -NLD64 : NLDBase, 64bit -NLD : NLDBase -SUSE : SUSEBase -# Debian -DebianBase : DebianOnly, LinuxCommon -Debian : DebianBase -Debian64 : DebianBase, 64bit -# Ark Linux -Ark: LinuxCommon, ArkOnly -# www.pld-linux.org -PLDBase: LinuxCommon -PLD: PLDBase -PLD64: PLDBase, 64bit -# Win32 -Win32 : Win32Common, NovellOnly, NovellOnlyWin32 - -# -------- [ Tag ], patch sets -------- - -[ TemporaryHacks ] -# Ugly hack to fix compilation of svtools with system jpeg #37002 -buildfix-system-jpeg.diff -# Temporary disable mozab FIXME no IZ, fix that together with --system-mozilla -buildfix-disable-mozab.diff -# De Sun-ify the recovery report dialog - FIXME file up-stream -# recovery-report.diff - FIXME -# A really ugly vcl hack while we sort our icons out #39358 -vcl-alpha-fix.diff -# Make libidn compile on sane Linux systems #40006 -buildfix-curl-libidn.diff -# quote filename that can include 'C#' in the filename #43561 -buildfix-odk-quoting.diff -# usage of fprintf without including stdio.h #43560 -buildfix-jvmfwk-stdio.diff -# Add custom build version bits #41391 -build-versioning.diff -# fix build with non-interactive shell, without tty input, #42418 -# it is a backport from src680_m74 until a correct solution is found -buildfix-odk-non-interactive-build.diff -# Fix filter build without java #42125 -filter-nojava.diff -# Fix build in libxmlsec #43079, CWS systemmozilla -buildfix-libxmlsec.diff -# Fix size of check boxes #41741, CWS vcl36 -cws-vcl36-checkboxes.diff -# update libwpd, CWS libwpdupgrade -cws-libwpdupgrade.diff -# The odk has a horribly slow & buggy build & we don't package it -odk-disable.diff - -[ GCJ ] -cws-gcj2.diff -gcc4.diff -readlicense-java-fix.diff -disable-qadevooo.diff - -[ Fixes ] -# Disable the printer properties which are unused IZ#14036, n#583 -printer-properties-disable.diff -# Make debugging nicer under unix #35336 -debug-bits.diff -# The world need not see that I can't spell #21440 -sd-export-no-spell-check.diff -# get interactivity right during slow updates #42221 -vcl-gtk-yield.diff -# Fix mind-mangled evo. addressbook path #26309 -evo-addrbook.diff -# make menu layout prettier #17937 -vcl-menu-fixes.diff -# File->New->Spreadsheet freezes on some versions of GCC # FIXME: shres -svx-freeze-fix.diff -# update pyuno docs from www.oo.o -pyuno-update-docs.diff -# Fix doc load crasher X#64030 - still in src680-m55 -sw-import-crash.diff -# Fix impress spellcheck #32320 -crash-sd-spellcheck.diff -# Make the scroll-wheel / page popup more sane #20826 -gui-sw-scroll.diff -# Re-size over-large icons to 24x24 - #15208 -sfx2-toolbox-size.diff -# disable font management dialog in padmin -padmin-nofontconfig.diff -# Improve the web bullet export / export to png not gif. #23353 -sd-export-html-theme.diff -sd-export-html.diff -sd-export-html-translations.diff -sd-export-html-descr.diff -# A potential trouble-spot #38037 -jvmfwk-eintr.diff -# configure some Japanese fonts used on Novell products -# (patch by Mike Fabian mfabian@suse.de) -novell-cjk-fonts.diff -# fix gtk+ / XIM - forward-port #38671 -# -# FIXME - disabled for now cf. cws-vcl36 backport -# -# xim-fixes.diff -# xim-fixes3.diff -# <ctrl> +/‑ to insert/delete a complete line in calc (X#62530) #38108 -calc-new-acceleration.diff -# Send e-mail in MS format as attachment (X#62200) -# ms-interoperability-email-attachment-as-xls-ppt.diff -# Escape should cancel the print preview X#67133 #35777 -sw-escape-print-preview.diff -sc-escape-print-preview.diff -# adds to Autofilter Empty-NonEmpty options bxc #62165 Issue#35578 -sc-autofilter-empty-nonempty.diff -# Improves the standard filter options and menu. bxc #62187 #62495 Issue#35579 -sc-standard-filter-options.diff -# Hides the filtered rows when height of rows are changed bxc #62161 Issue #35581 -sc-filter-hide-filteredrows.diff -# allows not to delete nonfiltered rows while deleting the filtered ones bxc #62186 Issue 35582 -sc-no-delete-filteredrows.diff -# Autofill doesnt fill filtered rows bxc 62499 -sc-filters-fill-fix.diff -# Provision for dynamic range in data pilot issue #23658 bxc 62522 -sc-datapilot-dynamic-range.diff -# Provision for data-pilot to give autoformat Issue #37388 bxc #62162 -sc-datapilot-autoformat.diff -# Make SAL compile on Linux systems that use NPTL without compat hacks -# (pthread_kill_other_threads_np is dead) -sal-compile-with-nptl.diff -# don't bloat the toolbars beyond belief #41833 -vcl-toolbox-height.diff -# fix +/- key syms #42077 -vcl-keys.diff -# BXC 62488 : Allows insertion of rows by shifting down -sc-paste-insert-rows.diff -# Fix KDE VCL compilation with gcc visibility #41591 -kde-visibility.diff -# Fix for datapilot crash when clicking outside dialog -sc-datapilot-crash-fix.diff -# Fix for datapilot crash on remote databases -sc-dp-database-crash.diff -# Fix for autotriming of autofilter choices bxc 65945 Issue FIXME -sc-autofilter-autotrim-choices.diff -# fix alpha in gallery #43341 -gallery-icons.diff -# Replace usability numb Zoom dialog with a Combo Box -# FIXME this needs porting -# zoom-combobox.diff -# Protect generic URIs from overly zealous absolutizer #43485 -url-relative.diff -# Tell the desktop we want URIs & we support the VFS #43504 -uses-vfs.diff -# Fix crash-on-exit snafu #43549 -crash-vcl-gtk-exit.diff -# Improve gtk nwf toolbar toggle button rendering. #43720, In vcl37 -vcl-nwf-gtk-toggle-toolitems.diff -# Make template document open / creation synchronous i#43741 -crash-template.diff -# Gnome 2.6 has totally different authentication (sigh) -vfs-2.6-auth.diff -# Fix canvas polyline impl. i#37793, n#66865 -canvas-open-line.diff -# fix sal wrt doube locks, Issue 41904 -doublelockcrashonexit.diff - -[ LinuxOnly ] -# Optimize linkage of some xmlhelp libraries # FIXME: shres -xmlhelp-optimize-linkage.diff -# Modify the fpicker makefile causing problems in the win32 build -fpicker-common-build.diff - -[ XineramaPIC ] -# use libXinerama_pic.a on all archs -xinerama-pic-on-all-archs.diff - - -[ Misc ] -# Make the default writer bullet larger i#10549 -# sw-default-bullet.diff -# Insert symbol defaults to the Symbol font - not a random one #15512 -gui-sw-insert-symbol.diff -# Address data source ordering X#62860 -addrbk-datasrc-ordering.diff -# Add an ooo-build version in ProductExtension - FIXME - improve & add to configure. -version-strike.diff -# Try to get the font mapping right -gui-metric-fonts.diff -# Describe the metric compatible fonts for export mappings -gui-metric-fonts-descr.diff -# Some of the new help & other icons we need #FIXME copy OOO_1_1_incons -# gui-new-icons.diff - SMALL REGRESSION -# Make the delete key happy again in starcalc #17965 - wontfix [!] -gui-sc-delete.diff -# Autodetect HAVE_GCC_VISIBILITY_FEATURE -- it's currently used but never -# set -detect-gcc-visibility.diff -#Review comments implemented for #34909 -#FIXME this needs to be ported -#dbaccess-evo-changes.diff -# E-mail attachment file name append with "_1" X#67684 #35780 -# email-attachment-underscore-zero.diff -# removing multimedia menu's X66608 -remove-default-multimedia-menu.diff - -[ NovellOnlyUnix ] -# Use bug buddy -bug-buddy.diff -# save everything to ~/Documents by default -default-save-path.diff -# Help Support page -help-support.diff -# mark the files in share/template/<lang>/wizard/bitmap as lang specific -build-wizard-bitmap-scp.diff -# change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre -scp2-user-config-ooo-2-0-pre.diff - -[ NovellOnlyWin32 ] -filebug-support.diff - -[ i18n ] -# shrink exported ISO_8859_2 & MS_1250 html -# most people will use UTF-8 and never see this, #19514 -html-8bit-export-shrink.diff - -# ( mmp@oo.o deals with defaults apparently ) -[ Defaults ] -# stop the user having to fight ooimpress constantly #35338 -capitalization.diff -# default to large icons in the toolbar -gui-toolbox-large-icons.diff -# Use nicer colors for the charts X#64359 -sc-default-color-modify.diff -# make tri-state toolbars less confusing #35563 -gui-toolbox-tristate.diff -# default to anti-alias at point size of 1 point -default-font-aasize.diff -# set default font size to 10pt #35565 -default-font-size.diff -# don't use any slow / nasty X fonts #35641 -default-no-x-fonts.diff -# use more normal hinting parameters #35714 -default-glyph-light.diff -# Dramatically improve MS import / export cf. #8276 et. al. -default-ms-filter-convert.diff -# improve keybindings #35738 -default-keybindings.diff -# use pair kerning in new documents #35873 -default-pairkerning-on.diff -# Optimal Page Wrap should be default for graphics insertion (X#59831) #38108 -writer-default-as-optimal-page-wrap.diff - -# -# Controversial bits - no use filing up-stream -# -# pestering people serves no useful purpose -default-no-registration.diff -# automatically do any migration we can, with no wizard -default-no-startup-wizard.diff -# don't throw up the style dialog on 1st run -default-no-style-dialog.diff -# no Help->registration dialog by default -default-no-registration-menu.diff -# Use the Gnome VFS on KDE as well if it's there (better than nothing) -vfs-kde-too.diff -# Trade speed for reliability with valgrind -valgrind-alloc.diff - -[ Features ] -# Make cut and paste nicer #15509 -sc-paste-dialog.diff -# Save as menuitem for image context menus in impress #13816 -# sd-save-image-context-menu.diff - FIXME - Raul working on this. -# Make insensitive toolbar icons look far nicer #35555 -gui-insensitive.diff - -[ BuildBits ] -# do an optimizing link -build-optimized-link.diff -# do not build extras for icu, workaround for http://bugs.debian.org/210608 -icu-build-no-extras.diff - -# fix installation with --disable-binfilter, #43457 -# it is a hunk from patches/src680-m79/cws-buildcond02.diff that was not send -# upstream -scp2-binfilter.diff -# remove binfilter formats from type & SaveAs configuration -starformat-disable.diff - -# allows to do not pack libstdc++ and libgcc_s; #42902 -system-stdlibs.diff - -# Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3) -sal-cxa-guard.diff -# do not pack any potential .orig files with ppds -psprint_config-no-orig.diff -# Fix ODK Java bits -odk-java-wizpanel.diff -# add possibility to set ARCH_FLAGS when building libnas -nas-use-arch-flags.diff - -[ ParallelMake ] -# Fixes for distributed building (with icecream) #35627 -parallel-solenv-target-mk.diff -parallel-solenv-tg_sdi-mk.diff -# 3 more makefiles in sysui are seriously broken #35628 -parallel-sysui-makefiles.diff - -# Fix/workaround race condition with .REMOVE rule #16752 -parallel-dmake-dont-remove.diff - -[ VCL ] -# Don't let the splash screen take over #23609 -no-splash-takeover.diff - -# Cleanup of old kdeint pieces - part of #36763 -# FIXME: #36763 is marked as fixed; create a new issue for this -cleanup-vcl-kdeint.diff - -# Implementation of KDE/Qt NWF toolbars and menus TODO up-stream -vcl-nwf-toolbars.diff -vcl-nwf-menus.diff -vcl-nwf-kde-toolbars-menus.diff - -# Improve the font resolving in KDE vclplug (grabbed from Gtk+ vclplug) TODO up-stream -vcl-nwf-kde-font-resolving.diff - -# Use nwf for menu item check boxes instead of ugly symbols -vcl-nwf-menu-checkmarks.diff - -[ SystemMozilla ] -# -# Snarfed from Caolan, unknown status. -# http://people.redhat.com/caolanm/SRC680_m58 -# -system-mozilla-config_office.diff -system-mozilla-connectivity.diff -system-mozilla-extensions.diff -system-mozilla-libxmlsec.diff -system-mozilla-scp2.diff -system-mozilla-xmlsecurity.diff -system-mozilla-xmlsecurity-libnss.diff -# FIXME: this is an UGLY hack. -# It sets LD_LIBRARY_PATH in soffice wrapper to system mozilla (only -# the SUSE specific path /opt/mozilla/lib -system-mozilla-desktop.diff -# Teach linkoo about the evil under the sun: -linkoo-moz-hack.diff - -[ Icons ] -# Installation & appearance of multiple icon sets (Industrial and Crystal) #36518 -icons-vcl-according-to-desktop.diff -icons-xmlhelp-according-to-desktop.diff -# Theme & add alpha to the WM icons #41225 -wm-icons.diff - -[ Fpickers ] -# Out-of-process implementation of KDE fpicker -# FIXME: No IZ number for this, because it is necessary to do it internal first -fpicker-kde-service.diff -fpicker-kde-dialog.diff -# Partially support KIO (download the file locally if we cannot handle it in -# OOo or (FIXME) using gnome-vfs) binc#60527 -fpicker-kde-partial-kio.diff - -# Let the KDE and Gtk+ fpickers build and install FIXME IZ number -fpicker-common-scp2.diff -# Show "Use OpenOffice.org dialogs" check box only if the system fpicker is -# available (better implementation) FIXME IZ number -fpicker-show-checkbox.diff -# add in an extra combobox to make filter selection easier i#10545, i#66075 -fpicker-fixes.diff -# fix for the gtk critical error n#66349 -fpicker-gnome-crash-fix.diff -# temporary fix to enable filter detection to work properly i#10545 -sfx2-fpicker-gnome-filter-fix.diff -# fix for the fpicker hanging on accessible desktop -fpicker-accessibility-fix.diff -# fix for the fpicker crashing in the Euro converter n#67124 -# fpicker-euro-converter-fix.diff -# Fix old gnome-vfs crasher i#43004 -fpicker-gnome-vfs-fix.diff -# Fix for case insensitive patterns n#807 i#44526 -fpicker-case-insensitive.diff - -[ Evo2 ] - -# evolution addressbook driver version 2 #34909 -connectivity-source-drivers-evoab1-5-dataaccess-xcu.diff -connectivity-source-drivers-evoab1-5-evoab1-5-map.diff -connectivity-source-drivers-evoab1-5-evoab-xml.diff -connectivity-source-drivers-evoab1-5-makefile-mk.diff -connectivity-source-drivers-evoab1-5-nconnection-cxx.diff -connectivity-source-drivers-evoab1-5-nconnection-hxx.diff -connectivity-source-drivers-evoab1-5-ndatabasemetadata-cxx.diff -connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff -connectivity-source-drivers-evoab1-5-ndebug-cxx.diff -connectivity-source-drivers-evoab1-5-ndebug-hxx.diff -connectivity-source-drivers-evoab1-5-ndriver-cxx.diff -connectivity-source-drivers-evoab1-5-ndriver-hxx.diff -connectivity-source-drivers-evoab1-5-npreparedstatement-cxx.diff -connectivity-source-drivers-evoab1-5-npreparedstatement-hxx.diff -connectivity-source-drivers-evoab1-5-nresultset-cxx.diff -connectivity-source-drivers-evoab1-5-nresultset-hxx.diff -connectivity-source-drivers-evoab1-5-nresultsetmetadata-cxx.diff -connectivity-source-drivers-evoab1-5-nresultsetmetadata-hxx.diff -connectivity-source-drivers-evoab1-5-nservices-cxx.diff -connectivity-source-drivers-evoab1-5-nstatement-cxx.diff -connectivity-source-drivers-evoab1-5-nstatement-hxx.diff -connectivity-source-drivers-evoab1-5-ncatalog-cxx.diff -connectivity-source-drivers-evoab1-5-ncatalog-hxx.diff -connectivity-source-drivers-evoab1-5-ntables-cxx.diff -connectivity-source-drivers-evoab1-5-ntables-hxx.diff -evoab2_prj.diff -evoab2_scp.diff -connectivity-source-drivers-evoab1-5-EApi-cxx.diff -connectivity-source-drivers-evoab1-5-EApi-h.diff -# Evolution in wizards -> addressbook X#66214 -wizard-evo-local.diff -[ QPro ] -# Quattro Pro 6.0 import filter: IZ #41688 -formel-hxx.diff -qpro-build.diff -qpro-detect.diff -qproform-hxx.diff -frmbase-cxx.diff -qpro-cxx.diff -qproform-cxx.diff -qpro-hxx.diff - -[ Win32Common ] -# 2 more makefiles in sysui are seriously broken #35628 -# parallel-python-makefile_mk.diff # looks to be upstream -# Work around G/W mail component crasher bug #34264 -win32-gw-send-mail.diff -# use bin/oowintool for the win32 configure stage -win32-msvs-2003-configure.diff -# Minor build fixes for win32 -win32-build-fixes.diff -# This is a pretty nasty IE problem #19510 -# win32-activex-disable.diff # commented out as it breaks instsetoo_native - - -[ VBABits ] -# Alt-F11 does something useful #29138 -vba-keybinding-f11.diff -# Parse (& ignore) 'Attribute' statements #37347 -vba-attribute.diff -# Add foreach statement - #33807 -# vba-foreach.diff - FIXME -# Prefer interoperability over marginal compatibility -default-vba-compatible.diff -vba-not-comments.diff - -[ NLDOnly ] -# Push fonts into the ps stream always -pushfont-psstream.diff - -# in case the system is panicing; registry/data/org/openoffice/VCL.xcu is -# not installed or broken; used for example if OOo is installed from an -# installation set by ./install --interactive -gui-font-paranoid-fallback.diff - -[ NLDOnly ] -# some branding action cf. doc/splash.txt -nld-splash.diff - -[ SUSEOnly ] -# some branding action cf. doc/splash.txt -suse-splash.diff - -[ ArkOnly ] -# Ark Linux splits Qt into qt-mt and qt-base-mt so text mode apps etc. -# can use Qt base functionality without linking in the whole GUI. -# vclplug needs to add -lqt-base-mt here. -ark-handle-split-qt.diff -# If /usr/bin/java is a gcj wrapper, javadoc doesn't exist -- and -# configure shouldn't barf. -missing-javadoc-nonfatal.diff -# Don't barf with "unresolved symbol PL_InitArenaPool" whenever something -# links to libnss3 -libxmlsec-nssckbi.diff -# Work around missing dictionaries for now. -# This is BROKEN and must be removed as soon as a real fix is found -workaround-missing-dictionaries.diff - -[ RedhatOnly ] -# Some palette loving -redhat-standard-colors.diff - -[ 64bit ] -# -# NOTE: 64 bit OOo is work in progress! -# - -# The following is a result of: -# cvs -d :pserver:anoncvs@anoncvs.services.openoffice.org:/cvs checkout -r cws_src680_ooo64bit02 OpenOffice -# for I in * ; do cvs -d :pserver:anoncvs@anoncvs.services.openoffice.org:/cvs diff -N -r CWS_SRC680_OOO64BIT02_ANCHOR -r cws_src680_ooo64bit02 $I > $I.diff ; done -# (and a bin/cvsclean) -64bit-basegfx.diff -64bit-basic.diff -#64bit-binfilter.diff -64bit-boost.diff -64bit-bridges.diff -#64bit-canvas.diff -64bit-comphelper.diff -64bit-configmgr.diff -64bit-connectivity.diff -#64bit-cppcanvas.diff -64bit-cppu.diff -64bit-cppuhelper.diff -#64bit-dbaccess.diff -64bit-desktop.diff -64bit-extensions.diff -64bit-extras.diff -64bit-framework.diff -64bit-goodies.diff -64bit-idlc.diff -64bit-i18npool.diff -64bit-jvmfwk.diff -64bit-nas.diff -64bit-psprint.diff -64bit-rdbmaker.diff -64bit-registry.diff -#64bit-rsc.diff -64bit-sal.diff -64bit-sc.diff -#64bit-setup2.diff -64bit-sfx2.diff -64bit-sch.diff -64bit-solenv.diff -64bit-so3.diff -64bit-starmath.diff -64bit-stlport.diff -64bit-stoc.diff -64bit-store.diff -64bit-svtools.diff -64bit-svx.diff -64bit-sw.diff -64bit-toolkit.diff -64bit-tools.diff -64bit-vcl.diff -64bit-vos.diff -64bit-xmloff.diff - -# Additional build fixes that need upstreaming to ooo64bit02 -buildfix-64bit-automation.diff -buildfix-64bit-basic.diff -buildfix-64bit-canvas.diff -buildfix-64bit-chart2.diff -buildfix-64bit-config_office.diff -buildfix-64bit-cppcanvas.diff -buildfix-64bit-dbaccess.diff -buildfix-64bit-extensions.diff -buildfix-64bit-filter.diff -buildfix-64bit-framework.diff -# TODO file to IZ -buildfix-64bit-rsc.diff -buildfix-64bit-sc.diff -buildfix-64bit-sch.diff -buildfix-64bit-sd.diff -buildfix-64bit-sfx2.diff -buildfix-64bit-solenv.diff -buildfix-64bit-starmath.diff -buildfix-64bit-svtools.diff -buildfix-64bit-svx.diff -buildfix-64bit-sw.diff -buildfix-64bit-tools.diff -buildfix-64bit-vcl.diff -buildfix-64bit-xmloff.diff - -# Other build fixes -buildfix-64bit-system-jpeg.diff - -# res32bit related fixes -# TODO file to IZ -buildfix-64bit-padmin-res32bit.diff -buildfix-64bit-extensions-res32bit.diff - -# 64-bit related fixes for run-time -# Correct reading of resources IZ#40338 -#fix-64bit-tools.diff -# Fix crash while initializing fontconfig -fix-64bit-psprint.diff - -# Fix ambiguous invocations of Min()/Max()/Abs() when OOo with 64 bit patches -# is built on 32 bit platforms -buildfix-64bit-on-32bit-systems.diff - -[ JDK150 ] -# You need 64bit java, e.g. JDK 1.5.0 for AMD64: -# http://java.sun.com/j2se/1.5.0/download.jsp -# This JDK needs -# ln -s motif21/libmawt.so /usr/java/jdk1.5.0_01/jre/lib/amd64/libmawt.so -# to let OOo compile well -# -# FIXME No IZ for this one yet -buildfix-jdk150-berkeleydb.diff -buildfix-jdk150-jurt.diff -buildfix-jdk150-jvmfwk.diff -buildfix-jdk150-qadevOOo.diff -buildfix-jdk150-rhino.diff -buildfix-jdk150-sandbox.diff -buildfix-jdk150-scripting.diff -buildfix-jdk150-sj2.diff -buildfix-jdk150-xmerge.diff -buildfix-jdk150-xmlhelp.diff -buildfix-jdk150-XmlSearch.diff - -[ DebianOnly ] -ant-only-main-classes-hack.diff - diff --git a/patches/src680/crash-iodetect.diff b/patches/src680/crash-iodetect.diff new file mode 100644 index 000000000..16bd55f34 --- /dev/null +++ b/patches/src680/crash-iodetect.diff @@ -0,0 +1,25 @@ +Index: sw/inc/iodetect.cxx +=================================================================== +RCS file: /cvs/sw/sw/inc/iodetect.cxx,v +retrieving revision 1.19 +diff -u -r1.19 iodetect.cxx +--- sw/inc/iodetect.cxx 28 Jan 2005 15:26:05 -0000 1.19 ++++ sw/inc/iodetect.cxx 14 Mar 2005 15:28:03 -0000 +@@ -101,7 +101,7 @@ + + inline int IsFilter( const String& rNm ) + { +- return rNm.EqualsAscii( pName, 0, nLen ); ++ return pName && rNm.EqualsAscii( pName, 0, nLen ); + } + + #ifdef _DLL_ +@@ -159,7 +159,7 @@ + 1 + + #endif + //21; +- 19; ++ 18; + + #define FORAMTNAME_SW4 "StarWriter 4.0" + #define FORAMTNAME_SW3 "StarWriter 3.0" diff --git a/patches/src680/crash-print.diff b/patches/src680/crash-print.diff new file mode 100644 index 000000000..54ba2fbb4 --- /dev/null +++ b/patches/src680/crash-print.diff @@ -0,0 +1,12 @@ +--- sfx2/source/view/viewprn.cxx ++++ sfx2/source/view/viewprn.cxx +@@ -525,6 +524,9 @@ + + // forget new printer, it was taken over (as pPrinter) or deleted + pDlgPrinter = NULL; ++ /* Now lets reset the Dialog printer, since its freed */ ++ if( pPrintDlg ) ++ pPrintDlg->SetPrinter (pPrinter); + + if ( SID_PRINTDOC == nId ) + { diff --git a/patches/src680/crash-sc-excel.diff b/patches/src680/crash-sc-excel.diff new file mode 100644 index 000000000..9b9a41f37 --- /dev/null +++ b/patches/src680/crash-sc-excel.diff @@ -0,0 +1,147 @@ +Index: sc/inc/scextopt.hxx +=================================================================== +RCS file: /cvs/sc/sc/inc/scextopt.hxx,v +retrieving revision 1.10 +diff -u -p -u -r1.10 scextopt.hxx +--- sc/inc/scextopt.hxx 11 Aug 2004 08:57:38 -0000 1.10 ++++ sc/inc/scextopt.hxx 16 Mar 2005 17:32:22 -0000 +@@ -86,7 +86,9 @@ + * + *****************************************************************************/ + +-class ColRowSettings; ++namespace sc { ++ class ColRowSettings; ++} + + // ACHTUNG1: einzelne Einstellungen sollten stimmen + // -> Absicherung nur ueber Assertions +@@ -149,7 +151,7 @@ class ScExtDocOptions + { + // Code: colrowst.cxx + private: +- friend class ColRowSettings; ++ friend class ::sc::ColRowSettings; + // Window -Info + ScExtTabOptions** ppExtTabOpts; + +@@ -190,7 +192,7 @@ public: + inline void SetChanged( BOOL bChg ) { bChanged = bChg; } + inline BOOL IsChanged() const { return bChanged; } + +- void Add( const ColRowSettings& rCRS ); ++ void Add( const ::sc::ColRowSettings& rCRS ); + + inline const ScExtTabOptions* GetExtTabOptions( const SCTAB nTabNum ) const; + inline ScExtTabOptions* GetExtTabOptions( const SCTAB nTabNum ); + + +Index: sc/source/filter/excel/colrowst.cxx +=================================================================== +RCS file: /cvs/sc/sc/source/filter/excel/colrowst.cxx,v +retrieving revision 1.25 +diff -u -p -u -r1.25 colrowst.cxx +--- sc/source/filter/excel/colrowst.cxx 14 Jan 2005 11:59:49 -0000 1.25 ++++ sc/source/filter/excel/colrowst.cxx 16 Mar 2005 17:32:26 -0000 +@@ -89,6 +89,8 @@ + // for filter manager + #include "excimp8.hxx" + ++using namespace ::sc; ++namespace sc { + + ColRowSettings::ColRowSettings( RootData& rRootData ) : + ExcRoot( &rRootData ) +@@ -417,7 +419,7 @@ void ColRowSettings::SetFrozen( const BO + } + + +- ++}; // end of namespace sc + + + +@@ -657,7 +659,7 @@ void ScExtDocOptions::SetZoom( UINT16 nZ + } + + +-void ScExtDocOptions::Add( const ColRowSettings& rCRS ) ++void ScExtDocOptions::Add( const sc::ColRowSettings& rCRS ) + { + const SCTAB nTab = rCRS.pExcRoot->pIR->GetCurrScTab(); + + +Index: sc/source/filter/excel/impop.cxx +=================================================================== +RCS file: /cvs/sc/sc/source/filter/excel/impop.cxx,v +retrieving revision 1.71 +diff -u -p -u -r1.71 impop.cxx +--- sc/source/filter/excel/impop.cxx 14 Jan 2005 12:01:42 -0000 1.71 ++++ sc/source/filter/excel/impop.cxx 16 Mar 2005 17:32:28 -0000 +@@ -1682,7 +1682,7 @@ OutlineDataBuffer::OutlineDataBuffer(Roo + nTab (nTabNo), + pColOutlineBuff( new OutlineBuffer (MAXCOLCOUNT) ), + pRowOutlineBuff( new OutlineBuffer (MAXROWCOUNT) ), +- pColRowBuff( new ColRowSettings( rRootData ) ) ++ pColRowBuff( new sc::ColRowSettings( rRootData ) ) + { + pColRowBuff->SetDefWidth( STD_COL_WIDTH ); + pColRowBuff->SetDefHeight( ( UINT16 ) STD_ROW_HEIGHT ); +Index: sc/source/filter/inc/colrowst.hxx +=================================================================== +RCS file: /cvs/sc/sc/source/filter/inc/colrowst.hxx,v +retrieving revision 1.17 +diff -u -p -u -r1.17 colrowst.hxx +--- sc/source/filter/inc/colrowst.hxx 4 Jun 2004 10:51:48 -0000 1.17 ++++ sc/source/filter/inc/colrowst.hxx 16 Mar 2005 17:32:38 -0000 +@@ -88,6 +88,7 @@ class XclImpStream; + #define ROWFLAG_HIDDEN 0x04 + #define ROWFLAG_MAN 0x08 + ++namespace sc { + + class ColRowSettings : public ExcRoot + { +@@ -238,7 +239,7 @@ inline void ColRowSettings::SetRowSettin + _SetRowSettings( nRow, nExcelHeight, nGrbit ); + } + +- ++} // end of namespace sc + + + #endif +Index: sc/source/filter/inc/imp_op.hxx +=================================================================== +RCS file: /cvs/sc/sc/source/filter/inc/imp_op.hxx,v +retrieving revision 1.30 +diff -u -p -u -r1.30 imp_op.hxx +--- sc/source/filter/inc/imp_op.hxx 14 Jan 2005 12:08:12 -0000 1.30 ++++ sc/source/filter/inc/imp_op.hxx 16 Mar 2005 17:32:38 -0000 +@@ -159,7 +159,7 @@ class OutlineDataBuffer + { + private: + typedef ::std::auto_ptr< OutlineBuffer > OutlineBufferPtr; +- typedef ::std::auto_ptr< ColRowSettings > ColRowSettingsPtr; ++ typedef ::std::auto_ptr< sc::ColRowSettings > ColRowSettingsPtr; + + OutlineBufferPtr pColOutlineBuff; + OutlineBufferPtr pRowOutlineBuff; +@@ -170,7 +170,7 @@ public: + OutlineDataBuffer(RootData& rRootData, SCTAB nScTab); + ~OutlineDataBuffer(); + +- inline ColRowSettings* GetColRowBuff() const { return pColRowBuff.get(); } ++ inline sc::ColRowSettings* GetColRowBuff() const { return pColRowBuff.get(); } + inline OutlineBuffer* GetColOutline() const { return pColOutlineBuff.get(); } + inline OutlineBuffer* GetRowOutline() const { return pRowOutlineBuff.get(); } + void Apply(ScDocument* pD); +@@ -196,7 +196,7 @@ protected: + + OutlineBuffer* pColOutlineBuff; + OutlineBuffer* pRowOutlineBuff; +- ColRowSettings* pColRowBuff; // Col/Row-Einstellungen 1 Tabelle ++ sc::ColRowSettings* pColRowBuff; // Col/Row-Einstellungen 1 Tabelle + + typedef ScfDelList< OutlineDataBuffer > OutlineListBuffer; + OutlineListBuffer* pOutlineListBuffer; diff --git a/patches/src680/crash-sd-shell.diff b/patches/src680/crash-sd-shell.diff new file mode 100644 index 000000000..be79a8128 --- /dev/null +++ b/patches/src680/crash-sd-shell.diff @@ -0,0 +1,106 @@ +Index: sd/source/ui/view/ViewShellManager.cxx +=================================================================== +RCS file: /cvs/graphics/sd/source/ui/view/ViewShellManager.cxx,v +retrieving revision 1.11 +retrieving revision 1.11.54.1 +diff -u -p -u -r1.11 -r1.11.54.1 +--- sd/source/ui/view/ViewShellManager.cxx 4 Feb 2005 14:18:29 -0000 1.11 ++++ sd/source/ui/view/ViewShellManager.cxx 15 Mar 2005 15:51:00 -0000 1.11.54.1 +@@ -77,6 +77,7 @@ + #endif + + #include <sfx2/dispatch.hxx> ++#include <svx/svxids.hrc> + + #include <hash_map> + +@@ -94,25 +95,23 @@ public: + ShellId mnId; + }; + +-class IsShell ++class IsShell : public ::std::unary_function<ActiveShellDescriptor,bool> + { + public: + IsShell (const ::sd::ViewShell* pShell) : mpShell(pShell) {} + bool operator() (const ActiveShellDescriptor& rDescriptor) +- { +- return rDescriptor.mpViewShell == mpShell; +- } ++ { return rDescriptor.mpViewShell == mpShell; } ++private: + const ViewShell* mpShell; + }; + +-class IsId ++class IsId : public ::std::unary_function<ActiveShellDescriptor,bool> + { + public: + IsId (ShellId nId) : mnId(nId) {} + bool operator() (const ActiveShellDescriptor& rDescriptor) +- { +- return rDescriptor.mnId == mnId; +- } ++ { return rDescriptor.mnId == mnId; } ++private: + ShellId mnId; + }; + +@@ -217,6 +216,13 @@ private: + void DumpSfxShellStack (void); + + void UpdateShellStack (ShellStack& rRequestedStack); ++ ++ /** To be called before a shell is taken fom the SFX shell stack. This ++ method deactivates an active text editing to avoid problems with ++ undo managers. ++ Afterwards the Deactivate() of the shell is called. ++ */ ++ void Deactivate (SfxShell* pShell); + }; + + +@@ -755,7 +761,7 @@ void ViewShellManager::Implementation::T + for (USHORT nIndex=0; true; nIndex++) + { + SfxShell* pShellOnStack = mrBase.GetSubShell(nIndex); +- pShellOnStack->Deactivate(TRUE); ++ Deactivate(pShellOnStack); + if (pShellOnStack == pShell) + break; + } +@@ -935,6 +941,34 @@ void ViewShellManager::Implementation::D + + + ++ ++void ViewShellManager::Implementation::Deactivate (SfxShell* pShell) ++{ ++ OSL_ASSERT(pShell!=NULL); ++ ++ // We have to end a text edit for view shells that are to be taken from ++ // the shell stack. ++ ViewShell* pViewShell = dynamic_cast<ViewShell*>(pShell); ++ if (pViewShell != NULL) ++ { ++ SdrView* pView = pViewShell->GetView(); ++ if (pView!=NULL && pView->IsTextEdit()) ++ { ++ pView->EndTextEdit(); ++ pView->UnmarkAll(); ++ pViewShell->GetViewFrame()->GetDispatcher()->Execute( ++ SID_OBJECT_SELECT, ++ SFX_CALLMODE_ASYNCHRON); ++ } ++ } ++ ++ // Now we can deactivate the shell. ++ pShell->Deactivate(TRUE); ++} ++ ++ ++ ++ + //===== ViewShellManager::UpdateLock ========================================== + + ViewShellManager::UpdateLock::UpdateLock (ViewShellManager& rManager) diff --git a/patches/src680/default-evolution-database.diff b/patches/src680/default-evolution-database.diff new file mode 100644 index 000000000..43115c052 --- /dev/null +++ b/patches/src680/default-evolution-database.diff @@ -0,0 +1,30 @@ +--- extras/source/database/makefile.mk.bakj 2005-03-16 18:49:33.251075928 +0530 ++++ extras/source/database/makefile.mk 2005-03-16 18:50:38.651285353 +0530 +@@ -72,8 +72,8 @@ + + ZIP1TARGET = $(DATABASE_USER_TARGET) + +-ZIP1LIST = biblio.odb +- ++ZIP1LIST = biblio.odb \ ++ evolocal.odb + ZIP2TARGET = $(DATABASE_USER_BIBLIO_TARGET) + + ZIP2LIST = biblio.dbf biblio.dbt +--- officecfg/registry/data/org/openoffice/Office/DataAccess.xcu.bakj 2005-03-16 18:51:43.777536725 +0530 ++++ officecfg/registry/data/org/openoffice/Office/DataAccess.xcu 2005-03-16 18:52:51.471404727 +0530 +@@ -187,6 +187,14 @@ + </node> + </node> + <node oor:name="RegisteredNames"> ++ <node oor:name="EvolutionLocal" oor:op="replace"> ++ <prop oor:name="Location" oor:type="xs:string"> ++ <value>$(userurl)/database/evolocal.odb</value> ++ </prop> ++ <prop oor:name="Name" oor:type="xs:string"> ++ <value>EvolutionLocal</value> ++ </prop> ++ </node> + <node oor:name="Bibliography" oor:op="replace"> + <prop oor:name="Location" oor:type="xs:string"> + <value>$(userurl)/database/biblio.odb</value> diff --git a/patches/src680/fpicker-csv-filter-open-fix.diff b/patches/src680/fpicker-csv-filter-open-fix.diff new file mode 100644 index 000000000..4680c3b39 --- /dev/null +++ b/patches/src680/fpicker-csv-filter-open-fix.diff @@ -0,0 +1,27 @@ +--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2005-03-16 14:36:50.532283458 +0530 ++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2005-03-16 14:38:00.113654743 +0530 +@@ -774,11 +774,23 @@ rtl::OUString SAL_CALL SalGtkFilePicker: + const gchar* filtername = gtk_file_filter_get_name( filter ); + m_aCurrentFilter = rtl::OUString( filtername, strlen( filtername ), + RTL_TEXTENCODING_UTF8 ); ++ gint nFilterPos = 0; ++ for( FilterList::iterator aListIter = m_pFilterList->begin(); ++ aListIter != m_pFilterList->end(); ++ ++aListIter, ++nFilterPos ++ ) ++ { ++ if ( aListIter->getTitle().indexOf( m_aCurrentFilter ) == 0 ) ++ { ++ m_aCurrentFilter = OUString( aListIter->getTitle() ); ++ break; ++ } ++ } + } + + if( GTK_FILE_CHOOSER_ACTION_SAVE == eAction || + ( GTK_FILE_CHOOSER_ACTION_OPEN == eAction && +- m_aCurrentFilter.equals( shrinkFilterName( m_pFilterList->begin()->getTitle() ) ) ) ) ++ m_aCurrentFilter.equals( m_pFilterList->begin()->getTitle() ) ) ) + { + gint nFilterChoice = gtk_combo_box_get_active( GTK_COMBO_BOX( m_pFilterComboBox ) ); + diff --git a/patches/src680/fpicker-extra-combobox.diff b/patches/src680/fpicker-extra-combobox.diff deleted file mode 100644 index c467acdf6..000000000 --- a/patches/src680/fpicker-extra-combobox.diff +++ /dev/null @@ -1,202 +0,0 @@ ---- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2005-02-14 10:39:19.877802587 +0530 -+++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2005-02-14 10:42:21.217193172 +0530 -@@ -169,6 +169,7 @@ SalGtkFilePicker::SalGtkFilePicker( cons - lang::XServiceInfo>( m_rbHelperMtx ), - m_xServiceMgr( xServiceMgr ), - m_aAsyncEventNotifier( rBHelper ), -+ m_pFilterComboBox( NULL ), - m_pVBox ( NULL ), - m_pFilterList( NULL ), - bVersionWidthUnset( false ), -@@ -618,12 +619,32 @@ rtl::OUString SAL_CALL SalGtkFilePicker: - - OSL_TRACE( "GetCURRENTfilter\n" ); - -- // Update the filtername from the users selection if they have had a chance to do so. -- if( GtkFileFilter *filter = gtk_file_chooser_get_filter( GTK_FILE_CHOOSER( m_pDialog ) ) ) -+ if( m_pFilterComboBox ) - { -- const gchar* filtername = gtk_file_filter_get_name( filter ); -- m_aCurrentFilter = rtl::OUString( filtername, strlen( filtername ), -+ gint nFilterChoice = gtk_combo_box_get_active( GTK_COMBO_BOX( m_pFilterComboBox ) ); -+ -+ gint nFilterPos = 0; -+ for ( FilterList::iterator aListIter = m_pFilterList->begin(); -+ aListIter != m_pFilterList->end(); -+ ++aListIter, ++nFilterPos -+ ) -+ { -+ if ( nFilterPos == nFilterChoice ) -+ { -+ m_aCurrentFilter = OUString( aListIter->getTitle() ); -+ break; -+ } -+ } -+ } -+ else -+ { -+ // Update the filtername from the users selection if they have had a chance to do so. -+ if( GtkFileFilter *filter = gtk_file_chooser_get_filter( GTK_FILE_CHOOSER( m_pDialog ) ) ) -+ { -+ const gchar* filtername = gtk_file_filter_get_name( filter ); -+ m_aCurrentFilter = rtl::OUString( filtername, strlen( filtername ), - RTL_TEXTENCODING_UTF8 ); -+ } - } - - OSL_TRACE( "Returning current filter of %s\n", -@@ -746,18 +767,22 @@ uno::Sequence<rtl::OUString> SAL_CALL Sa - - if( GTK_FILE_CHOOSER_ACTION_SAVE == eAction ) - { -- const gchar* filtername = -- gtk_file_filter_get_name( gtk_file_chooser_get_filter( GTK_FILE_CHOOSER( m_pDialog ) ) ); -- -- OSL_TRACE( "2: current filter is %s\n", filtername ); -+ OUString aFilter; - -+ gint nFilterChoice = gtk_combo_box_get_active( GTK_COMBO_BOX( m_pFilterComboBox ) ); - -- FilterList::iterator aListIter = ::std::find_if( -- m_pFilterList->begin(), m_pFilterList->end(), -- FilterTitleMatch( OUString( filtername, -- strlen( filtername ), RTL_TEXTENCODING_UTF8 ) ) ); -- -- OUString aFilter = aListIter->getFilter(); -+ gint nFilterPos = 0; -+ for ( FilterList::iterator aListIter = m_pFilterList->begin(); -+ aListIter != m_pFilterList->end(); -+ ++aListIter, ++nFilterPos -+ ) -+ { -+ if ( nFilterPos == nFilterChoice ) -+ { -+ aFilter = OUString( aListIter->getFilter() ); -+ break; -+ } -+ } - - OSL_TRACE( "turned into %s\n", - OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr() ); -@@ -1593,6 +1618,13 @@ void SAL_CALL SalGtkFilePicker::initiali - gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], FALSE, FALSE, 0 ); - } - -+ if( GTK_FILE_CHOOSER_ACTION_SAVE == eAction ) -+ { -+ m_pFilterComboBox = gtk_combo_box_new_text(); -+ gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterComboBox, FALSE, TRUE, 7 ); -+ gtk_widget_show( m_pFilterComboBox ); -+ } -+ - gtk_file_chooser_set_extra_widget( GTK_FILE_CHOOSER( m_pDialog ), m_pVBox ); - - // Setup special flags -@@ -1685,34 +1717,44 @@ uno::Sequence<rtl::OUString> SAL_CALL Sa - //------------------------------------------------- - void SalGtkFilePicker::SetCurFilter( const OUString& rFilter ) - { -- // Get all the filters already added -- GSList *filters = gtk_file_chooser_list_filters ( GTK_FILE_CHOOSER( m_pDialog ) ); -- bool bFound = false; -- -- while( ( !bFound ) && ( NULL != filters ) ) -- { -- GtkFileFilter* pFilter = reinterpret_cast<GtkFileFilter *>( filters->data ); -- G_CONST_RETURN gchar * filtername = gtk_file_filter_get_name( pFilter ); -- OUString sFilterName( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 ); -+ OUString aShrunkName = shrinkFilterName( rFilter ); - -- OUString aShrunkName = shrinkFilterName( rFilter ); -- if( aShrunkName.equals( sFilterName) ) -+ if( m_pFilterComboBox ) -+ { -+ gint nFilterPos = 0; -+ for ( FilterList::iterator aListIter = m_pFilterList->begin(); -+ aListIter != m_pFilterList->end(); -+ ++aListIter, ++nFilterPos -+ ) - { -- OSL_TRACE( "actually setting %s\n", filtername ); -- gtk_file_chooser_set_filter( GTK_FILE_CHOOSER( m_pDialog ), pFilter ); -- bFound = true; -+ if ( aShrunkName.equals( aListIter->getTitle() ) ) -+ { -+ gtk_combo_box_set_active( GTK_COMBO_BOX( m_pFilterComboBox ), nFilterPos ); -+ break; -+ } - } -+ } -+ else -+ { -+ // Get all the filters already added -+ GSList *filters = gtk_file_chooser_list_filters ( GTK_FILE_CHOOSER( m_pDialog ) ); -+ bool bFound = false; - -- // Free the node -- g_object_ref( pFilter ); -- gtk_object_sink( GTK_OBJECT( pFilter ) ); -- g_object_unref( pFilter ); -+ for( GSList *iter = filters; !bFound && iter; iter = iter->next ) -+ { -+ GtkFileFilter* pFilter = reinterpret_cast<GtkFileFilter *>( iter->data ); -+ G_CONST_RETURN gchar * filtername = gtk_file_filter_get_name( pFilter ); -+ OUString sFilterName( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 ); - -- // g_free(filters->data); -- filters = g_slist_next( filters ); -+ if( aShrunkName.equals( sFilterName) ) -+ { -+ OSL_TRACE( "actually setting %s\n", filtername ); -+ gtk_file_chooser_set_filter( GTK_FILE_CHOOSER( m_pDialog ), pFilter ); -+ bFound = true; -+ } -+ } -+ g_slist_free( filters ); - } -- -- g_slist_free( filters ); - } - - void SalGtkFilePicker::implAddFilter( const OUString& rFilter, const OUString& rType ) -@@ -1741,7 +1783,10 @@ void SalGtkFilePicker::implAddFilter( co - while( nIndex >= 0 ); - } - -- gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( m_pDialog ), filter ); -+ if( m_pFilterComboBox ) -+ gtk_combo_box_append_text( GTK_COMBO_BOX( m_pFilterComboBox ), aFilterName ); -+ else -+ gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( m_pDialog ), filter ); - } - - void SalGtkFilePicker::implAddFilterGroup( const OUString& _rFilter, const Sequence< StringPair >& _rFilters ) -@@ -1782,6 +1827,8 @@ void SalGtkFilePicker::SetFilters() - } - } - -+ if( m_pFilterComboBox ) -+ gtk_combo_box_set_active( GTK_COMBO_BOX( m_pFilterComboBox ), 0 ); - - // set the default filter - if( m_aCurrentFilter && (m_aCurrentFilter.getLength() > 0) ) -@@ -1814,6 +1861,9 @@ SalGtkFilePicker::~SalGtkFilePicker() - - delete m_pFilterList; - -+ if( m_pFilterComboBox ) -+ gtk_widget_destroy( m_pFilterComboBox ); -+ - gtk_widget_destroy( m_pVBox ); - } - ---- fpicker/source/unx/gnome/SalGtkFilePicker.hxx 2005-02-14 10:39:22.700342320 +0530 -+++ fpicker/source/unx/gnome/SalGtkFilePicker.hxx 2005-02-14 10:42:21.217193172 +0530 -@@ -324,6 +324,7 @@ class SalGtkFilePicker : - SalGtkAsyncEventNotifier m_aAsyncEventNotifier; - FilterList *m_pFilterList; - GtkWidget *m_pVBox; -+ GtkWidget *m_pFilterComboBox; - - enum { - AUTOEXTENSION, diff --git a/patches/src680/fpicker-kde-partial-kio.diff b/patches/src680/fpicker-kde-partial-kio.diff index 26eeb1288..160264fa3 100644 --- a/patches/src680/fpicker-kde-partial-kio.diff +++ b/patches/src680/fpicker-kde-partial-kio.diff @@ -181,7 +181,7 @@ + return QString::null; + } + -+ return qTempFile.name(); ++ return qDestURL.url(); +} + void FileDialog::fileHighlightedCommand( const QString & ) diff --git a/patches/src680/hack-sd-viewshel.diff b/patches/src680/hack-sd-viewshel.diff deleted file mode 100644 index 0aca6fe66..000000000 --- a/patches/src680/hack-sd-viewshel.diff +++ /dev/null @@ -1,20 +0,0 @@ -Index: sd/source/ui/view/viewshel.cxx -=================================================================== -RCS file: /cvs/graphics/sd/source/ui/view/viewshel.cxx,v -retrieving revision 1.48 -diff -u -p -u -r1.48 viewshel.cxx ---- sd/source/ui/view/viewshel.cxx 31 Jan 2005 14:56:31 -0000 1.48 -+++ sd/source/ui/view/viewshel.cxx 11 Mar 2005 13:27:48 -0000 -@@ -1143,9 +1143,9 @@ SfxUndoManager* ViewShell::ImpGetUndoMan - SfxShell* pObjectBar = GetObjectBarManager().GetTopObjectBar(); - // The object bar may be temporarily missing, i.e. when one is - // replaced by another. Return a NULL pointer in this case. -- if (pObjectBar != NULL) -- return pObjectBar->GetUndoManager(); -- else -+// if (pObjectBar != NULL) -+// return pObjectBar->GetUndoManager(); -+// else - { - //#i39635# this state occurs e.g. initially with the left slide sorter pane - SfxViewFrame* pViewFrame = GetViewFrame(); diff --git a/patches/src680/novell-team.diff b/patches/src680/novell-team.diff index deffcec41..ac0d0cad8 100644 --- a/patches/src680/novell-team.diff +++ b/patches/src680/novell-team.diff @@ -16,7 +16,7 @@ diff -u -r1.42 dochdl.src + +String STR_NOVELL_TEAM_NAMES +{ -+ TEXT = "Back row: Martin, Nagashree, Tuomas, Nicel, Srini, Raul, Petr, Abdul, Michael\nFront row: Shilpa, Parag, Jakub, Shreyas, Jayant, Jan."; ++ TEXT = "Back row: Martin, Nagashree, Tuomas, Nicel, Srini, Raul, Petr, Abdul, Michael, Federico\nFront row: Shilpa, Parag, Jakub, Shreyas, Jayant, Jan."; +}; + Index: sw/source/ui/dochdl/gloshdl.cxx diff --git a/patches/src680/psprint-timestamp.diff b/patches/src680/psprint-timestamp.diff new file mode 100644 index 000000000..30d09eaf3 --- /dev/null +++ b/patches/src680/psprint-timestamp.diff @@ -0,0 +1,11 @@ +--- psprint/source/fontmanager/fontcache.cxx 2005-03-17 14:14:43.825254438 +0100 ++++ psprint/source/fontmanager/fontcache.cxx 2005-03-17 14:15:31.265065233 +0100 +@@ -348,7 +348,7 @@ void FontCache::read() + else + { + nDir = rManager.getDirectoryAtom( aDir, true ); +- m_aCache[ nDir ].m_nTimestamp = nTimestamp; ++ m_aCache[ nDir ].m_nTimestamp = (sal_Int64)aStat.st_mtime; + m_aCache[ nDir ].m_bNoFiles = bEmpty; + pDir = bEmpty ? NULL : &m_aCache[ nDir ].m_aEntries; + bKeepOnlyUserOverridden = ((sal_Int64)aStat.st_mtime != nTimestamp); diff --git a/patches/src680/sd-interop-1.1.diff b/patches/src680/sd-interop-1.1.diff new file mode 100644 index 000000000..ae1061924 --- /dev/null +++ b/patches/src680/sd-interop-1.1.diff @@ -0,0 +1,59 @@ +Index: xmloff/source/transform/PropertyActionsOASIS.cxx +=================================================================== +RCS file: /cvs/xml/xmloff/source/transform/PropertyActionsOASIS.cxx,v +retrieving revision 1.11 +retrieving revision 1.11.76.1 +diff -u -p -u -p -w -r1.11 -r1.11.76.1 +--- xmloff/source/transform/PropertyActionsOASIS.cxx 26 Nov 2004 13:10:17 -0000 1.11 ++++ xmloff/source/transform/PropertyActionsOASIS.cxx 11 Mar 2005 12:19:14 -0000 1.11.76.1 +@@ -221,6 +221,11 @@ XMLTransformerActionInit aGraphicPropert + { XML_NAMESPACE_STYLE, XML_MIRROR, XML_ATACTION_DRAW_MIRROR_OASIS, 0 }, + { XML_NAMESPACE_DRAW, XML_GAMMA, XML_ATACTION_GAMMA_OASIS, 0 }, + ++ { XML_NAMESPACE_STYLE, XML_FLOW_WITH_TEXT, XML_ATACTION_REMOVE, ++ NO_PARAMS }, ++ { XML_NAMESPACE_DRAW, XML_WRAP_INFLUENCE_ON_POSITION, XML_ATACTION_REMOVE, ++ NO_PARAMS }, ++ + { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS } + }; + +@@ -235,6 +240,16 @@ XMLTransformerActionInit aDrawingPagePro + { XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH, XML_ATACTION_IN2INCH, NO_PARAMS }, /* generated entry */ + { XML_NAMESPACE_DRAW, XML_FILL_IMAGE_HEIGHT, XML_ATACTION_IN2INCH, NO_PARAMS }, /* generated entry */ + ++ { XML_NAMESPACE_PRESENTATION, XML_DISPLAY_HEADER, XML_ATACTION_REMOVE, NO_PARAMS }, ++ { XML_NAMESPACE_PRESENTATION, XML_DISPLAY_FOOTER, XML_ATACTION_REMOVE, NO_PARAMS }, ++ { XML_NAMESPACE_PRESENTATION, XML_DISPLAY_PAGE_NUMBER, XML_ATACTION_REMOVE, NO_PARAMS }, ++ { XML_NAMESPACE_PRESENTATION, XML_DISPLAY_DATE_TIME, XML_ATACTION_REMOVE, NO_PARAMS }, ++ ++ { XML_NAMESPACE_SMIL, XML_TYPE, XML_ATACTION_REMOVE, NO_PARAMS }, ++ { XML_NAMESPACE_SMIL, XML_SUBTYPE, XML_ATACTION_REMOVE, NO_PARAMS }, ++ { XML_NAMESPACE_SMIL, XML_DIRECTION, XML_ATACTION_REMOVE, NO_PARAMS }, ++ { XML_NAMESPACE_SMIL, XML_FADECOLOR, XML_ATACTION_REMOVE, NO_PARAMS }, ++ + { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS } + }; + +@@ -434,10 +449,10 @@ XMLTransformerActionInit aParagraphPrope + { XML_NAMESPACE_STYLE, XML_SHADOW, XML_ATACTION_INS2INCHS, + NO_PARAMS }, + { XML_NAMESPACE_FO, XML_KEEP_WITH_NEXT, XML_OPTACTION_KEEP_WITH_NEXT, +- NO_PARAMS }, /* generated entry */ ++ NO_PARAMS }, + { XML_NAMESPACE_FO, XML_KEEP_TOGETHER, XML_OPTACTION_KEEP_TOGETHER, + NO_PARAMS }, +- { XML_NAMESPACE_STYLE, XML_WRITING_MODE, XML_OPTACTION_DRAW_WRITING_MODE, 0 }, ++// { XML_NAMESPACE_STYLE, XML_WRITING_MODE, XML_OPTACTION_DRAW_WRITING_MODE, 0 }, + { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS } + }; + +@@ -462,6 +477,8 @@ XMLTransformerActionInit aTablePropertyO + NO_PARAMS }, /* generated entry */ + { XML_NAMESPACE_FO, XML_MARGIN_BOTTOM, XML_ATACTION_IN2INCH, + NO_PARAMS }, /* generated entry */ ++ { XML_NAMESPACE_FO, XML_KEEP_WITH_NEXT, XML_OPTACTION_KEEP_WITH_NEXT, ++ NO_PARAMS }, + { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS } + }; + diff --git a/patches/src680/vcl-nwf-kde-toolbars-handle.diff b/patches/src680/vcl-nwf-kde-toolbars-handle.diff new file mode 100644 index 000000000..ccd33e6ff --- /dev/null +++ b/patches/src680/vcl-nwf-kde-toolbars-handle.diff @@ -0,0 +1,26 @@ +--- vcl/unx/kde/salnativewidgets-kde.cxx 2005-03-15 12:51:47.033308709 +0100 ++++ vcl/unx/kde/salnativewidgets-kde.cxx 2005-03-15 13:31:44.924184772 +0100 +@@ -761,16 +761,20 @@ BOOL WidgetPainter::drawStyledWidget( QW + QRect qThumbRect = region2QRect( pValue->maGripRect ); + if ( bIsHorizontal ) + { +- qThumbRect.addCoords( 0, 1, 0, -2 ); // make the thumb a bit nicer ++ qThumbRect.addCoords( 0, 2, 0, -3 ); // make the thumb a bit nicer + qRect.setWidth( qThumbRect.width() ); // draw just the thumb part + } + else + { +- qThumbRect.addCoords( 1, 0, -2, 0 ); // make the thumb a bit nicer ++ qThumbRect.addCoords( 2, 0, -3, 0 ); // make the thumb a bit nicer + qRect.setHeight( qThumbRect.height() ); // draw just the thumb part + } + +- if ( kapp->style().inherits( "KStyle" ) ) ++ if ( kapp->style().inherits( "HighColorStyle" ) || ++ kapp->style().inherits( "HighContrastStyle" ) || ++ kapp->style().inherits( "KeramikStyle" ) || ++ kapp->style().inherits( "KThemeStyle" ) || ++ kapp->style().inherits( "ThinKeramikStyle" ) ) + { + // Workaround for the workaround in KStyle::drawPrimitive() + KStyle *pStyle = static_cast< KStyle * >( &kapp->style() ); diff --git a/patches/src680/wizard-table-filed-sizes.diff b/patches/src680/wizard-table-filed-sizes.diff new file mode 100644 index 000000000..40b0ad0e0 --- /dev/null +++ b/patches/src680/wizard-table-filed-sizes.diff @@ -0,0 +1,42 @@ +--- wizards/source/formwizard/dbwizres.src.old 2005-01-13 20:57:39.000000000 +0100 ++++ wizards/source/formwizard/dbwizres.src 2005-03-15 17:07:00.000000000 +0100 +@@ -5688,7 +5688,7 @@ + String RID_DB_TABLE_WIZARD_START + 35 + { + Text [ de ] = "Herzlichen Glückwunsch! Sie haben alle Informationen zum Erstellen Ihrer Tabelle eingegeben."; +- Text [ en-US] = "Congratulations. You have entered all the information needed to create your table"; ++ Text [ en-US] = "Congratulations. You have entered all the information needed to create your table."; + }; + + +--- wizards/com/sun/star/wizards/table/Finalizer.java.old 2004-10-27 15:38:12.000000000 +0200 ++++ wizards/com/sun/star/wizards/table/Finalizer.java 2005-03-15 16:56:52.000000000 +0100 +@@ -115,23 +115,23 @@ + + CurUnoDialog.insertLabel("lblcongratulations", + new String[] {"Height", "Label", "MultiLine", "PositionX", "PositionY", "Step", "TabIndex", "Width"}, +- new Object[] { UIConsts.INTEGERS[8], sCongratulations, Boolean.TRUE, new Integer(97), new Integer(62),IFINALSTEP, new Short(curtabindex++), new Integer(154)} ++ new Object[] { new Integer(20), sCongratulations, Boolean.TRUE, new Integer(97), new Integer(62),IFINALSTEP, new Short(curtabindex++), new Integer(185)} + ); + CurUnoDialog.insertLabel("lblProceed", + new String[] {"Height", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width"}, +- new Object[] { UIConsts.INTEGERS[8], slblProceed, new Integer(97), new Integer(82),IFINALSTEP, new Short(curtabindex++), new Integer(154)} ++ new Object[] { UIConsts.INTEGERS[8], slblProceed, new Integer(97), new Integer(82),IFINALSTEP, new Short(curtabindex++), new Integer(170)} + ); + optWorkWithTable = CurUnoDialog.insertRadioButton("optWorkWithTable", null, + new String[] {"Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Width"}, +- new Object[] { UIConsts.INTEGERS[8], "HID:41242", sWorkWithTable, new Integer(101), new Integer(97), new Short((short)1),IFINALSTEP, new Short(curtabindex++), new Integer(107)} ++ new Object[] { UIConsts.INTEGERS[8], "HID:41242", sWorkWithTable, new Integer(101), new Integer(97), new Short((short)1),IFINALSTEP, new Short(curtabindex++), new Integer(160)} + ); + optModifyTable = CurUnoDialog.insertRadioButton("optModifyTable", null, + new String[] {"Height", "HelpURL", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width"}, +- new Object[] { UIConsts.INTEGERS[8], "HID:41241", sModifyTable, new Integer(101), new Integer(109),IFINALSTEP, new Short(curtabindex++), new Integer(107)} ++ new Object[] { UIConsts.INTEGERS[8], "HID:41241", sModifyTable, new Integer(101), new Integer(109),IFINALSTEP, new Short(curtabindex++), new Integer(160)} + ); + optStartFormWizard = CurUnoDialog.insertRadioButton("optStartFormWizard", null, + new String[] {"Height", "HelpURL", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width"}, +- new Object[] { UIConsts.INTEGERS[8], "HID:41243", sStartFormWizard, new Integer(101), new Integer(121),IFINALSTEP, new Short(curtabindex++), new Integer(107)} ++ new Object[] { UIConsts.INTEGERS[8], "HID:41243", sStartFormWizard, new Integer(101), new Integer(121),IFINALSTEP, new Short(curtabindex++), new Integer(160)} + ); + } + diff --git a/patches/src680/wizards-crasher-fix.diff b/patches/src680/wizards-crasher-fix.diff index 381d5805d..0a18fc6d4 100644 --- a/patches/src680/wizards-crasher-fix.diff +++ b/patches/src680/wizards-crasher-fix.diff @@ -1,4 +1,4 @@ ---- /toolkit/source/awt/vclxaccessiblecomponent.cxx 2004-10-22 17:06:04.000000000 +0530 +--- toolkit/source/awt/vclxaccessiblecomponent.cxx 2004-10-22 17:06:04.000000000 +0530 +++ toolkit/source/awt/vclxaccessiblecomponent.cxx 2005-03-11 13:45:05.395403899 +0530 @@ -202,7 +202,7 @@ IMPL_LINK( VCLXAccessibleComponent, Wind DBG_CHKTHIS(VCLXAccessibleComponent,0); diff --git a/src/Makefile.am b/src/Makefile.am index 68ca2f9c0..6228c42c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,5 +11,6 @@ EXTRA_DIST=\ openabout_kde.png \ file-bug-24.png \ file-bug-16.png \ - novell-team.png + novell-team.png \ + evolocal.odb diff --git a/src/novell-team.png b/src/novell-team.png Binary files differindex 610b21805..57d024112 100644 --- a/src/novell-team.png +++ b/src/novell-team.png diff --git a/src/novell-team.xcf b/src/novell-team.xcf Binary files differindex 202e1c2e8..fae7997a3 100644 --- a/src/novell-team.xcf +++ b/src/novell-team.xcf |
