Update ooo320-m1
[ooovba.git] / applied_patches / 0319-mono-bridge-version.diff
blob50b3fff75446ed36d1c6fbce839fee8f5ebcfc39
1 diff -rup ../ooo300-m9-old/cli_ure/source/mono_bridge/makefile.mk cli_ure/source/mono_bridge/makefile.mk
2 --- ../ooo300-m9-old/cli_ure/source/mono_bridge/makefile.mk 2008-11-19 13:32:37.000000000 +0100
3 +++ cli_ure/source/mono_bridge/makefile.mk 2008-11-19 12:18:45.000000000 +0100
4 @@ -84,6 +84,7 @@ ALLTAR : \
5 $(BIN)$/cli_uno_bridge.dll
7 CSFILES= \
8 + assemblyinfo.cs \
9 binaryuno.cs \
10 bridge.cs \
11 cli_environment.cs \
12 diff -rup ../ooo300-m9-old/cli_ure/source/mono_bridge/mono_bridge.cxx cli_ure/source/mono_bridge/mono_bridge.cxx
13 --- ../ooo300-m9-old/cli_ure/source/mono_bridge/mono_bridge.cxx 2008-11-19 13:32:37.000000000 +0100
14 +++ cli_ure/source/mono_bridge/mono_bridge.cxx 2008-11-19 12:14:34.000000000 +0100
15 @@ -237,6 +237,10 @@ DoLoad (MonoDomain *domain, char *fullna
16 aname.culture = "";
17 strncpy ((char *)aname.public_key_token, "ce2cb7e279207b9e", MONO_PUBLIC_KEY_TOKEN_LENGTH);
18 aname.name = "cli_uno_bridge";
19 + aname.major=1;
20 + aname.minor=0;
21 + aname.build=0;
22 + aname.revision=0;
24 ass = mono_assembly_load (&aname, NULL, &status);
25 if (status != MONO_IMAGE_OK)
26 @@ -254,7 +258,7 @@ Bridge::Bridge(
28 MonoDomain * pDomain = mono_get_root_domain();
29 // FIXME where is this freed?
30 - MonoAssembly * pAssembly = DoLoad (pDomain, "cli_uno_bridge, Version=0.0.0.0, Culture=neutral, PublicKeyToken=ce2cb7e279207b9e");
31 + MonoAssembly * pAssembly = DoLoad (pDomain, "cli_uno_bridge, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ce2cb7e279207b9e");
32 // FIXME and this, is this needed later?
33 MonoClass * pClass = mono_class_from_name (
34 (MonoImage *)mono_assembly_get_image( pAssembly ), "com.sun.star.bridges.mono_uno", "Bridge" );
35 diff -Nrup ../ooo300-m9-old/cli_ure/source/mono_bridge//assemblyinfo.cs cli_ure/source/mono_bridge//assemblyinfo.cs
36 --- ../ooo300-m9-old/cli_ure/source/mono_bridge//assemblyinfo.cs 1970-01-01 01:00:00.000000000 +0100
37 +++ cli_ure/source/mono_bridge//assemblyinfo.cs 2008-11-19 12:13:51.000000000 +0100
38 @@ -0,0 +1,4 @@
39 +using System.Reflection;
40 +using System.Runtime.CompilerServices;
42 +[assembly: AssemblyVersion("1.0.0.0")]