#
# The format of this file is:
#

# -------- Options --------

PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../scsolver:../gstreamer:../ooxml:../postgresql:../emf+

OLDEST_SUPPORTED=src680-m237

# -------- Functional sub-sets --------

Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
	 Fixes, Defaults, Features, VCL, Misc, \
	 Icons, TangoIcons, Branding, CalcFixes, EasterEgg, \
	 SpeedImageList, GStreamer, CWSBackports, WPG, Cleanups, WMF, \
	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
	 OOXML, EMFPlus
	 
LinuxCommon : Common, FontConfigTemporaryHacks, \
	      FedoraFixes, LinuxOnly, NotMacOSX, SystemBits, \
	      cairocanvas, msaccess, GnomeVFS, OpenGLTransitions, \
	      Fpickers, Mono, AddressBooks, QuickStarter, UnitTesting
MacOSXCommon : Common, SystemBits
Win32Common : Common, \
	      Win32Only, NotDebian, NotMacOSX
# Experimental sections
Experimental: DebianBaseNoHelpContent, \
              VBAUntested, ArkOnlyExperimental, SharedWorksheets, \
	      UnUsedButNotYetRemovedFromSVN, \
	      PostgreSQL, SELinux, OpenGLTransitions, VOSremoval, Glib2, \
	      LayoutDialogs, SVGImport
# Binfilter patches: a special distro; applied only when building with binfilter
Binfilter : BFBuildBits, BFFixes
# Localization patches to localize.sdf files: applied only when we have langpacks
Localize : SDFPatches
# Novell
NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
	     NotDebian, Lockdown, CalcSolver, Split, Shrink
SUSE-9.1  : NovellBase
SUSE-9.2  : NovellBase
SUSE-9.3  : NovellBase
SUSE-10.0 : NovellBase
SUSE-10.1 : NovellBase, BerkeleyDB43
SUSE-10.2 : NovellBase, BerkeleyDB43
SUSE-10.3 : NovellBase, BerkeleyDB43
SUSE      : NovellBase, BerkeleyDB43, Gcc43
SUSE-PPC  : NovellBase, BerkeleyDB43
SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
# Debian
DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, CalcSolver, BerkeleyDB43, Split, PostgreSQL
Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, CairoFonts
DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
# Ubuntu
UbuntuBased : DebianBase, UbuntuOnly
UbuntuDapper : UbuntuBased, UbuntuDapperOnly, Debian32Only
UbuntuDapper64 : UbuntuBased, UbuntuDapperOnly
UbuntuEdgy : UbuntuBased, CairoFonts, UbuntuEdgyOnly, Debian32Only
UbuntuEdgy64 : UbuntuBased, CairoFonts, UbuntuEdgyOnly
UbuntuFeisty : UbuntuBased, CairoFonts, UbuntuFeistyOnly, Debian32Only
UbuntuFeisty64 : UbuntuBased, CairoFonts, UbuntuFeistyOnly
UbuntuGutsy : UbuntuBased, CairoFonts, UbuntuGutsyOnly, Debian32Only
UbuntuGutsy64 : UbuntuBased, CairoFonts, UbuntuGutsyOnly
UbuntuL10n : UbuntuBased, UbuntuL10nOnly, Debian32Only
# a copy of the UbuntuDapper* lines ("Ubuntu: UbuntuDapper" doesn't work)
Ubuntu : UbuntuBased, UbuntuDapperOnly,  Debian32Only
Ubuntu64 : UbuntuBased, UbuntuDapperOnly
# DroplineGNOME
DroplineGNOME : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess
DroplineGNOME64 : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess
# Ark Linux
Ark: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, Gcc43
# www.pld-linux.org
PLDBase: LinuxCommon, NotDebian, CalcSolver, CairoFonts, STLport5, OOXSTLport5, PLDOnly
PLD: PLDBase
PLD64: PLDBase
# Mandriva Linux
MandrivaBase: MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, LockDown
Mandriva: MandrivaBase
Mandriva64: MandrivaBase
# Frugalware Linux
Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, NovellOnlyUnix, NotDebian, FrugalwareOnly, CalcSolver
# openmamba
openmamba: LinuxCommon, GlobalDesktopFiles
#Gentoo
GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5, OOXSTLport5
GentooUnstable: GentooBase, GentooExperimental
Gentoo : GentooBase
Gentoo64: GentooBase
# rPath Linux
rPathCommon: LinuxCommon, NotDebian, CalcSolver, Lockdown, BerkeleyDB43, CairoFonts
rpl2: rPathCommon
rpl2-64: rPathCommon
# Win32
Win32 : Win32Common
# translate.org.za
translate-org-za-linux: translate-org-za-common, LinuxCommon, Common, Lockdown
translate-org-za-win32: translate-org-za-common, Win32Common, Common
NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas, Fpickers
# Novell
NovellWin32: NovellLikeWin32
NovellWin32ISO: NovellLikeWin32
# go-oo.org Win32
GoOoWin32: NovellLikeWin32
# Mac OS X
MacOSX : MacOSXCommon, CalcSolver, MacOSXOnly
# Pardus
Pardus: PardusOnly, LinuxCommon, NotDebian, CalcSolver, ICU36, STLport5, OOXSTLport5
# Solaris
Solaris: NovellBase
# Universal Upstream-like packages
GoOoLinux: NovellBase, Glib2
# OxygenOffice Professional
OxygenOfficeLinux:	LinuxCommon, SDFPatches, CalcSolver, OxygenOfficePalettes, OxygenOfficeDefaultSettings
OxygenOfficeWindows:	Win32Common, SDFPatches, CalcSolver, SVGImport, OxygenOfficePalettes, OxygenOfficeDefaultSettings
# -------- [ Tag [ >= <tag> etc. ], ] patch sets --------


[ LinuxOnly ]
# Don't stat tons of config files we don't need to read on startup
speed-configmgr.diff, i#56783, michael


[ TemporaryHacks ]
# add idl target to toplevel makefile
makefile-idl-build.diff, noelpwer

# Pagein types.rdb / services.rdb & the ui files 
speed-pagein.diff, i#57679, michael
# Sort the pagin information by inode number to improve read linearity
speed-pagein-sort.diff, i#81912, michael
# Use d_type entry when possible to get file type instead of using stat
speed-getfilestatus-dtype.diff, rodo, i#63159

# Replace hunspell linked list implementation with hashed implementation
# Reduces hunspell mem usage by more than half (3.7M to ~680K)
# (even bigger savings on 64bit, and with dicts like the Czech one)
hunspell-hashify.diff, i#50842, dkeskar/jholesov

# add no-crashreporter sections to testtool default config;
# also guess office path from testtool.bin path i#FIXME?
testtool-more-defaults.diff, martink

#Fix plus/minus in to each heading in Navigator
plus-minus-sw-navigator.diff, i#64886, n#129410, jianhua
plus-minus-sw-navigator2.diff, i#64886, n#129410, jianhua
#set default varchar lenght to 100.
dbaccess-default-varchar-lenght.diff, i#62664, jianhua
#make oovbaapi as a link
linkoo-type.diff
#for selection delete crash
selection-crash-svx-svdmrkv.diff, i#76084, jianhua

#Improve the behavior of input field dialog.
sw-input-field-dialog.diff, Zhang Yun

# Improve the behavior of input fields inline editing.
# sw-input-field-inline-edit.diff, Zhang Yun # removed since it causes some
# crashes with undo/redo

#realize a new feature named as Show Data Form in OpenOffice
sc-dataform.diff, Amelia Wang

#realize extra piece of new feature named as Show Data Form about vba
sc-dataform-suppor-vba.diff, Amelia Wang 

#First work on field enhancements...
#FIXME src680: sw-field-patch.diff, flr, n#248354

# fixed for n#200505
Simplified_Traditional_Chinese_convertion_table_n200505.diff, Fong Lin, n#200505

# workaround for a crash in the help on amd64.
sal-doublefree.diff, i#67740, mklose

# hack for n#240776
sw-graphic-save-problem.diff, flr, n#240776

# accelerate intern by not using stl
sal-strintern-speed.diff, i#78496, michael
sal-strintern-speed-fix.diff, i#78496, michael

# Faster makedepend
fast-mkdepend.diff, i#73081, jholesov

# invisible font when compiled with gcc 4.2
fix-invisible-text.diff, i#78417, vmiklos

# temporary hack to avoid the warning about missing return values in gcc4
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20624
warning-return-values-stlport.diff, jholesov

# Use -Bdirect linking - this is a really marginal win.
speed-bdirect.diff, i#58119, brosenk

# Fix linkoo, the ultimate hacker tool
fix-linkoo.diff, i#83548, jholesov

# libspl680*so does not have to be loaded when we present no startup wizard
startup-wizard-speedup.diff, i#84169, jholesov

# move gl_ES to localedata_es to save dependency & memory
i18npool-less-dependencies.diff, i#84206, jholesov

# dont initialize forms on the Writer startup, rather do it when the first form
# control is created
svx-delay-load-forms.diff, i#84259, jholesov

# Make the historically very verbose build quieter, helps us see warnings.
quiet-build.diff, i#84497, michael

[ TemporaryHacks < src680-m239 ]
# Don't expect TMP to be defined
buildfix-undefined-TMP.diff, i#83901, jholesov

[ CJK ]
#set default CJK font fontsize as 10.5pt
sw-default-cjk-fontsize.diff i#72010, jianhua

# Text grid enhancement for better CJK support
text_grid_enhancement_ww8_filter.diff, Fong Lin
text_grid_enhancement_officecfg.diff, Fong Lin
text_grid_enhancement_layout.diff, Fong Lin
text_grid_enhancement_filter.diff, Fong Lin

# add a new unit 'character unit'
cjk-character-units-ui.diff, Amelia Wang
cjk-character-units-imp.diff, Amelia Wang

#[ CJKTemporaryHacks ]
# the following patch is disabled temporary. 
# default value of tab stop for Chinese version
#default-tabstop-Chinese.diff, Fong Lin

# default value of automatic text indent for Chinese version
#sw-auto-text-indent-zh.diff, Fong Lin

[ FontConfigTemporaryHacks < src680-m240 ]
cws-gfbfcfg.diff, i#54603

[ FontConfigTemporaryHacks ]
# for mixed font set
#FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin


[ CWSBackports ]
# MS Works import filter (following patches depend on each other) Fridrich
wpsimport-config_office.diff
wpsimport-filter.diff
wpsimport-scp2.diff
wpsimport-writerperfect.diff
libwps.diff

# T602 import filter
cws-t602import01.diff

# removal of nas, sndfile, portaudio
cws-unifysound01-avmedia.diff
cws-unifysound01-config_office.diff
cws-unifysound01-filter.diff
cws-unifysound01-fpicker.diff
cws-unifysound01-framework.diff
cws-unifysound01-helpcontent2.diff
cws-unifysound01-sc.diff
cws-unifysound01-scp2.diff
cws-unifysound01-sd.diff
#cws-unifysound01-slideshow.diff
cws-unifysound01-solenv.diff
cws-unifysound01-svx.diff
cws-unifysound01-sw.diff
cws-unifysound01-vcl.diff

[ CWSBackports < src680-m240 ]
cws-configure22.diff

[ CWSBackports < src680-m238 ]
cws-shutup1.diff
# major re-work / speed-up of configmgr
cws-configrefactor01.diff, i#82311, michael

[ CWSBackports < src680-m239 ]
# npower8 (depends) e.g. must come after npower7
cws-npower8.diff
cws-npower8-buildfix.diff


[ WPG ]
# libwpg-based import filter for WordPerfect Graphics
libwpg.diff
wpgimporter.diff


[ GCJ ]
# gij/libgcj paths...
jvmfwk-gij-paths.diff, rengelha
# Seems that bug #69026 is back
gcj-workaround-serializer.diff

# Don't break hsqldb with gcj
# Depends on http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9866
# FIXME src680-m239 gcjaccessproblem-filter.diff, jholesov
# FIXME src680-m239 wizards-private-protected-to-public.diff, jholesov

# Fix up Javac error, known to happen with gcj, probably happens for other
# JDKs too
buildfix-qadevOOo-java-encoding.diff, brosenk

#FIXME src680: hsqldb-private-protected-to-public.diff, jholesov

[ GCJ < src680-m239 ]
# Search also /usr/lib64/jvm on x86_64 for JREs
jvmfwk-search-usr-lib64.diff, i#80976, pmladek

# Fixes that were not accepted up-stream, but are still useful
[ FixesNotForUpstream ]
# Make debugging nicer under unix
debug-bits.diff, i#35336, jholesov
# Make the scroll-wheel / page popup more sane
gui-sw-scroll.diff, i#20826, michael

# make menu layout prettier
vcl-menu-fixes.diff, i#67123, michael

# Tell the desktop we support the VFS 
uses-vfs.diff, i#43504, michael

# add mozilla certificate dir detection to soffice
soffice-detect-mozilla-certificates.diff

#upload a new libwpd + fix an exception with condensed paragraphs
libwpd.diff, fridrich
writerperfect-nocondensedparagraphs.diff, fridrich

#use newer xrender headears for platforms that cannot use the system ones
#and still want to have the cairo canvas working
x11_extensions-new-xrender-headers.diff

[ FixesNotForUpstream < src680-m239 ]
# no bogus license question when registering this extension
reportdesigner-no-license-m238.diff
sdext-no-license-m238.diff

[ FixesNotForUpstream >= src680-m239 ]
# no bogus license question when registering this extension
reportdesigner-no-license.diff
sdext-no-license.diff

[ Fixes < src680-m238 ]
# remove yet more dependency files
relocate-dpobj.diff, i#80794, mmeeks

# temporary hacks to remove warnings in the unused code,
# fix the signed/unsigned stuff for ppc
warning-comparsion-is-always-true-or-false-goodies.diff, i#81120, n#169875, pmladek
warning-comparsion-is-always-true-or-false-xmlhelp.diff, i#81123, n#169875, pmladek

[ Fixes ]
# sd printing fixes
printing-bugfix-254573.diff, n#254573, rodo

# let sd accept uri-list drop, n#183719
sd-accept-uri-list-drop.diff, n#183719, rodo

# default formatting PPT export bug n#285959
sd-default-format-n285959.diff, i#81395, n#285959, hub

# more intelligent nsplugin seeking
nsplugin-path.diff, i#49590, michael

# use basic (advanced) shapes for rectangle/ellipse on draw/impress's toolbars. make shapes wrap words by default, n#171052, rodo
sd-toolbar-advanced-shapes.diff, n#171052, rodo
svx-shapes-default-word-wrap-enable.diff, n#171052, rodo

# fix check box rendering issue - n#80447
check-buttons-rendering-fix.diff, michael

# disable font management dialog in padmin
padmin-nofontconfig.diff, michael

# Fix for n#113235
wizards-source-importwizard-filesmodul-xba.diff, i#56633, noelpwer

# testtool doesn't like oobuild basic compatability defaults
# ooo-build only fix n#145906#
automation-testtool-oobuildfix.diff, n#145906, noelpwer

# fixes some .cfg files in helpcontent2/source/auxiliary to use right
# lang code instead of en-US
helpcontent2-auxiliary-cfg.diff, pmladek

# Better Hungarian font setting
helpcontent2-hungarian-fonts.diff, i#71452, n#244488, pmladek

# more secure permissions for the user directory by default
desktop-safer-user-dir-perm.diff, i#62858, pmladek

# fixes some wrong usages of the function AddBytes that would malform the xml output
sax-writer.diff, i#66693, pmladek

# Added support for "application/octet-stream" mime type in package manager
desktop-application-octet-stream-mime-type.diff, i#73301, flr

win32-quickstarter-exit.diff, i#73550, tml

# find locked certs, fix by Jacob Berkman <jberkman@novell.com>
libxmlsec-findcerts.diff, i#76870, pmladek
# allow other types of signing certs, fix by Jacob Berkman <jberkman@novell.com>
#FIXME src680: xmlsecurity-verify-usages.diff, i#76871, pmladek

# fix that allows OOo to work with a standard (unpatched) libjpeg, 
jpegc.c.diff, i#80674, n#272574, flr

# process relative SMB paths correctly
tools-urlobj-smb-scheme-patch.diff, n#261623, flr
tools-qa-urlobj-unittest.diff, n#261623, flr

# try autodetection if it is allowed and the current java has been removed
jvmfwk-detect-removed-java.diff, i#83140, n#336242, pmladek

# allow dmake create_patch produce diffable patches
solenv-dmake-create_patch.diff, i#68917, fridrich

# fix visibility for controls 
svx-sdr-contact-visibility.diff, i#83611. noelpwer

# look for libmawt.so on x86_64 too
sun-java-amd64-jreextralibdir.diff

[ Fixes >= src680-m239 ]

sw-exceptionfiles.diff, noelpwer
[ SELinux ]
# make OOo work under SELinux
ooo80816.selinux.bridges.diff, i#80816

[ Fixes ]
# check real help path defined in registry instead of the $(instpath)/help
sfx-check-real-help-path.diff, i#81139, pmladek

# display help correctly even when the files are symlinks
xmlhelp-work-with-symlinks.diff, i#81138, pmladek

#don't accept all rows to be header rows in WW8 file
sw-rowsotrepeat.diff, i#69519, mloiseleur

#generate xhtml that is acceptable for Internet Explorer
filter-xhtml-title-title.diff,

#fix saving ( as doc format ) word documents with embedded word
#document ( containing macros ) crashing
save-doc-withembedded-doc-with-vba-crash.diff, n#339946, i#83632, noelpwer

#fix conversion of date/time strings in Dutch Word documents
sw-special-locales-date-string.diff, i#84469, n#344306, fridrich


[ Win32Only ]

accept-underscores-in-hostnames.diff, n#182422, tml


[ GnomeVFS ]
# Locking for gnome-vfs
# FIXME: file upstream when the correctness proven
ucb-gnome-vfs-lock.diff, n#203737, jholesov
sfx2-gnome-vfs-lock.diff, n#203737, jholesov
config_office-gnome-vfs-lock.diff, n#203737, jholesov

# Fix crash in reading the directories
# FIXME: file upstream together with the above
ucb-gnome-vfs-crashfix.diff, i#0, jholesov

# Read as much as possible
# FIXME: file upstream together with the above
ucb-gnome-vfs-read-more.diff, i#0, jholesov

# webdav did strange things when it tried to answer on SupportsActiveStreaming
# property
# FIXME: file upstream together with the above
ucb-gnome-vfs-lock-webdav.diff, i#0, n#294620, jholesov

# Fix locking of .xls files
# FIXME: this is as conservative as possible - a larger redesign appreciated
# FIXME: file upstream together with the above
sfx2-gnome-vfs-lock-fix-xls.diff, i#0, jholesov

# Workaround for sftp:// where gnome_vfs_get_file_info() produces
# GNOME_VFS_ERROR_PROTOCOL_ERROR for broken links
# FIXME: file upstream together with the above, or throw away when gnome-vfs
# is fixed
gnome-vfs-broken-symlinks.diff, i#0, n#293141, jholesov

# Assume that the INET_PROT_GENERIC (generic protocol) is hierarchical - fixes
# type detection over protocols that are not known to OOo - like sftp://
gnome-vfs-generic-prot.diff, i#79843, n#264138, jholesov

# Read-only smb share returns GNOME_VFS_ERROR_ACCESS_DENIED when opened with
# write; fallback to read-only in this case as well
gnome-vfs-read-only-smb.diff, n#330145, jholesov

# Map ETXTBSY errno to locking violation, necessary for CIFS
gnome-vfs-cifs-locking.diff, n#333001, jholesov

# Move gnome-vfs out of the startup sequence, load it only when needed
gnome-vfs-late-init.diff, i#84137, jholesov


[ BFFixes ]
# fix the signed/unsigned stuff for ppc
warning-comparsion-is-always-true-or-false-binfilter.diff, i#81125, n#169875, pmladek


[ QuickStarter < src680-m239 ]
# External splash screen implementation / 2nd time accelerator
unxsplash-rework-m238.diff, i#60696, michael/jholesov

[ QuickStarter >= src680-m239 ]
# External splash screen implementation / 2nd time accelerator
unxsplash-rework.diff, i#60696, michael/jholesov

[ QuickStarter ]
# handling of osl pipe has changed, see i#84045
unxsplash-new-osl-pipe.diff, i#60696, jholesov

# libstartup-notification is not necessary with oosplash.bin
libsn-removal.diff, i#84179, jholesov


[ CalcFixes < src680-m239 ]
# Replace usability numb Zoom dialog with a Combo Box
zoom-combobox-m238.diff, michael

[ CalcFixes >= src680-m239 ]
# Replace usability numb Zoom dialog with a Combo Box
# FIXME: this conflicts with Sun's duplication of this work,
# eg. print preview
zoom-combobox.diff, michael

[ CalcFixes ]
# make some symbols from sc visible when compiling with gcc4, necessary since m121
gcc4-visibility-sc.diff, i#53261, pmladek
# Fix for b.x.c 62193
sc-sheet-double-click-rename.diff, i#45245, jody
# adds to Autofilter Empty-NonEmpty options bxc #62165
sc-autofilter-empty-nonempty.diff, i#35578, jody
# Improves the standard filter options and menu. bxc #62187 #62495
sc-standard-filter-options.diff, i#35579, michael
# Saves and loads the standard filters in ods
sc-standard-filter-options-ods-hack.diff, i#35579, jonp
# Hides the filtered rows when height of rows are changed bxc #62161
sc-filter-hide-filteredrows.diff, i#35581, jody
# Autofill doesnt fill filtered rows bxc 62499
sc-filters-fill-fix.diff, jody

# Provision for dynamic range in data pilot bxc 62522
# Previously sc-dp-database-crash.diff and sc-pv-crasher.diff are now 
# incorporated into this patch since these two patches are improvement to 
# this patch below.
sc-datapilot-dynamic-range.diff, i#23658, kohei

# Provision for data-pilot to give autoformat bxc #62162
#
# Upstream has already rejected this patch, and closed the issue as WONTFIX.
# This patch needs to be revised to use 'DataPilot *' cell styles instead of 
# re-using Table AutoFormat, which is fragile and do not always apply 
# correctly.
sc-datapilot-autoformat.diff, i#37388, jody

# BXC 62488 : Allows insertion of rows by shifting down
#sc-paste-insert-rows.diff disable...

# Display min password length in dialog BINC 773
sc-save-password-minlength.diff, i#21923, kohei

# Allow dnd in Change record mode for Data source BINC 70845
sc-change-record-dnd.diff, i#44982, jody

# disable cut-n-paste on right-click menu for datapilot - n#75436 
# (depends on sc-datapilot-autoformat.diff).
# This patch will likely be obsoleted by upstream.  See
# http://specs.openoffice.org/calc/ease-of-use/Manual_Sorting_in_Data_Pilot.odt
sc-datapilot-cut-paste-disable.diff, i#46470, jody

# keybindings: <ctrl> +/‑ to insert/delete a complete line in calc (X#62530) 
calc-new-acceleration.diff, i#67029, michael

# sc-dp-gridlayout.diff, i#68544 n#190970, jody
sc-dp-gridlayout.diff, i#68544, n#190970, jody

# compatibility for numbers in string cells (with leading/trailing space) - i#47811
sc-string-arg.diff, i#47811, muthusub

# To make CSV Text Import settings persistent
sc-preserve-imp-opts.diff, i#3687, muthusub

# Print_Area/Print_Titles are only relevant for sheet local names, n#191005
sc-xls-builtin-name-scope.diff, n#191005, n#257422, jonp

# Allow Cols/Rows to be resized even if document is read-only, n#165980, jody
sc-read-only-colrow-resize.diff, jody

# Implement 'Toggle merge & center'
sc-toggle-merge-center.diff, i#67243, jholesov

# Add a 'Natural' variant of sorting, blocking on ODF extension issues
sc-natural-sort.diff, i#26565, kohei

# Include cell format when sorting via sort icon & determine whether the first
# row is the column header (depends on sc-natural-sort.diff patch).
sc-simple-sort-include-format-header.diff, i#13829, kohei

# Add R1C1 address support [ i#49499 for address ]
sc-r1c1.diff, i#20857, jody

# Add named range support for INDIRECT and INDIRECT_XL
sc-indirect-named-range.diff, i#4695, n#274387, kohei

# Change default numbering scheme of x-y plot chart from Row 1, Row2, ... to
# 1, 2, 3... when the X labels are not explicitly given.  This is what Excel
# does.
sc-excel-chart-default-xlabels.diff, n#257079, i#83679, kohei

# Fix autoshape excel hyperlink import OOo ( depends on vba-sc-handleautoshapemacro-import.diff )
vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
# Delete Rows/Delete Columns should remember the content so that the user is
# able to paste it elsewhere (similar to Insert Cut Cells in Excel)
sc-delete-rows-columns-remembers-content.diff, i#71921, jholesov

[ CalcFixes < src680-m239 ]
# load, store and save the sheet protection options from and to an Excel file,
# and use that information to constrain cell cursor movement when the sheet is
# protected.
sc-sheet-protection-options-m237.diff, i#71468, kohei

# Ensure that Print Preview is consistent with Print output.
sc-print-selected-sheets-m237.diff, n#335684, i#45497, jonp

[ CalcFixes >= src680-m239 ]
# load, store and save the sheet protection options from and to an Excel file,
# and use that information to constrain cell cursor movement when the sheet is
# protected.
sc-sheet-protection-options.diff, i#71468, kohei

# Ensure that Print Preview is consistent with Print output.
sc-print-selected-sheets.diff, n#335684, i#45497, jonp

[ CalcFixes ]

# allow Excel A1 style format (e.g. #Sheet2!A2) in hyperlink destination.
sc-hyperlink-excel-a1-style.diff, i#80448, kohei

# rename sheet name in URL on import when invalid characters are used (such as
# '&').
sc-hyperlink-rename-sheet-name.diff, n#246629, kohei

# Speed up recalculation of SEARCH function when thousands of cells use it.
speed-text-search-performance-unotools.diff, i#80981, kohei
speed-text-search-performance-i18npool.diff, i#80981, kohei

# Fix saving split-view information on 64-bit platforms.
sc-save-split-view.diff, n#235131, i#81936, jonp

# Allow biffdump.cxx to compile on 64-bit platforms
sc-biffdump.diff, i#82184, jonp

# Allow to copy-paste on merged cells.
sc-copy-on-merged-cells.diff, i#7500, mloiseleur

# Allow insertion of cell range that cuts across merged areas.
# (temporarily disabled as it causes memory exhaustion problem on
# column insert in empty document).
#sc-insert-inmerged-range.diff, i#8302, mloiseleur

# Allow objects to stay within cells as expected when rows are resized.
sc-object-row-position.diff, i#47088, jonp

# Return 0 by MIN/MAX/MINA/MAXA when referenced cells are all empty.
sc-minmax.diff, i#38759, muthusub

# Unit conversion fixes in ScDrawLayer.
sc-drwlayer-units.diff, i#83735, jonp

# Launch navigator when double-clicking the leftmost status area box.
sc-status-bar-launch-navigator.diff, i#49491, kohei

# Fix crashes on erf(0.65).  This is fixed in dr58 CWS upstream.
scaddins-erf-crash-fix-065.diff, i#84395, kohei

# Import sheet names properly from Lotus 1-2-3 document.
sc-lotus123-import-sheetname.diff, i#00000, kohei

[ LinuxOnly ]
# accelerate linking, by extreme cunning i#63927
speed-local-link-except.diff, i#63927, michael
speed-local-link.diff, i#63927, michael

# make some symbols from svtools visible for the kde fpicker when compiling with gcc4
# fix: this breaks win32
fpicker-kde-gcc4-visibility.diff, pmladek

[ NotMacOSX ]

# Make the delete key happy again in starcalc  - wontfix [!]
#gui-sc-delete.diff, i#17965, michael
# Swap the delete and backspace key bindings but leave the menus alone.
sc-default-delete-backspace-key.diff, i#17965, kohei

[ Misc ]
# Insert symbol defaults to the Symbol font - not a random one
gui-sw-insert-symbol.diff, i#15512, michael
# Address data source ordering x#62860
addrbk-datasrc-ordering.diff, michael
# Changed the default option in the Templates and Documents dialog.
svtools-default-new-document.diff, rodo
# contextual autocomplete
context-autocomplete.diff, i#22961, michael

# Fix casts in db_java_wrap.c
db4-jni-casting.diff, rengelha

[ Misc ]
# Grouping items in the templates dialog n#106603
svtools-unsort-template-dialogentries.diff, rodo

# Don't convert certain latin-2 characters into HTML entities when saving as 
# html in ISO-8859-2 encoding.
svtools-html-iso-8859-2-ignore-chars.diff, i#15456, kohei

# Don't substitute downloadable fonts with resident fonts.
psprint-do-not-substitute.diff, i#84481, kohei

[ EasterEgg >= src680-m239 ]
# go-oo.org people active in this release
go-oo-team.diff, michael


[ NovellOnly ]
# add in an entry for a corporate common dictionary
corporate-dictionary.diff, michael

# Some Novell colors ...
novell-palette.diff, michael

# finally disable -fsigned-char on pcc
solenv-really-use-unsinged-char-on-ppc.diff, i#81127, n#169875, pmladek

[ NotDebian ]

# Fix the system default fpicker
default-system-fpicker.diff, michael
# don't display File->Wizards-> install dictionaries/fonts -
# makes no sense on Linux n#74249
default-no-install-wizards.diff, michael
# Disable the printer properties which are unused#583
# related issue: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=353595
# also last comment in: https://bugzilla.novell.com/show_bug.cgi?id=83925
# also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=373974
printer-properties-disable.diff, i#14036, michael
# use --hash-style=gnu linking when supported
# disabled for Debian as Debian policy (for now) is to use=both
speed-hash-style.diff, pmladek


[ DebianBaseOnly ]
SectionOwner => rengelha

sdk-remove-non-free.diff
sensible-ooomua.diff
sensible-browser.diff
no-fontooo-wizard.diff
pyuno-rpath-ooodir.diff
default-cairo-disable.diff
gcj-32bit-runtime-path.diff, i#64888, mklose
# remove mozilla plug-in option completely since we enable it per default
# and therefore this option is sense-/useless
no-mozilla-plug-in-option.diff
# read variables from /etc/openoffice/sofficerc, since /usr/lib/openoffice/sofficerc
# just refers to it
oosplash-etc-openoffice-sofficerc.diff
# build using -O2 on x86 and sparc according to Debian policy.
debian-opt.diff
ubuntu-soffice-config.diff, mklose

# mention openoffice.org-report-builder instead of getting people
# to download it from elsewhere
reportdesign-mention-package.diff, rengelha


[ DebianOnly ]

SectionOwner => rengelha
# fix the splash progressbar colors
debian-splash.diff

[ DroplineGNOMEOnly ]
SectionOwner => DropLine

pushfont-psstream.diff, i#84481
scp2-user-config-ooo-2.0.diff


[ MandrivaOnly ]
SectionOwner => gghibo

default-system-fpicker.diff, michael
gcc401-stlport45-include.diff
mandriva-archflags.diff
mandriva-java32_64.diff
# db42-fix-jni-includes.diff


[ MandrivaOnlyUnix ]

SectionOwner => gghibo
help-support-mdv.diff
# change user config dir name from ~/.openoffice.org2.0 to ~/.ooo-2.0
scp2-user-config-ooo-2.0.diff, pmladek


[ NovellOnlyUnix ]

# Help Support page
help-support.diff, michael
# change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre
scp2-user-config-ooo-2.0.diff, pmladek
# Push fonts into the ps stream always
pushfont-psstream.diff, i#84481, michael

# search also /usr/share for icons
# it is a temporary hack; we should do more clean FHS compliant installation
# we need a good plan before, though ;-)
split-icons-search-usr-share.diff, n#296502, pmladek


[ BuildBits < src680-m239 ]
# Introduce relative pathnames in ddf files
win32-use_relative_path_in_ddf_files.diff, i#68888, KAMI

[ BuildBits ]
novell-win32-agfa-monotype-fonts.diff, tml

# allow to define java target, so the build is usable with the JVM 1.4
# even when it is built with JDK 1.5
#FIXME src680: build-java-target.diff, pmladek

[ BuildBits < src680-m240 ]
# build with neon 0.24.x
ucb-neon-0.24.diff, i#82569, pmladek

[ BuildBits ]
# fix build without STLport
transogl-Primitive-not-explicit.diff, i#84017

# don't include asm/sigcontext.h, see Debian Bug #442418
buildfix-sal-system.h-no-asm-sigcontext.h.diff

[ NovellOnlyWin32 ]
SectionOwner => tml

novell-win32-installer-branding.diff
novell-win32-vrb-branding.diff, n#191913, i#68817
novell-win32-registry-branding.diff, n#191913

win32-prebuilt-writingaids-zip.diff

[ translate-org-za-common ]
SectionOwner => davidf

# use the dejavu fonts - commented out as different patches in the works
# dejavu-fonts.diff, i#59853


[ FrugalwareOnly ]
gcc401-stlport45-include.diff, gghibo


# ( mmp@oo.o deals with defaults apparently )
[ Defaults ]

# Disable the recovery report dialog
recovery-report.diff, i#53531, martink
# default to anti-alias at point size of 1 point
default-font-aasize.diff, michael
# set default font size to 10pt
default-font-size.diff, i#35565, michael
# Dramatically improve MS import / export cf. i8276 et. al.
default-ms-filter-convert.diff, i#8276, michael
# use pair kerning in new documents
#KENDY TESTME: should be on using a different patch. default-pairkerning-on.diff, i#35873, jholesov
# Optimal Page Wrap should be default for graphics insertion (X#59831)
writer-default-as-optimal-page-wrap.diff, i#38108, jody

#
# Controversial bits - no use filing up-stream
#
# automatically do any migration we can, with no wizard
default-no-startup-wizard.diff, michael
# don't throw up the style dialog on 1st run
default-no-style-dialog.diff, michael
# Use the Gnome VFS on KDE as well if it's there (better than nothing)
vfs-kde-too.diff, michael
# Trade speed for reliability with valgrind
valgrind-alloc.diff, michael

# pestering people serves no useful purpose
default-no-registration.diff, michael

# no Help->registration dialog by default
default-no-registration-menu.diff, michael

# The Industrial OOo icon theme is too old. The OOo Tango icon
# theme is closer to the current GNOME Industrial theme rules.
# => Tango should be preferred over Industrial.
tango-prefer-over-industrial.diff, n#304615, pmladek

[ SDFPatches ]
sc-standard-filter-options-i18n.diff, i#35579, michael
# fake translations; combo box entries are not visible in the given
# localization if they are not translated
sc-standard-filter-options-i18n-fake.diff, i#66473, pmladek

# fix es localisation
chart2-es-eje-Y.diff

[ Features ]
# load and save also odf documents in flat xml format as opposed to the
# compressed ones (conforming to the odf specifications)
odf-flatxml-import-export.diff

# ask user on logout/shutdown to save documents
session-management.diff, i#63156, rodo

# search <ooo-home>/share/template/common for language independent templates
# will not push it upstream because it will be replaced by upcomming kendy's work
office-cfg-common-template-dir.diff, pmladek

# add new category "Labels" for blank Labels, calling cards, CD labels, etc.
# will not push it upstream because it will be obsoleted by upcomming kendy's work
sfx2-template-category-labels.diff, pmladek


[ BuildBits < src680-m239 ]
build-identification-m238.diff, tml
# missing dependency
buildfix-svx-unodialogs-dep.diff, i#79845, pmladek

[ BuildBits >= src680-m239 ]
build-identification.diff, tml

[ BuildBits ]
# do an optimizing link
build-optimized-link.diff, michael

# add -dontstrip option to the installer
installer-strip-optional.diff, i#48814, pmladek

# add possibility to set ARCH_FLAGS when building libnas
nas-use-arch-flags.diff, pmladek

# add missing #include <stdio.h> in autodoc, breaks when building with STLport5
autodoc-add-missing-stdio-h.diff, rengelha

# do not pack any potential .orig files with ppds
psprint_config-no-orig.diff, jholesov

# changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
# of files does not conflict with the main package, i#64802
sdk-gid-module-name.diff, pmladek, i#64802

# Workaround for compile failure with glibc 2.4's langinfo.h
i18nutil-glibc-braindamage-workaround.diff, brosenk

# fix build with system libnss installed apart from mozilla
# strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272
libxmlsec-system-nss.diff, i#69368, pmladek

# allow separate helpcontent build
#FIXME src680: separate-helpcontent.diff, jholesov

[ BuildBits < src680-m240 ]
# fix build without STLport
autodoc-cosv-newstandard-stl.diff, i#83486

[ MandrivaOnly ]
SectionOwner => gghibo
# mozilla-firefox.diff

[ ArkOnly ]
SectionOwner => brosenk

# Db 4.3/4.4 needs -lpthread
system-db-4.3-use-lpthread.diff, i#58474, rengelha


[PLDOnly]
SectionOwner => arekm

# fix build of sal project
solenv-unxlngi4-link.diff, i#66982
# fix for macro browser crash
sfx2-badscript.diff, i#67976


[ BuildBits ]
# add automatical detection of serializer.jar into the configure
# add it to classpath on one more place
xalan-serializer-jar-more.diff, pmladek

# work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
svx-customshapes-NOOPTFILES.diff, martink

# This set seem to be related to a gcc bug ...
# fixes warnings about missing return values
warning-return-values-filter.diff, i#58977, pmladek
warning-return-values-registry.diff, i#58979, pmladek
# fixes warnings about that a variable is used unitialized
warning-uninitialized-variables-tools-2.diff, i#58984, pmladek

# disabled on Fridrich's request. He will find a proper solution one day.
# moz-solaris11-makefiles.diff, fridrich

[ BFBuildBits ]
SectionOwner => pmladek

# STLport fixes
binfilter-stl.diff, i#63770, hmth
stlport-solaris-fileno.diff, fridrich
gcc-4.3-binfilter.diff, i#83276, pmladek

[ VCL ]

# Don't let the splash screen take over
no-splash-takeover.diff, i#23609, rodo

# Better fallback when some of the plugins are not available
vcl-better-fallback.diff, i#50857, jholesov

# prioritize hebrew culmus fonts, Debian bugs #280084, #296152, #300642
#FIXME src680: hebrew-culmus.diff, noelpwer

# write setup to %%Begin(End)Setup, instead of %%Begin(End)PageSetup when
# generating PostScript
psprint-postscript-page-setup.diff, i#65491, n#80448, jholesov

# enable vcl to load bitmaps when height it negative
vcl-bitmap2-negative-height.diff

[ VCL < src680-m239 ]
# add Russian and Turkish key names
vcl-xkb-tr-ru-corrections.diff, i#82370, jholesov


[ SystemBits ]
# use getopt() and readdir_r() from system glibc
#FIXME src680: system-libc.diff, i#69033, rengelha


[ Icons ]
# Make insensitive toolbar icons look far nicer
gui-insensitive.diff, i#35555, michael

[ Icons ]
# default to large icons in the toolbar
gui-toolbox-large-icons.diff, jholesov

# use it by default under Win32
tango-icons-default-w32.diff, n#254855, pmladek


[ NotDebian ]
# Improve readability of BUILD_VER_STRING in Help:About dialog
# rengelha doesn't like it, so put in NotDebian
# or maybe should be in Win32Only even?
about-build-ver-readability.diff, i#68590, tml


[ Fpickers ]
# Modify the fpicker makefile
fpicker-common-build.diff, jholesov

# Show "Use OpenOffice.org dialogs" check box only if the system fpicker is
# available (better implementation) FIXME IZ number
fpicker-show-checkbox.diff, jholesov

# 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, jholesov
# Out-of-process implementation of KDE fpicker
# FIXME: No IZ number for this, because it is necessary to do it internal first
fpicker-kde-dialog.diff, jholesov
# 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, jholesov
# Workaround for 'Filter name (*.blah)' vs. 'Filter name' problem in
# Insert->Picture->From File... n#66873
fpicker-kde-filter-name.diff, jholesov

# Adapt to changes in resources handling of fpickers
fpicker-kde-resmgr.diff, jholesov

# Handle media:/ files locally
fpicker-kde-local-media.diff, jholesov
fpicker-kde-local-media2.diff, jholesov, n#238695
# Fix too wide "Menu -> Insert -> Picture -> From File..." dialog Novell#72010
fpicker-kde-too-wide.diff, jholesov

# Don't overwrite files containing spaces, etc. n#241080
fpicker-kde-dont-overwrite.diff, jholesov
# Work even with non-UTF-8 locales n#168616
fpicker-kde-non-utf8.diff, jholesov

# Let the KDE and Gtk+ fpickers build and install FIXME IZ number
fpicker-common-scp2.diff, jholesov

[ Fpickers < src680-m239 ]
# don't crash if browsing to exotic URIs & fix multiselect issues
crash-fpicker.diff, i#63263, michael
# NB!: read i#63263 before removing these patches ...
fpicker-multiselect.diff, i#63263, michael

# remove obsolete 'autoextn' thing
fpicker-autoextn.diff, i#73876, michael


[ AddressBooks ]

# Evolution should also be default database(n#66217).
default-evolution-database.diff, michael
# Mailmerge column mapping by default (n#73627)
default-evo-column-mapping.diff, michael

# NB. when this cws goes up-stream we need to enable this
default-evo2-ab.diff, michael


[ Lwp ]
# Lotus Word Pro Import Filter
lwp-filter-component.diff, i#11215, noelpwer


[ Win32Only ]

# some versions of make don't like us
cygwin-make-ver.diff, i#68283, michael
# 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 #FIXME - re-file vs. i#34264
win32-gw-send-mail.diff, i#34264, michael
# Minor build fixes for win32
win32-build-fixes.diff, i#83191, tml
# This is a pretty nasty IE problem i#19510, i#65209
win32-activex-disable.diff, i#65209, i#19510, n#168534, tml
# This enables building libIDL, glib and buildtools for mozilla from source
mozilla-buildlibs-win32.diff, i#58741, davidf
# This enables building scsolver on Win32 
boost-patch.diff, tml
# Multi-language installer stuff
win32-multi-lang-installer.diff, i#66062, i#84449, tml

# fix for visual studio express 2005 ( ooo-build only )
2005-express-stl-remove.diff, noelpwer, i#71404
[ VBABits ]
# Parse (& ignore) 'Attribute' statements
vba-attribute.diff, i#37347, noelpwer
#basic depends on built and delivered ooovbaapi
basic-prj-build_lst.diff


[ ArkOnly ]
SectionOwner => brosenk

# See what breaks if we build with more optimizations
testing-more-optimizations-ark.diff


[ GentooExperimental ]
SectionOwner => hmth

# Gnu JRE paths.
gentooexperimental-gnujre.diff

[ GentooOnly ]
SectionOwner => aprosky

# Allow build to proceed with PaX enabled
gentoo-pax-fix.diff, aprosky
# support server-only versions of 64bit JDKs
64bit-jdk-server-paths.diff, i#65974, hmth
# use IBM j9vm over IBM classic JVM
ibm-j9vm.diff, hmth
# system db check
system-db-check.diff, i#65979, hmth
# User ~/.ooo-2.0 as user dir
scp2-user-config-ooo-2.0.diff, pmladek
# unused java code
disable-parser-jaxp.diff
# default inc/lib
config_office-XINC-XLIB-defaults.diff, i#65976
# gdi/font.cxx: stl list error
vcl_font-NO_LIST.diff
# linux-headers-2.6.22 issue?!
linux-headers.diff

[ DebianBaseOnly ]
SectionOwner => rengelha

help-msg-add-package-info.diff

[ DebianBaseOnly < src680-m240 ]
#qadevooo-runner-target-workaround.diff, i#79961

[ DebianBaseNoHelpContent ]
SectionOwner => rengelha

disable-helpcontent2.diff
disable-xmlsearch-and-xmlhelp-jar.diff


[ UbuntuOnly ]
SectionOwner => mklose

default-system-fpicker.diff, michael
ubuntu-palette.diff
ubuntu-dictionary.diff
ubuntu-lpi.diff, i#64895, mklose
ubuntu-sparc-hack.diff, mklose

[ Mono ]
SectionOwner => martink

#
# These patches are experimental beware ...
#
mono-scp2.diff

cli_ure-mono-bridge.diff

cli_ure-source-bootstrap-assembly-cs.diff
cli_ure-source-bootstrap-makefile-mk.diff
cli_ure-source-bootstrap-managed_bootstrap-cs.diff
cli_ure-source-bootstrap-native_glue-cxx.diff
mono-testtools.diff

# The build
mono-build.diff
build-mono-link.diff, jholesov

cli_ure-prj-build-lst.diff

[ Mono ]
# sign the output assembly using the key pair; it is needed to install
# the versioned assemblies into the system Global Assembly Cache  (GAC)

mono-build-keyfile.diff


[ Mono ]

# climaker rewritten in C#

SectionOwner => rodo

mono-climaker.diff
mono-climaker-config.diff
climaker-csharp-win.diff
buildfix-climaker-disabled.diff
mono-climaker-bridgetest.diff


[ VBAObjects ]
SectionOwner => noelpwer

vbaevents-services-sources.diff, i#68893

sc-hacky-handle-boolean.diff

svx-source-inc-fmundo-hxx.diff, i#68893
svx-source-form-fmscriptingenv-cxx.diff, i#68893
svx-source-form-makefile.diff, i#68893
svx-source-form-fmundo-cxx.diff, i#68893

vbaevents-services-build.diff, i#68893

scp_vba_uno_service.diff, i#68893

vba-support-export-palette.diff, i#68900

vba-workbook-worksheet-events.diff
vba-workbook-worksheet-events-buildfix.diff

vba-keep-codenames-in-sync.diff
#associating sheet and codename when insert a sheet
# sc-insert-sheet-codename.diff, i#80869, jianhua
vba-brackets-params-fix.diff, i#79918, n#292861  
vba-negnumber-inparam-withoutbrackets.diff, n#294302
# hack for when resolving a symbol in the module ThisWorkbook
vba-symbol-searchhack-for-thisworkbook.diff
vba-allow-ranges-for-cell-functions.diff

# in the basic IDE if the curson in within a macro 
# pressing the run button should run that macro
# if the cursor is not in the macro then it should
# raise the macro chooser dialog
vba-ide-choose-macro-to-run.diff

# provide a compatible error object
vba-error-object.diff

# Is function only valid for objects
vba-is-behaviour.diff

# support static keyword for procedures and local variables
vba-static-behaviour.diff, noelpwer, i#58089, n#306717

# make ScExtDocSettings public
scextopt-public.diff, jianhua

#tweak cws-npower7/8 to build vba before filter ( filter uses headers generated 
#from oovbapi.rdb )
sc-vba-build-lst.diff
# allows access to some internals needed for vba api, doesn't change
# any functionality
sc-vba-autofill-support.diff, i#68883
#-DVBA_OOBUILD_HACK ( make sure this flag is set for ooo-build builds )
# this flag hooks in code in vba api model implementation that depends on
# core changes not yet upstream
sc-source-ui-vba-makefile-mk.diff

# export of macro bindings for shapes
sc-export-shape-macro-bindings.diff, n#304739, noelpwer
# export of hlink bindings for shapes
sc-export-shape-hlink-bindings.diff, n#304739, noelpwer

# support Replace function
vba-replace-function.diff, n#226439, Fong
# support StrConv function
vba-strconv-function.diff, n#294187, Fong
# Fix rounding problem in CCur function
vba-ccur-function.diff, n#294187, Fong
# Conversion between byte array and String
vba-bytearray-string.diff, Fong
# support Partition function
vba-partition-function.diff, n#294187, Fong

[ VBAObjects < src680-m239 ]
# fix --disable-vba build
oovbaapi-disable-vba-m238.diff
[ VBAObjects >= src680-m239 ]
# fix --disable-vba build
oovbaapi-disable-vba.diff

[ VBAUntested ]
SectionOwner => noelpwer
basic-source-classes-eventatt-cxx.diff, #no-upstream
#ditto
vba-support-stoc-typeprovider-xexactname.diff, #no-upstream
#must ask kendy about this ( noelp )
vba-parallel-build.diff, #no-upstream
#not so useful but perhaps we can build on it later
basic-speedup-fix.diff
[ Features ]
# Pre- and postprocessing capabilities for loading and saving.
sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian
sfx2-pre-and-postprocess-crash-fix.diff, n#270544, rodo

[ Lockdown ]
# Disable UI [toolbars, menus] customization
ui-desktop-integration.diff, michael


[ msaccess ]
SectionOwner => strba
SectionIssue => i#33654

#cws-mdbdriver01.diff

[ msaccess ]
#cws-mdbdriver02.diff

[ msaccess ]
#mdbtools.diff
#mdbtools-makefile-mk.diff
#mdbtools-prj-build-lst.diff
#mdbtools-prj-d-lst.diff

#connectivity-source-drivers-mdb-mdb-map.diff

#hack to get the proper msaccess tabpage
#msaccess-db-create-dialog-fix.diff


[ STLport5 ]
SectionOwner => hmth
SectionIssue => i#63770

# system STLport5 support
system-stlport5-config.diff
system-stlport5-STLPORT_VER.diff

[ STLport5 ]
system-stlport5.diff

[ STLport5 ]
# system stlport51 support
system-stlport51.diff
# new wrapper func in cws chart11
cws-chart11.diff
system-stlport5_cppu.diff, i#78909

[ GCCSTL ]
#FIXME#stl-abi.diff

[ CalcSolver ]
SectionOwner => kyoshida
SectionIssue => i#8808

# add lpsolve linker flag to libs.mk
solenv-inc-libs-mk.diff

# add scsolver to the dep chain for sc
scs-sc-build.diff

# needs more boost headers
scs-boost.diff

# configure check for system-lpsolve
system-lpsolve-config_office.diff

# setup protocol handler (urgh) and add menu bar item, and install the component.
scs-officecfg.diff
scs-scp2.diff
scs-sc-menubar.diff
scs-officecfg-calc.diff

# package scsolver as a default uno extension (not working ATM).
#scsolver-uno-extension.diff
#scsolver-enable-extension.diff


[ OOXML < src680-m239 ]
cws-xmlfilter02-comphelper.diff
cws-xmlfilter02-sc-m238.diff

[ OOXML >= src680-m239 ]
cws-xmlfilter02-sc.diff

[ OOXML ]
cws-xmlfilter02-boost.diff
cws-xmlfilter02-config_office.diff
cws-xmlfilter02-filter.diff
cws-xmlfilter02-goodies.diff
cws-xmlfilter02-offapi.diff
cws-xmlfilter02-postprocess.diff
cws-xmlfilter02-sal.diff
cws-xmlfilter02-sax.diff
cws-xmlfilter02-scp2.diff
cws-xmlfilter02-sd.diff
cws-xmlfilter02-solenv.diff
cws-xmlfilter02-svx.diff
cws-xmlfilter02-sw.diff
cws-xmlfilter02-toolkit.diff

win32-installer-register-moox-types.diff

[ OOXSTLport5 ]
SectionOwner => hmth

system-stlport51-oox.diff
system-stlport51-oox-map.diff

[ PostgreSQL ]
sdbc-postgresql.diff
sdbc-postgresql-build-lst.diff
sdbc-postgresql-config_office.diff
connectivity-workben-postgresql.diff

[ Split ]
SectionOwner => pmladek

# FIXME: should be applied after the OOXML section
#        they both patch the same files

# split binfilter from core
split-binfilter-filter.diff, i#79800
#FIXME src680: split-binfilter-instsetoo_native.diff, i#79800

#FIXME src680: split-binfilter-scp2.diff, i#79800


[ ArkOnly ]
SectionOwner => brosenk

# We use KMail...
# There's no point in upstreaming this because not everyone uses KMail.
ark-default-ExternalMailer.diff

[ ArkOnlyExperimental ]
# There's no point in upstreaming this because it relies on the Ark
# Java lib naming scheme and won't work anywhere else.
# Not applied right now, needs porting
compiletime-skip-duplicate-jars.diff
# Don't crash HelpLinker
# FIXME check if this is still needed with m190
gcj-HelpLinker-no-NullPointerException.diff, i#61278

# This is faster, and solves gcj -C's private bug. But it's also
# close to untested.
# FIXME this needs reimplementation with the current build system
ark-experimental-gcj-use-ecj.diff, i#64917

# Ark Linux includes precompiled versions of Xerces, Xt and db.jar.
# There's no need to precompile them again, just use the system version.
# There's no point in upstreaming this because it relies on the Ark
# Java lib naming scheme and won't work anywhere else.
# FIXME this needs reimplementation with the current build system
ark-system-precompiled-java.diff

[ DebianBaseOnly ]
# link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it
system-lpsolve-link-with-colamd.diff, rengelha

[ DebianOnly ]
debian-dictionary.diff, rengelha
#debian-gccXXXXX.solenv.javaregistration.diff

[ cairocanvas ]
# build local cairo on Win32 (if enabled)
cairo-prj-build-lst.diff, i#70519, tml
cairo-prj-d-lst.diff, i#70519, tml
cairo-makefile-mk.diff, i#70519, tml
cairo-config_office-configure-in.diff, i#70519, tml
cairo-cairo-1-4-10-diff.diff, i#70519, tml

# Additional diffs for cairocanvas on Win32
cairo-canvas-win32.diff, i#70519, n#300398, tml

[ OpenGLTransitions ]
transogl01-config.diff
transogl01-build.diff
transogl01-transitions.diff
transogl01-transitions-enable.diff
transogl01-sd-transitions.diff
transogl01-officecfg-transitions.diff
transogl01-slideshow-smooth.diff
transogl01-vcl-syschild-show.diff

[ Experimental ]
# sal_uInt32 -> sal_uIntPtr for events on some places
events-intptr.diff, i#59411, jholesov


[ DebianSidOnly ]
static-libs-use-_pic.diff, rengelha
# link dynamically with liblpsolve55.so
system-lpsolve-rpath.diff, rengelha

[ UbuntuOnly ]
writer-default-font.diff, mklose
human-icons-add.diff, mklose

[ UbuntuL10nOnly ]
human-icons-i18n.diff, mklose

[ DebianEtchOnly ]
static-libs-use-_pic.diff, rengelha
hunspell-lib-use-_pic.diff, rengelha
libhnj-lib-use-_pic.diff, rengelha
# use -llpsolve55_pic
system-lpsolve-use-_pic.diff, rengelha

[ UbuntuDapperOnly ]
static-libs-use-_pic.diff, rengelha
hunspell-lib-use-_pic.diff, rengelha
# use -llpsolve55_pic
system-lpsolve-use-_pic.diff, rengelha

[ UbuntuEdgyOnly ]
static-libs-use-_pic.diff, rengelha
hunspell-lib-use-_pic.diff, rengelha
unxlngi6-notune.diff, doko
ubuntu-no-stack-protector.diff, doko
# use -llpsolve55_pic
system-lpsolve-use-_pic.diff, rengelha

[ UbuntuFeistyOnly ]
static-libs-use-_pic.diff, rengelha
unxlngi6-notune.diff, doko
ubuntu-no-stack-protector.diff, doko
# use -llpsolve55_pic
system-lpsolve-use-_pic.diff, rengelha
#gccXXXXX.solenv.javaregistration.diff

[ UbuntuGutsyOnly ]
static-libs-use-_pic.diff, rengelha
unxlngi6-notune.diff, doko
ubuntu-no-stack-protector.diff, doko
# link dynamically with liblpsolve55.so
system-lpsolve-rpath.diff, rengelha
#gccXXXXX.solenv.javaregistration.diff


[ FedoraFixes ]
#FIXME src680: ooo64508.vcl.honourfontconfighinting.diff

#FIXME src680: buildfix-font-hints-svp.diff

ooo67658.sfx2.reloadcrash.diff

ooo68048.vcl.imsurroundtext.diff
oooXXXXX.vcl.x86_64.impressatk.diff

ooo73201.sw.a11yloadcrash.diff

#FIXME src680: ooo72129.vcl.fontglyphindex.diff
ooo61812.svx.a11ycrash.diff


# needs Gtk2.0 >= 2.10 and cairo
[ CairoFonts ]
#FIXME src680: ooo59127.vcl.honourcairofont.diff


[ GStreamer < src680-m239 ]
gstreamer-avmedia-m238.diff
gstreamer-sd-m238.diff

[ GStreamer >= src680-m239 ]
SectionOwner => rodo
SectionIssue => i#68717

gstreamer-avmedia.diff
gstreamer-sd.diff

[ GStreamer ]
SectionOwner => rodo
SectionIssue => i#68717

gstreamer-scp2.diff
gstreamer-config-office.diff
gstreamer-solenv.diff
gstreamer-svtools-content-types.diff
gstreamer-avmedia-file-types.diff
gstreamer-vcl.diff
avmedia-source-gstreamer-ChangeLog.diff
avmedia-source-gstreamer-exports.dxp.diff
avmedia-source-gstreamer-gstcommon.hxx.diff
avmedia-source-gstreamer-gstframegrabber.cxx.diff
avmedia-source-gstreamer-gstframegrabber.hxx.diff
avmedia-source-gstreamer-gstmanager.cxx.diff
avmedia-source-gstreamer-gstmanager.hxx.diff
avmedia-source-gstreamer-gstplayer.cxx.diff
avmedia-source-gstreamer-gstplayer.hxx.diff
avmedia-source-gstreamer-gstuno.cxx.diff
avmedia-source-gstreamer-gstwindow.cxx.diff
avmedia-source-gstreamer-gstwindow.hxx.diff
avmedia-source-gstreamer-makefile.mk.diff

[ GStreamer < src680-m239 ]
gstreamer-slideshow-m237.diff

[ GStreamer >= src680-m239 ]
gstreamer-slideshow.diff


[ Shrink < src680-m239 ]
SectionOwner => michael
# kill >1Mb of bloat in sal
size-sal-textenc-m238.diff, i#70166

[ Shrink >= src680-m239 ]
SectionOwner => michael

# kill >1Mb of bloat in sal
size-sal-textenc.diff, i#70166

[ NovellOnlyWin32 ]
SectionOwner => tml

novell-win32-odma.diff, i#6885, i#32741


[ NovellOnlyUnix ]
# search also gij32, ..., so the 32-bit package works on 64-bit
jvmfwk-gij32.diff, n#222708, pmladek


[ SVGImport ]
# Very partial implementation of SVG import
# Work in progress, don't use, hic sunt leones, etc.
svg-import.diff, jholesov
# Marco Cecchetti's work on importing text
svg-import-text.diff, jholesov

# allow internal libsvg, hic sunt (still always) leones, HACK!!!
libsvg-module.diff, fridrich


[ SharedWorksheets ]
SectionOwner => jholesov
# Implementation of shared worksheets
# Work in progress, don't use, hic sunt leones, etc.

sal-osl-lock-file.diff
modal-changes-dialog.diff
shared-worksheets.diff

[ NovellOnlyWin32 ]
novell-win32-msi-patchability.diff, i#84448, tml

[ MacOSXOnly ]
SectionOwner => pluby

# fix lpsolve build for OSX
macosx-lpsolve-makefile.diff
# fixes build with gcc-3.3; required for MacOSX build
# it is usable only until anyone uses the disabled code => MacOSXOnly
# we will move to gcc-4.x, so it does not make sense to push it upstream
buildfix-boost-gcc33.diff

[ PardusOnly ]
pardus-default-ExternalMailer.diff
pardus-clipart.diff
no-mozilla-plug-in-option.diff
dont-check-fqdn.diff

[ UnUsedButNotYetRemovedFromSVN ]
# diffs kept for reference as there might soon be a need to resurrect
# part of the code

[ Store ]
SectionOwner => rodo
SectionIssue => i#75399
store-core.diff
#FIXME src680: in store-install.diff, instsetoo_native part was commented out
store-install.diff
store-registry.diff
# don't burn 3% of startup doing CRC's we don't need
speed-store.diff, i#78495, michael
# don't do a load of locking we don't need to 1% of startup
speed-store-lck.diff, i#78526, michael


[ NovellOnlyWin32 ]
#Fix for n#269146
novell-win32-avoid-premature-shutdown.diff


[ WMF ]
wmf-pattern-brush.diff, n#232232, rodo


[ Layout < src680-m239 ]
SectionOwner => michael
cws-awtfixes1-m238.diff, i#78291, i#80754

# FIXME: collate and rename to cws-awtfixes1-2.diff?
layout-offapi-metric-field.diff, i#83222#
layout-offapi-metric-field-mk.diff, i#83222#
layout-toolkit-metric-field.diff, i#83222#

# FIXME: collate and rename to cws-awtfixes1-3.diff?
layout-offapi-fieldunit.diff, i#83222#
layout-toolkit-sizing-and-nit.diff, i#83222#
layout-vcl-size-fixes.diff, i#83222#

[ Layout >= src680-m239 ]
SectionOwner => michael
cws-awtfixes1.diff, i#78291, i#80754

[ Layout ]
SectionOwner => michael

# FIXME: commit this with i#78291 too...
layout-svtools.diff


[ LayoutDialogs]
SectionOwner => jannie
layout-dialogs-config_office-scp2.diff
layout-dialogs-layout.diff
layout-dialogs-svx-sw.diff


[ UnitTesting < src680-m239 ]
unittesting-ucb-m238.diff

[ UnitTesting >= src680-m239 ]
unittesting-ucb.diff

[ UnitTesting ]
SectionOwner => jholesov
# FIXME: file when ready

# teach build.pl what to do with prj/tests.lst's
unittesting-build-pl.diff

# the tests
unittesting-basebmp.diff
unittesting-basegfx.diff
unittesting-basic.diff
unittesting-bean.diff
unittesting-bridges.diff
unittesting-canvas.diff
unittesting-cli_ure.diff
unittesting-codemaker.diff
unittesting-configmgr.diff
unittesting-connectivity.diff
unittesting-cppu.diff
unittesting-cppuhelper.diff
unittesting-dbaccess.diff
unittesting-desktop.diff
unittesting-dtrans.diff
unittesting-embeddedobj.diff
unittesting-extensions.diff
unittesting-filter.diff
unittesting-forms.diff
unittesting-fpicker.diff
unittesting-framework.diff
unittesting-chart2.diff
unittesting-idlc.diff
unittesting-io.diff
unittesting-javaunohelper.diff
unittesting-jurt.diff
unittesting-jvmaccess.diff
unittesting-linguistic.diff
unittesting-offapi.diff
unittesting-o3tl.diff
unittesting-package.diff
unittesting-qadevOOo.diff
unittesting-registry.diff
unittesting-ridljar.diff
unittesting-sal.diff
unittesting-salhelper.diff
unittesting-sandbox.diff
unittesting-sax.diff
unittesting-sc.diff
unittesting-scripting.diff
unittesting-sd.diff
unittesting-sfx2.diff
unittesting-shell.diff
unittesting-slideshow.diff
unittesting-sot.diff
unittesting-starmath.diff
unittesting-stoc.diff
unittesting-store.diff
unittesting-svtools.diff
unittesting-svx.diff
unittesting-sw.diff
unittesting-testshl2.diff
unittesting-testtools.diff
unittesting-toolkit.diff
unittesting-tools.diff
unittesting-ucbhelper.diff
unittesting-udkapi.diff
unittesting-vcl.diff
unittesting-writerfilter.diff
unittesting-xmerge.diff
unittesting-xmlhelp.diff
unittesting-xmloff.diff
unittesting-xmlscript.diff
unittesting-xmlsecurity.diff

[ ReducedDefaults ]
SectionOwner => jholesov

# disable automatic spellchecking by default
reduced-disable-auto-spellcheck.diff

[ VOSremoval ]

# remove vos/process.hxx
# FIXME: in vcl, ExtCommandLine was removed, and the osl_ calls were used.
# Should we use the new salhelper::ExtCommandLine there, or should we remove
# even salhelper::ExtCommandLine, and introduce the functionality where
# needed?  (It's on one place only)
vosremoval-process.diff

# remove vos/diagnose.hxx
vosremoval-diagnose.diff

# remove vos/ref*.hxx
vosremoval-reference.diff

# remove vos/thread.hxx
vosremoval-thread.diff

# remove vos/mutex.hxx
vosremoval-mutex.diff

# remove vos/conditn.hxx
vosremoval-conditn.diff

# remove vos/macros.hxx
vosremoval-macros.diff

# remove vos/xception.hxx
vosremoval-xception.diff

# remove vos/signal.hxx
vosremoval-signal.diff

# remove vos/module.hxx
vosremoval-module.diff

# remove vos/security.hxx
vosremoval-security.diff

# remove vos/socket.hxx
vosremoval-socket.diff

# remove includes of non-existing/unused headers (vos/process.hxx,
# vos/dynload.hxx, vos/object.hxx, vos/types.hxx, vos/runnable.hxx,
# vos/thread.hxx)
vosremoval-unused-stuff.diff

# remove vos/pipe.hxx
vosremoval-pipe.diff

# remove vos/timer.hxx, introduce salhelper/timer.hxx
vosremoval-timer.diff

# removel VOSLIB from makefile.mk's
vosremoval-cleanup.diff


[ Glib2 ]
external-package-glib2.diff
scp2-package-glib2.diff

[ Gcc43 ]
# Make it compile with gcc 4.3
#FIXME src680: gcc-4.3.diff, i#83276, brosenk
gcc-4.3-2.diff, i#83276, pmladek
gcc-4.3-3.diff, i#83276, pmladek

[ OxygenOfficePalettes ]
palette-enhanced-arrow.diff
palette-enhanced-color.diff
palette-enhanced-dash.diff
palette-enhanced-gradient.diff
palette-enhanced-hatch.diff

[ DebianBaseOnly ]
debian-system-jfreereport.diff

[ Fixes ]
svx-sdrobjeditview-update-edit-area.diff, n#305205, rodo
cairocanvas-image-borders.diff, n#340142, rodo
goodies-eps-filter-unix.diff, n#200053, rodo

[ EMFPlus ]
emf+-canvas.diff
emf+-canvas-line-width.diff
emf+-canvas-vcl-clear.diff
emf+-canvas-smooth-poly.diff
emf+-canvas-vcl-non-closed-polygons.diff
emf+-cppcanvas.diff
emf+-cppcanvas-renderer.diff
emf+-cppcanvas-emfplus.diff
emf+-cppcanvas-polyaction.diff
emf+-offapi.diff
emf+-offapi-renderer.diff
emf+-vcl-bitmap.diff
emf+-vcl-renderer.diff
emf+-svtools.diff
emf+-scp2-renderer.diff

[ OxygenOfficeDefaultSettings ]
i27928-extended-tips-on.diff
i54709-default-impress-ruler.diff
