ooo-build r15264 - in trunk: . patches/dev300 patches/emf+ patches/gstreamer patches/mono patches/postgresql patches/scsolver patches/unittesting patches/vba
- From: rengelhard svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r15264 - in trunk: . patches/dev300 patches/emf+ patches/gstreamer patches/mono patches/postgresql patches/scsolver patches/unittesting patches/vba
- Date: Sat, 31 Jan 2009 21:30:27 +0000 (UTC)
Author: rengelhard
Date: Sat Jan 31 21:30:26 2009
New Revision: 15264
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15264&view=rev
Log:
2009-01-31 Rene Engelhard <rene debian org>
* configure.in: default to dev300-m40
* patches/dev300/apply: OLDEST_SUPPORTED=dev300-m40
* patches/*: remove everything < dev300-m40
Removed:
trunk/patches/dev300/autocorrect-accidental-caps-lock-offapi-m39.diff
trunk/patches/dev300/basegfx-missing-inline-fix.diff
trunk/patches/dev300/build-ant-1.6-m39.diff
trunk/patches/dev300/build-ibm-java-enable-m37.diff
trunk/patches/dev300/build-ibm-java-enable.diff
trunk/patches/dev300/build-java-target-m39.diff
trunk/patches/dev300/build-prebuilt-stax-m39.diff
trunk/patches/dev300/buildfix-enable-debug-m39.diff
trunk/patches/dev300/buildfix-openjdk-6-no-rhino.diff
trunk/patches/dev300/buildfix-x86-64-visibility-workaround-m39.diff
trunk/patches/dev300/cairocanvas-colorspace-fix.diff
trunk/patches/dev300/calc-change-track-xls-export-fix-m39.diff
trunk/patches/dev300/calc-datapilot-cells-not-empty.diff
trunk/patches/dev300/calc-dde-always-ooo-conv-m39.diff
trunk/patches/dev300/calc-dp-custom-names-sc-m36.diff
trunk/patches/dev300/calc-dp-custom-names-sc-m39.diff
trunk/patches/dev300/calc-dp-drilldown-hidden-items.diff
trunk/patches/dev300/calc-dp-filtered-range-fix.diff
trunk/patches/dev300/calc-dp-group-ident-category-fix.diff
trunk/patches/dev300/calc-dp-no-drilldown-when-readonly.diff
trunk/patches/dev300/calc-dp-page-field-list-fix.diff
trunk/patches/dev300/calc-dp-pivotcache-fix.diff
trunk/patches/dev300/calc-external-defined-names-enable.diff
trunk/patches/dev300/calc-external-defined-names-offapi.diff
trunk/patches/dev300/calc-external-defined-names-officecfg.diff
trunk/patches/dev300/calc-external-defined-names-sc.diff
trunk/patches/dev300/calc-external-defined-names-svtools.diff
trunk/patches/dev300/calc-formula-asian-phonetic-m39.diff
trunk/patches/dev300/calc-formula-datevalue-strip-time.diff
trunk/patches/dev300/calc-formula-variable-separators-sc-m39.diff
trunk/patches/dev300/calc-grammar-xls-english-sc-m39.diff
trunk/patches/dev300/calc-multiline-formula-ref-m39.diff
trunk/patches/dev300/calc-xls-parser-sheet-name-fix-sc.diff
trunk/patches/dev300/chart-odf-always-calc-a1-m39.diff
trunk/patches/dev300/chart-skip-hidden-cells-chart2-m37.diff
trunk/patches/dev300/chart-skip-hidden-cells-sc-m37.diff
trunk/patches/dev300/chart-skip-hidden-cells-sc-m39.diff
trunk/patches/dev300/chart-skip-hidden-cells-xmloff-m37.diff
trunk/patches/dev300/config_office-openjdk-paths-m37.diff
trunk/patches/dev300/config_office-openjdk-paths.diff
trunk/patches/dev300/controls-with-images-in-document.diff
trunk/patches/dev300/cws-impress161.diff
trunk/patches/dev300/cws-impressfontsize.diff
trunk/patches/dev300/cws-native220-m39.diff
trunk/patches/dev300/cws-npower11-m38.diff
trunk/patches/dev300/cws-rt36.diff
trunk/patches/dev300/cws-scsheetprotection02-sc-m37.diff
trunk/patches/dev300/cws-scsheetprotection02-sc-m38.diff
trunk/patches/dev300/cws-scsheetprotection02-sfx2-m37.diff
trunk/patches/dev300/cws-scsheetprotection02-svx-m37.diff
trunk/patches/dev300/cws-swffixes02.diff
trunk/patches/dev300/cwscheckapi-envset.diff
trunk/patches/dev300/default-autotext-and-form-name-m37.diff
trunk/patches/dev300/default-autotext-and-form-name-m39.diff
trunk/patches/dev300/default-no-registration-menu-m39.diff
trunk/patches/dev300/default-no-style-dialog-m37.diff
trunk/patches/dev300/fit-list-to-size-m37.diff
trunk/patches/dev300/fit-list-to-size-popup-m39.diff
trunk/patches/dev300/fix-mozbootstrap.diff
trunk/patches/dev300/fix-swffixes02-integration.diff
trunk/patches/dev300/form-control-visibility-m36.diff
trunk/patches/dev300/form-control-visibility-m37.diff
trunk/patches/dev300/forms-radio-button-group-names-m36.diff
trunk/patches/dev300/forms-radio-button-group-names-m37.diff
trunk/patches/dev300/gengal-three-layer-install-scp2.diff
trunk/patches/dev300/gengal-three-layer-install-svx.diff
trunk/patches/dev300/gnome-vfs-locking-config_office-m39.diff
trunk/patches/dev300/internal-mesa-headers-config_office-m39.diff
trunk/patches/dev300/layout-default-enable-config_office-m39.diff
trunk/patches/dev300/layout-disable-experimental-m39.diff
trunk/patches/dev300/layout-simple-dialogs-svx-m39.diff
trunk/patches/dev300/layout-simple-dialogs-sw-m39.diff
trunk/patches/dev300/linkwarn-officecfg-disable-msgbox-m39.diff
trunk/patches/dev300/mailmerge-ssl-ehlo.diff
trunk/patches/dev300/makefile-idl-build-m39.diff
trunk/patches/dev300/mingw-avoid-ms-assembler.diff
trunk/patches/dev300/mingw-build-without-stlport-setup_native.diff
trunk/patches/dev300/mingw-build-without-stlport-shell.diff
trunk/patches/dev300/mingw-build-without-stlport-soltools.diff
trunk/patches/dev300/mingw-build-without-stlport-stlport.diff
trunk/patches/dev300/mingw-buildfix-cppunit.diff
trunk/patches/dev300/mingw-buildfix-fpicker.diff
trunk/patches/dev300/mingw-buildfix-libxslt.diff
trunk/patches/dev300/mingw-buildfix-openssl.diff
trunk/patches/dev300/mingw-buildfix-sal.diff
trunk/patches/dev300/mingw-buildfix-solenv.diff
trunk/patches/dev300/mingw-buildfix-testshl2.diff
trunk/patches/dev300/mingw-do-not-interfere-with-cygwin.diff
trunk/patches/dev300/novell-win32-agfa-monotype-fonts-m37.diff
trunk/patches/dev300/novell-win32-agfa-monotype-fonts-m39.diff
trunk/patches/dev300/ooo59127.vcl.honourcairofont-m39.diff
trunk/patches/dev300/presenterscreen-no-license-m39.diff
trunk/patches/dev300/reportdesign-mention-package-m38.diff
trunk/patches/dev300/reportdesigner-no-license-m36.diff
trunk/patches/dev300/reportdesigner-no-license-m38.diff
trunk/patches/dev300/sc-cellformat-icon-toggle-m39.diff
trunk/patches/dev300/sc-copy-source-border-m39.diff
trunk/patches/dev300/sc-dataform-sc-m38.diff
trunk/patches/dev300/sc-datapilot-dynamic-range-m38.diff
trunk/patches/dev300/sc-datapilot-dynamic-range-m39.diff
trunk/patches/dev300/sc-dbrange-dynamic-resize-m39.diff
trunk/patches/dev300/sc-export-shape-hlink-bindings-m39.diff
trunk/patches/dev300/sc-export-shape-macro-bindings-m39.diff
trunk/patches/dev300/sc-goalseek-higher-precision.diff
trunk/patches/dev300/sc-overwrite-char-font-attrs-m37.diff
trunk/patches/dev300/sc-overwrite-char-font-attrs-m39.diff
trunk/patches/dev300/sc-sheet-double-click-rename.diff
trunk/patches/dev300/sc-simple-sort-include-format-header-m37.diff
trunk/patches/dev300/sc-standard-filter-options-m38.diff
trunk/patches/dev300/sc-string-arg-m38.diff
trunk/patches/dev300/sc-toggle-merge-center-m37.diff
trunk/patches/dev300/sc-xls-builtin-name-scope-m37.diff
trunk/patches/dev300/sc-xls-builtin-name-scope-m38.diff
trunk/patches/dev300/sd-inplace-deselection-fix.diff
trunk/patches/dev300/sd-macro-nudges.diff
trunk/patches/dev300/slideshow-blink-text-fix.diff
trunk/patches/dev300/slideshow-media-control.diff
trunk/patches/dev300/speed-hash-style-m39.diff
trunk/patches/dev300/speed-local-link-except-m39.diff
trunk/patches/dev300/speed-symbolic-functions-m39.diff
trunk/patches/dev300/svg-import-filter-m39.diff
trunk/patches/dev300/svtools-dont-extern-sRTF-sHTML-m39.diff
trunk/patches/dev300/svx-ppt-textstyle-fix.diff
trunk/patches/dev300/sw-accept-reject-redline-m37.diff
trunk/patches/dev300/sw-accept-reject-redline-m39.diff
trunk/patches/dev300/sw-source-filter-ww8-continous-section-break-fix.diff
trunk/patches/dev300/ucb-gio-gnome-init.diff
trunk/patches/dev300/unxsplash-rework-m36.diff
trunk/patches/dev300/unxsplash-rework-m39.diff
trunk/patches/dev300/valgrind-fix-warnings.diff
trunk/patches/dev300/vba-get-nonfiltered-range-selection-m39.diff
trunk/patches/dev300/vcl-bigger-icons-kde-gnome.diff
trunk/patches/dev300/vcl-logical-bmp-size.diff
trunk/patches/dev300/webdav-locking-from-ooo-build-2-4-1-m36.diff
trunk/patches/dev300/wpgimporter-m39.diff
trunk/patches/dev300/wpsimport-config_office-m39.diff
trunk/patches/dev300/xmlhelp-system-lucene-fix.diff
trunk/patches/dev300/xmlsecurity-disable-moz.diff
trunk/patches/dev300/zoom-combobox-m37.diff
trunk/patches/emf+/emf+-vcl-renderer-m39.diff
trunk/patches/gstreamer/gstreamer-config-office-m36.diff
trunk/patches/gstreamer/gstreamer-config-office-m39.diff
trunk/patches/mono/mono-build-m39.diff
trunk/patches/mono/mono-climaker-config-m39.diff
trunk/patches/postgresql/sdbc-postgresql-config_office-m39.diff
trunk/patches/scsolver/scsolver-config-option-m39.diff
trunk/patches/scsolver/scsolver-config-set-soenv-m39.diff
trunk/patches/scsolver/scsolver-lpsolve-m37.diff
trunk/patches/scsolver/scsolver-sc-build-lst-m39.diff
trunk/patches/unittesting/unittesting-build-pl-m37.diff
trunk/patches/vba/api-application-caller-m39.diff
trunk/patches/vba/enhanced-form-userform-controls-m39.diff
trunk/patches/vba/scextopt-public.diff
trunk/patches/vba/svx-source-form-fmundo-cxx-m37.diff
trunk/patches/vba/vba-fix-n431657.diff
trunk/patches/vba/vba-userform-geometry-tweak-m36.diff
trunk/patches/vba/vba-userform-geometry-tweak-m37.diff
trunk/patches/vba/vba-xls-formula-parser-m39.diff
trunk/patches/vba/vbaevents-services-sources-m39.diff
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/patches/dev300/apply
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Sat Jan 31 21:30:26 2009
@@ -3,7 +3,7 @@
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
-DEFAULT_TAG=dev300-m38
+DEFAULT_TAG=dev300-m40
# For the upstream packages it is like:
# DEFAULT_TAG=OOH680_m12
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Sat Jan 31 21:30:26 2009
@@ -7,7 +7,7 @@
PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../scsolver:../lwp
-OLDEST_SUPPORTED=dev300-m36
+OLDEST_SUPPORTED=dev300-m40
# -------- Functional sub-sets --------
Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -179,15 +179,9 @@
# fix the smoketest
smoketest-fix.diff, michael, i#84720
-[ TemporaryHacks < dev300-m40 ]
-# add idl target to toplevel makefile
-makefile-idl-build-m39.diff, noelpwer
-
-[ TemporaryHacks >= dev300-m40 ]
# add idl target to toplevel makefile
makefile-idl-build.diff, noelpwer
-[ TemporaryHacks ]
# Pagein types.rdb / services.rdb & the ui files
speed-pagein.diff, i#57679, michael
@@ -221,15 +215,9 @@
# sw-input-field-inline-edit.diff, Zhang Yun # removed since it causes some
# crashes with undo/redo
-[ TemporaryHacks <= dev300-m38 ]
-#realize a new feature named as Show Data Form in OpenOffice
-sc-dataform-sc-m38.diff, Amelia Wang
-
-[ TemporaryHacks > dev300-m38 ]
#realize a new feature named as Show Data Form in OpenOffice
sc-dataform-sc.diff, Amelia Wang
-[ TemporaryHacks ]
sc-dataform-officecfg.diff, kohei
#realize extra piece of new feature named as Show Data Form about vba
@@ -296,10 +284,6 @@
cjk-character-units-fix-376788.diff, i#376788, Amelia Wang
cjk-character-units-in-pggrid-fix.diff, Amelia Wang
-[ CJK <= dev300-m38 ]
-# insert Chinese forbidden characters at start or end of line into i18npool module
-cjk-insert-forbidden-characters-into-i18npool.diff, Amelia Wang
-
#[ CJKTemporaryHacks ]
# the following patch is disabled temporary.
# default value of tab stop for Chinese version
@@ -314,20 +298,13 @@
[ WPS ]
# MS Works import filter (following patches depend on each other) Fridrich
-[ WPS < dev300-m40 ]
-wpsimport-config_office-m39.diff
-
-[ WPS >= dev300-m40 ]
wpsimport-config_office.diff
-
-[ WPS ]
wpsimport-filter.diff
wpsimport-scp2.diff
wpsimport-writerperfect.diff
libwps.diff
-[ WPS >= dev300-m40 ]
# readd WPS. (removed in cws native214/m40)
wps-registry.diff
@@ -335,45 +312,21 @@
#basic runtime fixes
basic-add-missing-includes-after-cws-npower10.diff
-[ CWSBackports <= dev300-m38 ]
-#api changes
-cws-npower11-m38.diff
-
-[ CWSBackports > dev300-m38 ]
#api changes
cws-npower11.diff
# GetDialogParent() symbol needs to be exported.
vba-show-data-form-link-fix.diff, kohei
-[ CWSBackports < dev300-m40 ]
-# not for upstreaming: don't disable the entire visibility, just
-# the -fvisibility-inlines-hidden
-buildfix-x86-64-visibility-workaround-m39.diff
-
-[ CWSBackports >= dev300-m40 ]
# not for upstreaming: don't disable the entire visibility, just
# the -fvisibility-inlines-hidden
buildfix-x86-64-visibility-workaround.diff
-[ CWSBackports == dev300-m38 ]
-# 'PreferredFilter' filter option should only be used if the filter is an
-# IMPORT filter.
-cws-rt36.diff
-
-[ CWSBackports == dev300-m39 ]
-cws-native220-m39.diff, i#98168
-
-[ CWSBackports == dev300-m40 ]
cws-native220.diff, i#98168
[ WPG ]
# libwpg-based import filter for WordPerfect Graphics
libwpg.diff
-[ WPG <= dev300-m39 ]
-wpgimporter-m39.diff
-
-[ WPG > dev300-m39 ]
wpgimporter.diff
[ GCJ ]
@@ -423,34 +376,13 @@
# no bogus license question when registering these extensions
#solenv-no-extension-license.diff
-[ ExtensionFixes <= dev300-m36 ]
-reportdesigner-no-license-m36.diff
-
-[ ExtensionFixes > dev300-m36 < dev300-m39 ]
-reportdesigner-no-license-m38.diff
-
-[ ExtensionFixes >= dev300-m39 ]
+[ ExtensionFixes ]
reportdesigner-no-license.diff
-
-[ ExtensionFixes < dev300-m40 ]
-presenterscreen-no-license-m39.diff
-
-[ ExtensionFixes >= dev300-m40 ]
presenterscreen-no-license.diff
-
-[ ExtensionFixes ]
presentation-minimizer-no-license.diff
# Fixing build breake in apache-common module when you use UTF-8 based locale in the build system
apache-commons-build-fix-invalid-chars.diff, kami
-
-[ ExtensionFixes < dev300-m40 ]
-# extensions: fix & unbundle system java
-extensions-system-java.diff, hmth
-
-[ FixesNotForUpstream ]
pdfimport-no-license.diff
-
-[ ExtensionFixes ]
wiki-publisher-no-license.diff
build-java-target-extensions.diff, i#93115, pmladek
@@ -462,12 +394,7 @@
solven-extensions-noarch-identifier.diff, pmladek
sdext-noarch-identifier.diff, pmladek
-[ NovellOnly <= dev300-m39 ]
-# allow build with ant-1.6
-# IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
-build-ant-1.6-m39.diff, i#90830, pmladek
-
-[ NovellOnly > dev300-m39 ]
+[ NovellOnly ]
# allow build with ant-1.6
# IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
build-ant-1.6.diff, i#90830, pmladek
@@ -523,9 +450,6 @@
# allow other types of signing certs, fix by Jacob Berkman <jberkman novell com>
xmlsecurity-verify-usages.diff, i#76871, pmladek
-[ Fixes < dev300-m38 ]
-mailmerge-ssl-ehlo.diff, i#76655, deb#5074448
-
[ LinuxOnly ]
# fix that allows OOo to work with a standard (unpatched) libjpeg,
jpegc.c.diff, i#80674, n#272574, flr
@@ -555,51 +479,23 @@
localize-pl-cygwin-paths.diff, tml
-[ Fixes < dev300-m37 ]
-# import/export form control's visibility
-form-control-visibility-m36.diff, i#88878, jianhua
-
-[ Fixes == dev300-m37 ]
-# import/export form control's visibility
-form-control-visibility-m37.diff, i#88878, jianhua
-
-[ Fixes > dev300-m37 ]
# import/export form control's visibility
form-control-visibility.diff, i#88878, jianhua
-
-[ Fixes ]
# import tooltip for userforms
import-controls-tooltip.diff, i#90124, noelpwer
-[ Fixes < dev300-m40 ]
-# fix gengal for three layer install
-gengal-three-layer-install-svx.diff, i#89713, jannieuw
-gengal-three-layer-install-scp2.diff, i#89713, jannieuw
-
-[ Fixes ]
# fix path to the python binary in the mailmerge.py script
# /bin/python does not exists and breaks the automatic rpm dependencies
# FIXME 2008-11-26: the mailmerge.py in dev300-m35 doesn't have any #! line at all!?
#scripting-mailmerge-python-binary.diff, pmladek
-[ Fixes < dev300-m38 ]
-# initialize the default locale in the resource manager
-# for example, it fixes unopkg to do not show random localization
-tools-resmgr-set-defaultlocale.diff, n#399101, i#90820, pmladek
-
-[ Fixes ]
# Allow some technically illegal pathname components on Win32
# (directories with trailing spaces or periods) because some SMB
# servers like Netware (and Samba, if mangled names = No) do serve
# such directories if they exist on the server's host system.
win32-invalid-names.diff, n#277603, tml
-[ Fixes < dev300-m38 ]
-# fix the GNOME quickstarter to work again
-sfx2-shutdownicon-3layer.diff, bnc#434778, i#95223, pmladek
-
-[ Fixes ]
# make CustomUnitText "Pixel" localisable
customunittext-pixel.diff, i#61043, atimar
@@ -627,30 +523,12 @@
sw-dialogs-resize.diff, i#98164, atimar
svx-dialogs-resize.diff, i#98164, atimar
-
-[ Fixes < dev300-m38 ]
-i95118.diff, i#93994, i#95118
-
-pythonloader-no-DEBUG.diff, i#90653
-
[ TemporaryHacks ]
# FIXME 2008-11-26: partly applies to dev300-m35 with several "fuzz 2", partly not at all
#xmloff-field-patch.diff, flr, n#248354
-[ RadioButtons <= dev300-m36 ]
-# Add a GroupName property to RadioButtons so that RadioButtons don't need to
-# share the same name to be part of the same group.
-forms-radio-button-group-names-m36.diff, n#310052, i#30823, jonp
-
-[ RadioButtons == dev300-m37 ]
-# Add a GroupName property to RadioButtons so that RadioButtons don't need to
-# share the same name to be part of the same group.
-forms-radio-button-group-names-m37.diff, n#310052, i#30823, jonp
-
-[ RadioButtons >= dev300-m38 ]
-forms-radio-button-group-names.diff, n#310052, i#30823, jonp
-
[ RadioButtons ]
+forms-radio-button-group-names.diff, n#310052, i#30823, jonp
# depends on forms-radio-button-group-names.diff,
xl-import-formradiobutton.diff, noelpwer, i#30823
# persist the groupname for basic dialogs also
@@ -682,20 +560,12 @@
SectionOwner => jholesov
SectionIssue => i#29152
-[ WebDAV < dev300-m37 ]
-# WebDAV locking implementation - the original version
-# This is forward-ported from ooo-build-2-4-1, because the version for
-# up-streaming still does not work as expected :-(
-webdav-locking-from-ooo-build-2-4-1-m36.diff
-
-[ WebDAV >= dev300-m37 ]
# WebDAV locking implementation - the original version
# This is forward-ported from ooo-build-2-4-1, because the version for
# up-streaming still does not work as expected :-(
# FIXME 2008-12-04: doesn't apply to dev300-m37
#webdav-locking-from-ooo-build-2-4-1.diff
-[ WebDAV ]
# fix saving files on Novell teaming via WebDaV
webdav-locking-local-temp-file.diff, bnc#440514, kendy
@@ -705,13 +575,8 @@
# it was not committed up-stream yet because up-stream uses so old gnome-vfs
# that it did not even compile :-(
-[ GnomeVFS <= dev300-m39 ]
-gnome-vfs-locking-config_office-m39.diff, i#91151, jholesov
-
-[ GnomeVFS > dev300-m39 ]
gnome-vfs-locking-config_office.diff, i#91151, jholesov
-[ GnomeVFS ]
gnome-vfs-locking-ucb.diff, i#91151, jholesov
# Move gnome-vfs out of the startup sequence, load it only when needed
@@ -719,16 +584,9 @@
gnome-vfs-late-init.diff, i#84137, jholesov
-[ QuickStarter <= dev300-m36 ]
-unxsplash-rework-m36.diff, i#60696, michael/jholesov
-
-[ QuickStarter > dev300-m36 <= dev300-m39 ]
-unxsplash-rework-m39.diff, i#60696, michael/jholesov
-
-[ QuickStarter > dev300-m39 ]
+[ QuickStarter ]
unxsplash-rework.diff, i#60696, michael/jholesov
-[ QuickStarter ]
# fix the systray quickstarter
sfx2-quickstarter-fix.diff, i#88382, michael
@@ -755,9 +613,6 @@
# fix bitmap reading; the lines are aliased to 4 bytes
unxsplash-bmp-alias.diff, i#60696, jholesov
-[ Fixes < dev300-m37 ]
-cwscheckapi-envset.diff, i#95204
-
[ WriterFixes ]
# Allows to copy/paste html text which is between 2 unknown tags.
sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
@@ -775,13 +630,6 @@
csv-import-preserve-options-sc.diff, i#3687, i#97416, n#433378, muthusub/kohei
csv-import-preserve-options-officecfg.diff, i#3687, i#97416, n#433378, muthusub/kohei
-[ CalcFixes < dev300-m38 ]
-# Replace usability numb Zoom dialog with a Combo Box
-# FIXME: this conflicts with Sun's duplication of this work,
-# eg. print preview
-zoom-combobox-m37.diff, michael
-
-[ CalcFixes ]
# Replace usability numb Zoom dialog with a Combo Box
# FIXME: this conflicts with Sun's duplication of this work,
# eg. print preview
@@ -790,23 +638,12 @@
# make some symbols from sc visible when compiling with gcc4, necessary since m121
gcc4-visibility-sc.diff, i#53261, pmladek
-[ CalcFixes < dev300-m38 ]
-# Fix for b.x.c 62193
-sc-sheet-double-click-rename.diff, i#4517, kohei
-
-[ CalcFixes ]
# adds to Autofilter Empty-NonEmpty options bxc #62165
sc-autofilter-empty-nonempty.diff, i#35578, jody
-[ CalcFixes <= dev300-m38 ]
-# Improves the standard filter options and menu. bxc #62187 #62495
-sc-standard-filter-options-m38.diff, i#35579, michael
-
-[ CalcFixes > dev300-m38 ]
# Improves the standard filter options and menu. bxc #62187 #62495
sc-standard-filter-options.diff, i#35579, michael
-[ CalcFixes ]
# 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
@@ -814,22 +651,10 @@
# Autofill doesnt fill filtered rows bxc 62499
sc-filters-fill-fix.diff, jody
-[ CalcFixes <= dev300-m38 ]
-# Support modification of data source range in DataPilot after table output has
-# been generated.
-sc-datapilot-dynamic-range-m38.diff, i#23658, kohei
-
-[ CalcFixes > dev300-m38 <= dev300-m39 ]
-# Support modification of data source range in DataPilot after table output has
-# been generated.
-sc-datapilot-dynamic-range-m39.diff, i#23658, kohei
-
-[ CalcFixes > dev300-m39 ]
# Support modification of data source range in DataPilot after table output has
# been generated.
sc-datapilot-dynamic-range.diff, i#23658, kohei
-[ CalcFixes ]
# Provision for data-pilot to give autoformat bxc #62162
#
# Upstream has already rejected this patch, and closed the issue as WONTFIX.
@@ -852,15 +677,9 @@
sc-dp-gridlayout.diff, i#68544 n#190970, jody
-[ CalcFixes <= dev300-m38 ]
-# Excel compatibility for handling of "string numbers".
-sc-string-arg-m38.diff, i#5658, kohei
-
-[ CalcFixes > dev300-m38 ]
# Excel compatibility for handling of "string numbers".
sc-string-arg.diff, i#5658, kohei
-[ CalcFixes ]
# Fix for the above string number patch, for cases where a formula cell is
# being referenced by the origin cell.
sc-string-arg-ref-formula-cell.diff, n#391330, kohei
@@ -868,57 +687,28 @@
# Fix an error in presence of string literals in COUNTA.
sc-string-arg-counta-fix.diff, n#446622, kohei
-[ CalcFixes < dev300-m38 ]
-# Print_Area/Print_Titles are only relevant for sheet local names, n#191005
-sc-xls-builtin-name-scope-m37.diff, n#191005, n#257422, jonp
-
-[ CalcFixes == dev300-m38 ]
-# Print_Area/Print_Titles are only relevant for sheet local names, n#191005
-sc-xls-builtin-name-scope-m38.diff, n#191005, n#257422, jonp
-
-[ CalcFixes > dev300-m38 ]
# Print_Area/Print_Titles are only relevant for sheet local names, n#191005
sc-xls-builtin-name-scope.diff, n#191005, n#257422, jonp
-[ CalcFixes ]
# Allow Cols/Rows to be resized even if document is read-only, n#165980, jody
sc-read-only-colrow-resize.diff, jody
-[ CalcFixes < dev300-m38 ]
-# Implement 'Toggle merge & center'
-sc-toggle-merge-center-m37.diff, i#67243, jholesov
-
-[ CalcFixes >= dev300-m38 ]
# Implement 'Toggle merge & center'
sc-toggle-merge-center.diff, i#67243, jholesov
-[ CalcFixes ]
# Add a 'Natural' variant of sorting, blocking on ODF extension issues
sc-natural-sort.diff, i#26565, kohei
-[ CalcFixes < dev300-m38 ]
-# 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-m37.diff, i#13829, kohei
-
-[ CalcFixes >= dev300-m38]
# 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
-[ CalcFixes ]
# Paste clipboard when ENTER is pressed, then clear clipboard.
sc-paste-on-enter.diff, n#358545, i#28535, jonp
-[ CalcFixes <= dev300-m39 ]
-# Place a border around the Copy source cell(s).
-sc-copy-source-border-m39.diff, n#367489, jonp
-
-[ CalcFixes > dev300-m39 ]
# Place a border around the Copy source cell(s).
sc-copy-source-border.diff, n#367489, jonp
-[ CalcFixes ]
# Allow 'june-2007' to be properly parsed as June 1 2007 in en-US locales.
sc-date-fix.diff, n#358750, jonp
@@ -941,27 +731,10 @@
# able to paste it elsewhere (similar to Insert Cut Cells in Excel)
sc-delete-rows-columns-remembers-content.diff, i#71921, jholesov
-[ CalcFixes < dev300-m38 ]
-# 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. Also to support encryption on Excel file export.
-cws-scsheetprotection02-sc-m37.diff, i#60305, i#71468, i#84766, kohei
-cws-scsheetprotection02-sfx2-m37.diff, i#60305, i#71468, i#84766, kohei
-cws-scsheetprotection02-svx-m37.diff, i#60305, i#71468, i#84766, kohei
-
-[ CalcFixes == dev300-m38 ]
-# 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. Also to support encryption on Excel file export.
-cws-scsheetprotection02-sc-m38.diff, i#97515, kohei
-
-[ CalcFixes > dev300-m38 ]
# 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. Also to support encryption on Excel file export.
cws-scsheetprotection02-sc.diff, i#97515, kohei
-
-[ CalcFixes >= dev300-m38 ]
cws-scsheetprotection02-sfx2.diff, i#97515, kohei
cws-scsheetprotection02-svx.diff, i#97515, kohei
@@ -969,7 +742,6 @@
enable-xls-export-encryption.diff, kohei
enable-sheet-protection-options.diff, kohei
-[ CalcFixes ]
# Ensure that Print Preview is consistent with Print output.
sc-print-selected-sheets.diff, n#335684, i#45497, jonp
@@ -1000,67 +772,28 @@
# Support print & page preview for files containing only lines
sc-print-lines.diff, n#351468, i#85076, jonp
-[ CalcFixes <= dev300-m39 ]
-# Dynyamically resize filtered range when new data rows are present.
-sc-dbrange-dynamic-resize-m39.diff, n#352662, i#85305, kohei
-
-[ CalcFixes > dev300-m39 ]
# Dynyamically resize filtered range when new data rows are present.
sc-dbrange-dynamic-resize.diff, n#352662, i#85305, kohei
-[ CalcFixes ]
# Have cell background paint over the gridlines.
sc-cellbackground-over-gridlines.diff, n#361360, i#3907, kohei
-[ CalcFixes <= dev300-m39 ]
-# Make cell number format toolbar icons togglable & remove the standard format
-# button.
-sc-cellformat-icon-toggle-m39.diff, n#358548, i#86377, kohei
-
-[ CalcFixes > dev300-m39 ]
# Make cell number format toolbar icons togglable & remove the standard format
# button.
sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei
-[ CalcFixes < dev300-m38 ]
-# overwrite character level font attributes when changing them at cell level.
-sc-overwrite-char-font-attrs-m37.diff, n#374580, i#53545, i#96853, kohei
-
-[ CalcFixes >= dev300-m38 <= dev300-m39 ]
-# overwrite character level font attributes when changing them at cell level.
-sc-overwrite-char-font-attrs-m39.diff, n#374580, i#53545, i#96853, kohei
-
-[ CalcFixes > dev300-m39 ]
# overwrite character level font attributes when changing them at cell level.
sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
-[ CalcFixes ]
# ignore manual breaks when the "fit to x pages wide and x pages tall" option
# is used, for Excel interoperability.
sc-fit-to-width-height-skip-breaks.diff, n#404232, n#404563, i#94698, kohei
-[ CalcFixes <= dev300-m39 ]
-# reduce the delta value for improved precision.
-sc-goalseek-higher-precision.diff, i#92552, kohei
-
-[ CalcFixes < dev300-m38 ]
-# skip data in hidden cells when rendering charts.
-chart-skip-hidden-cells-chart2-m37.diff, n#404190, i#81209, n#427545, kohei
-chart-skip-hidden-cells-sc-m37.diff, n#404190, i#81209, n#425617, kohei
-chart-skip-hidden-cells-xmloff-m37.diff, n#404190, i#81209, n#425617, kohei
-
-[ CalcFixes >= dev300-m38 ]
# skip data in hidden cells when rendering charts.
chart-skip-hidden-cells-chart2.diff, n#404190, i#81209, n#427545, kohei
chart-skip-hidden-cells-xmloff.diff, n#404190, i#81209, n#425617, kohei
-
-[ CalcFixes >= dev300-m38 <= dev300-m39 ]
-chart-skip-hidden-cells-sc-m39.diff, n#404190, i#81209, n#425617, kohei
-
-[ CalcFixes > dev300-m39 ]
chart-skip-hidden-cells-sc.diff, n#404190, i#81209, n#425617, kohei
-[ CalcFixes ]
# render charts with multiple chart types correctly for xls interop.
chart-axis-multi-chart-types-chart2.diff, n#437322, i#95934, kohei
chart-axis-multi-chart-types-sc.diff, n#437322, i#95934, kohei
@@ -1074,87 +807,28 @@
# modify the autofill behavior to bring it a little closer to Excel's.
calc-autofill-increment-fix.diff, i#5550, kohei
-[ CalcFixes <= dev300-m39 ]
-# preserve line breaks when referencing it in formula.
-calc-multiline-formula-ref-m39.diff, i#35913, kohei
-
-[ CalcFixes > dev300-m39 ]
# preserve line breaks when referencing it in formula.
calc-multiline-formula-ref.diff, i#35913, kohei
-[ CalcFixes ]
# fixed chart wizard failure when the formula syntax is set to Excel A1/R1C1.
chart-wizard-xls-address-convention-fix.diff, n#411450, i#94696, kohei
-[ CalcFixes <= dev300-m39 ]
-# always store ranges in ODF using Calc A1 formula syntax.
-chart-odf-always-calc-a1-m39.diff, n#463305, kohei
-
-[ CalcFixes > dev300-m39 ]
# always store ranges in ODF using Calc A1 formula syntax.
chart-odf-always-calc-a1.diff, n#463305, kohei
-[ CalcFixes <= dev300-m39 ]
-# fixed change track export to xls files wrt cell change records.
-calc-change-track-xls-export-fix-m39.diff, n#416045, i#93839, kohei
-
-[ CalcFixes > dev300-m39 ]
# fixed change track export to xls files wrt cell change records.
calc-change-track-xls-export-fix.diff, n#416045, i#93839, kohei
-[ CalcFixes < dev300-m37 ]
-# correctly evaluate the visibility of dimension members when generating a
-# drill-down sheet & also reduce memory use on cache tables.
-calc-dp-drilldown-hidden-items.diff i#93918, i#93998, kohei
-
-# fix regression that prevents data pilot from being created on a filtered range.
-calc-dp-filtered-range-fix.diff, i#94281, kohei
-
-[ CalcFixes ]
# show COUNT and COUNTA results even if current range contains an error.
calc-status-bar-func.diff, n#430655, i#94618, kohei
-[ CalcFixes < dev300-m37 ]
-# Don't insert drill-down sheet in read-only mode.
-calc-dp-no-drilldown-when-readonly.diff, i#90402, kohei
-
-[ CalcFixes < dev300-m40 ]
-# Pivot cache field import fix.
-calc-dp-pivotcache-fix.diff, n#433658, i#96326, kohei
-
-[ CalcFixes <= dev300-m36 ]
# support custom names in data pilot tables.
-calc-dp-custom-names-sc-m36.diff, n#338014, i#22029, kohei
calc-dp-custom-names-offapi.diff, n#338014, i#22029, kohei
-
-[ CalcFixes > dev300-m36 ]
-# support custom names in data pilot tables.
-calc-dp-custom-names-offapi.diff, n#338014, i#22029, kohei
-
-[ CalcFixes > dev300-m36 <= dev300-m39 ]
-calc-dp-custom-names-sc-m39.diff, n#338014, i#22029, kohei
-
-[ CalcFixes > dev300-m39 ]
calc-dp-custom-names-sc.diff, n#338014, i#22029, kohei
-[ CalcFixes < dev300-m40 ]
-# fix 'Identify Categories' greakage on grouping.
-calc-dp-group-ident-category-fix.diff, n#447182, i#96171, kohei
-
-[ CalcFixes <= dev300-m39 ]
-# always use OOo address convention when parsing address in DDE function.
-calc-dde-always-ooo-conv-m39.diff, n#442143, kohei
-
-[ CalcFixes > dev300-m39 ]
# always use OOo address convention when parsing address in DDE function.
calc-dde-always-ooo-conv.diff, n#442143, kohei
-[ CalcFixes < dev300-m40 ]
-# include only visible members in the page field list box.
-calc-dp-page-field-list-fix.diff, i#96591, kohei
-
-[ CalcFixes ]
-
# make biffdumper build
fix-biffdumper.diff, noelpwer
@@ -1162,19 +836,13 @@
# properly )
vba-xl-import-crash.diff, noelpwer
-[ LinuxOnly <= dev300-m39 ]
-# accelerate linking, by extreme cunning i#63927
-# this is an increasingly marginal win ...
-speed-local-link-except-m39.diff, i#63927, michael
-
-[ LinuxOnly > dev300-m39 ]
+[ LinuxOnly ]
# accelerate linking, by extreme cunning i#63927
# this is an increasingly marginal win ...
speed-local-link-except.diff, i#63927, michael
# the file this one patches ends with CR chars... :-(
speed-local-link-except-offuh.diff
-[ LinuxOnly ]
speed-local-link.diff, i#63927, michael
# make some symbols from svtools visible for the kde fpicker when compiling with gcc4
@@ -1252,11 +920,6 @@
# also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=373974
printer-properties-disable.diff, i#14036, michael
-[ NotDebian <= dev300-m39 ]
-# Enable layout'ed dialogs. Not to be released, therefore NotDebian.
-layout-default-enable-config_office-m39.diff, janniew
-
-[ NotDebian > dev300-m39 ]
# Enable layout'ed dialogs. Not to be released, therefore NotDebian.
layout-default-enable-config_office.diff, janniew
@@ -1361,24 +1024,13 @@
libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
-[ BuildBits < dev300-m38 ]
-novell-win32-agfa-monotype-fonts-m37.diff, tml
-[ BuildBits >= dev300-m38 < dev300-m40 ]
-novell-win32-agfa-monotype-fonts-m39.diff, tml
-[ BuildBits >= dev300-m40 ]
+[ BuildBits ]
novell-win32-agfa-monotype-fonts.diff, tml
-[ BuildBits <= dev300-m39 ]
-# allow to define java target, so the build is usable with the JVM 1.5
-# even when it is built with JDK 1.6
-build-java-target-m39.diff, i#93115, pmladek
-
-[ BuildBits > dev300-m39 ]
# allow to define java target, so the build is usable with the JVM 1.5
# even when it is built with JDK 1.6
build-java-target.diff, i#93115, pmladek
-[ BuildBits ]
# do not create '.' subdirectories
# omit './' in paths
solenv-installer-cleaner-paths.diff, pmladek
@@ -1394,47 +1046,9 @@
# even worse, the direcotry had the rights 444
installer-get-path-correctly.diff, pmladek
-[ BuildBits < dev300-m38 ]
-# enable build with IBM Java 1.6.0
-build-ibm-java-enable-m37.diff, i#93114, pmladek
-
-[ BuildBits >= dev300-m38 <= dev300-m39 ]
-# enable build with IBM Java 1.6.0
-build-ibm-java-enable.diff, i#93114, pmladek
-
-[ BuildBits <= dev300-m39 ]
-# allow to use the prebuilt jsr173_1.0_api.jar
-build-prebuilt-stax-m39.diff, i#93116, pmladek
-
-[ BuildBits > dev300-m39 ]
# allow to use the prebuilt jsr173_1.0_api.jar
build-prebuilt-stax.diff, i#93116, pmladek
-[ BuildBits < dev300-m38 ]
-# OpenJDK paths for some archs
-config_office-openjdk-paths-m37.diff, i91783
-
-[ BuildBits >= dev300-m38 < dev300-m40 ]
-# OpenJDK paths for some archs
-config_office-openjdk-paths.diff, i91783
-
-[ BuildBits < dev300-m38 ]
-# fix build after cws swffixes
-cws-swffixes02.diff, i#96970
-
-[ BuildBits == dev300-m38 ]
-# fix build after cws swffixes. Somehow, it missed the
-# makefile.mks on integration
-fix-swffixes02-integration.diff, i#96970
-
-[ BuildBits < dev300-m38 ]
-# call g_type_init() before using GIO;
-# avoid crash when using GIO in non-GNOME Window manager
-ucb-gio-gnome-init.diff, i#96170, n#442678, mmeeks
-
-[ BuildBits < dev300-m39 ]
-fix-mozbootstrap.diff, i#97010, jholesov
-
[ Java14 ]
# enable build with Java 1.4; can't go upstream
@@ -1491,15 +1105,9 @@
# automatically do any migration we can, with no wizard
default-no-startup-wizard.diff, michael
-[ Defaults < dev300-m38 ]
-# don't throw up the style dialog on 1st run
-default-no-style-dialog-m37.diff, michael
-
-[ Defaults >= dev300-m38 ]
# don't throw up the style dialog on 1st run
default-no-style-dialog.diff, michael
-[ Defaults ]
# pestering people serves no useful purpose
default-no-registration.diff, michael
@@ -1508,17 +1116,11 @@
# => Tango should be preferred over Industrial.
tango-prefer-over-industrial.diff, n#304615, pmladek
-[ Defaults <= dev300-m39 ]
-# no Help->registration dialog by default
-default-no-registration-menu-m39.diff, michael
-
-[ Defaults > dev300-m39 ]
# no Help->registration dialog by default
default-no-registration-menu.diff, michael
# CR line endings again...
default-no-registration-menu-sd.diff, michael/kohei
-[ Defaults ]
# flatten the structure of the 3 layer OOo a bit
scp2-3layer-nicer-paths.diff, i#90430, jholesov
@@ -1597,18 +1199,6 @@
# FIXME: is anybody using this feature?
#FIXME src680: separate-helpcontent.diff, jholesov
-[ BuildBits <= dev300-m39 ]
-# use --hash-style=gnu linking when supported
-# disabled for Debian as Debian policy (for now) is to use=both
-speed-hash-style-m39.diff, pmladek
-
-# bind all those function / named relocations locally
-speed-symbolic-functions-m39.diff, i#85679, pmladek
-
-# fix configure.in (exists in dev300-m40)
-config_office-liblayout-libfonts.diff
-
-[ BuildBits > dev300-m39 ]
# use --hash-style=gnu linking when supported
# disabled for Debian as Debian policy (for now) is to use=both
speed-hash-style.diff, pmladek
@@ -1700,18 +1290,10 @@
# enable vcl to load bitmaps when height it negative
vcl-bitmap2-negative-height.diff
-[ VCL <= dev300-m36 ]
-# There's no reason to arbitrary use smaller icons - it looks ugly in the
-# modern desktop environments
-vcl-bigger-icons-kde-gnome.diff, i#95220, jholesov
-
[ SystemBits ]
# use getopt() and readdir_r() from system glibc
#FIXME src680: system-libc.diff, i#69033, rengelha
-[ SystemBits < dev300-m40 ]
-xmlhelp-system-lucene-fix.diff
-
[ TangoIcons ]
# default to large icons in the toolbar
gui-toolbox-large-icons.diff, jholesov
@@ -1892,13 +1474,8 @@
cli_ure-source-bootstrap-makefile-mk.diff, rodo
cli_ure-mono-bridge.diff, rodo
-[ Mono <= dev300-m39 ]
-mono-build-m39.diff, rodo
-
-[ Mono > dev300-m39 ]
mono-build.diff, rodo
-[ Mono ]
build-mono-link.diff, jholesov
# sign the output assembly using the key pair; it is needed to install
# the versioned assemblies into the system Global Assembly Cache (GAC)
@@ -1914,13 +1491,8 @@
cli_ure-prj-build-lst.diff
# climaker rewritten in C#
-[ Mono <= dev300-m39 ]
-mono-climaker-config-m39.diff
-
-[ Mono > dev300-m39 ]
mono-climaker-config.diff
-[ Mono ]
mono-climaker-bridgetest.diff
[ VBAObjects ]
@@ -1934,39 +1506,22 @@
svx-source-form-fmscriptingenv-cxx.diff, i#68893
svx-source-form-makefile.diff, i#68893
-[ VBAObjects < dev300-m38 ]
-svx-source-form-fmundo-cxx-m37.diff, i#68893
-
-[ VBAObjects >= dev300-m38 ]
svx-source-form-fmundo-cxx.diff, i#68893
-[ VBAObjects ]
vbaevents-services-build.diff, i#68893
scp_vba_uno_service.diff, i#68893
vba-support-export-palette.diff, i#68900
-[ VBAObjects <= dev300-m39 ]
-# always get non-filtered range selection when querying for current selection
-# address.
-vba-get-nonfiltered-range-selection-m39.diff, n#415002, kohei
-
-[ VBAObjects > dev300-m39 ]
# always get non-filtered range selection when querying for current selection
# address.
vba-get-nonfiltered-range-selection.diff, n#415002, kohei
-[ VBAObjects ]
vba-allow-ranges-for-cell-functions.diff
vba-error-object.diff
-[ VBAObjects <= dev300-m39 ]
-# make ScExtDocSettings public
-scextopt-public.diff, jianhua
-
-[ VBAObjects ]
#tweak cws-npower7/8 to build vba before filter ( filter uses headers generated
#from oovbapi.rdb )
sc-vba-build-lst.diff
@@ -1981,45 +1536,21 @@
# fix nasty corruption of rountriped excel documents with shapes
fix-shape-export-i96858.diff, i#96858
-[ VBAObjects <= dev300-m39 ]
-# export of macro bindings for shapes
-sc-export-shape-macro-bindings-m39.diff, n#304739, noelpwer
-
-[ VBAObjects > dev300-m39 ]
# export of macro bindings for shapes
sc-export-shape-macro-bindings.diff, n#304739, noelpwer
-[ VBAObjects <= dev300-m39 ]
-# export of hlink bindings for shapes
-sc-export-shape-hlink-bindings-m39.diff, n#304739, noelpwer
-
-[ VBAObjects > dev300-m39 ]
# export of hlink bindings for shapes
sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
-[ VBAObjects ]
# attributes present in the vba streams can override the default shape name
# used for the control in the binary format
sc-vbaimport-override-controlname.diff, n#359933, noelpwer
-[ VBAObjects <= dev300-m39 ]
-# Application.Caller
-api-application-caller-m39.diff, n#339941, noelpwer
-
-[ VBAObjects > dev300-m39 ]
# Application.Caller
api-application-caller.diff, n#339941, noelpwer
-[ VBAObjects < dev300-m38 ]
-default-autotext-and-form-name-m37.diff, n#353687, i#85358
-
-[ VBAObjects >= dev300-m38 <= dev300-m39 ]
-default-autotext-and-form-name-m39.diff, n#353687, i#85358
-
-[ VBAObjects > dev300-m39 ]
default-autotext-and-form-name.diff, n#353687, i#85358
-[ VBAObjects ]
# fix --disable-vba build
oovbaapi-disable-vba.diff
@@ -2034,26 +1565,14 @@
#also allow paramaters to be supported for Get properties
vba-support-properties-inmodules.diff
-[ VBAObjects <= dev300-m36 ]
-controls-with-images-in-document.diff, i#38215, noelpwer
-
-[ VBAObjects ]
# import graphic for image control
controls-with-images-import.diff, Fong
-[ VBAObjects <= dev300-m39 ]
-#use of form control models in userforms/dialogs, additionally
-#enables use of document embedded images in image control for
-#userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
-enhanced-form-userform-controls-m39.diff, noelpwer
-
-[ VBAObjects > dev300-m39 ]
#use of form control models in userforms/dialogs, additionally
#enables use of document embedded images in image control for
#userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
enhanced-form-userform-controls.diff, noelpwer
-[ VBAObjects ]
# object module support... getting there
ObjectModule.diff
# userform ( depends on ObjectModule.diff )
@@ -2065,13 +1584,8 @@
# support to display spinbutton in userform
vba-spinbutton-in-userform.diff, Fong
-[ VBAObjects <= dev300-m39 ]
-vbaevents-services-sources-m39.diff, i#68893
-
-[ VBAObjects > dev300-m39 ]
vbaevents-services-sources.diff, i#68893
-[ VBAObjects ]
# vba workbook/worksheet events
vba-workbook-worksheet-events.diff, Fong
# worksheet_calculate event fix
@@ -2108,19 +1622,9 @@
# fix bug comparing string that can't be converted to number
stringnumbercompare.diff, n#422559
-[ VBAObjects <= dev300-m36 ]
-# fix import sizes and geometry of userforms
-vba-userform-geometry-tweak-m36.diff
-
-[ VBAObjects == dev300-m37 ]
-# fix import sizes and geometry of userforms
-vba-userform-geometry-tweak-m37.diff
-
-[ VBAObjects >= dev300-m38 ]
# fix import sizes and geometry of userforms
vba-userform-geometry-tweak.diff
-[ VBAObjects ]
# n#426415
vba-allow-forms-resetvalue-binding.diff
# n#426415
@@ -2137,28 +1641,16 @@
# 'regex' like characters are present
vba-noregrex-for-match.diff
-[ VBAObjects <= dev300-m36 ]
-# fix queryInterface problem
-vba-fix-n431657.diff, n#431657
-
-[ VBAObjects ]
# fix treatment of NULL with
# a) NOT operator b) comparison operators
vba-null-not-treatment.diff
# fix core issue in Commandbar
vba-commandbar-fix.diff, n#434214, n#437157, Fong
-[ VBAObjects <= dev300-m39 ]
-# always use English Excel grammar when parsing formulas.
-# (depends on calc-grammar-xls-english-*.diff patches.)
-vba-xls-formula-parser-m39.diff, n#422145, kohei
-
-[ VBAObjects > dev300-m39 ]
# always use English Excel grammar when parsing formulas.
# (depends on calc-grammar-xls-english-*.diff patches.)
vba-xls-formula-parser.diff, n#422145, kohei
-[ VBAObjects ]
vba-fix-docmodule-import-crash.diff, n#447560
vba-servicemacros-rework.diff
@@ -2205,13 +1697,6 @@
# hack to ignore writerfilter if odf-converter is present
odf-converter-ignore-writerfilter.diff, n#348471, jholesov
-[ Features < dev300-m38 ]
-sw-accept-reject-redline-m37.diff, n#249775, Amelia Wang
-
-[ Features >= dev300-m38 <= dev300-m39 ]
-sw-accept-reject-redline-m39.diff, n#249775, Amelia Wang
-
-[ Features > dev300-m39 ]
sw-accept-reject-redline.diff, n#249775, Amelia Wang
[ msaccess ]
@@ -2261,68 +1746,30 @@
# Make the formula separators changeable per locale setting, and add new
# configuration page for formula syntax and separators.
-[ CalcFixes <= dev300-m39 ]
-calc-formula-variable-separators-sc-m39.diff, n#447164, i#92056, kohei
-
-[ CalcFixes > dev300-m39 ]
calc-formula-variable-separators-sc.diff, n#447164, i#92056, kohei
-[ CalcFixes ]
calc-formula-variable-separators-svx.diff, n#447164, i#92056, kohei
calc-formula-variable-separators-officecfg.diff, n#447164, i#92056, kohei
-[ CalcFixes < dev300-m38 ]
-# Fix parse failure on non-ASCII sheet names in Excel A1 and R1C1 modes.
-calc-xls-parser-sheet-name-fix-sc.diff, n#407807, i#92379, kohei
-
-[ CalcFixes < dev300-m37 ]
-# Keep the datapilot dialog open when table insertion fails.
-calc-datapilot-cells-not-empty.diff, n#408934, i#92378, kohei
-
-[ CalcFixes ]
# Squeeze chart's subtitle into the 2nd line of the main title when exporting
# to xls.
chart-subtitle-xls-export.diff, i#92357, kohei
-[ CalcFixes <= dev300-m39 ]
-# strip the fraction part of a date-time value when using DATEVALUE.
-calc-formula-datevalue-strip-time.diff, i#94765, kohei
-
-[ CalcFixes < dev300-m38 ]
-# Implement external range names.
-calc-external-defined-names-sc.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-offapi.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-officecfg.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-svtools.diff, i#3740, i#4385, n#355685, kohei
-
-[ CalcFixes >= dev300-m38 ]
# Enable external defined name import on xls documents.
calc-external-defined-names-enable.diff, kohei
-[ CalcFixes ]
# Don't adjust row height on xls load for better layout preservation and
# faster file load.
calc-xls-disable-adjust-row-height.diff, kohei
-[ CalcFixes <= dev300-m39 ]
-# Support PHONETIC function to display asian phonetic guide.
-calc-formula-asian-phonetic-m39.diff, i#80764, i#80765, i#80766, kohei
-
-[ CalcFixes > dev300-m39 ]
# Support PHONETIC function to display asian phonetic guide.
calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
-[ CalcFixes ]
# Support Excel English grammar needed for VBA and (probably) for xlsx filter.
calc-grammar-xls-english-offapi.diff, kohei
-[ CalcFixes <= dev300-m39 ]
-calc-grammar-xls-english-sc-m39.diff, kohei
-
-[ CalcFixes > dev300-m39 ]
calc-grammar-xls-english-sc.diff, kohei
-[ CalcFixes ]
# fix assertions to prevent them from being incorrectly triggered.
chart-odf-export-assert-removal.diff, i#97563, kohei
@@ -2344,25 +1791,14 @@
[ CalcSolver ]
SectionOwner => kohei
-[ CalcSolver <= dev300-m39 ]
-scsolver-config-option-m39.diff
-scsolver-config-set-soenv-m39.diff
-scsolver-sc-build-lst-m39.diff
-
-[ CalcSolver > dev300-m39 ]
scsolver-config-option.diff
scsolver-config-set-soenv.diff
scsolver-sc-build-lst.diff
-[ CalcSolver ]
scsolver-sc-remove-menu.diff
scsolver-scp2.diff
scsolver-setup_native.diff
-[ CalcSolver < dev300-m38 ]
-scsolver-lpsolve-m37.diff
-
-[ CalcSolver >= dev300-m38 ]
scsolver-lpsolve.diff
[ OptionalOutplaceOLE ]
@@ -2381,11 +1817,7 @@
sdbc-postgresql-build-lst.diff
connectivity-workben-postgresql.diff
gcc-4.3-postgresql.diff
-
-[ PostgreSQL >= dev300-m40 ]
sdbc-postgresql-config_office.diff
-[ PostgreSQL < dev300-m40 ]
-sdbc-postgresql-config_office-m39.diff
[ ArkOnly ]
SectionOwner => brosenk
@@ -2529,14 +1961,9 @@
ooo86080.unopkg.bodge.diff
-[ CairoFonts < dev300-m40 ]
-# needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
-ooo59127.vcl.honourcairofont-m39.diff
-[ CairoFonts >= dev300-m40]
+[ CairoFonts ]
# needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
ooo59127.vcl.honourcairofont.diff
-
-[ CairoFonts ]
psprint-fontconfig-fix.diff, n#407958, thorsten
[ GStreamer ]
@@ -2546,17 +1973,7 @@
gstreamer-avmedia.diff
gstreamer-sd.diff
gstreamer-scp2.diff
-
-[ GStreamer <= dev300-m36 ]
-gstreamer-config-office-m36.diff
-
-[ GStreamer > dev300-m36 < dev300-m40 ]
-gstreamer-config-office-m39.diff
-
-[ GStreamer >= dev300-m40 ]
gstreamer-config-office.diff
-
-[ GStreamer ]
gstreamer-slideshow.diff
gstreamer-solenv.diff
gstreamer-svtools-content-types.diff
@@ -2588,11 +2005,6 @@
# warning: comparison with string literal results in unspecified results
warning-string-comparsion-sw.diff, i#86880, i#86772, pmladek
-[ Shrink <= dev300-m39 ]
-# don't export trivial strings in svtools, increases linking time, bloats size
-svtools-dont-extern-sRTF-sHTML-m39.diff, i#86772, jholesov
-
-[ Shrink > dev300-m39 ]
# don't export trivial strings in svtools, increases linking time, bloats size
svtools-dont-extern-sRTF-sHTML.diff, i#86772, jholesov
@@ -2606,17 +2018,11 @@
jvmfwk-gij32.diff, n#222708, pmladek
-[ SVGImport <= dev300-m39 ]
-# A bit less partial implementation of SVG import
-# Work in progress, but fairly usable already
-svg-import-filter-m39.diff, thorsten
-
-[ SVGImport > dev300-m39 ]
+[ SVGImport ]
# A bit less partial implementation of SVG import
# Work in progress, but fairly usable already
svg-import-filter.diff, thorsten
-[ SVGImport ]
# like svg-import-filter.diff, but adds a graphic filter for SVG
svg-import-filter-gfxfilter.diff, thorsten
@@ -2688,16 +2094,8 @@
layout-simple-dialogs-sfx2.diff
layout-simple-dialogs-solenv.diff
layout-simple-dialogs-starmath.diff
-
-[ LayoutDialogs <= dev300-m39 ]
-layout-simple-dialogs-svx-m39.diff
-layout-simple-dialogs-sw-m39.diff
-
-[ LayoutDialogs > dev300-m39 ]
layout-simple-dialogs-svx.diff
layout-simple-dialogs-sw.diff
-
-[ LayoutDialogs ]
layout-simple-dialogs-toolkit.diff
layout-simple-dialogs-vcl.diff
layout-tab-sfx2-fix.diff, thorsten
@@ -2707,10 +2105,6 @@
toolkit-layout-gcc-4.3.2-hack.diff, pmladek
# These merge with the layoutdialogs2 cws
-[ LayoutDialogs <= dev300-m39 ]
-layout-disable-experimental-m39.diff
-
-[ LayoutDialogs > dev300-m39 ]
layout-disable-experimental.diff
[ LayoutDialogs ]
@@ -2720,13 +2114,7 @@
SectionOwner => kohei
SectionIssue => i#62234
-[ AutoCorrectCapsLock <= dev300-m39 ]
-autocorrect-accidental-caps-lock-offapi-m39.diff
-
-[ AutoCorrectCapsLock > dev300-m39 ]
autocorrect-accidental-caps-lock-offapi.diff
-
-[ AutoCorrectCapsLock ]
autocorrect-accidental-caps-lock-officecfg.diff
autocorrect-accidental-caps-lock-sc.diff
autocorrect-accidental-caps-lock-sw.diff
@@ -2739,15 +2127,9 @@
SectionIssue => i#87469
# FIXME: file more issuses when ready
-[ UnitTesting < dev300-m38 ]
-# teach build.pl what to do with prj/tests.lst's
-unittesting-build-pl-m37.diff
-
-[ UnitTesting >= dev300-m38 ]
# teach build.pl what to do with prj/tests.lst's
unittesting-build-pl.diff
-[ UnitTesting ]
# the tests
unittesting-basebmp.diff
unittesting-basegfx.diff
@@ -2911,14 +2293,7 @@
emf+-cppcanvas-emfplus.diff
emf+-offapi-renderer.diff
emf+-vcl-bitmap.diff
-
-[ EMFPlus <= dev300-m39 ]
-emf+-vcl-renderer-m39.diff
-
-[ EMFPlus > dev300-m39 ]
emf+-vcl-renderer.diff
-
-[ EMFPlus ]
emf+-svtools.diff
emf+-scp2-renderer.diff
emf+-crash-fix.diff, n#361534, rodo
@@ -2935,13 +2310,8 @@
linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten
-[ LinkWarningDlg <= dev300-m39 ]
-linkwarn-officecfg-disable-msgbox-m39.diff, n#348149, thorsten
-
-[ LinkWarningDlg > dev300-m39 ]
linkwarn-officecfg-disable-msgbox.diff, n#348149, thorsten
-[ LinkWarningDlg ]
linkwarn-svx-warning-dlg.diff, n#348149, thorsten
linkwarn-sd-no-dnd-links.diff, n#348149, thorsten
@@ -3044,10 +2414,6 @@
sd-slideshow-slideshowview-transformation-fix.diff, rodo
-[ Fixes < dev300-m39 ]
-sd-inplace-deselection-fix.diff, i#89283, n#384506, thorsten
-
-[ Fixes ]
sd-view-zoom-fix.diff, n#380013, i#88939, thorsten
sd-custom-show-fix.diff, n#355638, i#90145, thorsten
@@ -3055,26 +2421,14 @@
# hyperlink issue with numeric slide names in Impress
sd-update-relative-links.diff, n#355674, i#55224, rodo
-[ Fixes < dev300-m38 ]
-# have Impress outline text boxes shrink font automatically when text
-# starts to overflow
-fit-list-to-size-m37.diff, i#94086, thorsten
-
-[ Fixes >= dev300-m38 ]
# have Impress outline text boxes shrink font automatically when text
# starts to overflow
fit-list-to-size.diff, i#94086, thorsten
fit-list-to-size-ui.diff, i#94086, thorsten
fit-list-to-size-style-defaults.diff, i#94086, thorsten
-
-[ Fixes <= dev300-m39 ]
-fit-list-to-size-popup-m39.diff, i#94086, thorsten
-
-[ Fixes > dev300-m39 ]
fit-list-to-size-popup.diff, i#94086, thorsten
-[ Fixes ]
# apply this patch if you need to disable vcl grabbing your mouse -
# after applying the patch, set SAL_NO_MOUSEGRABS in your env
#vcl-disable-mouse-grab.diff
@@ -3097,13 +2451,8 @@
# TODO file up-stream
lockfile-less-symbols.diff, jholesov
-[ InternalMesaHeaders < dev300-m40 ]
-internal-mesa-headers-config_office-m39.diff, fridrich
-
-[ InternalMesaHeaders >= dev300-m40 ]
-internal-mesa-headers-config_office.diff, fridrich
-
[ InternalMesaHeaders ]
+internal-mesa-headers-config_office.diff, fridrich
internal-mesa-headers-slideshow.diff, fridrich
internal-mesa-headers-mesa.diff, fridrich
@@ -3134,26 +2483,12 @@
[ Fixes ]
cppcanvas-fix-roundcorners.diff, rodo
-[ Fixes < dev300-m39 ]
-slideshow-media-control.diff, i#91250, thorsten
-sd-macro-nudges.diff, i#91249, n#188199, thorsten
-
-[ Fixes ]
sd-more-title-styles.diff, i#23221, thorsten
officecfg-bighandles-default.diff, thorsten
-[ Fixes < dev300-m38 ]
-xmlsecurity-disable-moz.diff, thorsten
-cairocanvas-colorspace-fix.diff, thorsten
-
-[ Fixes ]
slideshow-colorspace-fix.diff, thorsten
slideshow-cutblack.diff, thorsten
-[ Fixes < dev300-m38 ]
-sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
-
-[ Fixes ]
sw-ww8-fieldandcharstyle.diff, n#414471, i#93105, fridrich
unoxml-boost-workaround.diff, thorsten
@@ -3263,9 +2598,6 @@
[ Fixes ]
svtools-update-ole.diff, n#411855, thorsten
-[ Fixes < dev300-m38 ]
-vcl-logical-bmp-size.diff, i#92902, thorsten
-
[ ExtensionFixes ]
pdfimport-lax-restrictions.diff, i#90468, thorsten
@@ -3286,42 +2618,16 @@
svx-debug-sdrolestreams.diff, thorsten
instset-macos-langpacks.diff, i#64937, cloph
sal-disable-backtrace.diff, thorsten
-[ Fixes < dev300-m38 ]
-valgrind-fix-warnings.diff, i#95197, thorsten
-[ Fixes ]
# FIXME 2008-11-26:
#sw-invert-border-spacing.diff, n#391591, flr
cws-impress162-sd.diff, i#94193, thorsten
cws-impress162-canvas.diff, i#94193, thorsten
cws-impress162-slideshow.diff, i#94193, thorsten
-[ Fixes < dev300-m38 ]
-slideshow-blink-text-fix.diff, i#96047, thorsten
-[ Fixes < dev300-m39 ]
-basegfx-missing-inline-fix.diff, i#96585, thorsten
-[ Fixes ]
canvas-directx-lostdevice-fix.diff, n#445628, thorsten
# fix wrong en-US accelerators in Impress
fix-sd-accelerators.diff, n#463733, i#97088, jholesov
-[ Fixes < dev300-m40 ]
-# fix wordwrap problem with 2.x documents (forward port from 3.0.1,
-# no idea why fix is still missing in trunk)
-cws-impress161.diff, i#93996, thorsten
-
-[ Fixes < dev300-m38 ]
-svx-ppt-textstyle-fix.diff, n#443127, thorsten
-
-[ MinGW < dev300-m40 ]
-# trivial build fixes
-mingw-buildfix-cppunit.diff, i#95190, jholesov
-mingw-buildfix-fpicker.diff, i#95190, jholesov
-mingw-buildfix-libxslt.diff, i#95190, jholesov
-mingw-buildfix-openssl.diff, i#95190, jholesov
-mingw-buildfix-solenv.diff, i#95190, jholesov
-mingw-buildfix-sal.diff, i#95190, jholesov
-mingw-buildfix-testshl2.diff, i#95190, jholesov
-
[ MinGW ]
# build fix for odma - not up-stream
mingw-buildfix-odma.diff, jholesov
@@ -3329,27 +2635,9 @@
# more allowed -I's in OOo's cpp [for scp2]
mingw-cpp-increase-include-limit.diff, i#95193, jholesov
-[ MinGW < dev300-m40 ]
-# don't use MS assembler for MinGW
-mingw-avoid-ms-assembler.diff, i#95194, jholesov
-
-# make MinGW in Cygwin actually work
-mingw-do-not-interfere-with-cygwin.diff, i#95198, jholesov
-
-[ MinGW ]
# sleep using osl::Thread::wait()
mingw-thread-wait-instead-of-sleep.diff, i#95200, jholesov
-[ MinGW < dev300-m40 ]
-# make it build --without-stlport
-mingw-build-without-stlport-setup_native.diff, i#95203, jholesov
-mingw-build-without-stlport-shell.diff, i#95203, jholesov
-mingw-build-without-stlport-soltools.diff, i#95203, jholesov
-mingw-build-without-stlport-stlport.diff, i#95203, jholesov
-
-[ Fixes < dev300-m38 ]
-cws-impressfontsize.diff, i#8824, cl
-
[ Fixes ]
# fix problem with outline numbering broken in master document
sw-outline-numbering-broken-fix.diff, i#96092, n#445536, Amelia Wang
@@ -3360,21 +2648,12 @@
# and in the Start Menu on Windows
win32-tooltips.diff, tml
-[ Fixes < dev300-m40 ]
-# openjdk contains rhino.jar. breaks the build...
-buildfix-openjdk-6-no-rhino.diff
-
[ Fixes ]
# fix problem with calling private and protected members in layout code
sfx2-privateprotectedpublic.diff
# add make_pair<>()-like type generator functions to generated header files
codemaker-function-template-generators.diff, i#98625, thorsten
-[ Fixes <= dev300-m39 ]
-# several compile fixes for --enable-debug.
-buildfix-enable-debug-m39.diff
-
-[ Fixes > dev300-m39 ]
# several compile fixes for --enable-debug.
buildfix-enable-debug.diff
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
