fdo#52296 put ShellNew files to program's folder

Change-Id: I501d08fb0be65c7191b807e1d6d6f20026e14860

7 files changed, 7 insertions, 60 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index afd65e2e75f0..8f0a08b05a4d 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -212,8 +212,7 @@
 #define PACKED_SHELLNEW_FILE_BODY \
         TXT_FILE_BODY; \
         Styles = (PACKED,WORKSTATION, OVERWRITE); \
-        Dir    = PREDEFINED_OSSHELLNEWDIR; \
-        NetDir = gid_Dir_Shellnew
+        Dir    = gid_Dir_Shellnew
 
 #define STD_SHELLNEW_FILE(id,name) \
     File id \
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 8bd58b127120..6f886a48506f 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -676,7 +676,7 @@ RegistryItem gid_Regitem_Ods_Openoffice_Calcdocument_1_Shellnew
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = ".ods\LibreOffice.CalcDocument.1\ShellNew";
     Name = "FileName";
-    Value = "soffice.ods";
+    Value = "<progpath>\share\template\shellnew\soffice.ods";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_Curver
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 3c84dd16f161..2caa0bc5a28a 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -676,7 +676,7 @@ RegistryItem gid_Regitem_Odg_Openoffice_Drawdocument_1_Shellnew
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = ".odg\LibreOffice.DrawDocument.1\ShellNew";
     Name = "FileName";
-    Value = "soffice.odg";
+    Value = "<progpath>\share\template\shellnew\soffice.odg";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_Curver
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index d0eda1d7a8d5..0c76dbd1fc01 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -691,7 +691,7 @@ RegistryItem gid_Regitem_Odp_Openoffice_Impressdocument_1_Shellnew
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = ".odp\LibreOffice.ImpressDocument.1\ShellNew";
     Name = "FileName";
-    Value = "soffice.odp";
+    Value = "<progpath>\share\template\shellnew\soffice.odp";
 End
 
 RegistryItem gid_Regitem_Openoffice_Starimpressdocument_Curver
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 657cb343f89a..f5990938f1df 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -122,13 +122,8 @@ End
 #ifdef WNT
 
 Directory gid_Dir_Shellnew
-    ParentID = gid_Brand_Dir_Program;
-    DosName = "shlnew";
-End
-
-Directory gid_Dir_ShellnewToo
-    ParentID = gid_Brand_Dir_Program;
-    DosName = "2shlnew";
+    ParentID = gid_Dir_Template;
+    DosName = "shellnew";
 End
 
 #endif
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index c0f831d91538..3d3215f0560c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -741,57 +741,10 @@ End
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
-
-File gid_File_Shellnew2_Ods_Soffice
-    TXT_FILE_BODY;
-    Styles = (PACKED,WORKSTATION, OVERWRITE);
-    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-    NetDir = gid_Dir_ShellnewToo;
-    Name = "soffice.ods";
-End
-
-#endif
-
-#ifdef WNT
-
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odg_Soffice, soffice.odg)
-
-File gid_File_Shellnew2_Odg_Soffice
-    TXT_FILE_BODY;
-    Styles = (PACKED,WORKSTATION, OVERWRITE);
-    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-    NetDir = gid_Dir_ShellnewToo;
-    Name = "soffice.odg";
-End
-
-#endif
-
-#ifdef WNT
-
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odp_Soffice, soffice.odp)
-
-File gid_File_Shellnew2_Odp_Soffice
-    TXT_FILE_BODY;
-    Styles = (PACKED,WORKSTATION, OVERWRITE);
-    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-    NetDir = gid_Dir_ShellnewToo;
-    Name = "soffice.odp";
-End
-
-#endif
-
-#ifdef WNT
-
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_Soffice, soffice.odt)
 
-File gid_File_Shellnew2_Odt_Soffice
-    TXT_FILE_BODY;
-    Styles = (PACKED,WORKSTATION, OVERWRITE);
-    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-    NetDir = gid_Dir_ShellnewToo;
-    Name = "soffice.odt";
-End
-
 #endif
 
 #if defined UNX && ! defined MACOSX
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 4169835336ca..2de4a8bb6ebd 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -826,7 +826,7 @@ RegistryItem gid_Regitem_Odt_Openoffice_Writerdocument_1_Shellnew
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".odt\LibreOffice.WriterDocument.1\ShellNew";
     Name = "FileName";
-    Value = "soffice.odt";
+    Value = "<progpath>\share\template\shellnew\soffice.odt";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_Curver