solenv/bin/modules/installer/windows/msiglobal.pm | 68 +---------------------
1 file changed, 5 insertions(+), 63 deletions(-)
New commits:
commit 25d62325f320ba75a2b64584fe1d5d98c18275f1
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed May 7 16:04:50 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Sat May 24 23:39:24 2025 +0200
janitor: remove some useless redirection from perl code
calling single-use functions that do nothing else but set a single value
with a single line of code is madness.
only the tip of the iceberg…
Change-Id: Ic222d65d90cb81c6fdef5ac2e538ca8abb441aad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185021
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 3b392c4fd4a1..e6e77ea0dbd1 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -490,26 +490,6 @@ sub create_msi_database
}
}
-#################################################################
-# Returning the msi version for the Summary Information Stream
-#################################################################
-
-sub get_msiversion_for_sis
-{
- my $msiversion = "200";
- return $msiversion;
-}
-
-#################################################################
-# Returning the word count for the Summary Information Stream
-#################################################################
-
-sub get_wordcount_for_sis
-{
- my $wordcount = "0";
- return $wordcount;
-}
-
#################################################################
# Returning the template for the Summary Information Stream
#################################################################
@@ -553,44 +533,6 @@ sub get_packagecode_for_sis
return $guid;
}
-#################################################################
-# Returning the author for the Summary Information Stream
-#################################################################
-
-sub get_author_for_sis
-{
- my $author = $installer::globals::longmanufacturer;
-
- $author = "\"" . $author . "\"";
-
- return $author;
-}
-
-#################################################################
-# Returning the subject for the Summary Information Stream
-#################################################################
-
-sub get_subject_for_sis
-{
- my ( $allvariableshashref ) = @_;
-
- my $subject = $allvariableshashref->{'PRODUCTNAME'} . " " .
$allvariableshashref->{'PRODUCTVERSION'};
-
- $subject = "\"" . $subject . "\"";
-
- return $subject;
-}
-
-######################################################################
-# Returning the security for the Summary Information Stream
-######################################################################
-
-sub get_security_for_sis
-{
- my $security = "0";
- return $security;
-}
-
#################################################################
# Writing the Summary information stream into the msi database
# This works only on Windows
@@ -608,18 +550,18 @@ sub write_summary_into_msi_database
my $msiinfo = "msiinfo.exe"; # Has to be in the path
- my $msiversion = get_msiversion_for_sis();
+ my $msiversion = 200;
my $codepage = 0; # PID_CODEPAGE summary property in a signed short,
therefore it is impossible to set 65001 here.
my $template = get_template_for_sis($language, $allvariableshashref);
my $guid = get_packagecode_for_sis();
my $title = "\"Installation database\"";
- my $author = get_author_for_sis();
- my $subject = get_subject_for_sis($allvariableshashref);
+ my $author = "\"" . $installer::globals::longmanufacturer . "\"";
+ my $subject = "\"" . $allvariableshashref->{'PRODUCTNAME'} . " " .
$allvariableshashref->{'PRODUCTVERSION'} . "\"";
my $comment = "\"" . $allvariableshashref->{'PRODUCTNAME'} ."\"";
my $keywords = "\"Install,MSI\"";
my $appname = "\"Windows Installer\"";
- my $security = get_security_for_sis();
- my $wordcount = get_wordcount_for_sis();
+ my $security = 0;
+ my $wordcount = 0;
$msifilename = installer::converter::make_path_conform($msifilename);
