rpms/openoffice.org/devel openoffice.org-2.0.1.gcc25389.jurt.nullpointer.patch, NONE, 1.1 openoffice.org.spec, 1.583, 1.584

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13635

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.1.gcc25389.jurt.nullpointer.patch 
Log Message:
registration problem seems to be gcc#25389#

openoffice.org-2.0.1.gcc25389.jurt.nullpointer.patch:
 com/sun/star/lib/util/UrlToFileMapper.java      |    0 
 jurt/com/sun/star/lib/util/UrlToFileMapper.java |    8 ++++++++
 2 files changed, 8 insertions(+)

--- NEW FILE openoffice.org-2.0.1.gcc25389.jurt.nullpointer.patch ---
Index: com/sun/star/lib/util/UrlToFileMapper.java
===================================================================
RCS file: /cvs/udk/jurt/com/sun/star/lib/util/UrlToFileMapper.java,v
retrieving revision 1.3
diff -u -p -u -r1.3 UrlToFileMapper.java
--- openoffice.org.orig/jurt/com/sun/star/lib/util/UrlToFileMapper.java	7 Sep 2005 19:05:37 -0000	1.3
+++ openoffice.org/jurt/com/sun/star/lib/util/UrlToFileMapper.java	13 Dec 2005 11:34:14 -0000
@@ -95,6 +95,14 @@ public class UrlToFileMapper {
             // the URI constructor might throw java.net.URISyntaxException (in
             // Java 1.5, URL.toURI might be used instead).
             String encodedUrl = encode(url.toString());
+
+
+            String mytest = encodedUrl.substring(0, 6);
+            if (mytest.equals("file:.")) {
+                String ans = encodedUrl.substring(5, encodedUrl.length());
+                return new File(ans);
+            }
+
             try {
                 Object uri = uriConstructor.newInstance(
                     new Object[] { encodedUrl });


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -r1.583 -r1.584
--- openoffice.org.spec	9 Dec 2005 19:08:41 -0000	1.583
+++ openoffice.org.spec	13 Dec 2005 11:37:57 -0000	1.584
@@ -198,6 +198,7 @@
 Patch45: workspace.sb41.patch
 Patch46: openoffice.org-2.0.1.rh175242.connectivity.mozab.patch
 Patch47: openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch
+Patch48: openoffice.org-2.0.1.gcc25389.jurt.nullpointer.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -858,6 +859,7 @@
 %patch45 -p1 -b .workspace.sb41.patch
 %patch46 -p1 -b .rh175242.connectivity.mozab.patch
 %patch47 -p1 -b .ooo59129.vcl.readonlyentry.patch
+%patch48 -p1 -b .gcc25389.jurt.nullpointer.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3315,6 +3317,7 @@
 - disable workspace.jaxpapi.patch for now
 - disable fasterhelpcontent2.patch for now
 - rh#175272# openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch
+- gcc#25389# File(new URI("file:./")) regression
 
 * Thu Dec 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-145.1
 - next version