ooo-build r14782 - in branches/ooo-build-3-0-1: . patches/dev300 patches/emf+ patches/mono



Author: pmladek
Date: Mon Dec  8 18:49:03 2008
New Revision: 14782
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14782&view=rev

Log:
2008-12-08  Petr Mladek  <pmladek suse cz>

	* patches/dev300/dbaccess-righ-join-description.diff:  
	* patches/dev300/apply: fixes description of the RIGH JOIN selection
	  (bnc#431031, i#97026)

	* patches/mono/mono-climaker.diff: backport from opensuse-11-1 branch;
	  make value__ enum special field public (bnc#444353)
	* patches/dev300/mono-bridge-version.diff, patches/dev300/apply:
	  backport from opensuse-11-1 branch; adds version info to
	  cli_uno_bridge.dll assembly (bnc#361463)

	* ooo-build/patches/dev300/buildfix-openjdk-6-no-rhino.diff:
	  backport from trunk; fix the patch to work also with IBM Java
	  (bnc#449711)

	* patches/emf+/emf+-cppcanvas-input-validation.diff:
	* patches/dev300/wmf-pattern-brush.diff: backported some fixes from
	  opensuse-11-1 branch

	* patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff:
	* patches/dev300/apply: (applied only for SUSE-10.1) backported from
	  opensuse-11-1; gtk-2.8 does not know the link-color properties;
	  do not try to read them to avoid annoying warning messages
	  (bnc#440514)




Added:
   branches/ooo-build-3-0-1/patches/dev300/dbaccess-righ-join-description.diff
   branches/ooo-build-3-0-1/patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff
   branches/ooo-build-3-0-1/patches/emf+/emf+-cppcanvas-input-validation.diff
   branches/ooo-build-3-0-1/patches/mono/mono-bridge-version.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply
   branches/ooo-build-3-0-1/patches/dev300/buildfix-openjdk-6-no-rhino.diff
   branches/ooo-build-3-0-1/patches/dev300/wmf-pattern-brush.diff
   branches/ooo-build-3-0-1/patches/mono/mono-climaker.diff

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Mon Dec  8 18:49:03 2008
@@ -57,7 +57,7 @@
 SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase
 SUSE-10.0 : NovellBase
-SUSE-10.1 : NovellBase, BerkeleyDB43, BrokenSystemNSS, Java14
+SUSE-10.1 : NovellBase, BerkeleyDB43, BrokenSystemNSS, Java14, GTK28
 SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus, Java14
 SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus, Java14
 SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts
@@ -423,6 +423,9 @@
 
 mailmerge-ssl-ehlo.diff, i#76655, deb#5074448
 
+# fixes description of the RIGH JOIN selection
+dbaccess-righ-join-description.diff, bnc#431031, i#97026, pmladek
+
 [ LinuxOnly ]
 # fix that allows OOo to work with a standard (unpatched) libjpeg,
 jpegc.c.diff, i#80674, n#272574, flr
@@ -1003,6 +1006,13 @@
 # another fallback to load libhsqldb with JRE 1.4
 connectivity-load-libhsqldb-with-jre-1.4.diff, n#431360, pmladek
 
+[ GTK28 ]
+
+# gtk-2.8 does not know the link-color properties;
+# do not try to read them to avoid annoying warning messages
+vcl-gtk-2.8-unsupported-link-colors.diff, n#440514, pmladek
+
+
 [ NovellOnlyWin32 ]
 SectionOwner => tml
 
@@ -2240,6 +2250,7 @@
 emf+-use-canvas-only-for-emf+.diff, rodo
 emf+-embedded-mf-image.diff, rodo
 vcl-pluggable-mtf-renderer.diff, thorsten
+emf+-cppcanvas-input-validation.diff, thorsten
 
 [ LinkWarningDlg ]
 linkwarn-dlg-in-apps.diff, n#348149, thorsten

Modified: branches/ooo-build-3-0-1/patches/dev300/buildfix-openjdk-6-no-rhino.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/buildfix-openjdk-6-no-rhino.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/buildfix-openjdk-6-no-rhino.diff	Mon Dec  8 18:49:03 2008
@@ -1,41 +1,62 @@
-? unxlngx6.pro
-Index: rhino1_5R5.patch
-===================================================================
-RCS file: /cvs/external/rhino/rhino1_5R5.patch,v
-retrieving revision 1.3
-diff -u -r1.3 rhino1_5R5.patch
---- rhino/rhino1_5R5.patch	11 Apr 2008 07:03:06 -0000	1.3
-+++ rhino/rhino1_5R5.patch	12 Aug 2008 20:08:16 -0000
-@@ -1174,3 +1174,14 @@
+--- rhino/rhino1_5R5.patch.old	2008-12-03 20:22:39.000000000 +0100
++++ rhino/rhino1_5R5.patch	2008-12-03 20:22:30.000000000 +0100
+@@ -1174,3 +1174,30 @@
           PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
           return new ProtectionDomain(cs, pc);
       }
-+--- misc/rhino1_5R5/toolsrc/build.xml	2004-03-25 17:54:34.000000000 -0300
-++++ misc/build/rhino1_5R5/toolsrc/build.xml	2008-08-12 16:58:52.000000000 -0
-+va	Fri Mar 28 17:24:23 2008
-+@@ -68,6 +32,7 @@
++--- misc/rhino1_5R5/toolsrc/build.xml	2008-12-03 20:20:21.000000000 +0100
+++++ misc/build/rhino1_5R5/toolsrc/build.xml	2008-12-03 20:19:28.000000000 +0100
++@@ -6,6 +6,16 @@ Requires Ant version 1.2
++ -->
++ <project name="toolsrc" default="compile" basedir=".">
++ 
+++  <!-- rhino.jar from OpenJDK breaks build -->
+++  <path id="my.bootstrap.classpath">
+++     <fileset dir="${java.home}/">
+++       <include name="jre/lib/*.jar"/>
+++       <include name="lib/*.jar"/>
+++       <exclude name="jre/lib/rhino.jar"/>
+++       <exclude name="lib/rhino.jar"/>
+++     </fileset>
+++  </path>
+++
++   <target name="properties">
++     <property name="nest" value=".."/>
++     <property name="build.dir" value="./build"/>
++@@ -32,6 +42,7 @@ Requires Ant version 1.2
 +            includes="org/**/*.java"
 +            deprecation="on"
 +            debug="${debug}">
-++      <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
+++      <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
 +     </javac>
 +     <copy todir="${nest}/${classes}">
 +       <fileset dir="." includes="org/**/*.properties" />
-? unxlngx6.pro
-Index: java/build.xml
-===================================================================
-RCS file: /cvs/framework/scripting/java/build.xml,v
-retrieving revision 1.36
-diff -u -r1.36 build.xml
---- scripting/java/build.xml	11 Apr 2008 09:46:13 -0000	1.36
-+++ scripting/java/build.xml	12 Aug 2008 23:20:31 -0000
-@@ -85,7 +85,9 @@
+--- scripting/java/build.xml.old.orig	2008-12-03 20:08:19.000000000 +0100
++++ scripting/java/build.xml	2008-12-03 20:12:57.000000000 +0100
+@@ -85,6 +85,16 @@
+     <pathelement path="${jardir}"/>
+     <pathelement path="${netbeans.install.path}/modules/ext/nb-editor.jar"/>
+   </path>
++
++  <!-- rhino.jar from OpenJDK breaks build -->
++  <path id="my.bootstrap.classpath">
++     <fileset dir="${java.home}/">
++       <include name="jre/lib/*.jar"/>
++       <include name="lib/*.jar"/>
++       <exclude name="jre/lib/rhino.jar"/>
++       <exclude name="lib/rhino.jar"/>
++     </fileset>
++  </path>
+     
+   <!-- ===================== Prepare Directories ========================= -->
+   <target name="prepare">
+@@ -95,7 +105,9 @@
    <target name="compile" depends="prepare">
      <javac srcdir="com" destdir="${jardir}"
           includes="**/*.java" classpathref="idlclasspath"
 -         debug="${debug}" optimize="${optimize}" deprecation="off"/>
 +         debug="${debug}" optimize="${optimize}" deprecation="off">
-+	 <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
++      <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
 +    </javac>
      <javac srcdir="Framework/" destdir="${jardir}"
           includes="**/*.java" classpathref="idlclasspath" debug="${debug}" 

Added: branches/ooo-build-3-0-1/patches/dev300/dbaccess-righ-join-description.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/dbaccess-righ-join-description.diff	Mon Dec  8 18:49:03 2008
@@ -0,0 +1,19 @@
+--- dbaccess/source/ui/querydesign/querydlg.cxx.old	2008-06-25 14:56:00.000000000 +0200
++++ dbaccess/source/ui/querydesign/querydlg.cxx	2008-12-05 20:53:05.000000000 +0100
+@@ -276,8 +276,16 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, List
+ 	String sHelpText = String( ModuleRes( nResId ) );
+ 	if( nPos )
+ 	{
++	    if ( eJoinType == RIGHT_JOIN )
++	    {
++		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%2" ) ), sFirstWinName );
++		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%1" ) ), sSecondWinName );
++	    }
++	    else
++	    {
+ 		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%1" ) ), sFirstWinName );
+ 		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%2" ) ), sSecondWinName );
++	    }
+ 	}
+     if ( bAddHint )
+     {

Added: branches/ooo-build-3-0-1/patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff	Mon Dec  8 18:49:03 2008
@@ -0,0 +1,25 @@
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx.old	2008-06-16 16:30:38.000000000 +0200
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	2008-11-03 16:39:51.000000000 +0100
+@@ -3180,22 +3180,6 @@ void GtkSalGraphics::updateSettings( All
+     aStyleSet.SetHighlightColor( aHighlightColor );
+     aStyleSet.SetHighlightTextColor( aHighlightTextColor );
+ 
+-    // hyperlink colors
+-    GdkColor *link_color = NULL;
+-    gtk_widget_style_get (m_pWindow, "link-color", &link_color, NULL);
+-    if (link_color)
+-    {
+-        aStyleSet.SetLinkColor(getColor(*link_color));
+-        gdk_color_free (link_color);
+-        link_color = NULL;
+-    }
+-    gtk_widget_style_get (m_pWindow, "visited-link-color", &link_color, NULL);
+-    if (link_color)
+-    {
+-        aStyleSet.SetVisitedLinkColor(getColor(*link_color));
+-        gdk_color_free (link_color);
+-    }
+-
+     // menu disabled entries handling
+     aStyleSet.SetSkipDisabledInMenus( TRUE );
+     // menu colors

Modified: branches/ooo-build-3-0-1/patches/dev300/wmf-pattern-brush.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/wmf-pattern-brush.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/wmf-pattern-brush.diff	Mon Dec  8 18:49:03 2008
@@ -23,7 +23,7 @@
  				}
  			}
  			break;
-@@ -1152,6 +1153,49 @@ BOOL EnhWMFReader::ReadEnhWMF()
+@@ -1152,6 +1153,54 @@ BOOL EnhWMFReader::ReadEnhWMF()
              }
              break;
  
@@ -45,27 +45,32 @@
 +                    *pWMF >> offBits;
 +                    *pWMF >> cbBits;
 +
-+                    if ( offBmi )
++                    if ( (cbBits > (SAL_MAX_UINT32 - 14)) || ((SAL_MAX_UINT32 - 14) - cbBits < cbBmi) )
++                       bStatus = FALSE;
++                    else if ( offBmi )
 +                    {
 +                        UINT32	nSize = cbBmi + cbBits + 14;
-+                        char*	pBuf = new char[ nSize ];
-+
-+                        SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
-+                        aTmp.ObjectOwnsMemory( TRUE );
-+                        aTmp << (BYTE)'B'
-+                             << (BYTE)'M'
-+                             << (UINT32)cbBits
-+                             << (UINT16)0
-+                             << (UINT16)0
-+                             << (UINT32)cbBmi + 14;
-+                        pWMF->Seek( nStart + offBmi );
-+                        pWMF->Read( pBuf + 14, cbBmi );
-+                        pWMF->Seek( nStart + offBits );
-+                        pWMF->Read( pBuf + 14 + cbBmi, cbBits );
-+                        aTmp.Seek( 0 );
-+                        aBitmap.Read( aTmp, TRUE );
++                        if ( nSize <= ( nEndPos - nStartPos ) )
++                        {
++                            char*	pBuf = new char[ nSize ];
++
++                            SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
++                            aTmp.ObjectOwnsMemory( TRUE );
++                            aTmp << (BYTE)'B'
++                                 << (BYTE)'M'
++                                 << (UINT32)cbBits
++                                 << (UINT16)0
++                                 << (UINT16)0
++                                 << (UINT32)cbBmi + 14;
++                            pWMF->Seek( nStart + offBmi );
++                            pWMF->Read( pBuf + 14, cbBmi );
++                            pWMF->Seek( nStart + offBits );
++                            pWMF->Read( pBuf + 14 + cbBmi, cbBits );
++                            aTmp.Seek( 0 );
++                            aBitmap.Read( aTmp, TRUE );
++                        }
 +                    }
-+				}
++                }
 +
 +                pOut->CreateObject( nIndex, GDI_BRUSH, new WinMtfFillStyle( aBitmap ) );
 +            }

Added: branches/ooo-build-3-0-1/patches/emf+/emf+-cppcanvas-input-validation.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/emf+/emf+-cppcanvas-input-validation.diff	Mon Dec  8 18:49:03 2008
@@ -0,0 +1,107 @@
+--- cppcanvas/source/mtfrenderer/emfplus.cxx.bak	2008-10-22 18:32:48.000000000 +0200
++++ cppcanvas/source/mtfrenderer/emfplus.cxx	2008-10-22 18:58:35.000000000 +0200
+@@ -96,6 +96,8 @@
+         public:
+             EMFPPath (sal_Int32 _nPoints, bool bLines = false)
+             {
++                if( _nPoints<0 || _nPoints>SAL_MAX_INT32/(2*sizeof(float)) )
++                    _nPoints = SAL_MAX_INT32/(2*sizeof(float));
+                 nPoints = _nPoints;
+                 pPoints = new float [nPoints*2];
+                 if (!bLines)
+@@ -238,6 +240,9 @@
+                 EMFP_DEBUG (printf ("EMF+\theader: 0x%08x parts: %d\n", header, parts));
+ 
+                 if (parts) {
++                    if( parts<0 || parts>SAL_MAX_INT32/sizeof(sal_Int32) )
++                        parts = SAL_MAX_INT32/sizeof(sal_Int32);
++
+                     combineMode = new sal_Int32 [parts];
+ 
+                     for (int i = 0; i < parts; i ++) {
+@@ -349,6 +354,9 @@
+                         s >> surroundColorsNumber;
+                         EMFP_DEBUG (printf ("EMF+\tsurround colors: %d\n", surroundColorsNumber));
+ 
++                        if( surroundColorsNumber<0 || surroundColorsNumber>SAL_MAX_INT32/sizeof(::Color) )
++                            surroundColorsNumber = SAL_MAX_INT32/sizeof(::Color);
++
+                         surroundColors = new ::Color [surroundColorsNumber];
+                         for (int i = 0; i < surroundColorsNumber; i++) {
+                             s >> color;
+@@ -398,6 +406,8 @@
+                         if (additionalFlags & 0x08) {
+                             s >> blendPoints;
+                             EMFP_DEBUG (printf ("EMF+\tuse blend, points: %d\n", blendPoints));
++                            if( blendPoints<0 || blendPoints>SAL_MAX_INT32/(2*sizeof(float)) )
++                                blendPoints = SAL_MAX_INT32/(2*sizeof(float));
+                             blendPositions = new float [2*blendPoints];
+                             blendFactors = blendPositions + blendPoints;
+                             for (int i=0; i < blendPoints; i ++) {
+@@ -413,6 +423,10 @@
+                         if (additionalFlags & 0x04) {
+                             s >> colorblendPoints;
+                             EMFP_DEBUG (printf ("EMF+\tuse color blend, points: %d\n", colorblendPoints));
++                            if( colorblendPoints<0 || colorblendPoints>SAL_MAX_INT32/sizeof(float) )
++                                colorblendPoints = SAL_MAX_INT32/sizeof(float);
++                            if( colorblendPoints>SAL_MAX_INT32/sizeof(::Color) )
++                                colorblendPoints = SAL_MAX_INT32/sizeof(::Color);
+                             colorblendPositions = new float [colorblendPoints];
+                             colorblendColors = new ::Color [colorblendPoints];
+                             for (int i=0; i < colorblendPoints; i ++) {
+@@ -467,6 +481,8 @@
+                         if (additionalFlags & 0x08) {
+                             s >> blendPoints;
+                             EMFP_DEBUG (printf ("EMF+\tuse blend, points: %d\n", blendPoints));
++                            if( blendPoints<0 || blendPoints>SAL_MAX_INT32/(2*sizeof(float)) )
++                                blendPoints = SAL_MAX_INT32/(2*sizeof(float));
+                             blendPositions = new float [2*blendPoints];
+                             blendFactors = blendPositions + blendPoints;
+                             for (int i=0; i < blendPoints; i ++) {
+@@ -482,6 +498,10 @@
+                         if (additionalFlags & 0x04) {
+                             s >> colorblendPoints;
+                             EMFP_DEBUG (printf ("EMF+\tuse color blend, points: %d\n", colorblendPoints));
++                            if( colorblendPoints<0 || colorblendPoints>SAL_MAX_INT32/sizeof(float) )
++                                colorblendPoints = SAL_MAX_INT32/sizeof(float);
++                            if( colorblendPoints>SAL_MAX_INT32/sizeof(::Color) )
++                                colorblendPoints = SAL_MAX_INT32/sizeof(::Color);
+                             colorblendPositions = new float [colorblendPoints];
+                             colorblendColors = new ::Color [colorblendPoints];
+                             for (int i=0; i < colorblendPoints; i ++) {
+@@ -583,6 +603,8 @@
+ 
+                 if (penFlags & 256) {
+                     s >> dashPatternLen;
++                    if( dashPatternLen<0 || dashPatternLen>SAL_MAX_INT32/sizeof(float) )
++                        dashPatternLen = SAL_MAX_INT32/sizeof(float);
+                     dashPattern = new float [dashPatternLen];
+                     for (i = 0; i < dashPatternLen; i++)
+                         s >> dashPattern [i];
+@@ -596,6 +618,8 @@
+ 
+                 if (penFlags & 1024) {
+                     s >> compoundArrayLen;
++                    if( compoundArrayLen<0 || compoundArrayLen>SAL_MAX_INT32/sizeof(float) )
++                        compoundArrayLen = SAL_MAX_INT32/sizeof(float);
+                     compoundArray = new float [compoundArrayLen];
+                     for (i = 0; i < compoundArrayLen; i++)
+                         s >> compoundArray [i];
+@@ -604,6 +628,8 @@
+ 
+                 if (penFlags & 2048) {
+                     s >> customStartCapLen;
++                    if( customStartCapLen<0 )
++                        customStartCapLen=0;
+                     customStartCap = new sal_uInt8 [customStartCapLen];
+                     for (i = 0; i < customStartCapLen; i++)
+                         s >> customStartCap [i];
+@@ -612,6 +638,8 @@
+ 
+                 if (penFlags & 4096) {
+                     s >> customEndCapLen;
++                    if( customEndCapLen<0 )
++                        customEndCapLen=0;
+                     customEndCap = new sal_uInt8 [customEndCapLen];
+                     for (i = 0; i < customEndCapLen; i++)
+                         s >> customEndCap [i];

Added: branches/ooo-build-3-0-1/patches/mono/mono-bridge-version.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/mono/mono-bridge-version.diff	Mon Dec  8 18:49:03 2008
@@ -0,0 +1,31 @@
+diff -rup ../ooo300-m9-old/cli_ure/source/mono_bridge/makefile.mk cli_ure/source/mono_bridge/makefile.mk
+--- ../ooo300-m9-old/cli_ure/source/mono_bridge/makefile.mk	2008-11-19 13:32:37.000000000 +0100
++++ cli_ure/source/mono_bridge/makefile.mk	2008-11-19 12:18:45.000000000 +0100
+@@ -84,6 +84,7 @@ ALLTAR : 				\
+ 	$(BIN)$/cli_uno_bridge.dll
+ 
+ CSFILES= 			\
++	assemblyinfo.cs		\
+ 	binaryuno.cs 		\
+ 	bridge.cs 		\
+ 	cli_environment.cs 	\
+diff -rup ../ooo300-m9-old/cli_ure/source/mono_bridge/mono_bridge.cxx cli_ure/source/mono_bridge/mono_bridge.cxx
+--- ../ooo300-m9-old/cli_ure/source/mono_bridge/mono_bridge.cxx	2008-11-19 13:32:37.000000000 +0100
++++ cli_ure/source/mono_bridge/mono_bridge.cxx	2008-11-19 12:14:34.000000000 +0100
+@@ -254,7 +254,7 @@ Bridge::Bridge(
+ {
+     MonoDomain * pDomain = mono_get_root_domain();
+     // FIXME where is this freed?
+-    MonoAssembly * pAssembly = DoLoad (pDomain, "cli_uno_bridge, Version=0.0.0.0, Culture=neutral, PublicKeyToken=ce2cb7e279207b9e");
++    MonoAssembly * pAssembly = DoLoad (pDomain, "cli_uno_bridge, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ce2cb7e279207b9e");
+     // FIXME and this, is this needed later?
+     MonoClass * pClass = mono_class_from_name (
+         (MonoImage *)mono_assembly_get_image( pAssembly ), "com.sun.star.bridges.mono_uno", "Bridge" );
+diff -Nrup ../ooo300-m9-old/cli_ure/source/mono_bridge//assemblyinfo.cs cli_ure/source/mono_bridge//assemblyinfo.cs
+--- ../ooo300-m9-old/cli_ure/source/mono_bridge//assemblyinfo.cs	1970-01-01 01:00:00.000000000 +0100
++++ cli_ure/source/mono_bridge//assemblyinfo.cs	2008-11-19 12:13:51.000000000 +0100
+@@ -0,0 +1,4 @@
++using System.Reflection;
++using System.Runtime.CompilerServices;
++
++[assembly: AssemblyVersion("1.0.0.0")]

Modified: branches/ooo-build-3-0-1/patches/mono/mono-climaker.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/mono/mono-climaker.diff	(original)
+++ branches/ooo-build-3-0-1/patches/mono/mono-climaker.diff	Mon Dec  8 18:49:03 2008
@@ -1613,7 +1613,7 @@
 +					   TypeAttributes.Sealed,
 +					   typeof (System.Enum));
 +	    enumBuilder.DefineField ("value__", typeof (System.Int32),
-+				     FieldAttributes.Private |
++				     FieldAttributes.Public |
 +				     FieldAttributes.SpecialName |
 +				     FieldAttributes.RTSpecialName);
 +	



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]