[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Nov 18 09:34:23 PST 2010
patches/dev300/apply | 80 ++++++++++++++++-----------------------------------
1 file changed, 26 insertions(+), 54 deletions(-)
New commits:
commit 1066f33c726544693be51236b52c226b12cc26d8
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Thu Nov 18 19:32:39 2010 +0200
fix a merge conflict separately
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 57994f1..a1d4727 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -30,7 +30,7 @@ Win32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent, NotDebia
Experimental: VBAUntested, ArkOnlyExperimental, \
UnUsedButNotYetRemovedFromGit, WebDAVUpstream, \
PostgreSQL, SELinux, \
- UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, \
+ UnitBootstrap, RadioButtons, WWInProgress, \
KDE4Experimental, MinGW, CalcExperimental, \
OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
WriterNavigation \
commit 9e68881cdfd6fd6d0eb5a22c596a5fdb2eb6c04c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Nov 18 19:30:25 2010 +0200
Revert presumably accidental commit of changes to the apply file
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 105a76a..57994f1 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -30,7 +30,7 @@ Win32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent, NotDebia
Experimental: VBAUntested, ArkOnlyExperimental, \
UnUsedButNotYetRemovedFromGit, WebDAVUpstream, \
PostgreSQL, SELinux, \
- UnitBootstrap, RadioButtons, WWInProgress, \
+ UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, \
KDE4Experimental, MinGW, CalcExperimental, \
OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
WriterNavigation \
@@ -46,6 +46,7 @@ NLPSolver : NLPSolverBits
Piece : PieceBits
#Localize
Localize : LocalizeFixes
+UnstableWP : UnstableLibwpd
# Novell
NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
@@ -146,7 +147,6 @@ OOo4Kids: OOo4KidsPatches
Raw: RawCommon RawPatches
# LibreOffice
LibreOfficeWin32: LibreOfficeCommon LibreOfficePatches LibreOfficeWin32Patches
-LibreOfficeWin64: LibreOfficeCommon LibreOfficePatches LibreOfficeWin32Patches
LibreOfficeLinux: LibreOfficeCommon LibreOfficePatches LibreOfficeLinuxPatches
LibreOfficeLinuxDevel: LibreOfficeCommon LibreOfficePatches LibreOfficeLinuxPatches
LibreOfficeMacOSX: LibreOfficeCommon LibreOfficePatches LibreOfficeMacOSXPatches
@@ -840,6 +840,11 @@ system-python-uno-path.diff, i#97629
liberation_packaging_fix.diff, kami
#liberation_making_fix.diff, kami
+[ VCL ]
+# prioritize hebrew culmus fonts, Debian bugs #280084, #296152, #300642
+hebrew-culmus.diff, noelpwer
+
+
[ AddressBooks ]
# build either the driver for Evolution 1.x or 2.x
# they produce the same binary and configuration, so they can't be built at once
@@ -956,8 +961,7 @@ SectionOwner => noelpwer
# is disabled in vbasupportdev300 upstream )
cws-vbasupportdev300_m83-fix.diff, cbosdo
vba-enable-fieldrelatedbits.diff
-# This one is in the repo, it seems
-#vba-container-controls.diff
+vba-container-controls.diff
# need to adapt ooo-build wrt the changes intorduced into container_controls
oox-projectname-oobuild-specifix.diff
# fix problem with inserting imported modules with oox
@@ -1887,6 +1891,10 @@ sd-slideshow-slideshowview-transformation-fix.diff, rodo
# version compat distinction?
sd-custom-show-fix.diff, n#355638, i#90145, thorsten
+# 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
+
# 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
@@ -1967,35 +1975,9 @@ base64.diff, i#100620, hmth
ooop-langpack-policy.diff
[ OOXMLExport ]
-pptx-filter-as-a-separate-lib.diff
-
-[ OOXMLExport and not OpenGLTransitions ]
-pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
-
-[ OOXMLExport and OpenGLTransitions ]
-pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
-
-# Snapshot of the pptx export filter at the time of creation of ooxml03
-# This is until 0475--fix-crash-introduced-by-Jonathan-s-changes-in-eppt.patch
-# (including)
-[ OOXMLExport ]
-pptx-snapshot-at-ooxml03-creation.diff
-
-# ...and the rest from the git tree
-# (until 'more qnimations export work', including)
-
-pptx-the-rest-from-git.diff
-pptx-export-empty-animations-node-and-groupshape-fix.diff, rodo
-
-# handles case where a connector shape is not connected
-pptx-fix-connector-crash.diff, n#499129, thorsten
-
-[ OOXMLExport ]
# hack to ignore writerfilter when odf-converter is present
odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
-oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
-
[ Fixes ]
external-apm-header.diff, freuter
wmf-mm-text.diff, n#417818, rodo
@@ -2030,22 +2012,6 @@ svx-fix-fit-to-frame-crash.diff, n#508621, rodo
# expand path placeholders early in template dialog
normalize-template-paths-fix.diff, n#512146, thorsten
-[ OOXMLExport ]
-oox-pptx-export-vertical-text.diff, n#498737, rodo
-oox-pptx-export-para-linespacing.diff, n#498737, rodo
-oox-pptx-export-fix-action-button-presets.diff, n#497570, rodo
-oox-drawingml-fix-shapes-map-crash.diff, rodo
-
-[ OOXMLExportDevel ]
-# equivalent of ooxml-drawing-fix-shapes-map-crash-xlsx-part for shared filter
-xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff, rodo
-
-[ OOXMLExport ]
-oox-pptx-export-animations-filter.diff, n#497570, rodo
-oox-pptx-export-animations-paragraph-target.diff, n#497570, rodo
-oox-pptx-export-blip-luminance.diff, n#497570, rodo
-
-
[ Experimental ]
experimental_ooapi.diff, flr
@@ -2053,6 +2019,15 @@ experimental_ooapi.diff, flr
# It's empty but please don't remove this section.
SectionOwner => kohei
+[ NovellOnlyWin32 ]
+# when reading csv file, don't read multiple physical lines for one logical
+# line even if matching quotes are on separate lines.
+
+# This is a risky patch but we put it in NovellOnlyWin32 so that we
+# don't need to produce a PTF with just this for the one customer that
+# wants it.
+stream-read-csv-always-single-line.diff, n#523517, kohei
+
[ AutoLayout ]
impress-autolayout.diff, cocofan
@@ -2135,7 +2110,6 @@ solenv-unpack-oxt.diff, pmladek
system-lpsolve-link-with-colamd.diff, rengelha
[ OOXMLExport ]
-oox-pptx-export-update-to-ooo320.diff, rodo
iso-ooxml-sw.diff, cbosdo
[ OOXMLExportDevel ]
@@ -2143,10 +2117,12 @@ iso-ooxml-sw.diff, cbosdo
# mostly merged into git by now, except for
# xlsx-export-row-limit-fix.diff, n#504623, kohei
-# this used to be xlsx-shared-oox-chart-export-part1.diff, Fong
-# it is now merged into git, except for the hunk patching pptx
-# which follows:
-xlsx-shared-oox-chart-export-part1-pptx-part.diff
+[ UnstableLibwpd ]
+config_office-testing.diff
+libwpd-testing.diff
+libwpg-testing.diff
+libwps-testing.diff
+writerperfect-testing.diff
[ PieceBits ]
SectionOwner => michael
@@ -2359,10 +2335,6 @@ sled10-splash.diff, i#123456, pmladek
[ Fixes ]
svx-ppt-bullet-offset-fix.diff, n#593609, rodo
-[ OOXMLExport ]
-sd-pptx-export-build-fix.diff, rodo
-sd-pptx-export-build-fix-2.diff, rodo
-
[ Fixes ]
svx-fix-layout-build.diff, rodo
sfx2-style-edit-greyentry.diff, i#85003, simonaw
More information about the Libreoffice-commits
mailing list