ooo-build r12007 - in branches/sled-10-sp1-ooo-build-2-4: . patches/src680

[tml svn gnome org]

Author: tml
Date: Tue Mar 25 19:05:11 2008
New Revision: 12007
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12007&view=rev

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

	* patches/src680/novell-win32-odma.diff: Store the templates also
	in the %WINDIR%\ShellNew folder again.



Modified:
   branches/sled-10-sp1-ooo-build-2-4/ChangeLog
   branches/sled-10-sp1-ooo-build-2-4/patches/src680/novell-win32-odma.diff

Modified: branches/sled-10-sp1-ooo-build-2-4/patches/src680/novell-win32-odma.diff
==============================================================================
--- branches/sled-10-sp1-ooo-build-2-4/patches/src680/novell-win32-odma.diff	(original)
+++ branches/sled-10-sp1-ooo-build-2-4/patches/src680/novell-win32-odma.diff	Tue Mar 25 19:05:11 2008
@@ -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