[Libreoffice-commits] .: 8 commits - patches/dev300

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Fri Jul 22 07:10:26 PDT 2011 

 patches/dev300/apply |  350 ++++++++++++++++++++++-----------------------------
 1 file changed, 152 insertions(+), 198 deletions(-)

New commits:
commit eb788aa4cf88582c172c92c2c127a35b30bb3c2a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 16:07:39 2011 +0200

    Remove nonexistent GJC section

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8317e25..5bd7b16 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -10,7 +10,7 @@ PATCHPATH=.:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql
 OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
 
 # -------- Functional sub-sets --------
-Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Features, Misc, CalcFixes, EasterEgg, GnomeVFS, VBAObjects, GCJ, OOXML, OOXMLExport, FedoraCommonFixes, WriterDocComparison, MySQL
+Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Features, Misc, CalcFixes, EasterEgg, GnomeVFS, VBAObjects, OOXML, OOXMLExport, FedoraCommonFixes, WriterDocComparison, MySQL
 
 LinuxCommon : Common, LinuxOnly, CliMonoCommon, Mono, MonoComp, Netbook
 MacOSXCommon : Common
commit 967cdf7cd70c025a061d55c78deec576ff694bfc
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 16:06:56 2011 +0200

    Unify Features

diff --git a/patches/dev300/apply b/patches/dev300/apply
index df2631d..8317e25 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -531,6 +531,14 @@ writer-default-as-optimal-page-wrap.diff, i#38108, jody
 # handling of the issue. See discussion in bnc#525331. --tml
 # session-management.diff, i#63156, rodo
 
+# embed generic media files inside odf docs, plus various related
+# sound fixes from rodo
+#impressmedia-features.diff, i#83753, n#515553, thorsten
+#slideshow-sound.diff, n#515553, rodo
+
+# Pre- and postprocessing capabilities for loading and saving.
+sfx2-pre-and-postprocess-during-save-load.diff, i#71939, flr
+
 [ BuildBits ]
 build-identification.diff, tml
 
@@ -1571,17 +1579,6 @@ recovery-dialog-reduce-height.diff, bnc#623352, rodo
 [ MacOSXOnly ]
 SectionOwner => thorsten
 
-[ Features ]
-# embed generic media files inside odf docs, plus various related
-# sound fixes from rodo
-#impressmedia-features.diff, i#83753, n#515553, thorsten
-#slideshow-sound.diff, n#515553, rodo
-
-# Pre- and postprocessing capabilities for loading and saving.
-sfx2-pre-and-postprocess-during-save-load.diff, i#71939, flr
-
-
-
 [ Toolbars ]
 SectionOwner => jholesov
 # experimental now
commit 29b7ded10554687399190417d03d0923c241480e
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 16:06:00 2011 +0200

    Unify BuildBits

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b4e1854..df2631d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -534,6 +534,9 @@ writer-default-as-optimal-page-wrap.diff, i#38108, jody
 [ BuildBits ]
 build-identification.diff, tml
 
+# work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
+svx-customshapes-NOOPTFILES.diff, martink
+
 # add missing #include <stdio.h> in autodoc, breaks when building with STLport5
 #autodoc-add-missing-stdio-h.diff, rengelha
 
@@ -547,6 +550,9 @@ i18nutil-glibc-braindamage-workaround.diff, brosenk
 # use -Wl,--as-needed, save 1% of relocations
 link-as-needed.diff, i#89511, pmladek
 
+novell-win32-agfa-monotype-fonts.diff, tml
+
+
 [ DebianOnly ]
 open-url-support-iceanimals.diff
 seamonkey-is-iceape.diff
@@ -564,10 +570,6 @@ SectionOwner => arekm
 # fix for macro browser crash
 sfx2-badscript.diff, i#67976
 
-[ BuildBits ]
-# work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
-svx-customshapes-NOOPTFILES.diff, martink
-
 [ LiberationFontsOnWindows ]
 
 # Use Liberation fonts on Windows, too
@@ -1418,10 +1420,6 @@ SectionOwner => jholesov
 # fix mysqlc to use the SONAME instead of the .so symlink...
 mysqlcppconn-mysqlclient-SONAME.diff
 
-[ BuildBits ]
-novell-win32-agfa-monotype-fonts.diff, tml
-
-
 [ DebianSidOnly ]
 # link dynamically with liblpsolve55.so
 system-lpsolve-rpath.diff, rengelha
commit 95e440667266755b550a6eafbcdc44ff89830f89
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 16:03:54 2011 +0200

    Remove nonexistent Split section

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f0689c8..b4e1854 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -33,7 +33,7 @@ Piece : PieceBits
 Localize : LocalizeFixes
 
 # Novell
-NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, Split, CustomUserConfig
+NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, CustomUserConfig
 SUSE-9.1  : NovellBase, DisableGCJ
 SUSE-9.2  : NovellBase, DisableGCJ
 SUSE-9.3  : NovellBase, DisableGCJ
@@ -48,7 +48,7 @@ SUSE      : NovellBase, DisableGCJ, ImpressFontSize, PostgreSQL, SUSE112
 # Slackware
 Slackware : LinuxCommon, Mono, msaccess
 # Debian
-DebianBase : LinuxCommon, DebianBaseOnly, Split, PostgreSQL
+DebianBase : LinuxCommon, DebianBaseOnly, PostgreSQL
 Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
 DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
 # Ubuntu
@@ -65,7 +65,7 @@ PLDBase: LinuxCommon, PLDOnly
 PLD: PLDBase
 PLD64: PLDBase
 # Mandriva Linux
-MandrivaBase: MandrivaOnly, LinuxCommon, Split
+MandrivaBase: MandrivaOnly, LinuxCommon
 Mandriva: MandrivaBase
 Mandriva64: MandrivaBase
 # openmamba
commit 62a3a4677821b25b59485878d18aa245974b65ef
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 16:03:01 2011 +0200

    Remove nonexistent BerkeleyDB section

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6e96ea6..f0689c8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -38,17 +38,17 @@ SUSE-9.1  : NovellBase, DisableGCJ
 SUSE-9.2  : NovellBase, DisableGCJ
 SUSE-9.3  : NovellBase, DisableGCJ
 SUSE-10.0 : NovellBase, DisableGCJ
-SUSE-10.1 : NovellBase, DisableGCJ, BerkeleyDB43, Java14, BrokenSystemNSS, Cairo10, SUSE101
-SUSE-10.2 : NovellBase, DisableGCJ, BerkeleyDB43, Java14
-SUSE-10.3 : NovellBase, DisableGCJ, BerkeleyDB43, Java14, GCC41
-SUSE-11.0 : NovellBase, DisableGCJ, BerkeleyDB43, PostgreSQL
-SUSE-11.1 : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL
-SUSE-11.2 : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL, SUSE112
-SUSE      : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL, SUSE112
+SUSE-10.1 : NovellBase, DisableGCJ, Java14, BrokenSystemNSS, Cairo10, SUSE101
+SUSE-10.2 : NovellBase, DisableGCJ, Java14
+SUSE-10.3 : NovellBase, DisableGCJ, Java14, GCC41
+SUSE-11.0 : NovellBase, DisableGCJ, PostgreSQL
+SUSE-11.1 : NovellBase, DisableGCJ, ImpressFontSize, PostgreSQL
+SUSE-11.2 : NovellBase, DisableGCJ, ImpressFontSize, PostgreSQL, SUSE112
+SUSE      : NovellBase, DisableGCJ, ImpressFontSize, PostgreSQL, SUSE112
 # Slackware
 Slackware : LinuxCommon, Mono, msaccess
 # Debian
-DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL
+DebianBase : LinuxCommon, DebianBaseOnly, Split, PostgreSQL
 Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
 DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
 # Ubuntu
@@ -59,7 +59,7 @@ UbuntuL10n : UbuntuBased
 DroplineGNOME : LinuxCommon, Mono, msaccess
 DroplineGNOME64 : LinuxCommon, Mono, msaccess
 # Ark Linux
-Ark: LinuxCommon, ArkOnly, BerkeleyDB43
+Ark: LinuxCommon, ArkOnly
 # www.pld-linux.org
 PLDBase: LinuxCommon, PLDOnly
 PLD: PLDBase
@@ -71,12 +71,12 @@ Mandriva64: MandrivaBase
 # openmamba
 openmamba: LinuxCommon, GlobalDesktopFiles
 #Gentoo
-GentooBase : LinuxCommon, GentooOnly, BerkeleyDB43
+GentooBase : LinuxCommon, GentooOnly
 GentooUnstable: GentooBase, GentooExperimental
 Gentoo : GentooBase
 Gentoo64: GentooBase
 # rPath Linux
-rPathCommon: LinuxCommon, BerkeleyDB43
+rPathCommon: LinuxCommon
 rpl2: rPathCommon
 rpl2-64: rPathCommon
 # ArchLinux
commit b147ff1ca07401a10c5ec4e3ea5e4ba295feb102
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 16:01:34 2011 +0200

    Unify DebianBasOnly

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b6fcaf3..6e96ea6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -416,6 +416,23 @@ reportdesign-mention-package.diff, rengelha
 # build using -O2 on x86 and sparc according to Debian policy.
 debian-opt.diff
 
+sensible-ooomua.diff
+sensible-browser.diff
+
+# add JDK paths for MySQL, PostgreSQL, JTDS
+jdbc-driver-classpaths-debian.diff
+
+help-msg-add-package-info.diff
+
+soffice-opengl-and-locking-config.diff, mklose
+
+#configures-explicit-arch.diff
+
+icu-arm.diff, doko
+
+# link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it
+system-lpsolve-link-with-colamd.diff, rengelha
+
 [ LocalizeFixes and DebianBaseOnly ]
 # mention openoffice.org-report-builder instead of getting people
 # to download it from elsewhere
@@ -514,10 +531,6 @@ writer-default-as-optimal-page-wrap.diff, i#38108, jody
 # handling of the issue. See discussion in bnc#525331. --tml
 # session-management.diff, i#63156, rodo
 
-[ DebianBaseOnly ]
-sensible-ooomua.diff
-sensible-browser.diff
-
 [ BuildBits ]
 build-identification.diff, tml
 
@@ -561,10 +574,6 @@ svx-customshapes-NOOPTFILES.diff, martink
 liberation_packaging_fix.diff, kami
 #liberation_making_fix.diff, kami
 
-[ DebianBaseOnly ]
-# add JDK paths for MySQL, PostgreSQL, JTDS
-jdbc-driver-classpaths-debian.diff
-
 [ Win32Only ]
 
 # 2 more makefiles in sysui are seriously broken #35628
@@ -591,11 +600,6 @@ gentoo-sandbox.diff
 # specific JVM search path
 jvm-search-path.diff
 
-[ DebianBaseOnly ]
-SectionOwner => rengelha
-
-help-msg-add-package-info.diff
-
 [ DebianBaseNoHelpContent ]
 SectionOwner => rengelha
 
@@ -1220,9 +1224,6 @@ ooo86080.unopkg.bodge.diff
 
 oooXXXX.partial-revert-ooo95118.diff
 
-[ DebianBaseOnly ]
-soffice-opengl-and-locking-config.diff, mklose
-
 [ SUSE101 ]
 sled10-splash.diff, i#123456, pmladek
 
@@ -1289,13 +1290,6 @@ palette-enhanced-dash.diff
 palette-enhanced-gradient.diff
 palette-enhanced-hatch.diff
 
-[ DebianBaseOnly ]
-#configures-explicit-arch.diff
-
-icu-arm.diff, doko
-
-
-
 [ OxygenOfficeDefaultSettings ]
 # Always enable extended tips
 i27928-extended-tips-on.diff
@@ -1433,9 +1427,6 @@ novell-win32-agfa-monotype-fonts.diff, tml
 system-lpsolve-rpath.diff, rengelha
 
 
-[ DebianBaseOnly ]
-# link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it
-system-lpsolve-link-with-colamd.diff, rengelha
 
 [ OOXMLExportDevel ]
 # this s shared binary/ooxml filter
commit 4a711f5ec3802caeeee4efce733792b86d95146b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 15:56:25 2011 +0200

    remove Ubuntu distrels

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1284b6f..b6fcaf3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -53,13 +53,6 @@ Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
 DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
 # Ubuntu
 UbuntuBased : DebianBase
-UbuntuHardy : UbuntuBased
-UbuntuJaunty : UbuntuBased
-UbuntuKarmic : UbuntuBased
-UbuntuLucid : UbuntuBased
-UbuntuMaverick : UbuntuBased
-UbuntuNatty : UbuntuBased
-UbuntuOneiric : UbuntuBased
 Ubuntu : UbuntuBased
 UbuntuL10n : UbuntuBased
 # DroplineGNOME
commit 0ec00f82c213edbce30155dd04974c318639cf6e
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 15:55:29 2011 +0200

    make sections unique (unifying them), remove nonexistent section references

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b0f893f..1284b6f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -10,12 +10,9 @@ PATCHPATH=.:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql
 OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
 
 # -------- Functional sub-sets --------
-Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Features,
-	 VCL, Misc, Icons, CalcFixes, WriterFixes, EasterEgg, \
-	 GnomeVFS, VBABits, VBAObjects, GCJ, OOXML, OOXMLExport, \
-	 FedoraCommonFixes, WriterDocComparison, MySQL
+Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Features, Misc, CalcFixes, EasterEgg, GnomeVFS, VBAObjects, GCJ, OOXML, OOXMLExport, FedoraCommonFixes, WriterDocComparison, MySQL
 
-LinuxCommon : Common, LinuxOnly, CliMonoCommon, Mono, MonoComp, KDE4, Netbook
+LinuxCommon : Common, LinuxOnly, CliMonoCommon, Mono, MonoComp, Netbook
 MacOSXCommon : Common
 Win32Common : Common, Win32Only, CliMonoCommon, CliComponent
 # Experimental sections
@@ -69,7 +66,7 @@ UbuntuL10n : UbuntuBased
 DroplineGNOME : LinuxCommon, Mono, msaccess
 DroplineGNOME64 : LinuxCommon, Mono, msaccess
 # Ark Linux
-Ark: LinuxCommon, ArkOnly, BerkeleyDB43, KDE4
+Ark: LinuxCommon, ArkOnly, BerkeleyDB43
 # www.pld-linux.org
 PLDBase: LinuxCommon, PLDOnly
 PLD: PLDBase
@@ -110,7 +107,7 @@ Pardus2008: PardusOnly, LinuxCommon
 Solaris: NovellBase, UnstableExtensions
 # OxygenOffice Professional
 OxygenOfficeLinuxCommon :	Common,  LinuxOnly, \
-				msaccess, OpenGLTransitions, CliMonoCommon, Mono, MonoComp, KDE4,\
+				msaccess, OpenGLTransitions, CliMonoCommon, Mono, MonoComp, \
 				Netbook
 OxygenOfficeMacOSXCommon :	Common
 OxygenOfficeWin32Common :	Common, Win32Only, CliMonoCommon, CliComponent
@@ -168,7 +165,6 @@ writerfilter-qnametostr-NOOPTFILES.diff
 # don't let HelpLinker be miscompiled with g++ 4.3
 gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
 
-[ TemporaryHacks ]
 # included in dev300 for OOo-3.4
 # add the .archive flag to some instsetoo_native/util/makefile.mk rules
 buildfix-instsetoo_native-archive.diff, i#111617
@@ -206,13 +202,96 @@ desktop-application-octet-stream-mime-type.diff, i#73301, flr
 # FIXME: temporarily disabled as this causes a race condition in calc's cell format dialog.
 #vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
 
-[ Fixes ]
 # check real help path defined in registry instead of the $(instpath)/help
 sfx-check-real-help-path.diff, i#81139, pmladek
+svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
+goodies-eps-filter-unix.diff, n#200053, rodo
 
 # fix erroneous element exists exception while defining new toolbar/menu
 # buried in cws-vbasupportdev300
 #fix-uiconfiguration-insert.diff, i#105154, noelpwer
+#sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
+
+fix-ppt-linespacing-import-export.diff, n#355302, rodo
+
+fields-table-formula.diff, n#631912, cbosdo
+
+svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer
+
+sd-slideshow-slideshowview-transformation-fix.diff, rodo
+
+# temporary fix. does no harm and gets the job done but its not
+# beautiful. Since the whole section needs to be refactored anyway decided not
+# to waste for time with this fix but to focus on the refactoring
+sw-nested-positionned-tables-ww8-import-fix.diff, n#376688, flr
+
+# FIXME dev300-m83 xmloff_dis26300_conformance.diff, n#396280, flr
+
+# FIXME: 2009-09-11: I wonder when this has been commented out, and
+# why? If this really is not needed, let's remove totally then. --tml
+#sw-import-TOC.diff ,n#404254, Amelia Wang
+
+# fix wrong en-US accelerators in Impress
+fix-sd-accelerators.diff, n#463733, i#97088, jholesov
+
+fix-es-accelerators.diff, i#102645
+
+# Experimental support for Interix
+# FIXME dev300-m83 win32-interix.diff, tml
+
+# fix problem with calling private and protected members in layout code
+sfx2-privateprotectedpublic.diff
+# UI + core to make OLE editing optionally outplace
+# needs major review/rewrite, caused at least lp#709778, fdo#36443, bnc#689375 and Debian #617319
+#optional-outplace-ole.diff, i#98970, thorsten
+# let ctrl-<keycode> stuff pass dlg keyboard handling, to permit
+# global application-wide shortcuts also in open dialogs
+vcl-permit-global-shortcuts.diff, i#105676, thorsten
+
+# unresolved Base64 Java classes
+base64.diff, i#100620, hmth
+
+# Fix for crash on Windows by Rail Aliev. Root cause unknown.
+svx-fix-fit-to-frame-crash.diff, n#508621, rodo
+
+# FIXME dev300-m77 sd-print-fix-pageoffset.diff, n#537931, rodo # the code has moved to sd/source/ui/view/DocumentRenderer.cxx
+svx-ppt-import-fix-bullet-size.diff, n#515972, rodo
+# correctly import connector style attribute.
+# FIXME ooo3330-m4: doesn't apply in m3f svx-msdff-import-connector-style-fix.diff, n#631804, kohei
+
+filter-fix-build-FCFGMerge.cfg.diff, rodo
+store-crash-fix.diff, thorsten
+sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
+# fixes crasher in xml parser
+unoxml-fix-empty-xmlns.diff, rodo
+build-fix-xulrunner-npapi-inc.diff, janneke
+# FIXME ooo330-m2: does not apply: configure-fix-lpsolve-depends.diff, janneke
+
+# make dlopen-ed libs to use the global namespace for symbol
+# resolution
+dlopen-global-symbols.diff, thorsten
+
+# fix framework to no longer pull presenter screen for all apps
+# needs some more love, see comments in issue
+framework-extra-job-config.diff, i#107568, thorsten
+
+vcl-gtk-process-events-on-exit.diff, rodo
+sfx2-add-to-recently-used-after-save.diff, rodo
+
+# In some cases when exporting a PDF from a presentation, we are asked
+# to export an empty "link annotation", which gets turned into a
+# rather bogus file: link to the directory the presentadion document
+# is in.  Just don't bother handling such empty "link annotations".
+pdf-link-export-fix.diff, n#598816, n#639278, cbosdo
+
+svx-ppt-bullet-offset-fix.diff, n#593609, rodo
+
+svx-fix-layout-build.diff, rodo
+sfx2-style-edit-greyentry.diff, i#85003, simonaw
+
+# soffice process doesn't block ( under linux ) connect
+# to raised office instance instead ( should work for windows too )
+smoketest-officeconnection-fix.diff
 
 [ RadioButtons ]
 forms-radio-button-group-names.diff, n#310052, i#30823, jonp
@@ -236,6 +315,11 @@ cws-webdavandgvfslocking1-tools.diff
 cws-webdavandgvfslocking1-ucb.diff
 cws-webdavandgvfslocking1-unotools.diff
 
+# diffs kept for reference as there might soon be a need to resurrect
+# part of the code
+win32-quickstarter-exit.diff, i#73550, tml
+novell-win32-avoid-premature-shutdown.diff, n#269146, tml
+
 [ GnomeVFS ]
 # gnome-vfs locking implementation
 # it was not committed up-stream yet because up-stream uses so old gnome-vfs
@@ -260,6 +344,10 @@ gnome-vfs-locking-config_office.diff, i#91151, jholesov
 # any more? -- kendy
 calc-string-number.diff, kohei
 
+# Allow export of filtered range selection, and show error when fails.
+calc-pdf-export-allow-filtered-range-sc.diff,     n#585028, kohei
+calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei
+
 # Support PHONETIC function to display asian phonetic guide.
 # LATER: I'll take care of this later.  --kohei
 # calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
@@ -272,6 +360,14 @@ calc-string-number.diff, kohei
 #        it is most likely solved in the plain code another way
 # fpicker-kde-gcc4-visibility.diff, pmladek
 
+# 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-linux-common-template-dir.diff, pmladek
+
+system-python-ure-bootstrap.diff, deb#501028, i#90701
+pyuno-ooodir.diff, i#90701
+system-python-uno-path.diff, i#97629
+
 [ Misc ]
 # Address data source ordering x#62860
 addrbk-datasrc-ordering.diff, michael
@@ -419,11 +515,6 @@ win32-prebuilt-writingaids-zip-scp2.diff
 # Optimal Page Wrap should be default for graphics insertion (X#59831)
 writer-default-as-optimal-page-wrap.diff, i#38108, jody
 
-[ LinuxOnly ]
-# 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-linux-common-template-dir.diff, pmladek
-
 [ Features ]
 # ask user on logout/shutdown to save documents
 # It seems to be better not to use this. It interfers with upstream's
@@ -443,10 +534,6 @@ build-identification.diff, tml
 # Workaround for compile failure with glibc 2.4's langinfo.h
 i18nutil-glibc-braindamage-workaround.diff, brosenk
 
-[ DebianOnly ]
-open-url-support-iceanimals.diff
-
-[ BuildBits ]
 # allow separate helpcontent build
 # FIXME: is anybody using this feature?
 #FIXME src680: separate-helpcontent.diff, jholesov
@@ -455,6 +542,7 @@ open-url-support-iceanimals.diff
 link-as-needed.diff, i#89511, pmladek
 
 [ DebianOnly ]
+open-url-support-iceanimals.diff
 seamonkey-is-iceape.diff
 
 [ ArkOnly ]
@@ -474,11 +562,6 @@ sfx2-badscript.diff, i#67976
 # work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
 svx-customshapes-NOOPTFILES.diff, martink
 
-[ LinuxOnly ]
-system-python-ure-bootstrap.diff, deb#501028, i#90701
-pyuno-ooodir.diff, i#90701
-system-python-uno-path.diff, i#97629
-
 [ LiberationFontsOnWindows ]
 
 # Use Liberation fonts on Windows, too
@@ -1005,11 +1088,6 @@ vba-tweak-errorobj.diff
 # FATE # 309162
 vba-import-xlsm.diff
 
-[ Features ]
-# Pre- and postprocessing capabilities for loading and saving.
-sfx2-pre-and-postprocess-during-save-load.diff, i#71939, flr
-
-
 [ WebDAV ]
 SectionOwner => tml
 SectionIssue => bnc#651977
@@ -1075,11 +1153,13 @@ oox-xlsx-import-fix-connector-shape.diff, n#549331, Fong
 
 # FIXME dev300-m83 oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
 
-[ OOXML ]
 # FIXME: 2009-08-12: Does not apply, upstream code refactored, not
 # clear what to do. --tml
 # oox-import-zoom-setting-with-tab-color.diff, n#494603, janneke
 
+oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo
+oox-smartart-import.diff, thorsten
+
 [ PostgreSQL ]
 sdbc-postgresql.diff
 sdbc-postgresql-build-lst.diff
@@ -1165,11 +1245,6 @@ pardus-default-ExternalMailer.diff
 pardus-clipart.diff
 dont-check-fqdn.diff
 
-[ UnUsedButNotYetRemovedFromGit ]
-# diffs kept for reference as there might soon be a need to resurrect
-# part of the code
-win32-quickstarter-exit.diff, i#73550, tml
-novell-win32-avoid-premature-shutdown.diff, n#269146, tml
 
 # Provides a great speed-up for a mail merge operation : 7x faster
 sw-mailmerge-faster.diff, i#40827, mloiseleur
@@ -1227,9 +1302,6 @@ palette-enhanced-hatch.diff
 icu-arm.diff, doko
 
 
-[ Fixes ]
-svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
-goodies-eps-filter-unix.diff, n#200053, rodo
 
 [ OxygenOfficeDefaultSettings ]
 # Always enable extended tips
@@ -1284,24 +1356,6 @@ always_default_iconset.diff
 # restore them if still relevant when uninstalling OOo
 win32-restore-associations.diff, n#530872, tml
 
-[ Fixes ]
-#sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
-
-[ Fixes ]
-fix-ppt-linespacing-import-export.diff, n#355302, rodo
-
-fields-table-formula.diff, n#631912, cbosdo
-
-svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer
-
-sd-slideshow-slideshowview-transformation-fix.diff, rodo
-
-# temporary fix. does no harm and gets the job done but its not
-# beautiful. Since the whole section needs to be refactored anyway decided not
-# to waste for time with this fix but to focus on the refactoring
-sw-nested-positionned-tables-ww8-import-fix.diff, n#376688, flr
-
-# FIXME dev300-m83 xmloff_dis26300_conformance.diff, n#396280, flr
 
 [ WWInProgress ]
 sw_layout_in_table_cell_fix.diff, n#367341, flr
@@ -1330,16 +1384,6 @@ testing-more-optimizations-ark.diff
 # this to have it used on all platforms.) --tml
 # i92372.diff, i#92372, n#353143, tml
 
-[ Fixes ]
-# FIXME: 2009-09-11: I wonder when this has been commented out, and
-# why? If this really is not needed, let's remove totally then. --tml
-#sw-import-TOC.diff ,n#404254, Amelia Wang
-
-# fix wrong en-US accelerators in Impress
-fix-sd-accelerators.diff, n#463733, i#97088, jholesov
-
-fix-es-accelerators.diff, i#102645
-
 [ MinGW ]
 # build fix for odma - not up-stream
 mingw-buildfix-odma.diff, jholesov
@@ -1350,22 +1394,6 @@ mingw-cpp-increase-include-limit.diff, i#95193, jholesov
 # sleep using osl::Thread::wait()
 mingw-thread-wait-instead-of-sleep.diff, i#95200, jholesov
 
-[ Fixes ]
-
-# Experimental support for Interix
-# FIXME dev300-m83 win32-interix.diff, tml
-
-# fix problem with calling private and protected members in layout code
-sfx2-privateprotectedpublic.diff
-# UI + core to make OLE editing optionally outplace
-# needs major review/rewrite, caused at least lp#709778, fdo#36443, bnc#689375 and Debian #617319
-#optional-outplace-ole.diff, i#98970, thorsten
-# let ctrl-<keycode> stuff pass dlg keyboard handling, to permit
-# global application-wide shortcuts also in open dialogs
-vcl-permit-global-shortcuts.diff, i#105676, thorsten
-
-# unresolved Base64 Java classes
-base64.diff, i#100620, hmth
 
 [ OxygenOfficeDefaultSettings ]
 #Create langpack and full installers
@@ -1375,9 +1403,7 @@ base64.diff, i#100620, hmth
 # hack to ignore writerfilter when odf-converter is present
 odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
 
-[ Fixes ]
-# Fix for crash on Windows by Rail Aliev. Root cause unknown.
-svx-fix-fit-to-frame-crash.diff, n#508621, rodo
+oox-pptx-export-update-to-ooo320.diff, rodo
 
 [ Experimental ]
 experimental_ooapi.diff, flr
@@ -1408,40 +1434,16 @@ mysqlcppconn-mysqlclient-SONAME.diff
 [ BuildBits ]
 novell-win32-agfa-monotype-fonts.diff, tml
 
-[ Fixes ]
-# FIXME dev300-m77 sd-print-fix-pageoffset.diff, n#537931, rodo # the code has moved to sd/source/ui/view/DocumentRenderer.cxx
-svx-ppt-import-fix-bullet-size.diff, n#515972, rodo
-# correctly import connector style attribute.
-# FIXME ooo3330-m4: doesn't apply in m3f svx-msdff-import-connector-style-fix.diff, n#631804, kohei
-
-filter-fix-build-FCFGMerge.cfg.diff, rodo
-store-crash-fix.diff, thorsten
-sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
-# fixes crasher in xml parser
-unoxml-fix-empty-xmlns.diff, rodo
-build-fix-xulrunner-npapi-inc.diff, janneke
-# FIXME ooo330-m2: does not apply: configure-fix-lpsolve-depends.diff, janneke
 
 [ DebianSidOnly ]
 # link dynamically with liblpsolve55.so
 system-lpsolve-rpath.diff, rengelha
 
-[ Fixes ]
-# make dlopen-ed libs to use the global namespace for symbol
-# resolution
-dlopen-global-symbols.diff, thorsten
-
-# fix framework to no longer pull presenter screen for all apps
-# needs some more love, see comments in issue
-framework-extra-job-config.diff, i#107568, thorsten
 
 [ DebianBaseOnly ]
 # link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it
 system-lpsolve-link-with-colamd.diff, rengelha
 
-[ OOXMLExport ]
-oox-pptx-export-update-to-ooo320.diff, rodo
-
 [ OOXMLExportDevel ]
 # this s shared binary/ooxml filter
 # mostly merged into git by now, except for
@@ -1564,12 +1566,6 @@ crosswin32-unotools-mingw.diff
 # don't throw unnecessary exceptions in sfx2
 speed-sfx2-dont-throw-too-much.diff, i#107512, jholesov
 
-[ CalcFixes ]
-
-# Allow export of filtered range selection, and show error when fails.
-calc-pdf-export-allow-filtered-range-sc.diff,     n#585028, kohei
-calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei
-
 [ GentooExperimental ]
 SectionOwner => hmth
 # make Python2 optional
@@ -1599,16 +1595,10 @@ SectionOwner => thorsten
 #impressmedia-features.diff, i#83753, n#515553, thorsten
 #slideshow-sound.diff, n#515553, rodo
 
-[ Fixes ]
-vcl-gtk-process-events-on-exit.diff, rodo
-sfx2-add-to-recently-used-after-save.diff, rodo
+# Pre- and postprocessing capabilities for loading and saving.
+sfx2-pre-and-postprocess-during-save-load.diff, i#71939, flr
+
 
-[ Fixes ]
-# In some cases when exporting a PDF from a presentation, we are asked
-# to export an empty "link annotation", which gets turned into a
-# rather bogus file: link to the directory the presentadion document
-# is in.  Just don't bother handling such empty "link annotations".
-pdf-link-export-fix.diff, n#598816, n#639278, cbosdo
 
 [ Toolbars ]
 SectionOwner => jholesov
@@ -1617,10 +1607,6 @@ SectionOwner => jholesov
 # Not looking too well, but might be useful?
 toolbar-decorations-vcl-nwf.diff
 
-[ OOXML ]
-oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo
-oox-smartart-import.diff, thorsten
-
 [ NovellOnlyWin32 ]
 novell-win32-splash.diff, fridrich
 openlockedquerybox-alwaysontop.diff, n#656566, tml
@@ -1640,17 +1626,6 @@ build-sled10-autoconf.diff
 #       boost.m4 can't be procced by it
 build-sled10-ixion-with-internal-boost.diff
 
-[ Fixes ]
-svx-ppt-bullet-offset-fix.diff, n#593609, rodo
-
-[ Fixes ]
-svx-fix-layout-build.diff, rodo
-sfx2-style-edit-greyentry.diff, i#85003, simonaw
-
-[ Fixes ]
-# soffice process doesn't block ( under linux ) connect
-# to raised office instance instead ( should work for windows too )
-smoketest-officeconnection-fix.diff
 
 [ GSoC2010 ]
 # Patches from GSoC 2010 students.

More information about the Libreoffice-commits mailing list