ooo-build r13223 - in trunk: . patches/dev300 patches/mono patches/vba
- From: rengelhard svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13223 - in trunk: . patches/dev300 patches/mono patches/vba
- Date: Tue, 15 Jul 2008 15:09:58 +0000 (UTC)
Author: rengelhard
Date: Tue Jul 15 15:09:58 2008
New Revision: 13223
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13223&view=rev
Log:
2008-07-15 Rene Engelhard <rene debian org>
* patches/mono/mono-testtools.diff,
patches/mono/mono-testtools-m21.diff,
patches/vba/basic-caller-support.diff,
patches/vba/basic-caller-support-m22.diff,
patches/dev300/apply: more dev300-m22/23/24 work
Added:
trunk/patches/mono/mono-testtools-m21.diff (props changed)
- copied unchanged from r13219, /trunk/patches/mono/mono-testtools.diff
trunk/patches/vba/basic-caller-support-m22.diff
- copied unchanged from r13222, /trunk/patches/vba/basic-caller-support.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/mono/mono-testtools.diff
trunk/patches/vba/basic-caller-support.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Tue Jul 15 15:09:58 2008
@@ -1434,7 +1434,11 @@
cli_ure-source-bootstrap-assembly-cs.diff
cli_ure-source-bootstrap-managed_bootstrap-cs.diff
cli_ure-source-bootstrap-native_glue-cxx.diff
+
+[ Mono >= dev300-m22 < beb300-m0 ]
mono-testtools.diff
+[ Mono < dev300-m22 ]
+mono-testtools-m21.diff
# The build
[ Mono >= dev300-m22 < beb300-m0 ]
@@ -1587,9 +1591,15 @@
#merged into vba-workbook-worksheet-events-dev300.diff
#vba-workbook-worksheet-events-buildfix.diff,
vba-workbook-worksheet-events-dev300.diff
+[ VBAObjects >= dev300-m23 < beb300-m0 ]
# add support for passing a caller to basic when calling a script
# via the scripting framework - note depends on vbaevents-services-sources.diff
basic-caller-support.diff
+[ VBAObjects < dev300-m23 ]
+# add support for passing a caller to basic when calling a script
+# via the scripting framework - note depends on vbaevents-services-sources.diff
+basic-caller-support-m22.diff
+[ VBAObjects ]
# comparison of tow empty type fix in vba mode
vba-empty-comparison-fix.diff, n#397438, Fong
# support Range.MergeArea, Range.ShowDetail
@@ -2233,9 +2243,11 @@
[ DebianBaseOnly >= dev300-m22 ]
#debian-system-lucene.diff
+[ Fixes < dev300-m22 ]
+cairocanvas-image-borders.diff, n#340142, rodo
+
[ Fixes ]
svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
-cairocanvas-image-borders.diff, n#340142, rodo
goodies-eps-filter-unix.diff, n#200053, rodo
xmloff-import-crash-fix-for-i90562.diff, i#90562, flr
@@ -2381,8 +2393,11 @@
sw-allow-negative-spacing.diff, n#364534, freuter
sd-slideshow-slideshowview-transformation-fix.diff, rodo
+
+[ Fixes < dev300-m22 ]
cairocanvas-fix-image-cache.diff, rodo
+[ Fixes ]
sd-view-zoom-fix.diff, n#380013, i#88939, thorsten
sd-inplace-deselection-fix.diff, i#89283, n#384506, thorsten
svx-hatched-textmove.diff, n#384563, i#89661, thorsten
Modified: trunk/patches/mono/mono-testtools.diff
==============================================================================
--- trunk/patches/mono/mono-testtools.diff (original)
+++ trunk/patches/mono/mono-testtools.diff Tue Jul 15 15:09:58 2008
@@ -1,21 +1,12 @@
--- testtools/source/bridgetest/cli/makefile.mk 16 Dec 2004 12:49:01 -0000 1.11
+++ testtools/source/bridgetest/cli/makefile.mk 25 May 2005 08:52:22 -0000
-@@ -74,10 +74,9 @@
- .INCLUDE : settings.mk
- DLLPRE =
-
--.IF "$(COM)" == "MSC"
-
+@@ -50,28 +50,25 @@
+ CFLAGSENABLESYMBOLS:=-Z7
# ------------------------------------------------------------------
--.IF "$(GUI)"=="WNT"
-+.IF "$(GUI)"=="WINNT"
- MY_DLLPOSTFIX=.dll
- DESTDIR=$(BIN)
- BATCH_SUFFIX=.bat
-@@ -106,26 +105,26 @@
- INCPRE+=$(OUT)$/inc
- #-----------------------
+-#These tests are for Windows only
+-.IF "$(COM)" == "MSC" && "$(GUI)" == "WNT"
+-
-.IF "$(CCNUMVER)" >= "001399999999"
-CFLAGSCXX += -clr:oldSyntax -AI $(OUT)$/bin -AI $(SOLARBINDIR)
-SHL1STDLIBS = \
@@ -27,7 +18,6 @@
- mscoree.lib
-.ENDIF
-SLOFILES= \
-- $(SLO)$/cli_cpp_bridgetest.obj
+#.IF "$(CCNUMVER)" >= "001399999999"
+#CFLAGSCXX += -clr:oldSyntax -AI $(OUT)$/bin -AI $(SOLARBINDIR)
+#SHL1STDLIBS = \
@@ -39,7 +29,7 @@
+# mscoree.lib
+#.ENDIF
+#SLOFILES= \
-+# $(SLO)$/cli_cpp_bridgetest.obj
+ $(SLO)$/cli_cpp_bridgetest.obj
-SHL1OBJS = $(SLOFILES)
+#SHL1OBJS = $(SLOFILES)
@@ -47,55 +37,51 @@
-SHL1TARGET = $(TARGET)
+#SHL1TARGET = $(TARGET)
-
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-DEF1NAME = $(SHL1TARGET)
+#SHL1DEF = $(MISC)$/$(SHL1TARGET).def
+#DEF1NAME = $(SHL1TARGET)
+ .ENDIF
- # --- Targets ------------------------------------------------------
-@@ -136,7 +135,7 @@
- CLI_CPPUHELPER = $(SOLARBINDIR)$/cli_cppuhelper.dll
+@@ -92,7 +89,7 @@
+ CLI_OOOTYPES = $(SOLARBINDIR)$/cli_oootypes.dll
CLI_TYPES_BRIDGETEST = $(BIN)$/cli_types_bridgetest.dll
--CSCFLAGS = -warnaserror+
+-CSCFLAGS = -warnaserror+
+CSCFLAGS =
.IF "$(CCNUMVER)" <= "001399999999"
VBC_FLAGS = -warnaserror+
.ELSE
-@@ -158,7 +157,7 @@
+@@ -149,8 +146,7 @@
-reference:$(CLI_TYPES_BRIDGETEST) \
- -reference:$(CLI_URE) \
- -reference:$(CLI_BASETYPES) \
-- -reference:$(CLI_TYPES) \
-+ -reference:$(CLI_TYPES) \
- cli_cs_testobj.cs cli_cs_multi.cs
-
- $(DESTDIR)$/cli_cs_bridgetest.uno.dll : \
-@@ -214,9 +213,6 @@
+ -reference:System.dll \
+ -reference:System.Drawing.dll \
+- -reference:System.Windows.Forms.dll \
+- cli_vb_bridgetest.vb
++ -reference:System.Windows.Forms.dll
+
+ $(BIN)$/cli_vb_testobj.uno.dll : \
+ cli_vb_testobj.vb \
+@@ -181,9 +177,6 @@
cli_bridgetest_inprocess.cs \
- $(DESTDIR)$/cli_cs_bridgetest.uno.dll \
- $(DESTDIR)$/cli_cs_testobj.uno.dll \
-- $(DESTDIR)$/cli_vb_bridgetest.uno.dll \
-- $(DESTDIR)$/cli_vb_testobj.uno.dll \
-- $(DESTDIR)$/cli_cpp_bridgetest.uno.dll \
+ $(BIN)$/cli_cs_bridgetest.uno.dll \
+ $(BIN)$/cli_cs_testobj.uno.dll \
+- $(BIN)$/cli_vb_bridgetest.uno.dll \
+- $(BIN)$/cli_vb_testobj.uno.dll \
+- $(BIN)$/cli_cpp_bridgetest.uno.dll \
+ $(MISC)$/copyassemblies.done \
$(CLI_BASETYPES) \
- $(CLI_TYPES) \
- $(CLI_URE) \
-@@ -229,9 +225,6 @@
+ $(CLI_URETYPES) \
+@@ -197,11 +190,7 @@
-reference:$(CLI_CPPUHELPER) \
- -reference:$(DESTDIR)$/cli_cs_bridgetest.uno.dll \
- -reference:$(DESTDIR)$/cli_cs_testobj.uno.dll \
-- -reference:$(DESTDIR)$/cli_vb_bridgetest.uno.dll \
-- -reference:$(DESTDIR)$/cli_vb_testobj.uno.dll \
-- -reference:$(DESTDIR)$/cli_cpp_bridgetest.uno.dll \
+ -reference:$(BIN)$/cli_cs_bridgetest.uno.dll \
+ -reference:$(BIN)$/cli_cs_testobj.uno.dll \
+- -reference:$(BIN)$/cli_vb_bridgetest.uno.dll \
+- -reference:$(BIN)$/cli_vb_testobj.uno.dll \
+- -reference:$(BIN)$/cli_cpp_bridgetest.uno.dll \
cli_bridgetest_inprocess.cs
- $(GNUCOPY) -p cli_bridgetest_inprocess.ini $(DESTDIR)
- $(GNUCOPY) -p $(CLI_CPPUHELPER) $(DESTDIR)$/$(CLI_CPPUHELPER:f)
-@@ -239,5 +232,4 @@
- $(GNUCOPY) -p $(CLI_TYPES) $(DESTDIR)$/$(CLI_TYPES:f)
- $(GNUCOPY) -p $(CLI_URE) $(DESTDIR)$/$(CLI_URE:f)
+ $(GNUCOPY) -p cli_bridgetest_inprocess.ini $(BIN)
-.ENDIF
Modified: trunk/patches/vba/basic-caller-support.diff
==============================================================================
--- trunk/patches/vba/basic-caller-support.diff (original)
+++ trunk/patches/vba/basic-caller-support.diff Tue Jul 15 15:09:58 2008
@@ -71,21 +71,20 @@
//.........................................................................
--- /data4/Latest/ooo-build/build/ooh680-m1/basic/inc/basic/sbmeth.hxx 2008-01-08 09:36:28.000000000 +0000
+++ basic/inc/basic/sbmeth.hxx 2007-12-20 09:38:21.000000000 +0000
-@@ -49,7 +49,7 @@ class SbMethod : public SbxMethod
+@@ -49,6 +49,7 @@
friend class SbIfaceMapperMethod;
SbMethodImpl* mpSbMethodImpl; // Impl data
--
-+ SbxVariable* mCaller; // caller
++ SbxVariable* mCaller; // caller
SbModule* pMod;
USHORT nDebugFlags;
USHORT nLine1, nLine2;
-@@ -76,7 +76,7 @@ public:
+@@ -75,7 +76,7 @@
void GetLineRange( USHORT&, USHORT& );
// Schnittstelle zum Ausfuehren einer Methode aus den Applikationen
- virtual ErrCode Call( SbxValue* pRet = NULL );
-+ virtual ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL );
++ virtual ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL );
virtual void Broadcast( ULONG nHintId );
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]