ooo-build r11370 - in trunk: . patches/src680
- From: rengelhard svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11370 - in trunk: . patches/src680
- Date: Wed, 23 Jan 2008 08:29:34 +0000 (GMT)
Author: rengelhard
Date: Wed Jan 23 08:29:34 2008
New Revision: 11370
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11370&view=rev
Log:
2008-01-23 Rene Engelhard <rene debian org>
* patches/src680/apply,
patches/src680/wizards-source-importwizard-filesmodul-xba.diff,
patches/src680/wizards-source-importwizard-filesmodul-xba-m3.diff,
patches/src680/reportdesigner-no-license.diff,
patches/src680/reportdesigner-no-license-m3.diff: first ooh680-m4
stuff, many patches still to go
Added:
trunk/patches/src680/reportdesigner-no-license-m3.diff
- copied unchanged from r11369, /trunk/patches/src680/reportdesigner-no-license.diff
trunk/patches/src680/wizards-source-importwizard-filesmodul-xba-m3.diff
- copied unchanged from r11369, /trunk/patches/src680/wizards-source-importwizard-filesmodul-xba.diff
Modified:
trunk/ChangeLog
trunk/patches/src680/apply
trunk/patches/src680/reportdesigner-no-license.diff
trunk/patches/src680/wizards-source-importwizard-filesmodul-xba.diff
Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply (original)
+++ trunk/patches/src680/apply Wed Jan 23 08:29:34 2008
@@ -208,10 +208,10 @@
# libspl680*so does not have to be loaded when we present no startup wizard
startup-wizard-speedup.diff, i#84169, jholesov
+[ TemporaryHacks < ooh680-m4 ]
# move gl_ES to localedata_es to save dependency & memory
i18npool-less-dependencies.diff, i#84206, jholesov
-[ TemporaryHacks < ooh680-m4 ]
# dont initialize forms on the Writer startup, rather do it when the first form
# control is created
svx-delay-load-forms.diff, i#84259, jholesov
@@ -329,7 +329,7 @@
# JDKs too
buildfix-qadevOOo-java-encoding.diff, brosenk
-[ GCJ >= ooh680-m2 ]
+[ GCJ >= ooh680-m2 < ooh680-m4 ]
buildfix-libformula-gcj-source.diff, i#85249
# Fixes that were not accepted up-stream, but are still useful
@@ -362,7 +362,11 @@
# no bogus license question when registering this extension
reportdesigner-no-license-m1.diff
-[ FixesNotForUpstream >= ooh680-m2 ]
+[ FixesNotForUpstream >= ooh680-m2 < ooh680-m4 ]
+# no bogus license question when registering this extension
+reportdesigner-no-license-m3.diff
+
+[ FixesNotForUpstream >= ooh680-m4 ]
# no bogus license question when registering this extension
reportdesigner-no-license.diff
@@ -373,9 +377,11 @@
# let sd accept uri-list drop, n#183719
sd-accept-uri-list-drop.diff, n#183719, rodo
+[ Fixes < ooh680-m4 ]
# default formatting PPT export bug n#285959
sd-default-format-n285959.diff, i#81395, n#285959, hub
+[ Fixes ]
# add some shortcuts to Impress + needed fixes. bug n#352330
sd-text-shortcut-n352330.diff, i#85247, n#352330, hub
svx-text-move-fix-i59061.diff, i#59061, hub
@@ -393,9 +399,15 @@
# disable font management dialog in padmin
padmin-nofontconfig.diff, michael
+[ Fixes < ooh680-m4 ]
+# Fix for n#113235
+wizards-source-importwizard-filesmodul-xba-m3.diff, i#56633, noelpwer
+
+[ Fixes >= ooh680-m4 ]
# Fix for n#113235
wizards-source-importwizard-filesmodul-xba.diff, i#56633, noelpwer
+[ Fixes ]
# testtool doesn't like oobuild basic compatability defaults
# ooo-build only fix n#145906#
automation-testtool-oobuildfix.diff, n#145906, noelpwer
@@ -437,7 +449,7 @@
solenv-dmake-create_patch.diff, i#68917, fridrich
# fix visibility for controls
-svx-sdr-contact-visibility.diff, i#83611. noelpwer
+#FIXME#svx-sdr-contact-visibility.diff, i#83611. noelpwer
# look for libmawt.so on x86_64 too
sun-java-amd64-jreextralibdir.diff
@@ -458,6 +470,7 @@
#document ( containing macros ) crashing
save-doc-withembedded-doc-with-vba-crash.diff, n#339946, i#83632, noelpwer
+[ Fixes < ooh680-m4 ]
#fix conversion of date/time strings in Dutch Word documents
sw-special-locales-date-string.diff, i#84469, n#344306, fridrich
@@ -529,7 +542,7 @@
# WebDAV locking
# It is in this section because it needs part of the gvfs-related patches
-webdav-locking.diff, n#346711, i#29152, jholesov
+#FIXME#webdav-locking.diff, n#346711, i#29152, jholesov
[ QuickStarter < ooh680-m2 ]
@@ -628,9 +641,11 @@
# Add R1C1 address support [ i#49499 for address ]
sc-r1c1.diff, i#20857, jody
+[ CalcFixes < ooh680-m4 ]
# Add named range support for INDIRECT and INDIRECT_XL
sc-indirect-named-range.diff, i#4695, n#274387, kohei
+[ CalcFixes ]
# Change default numbering scheme of x-y plot chart from Row 1, Row2, ... to
# 1, 2, 3... when the X labels are not explicitly given. This is what Excel
# does.
@@ -650,17 +665,19 @@
# Ensure that Print Preview is consistent with Print output.
sc-print-selected-sheets.diff, n#335684, i#45497, jonp
+[ CalcFixes < ooh680-m4 ]
# allow Excel A1 style format (e.g. #Sheet2!A2) in hyperlink destination.
sc-hyperlink-excel-a1-style.diff, i#80448, kohei
# rename sheet name in URL on import when invalid characters are used (such as
# '&').
-sc-hyperlink-rename-sheet-name.diff, n#246629, kohei
+sc-hyperlink-rename-sheet-name.diff, n#246629, i#81154, kohei
# Speed up recalculation of SEARCH function when thousands of cells use it.
speed-text-search-performance-unotools.diff, i#80981, kohei
speed-text-search-performance-i18npool.diff, i#80981, kohei
+[ CalcFixes ]
# Allow biffdump.cxx to compile on 64-bit platforms
sc-biffdump.diff, i#82184, jonp
@@ -685,10 +702,10 @@
# Fix crashes on erf(0.65). This is fixed in dr58 CWS upstream.
scaddins-erf-crash-fix-065.diff, i#84395, kohei
-[ CalcFixes ]
# Import sheet names properly from Lotus 1-2-3 document.
sc-lotus123-import-sheetname.diff, i#84496, kohei
+[ CalcFixes ]
# Enhance FREQUENCY function to make it behave like Excel (ODFF).
sc-openformula-frequency.diff, i#8946, kohei
@@ -788,11 +805,12 @@
# disabled for Debian as Debian policy (for now) is to use=both
speed-hash-style.diff, pmladek
+[ DebianBaseOnly < ooh680-m4 ]
+sdk-remove-non-free.diff
[ DebianBaseOnly ]
SectionOwner => rengelha
-sdk-remove-non-free.diff
sensible-ooomua.diff
sensible-browser.diff
no-fontooo-wizard.diff
@@ -1301,8 +1319,12 @@
vba-keep-codenames-in-sync.diff
#associating sheet and codename when insert a sheet
# sc-insert-sheet-codename.diff, i#80869, jianhua
+
+[ VBAObjects < ooh680-m4 ]
vba-brackets-params-fix.diff, i#79918, n#292861
vba-negnumber-inparam-withoutbrackets.diff, n#294302
+
+[ VBAObjects ]
# hack for when resolving a symbol in the module ThisWorkbook
vba-symbol-searchhack-for-thisworkbook.diff
vba-allow-ranges-for-cell-functions.diff
@@ -1332,9 +1354,9 @@
sc-source-ui-vba-makefile-mk.diff
# export of macro bindings for shapes
-sc-export-shape-macro-bindings.diff, n#304739, noelpwer
+#FIXME#sc-export-shape-macro-bindings.diff, n#304739, noelpwer
# export of hlink bindings for shapes
-sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
+#FIXME#sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
# Application.Caller
api-application-caller.diff, n#339941, noelpwer
@@ -1459,7 +1481,7 @@
[ OOXML ]
-cws-xmlfilter02-sc.diff
+#FIXME#cws-xmlfilter02-sc.diff
cws-xmlfilter02-config_office.diff
cws-xmlfilter02-filter.diff
cws-xmlfilter02-goodies.diff
@@ -1749,7 +1771,7 @@
[ WMF ]
-wmf-pattern-brush.diff, n#232232, rodo
+#FIXME#wmf-pattern-brush.diff, n#232232, rodo
[ Layout < ooh680-m2]
Modified: trunk/patches/src680/reportdesigner-no-license.diff
==============================================================================
--- trunk/patches/src680/reportdesigner-no-license.diff (original)
+++ trunk/patches/src680/reportdesigner-no-license.diff Wed Jan 23 08:29:34 2008
@@ -17,7 +17,7 @@
-LICLINES:=$(foreach,i,$(TXTFILES) <license-text xlink:href="registration/$(i:f)" lang="$(subst,.txt, $(subst,license_, $(i:f)))" license-id="$(subst,.txt, $(subst,license_, $(i:f)))" />)
-.ENDIF # "$(GUI)"!="WNT"
-
- REPRORTJARFILES := \
+ REPORTJARFILES := \
$(ZIP1DIR)$/flute-1.3-jfree-20061107.jar \
$(ZIP1DIR)$/jcommon-1.0.10.jar \
@@ -251,7 +243,7 @@
Modified: trunk/patches/src680/wizards-source-importwizard-filesmodul-xba.diff
==============================================================================
--- trunk/patches/src680/wizards-source-importwizard-filesmodul-xba.diff (original)
+++ trunk/patches/src680/wizards-source-importwizard-filesmodul-xba.diff Wed Jan 23 08:29:34 2008
@@ -6,6 +6,6 @@
Dim bAssignFileName as Boolean
+Dim oDocInfo as Object
+Dim bInterruptSearch as Boolean
- oDocInfo = CreateUnoService("com.sun.star.document.DocumentProperties")
+ oDocInfo = CreateUnoService("com.sun.star.document.StandaloneDocumentInfo")
bInterruptSearch = False
For i = 0 To MaxCollectIndex
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
