1 files changed, 11 insertions, 50 deletions
diff --git a/editors/openoffice-devel/files/patch-jvmaccess+source+sunversion.cxx b/editors/openoffice-devel/files/patch-jvmaccess+source+sunversion.cxx
index 67e014595219..44cec840184a 100644
--- a/editors/openoffice-devel/files/patch-jvmaccess+source+sunversion.cxx
+++ b/editors/openoffice-devel/files/patch-jvmaccess+source+sunversion.cxx
@@ -1,50 +1,11 @@
---- ../jvmaccess/source/sunversion.cxx.orig	Sun Mar 30 00:40:02 2003
-+++ ../jvmaccess/source/sunversion.cxx	Sun Mar 30 01:31:48 2003
-@@ -102,6 +102,7 @@
-         {
-             //token can be "1", or "2_02"
-             char* pUnderscore= strpbrk(tok,"_");
-+            char* pLine= strpbrk(tok,"-");
-             if( pUnderscore != NULL)
-             {
-                 // get the value before and after the underscore
-@@ -115,6 +116,19 @@
-                 // now get the part after "_"
-                 m_nMinor= atoi( pUnderscore + 1);
-             }
-+            else if (pLine != NULL)
-+            {
-+                // get the value before and after the underscore
-+                int len= pLine - tok;
-+                char* pre= new char[len  + 1];
-+                strncpy( pre, tok, len);
-+                pre[len]= 0;
-+                // convert the value before the "_" into a numeric value
-+                arTokens[index]= atoi(pre);
-+                delete[] pre;
-+                // now get the part after "-"
-+                m_nMinor= atoi( pLine + 1);
-+            }
-             else
-             {
-                 arTokens[index]= atoi(tok);
-@@ -172,6 +186,19 @@
-                     continue;
-             }
-         }
-+        if(cCur == '-')
-+        {
-+            //check previous char
-+            if(cLast >= 48 && cLast <= 57)
-+            {
-+                if(cNext == 'p')
-+                    continue;
-+            }
-+        }
-+        if(cCur == 'p')
-+	{
-+                    continue;
-+	}
-         //If we get here then the current character is not a number (0..9),'.','_'
-         ret= false;
-         break;
+--- ../jvmaccess/source/sunversion.cxx.orig	Mon Jun  2 00:00:25 2003
++++ ../jvmaccess/source/sunversion.cxx	Mon Jun  2 00:06:00 2003
+@@ -231,6 +231,8 @@
+             m_preRelease = Rel_BETA;
+         else if (! strcmp(pCur, "rc1"))
+             m_preRelease = Rel_RC1;
++        else if (*pCur == 'p')
++            m_preRelease = Rel_BETA;
+         else
+             return false;
+     }