diff options
Diffstat (limited to 'editors/openoffice.org-2.0/files/patch-i64442')
-rw-r--r-- | editors/openoffice.org-2.0/files/patch-i64442 | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/editors/openoffice.org-2.0/files/patch-i64442 b/editors/openoffice.org-2.0/files/patch-i64442 deleted file mode 100644 index b018425305fb..000000000000 --- a/editors/openoffice.org-2.0/files/patch-i64442 +++ /dev/null @@ -1,54 +0,0 @@ -Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v -retrieving revision 1.7 -diff -u -r1.7 gnujre.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 16 Mar 2006 13:13:00 -0000 1.7 -+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 28 May 2006 03:33:20 -0000 -@@ -63,13 +63,8 @@ - char const* const* GnuInfo::getRuntimePaths(int * size) - { - static char const* ar[]= { --#ifdef X86_64 -- "/lib64/libgcj.so.7", -- "/lib64/libgcj.so.6" --#else -- "/lib/libgcj.so.7", -- "/lib/libgcj.so.6" --#endif -+ "/libgcj.so.7", -+ "/libgcj.so.6" - }; - *size = sizeof(ar) / sizeof (char*); - return ar; -@@ -87,7 +82,7 @@ - OUString sVersionProperty( - RTL_CONSTASCII_USTRINGPARAM("java.version")); - OUString sHomeProperty( -- RTL_CONSTASCII_USTRINGPARAM("java.home")); -+ RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url")); - OUString sAccessProperty( - RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies")); - -@@ -111,19 +106,8 @@ - } - else if (!bHome && sHomeProperty.equals(i->first)) - { -- OUString fileURL; -- if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) == -- osl_File_E_None) -- { -- //make sure that the drive letter have all the same case -- //otherwise file:///c:/jre and file:///C:/jre produce two -- //different objects!!! -- if (makeDriveLetterSame( & fileURL)) -- { -- m_sHome = fileURL; -- bHome = true; -- } -- } -+ m_sHome = i->second; -+ bHome = true; - } - else if (!bAccess && sAccessProperty.equals(i->first)) - { |