ooo-build r15016 - in branches/ooo-build-3-0-1: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Wed Jan  7 13:14:12 2009
New Revision: 15016
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15016&view=rev

Log:
2008-01-07  Petr Mladek  <pmladek suse cz>

	* patches/dev300/chart-odf-always-calc-a1.diff: one more change in
	  sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx is needed to
	  compile

	* patches/dev300/ucb-gio-gnome-init.diff, patches/dev300/apply:
	  call g_type_init() before using GIO; avoid crash when using GIO in
	  non-GNOME Window manager (i#96170, n#442678); thanks Michael Meeks
	  for the patch.

	* patches/dev300/config_office-gio-vs-gnome-vfs.diff:
	* patches/dev300/apply: do not allow to enable GIO and GNOME VFS at
	  once (i#95713)



Added:
   branches/ooo-build-3-0-1/patches/dev300/config_office-gio-vs-gnome-vfs.diff
   branches/ooo-build-3-0-1/patches/dev300/ucb-gio-gnome-init.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/chart-odf-always-calc-a1.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	Wed Jan  7 13:14:12 2009
@@ -1042,6 +1042,13 @@
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
 
+# do not allow to enable GIO and GNOME VFS at once
+config_office-gio-vs-gnome-vfs.diff, i#95713, pmladek
+
+# call g_type_init() before using GIO;
+# avoid crash when using GIO in non-GNOME Window manager
+ucb-gio-gnome-init.diff, i#96170, n#442678, mmeeks
+
 # OpenJDK paths for some archs
 config_office-openjdk-paths.diff, i91783
 

Modified: branches/ooo-build-3-0-1/patches/dev300/chart-odf-always-calc-a1.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/chart-odf-always-calc-a1.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/chart-odf-always-calc-a1.diff	Wed Jan  7 13:14:12 2009
@@ -450,6 +450,15 @@
  		rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CELL_ADDRESS, sAddress);
          const ScGrammar::Grammar eGrammar = pDoc->GetStorageGrammar();
          sal_uInt16 nNamespacePrefix = (eGrammar == ScGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC);
+@@ -884,7 +884,7 @@ void ScChangeTrackingExportHelper::Write
+ 					SvXMLElementExport aEqualCommentElem(rExport, XML_NAMESPACE_TABLE, XML_EQUAL_COMMENT, sal_True, sal_True);
+ 				}
+ 				rtl::OUString sRangeList;
+-				ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), rExport.GetDocument());
++				ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), rExport.GetDocument(), ScAddress::CONV_OOO);
+ 				if (sRangeList.getLength() && !pViewSettings->HasRange())
+ 				{
+ 					if (pViewSettings->HasRange())
 diff --git sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
 index 1c386a4..37528b2 100644
 --- sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx

Added: branches/ooo-build-3-0-1/patches/dev300/config_office-gio-vs-gnome-vfs.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/config_office-gio-vs-gnome-vfs.diff	Wed Jan  7 13:14:12 2009
@@ -0,0 +1,12 @@
+--- config_office/configure.in.old	2008-10-27 18:58:15.000000000 +0100
++++ config_office/configure.in	2008-10-31 17:22:28.000000000 +0100
+@@ -5472,6 +5472,9 @@ if test  "$test_gtk" = "yes"; then
+ 
+       AC_MSG_CHECKING([whether to enable GIO support])
+       if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
++          if test "$ENABLE_GNOMEVFS" = "TRUE" ; then
++             AC_MSG_ERROR([please use --enable-gio only together with --disable-gnome-vfs.])
++          fi
+           ENABLE_GIO="TRUE"
+           AC_MSG_RESULT([yes])
+           PKG_CHECK_MODULES( GIO, gio-2.0 )

Added: branches/ooo-build-3-0-1/patches/dev300/ucb-gio-gnome-init.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/ucb-gio-gnome-init.diff	Wed Jan  7 13:14:12 2009
@@ -0,0 +1,16 @@
+Index: ucb/source/ucp/gio/gio_provider.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/gio/gio_provider.cxx,v
+retrieving revision 1.2
+diff -u -p -u -r1.2 gio_provider.cxx
+--- ucb/source/ucp/gio/gio_provider.cxx	14 May 2008 14:47:59 -0000	1.2
++++ ucb/source/ucp/gio/gio_provider.cxx	12 Nov 2008 13:34:53 -0000
+@@ -163,6 +163,8 @@ extern "C" void * SAL_CALL component_get
+         (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
+     uno::Reference< lang::XSingleServiceFactory > xFactory;
+ 
++    g_type_init();
++
+     if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) )
+         xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr );
+