[Libreoffice-commits] .: 3 commits - crashrep/source instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure jvmfwk/source odk/source scp2/source shell/source solenv/bin testtools/qa ure/source vcl/source

Andras Timar timar at kemper.freedesktop.org
Fri Mar 23 03:45:07 PDT 2012


 crashrep/source/win32/soreport.cpp                                  |   20 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt  |   14 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt |    5 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt   |    1 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt  |   14 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt |    5 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt   |    1 
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf   |   24 
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt   |   14 
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt  |    5 
 instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt    |    1 
 instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt        |   14 
 instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt       |    5 
 instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt         |    1 
 instsetoo_native/inc_ure/windows/msi_templates/Control.idt          |   14 
 instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt         |    5 
 instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt           |    1 
 jvmfwk/source/fwkutil.cxx                                           |    2 
 odk/source/unoapploader/win/unoapploader.c                          |    2 
 scp2/source/ooo/ure.scp                                             |    2 
 shell/source/win32/simplemail/smplmailclient.cxx                    |    2 
 solenv/bin/make_download.pl                                         |  126 -
 solenv/bin/modules/installer/downloadsigner.pm                      |  569 ----
 solenv/bin/modules/installer/windows/sign.pm                        | 1241 ----------
 testtools/qa/cliversioning/makefile.mk                              |    4 
 ure/source/README                                                   |    2 
 vcl/source/app/settings.cxx                                         |    4 
 vcl/source/window/toolbox.cxx                                       |    2 
 28 files changed, 20 insertions(+), 2080 deletions(-)

New commits:
commit fb067f9bb25c49ee50b8fd62c844812d6a875805
Author: Andras Timar <atimar at suse.com>
Date:   Fri Mar 23 11:44:17 2012 +0100

    replace OpenOffice.org to LibreOffice in registry keys

diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index 1a3baa8..c8c4876 100644
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -291,7 +291,7 @@ void CrashReportParams::ReadFromRegistry()
 
     if ( ERROR_SUCCESS == RegReadValue(
         HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+        TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
         TEXT("HTTPProxyServer"),
         szBuffer,
         sizeof(szBuffer) ) )
@@ -301,7 +301,7 @@ void CrashReportParams::ReadFromRegistry()
 
     if ( ERROR_SUCCESS == RegReadValue(
         HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+        TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
         TEXT("HTTPProxyPort"),
         &dwProxyPort,
         sizeof(dwProxyPort) ) )
@@ -312,7 +312,7 @@ void CrashReportParams::ReadFromRegistry()
 
     if ( ERROR_SUCCESS == RegReadValue(
         HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+        TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
         TEXT("ReturnAddress"),
         szBuffer,
         sizeof(szBuffer) ) )
@@ -320,14 +320,14 @@ void CrashReportParams::ReadFromRegistry()
 
     RegReadValue(
         HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+        TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
         TEXT("AllowContact"),
         &fAllowContact,
         sizeof(fAllowContact) );
 
     RegReadValue(
         HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+        TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
         TEXT("HTTPConnection"),
         &uInternetConnection,
         sizeof(uInternetConnection) );
@@ -339,7 +339,7 @@ void CrashReportParams::WriteToRegistry()
 {
     RegWriteValue(
         HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+        TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
         TEXT("HTTPProxyServer"), REG_SZ,
         sProxyServer.c_str(),
         sizeof(TCHAR) * (sProxyServer.length() + 1) );
@@ -349,14 +349,14 @@ void CrashReportParams::WriteToRegistry()
 
     RegWriteValue(
         HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+        TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
         TEXT("HTTPProxyPort"), REG_DWORD,
         &dwProxyPort,
         sizeof(DWORD) );
 
     RegWriteValue(
         HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+        TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
         TEXT("AllowContact"), REG_DWORD,
         &fAllowContact,
         sizeof(DWORD) );
@@ -364,14 +364,14 @@ void CrashReportParams::WriteToRegistry()
 
     RegWriteValue(
         HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+        TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
         TEXT("HTTPConnection"), REG_DWORD,
         &uInternetConnection,
         sizeof(DWORD) );
 
     RegWriteValue(
         HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+        TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
         TEXT("ReturnAddress"), REG_SZ,
         sEmail.c_str(),
         sizeof(TCHAR) * (sEmail.length() + 1) );
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 4b8c223..928588a 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -78,7 +78,7 @@ bool isAccessibilitySupportDesired()
 #ifdef WNT
     HKEY    hKey = 0;
     if (RegOpenKeyEx(HKEY_CURRENT_USER,
-                     "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+                     "Software\\LibreOffice\\Accessibility\\AtToolSupport",
                      0, KEY_READ, &hKey) == ERROR_SUCCESS)
     {
         DWORD   dwType = 0;
diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c
index 762b554..8debafe 100644
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -66,7 +66,7 @@ void closeErrorFile();
  * environment variable to the program directory of the UNO installation.
  * If no installation is specified by the user, the default installation on
  * the system will be taken. The default installation is read from the
- * default value of the key "Software\OpenOffice.org\UNO\InstallPath" from the
+ * default value of the key "Software\LibreOffice\UNO\InstallPath" from the
  * root key HKEY_CURRENT_USER in the Windows Registry. If this key is missing,
  * the key is read from the root key HKEY_LOCAL_MACHINE.</p>
  */
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 88d76b9..be2c52f 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -1138,7 +1138,7 @@ End
 RegistryItem gid_Regitem_Path
     ModuleID = gid_Module_Root;
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
+    Subkey = "Software\LibreOffice\%PRODUCTNAME";
     Name = "Path";
     Value = "[INSTALLLOCATION]";
 End
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index 4b70c8a..a6e0187 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -80,7 +80,7 @@ namespace /* private */
     {
         rtl::OUString altSenddocUrl;
         HKEY hkey;
-        LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\OpenOffice.org\\SendAsEMailClient", &hkey);
+        LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\LibreOffice\\SendAsEMailClient", &hkey);
         if (lret == ERROR_SUCCESS)
         {
             wchar_t buff[MAX_PATH];
diff --git a/testtools/qa/cliversioning/makefile.mk b/testtools/qa/cliversioning/makefile.mk
index c4708f2..329fa15 100644
--- a/testtools/qa/cliversioning/makefile.mk
+++ b/testtools/qa/cliversioning/makefile.mk
@@ -60,7 +60,7 @@ echo :
     @echo ###########################   N O T E  ######################################
     @echo . 
     @echo To run the test you have to provide the path to the  office location. It must
-    @echo contain the ure (d:\myOffice\OpenOffice.org\URE).
+    @echo contain the ure (d:\myOffice\LibreOffice\URE).
     @echo Also an office must be installed with full system integration.
     @echo Example:
     @echo dmake run office="d:\myOffice"
@@ -87,7 +87,7 @@ CT_NOOFFICE = -NoOffice
 # --- Targets ------------------------------------------------------
 
 RUN: $(MISC)$/copyassemblies.done
-    java -cp $(CLASSPATH) -DSystemRoot=$(SystemRoot) -Dcli_test_program=$(BIN)$/runtests.exe -Dpath="$(office)"\OpenOffice.org\URE\bin $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
+    java -cp $(CLASSPATH) -DSystemRoot=$(SystemRoot) -Dcli_test_program=$(BIN)$/runtests.exe -Dpath="$(office)"\LibreOffice\URE\bin $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
 
 run: RUN
 
diff --git a/ure/source/README b/ure/source/README
index efb88d9..1da0610 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -234,7 +234,7 @@ rpm --relocate on Linux.  The URE is designed so that multiple instances of the
 URE can coexist on a single system in different locations.
 
 On Windows, the path to the installed URE is stored in the registry under the
-path "HKEY_CLASSES_ROOT\Software\OpenOffice.org\URE" and key "Path".
+path "HKEY_CLASSES_ROOT\Software\LibreOffice\URE" and key "Path".
 
 
 UNO Deployment Variables
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index c95d561..3116b7b 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -984,7 +984,7 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const
         HKEY hkey;
 
         if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
-            "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+            "Software\\LibreOffice\\Accessibility\\AtToolSupport",
             &hkey) )
         {
             DWORD dwType;
@@ -1046,7 +1046,7 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
 
         // If the accessibility key in the Windows registry exists, change it synchronously
         if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
-            "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+            "Software\\LibreOffice\\Accessibility\\AtToolSupport",
             &hkey) )
         {
             DWORD dwType;
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index ff5cb5b..4dc2458 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -5986,7 +5986,7 @@ void ToolBox::ImplDisableFlatButtons()
         HKEY hkey;
 
         if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
-            "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+            "Software\\LibreOffice\\Accessibility\\AtToolSupport",
             &hkey) )
         {
             DWORD dwType = 0;
commit b13f2b5788bc27d055e20926053244e824ac5bd6
Author: Andras Timar <atimar at suse.com>
Date:   Fri Mar 23 10:05:58 2012 +0100

    remove unused installer modules

diff --git a/solenv/bin/make_download.pl b/solenv/bin/make_download.pl
deleted file mode 100644
index 62d8888..0000000
--- a/solenv/bin/make_download.pl
+++ /dev/null
@@ -1,126 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#################
-# use
-#################
-
-use lib ("$ENV{SOLARENV}/bin/modules");
-
-use Cwd;
-use File::Copy;
-use installer::download;
-use installer::downloadsigner;
-use installer::exiter;
-use installer::followme;
-use installer::globals;
-use installer::logger;
-use installer::windows::sign;
-
-#################################################
-# Main program
-#################################################
-
-installer::downloadsigner::getparameter();
-installer::downloadsigner::checkparameter();
-
-my $temppath = installer::downloadsigner::set_temp_path();
-my $infofilelist = installer::downloadsigner::createproductlist();
-installer::downloadsigner::publishproductlist($infofilelist);
-
-foreach my $infofilename ( @{$infofilelist} )
-{
-    installer::logger::starttime();
-
-    my $success = 1;
-    my $do_copy = 1;
-    my $followmeinfohash = installer::followme::read_followme_info($infofilename);
-    installer::downloadsigner::setlogfilename();    # Successful after reading followme file, resetting log file
-    if ( $installer::globals::writetotemp ) { installer::downloadsigner::set_output_pathes_to_temp($followmeinfohash, $temppath); }
-    if ( $installer::globals::useminor ) { installer::downloadsigner::set_minor_into_pathes($followmeinfohash, $temppath); }
-
-    if (( ! $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign ))
-    {
-        installer::logger::print_message( "... WARNING: Signing only for Windows platforms active ...\n" );
-    }
-
-    if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign ))
-    {
-        $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy, $temppath);
-
-        ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'},
-                                                                                                            $followmeinfohash->{'finalinstalldir'},
-                                                                                                            $followmeinfohash->{'installlogdir'},
-                                                                                                            "",
-                                                                                                            \$followmeinfohash->{'languagestring'},
-                                                                                                            $followmeinfohash->{'currentinstallnumber'});
-
-        if ( ! $success ) { installer::exiter::exit_program("ERROR: Signing installation set failed: $followmeinfohash->{'finalinstalldir'}", "Main"); }
-    }
-
-    if ( ! $installer::globals::nodownload )
-    {
-        $followmeinfohash->{'finalinstalldir'} = installer::download::create_download_sets($followmeinfohash->{'finalinstalldir'},
-                                                                                            $followmeinfohash->{'includepatharray'},
-                                                                                            $followmeinfohash->{'allvariableshash'},
-                                                                                            $followmeinfohash->{'downloadname'},
-                                                                                            \$followmeinfohash->{'languagestring'},
-                                                                                            $followmeinfohash->{'languagesarray'});
-
-        ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'},
-                                                                                                        $followmeinfohash->{'finalinstalldir'},
-                                                                                                        $followmeinfohash->{'installlogdir'},
-                                                                                                        "",
-                                                                                                        \$followmeinfohash->{'languagestring'},
-                                                                                                        $followmeinfohash->{'currentinstallnumber'});
-
-        if (( $success ) && ( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign ))
-        {
-            $do_copy = 0;
-            $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy, $temppath);
-
-            ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'},
-                                                                                                            $followmeinfohash->{'finalinstalldir'},
-                                                                                                            $followmeinfohash->{'installlogdir'},
-                                                                                                            "",
-                                                                                                            \$followmeinfohash->{'languagestring'},
-                                                                                                            $followmeinfohash->{'currentinstallnumber'});
-        }
-    }
-
-    if ( $success )
-    {
-        installer::worker::clean_output_tree();
-        if ( $installer::globals::followme_from_directory ) { installer::downloadsigner::rename_followme_infofile($infofilename); }
-    }
-
-    installer::logger::stoptime();
-}
-
-####################################
-# Main program end
-####################################
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
deleted file mode 100644
index 575b42c..0000000
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ /dev/null
@@ -1,569 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::downloadsigner;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-
-############################################
-# Parameter Operations
-############################################
-
-sub usage
-{
-    print <<Ende;
---------------------------------------------------------------------------------
-make_download V1.0
-The following parameter are needed:
--d: Full path to the file containing the follow-me info or to a directory
-    containing the follow-me info files. In the latter case, all follow-me
-    info files are evaluated. If a directory is used, the successfully used
-    follow-me info files are renamed using a string "success". Files with
-    this string are ignored in repeated processes using "-d" with a
-    directory.
-
-The following parameter are optional:
--nodownload: Only signing, no creation of download sets (Windows only)
--useminor: Important for installation sets, created without minor set
--writetotemp: Necessary, if you do not want to write into solver
-              This can be caused by missing privileges (Windows only)
--internalcabinet: Not only the cabinet files are signed, but also all
-                  files included in the cabinet files (Windows only).
-
--sign: Uses signing mechanism to sign installation sets
-If \"-sign\" is set, the following two parameter are required:
--pfx: Full path to the pfx file
--pw: Full path to the file, containing the pfx password.
-
-Examples:
-
-Specifying an installation set (with "-d"):
-
-perl make_download.pl -d <followmeinfofilename>
-
-perl make_download.pl -d <followmeinfofilename>
-                         -sign
-                         -pfx <pfxfilename>
-                         -pw <passwordfilename>
-
-or without specifying an installation set:
-
-perl make_download.pl -d <followmedirectory>
-                      -sign
-                      -pfx <pfxfilename>
-                      -pw <passwordfilename>
---------------------------------------------------------------------------------
-Ende
-    exit(-1);
-}
-
-#####################################
-# Reading parameter
-#####################################
-
-sub getparameter
-{
-    while ( $#ARGV >= 0 )
-    {
-        my $param = shift(@ARGV);
-
-        if ($param eq "-d") { $installer::globals::followmeinfofilename = shift(@ARGV); }
-        elsif ($param eq "-pw") { $installer::globals::pwfile = shift(@ARGV); }
-        elsif ($param eq "-pfx") { $installer::globals::pfxfile = shift(@ARGV); }
-        elsif ($param eq "-sign") { $installer::globals::dosign = 1; }
-        elsif ($param eq "-nodownload") { $installer::globals::nodownload = 1; }
-        elsif ($param eq "-writetotemp") { $installer::globals::writetotemp = 1; }
-        elsif ($param eq "-useminor") { $installer::globals::useminor = 1; }
-        elsif ($param eq "-internalcabinet") { $installer::globals::internal_cabinet_signing = 1; }
-        else
-        {
-            installer::logger::print_error( "unknown parameter: $param" );
-            usage();
-            exit(-1);
-        }
-    }
-}
-
-#####################################
-# Controlling required parameter
-#####################################
-
-sub checkparameter
-{
-    if ( $installer::globals::followmeinfofilename eq "" )
-    {
-        installer::logger::print_error( "Error: Required parameter is missing: -d\n" );
-        usage();
-        exit(-1);
-    }
-
-    if ( $installer::globals::dosign )
-    {
-        # -pfx and -pw have to be set
-        if ( $installer::globals::pfxfile eq "" )
-        {
-            installer::logger::print_error( "Error: If \"-sign\" is set, a pfx file has to be specified: -pfx\n" );
-            usage();
-            exit(-1);
-        }
-
-        # -pfx and -pw have to be set
-        if ( $installer::globals::pwfile eq "" )
-        {
-            installer::logger::print_error( "Error: If \"-sign\" is set, a password file has to be specified: -pw\n" );
-            usage();
-            exit(-1);
-        }
-
-        # and both files have to exist
-        if ( ! -f $installer::globals::pfxfile )
-        {
-            installer::logger::print_error( "Error: pfx file \"$installer::globals::pfxfile\" does not exist.\n" );
-            usage();
-            exit(-1);
-        }
-
-        if ( ! -f $installer::globals::pwfile )
-        {
-            installer::logger::print_error( "Error: Password file \"$installer::globals::pwfile\" does not exist (-pw).\n" );
-            usage();
-            exit(-1);
-        }
-    }
-}
-
-#############################################
-# Setting the temporary path for the download
-# and signing process
-#############################################
-
-sub set_temp_path
-{
-    my $temppath = "";
-    my $pid = $$;           # process id
-    my $time = time();      # time
-    my $helperdir = "unpackdir_" . $pid . $time;
-
-    if (( $ENV{'TMP'} ) || ( $ENV{'TEMP'} ))
-    {
-        if ( $ENV{'TMP'} ) { $temppath = $ENV{'TMP'}; }
-        elsif ( $ENV{'TEMP'} )  { $temppath = $ENV{'TEMP'}; }
-        $temppath =~ s/\Q$installer::globals::separator\E\s*$//;    # removing ending slashes and backslashes
-        $temppath = $temppath . $installer::globals::separator . $helperdir;
-
-        if( $^O =~ /cygwin/i )
-        {
-            $temppath = qx{cygpath -w "$temppath"};
-            $temppath =~ s/\\/\//g;
-            $temppath =~ s/\s*$//g;
-        }
-
-        installer::systemactions::create_directory_structure($temppath);
-    }
-    else
-    {
-        installer::logger::print_error( "Error: TMP and TEMP not defined. This is required for this process.\n" );
-        usage();
-        exit(-1);
-    }
-
-    installer::logger::print_message( "\n... using output path: $temppath ...\n" );
-
-    push(@installer::globals::removedirs, $temppath);
-
-    return $temppath;
-}
-
-#############################################
-# Setting output paths to temp directory
-# This are the:
-# unpackpath and the loggingdir
-#############################################
-
-sub set_output_pathes_to_temp
-{
-    my ($followmeinfohash, $temppath) = @_;
-
-    $followmeinfohash->{'loggingdir'} = $temppath . $installer::globals::separator;
-    $installer::globals::unpackpath = $temppath;
-}
-
-#############################################
-# Setting the minor into the paths. This is
-# required, if the original installation set
-# was created without minor
-# Value is always saved in
-# $installer::globals::lastminor
-# which is saved in the follow_me file
-#############################################
-
-sub set_minor_into_pathes
-{
-    my ($followmeinfohash, $temppath) = @_;
-
-    installer::logger::print_message( "\n... forcing into minor: $installer::globals::lastminor ...\n" );
-
-    my @pathnames = ("bin", "doc", "inc", "lib", "pck", "res", "xml");
-    my $sourcename = "src";
-    my $srcpath = $installer::globals::separator . $sourcename . $installer::globals::separator;
-
-    if ( $installer::globals::minor ne "" )
-    {
-        installer::logger::print_message( "\n... already defined minor: $installer::globals::minor -> ignoring parameter \"-useminor\" ...\n" );
-        return;
-    }
-
-    # Affected paths:
-    # $contenthash{'installlogdir'}
-    # $contenthash{'includepatharray'}
-    # $installer::globals::unpackpath
-    # $installer::globals::idttemplatepath
-    # $installer::globals::idtlanguagepath
-
-    installer::logger::include_header_into_logfile("Changing saved paths to add the minor");
-    my $infoline = "Old paths:\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$followmeinfohash->{'installlogdir'}: $followmeinfohash->{'installlogdir'}\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::unpackpath: $installer::globals::unpackpath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::idttemplatepath: $installer::globals::idttemplatepath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::idtlanguagepath: $installer::globals::idtlanguagepath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "Include paths:\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { push( @installer::globals::logfileinfo, $path); }
-
-    foreach $onepath ( @pathnames )
-    {
-        my $oldvalue = $installer::globals::separator . $onepath . $installer::globals::separator;
-        my $newvalue = $installer::globals::separator . $onepath . "\." . $installer::globals::lastminor . $installer::globals::separator;
-
-        if (( $followmeinfohash->{'installlogdir'} =~ /\Q$oldvalue\E/ ) && ( ! ( $followmeinfohash->{'installlogdir'} =~ /\Q$srcpath\E/ ))) { $followmeinfohash->{'installlogdir'} =~ s/\Q$oldvalue\E/$newvalue/; }
-        if (( $installer::globals::unpackpath =~ /\Q$oldvalue\E/ ) && ( ! ( $installer::globals::unpackpath =~ /\Q$srcpath\E/ ))) { $installer::globals::unpackpath =~ s/\Q$oldvalue\E/$newvalue/; }
-        if (( $installer::globals::idttemplatepath =~ /\Q$oldvalue\E/ ) && ( ! ( $installer::globals::idttemplatepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idttemplatepath =~ s/\Q$oldvalue\E/$newvalue/; }
-        if (( $installer::globals::idtlanguagepath =~ /\Q$oldvalue\E/ ) && ( ! ( $installer::globals::idtlanguagepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idtlanguagepath =~ s/\Q$oldvalue\E/$newvalue/; }
-        foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { if (( $path =~ /\Q$oldvalue\E/ ) && ( ! ( $path =~ /\Q$srcpath\E/ ))) { $path =~ s/\Q$oldvalue\E/$newvalue/; } }
-
-        # Checking for the end of the path
-        $oldvalue = $installer::globals::separator . $onepath;
-        $newvalue = $installer::globals::separator . $onepath . "\." . $installer::globals::lastminor;
-
-        if (( $followmeinfohash->{'installlogdir'} =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $followmeinfohash->{'installlogdir'} =~ /\Q$srcpath\E/ ))) { $followmeinfohash->{'installlogdir'} =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
-        if (( $installer::globals::unpackpath =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $installer::globals::unpackpath =~ /\Q$srcpath\E/ ))) { $installer::globals::unpackpath =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
-        if (( $installer::globals::idttemplatepath =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $installer::globals::idttemplatepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idttemplatepath =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
-        if (( $installer::globals::idtlanguagepath =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $installer::globals::idtlanguagepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idtlanguagepath =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
-        foreach my $path ( @{$followmeinfohash->{'includepatharray'}} )
-        {
-            if (( $path =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $path =~ /\Q$srcpath\E/ )))
-            {
-                $path =~ s/\Q$oldvalue\E\s*$/$newvalue/;
-                $path = $path . "\n";
-            }
-        }
-    }
-
-    # And now can follow the replacement for the source path "src". Subdirs like "bin" in the source tree
-    # must not get the minor. This is instead "src.m9/instsetoo_native/common.pro/bin/..."
-    # Directory "src" can never be the end of the path
-
-    my $newsrcpath = $installer::globals::separator . $sourcename . "\." . $installer::globals::lastminor . $installer::globals::separator;
-
-    if ( $followmeinfohash->{'installlogdir'} =~ /\Q$srcpath\E/ ) { $followmeinfohash->{'installlogdir'} =~ s/\Q$srcpath\E/$newsrcpath/; }
-    if ( $installer::globals::unpackpath =~ /\Q$srcpath\E/ ) { $installer::globals::unpackpath =~ s/\Q$srcpath\E/$newsrcpath/; }
-    if ( $installer::globals::idttemplatepath =~ /\Q$srcpath\E/ ) { $installer::globals::idttemplatepath =~ s/\Q$srcpath\E/$newsrcpath/; }
-    if ( $installer::globals::idtlanguagepath =~ /\Q$srcpath\E/ ) { $installer::globals::idtlanguagepath =~ s/\Q$srcpath\E/$newsrcpath/; }
-    foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { if ( $path =~ /\Q$srcpath\E/ ) { $path =~ s/\Q$srcpath\E/$newsrcpath/; } }
-
-    $infoline = "\nNew paths:\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$followmeinfohash->{'installlogdir'}: $followmeinfohash->{'installlogdir'}\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::unpackpath: $installer::globals::unpackpath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::idttemplatepath: $installer::globals::idttemplatepath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::idtlanguagepath: $installer::globals::idtlanguagepath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "Include paths:\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { push( @installer::globals::logfileinfo, $path); }
-}
-
-#############################################
-# Setting the name of the log file
-#############################################
-
-sub setlogfilename
-{
-    if ( $installer::globals::dosign ) { $installer::globals::logfilename = "sign_and_download_" . $installer::globals::logfilename; }
-    else { $installer::globals::logfilename = "download_" . $installer::globals::logfilename; }
-    # reset the log file
-    @installer::globals::logfileinfo = ();
-}
-
-#########################################################
-# Checking, if this is a task in a cws or
-# on the master. Simple check of naming schema:
-# CWS: follow_me_DEV300_m40_de.log
-# Master: follow_me_4_DEV300_m40_en-US.log
-#########################################################
-
-sub check_cws_build
-{
-    my ( $filename ) = @_;
-
-    my $iscws = 1;
-
-    if ( $filename =~ /follow_me_\d+_/ ) { $iscws = 0; }
-
-    return $iscws;
-}
-
-#########################################################
-# Reading a specific key from a follow-me file
-#########################################################
-
-sub get_property_from_file
-{
-    my ($followmefile, $key) = @_;
-
-    my $value = "";
-
-    my $filecontent = installer::files::read_file($followmefile);
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( ${$filecontent}[$i] =~ /^\s*\Q$key\E\s*\:\s*(.*?)\s*$/ )
-        {
-            $value = $1;
-            last;
-        }
-    }
-
-    return $value;
-}
-
-#########################################################
-# Publishing the content of the product list
-#########################################################
-
-sub publishproductlist
-{
-    my ($infofilelist) = @_;
-
-    installer::logger::print_message( "\n... found products: ...\n" );
-
-    for ( my $i = 0; $i <= $#{$infofilelist}; $i++ )
-    {
-        my $onefile = ${$infofilelist}[$i];
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$onefile);
-        installer::logger::print_message( "...... $onefile ...\n" );
-    }
-
-    installer::logger::print_message( "\n" );
-}
-
-#########################################################
-# Filtering all files, that have correct minor
-# and work stamp.
-# Master: follow_me_4_DEV300_m40_en-US.log
-#########################################################
-
-sub filter_all_files_with_correct_settings
-{
-    my ($allfollowmefiles) = @_;
-
-    my @allfiles = ();
-    my @allfiles2 = ();
-    my $maxhash = ();
-
-    my $minor = "";
-    my $workstamp = "";
-
-    if ( $ENV{'WORK_STAMP'} ) { $workstamp = $ENV{'WORK_STAMP'}; }
-
-    # This is broken, we don't want to support any UPDMINOR
-    # complexities in LibreOffice. (Or do we?) This needs updating if
-    # we want to actually use this file for signing.
-
-    if ( $ENV{'UPDMINOR'} ) { $minor = $ENV{'UPDMINOR'}; }
-
-    if ( $minor eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"UPDMINOR\" not set!", "filter_all_files_with_correct_settings"); }
-    if ( $workstamp eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"WORK_STAMP\" not set!", "filter_all_files_with_correct_settings"); }
-
-    foreach my $onefile ( @{$allfollowmefiles} )
-    {
-        if (( $onefile =~ /_\Q$minor\E_/i ) && ( $onefile =~ /_\Q$workstamp\E_/i ))
-        {
-            push(@allfiles, $onefile);
-
-            # also collecting maximum hash
-
-            if ( $onefile =~ /follow_me_(\d+)_\Q$workstamp\E_\Q$minor\E_([-\w]+)\.log\s*$/i )
-            {
-                my $sequence = $1;
-                my $lang = $2;
-
-                if (( ! exists($maxhash{$lang})) || ( $maxhash{$lang} < $sequence )) { $maxhash{$lang} = $sequence; }
-            }
-        }
-    }
-
-    # second run, because of sequence numbers
-
-    foreach my $onefile ( @allfiles )
-    {
-        if ( $onefile =~ /follow_me_(\d+)_\Q$workstamp\E_\Q$minor\E_([-\w]+)\.log\s*$/i )
-        {
-            my $sequence = $1;
-            my $lang = $2;
-
-            if ( $sequence == $maxhash{$lang} ) { push(@allfiles2, $onefile); }
-        }
-    }
-
-    return ( \@allfiles2 );
-}
-
-#########################################################
-# Creating a list of products, that need to be signed
-# or for which download sets need to be created.
-#########################################################
-
-sub createproductlist
-{
-    # If "-d" specifies an installation set, there is only one product
-
-    my @infofilelist = ();
-    my @infofilelist2 = ();
-
-    if ( -f $installer::globals::followmeinfofilename )
-    {
-        push(@infofilelist, $installer::globals::followmeinfofilename);
-        # Saving info, that this is a file
-        $installer::globals::followme_from_directory = 0;
-    }
-    elsif ( -d $installer::globals::followmeinfofilename )
-    {
-        installer::logger::print_message( "\n... reading directory: $installer::globals::followmeinfofilename ...\n" );
-        $installer::globals::followmeinfofilename =~ s/$installer::globals::separator\s*$//;
-        my $allfollowmefiles = installer::systemactions::find_file_with_file_extension("log", $installer::globals::followmeinfofilename);
-
-        if ( ! ( $#{$allfollowmefiles} > -1 ))
-        {
-            installer::logger::print_error( "Error: Nothing to do! No follow-me file in directory \"$installer::globals::followmeinfofilename\"!.\n" );
-            usage();
-            exit(-1);
-        }
-
-        # Saving info, that this is a directory
-        $installer::globals::followme_from_directory = 1;
-
-        # Collect all possible installation sets
-        # CWS: All installation sets
-        # Master: All installation sets with same major, minor and buildid. Additionally using the highest number.
-
-        my $iscws = check_cws_build(${$allfollowmefiles}[0]);
-
-        if ( $iscws )
-        {
-            # Simply read all follow-me files and check existence of installation sets
-            foreach my $onefile ( @{$allfollowmefiles} )
-            {
-                my $fullfilename = $installer::globals::followmeinfofilename . $installer::globals::separator . $onefile;
-                my $installdir = get_property_from_file($fullfilename, "finalinstalldir");
-                if (( $installdir ne "" ) && ( -d $installdir )) { push(@infofilelist2, $fullfilename); }
-            }
-        }
-        else
-        {
-            $allfollowmefiles = filter_all_files_with_correct_settings($allfollowmefiles);
-
-            foreach my $onefile ( @{$allfollowmefiles} )
-            {
-                my $fullfilename = $installer::globals::followmeinfofilename . $installer::globals::separator . $onefile;
-                # Check, if installation set still exists
-                my $installdir = get_property_from_file($fullfilename, "finalinstalldir");
-                if (( $installdir ne "" ) && ( -d $installdir )) { push(@infofilelist2, $fullfilename); }
-            }
-        }
-
-        # Removing all files, starting with "follow_me_success_" in their names. This have already been used successfully.
-
-        foreach my $onefile ( @infofilelist2 )
-        {
-            if ( $onefile =~ /follow_me_success_/ ) { next; }
-            push(@infofilelist, $onefile);
-        }
-
-        # Checking, if there is content in the list
-        if ( ! ( $#infofilelist > -1 ))
-        {
-            installer::logger::print_error( "Error: Nothing to do! No installation set found for follow-me files in directory \"$installer::globals::followmeinfofilename\"!.\n" );
-            usage();
-            exit(-1);
-        }
-    }
-    else
-    {
-        installer::logger::print_error( "Error: Nothing to do! \"$installer::globals::followmeinfofilename\" is no file and no directory (-d).\n" );
-        usage();
-        exit(-1);
-    }
-
-    return \@infofilelist;
-}
-
-########################################################################
-# Renaming the follow me info file, if it was successfully used.
-# This can only be done, if the parameter "-d" was used with a
-# directory, not a name. In this case the repeated use of parameter
-# "-d" with this directory has to ignore this already successfully
-# used file.
-########################################################################
-
-sub rename_followme_infofile
-{
-    my ( $filename ) = @_;
-
-    my $newfilename = $filename;
-    $newfilename =~ s/follow_me_/follow_me_success_/;   # including "_success" after "follow_me"
-
-    if ( $filename ne $newfilename )
-    {
-        my $returnvalue = rename($filename, $newfilename);
-        if ( $returnvalue ) { installer::logger::print_message( "\n... renamed file \"$filename\" to \"$newfilename\" ...\n" ); }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
deleted file mode 100644
index a874fa6..0000000
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ /dev/null
@@ -1,1241 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::sign;
-
-use Cwd;
-use installer::converter;
-use installer::files;
-use installer::globals;
-use installer::scriptitems;
-use installer::worker;
-use installer::windows::admin;
-
-########################################################
-# Copying an existing Windows installation set.
-########################################################
-
-sub copy_install_set
-{
-    my ( $installsetpath ) = @_;
-
-    installer::logger::include_header_into_logfile("Start: Copying installation set $installsetpath");
-
-    my $infoline = "";
-
-    my $dirname = $installsetpath;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$dirname);
-
-    my $path = $installsetpath;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$path);
-
-    $path =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( $dirname =~ /\./ ) { $dirname =~ s/\./_signed_inprogress./; }
-    else { $dirname = $dirname . "_signed_inprogress"; }
-
-    my $newpath = $path . $installer::globals::separator . $dirname;
-    my $removepath = $newpath;
-    $removepath =~ s/_inprogress/_witherror/;
-
-    if ( -d $newpath ) { installer::systemactions::remove_complete_directory($newpath, 1); }
-    if ( -d $removepath ) { installer::systemactions::remove_complete_directory($removepath, 1); }
-
-    $infoline = "Copy installation set from $installsetpath to $newpath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    $installsetpath = installer::systemactions::copy_complete_directory($installsetpath, $newpath);
-
-    installer::logger::include_header_into_logfile("End: Copying installation set $installsetpath");
-
-    return $newpath;
-}
-
-########################################################
-# Renaming an existing Windows installation set.
-########################################################
-
-sub rename_install_set
-{
-    my ( $installsetpath ) = @_;
-
-    my $infoline = "";
-
-    my $dirname = $installsetpath;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$dirname);
-
-    my $path = $installsetpath;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$path);
-
-    $path =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( $dirname =~ /\./ ) { $dirname =~ s/\./_inprogress./; }
-    else { $dirname = $dirname . "_inprogress"; }
-
-    my $newpath = $path . $installer::globals::separator . $dirname;
-    my $removepath = $newpath;
-    $removepath =~ s/_inprogress/_witherror/;
-
-    if ( -d $newpath ) { installer::systemactions::remove_complete_directory($newpath, 1); }
-    if ( -d $removepath ) { installer::systemactions::remove_complete_directory($removepath, 1); }
-
-    $installsetpath = installer::systemactions::rename_directory($installsetpath, $newpath);
-
-    return $newpath;
-}
-
-#########################################################
-# Checking the local system
-# Checking existence of needed files in include path
-#########################################################
-
-sub check_system_path
-{
-    # The following files have to be found in the environment variable PATH
-    # Only, if \"-sign\" is used.
-    # Windows : "msicert.exe", "diff.exe", "msidb.exe", "signtool.exe"
-
-    my @needed_files_in_path = ("msicert.exe", "msidb.exe", "signtool.exe", "diff.exe");
-    if ( $installer::globals::internal_cabinet_signing )
-    {
-        push(@needed_files_in_path, "cabarc.exe");
-        push(@needed_files_in_path, "makecab.exe");
-    }
-
-    my $onefile;
-    my $error = 0;
-    my $pathvariable = $ENV{'PATH'};
-    my $local_pathseparator = $installer::globals::pathseparator;
-
-    if( $^O =~ /cygwin/i )
-    {   # When using cygwin's perl the PATH variable is POSIX style and ...
-        $pathvariable = qx{cygpath -mp "$pathvariable"} ;
-        # has to be converted to DOS style for further use.
-        $local_pathseparator = ';';
-    }
-
-    my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
-
-    $installer::globals::patharray = $patharrayref;
-
-    foreach my $onefile ( @needed_files_in_path )
-    {
-        installer::logger::print_message( "...... searching $onefile ..." );
-
-        my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$onefile, $patharrayref , 0);
-
-        if ( $$fileref eq "" )
-        {
-            $error = 1;
-            installer::logger::print_error( "$onefile not found\n" );
-        }
-        else
-        {
-            installer::logger::print_message( "\tFound: $$fileref\n" );
-        }
-    }
-
-    $installer::globals::signfiles_checked = 1;
-
-    if ( $error ) { installer::exiter::exit_program("ERROR: Could not find all needed files in path!", "check_system_path"); }
-}
-
-######################################################
-# Making systemcall
-######################################################
-
-sub make_systemcall
-{
-    my ($systemcall, $displaysystemcall) = @_;
-
-    installer::logger::print_message( "... $displaysystemcall ...\n" );
-
-    my $success = 1;
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $displaysystemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$displaysystemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $success = 0;
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$displaysystemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    return $success;
-}
-
-######################################################
-# Making systemcall with warning
-######################################################
-
-sub make_systemcall_with_warning
-{
-    my ($systemcall, $displaysystemcall) = @_;
-
-    installer::logger::print_message( "... $displaysystemcall ...\n" );
-
-    my $success = 1;
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $displaysystemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "WARNING: Could not execute \"$displaysystemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $success = 0;
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$displaysystemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    return $success;
-}
-
-######################################################
-# Making systemcall with more return data
-######################################################
-
-sub execute_open_system_call
-{
-    my ( $systemcall ) = @_;
-
-    my @openoutput = ();
-    my $success = 1;
-
-    my $comspec = $ENV{COMSPEC};
-    $comspec = $comspec . " -c ";
-
-    if( $^O =~ /cygwin/i )
-    {
-        $comspec = "";
-    }
-
-    my $localsystemcall = "$comspec $systemcall 2>&1 |";
-
-    open( OPN, "$localsystemcall") or warn "Can't execute $localsystemcall\n";
-    while (<OPN>) { push(@openoutput, $_); }
-    close (OPN);
-
-    my $returnvalue = $?;   # $? contains the return value of the systemcall
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $success = 0;
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    return ($success, \@openoutput);
-}
-
-########################################################
-# Reading first line of pw file.
-########################################################
-
-sub get_pw
-{
-    my ( $file ) = @_;
-
-    my $filecontent = installer::files::read_file($file);
-
-    my $pw = ${$filecontent}[0];
-    $pw =~ s/^\s*//;
-    $pw =~ s/\s*$//;
-
-    return $pw;
-}
-
-########################################################
-# Counting the keys of a hash.
-########################################################
-
-sub get_hash_count
-{
-    my ($hashref) = @_;
-
-    my $counter = 0;
-
-    foreach my $key ( keys %{$hashref} ) { $counter++; }
-
-    return $counter;
-}
-
-############################################################
-# Collect all last files in a cabinet file. This is
-# necessary to control, if the cabinet file was damaged
-# by calling signtool.exe.
-############################################################
-
-sub analyze_file_file
-{
-    my ($filecontent) = @_;
-
-    my %filenamehash = ();
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i < 3 ) { next; }
-
-        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $name = $1;
-            my $sequence = $8;
-
-            $filenamehash{$sequence} = $name;
-        }
-    }
-
-    return ( \%filenamehash );
-}
-
-############################################################
-# Collect all DiskIds to the corresponding cabinet files.
-############################################################
-
-sub analyze_media_file
-{
-    my ($filecontent) = @_;
-
-    my %diskidhash = ();
-    my %lastsequencehash = ();
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i < 3 ) { next; }
-
-        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $diskid = $1;
-            my $lastsequence = $2;
-            my $cabfile = $4;
-
-            $diskidhash{$cabfile} = $diskid;
-            $lastsequencehash{$cabfile} = $lastsequence;
-        }
-    }
-
-    return ( \%diskidhash, \%lastsequencehash );
-}
-
-########################################################
-# Collect all DiskIds from database table "Media".
-########################################################
-
-sub collect_diskid_from_media_table
-{
-    my ($msidatabase, $languagestring) = @_;
-
-    # creating working directory
-    my $workdir = installer::systemactions::create_directories("media", \$languagestring);
-    installer::windows::admin::extract_tables_from_pcpfile($msidatabase, $workdir, "Media File");
-
-    # Reading tables
-    my $filename = $workdir . $installer::globals::separator . "Media.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); }
-    my $filecontent = installer::files::read_file($filename);
-    my ( $diskidhash, $lastsequencehash ) = analyze_media_file($filecontent);
-
-    $filename = $workdir . $installer::globals::separator . "File.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); }
-    $filecontent = installer::files::read_file($filename);
-    my $filenamehash = analyze_file_file($filecontent);
-
-    return ( $diskidhash, $filenamehash, $lastsequencehash );
-}
-
-########################################################
-# Check, if this installation set contains
-# internal cabinet files included into the msi
-# database.
-########################################################
-
-sub check_for_internal_cabfiles
-{
-    my ($cabfilehash) = @_;
-
-    my $contains_internal_cabfiles = 0;
-    my %allcabfileshash = ();
-
-    foreach my $filename ( keys %{$cabfilehash} )
-    {
-        if ( $filename =~ /^\s*\#/ )     # starting with a hash
-        {
-            $contains_internal_cabfiles = 1;
-            # setting real filename without hash as key and name with hash as value
-            my $realfilename = $filename;
-            $realfilename =~ s/^\s*\#//;
-            $allcabfileshash{$realfilename} = $filename;
-        }
-    }
-
-    return ( $contains_internal_cabfiles, \%allcabfileshash );
-}
-
-########################################################
-# Collecting all files in an installation set.
-########################################################
-
-sub analyze_installset_content
-{
-    my ( $installsetpath ) = @_;
-
-    my @sourcefiles = ();
-    my $pathstring = "";
-    installer::systemactions::read_complete_directory($installsetpath, $pathstring, \@sourcefiles);
-
-    if ( ! ( $#sourcefiles > -1 )) { installer::exiter::exit_program("ERROR: No file in installation set. Path: $installsetpath !", "analyze_installset_content"); }
-
-    my %allcabfileshash = ();
-    my %allmsidatabaseshash = ();
-    my %allfileshash = ();
-    my $contains_external_cabfiles = 0;
-    my $msidatabase = "";
-    my $contains_msidatabase = 0;
-
-    for ( my $j = 0; $j <= $#sourcefiles; $j++ )
-    {
-        if ( $sourcefiles[$j] =~ /\.cab\s*$/ ) { $allcabfileshash{$sourcefiles[$j]} = 1; }
-        else
-        {
-            if ( $sourcefiles[$j] =~ /\.txt\s*$/ ) { next; }
-            if ( $sourcefiles[$j] =~ /\.html\s*$/ ) { next; }
-            if ( $sourcefiles[$j] =~ /\.ini\s*$/ ) { next; }
-            if ( $sourcefiles[$j] =~ /\.bmp\s*$/ ) { next; }
-            if ( $sourcefiles[$j] =~ /\.msi\s*$/ )
-            {
-                if ( $msidatabase eq "" ) { $msidatabase = $sourcefiles[$j]; }
-                else { installer::exiter::exit_program("ERROR: There is more than one msi database in installation set. Path: $installsetpath !", "analyze_installset_content"); }
-            }
-            $allfileshash{$sourcefiles[$j]} = 1;
-        }
-    }
-
-    # Is there at least one cab file in the installation set?
-    my $cabcounter = get_hash_count(\%allcabfileshash);
-    if ( $cabcounter > 0 ) { $contains_external_cabfiles = 1; }
-
-    # How about a cab file without a msi database?
-    if (( $cabcounter > 0 ) && ( $msidatabase eq "" )) { installer::exiter::exit_program("ERROR: There is no msi database in the installation set, but an external cabinet file. Path: $installsetpath !", "collect_installset_content"); }
-
-    if ( $msidatabase ne "" ) { $contains_msidatabase = 1; }
-
-    return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, \@sourcefiles);
-}
-
-########################################################
-# Adding content of external cabinet files into the
-# msi database
-########################################################
-
-sub msicert_database
-{
-    my ($msidatabase, $allcabfiles, $cabfilehash, $internalcabfile) = @_;
-
-    my $fullsuccess = 1;
-
-    foreach my $cabfile ( keys %{$allcabfiles} )
-    {
-        my $origfilesize = -s $cabfile;
-
-        my $mediacabfilename = $cabfile;
-        if ( $internalcabfile ) { $mediacabfilename = "\#" . $mediacabfilename; }
-        if ( ! exists($cabfilehash->{$mediacabfilename}) ) { installer::exiter::exit_program("ERROR: Could not determine DiskId from media table for cabinet file \"$cabfile\" !", "msicert_database"); }
-        my $diskid = $cabfilehash->{$mediacabfilename};
-
-        my $systemcall = "msicert.exe -d $msidatabase -m $diskid -c $cabfile -h";
-         $success = make_systemcall($systemcall, $systemcall);
-        if ( ! $success ) { $fullsuccess = 0; }
-
-        # size of cabinet file must not change
-        my $finalfilesize = -s $cabfile;
-
-        if ( $origfilesize != $finalfilesize ) { installer::exiter::exit_program("ERROR: msicert.exe changed size of cabinet file !", "msicert_database"); }
-    }
-
-    return $fullsuccess;
-}
-
-########################################################
-# Checking if cabinet file was broken by signtool.
-########################################################
-
-sub cabinet_cosistency_check
-{
-    my ( $onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath ) = @_;
-
-    my $infoline = "Making consistency check of $onefile\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    my $expandfile = "expand.exe";  # Has to be in the path
-
-    if ( $^O =~ /cygwin/i )
-    {
-        $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
-        chomp $expandfile;
-    }
-
-    if ( $filenamehash == 0 )
-    {
-        $infoline = "Warning: Stopping consistency check: Important hash of filenames is empty!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    elsif  ( $lastsequencehash == 0 )
-    {
-        $infoline = "Warning: Stopping consistency check; Important hash of last sequences is empty!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else # both hashes are available
-    {
-        # $onefile contains only the name of the cabinet file without path
-         my $sequence = $lastsequencehash->{$onefile};
-         my $lastfile = $filenamehash->{$sequence};
-        $infoline = "Check of $onefile: Sequence: $sequence is file: $lastfile\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-         # Therefore the file $lastfile need to be binary compared.
-         # It has to be expanded from the cabinet file
-         # of the original installation set and from the
-         # newly signed cabinet file.
-
-        # How about cabinet files extracted from msi database?
-        my $finalinstalldir = $followmeinfohash->{'finalinstalldir'};
-
-        $finalinstalldir =~ s/\\\s*$//;
-        $finalinstalldir =~ s/\/\s*$//;
-        my $sourcecabfile = $finalinstalldir . $installer::globals::separator . $onefile;
-        my $currentpath = cwd();
-        my $destcabfile = $currentpath . $installer::globals::separator . $onefile;
-
-        if ( $^O =~ /cygwin/i )
-        {
-            chomp( $destcabfile = qx{cygpath -w "$destcabfile"} );
-            $destcabfile =~ s/\\/\//g;
-        }
-
-        if ( ! -f $sourcecabfile )
-        {
-            $infoline = "WARNING: Check of cab file cannot happen, because source cabinet file was not found: $sourcecabfile\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        elsif ( ! -f $destcabfile )
-        {
-            $infoline = "WARNING: Check of cab file cannot happen, because destination cabinet file was not found: $sourcecabfile\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else # everything is okay for the check
-        {
-            my $diffpath = get_diff_path($temppath);
-
-            my $origdiffpath = $diffpath . $installer::globals::separator . "orig";
-            my $newdiffpath = $diffpath . $installer::globals::separator . "new";
-
-            if ( ! -d $origdiffpath ) { mkdir($origdiffpath); }
-            if ( ! -d $newdiffpath ) { mkdir($newdiffpath); }
-
-            my $systemcall = "$expandfile $sourcecabfile $origdiffpath -f:$lastfile ";
-            $infoline = $systemcall . "\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            my $success = make_systemcall($systemcall, $systemcall);
-            if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
-
-            $systemcall = "$expandfile $destcabfile $newdiffpath -f:$lastfile ";
-            $infoline = $systemcall . "\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            $success = make_systemcall($systemcall, $systemcall);
-            if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
-
-            # and finally the two files can be diffed.
-            my $origfile = $origdiffpath . $installer::globals::separator . $lastfile;
-            my $newfile = $newdiffpath . $installer::globals::separator . $lastfile;
-
-            if ( ! -f $origfile ) { installer::exiter::exit_program("ERROR: Unpacked original file not found: $origfile !", "cabinet_cosistency_check"); }
-            if ( ! -f $newfile ) { installer::exiter::exit_program("ERROR: Unpacked new file not found: $newfile !", "cabinet_cosistency_check"); }
-
-            my $origsize = -s $origfile;
-            my $newsize = -s $newfile;
-
-            if ( $origsize != $newsize ) # This shows an error!
-            {
-                $infoline = "ERROR: Different filesize after signtool.exe was used. Original: $origsize Bytes, new: $newsize. File: $lastfile\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                installer::exiter::exit_program("ERROR: The cabinet file $destcabfile is broken after signtool.exe signed this file !", "cabinet_cosistency_check");
-            }
-            else
-            {
-                $infoline = "Same size of last file in cabinet file after usage of signtool.exe: $newsize (File: $lastfile)\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                # Also making a binary diff?
-
-                my $difffile = "diff.exe";  # has to be in the path
-                $systemcall = "$difffile $origfile $newfile";
-                $infoline = $systemcall . "\n";
-                $returnvalue = make_systemcall($systemcall, $systemcall);
-
-                my $success = $?;
-
-                if ( $success == 0 )
-                {
-                    $infoline = "Last files are identical after signing cabinet file (File: $lastfile)\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-                elsif ( $success == 1 )
-                {
-                    $infoline = "ERROR: Last files are different after signing cabinet file (File: $lastfile)\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    installer::exiter::exit_program("ERROR: Last files are different after signing cabinet file (File: $lastfile)!", "cabinet_cosistency_check");
-                }
-                else
-                {
-                    $infoline = "ERROR: Problem occurred calling diff.exe (File: $lastfile)\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    installer::exiter::exit_program("ERROR: Problem occurred calling diff.exe (File: $lastfile) !", "cabinet_cosistency_check");
-                }
-            }
-        }
-    }
-
-}
-
-########################################################
-# Signing a list of files
-########################################################
-
-sub sign_files
-{
-    my ( $followmeinfohash, $allfiles, $pw, $cabinternal, $filenamehash, $lastsequencehash, $temppath ) = @_;
-
-    my $infoline = "";
-    my $fullsuccess = 1;
-    my $maxcounter = 3;
-
-    my $productname = "";
-    if ( $followmeinfohash->{'allvariableshash'}->{'PRODUCTNAME'} ) { $productname = "/d " . "\"$followmeinfohash->{'allvariableshash'}->{'PRODUCTNAME'}\""; }
-    my $url = "";
-    if (( ! exists($followmeinfohash->{'allvariableshash'}->{'OPENSOURCE'}) ) || ( $followmeinfohash->{'allvariableshash'}->{'OPENSOURCE'} == 0 )) { $url = "/du " . "\"http://www.sun.com\""; }
-    else { $url = "/du " . "\"http://www.openoffice.org\""; }
-    my $timestampurl = "http://timestamp.verisign.com/scripts/timestamp.dll";
-
-    my $pfxfilepath = $installer::globals::pfxfile;
-
-    if( $^O =~ /cygwin/i )
-    {
-        $pfxfilepath = qx{cygpath -w "$pfxfilepath"};
-        $pfxfilepath =~ s/\\/\\\\/g;
-        $pfxfilepath =~ s/\s*$//g;
-    }
-
-    foreach my $onefile ( reverse sort keys %{$allfiles} )
-    {
-        if ( already_certified($onefile) )
-        {
-            $infoline = "Already certified: Skipping file $onefile\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            next;
-        }
-
-        my $counter = 1;
-        my $success = 0;
-
-        while (( $counter <= $maxcounter ) && ( ! $success ))
-        {
-            if ( $counter > 1 ) { installer::logger::print_message( "\n\n... repeating file $onefile ...\n" ); }
-            if ( $cabinternal ) { installer::logger::print_message("    Signing: $onefile\n"); }
-            my $systemcall = "signtool.exe sign /f \"$pfxfilepath\" /p $pw $productname $url /t \"$timestampurl\" \"$onefile\"";
-            my $displaysystemcall = "signtool.exe sign /f \"$pfxfilepath\" /p ***** $productname $url /t \"$timestampurl\" \"$onefile\"";
-             $success = make_systemcall_with_warning($systemcall, $displaysystemcall);
-             $counter++;
-         }
-
-         # Special check for cabinet files, that sometimes get damaged by signtool.exe
-         if (( $success ) && ( $onefile =~ /\.cab\s*$/ ) && ( ! $cabinternal ))
-         {
-             cabinet_cosistency_check($onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath);
-        }
-
-         if ( ! $success )
-         {
-             $fullsuccess = 0;
-            installer::exiter::exit_program("ERROR: Could not sign file: $onefile!", "sign_files");
-        }
-    }
-
-    return $fullsuccess;
-}
-
-##########################################################################
-# Lines in ddf files must not contain more than 256 characters
-##########################################################################
-
-sub check_ddf_file
-{
-    my ( $ddffile, $ddffilename ) = @_;
-
-    my $maxlength = 0;
-    my $maxline = 0;
-    my $linelength = 0;
-    my $linenumber = 0;
-
-    for ( my $i = 0; $i <= $#{$ddffile}; $i++ )
-    {
-        my $oneline = ${$ddffile}[$i];
-
-        $linelength = length($oneline);
-        $linenumber = $i + 1;
-
-        if ( $linelength > 256 )
-        {
-            installer::exiter::exit_program("ERROR \"$ddffilename\" line $linenumber: Lines in ddf files must not contain more than 256 characters!", "check_ddf_file");
-        }
-
-        if ( $linelength > $maxlength )
-        {
-            $maxlength = $linelength;
-            $maxline = $linenumber;
-        }
-    }
-
-    my $infoline = "Check of ddf file \"$ddffilename\": Maximum length \"$maxlength\" in line \"$maxline\" (allowed line length: 256 characters)\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-#################################################################
-# Setting the path, where the cab files are unpacked.
-#################################################################
-
-sub get_cab_path
-{
-    my ($temppath) = @_;
-
-    my $cabpath = "cabs_" . $$;
-    $cabpath = $temppath . $installer::globals::separator . $cabpath;
-    if ( ! -d $cabpath ) { installer::systemactions::create_directory($cabpath); }
-
-    return $cabpath;
-}
-
-#################################################################
-# Setting the path, where the diff can happen.
-#################################################################
-
-sub get_diff_path
-{
-    my ($temppath) = @_;
-
-    my $diffpath = "diff_" . $$;
-    $diffpath = $temppath . $installer::globals::separator . $diffpath;
-    if ( ! -d $diffpath ) { installer::systemactions::create_directory($diffpath); }
-
-    return $diffpath;
-}
-
-#################################################################
-# Exclude all cab files from the msi database.
-#################################################################
-
-sub extract_cabs_from_database
-{
-    my ($msidatabase, $allcabfiles) = @_;
-
-    installer::logger::include_header_into_logfile("Extracting cabs from msi database");
-
-    my $infoline = "";
-    my $fullsuccess = 1;
-    my $msidb = "msidb.exe";    # Has to be in the path
-
-    # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-    $msidatabase =~ s/\//\\\\/g;
-
-    foreach my $onefile ( keys %{$allcabfiles} )
-    {
-        my $systemcall = $msidb . " -d " . $msidatabase . " -x " . $onefile;
-         my $success = make_systemcall($systemcall, $systemcall);
-        if ( ! $success ) { $fullsuccess = 0; }
-
-        # and removing the stream from the database
-        $systemcall = $msidb . " -d " . $msidatabase . " -k " . $onefile;
-         $success = make_systemcall($systemcall, $systemcall);
-        if ( ! $success ) { $fullsuccess = 0; }
-    }
-
-    return $fullsuccess;
-}
-
-#################################################################
-# Include cab files into the msi database.
-#################################################################
-
-sub include_cabs_into_database
-{
-    my ($msidatabase, $allcabfiles) = @_;
-
-    installer::logger::include_header_into_logfile("Including cabs into msi database");
-
-    my $infoline = "";
-    my $fullsuccess = 1;
-    my $msidb = "msidb.exe";    # Has to be in the path
-
-    # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-    $msidatabase =~ s/\//\\\\/g;
-
-    foreach my $onefile ( keys %{$allcabfiles} )
-    {
-        my $systemcall = $msidb . " -d " . $msidatabase . " -a " . $onefile;
-         my $success = make_systemcall($systemcall, $systemcall);
-        if ( ! $success ) { $fullsuccess = 0; }
-    }
-
-    return $fullsuccess;
-}
-
-########################################################
-# Reading the order of the files inside the
-# cabinet files.
-########################################################
-
-sub read_cab_file
-{
-    my ($cabfilename) = @_;
-
-    installer::logger::print_message( "\n... reading cabinet file $cabfilename ...\n" );
-    my $infoline = "Reading cabinet file $cabfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $systemcall = "cabarc.exe" . " L " . $cabfilename;
-    push(@logfile, "$systemcall\n");
-
-    my ($success, $fileorder) = execute_open_system_call($systemcall);
-
-    my @allfiles = ();
-
-    for ( my $i = 0; $i <= $#{$fileorder}; $i++ )
-    {
-        my $line = ${$fileorder}[$i];
-        if ( $line =~ /^\s*(.*?)\s+\d+\s+\d+\/\d+\/\d+\s+\d+\:\d+\:\d+\s+[\w-]+\s*$/ )
-        {
-            my $filename = $1;
-            push(@allfiles, $filename);
-        }
-    }
-
-    return \@allfiles;
-}
-
-########################################################
-# Unpacking a cabinet file.
-########################################################
-
-sub unpack_cab_file
-{
-    my ($cabfilename, $temppath) = @_;
-
-    installer::logger::print_message( "\n... unpacking cabinet file $cabfilename ...\n" );
-    my $infoline = "Unpacking cabinet file $cabfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $dirname = $cabfilename;
-    $dirname =~ s/\.cab\s*$//;
-    my $workingpath = $temppath . $installer::globals::separator . "unpack_". $dirname . "_" . $$;
-    if ( ! -d $workingpath ) { installer::systemactions::create_directory($workingpath); }
-
-    # changing into unpack directory
-    my $from = cwd();
-    chdir($workingpath);
-
-    my $fullcabfilename = $from . $installer::globals::separator . $cabfilename;
-
-    if( $^O =~ /cygwin/i )
-    {
-        $fullcabfilename = qx{cygpath -w "$fullcabfilename"};
-        $fullcabfilename =~ s/\\/\\\\/g;
-        $fullcabfilename =~ s/\s*$//g;
-    }
-
-    my $systemcall = "cabarc.exe" . " -p X " . $fullcabfilename;
-    $success = make_systemcall($systemcall, $systemcall);
-    if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not unpack cabinet file: $fullcabfilename!", "unpack_cab_file"); }
-
-    # returning to directory
-    chdir($from);
-
-    return $workingpath;
-}
-
-########################################################
-# Returning the header of a ddf file.
-########################################################
-
-sub get_ddf_file_header
-{
-    my ($ddffileref, $cabinetfile, $installdir) = @_;
-
-    my $oneline;
-    my $compressionlevel = 2;
-
-    if( $^O =~ /cygwin/i )
-    {
-        $installdir = qx{cygpath -w "$installdir"};
-        $installdir =~ s/\s*$//g;
-    }
-
-    $oneline = ".Set CabinetName1=" . $cabinetfile . "\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set ReservePerCabinetSize=128\n";  # This reserves space for a digital signature.
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set MaxDiskSize=2147483648\n";     # This allows the .cab file to get a size of 2 GB.
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set CompressionType=LZX\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set Compress=ON\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set CompressionLevel=$compressionlevel\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set Cabinet=ON\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set DiskDirectoryTemplate=" . $installdir . "\n";
-    push(@{$ddffileref} ,$oneline);
-}
-
-########################################################
-# Writing content into ddf file.
-########################################################
-
-sub put_all_files_into_ddffile
-{
-    my ($ddffile, $allfiles, $workingpath) = @_;
-
-    $workingpath =~ s/\//\\/g;
-
-    for ( my $i = 0; $i <= $#{$allfiles}; $i++ )
-    {
-        my $filename = ${$allfiles}[$i];
-        if( $^O =~ /cygwin/i ) { $filename =~ s/\//\\/g; } # Backslash for Cygwin!
-        if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file: $filename!", "put_all_files_into_ddffile"); }
-        my $infoline = "\"" . $filename . "\"" . " " . ${$allfiles}[$i] . "\n";
-        push( @{$ddffile}, $infoline);
-    }
-}
-
-########################################################
-# Packing a cabinet file.
-########################################################
-
-sub do_pack_cab_file
-{
-    my ($cabfilename, $allfiles, $workingpath, $temppath) = @_;
-
-    installer::logger::print_message( "\n... packing cabinet file $cabfilename ...\n" );
-    my $infoline = "Packing cabinet file $cabfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ( -f $cabfilename ) { unlink($cabfilename); } # removing cab file
-    if ( -f $cabfilename ) { installer::exiter::exit_program("ERROR: Failed to remove file: $cabfilename!", "do_pack_cab_file"); }
-
-    # generate ddf file for makecab.exe
-    my @ddffile = ();
-
-    my $dirname = $cabfilename;
-    $dirname =~ s/\.cab\s*$//;
-    my $ddfpath = $temppath . $installer::globals::separator . "ddf_". $dirname . "_" . $$;
-
-    my $ddffilename = $cabfilename;
-    $ddffilename =~ s/.cab/.ddf/;
-    $ddffilename = $ddfpath . $installer::globals::separator . $ddffilename;
-
-    if ( ! -d $ddfpath ) { installer::systemactions::create_directory($ddfpath); }
-
-    my $from = cwd();
-
-    chdir($workingpath); # changing into the directory with the unpacked files
-
-    get_ddf_file_header(\@ddffile, $cabfilename, $from);
-    put_all_files_into_ddffile(\@ddffile, $allfiles, $workingpath);
-    # lines in ddf files must not be longer than 256 characters
-    check_ddf_file(\@ddffile, $ddffilename);
-
-    installer::files::save_file($ddffilename, \@ddffile);
-
-    if( $^O =~ /cygwin/i )
-    {
-        $ddffilename = qx{cygpath -w "$ddffilename"};
-        $ddffilename =~ s/\\/\\\\/g;
-        $ddffilename =~ s/\s*$//g;
-    }
-
-    my $systemcall = "makecab.exe /V1 /F " . $ddffilename;
-    my $success = make_systemcall($systemcall, $systemcall);
-    if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not pack cabinet file!", "do_pack_cab_file"); }
-
-    chdir($from);
-
-    return ($success);
-}
-
-########################################################
-# Extraction the file extension from a file
-########################################################
-
-sub get_extension
-{
-    my ( $file ) = @_;
-
-    my $extension = "";
-
-    if ( $file =~ /^\s*(.*)\.(\w+?)\s*$/ ) { $extension = $2; }
-
-    return $extension;
-}
-
-########################################################
-# Checking, if a file already contains a certificate.
-# This must not be overwritten.
-########################################################
-
-sub already_certified
-{
-    my ( $filename ) = @_;
-
-    my $success = 1;
-    my $is_certified = 0;
-
-    my $systemcall = "signtool.exe verify /q /pa \"$filename\"";
-    my $returnvalue = system($systemcall);
-
-    if ( $returnvalue ) { $success = 0; }
-
-     if ( $success )
-     {
-         $is_certified = 1;
-        installer::logger::print_message( "... already certified -> skipping $filename ...\n" );
-    }
-
-    return $is_certified;
-}
-
-########################################################
-# Signing the files, that are included into
-# cabinet files.
-########################################################
-
-sub sign_files_in_cabinet_files
-{
-    my ( $followmeinfohash, $allcabfiles, $pw, $temppath ) = @_;
-
-    my $complete_success = 1;
-    my $from = cwd();
-
-    foreach my $cabfilename ( keys %{$allcabfiles} )
-    {
-        my $success = 1;
-
-        # saving order of files in cab file
-        my $fileorder = read_cab_file($cabfilename);
-
-        # unpack into $working path
-        my $workingpath = unpack_cab_file($cabfilename, $temppath);
-
-        chdir($workingpath);
-
-        # sign files
-        my %allfileshash = ();
-        foreach my $onefile ( @{$fileorder} )
-        {
-            my $extension = get_extension($onefile);
-            if ( exists( $installer::globals::sign_extensions{$extension} ) )
-            {
-                $allfileshash{$onefile} = 1;
-            }
-        }
-         $success = sign_files($followmeinfohash, \%allfileshash, $pw, 1, 0, 0, $temppath);
-        if ( ! $success ) { $complete_success = 0; }
-
-        chdir($from);
-
-        # pack into new directory
-        do_pack_cab_file($cabfilename, $fileorder, $workingpath, $temppath);
-    }
-
-    return $complete_success;
-}
-
-########################################################
-# Comparing the content of two directories.
-# Only filesize is compared.
-########################################################
-
-sub compare_directories
-{
-    my ( $dir1, $dir2, $files ) = @_;
-
-    $dir1 =~ s/\\\s*//;
-    $dir2 =~ s/\\\s*//;
-    $dir1 =~ s/\/\s*//;
-    $dir2 =~ s/\/\s*//;
-
-    my $infoline = "Comparing directories: $dir1 and $dir2\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    foreach my $onefile ( @{$files} )
-    {
-        my $file1 = $dir1 . $installer::globals::separator . $onefile;
-        my $file2 = $dir2 . $installer::globals::separator . $onefile;
-
-        if ( ! -f $file1 ) { installer::exiter::exit_program("ERROR: Missing file : $file1!", "compare_directories"); }
-        if ( ! -f $file2 ) { installer::exiter::exit_program("ERROR: Missing file : $file2!", "compare_directories"); }
-
-        my $size1 = -s $file1;
-        my $size2 = -s $file2;
-
-        $infoline = "Comparing files: $file1 ($size1) and $file2 ($size2)\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        if ( $size1 != $size2 )
-        {
-            installer::exiter::exit_program("ERROR: File defect after copy (different size) $file1 ($size1 bytes) and $file2 ($size2 bytes)!", "compare_directories");
-        }
-    }
-}
-
-########################################################
-# Signing an existing Windows installation set.
-########################################################
-
-sub sign_install_set
-{
-    my ($followmeinfohash, $make_copy, $temppath) = @_;
-
-    my $installsetpath = $followmeinfohash->{'finalinstalldir'};
-
-    installer::logger::include_header_into_logfile("Start: Signing installation set $installsetpath");
-
-    my $complete_success = 1;
-    my $success = 1;
-
-    my $infoline = "Signing installation set in $installsetpath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # check required files.
-    if ( ! $installer::globals::signfiles_checked ) { check_system_path(); }
-
-    # get cerficate information
-    my $pw = get_pw($installer::globals::pwfile);
-
-    # making a copy of the installation set, if required
-    if ( $make_copy ) { $installsetpath = copy_install_set($installsetpath); }
-    else { $installsetpath = rename_install_set($installsetpath); }
-
-    # collecting all files in the installation set
-    my ($allcabfiles, $allfiles, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, $sourcefiles) = analyze_installset_content($installsetpath);
-
-    if ( $make_copy ) { compare_directories($installsetpath, $followmeinfohash->{'finalinstalldir'}, $sourcefiles); }
-
-    # changing into installation set
-    my $from = cwd();
-    my $fullmsidatabase = $installsetpath . $installer::globals::separator . $msidatabase;
-
-    if( $^O =~ /cygwin/i )
-    {
-        $fullmsidatabase = qx{cygpath -w "$fullmsidatabase"};
-        $fullmsidatabase =~ s/\\/\\\\/g;
-        $fullmsidatabase =~ s/\s*$//g;
-    }
-
-    chdir($installsetpath);
-
-    if ( $contains_msidatabase )
-    {
-        # exclude media table from msi database and get all diskids.
-        my ( $cabfilehash, $filenamehash, $lastsequencehash ) = collect_diskid_from_media_table($msidatabase, $followmeinfohash->{'languagestring'});
-
-        # Check, if there are internal cab files
-        my ( $contains_internal_cabfiles, $all_internal_cab_files) = check_for_internal_cabfiles($cabfilehash);
-
-        if ( $contains_internal_cabfiles )
-        {
-            my $cabpath = get_cab_path($temppath);
-            chdir($cabpath);
-
-            # Exclude all cabinet files from database
-            $success = extract_cabs_from_database($fullmsidatabase, $all_internal_cab_files);
-            if ( ! $success ) { $complete_success = 0; }
-
-            if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $all_internal_cab_files, $pw, $temppath); }
-
-            $success = sign_files($followmeinfohash, $all_internal_cab_files, $pw, 0, $filenamehash, $lastsequencehash, $temppath);
-            if ( ! $success ) { $complete_success = 0; }
-            $success = msicert_database($fullmsidatabase, $all_internal_cab_files, $cabfilehash, 1);
-            if ( ! $success ) { $complete_success = 0; }
-
-            # Include all cabinet files into database
-            $success = include_cabs_into_database($fullmsidatabase, $all_internal_cab_files);
-            if ( ! $success ) { $complete_success = 0; }
-            chdir($installsetpath);
-        }
-
-        # Warning: There might be a problem with very big cabinet files
-        # signing all external cab files first
-        if ( $contains_external_cabfiles )
-        {
-            if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $allcabfiles, $pw, $temppath); }
-
-            $success = sign_files($followmeinfohash, $allcabfiles, $pw, 0, $filenamehash, $lastsequencehash, $temppath);
-            if ( ! $success ) { $complete_success = 0; }
-            $success = msicert_database($msidatabase, $allcabfiles, $cabfilehash, 0);
-            if ( ! $success ) { $complete_success = 0; }
-        }
-    }
-
-    # finally all other files can be signed
-    $success = sign_files($followmeinfohash, $allfiles, $pw, 0, 0, 0, $temppath);
-    if ( ! $success ) { $complete_success = 0; }
-
-    # and changing back
-    chdir($from);
-
-    installer::logger::include_header_into_logfile("End: Signing installation set $installsetpath");
-
-    return ($installsetpath);
-}
-
-1;
commit af4c27b71a5bc178c69365364d101d9c29e38957
Author: Andras Timar <atimar at suse.com>
Date:   Fri Mar 23 09:59:40 2012 +0100

    remove unused DatabaseFolder dialog from MSI

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index f798e24..49e16c0 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -95,20 +95,6 @@ CustomSetupTips	InstallText	Text	60	105	300	20	3		OOO_CONTROL_69
 CustomSetupTips	MenuText	Text	50	52	300	36	3		OOO_CONTROL_70		
 CustomSetupTips	OK	PushButton	301	243	66	17	3		OOO_CONTROL_72		
 CustomSetupTips	PartialText	Text	60	130	300	20	3		OOO_CONTROL_73		
-DatabaseFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_74	Next	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DatabaseFolder	BannerLine	Line	0	44	374	0	1				
-DatabaseFolder	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-DatabaseFolder	Branding2	Text	3	228	140	13	65537		[ProductName]		
-DatabaseFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_77	ChangeFolder	
-DatabaseFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_78	Back	
-DatabaseFolder	DatabaseFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DatabaseFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_79		
-DatabaseFolder	DlgLine	Line	145	234	229	0	1				
-DatabaseFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_80		
-DatabaseFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_81		
-DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
-DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
 DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
 DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
 DestinationFolder	BannerLine	Line	0	44	374	0	1				
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
index e478ce0..285a77b 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
@@ -32,11 +32,6 @@ CustomSetup	Next	[_IsSetupTypeMin]	Custom	1	0
 CustomSetup	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 CustomSetup	Next	NewDialog	ReadyToInstall	OutOfNoRbDiskSpace <> 1	0
 CustomSetupTips	OK	EndDialog	Return	1	1
-DatabaseFolder	Back	NewDialog	CustomerInformation	1	1
-DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
-DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DatabaseFolder	Next	NewDialog	SetupType	1	1
 DestinationFolder	Back	NewDialog	InstallWelcome	1	0
 DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
 DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
index d950c9a..7e97dd8 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
@@ -8,7 +8,6 @@ CancelSetup	50	50	260	85	3	[ProductName] [Setup]	No	No	No
 CustomerInformation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	NameLabel	Next	Cancel
 CustomSetup	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	Tree	Next	Cancel
 CustomSetupTips	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-DatabaseFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
 DestinationFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
 DiskSpaceRequirements	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
 FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retry	Exit
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index f798e24..49e16c0 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -95,20 +95,6 @@ CustomSetupTips	InstallText	Text	60	105	300	20	3		OOO_CONTROL_69
 CustomSetupTips	MenuText	Text	50	52	300	36	3		OOO_CONTROL_70		
 CustomSetupTips	OK	PushButton	301	243	66	17	3		OOO_CONTROL_72		
 CustomSetupTips	PartialText	Text	60	130	300	20	3		OOO_CONTROL_73		
-DatabaseFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_74	Next	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DatabaseFolder	BannerLine	Line	0	44	374	0	1				
-DatabaseFolder	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-DatabaseFolder	Branding2	Text	3	228	140	13	65537		[ProductName]		
-DatabaseFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_77	ChangeFolder	
-DatabaseFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_78	Back	
-DatabaseFolder	DatabaseFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DatabaseFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_79		
-DatabaseFolder	DlgLine	Line	145	234	229	0	1				
-DatabaseFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_80		
-DatabaseFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_81		
-DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
-DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
 DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
 DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
 DestinationFolder	BannerLine	Line	0	44	374	0	1				
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index e478ce0..285a77b 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -32,11 +32,6 @@ CustomSetup	Next	[_IsSetupTypeMin]	Custom	1	0
 CustomSetup	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 CustomSetup	Next	NewDialog	ReadyToInstall	OutOfNoRbDiskSpace <> 1	0
 CustomSetupTips	OK	EndDialog	Return	1	1
-DatabaseFolder	Back	NewDialog	CustomerInformation	1	1
-DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
-DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DatabaseFolder	Next	NewDialog	SetupType	1	1
 DestinationFolder	Back	NewDialog	InstallWelcome	1	0
 DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
 DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
index d950c9a..7e97dd8 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
@@ -8,7 +8,6 @@ CancelSetup	50	50	260	85	3	[ProductName] [Setup]	No	No	No
 CustomerInformation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	NameLabel	Next	Cancel
 CustomSetup	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	Tree	Next	Cancel
 CustomSetupTips	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-DatabaseFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
 DestinationFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
 DiskSpaceRequirements	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
 FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retry	Exit
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 249120b..3014793 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -172,30 +172,6 @@ en-US = "OK"
 [OOO_CONTROL_73]
 en-US = "Will have some subfeatures installed to the local hard drive. (Available only if the feature has subfeatures.)"
 
-[OOO_CONTROL_74]
-en-US = "< &Back"
-
-[OOO_CONTROL_77]
-en-US = "Cancel"
-
-[OOO_CONTROL_78]
-en-US = "&Change..."
-
-[OOO_CONTROL_79]
-en-US = "Click Next to install to this folder, or click Change to install to a different folder."
-
-[OOO_CONTROL_80]
-en-US = "{&MSSansBold8}Database Folder"
-
-[OOO_CONTROL_81]
-en-US = "[DATABASEDIR]"
-
-[OOO_CONTROL_82]
-en-US = "Install [ProductName] database to:"
-
-[OOO_CONTROL_83]
-en-US = "&Next >"
-
 [OOO_CONTROL_84]
 en-US = "< &Back"
 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 240b178..b932ae5 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -98,20 +98,6 @@ CustomSetupTips	InstallText	Text	60	105	300	20	3		OOO_CONTROL_69
 CustomSetupTips	MenuText	Text	50	52	300	36	3		OOO_CONTROL_70		
 CustomSetupTips	OK	PushButton	301	243	66	17	3		OOO_CONTROL_72		
 CustomSetupTips	PartialText	Text	60	130	300	20	3		OOO_CONTROL_73		
-DatabaseFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_74	Next	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DatabaseFolder	BannerLine	Line	0	44	374	0	1				
-DatabaseFolder	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-DatabaseFolder	Branding2	Text	3	228	88	13	65537		[ProductName]		
-DatabaseFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_77	ChangeFolder	
-DatabaseFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_78	Back	
-DatabaseFolder	DatabaseFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DatabaseFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_79		
-DatabaseFolder	DlgLine	Line	90	234	284	0	1				
-DatabaseFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_80		
-DatabaseFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_81		
-DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
-DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
 DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
 DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
 DestinationFolder	BannerLine	Line	0	44	374	0	1				
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index b32bd00..a8bb1b5 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -41,11 +41,6 @@ CustomSetup	Next	DoAction	SetApplicationSelected	Not Installed And (APPLICATIONC
 CustomSetup	Next	DoAction	SetApplicationSelected	Installed	5
 CustomSetup	Next	SpawnDialog	ApplicationInfo1	APP_SELECTED <> 1	6
 CustomSetupTips	OK	EndDialog	Return	1	1
-DatabaseFolder	Back	NewDialog	CustomerInformation	1	1
-DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
-DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DatabaseFolder	Next	NewDialog	SetupType	1	1
 DestinationFolder	Back	NewDialog	CustomerInformation	1	0
 DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
 DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
index 6b7d05b..ba9cac5 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
@@ -9,7 +9,6 @@ CancelSetup	50	50	260	85	3	[ProductName] [Setup]	No	No	No
 CustomerInformation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	NameLabel	Next	Cancel
 CustomSetup	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	Tree	Next	Cancel
 CustomSetupTips	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-DatabaseFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
 DestinationFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
 DiskSpaceRequirements	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
 FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retry	Exit
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
index 0219c84..123a431 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
@@ -95,20 +95,6 @@ CustomSetupTips	InstallText	Text	60	105	300	20	3		OOO_CONTROL_69
 CustomSetupTips	MenuText	Text	50	52	300	36	3		OOO_CONTROL_70		
 CustomSetupTips	OK	PushButton	301	243	66	17	3		OOO_CONTROL_72		
 CustomSetupTips	PartialText	Text	60	130	300	20	3		OOO_CONTROL_73		
-DatabaseFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_74	Next	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DatabaseFolder	BannerLine	Line	0	44	374	0	1				
-DatabaseFolder	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-DatabaseFolder	Branding2	Text	3	228	92	13	65537		[ProductName]		
-DatabaseFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_77	ChangeFolder	
-DatabaseFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_78	Back	
-DatabaseFolder	DatabaseFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DatabaseFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_79		
-DatabaseFolder	DlgLine	Line	95	234	279	0	1				
-DatabaseFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_80		
-DatabaseFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_81		
-DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
-DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
 DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
 DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
 DestinationFolder	BannerLine	Line	0	44	374	0	1				
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
index e0476e9..6bd5f27 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
@@ -32,11 +32,6 @@ CustomSetup	Next	[_IsSetupTypeMin]	Custom	1	0
 CustomSetup	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 CustomSetup	Next	NewDialog	ReadyToInstall	OutOfNoRbDiskSpace <> 1	0
 CustomSetupTips	OK	EndDialog	Return	1	1
-DatabaseFolder	Back	NewDialog	CustomerInformation	1	1
-DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
-DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DatabaseFolder	Next	NewDialog	SetupType	1	1

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list