[ooo-build-commit] .: patches/dev300 patches/vba
Noel Power
noelp at kemper.freedesktop.org
Wed Jun 30 09:51:03 PDT 2010
patches/dev300/apply | 68 ++++++++++++---------------
patches/vba/fix-name-range-separator.diff | 25 +++------
patches/vba/vba-enable-fieldrelatedbits.diff | 31 ++++--------
3 files changed, 50 insertions(+), 74 deletions(-)
New commits:
commit b2c9e7957c75ec9b2bc9675644bd334a6631bf01
Author: Noel Power <noel.power at novell.com>
Date: Wed Jun 30 17:47:54 2010 +0100
add remaining vba patches ( container_controls still disabled )
* patches/dev300/apply:
* patches/vba/fix-name-range-separator.diff:
* patches/vba/vba-enable-fieldrelatedbits.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index f835715..5ffef4c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1578,51 +1578,21 @@ mono-climaker-bridgetest.diff
[ VBAObjects ]
SectionOwner => noelpwer
-
-
cws-vbasupportdev300_m83.diff, noelpwer
-# FIXME dev300-m77 cws-vbasupportdev300.diff # disabled
-
-# FIXME dev300-m77 eventhelper-closecrash-fix.diff, n#438606, i#106270 #disabled
-# make sure no vba libraries are loaded ( if not filtering )
-# FIXME dev300-m77 vba-dont-load-for-odf.diff #disabled
-# FIXME dev300-m77 vba-fix-listboxhang-n560355.diff, n#560355 #disabled
-
-# FIXME dev300-m77 vba-fireevents-from-apichange.diff, n#561639, n#539220 #disabled
-# FIXME dev300-m77 vba-macro-properties.diff, n#566030 #disabled
-# for consistency use an exe option for controlling commented out
-# basic
-# FIXME dev300-m77 vba-word-executable-option.diff, Fong #disabled
-# regenerating ( and fixing up ) generated diff from
-# vbasupportdev300_HG, using the patch below to manually
-# add some changesets from the cws ( they will of course
-# dissappear when the cws diff is next generated )
-# FIXME dev300-m77 vba-fixup-vbasupportcws.diff #disabled
-# some field related code cannot be included in vbasupportdev300 as
-# it depends on field support stuff
-# FIXME dev300-m77 vba-enable-fieldrelatedbits.diff #disabled
+vba-enable-fieldrelatedbits.diff
# container controls
+# Note: the fixme's below should be already integrated into the
+# next generated diff for the cws ( e.g. container_controls )
# FIXME dev300-m77 vba-container-controls.diff #disabled
# fire change event when active tab is changed via api for multipage
# FIXME dev300-m77 vba-multipage-fireapichange.diff #disabled
-# support copy of worksheet to 'other' document
-#####vba-worksheet-copy-otherdoc-api-support.diff
-# fix problem with parallel build failing
-# FIXME dev300-m77 vba-fix-scripting-parallelbuild.diff #disabled
-# fix strange problem when strange (empty) TBC records can
-# cause document load to ... loop ( and potential crash )
-# FIXME dev300-m77 vba-ctb-fix-looponload.diff, n#589794, n#590359 #disabled
-# import vba project from xlsm document ( experimental )
-# FATE # 309162
-# FIXME dev300-m77 vba-import-xlsm.diff #disabled
# fix weird wizard truncation
# FIXME dev300-m77 fix-containercontrols-wizardresize.diff, n#591768 #disabled
+
+
# fix strange ranges seperator regression problem
-# FIXME dev300-m77 fix-name-range-separator.diff, n#597351 #disabled
-# fix resolving of Err function/object in vba/non-vba mode
-# FIXME dev300-m77 vba-fixerror-nonvba.diff, n#597884 #disabled
-# tweak errObj behaviour
-# FIXME dev300-m77 vba-tweak-errorobj.diff
+fix-name-range-separator.diff, n#597351
+
[ VBAUntested ]
SectionOwner => noelpwer
# KEEP - unfinished autotext stuff
@@ -1994,6 +1964,30 @@ fix-vba-late-docevent-crash.diff, n#558907
vba-import-and-use-localrangenames.diff
+eventhelper-closecrash-fix.diff, n#438606, i#106270
+# make sure no vba libraries are loaded ( if not filtering )
+vba-dont-load-for-odf.diff
+vba-fix-listboxhang-n560355.diff, n#560355
+vba-fireevents-from-apichange.diff, n#561639, n#539220
+vba-macro-properties.diff, n#566030
+vba-word-executable-option.diff, Fong #disabled
+vba-fixup-vbasupportcws.diff #disabled
+# support copy of worksheet to 'other' document
+vba-worksheet-copy-otherdoc-api-support.diff
+# fix problem with parallel build failing
+vba-fix-scripting-parallelbuild.diff
+# fix strange problem when strange (empty) TBC records can
+# cause document load to ... loop ( and potential crash )
+vba-ctb-fix-looponload.diff, n#589794, n#590359
+
+# fix resolving of Err function/object in vba/non-vba mode
+vba-fixerror-nonvba.diff, n#597884
+# tweak errObj behaviour
+vba-tweak-errorobj.diff
+# import vba project from xlsm document ( experimental )
+# 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, florian
diff --git a/patches/vba/fix-name-range-separator.diff b/patches/vba/fix-name-range-separator.diff
index 66dbdf0..9588923 100644
--- a/patches/vba/fix-name-range-separator.diff
+++ b/patches/vba/fix-name-range-separator.diff
@@ -1,17 +1,11 @@
-From d2b5f0c54925bb81f5a821a9570267d468567e50 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:00:26 +0200
-Subject: [PATCH 408/878] fix-name-range-separator.diff
-
----
sc/source/ui/vba/vbarange.cxx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
-diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
-index d7f1799..c30bcc1 100644
---- a/sc/source/ui/vba/vbarange.cxx
-+++ b/sc/source/ui/vba/vbarange.cxx
-@@ -1066,7 +1066,7 @@ public:
+diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
+index d9cc4ea..2e6eae1 100644
+--- sc/source/ui/vba/vbarange.cxx
++++ sc/source/ui/vba/vbarange.cxx
+@@ -1044,7 +1044,7 @@ public:
};
bool
@@ -20,7 +14,7 @@ index d7f1799..c30bcc1 100644
{
ScDocument* pDoc = NULL;
-@@ -1076,7 +1076,7 @@ getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDoc
+@@ -1054,7 +1054,7 @@ getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDoc
String aString(sAddress);
USHORT nMask = SCA_VALID;
//USHORT nParse = rCellRanges.Parse( sAddress, pDoc, nMask, formula::FormulaGrammar::CONV_XL_A1 );
@@ -29,7 +23,7 @@ index d7f1799..c30bcc1 100644
if ( rResFlags & SCA_VALID )
{
return true;
-@@ -1129,6 +1129,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
+@@ -1107,6 +1107,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
}
}
}
@@ -37,7 +31,7 @@ index d7f1799..c30bcc1 100644
if ( xNameAccess->hasByName( sAddress ) )
{
uno::Reference< sheet::XNamedRange > xNamed( xNameAccess->getByName( sAddress ), uno::UNO_QUERY_THROW );
-@@ -1136,10 +1137,11 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
+@@ -1114,10 +1115,11 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
// As the address comes from OOO, the addressing
// style is may not be XL_A1
eConv = pDocSh->GetDocument()->GetAddressConvention();
@@ -50,6 +44,3 @@ index d7f1799..c30bcc1 100644
return false;
bool bTabFromReferrer = !( nFlags & SCA_TAB_3D );
---
-1.7.0.1
-
diff --git a/patches/vba/vba-enable-fieldrelatedbits.diff b/patches/vba/vba-enable-fieldrelatedbits.diff
index ef42b98..e328226 100644
--- a/patches/vba/vba-enable-fieldrelatedbits.diff
+++ b/patches/vba/vba-enable-fieldrelatedbits.diff
@@ -1,36 +1,27 @@
-From affc4e55c160a014c9427884d876f33ab15038ed Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:00:10 +0200
-Subject: [PATCH 398/878] vba-enable-fieldrelatedbits.diff
-
----
sw/source/ui/vba/makefile.mk | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
-diff --git a/sw/source/ui/vba/makefile.mk b/sw/source/ui/vba/makefile.mk
-index 282091b..1323422 100644
---- a/sw/source/ui/vba/makefile.mk
-+++ b/sw/source/ui/vba/makefile.mk
-@@ -46,7 +46,7 @@ dummy:
+diff --git sw/source/ui/vba/makefile.mk sw/source/ui/vba/makefile.mk
+index 50335f3..052287d 100644
+--- sw/source/ui/vba/makefile.mk
++++ sw/source/ui/vba/makefile.mk
+@@ -42,7 +42,7 @@ dummy:
.ENDIF
-
+
INCPRE=$(INCCOM)$/$(TARGET)
-CDEFS+=-DVBA_OOBUILD_HACK
+CDEFS+=-DVBA_OOBUILD_HACK -DFIELDPATCH
# ------------------------------------------------------------------
SLOFILES= \
-@@ -119,7 +119,10 @@ SLOFILES= \
- $(SLO)$/vbarevisions.obj \
- $(SLO)$/vbaframe.obj \
- $(SLO)$/vbaframes.obj \
+@@ -115,7 +115,10 @@ SLOFILES= \
+ $(SLO)$/vbarevisions.obj \
+ $(SLO)$/vbaframe.obj \
+ $(SLO)$/vbaframes.obj \
+ $(SLO)$/vbaformfield.obj \
+ $(SLO)$/vbaformfields.obj \
- $(SLO)$/vbaeventshelper.obj \
+ $(SLO)$/vbaeventshelper.obj \
+ $(SLO)$/vbacheckbox.obj \
# --- Targets ------------------------------------------------------
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list