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

[tml svn gnome org]

Author: tml
Date: Wed Mar 26 00:30:23 2008
New Revision: 12010
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12010&view=rev

Log:
2008-03-25  Tor Lillqvist  <tml novell com>

	* patches/src680/novell-win32-odma.diff
	(fpicker/source/odma/ODMAFilePicker.cxx
	(ODMAFilePicker::execute)): Pass GetActiveWindow() as the HWND
	parameter to ODMRegisterApp() so that the ODMA dialog is on top of
	the OOo window.
	
	(officecfg/registry/schema/org/openoffice/Office/Common.xcs): Make
	the default for TryODMADialog false, as is seeems a bit flaky.

	(scp2/source/ooo/directory_ooo.scp): Add a dumy directory
	gid_Dir_ShellnewToo to be able to install another copy of the
	blank template documents in %WINDIR%\SHELLNEW. The installer
	builder doesn't allow installing the same file in two places
	unless the files have a different "NetDir" attribute.

	(scp2/source/ooo/file_ooo.scp): Revert the ifdeffing out from
	2008-02-01 of the additional stanzas. Use gid_Dir_ShellnewToo as
	their "NetDir".



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	Wed Mar 26 00:30:23 2008
@@ -829,7 +829,7 @@
 +	WORD count = 0;
 +	DWORD flags;
 +
-+	status = NODMRegisterApp( &handle, ODM_API_VERSION, "sodma", NULL, NULL );
++	status = NODMRegisterApp( &handle, ODM_API_VERSION, "sodma", (DWORD) GetActiveWindow( ), NULL );
 +	if (status == ODM_SUCCESS)
 +	{
 +		if (m_nDialogKind == OPEN)
@@ -2204,7 +2204,7 @@
 +					<author>tml</author>
 +					<desc>Determines whether to show the document creation and selection of the machine's default ODMA (Open Document Management Architecture) DMS (Document Management System). If true, and the machine has a DMS available, the DMS's dialog will be displayed. That dialog then gives the opportunity to use the application's dialog instead, which means the normal system file and folder pickers will be displayed. Relevant only on Windows.</desc>
 +				</info>
-+				<value>true</value>
++				<value>false</value>
 +			</prop>
  			<prop oor:name="DisableUICustomization" oor:type="xs:boolean">
  				<info>
@@ -2423,21 +2423,33 @@
  	my $sourcediraddon = "";
  	if (($installer::globals::addchildprojects) ||
 dummy line to avoid confusing diff-mode
+--- scp2/source/ooo/directory_ooo.scp
++++ scp2/source/ooo/directory_ooo.scp
+@@ -166,6 +166,11 @@
+     ParentID = gid_Dir_Program;
+     DosName = "shellnew";
+ End
++
++Directory gid_Dir_ShellnewToo
++    ParentID = gid_Dir_Program;
++    DosName = "shellnew2";
++End
+ 
+ #endif
+ 
 --- scp2/source/ooo/file_ooo.scp
 +++ scp2/source/ooo/file_ooo.scp
-@@ -2025,24 +2025,64 @@
+@@ -2025,24 +2025,56 @@
  
  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);
 +    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-+    NetDir = gid_Dir_Shellnew;
++    NetDir = gid_Dir_ShellnewToo;
 +    Name = "soffice.ods";
 +End
-+#endif
 +
  #endif
  
@@ -2445,15 +2457,13 @@
  
  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);
 +    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-+    NetDir = gid_Dir_Shellnew;
++    NetDir = gid_Dir_ShellnewToo;
 +    Name = "soffice.odg";
 +End
-+#endif
 +
  #endif
  
@@ -2461,15 +2471,13 @@
  
  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);
 +    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-+    NetDir = gid_Dir_Shellnew;
++    NetDir = gid_Dir_ShellnewToo;
 +    Name = "soffice.odp";
 +End
-+#endif
 +
  #endif
  
@@ -2477,15 +2485,13 @@
  
  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);
 +    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-+    NetDir = gid_Dir_Shellnew;
++    NetDir = gid_Dir_ShellnewToo;
 +    Name = "soffice.odt";
 +End
-+#endif
 +
  #endif