rpms/openoffice.org/F-10 openoffice.org.spec, 1.1689, 1.1690 workspace.cmcfixes50.patch, 1.6, 1.7

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14591

Modified Files:
	openoffice.org.spec workspace.cmcfixes50.patch 
Log Message:
Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything remotely, so workaround


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1689
retrieving revision 1.1690
diff -u -r1.1689 -r1.1690
--- openoffice.org.spec	7 Nov 2008 11:58:46 -0000	1.1689
+++ openoffice.org.spec	10 Nov 2008 12:36:09 -0000	1.1690
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 9
-%define rh_rpm_release 10
+%define rh_rpm_release 11
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -3747,6 +3747,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Nov 10 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
+- Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 
+  remotely
+
 * Fri Nov 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.10
 - window manager hatred
 

workspace.cmcfixes50.patch:

Index: workspace.cmcfixes50.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.cmcfixes50.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- workspace.cmcfixes50.patch	5 Nov 2008 11:44:26 -0000	1.6
+++ workspace.cmcfixes50.patch	10 Nov 2008 12:36:09 -0000	1.7
@@ -696,3 +696,55 @@
  		}
  		else
  		{
+Index: source/ucp/gio/gio_seekable.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/gio/gio_seekable.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 gio_seekable.cxx
+--- openoffice.org.orig/ucb/source/ucp/gio/gio_seekable.cxx	14 May 2008 14:48:47 -0000	1.2
++++ openoffice.org/ucb/source/ucp/gio/gio_seekable.cxx	10 Nov 2008 12:12:17 -0000
+@@ -94,22 +94,33 @@
+     if (!mpStream)
+         throw io::NotConnectedException();
+ 
++    bool bOk = false;
++    sal_uInt64 nSize = 0;
++
+     GFileInfo* pInfo = G_IS_FILE_INPUT_STREAM(mpStream) 
+         ? g_file_input_stream_query_info(G_FILE_INPUT_STREAM(mpStream), const_cast<char*>(G_FILE_ATTRIBUTE_STANDARD_SIZE), NULL, NULL) 
+         : g_file_output_stream_query_info(G_FILE_OUTPUT_STREAM(mpStream), const_cast<char*>(G_FILE_ATTRIBUTE_STANDARD_SIZE), NULL, NULL);
+ 
+-    if (!pInfo)
+-        throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Getting attributes unsupported")),
+-            static_cast< cppu::OWeakObject * >(this));
+-
+-    bool bOk = true;
+-    sal_uInt64 nSize = 0;
+-    if (g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_SIZE))
+-        nSize = g_file_info_get_size(pInfo);
+-    else
+-        bOk = false;
++    if (pInfo)
++    {
++        if (g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_SIZE))
++        {
++            nSize = g_file_info_get_size(pInfo);
++            bOk = true;
++        }
++        g_object_unref(pInfo);
++    }
+ 
+-    g_object_unref(pInfo);
++    if (!bOk)
++    {
++        GError *pError=NULL;
++        sal_Int64 nCurr = getPosition();
++        if (!g_seekable_seek(mpStream, 0, G_SEEK_END, NULL, &pError))
++            convertToException(pError, static_cast< cppu::OWeakObject * >(this));
++        nSize = getPosition();
++        seek(nCurr);
++        bOk = true;
++    }
+ 
+     if (!bOk)
+         throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Getting size unsupported")),