[Libreoffice-commits] .: scp2/inc scp2/source solenv/bin
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Sep 8 12:12:32 PDT 2012
scp2/inc/macros.inc | 3 -
scp2/source/calc/registryitem_calc.scp | 2
scp2/source/draw/registryitem_draw.scp | 2
scp2/source/impress/registryitem_impress.scp | 2
scp2/source/ooo/directory_ooo.scp | 9 ----
scp2/source/ooo/file_ooo.scp | 47 ----------------------
scp2/source/writer/registryitem_writer.scp | 2
solenv/bin/modules/installer/globals.pm | 1
solenv/bin/modules/installer/windows/component.pm | 16 -------
solenv/bin/modules/installer/windows/directory.pm | 3 -
solenv/bin/modules/installer/windows/file.pm | 4 -
solenv/bin/modules/installer/windows/registry.pm | 5 --
12 files changed, 11 insertions(+), 85 deletions(-)
New commits:
commit 700301a9ab256bd10d831f77bf7e4750e07670a0
Author: Andras Timar <atimar at suse.com>
Date: Sat Sep 8 21:13:10 2012 +0200
fdo#52296 put ShellNew files to program's folder
Change-Id: I501d08fb0be65c7191b807e1d6d6f20026e14860
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index afd65e2..8f0a08b 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 8bd58b1..6f886a4 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 3c84dd1..2caa0bc 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 d0eda1d..0c76dbd 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 657cb34..f599093 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 c0f831d..3d3215f 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 4169835..2de4a8b 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
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index e4cee55..bee3d0d 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -185,7 +185,6 @@ BEGIN
$ooodownloadfilename = "";
$downloadfilename = "";
$downloadfileextension = "";
- $shellnewfilesadded = 0;
%multilingual_only_modules = ();
%application_modules = ();
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index 555c99c..4d52b90 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -121,16 +121,6 @@ sub get_file_component_directory
if ( $onefile->{'Dir'} ) { $destdir = $onefile->{'Dir'}; }
- if ( $destdir =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ ) # special handling for shellnew files
- {
- return $installer::globals::templatefolder;
- }
-
- if ( $destdir =~ /\bPREDEFINED_OSWINSHELLNEWDIR\b/ )
- {
- return "WindowsShellNewFolder";
- }
-
my $destination = $onefile->{'destination'};
installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
@@ -237,9 +227,9 @@ sub get_file_component_attributes
$attributes = 0; # Assembly files cannot run from source
}
- if (( $onefile->{'Dir'} =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ ) || ( $onefile->{'needs_user_registry_key'} ))
+ if ( $onefile->{'needs_user_registry_key'} )
{
- $attributes = 4; # Files in shellnew dir and in non advertised startmenu entries must have user registry key as KeyPath
+ $attributes = 4; # Files in non advertised startmenu entries must have user registry key as KeyPath
}
# Setting msidbComponentAttributes64bit, if this is a 64 bit installation set.
@@ -375,8 +365,6 @@ sub get_component_keypath
}
}
- # Special handling for components in PREDEFINED_OSSHELLNEWDIR. These components
- # need as KeyPath a RegistryItem in HKCU
if ( $oneitem->{'userregkeypath'} ) { $keypath = $oneitem->{'userregkeypath'}; }
# saving it in the file and registry collection
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index a9c3432..fd947d0 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -451,9 +451,6 @@ sub add_root_directories
$oneline = "WindowsFolder\tTARGETDIR\tWindows\n";
push(@{$directorytableref}, $oneline);
- $oneline = "WindowsShellNewFolder\tWindowsFolder\tShellNew\n";
- push(@{$directorytableref}, $oneline);
-
$oneline = "$installer::globals::programfilesfolder\tTARGETDIR\t.\n";
push(@{$directorytableref}, $oneline);
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index f5449ce..e0e4372 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -1016,12 +1016,10 @@ sub create_files_table
# This is used for better performance in "save_packorder"
$installer::globals::uniquefilenamesequence{$onefile->{'uniquename'}} = $onefile->{'sequencenumber'};
- # Special handling for files in PREDEFINED_OSSHELLNEWDIR. These components
- # need as KeyPath a RegistryItem in HKCU
my $destdir = "";
if ( $onefile->{'Dir'} ) { $destdir = $onefile->{'Dir'}; }
- if (( $destdir =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ ) || ( $onefile->{'needs_user_registry_key'} ))
+ if ( $onefile->{'needs_user_registry_key'} )
{
my $keypath = generate_registry_keypath($onefile);
$onefile->{'userregkeypath'} = $keypath;
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 29e0e8a..2580d54 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -326,7 +326,6 @@ sub add_userregs_to_registry_table
$registry{'Root'} = "1"; # always HKCU
$registry{'Key'} = "Software\\$allvariables->{'MANUFACTURER'}\\$allvariables->{'PRODUCTNAME'} $allvariables->{'PRODUCTVERSION'}\\";
if ( $onefile->{'needs_user_registry_key'} ) { $registry{'Key'} = $registry{'Key'} . "StartMenu"; }
- else { $registry{'Key'} = $registry{'Key'} . "ShellNew"; }
$registry{'Name'} = $onefile->{'Name'};
$registry{'Value'} = "1";
$registry{'Component_'} = $onefile->{'componentname'};
@@ -412,9 +411,7 @@ sub create_registry_table
# If there are added user registry keys for files collected in
# @installer::globals::userregistrycollector (file.pm), then
- # this registry keys have to be added now. This is necessary for
- # files in PREDEFINED_OSSHELLNEWDIR, because their component
- # needs as KeyPath a RegistryItem in HKCU.
+ # this registry keys have to be added now.
if ( $installer::globals::addeduserregitrykeys ) { add_userregs_to_registry_table(\@registrytable, $allvariableshashref); }
More information about the Libreoffice-commits
mailing list