ooo-build r11488 - in trunk: . patches/src680

[tml svn gnome org]

Author: tml
Date: Fri Feb  1 19:59:24 2008
New Revision: 11488
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11488&view=rev

Log:
2008-02-01  Tor Lillqvist  <tml novell com>

	* patches/src680/novell-win32-odma.diff
	(fpicker/source/odma/ODMAFilePicker.cxx): Don't return
	"com.sun.star.ui.dialogs.FilePicker" as a supported service name
	any longer. Causes problems in 2.4.0: the ODMA file picker is
	invoked always, even if the option allowing it is turned off.

	(scp2/source/ooo/file_ooo.scp): Temporarily surround the
	additional stanzas for the template documents with #if 0, to avoid
	error when constructing installer because the same file is in two
	directories, or something like that. Correct fix is to use a
	different NetDir for them.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/novell-win32-odma.diff

Modified: trunk/patches/src680/novell-win32-odma.diff
==============================================================================
--- trunk/patches/src680/novell-win32-odma.diff	(original)
+++ trunk/patches/src680/novell-win32-odma.diff	Fri Feb  1 19:59:24 2008
@@ -677,7 +677,7 @@
 diff -ruN fpicker/source/odma/ODMAFilePicker.cxx fpicker/source/odma/ODMAFilePicker.cxx
 --- fpicker/source/odma/ODMAFilePicker.cxx	1970-01-01 00:00:00.000000000 +0000
 +++ fpicker/source/odma/ODMAFilePicker.cxx	2006-11-03 13:31:25.014750000 +0000
-@@ -0,0 +1,566 @@
+@@ -0,0 +1,565 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1215,10 +1215,9 @@
 +
 +Sequence< rtl::OUString > ODMAFilePicker::impl_getStaticSupportedServiceNames( )
 +{
-+    Sequence< rtl::OUString > seqServiceNames( 3 );
++    Sequence< rtl::OUString > seqServiceNames( 2 );
 +    rtl::OUString* pArray = seqServiceNames.getArray();
-+    pArray[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FilePicker" );
-+    pArray[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.ODMAFilePicker" );
++    pArray[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.ODMAFilePicker" );
 +
 +	// Super-ugly, but check the function sal_Bool
 +	// lcl_isSystemFilePicker( const Reference< XFilePicker >& ) in
@@ -1228,7 +1227,7 @@
 +    // isn't it?  If we don't claim to implement this "service" (which
 +    // is not defined in any IDL file, btw), we get hangs.
 +
-+    pArray[2] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" );
++    pArray[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" );
 +    return seqServiceNames ;
 +}
 +
@@ -2413,10 +2412,11 @@
 dummy line to avoid confusing diff-mode
 --- scp2/source/ooo/file_ooo.scp
 +++ scp2/source/ooo/file_ooo.scp
-@@ -2025,24 +2025,56 @@
+@@ -2025,24 +2025,64 @@
  
  STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
  
++#if 0
 +File gid_File_Shellnew2_Ods_Soffice
 +    TXT_FILE_BODY;
 +    Styles = (PACKED,WORKSTATION, OVERWRITE);
@@ -2424,6 +2424,7 @@
 +    NetDir = gid_Dir_Shellnew;
 +    Name = "soffice.ods";
 +End
++#endif
 +
  #endif
  
@@ -2431,6 +2432,7 @@
  
  STD_SHELLNEW_FILE(gid_File_Shellnew_Odg_Soffice, soffice.odg)
  
++#if 0
 +File gid_File_Shellnew2_Odg_Soffice
 +    TXT_FILE_BODY;
 +    Styles = (PACKED,WORKSTATION, OVERWRITE);
@@ -2438,6 +2440,7 @@
 +    NetDir = gid_Dir_Shellnew;
 +    Name = "soffice.odg";
 +End
++#endif
 +
  #endif
  
@@ -2445,6 +2448,7 @@
  
  STD_SHELLNEW_FILE(gid_File_Shellnew_Odp_Soffice, soffice.odp)
  
++#if 0
 +File gid_File_Shellnew2_Odp_Soffice
 +    TXT_FILE_BODY;
 +    Styles = (PACKED,WORKSTATION, OVERWRITE);
@@ -2452,6 +2456,7 @@
 +    NetDir = gid_Dir_Shellnew;
 +    Name = "soffice.odp";
 +End
++#endif
 +
  #endif
  
@@ -2459,6 +2464,7 @@
  
  STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_Soffice, soffice.odt)
  
++#if 0
 +File gid_File_Shellnew2_Odt_Soffice
 +    TXT_FILE_BODY;
 +    Styles = (PACKED,WORKSTATION, OVERWRITE);
@@ -2466,6 +2472,7 @@
 +    NetDir = gid_Dir_Shellnew;
 +    Name = "soffice.odt";
 +End
++#endif
 +
  #endif