[Libreoffice-commits] .: 7 commits - instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/util scp2/source setup_native/prj setup_native/source solenv/bin
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 30 06:26:26 PST 2013
instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt | 71 -
instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminExe.idt | 13
instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminUIS.idt | 14
instsetoo_native/inc_ooolangpack/windows/msi_templates/AdvtExec.idt | 19
instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary.idt | 18
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt | 309 ------
instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt | 57 -
instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt | 125 --
instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt | 9
instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt | 31
instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt | 133 --
instsetoo_native/inc_ooolangpack/windows/msi_templates/EventMap.idt | 19
instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt | 71 -
instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallU.idt | 30
instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt | 4
instsetoo_native/inc_ooolangpack/windows/msi_templates/ListBox.idt | 3
instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt | 55 -
instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt | 11
instsetoo_native/inc_ooolangpack/windows/msi_templates/TextStyl.idt | 25
instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt | 53 -
instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt | 459 ----------
instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt | 170 ---
instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt | 170 ---
instsetoo_native/inc_ooolangpack/windows/msi_templates/ooo_patchcodes.txt | 21
instsetoo_native/inc_ooolangpack/windows/msi_templates/ooodev_patchcodes.txt | 21
instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt | 1
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt | 1
instsetoo_native/util/makefile.mk | 12
scp2/source/ooo/file_library_ooo.scp | 11
scp2/source/ooo/windowscustomaction_ooo.scp | 85 -
setup_native/prj/build.lst | 1
setup_native/source/win32/customactions/languagepacks/exports.dxp | 4
setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx | 196 ----
setup_native/source/win32/customactions/languagepacks/makefile.mk | 73 -
setup_native/source/win32/customactions/languagepacks/respintest.cxx | 175 ---
setup_native/source/win32/customactions/shellextensions/copyeditiondata.cxx | 124 --
setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx | 116 --
setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx | 175 ---
setup_native/source/win32/customactions/shellextensions/exports.dxp | 6
setup_native/source/win32/customactions/shellextensions/makefile.mk | 7
setup_native/source/win32/customactions/shellextensions/postuninstall.cxx | 145 ---
setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx | 60 -
solenv/bin/modules/installer/windows/assembly.pm | 2
solenv/bin/modules/installer/windows/property.pm | 4
44 files changed, 6 insertions(+), 3103 deletions(-)
New commits:
commit 0701e1ab56dd185fd6fc39012c5a798ca4b77f3f
Author: Andras Timar <atimar at suse.com>
Date: Wed Jan 30 13:36:33 2013 +0100
remove CopyEditionData CustomAction
It is not entirely clear what this CustomAction was supposed to do, but
program\edition directory is not present in LibreOffice, therefore this
feature is useless.
Change-Id: Icfcd9c5f88da28e171329d951956baaa42908fd0
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 9a18464..4d5116c 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -178,16 +178,6 @@ WindowsCustomAction gid_Customaction_Check_Install_Directory
Assignment3 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "CheckInstallDirectory", "Not Installed", "2");
End
-WindowsCustomAction gid_Customaction_CopyEditionData
- Name = "CopyEditionData";
- Typ = "1";
- Source = "shlxtmsi.dll";
- Target = "copyEditionData";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
- Assignment2 = ("AdminExecuteSequence", "", "end");
-End
-
WindowsCustomAction gid_Customaction_Patch_Regpatchactivex_Patchactivexcontrol
Name = "PatchActiveXControl";
Typ = "65";
diff --git a/setup_native/source/win32/customactions/shellextensions/copyeditiondata.cxx b/setup_native/source/win32/customactions/shellextensions/copyeditiondata.cxx
deleted file mode 100644
index 0934c56..0000000
--- a/setup_native/source/win32/customactions/shellextensions/copyeditiondata.cxx
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sal/config.h"
-
-#include <cstddef>
-#include <new>
-#include <string.h> // <cstring> not supported by old MSC versions
-
-#define WIN32_LEAN_AND_MEAN
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#include <msiquery.h>
-#include <shellapi.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include "boost/scoped_array.hpp"
-
-#define LCL_LENGTH0(s) (sizeof (s) / sizeof *(s))
-#define LCL_STRING0(s) (s), LCL_LENGTH0(s)
-
-namespace {
-
-enum Status { STATUS_NO, STATUS_YES, STATUS_ERROR };
-
-Status fileExists(wchar_t const * path) {
- return GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES
- ? GetLastError() == ERROR_FILE_NOT_FOUND ? STATUS_NO : STATUS_ERROR
- : STATUS_YES;
-}
-
-wchar_t * getProperty(
- MSIHANDLE install, wchar_t const * name, wchar_t const * suffix,
- std::size_t suffixLength, wchar_t ** end = NULL)
-{
- DWORD n = 0;
- UINT err = MsiGetPropertyW(install, name, L"", &n);
- if (err != ERROR_SUCCESS && err != ERROR_MORE_DATA) {
- return NULL;
- }
- DWORD n2 = n + suffixLength; //TODO: overflow
- wchar_t * data = new(std::nothrow) wchar_t[n2];
- if (data == NULL) {
- return NULL;
- }
- if (MsiGetPropertyW(install, name, data, &n2) != ERROR_SUCCESS || n2 != n) {
- delete[] data;
- return NULL;
- }
- memcpy(data + n, suffix, suffixLength * sizeof (wchar_t)); //TODO: overflow
- if (end != NULL) {
- *end = data + n + suffixLength;
- }
- return data;
-}
-
-}
-
-extern "C" UINT __stdcall copyEditionData(MSIHANDLE install) {
- boost::scoped_array<wchar_t> from(
- getProperty(install, L"SourceDir", LCL_STRING0(L"edition\0")));
- if (!from) {
- return ERROR_INSTALL_FAILURE;
- }
- Status stat = fileExists(from.get());
- if (stat == STATUS_ERROR) {
- return ERROR_INSTALL_FAILURE;
- }
- if (stat == STATUS_NO) {
- return ERROR_SUCCESS;
- }
- wchar_t * end;
- boost::scoped_array<wchar_t> to(
- getProperty(
- install, L"INSTALLLOCATION",
- LCL_STRING0(L"program\\edition\0"), &end));
- if (!to) {
- return ERROR_INSTALL_FAILURE;
- }
- stat = fileExists(to.get());
- if (stat == STATUS_ERROR) {
- return ERROR_INSTALL_FAILURE;
- }
- if (stat == STATUS_YES) {
- SHFILEOPSTRUCTW opDelete = {
- NULL, FO_DELETE, to.get(), NULL, FOF_NOCONFIRMATION | FOF_SILENT,
- FALSE, NULL, NULL }; //TODO: non-NULL hwnd
- if (SHFileOperationW(&opDelete) != 0) {
- return ERROR_INSTALL_FAILURE;
- }
- }
- *(end - LCL_LENGTH0(L"\\edition\0")) = L'\0';
- *(end - LCL_LENGTH0(L"\\edition\0") + 1) = L'\0';
- SHFILEOPSTRUCTW opCopy = {
- NULL, FO_COPY, from.get(), to.get(),
- FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR | FOF_SILENT, FALSE, NULL,
- NULL }; //TODO: non-NULL hwnd
- if (SHFileOperationW(&opCopy) != 0) {
- return ERROR_INSTALL_FAILURE;
- }
- return ERROR_SUCCESS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp
index 9b26446..59a8b3b 100644
--- a/setup_native/source/win32/customactions/shellextensions/exports.dxp
+++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp
@@ -7,7 +7,6 @@ MigrateInstallPath
CheckInstallDirectory
CreateLayerLinks
RemoveLayerLinks
-copyEditionData
RenamePrgFolder
RemovePrgFolder
CheckPatchList
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 880ebc7..93b9888 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -44,7 +44,6 @@ SLOFILES = \
$(SLO)$/completeinstallpath.obj \
$(SLO)$/checkdirectory.obj \
$(SLO)$/layerlinks.obj \
- $(SLO)$/copyeditiondata.obj \
$(SLO)$/vistaspecial.obj \
$(SLO)$/checkpatches.obj
commit cf4ca992349492019938b68ae33ec9fec7cd5e16
Author: Andras Timar <atimar at suse.com>
Date: Tue Jan 29 13:20:07 2013 +0100
remove DotNetCheck CustomAction
We do not need to call a dll function for a simple version check.
Change-Id: If82b06a61f10dbfe3eb92b6fe495e6d800c57aff
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index c7cdc35..9a18464 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -178,16 +178,6 @@ WindowsCustomAction gid_Customaction_Check_Install_Directory
Assignment3 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "CheckInstallDirectory", "Not Installed", "2");
End
-WindowsCustomAction gid_Customaction_Dotnetcheck
- Name = "DotNetCheck";
- Typ = "321";
- Source = "shlxtmsi.dll";
- Target = "DotNetCheck";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "LaunchConditions");
- Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\"", "LaunchConditions");
-End
-
WindowsCustomAction gid_Customaction_CopyEditionData
Name = "CopyEditionData";
Typ = "1";
diff --git a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
deleted file mode 100644
index 864b886..0000000
--- a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#undef UNICODE
-#undef _UNICODE
-
-#define _WIN32_WINDOWS 0x0410
-
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <msiquery.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <malloc.h>
-#include <assert.h>
-
-#include <tchar.h>
-#include <string>
-#include <systools/win32/uwinapi.h>
-
-#include <../tools/seterror.hxx>
-
-using namespace std;
-
-namespace
-{
- string GetMsiProperty(MSIHANDLE handle, const string& sProperty)
- {
- string result;
- TCHAR szDummy[1] = TEXT("");
- DWORD nChars = 0;
-
- if (MsiGetProperty(handle, sProperty.c_str(), szDummy, &nChars) == ERROR_MORE_DATA)
- {
- DWORD nBytes = ++nChars * sizeof(TCHAR);
- LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
- ZeroMemory( buffer, nBytes );
- MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
- result = buffer;
- }
- return result;
- }
-
- inline void SetMsiProperty(MSIHANDLE handle, const string& sProperty, const string& sValue)
- {
- MsiSetProperty(handle, sProperty.c_str(), sValue.c_str());
- }
-
- void stripFinalBackslash(std::string * path) {
- std::string::size_type i = path->size();
- if (i > 1) {
- --i;
- if ((*path)[i] == '\\') {
- path->erase(i);
- }
- }
- }
-
-// Copied more or less verbatim from
-// desktop/source/deployment/inc/dp_version.hxx:1.5 and
-// desktop/source/deployment/misc/dp_version.cxx:1.5:
-
-enum Order { ORDER_LESS, ORDER_EQUAL, ORDER_GREATER };
-
-string getElement(string const & version, string::size_type * index) {
- while (*index < version.size() && version[*index] == '0') {
- ++*index;
- }
- string::size_type i = *index;
- *index = version.find('.', i);
- if (*index == string::npos) {
- *index = version.size();
- return string(version, i);
- } else {
- ++*index;
- return string(version, i, *index - 1 - i);
- }
-}
-
-Order compareVersions(string const & version1, string const & version2) {
- for (string::size_type i1 = 0, i2 = 0;
- i1 < version1.size() || i2 < version2.size();)
- {
- string e1(getElement(version1, &i1));
- string e2(getElement(version2, &i2));
-
- // string myText1 = TEXT("e1: ") + e1;
- // string myText2 = TEXT("e2: ") + e2;
- // MessageBox(NULL, myText1.c_str(), "DEBUG", MB_OK);
- // MessageBox(NULL, myText2.c_str(), "DEBUG", MB_OK);
-
- if (e1.size() < e2.size()) {
- return ORDER_LESS;
- } else if (e1.size() > e2.size()) {
- return ORDER_GREATER;
- } else if (e1 < e2) {
- return ORDER_LESS;
- } else if (e1 > e2) {
- return ORDER_GREATER;
- }
- }
- return ORDER_EQUAL;
-}
-
-} // namespace
-
-extern "C" UINT __stdcall DotNetCheck(MSIHANDLE handle) {
- string present(GetMsiProperty(handle, TEXT("MsiNetAssemblySupport")));
- string required(GetMsiProperty(handle, TEXT("REQUIRED_DOTNET_VERSION")));
-
- // string myText1 = TEXT("MsiNetAssemblySupport: ") + present;
- // string myText2 = TEXT("REQUIRED_DOTNET_VERSION: ") + required;
- // MessageBox(NULL, myText1.c_str(), "DEBUG", MB_OK);
- // MessageBox(NULL, myText2.c_str(), "DEBUG", MB_OK);
-
- SetMsiProperty(
- handle, TEXT("DOTNET_SUFFICIENT"),
- (present.empty() || compareVersions(present, required) == ORDER_LESS ?
- TEXT("0") : TEXT("1")));
-
- // string result(GetMsiProperty(handle, TEXT("DOTNET_SUFFICIENT")));
- // string myText3 = TEXT("DOTNET_SUFFICIENT: ") + result;
- // MessageBox(NULL, myText3.c_str(), "DEBUG", MB_OK);
-
-
- return ERROR_SUCCESS;
-}
-
-extern "C" UINT __stdcall ShowProperties(MSIHANDLE handle)
-{
- string property = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
- string myText = TEXT("INSTALLLOCATION: ") + property;
- MessageBox(NULL, myText.c_str(), "INSTALLLOCATION", MB_OK);
-
- property = GetMsiProperty(handle, TEXT("Installed"));
- myText = TEXT("Installed: ") + property;
- MessageBox(NULL, myText.c_str(), "Installed", MB_OK);
-
- property = GetMsiProperty(handle, TEXT("PATCH"));
- myText = TEXT("PATCH: ") + property;
- MessageBox(NULL, myText.c_str(), "PATCH", MB_OK);
-
- property = GetMsiProperty(handle, TEXT("REMOVE"));
- myText = TEXT("REMOVE: ") + property;
- MessageBox(NULL, myText.c_str(), "REMOVE", MB_OK);
-
- property = GetMsiProperty(handle, TEXT("ALLUSERS"));
- myText = TEXT("ALLUSERS: ") + property;
- MessageBox(NULL, myText.c_str(), "ALLUSERS", MB_OK);
-
- return ERROR_SUCCESS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp
index 364473f..9b26446 100644
--- a/setup_native/source/win32/customactions/shellextensions/exports.dxp
+++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp
@@ -7,8 +7,6 @@ MigrateInstallPath
CheckInstallDirectory
CreateLayerLinks
RemoveLayerLinks
-DotNetCheck
-ShowProperties
copyEditionData
RenamePrgFolder
RemovePrgFolder
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 73e0289..880ebc7 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -44,7 +44,6 @@ SLOFILES = \
$(SLO)$/completeinstallpath.obj \
$(SLO)$/checkdirectory.obj \
$(SLO)$/layerlinks.obj \
- $(SLO)$/dotnetcheck.obj \
$(SLO)$/copyeditiondata.obj \
$(SLO)$/vistaspecial.obj \
$(SLO)$/checkpatches.obj
diff --git a/solenv/bin/modules/installer/windows/assembly.pm b/solenv/bin/modules/installer/windows/assembly.pm
index e639ee2..a03c4de 100644
--- a/solenv/bin/modules/installer/windows/assembly.pm
+++ b/solenv/bin/modules/installer/windows/assembly.pm
@@ -283,7 +283,7 @@ sub add_assembly_condition_into_component_table
{
# setting the condition
- $condition = "DOTNET_SUFFICIENT=1";
+ $condition = "MsiNetAssemblySupport >= \"4.0.0.0\"";
$oneline = $component . "\t" . $componentid . "\t" . $directory . "\t" . $attributes . "\t" . $condition . "\t" . $keypath . "\n";
${$componenttable}[$j] = $oneline;
$changed = 1;
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index f780a6d..7cf568e 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -360,10 +360,6 @@ sub set_important_properties
push(@{$propertyfile}, $onepropertyline);
}
}
-
- # Setting .NET requirements
- push @{$propertyfile}, "REQUIRED_DOTNET_VERSION" . "\t" . "4.0.0.0" . "\n";
- push @{$propertyfile}, "DOTNET_SUFFICIENT" . "\t" . "1" . "\n"; # default value for found .NET
}
#######################################################
commit d14c765b6e20158af34520e1092c552a6d28bbb3
Author: Andras Timar <atimar at suse.com>
Date: Wed Jan 30 13:25:16 2013 +0100
remove CopyExtensionData CustomAction
It copied *.oxt from [SourceDir]\extension to TARGETDIR\share\extension\install.
One might think that *.oxt files there get installed automagically at first start,
but no, it does not happen. This feature looks useless.
Change-Id: I5ce583f3b46f5e4e962449790bdce70f99aa135b
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 06d1520..c7cdc35 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -198,16 +198,6 @@ WindowsCustomAction gid_Customaction_CopyEditionData
Assignment2 = ("AdminExecuteSequence", "", "end");
End
-WindowsCustomAction gid_Customaction_CopyExtensionData
- Name = "CopyExtensionData";
- Typ = "1";
- Source = "shlxtmsi.dll";
- Target = "copyExtensionData";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
- Assignment2 = ("AdminExecuteSequence", "", "end");
-End
-
WindowsCustomAction gid_Customaction_Patch_Regpatchactivex_Patchactivexcontrol
Name = "PatchActiveXControl";
Typ = "65";
diff --git a/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx b/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx
deleted file mode 100644
index 1a52dad..0000000
--- a/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#undef UNICODE
-#undef _UNICODE
-
-#define _WIN32_WINDOWS 0x0410
-
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#include <msiquery.h>
-#include <shellapi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <malloc.h>
-#include <assert.h>
-#include <string.h>
-
-#ifdef UNICODE
-#define _UNICODE
-#define _tstring wstring
-#else
-#define _tstring string
-#endif
-#include <tchar.h>
-#include <string>
-
-
-static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
-{
- std::_tstring result;
- TCHAR szDummy[1] = TEXT("");
- DWORD nChars = 0;
-
- if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA )
- {
- DWORD nBytes = ++nChars * sizeof(TCHAR);
- LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
- ZeroMemory( buffer, nBytes );
- MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
- result = buffer;
- }
-
- return result;
-}
-
-extern "C" UINT __stdcall copyExtensionData(MSIHANDLE handle) {
-
- std::_tstring sSourceDir = GetMsiProperty( handle, TEXT("SourceDir") );
- std::_tstring sExtensionDir = sSourceDir + TEXT("extension\\");
- std::_tstring sPattern = sExtensionDir + TEXT("*.oxt");
-
- // Finding all oxt files in sExtensionDir
-
- WIN32_FIND_DATA aFindFileData;
-
- HANDLE hFindOxt = FindFirstFile( sPattern.c_str(), &aFindFileData );
-
- if ( hFindOxt != INVALID_HANDLE_VALUE )
- {
- bool fNextFile = false;
- bool bFailIfExist = true;
-
- std::_tstring sDestDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
- std::_tstring sShareInstallDir = sDestDir + TEXT("share\\extension\\install\\");
-
- // creating directories
- std::_tstring sShareDir = sDestDir + TEXT("share");
- std::_tstring sExtDir = sShareDir + TEXT("\\extension");
- std::_tstring sExtInstDir = sExtDir + TEXT("\\install");
- CreateDirectory(sShareDir.c_str(), NULL);
- CreateDirectory(sExtDir.c_str(), NULL);
- CreateDirectory(sExtInstDir.c_str(), NULL);
-
- do
- {
- std::_tstring sOxtFile = aFindFileData.cFileName;
-
- std::_tstring sSourceFile = sExtensionDir + sOxtFile;
- std::_tstring sDestFile = sShareInstallDir + sOxtFile;
-
- CopyFile( sSourceFile.c_str(), sDestFile.c_str(), bFailIfExist );
-
- fNextFile = FindNextFile( hFindOxt, &aFindFileData );
-
- } while ( fNextFile );
-
- FindClose( hFindOxt );
- }
-
- return ERROR_SUCCESS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp
index 8ec3561..364473f 100644
--- a/setup_native/source/win32/customactions/shellextensions/exports.dxp
+++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp
@@ -13,4 +13,3 @@ copyEditionData
RenamePrgFolder
RemovePrgFolder
CheckPatchList
-copyExtensionData
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 3fc78d3..73e0289 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -47,8 +47,7 @@ SLOFILES = \
$(SLO)$/dotnetcheck.obj \
$(SLO)$/copyeditiondata.obj \
$(SLO)$/vistaspecial.obj \
- $(SLO)$/checkpatches.obj \
- $(SLO)$/copyextensiondata.obj
+ $(SLO)$/checkpatches.obj
STDSHL += \
$(ADVAPI32LIB)\
commit 030124d836a3f8571e26c8ce6b5d752ca7ab2511
Author: Andras Timar <atimar at suse.com>
Date: Tue Jan 29 13:31:44 2013 +0100
remove CustomAction ExecutePostUninstallScript
I think this CustomAction is unnecessary, providing that we do
not use Star Division home-made PATCH technology. I have never
seen this CustomAction used in any OpenOffice.org/LibreOffice builds.
Change-Id: I62f3b5a3ef8a9686f018ca1af52689954262e830
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index d0f630e..06d1520 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -167,15 +167,6 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll6
Assignment1 = ("InstallExecuteSequence", "Not PATCH", "end");
End
-WindowsCustomAction gid_Customaction_Shellextensionsdll7
- Name = "Shellextensionsdll7";
- Typ = "65";
- Source = "shlxtmsi.dll";
- Target = "ExecutePostUninstallScript";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallValidate");
-End
-
WindowsCustomAction gid_Customaction_Check_Install_Directory
Name = "CheckInstallDirectory";
Typ = "65";
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp
index b9fbe18..8ec3561 100644
--- a/setup_native/source/win32/customactions/shellextensions/exports.dxp
+++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp
@@ -2,7 +2,6 @@ InstallStartmenuFolderIcon
DeinstallStartmenuFolderIcon
SetProductInstallMode
RebuildShellIconCache
-ExecutePostUninstallScript
CompleteInstallPath
MigrateInstallPath
CheckInstallDirectory
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 93eaaa8..3fc78d3 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -40,7 +40,6 @@ SLOFILES = \
$(SLO)$/startmenuicon.obj \
$(SLO)$/upgrade.obj \
$(SLO)$/iconcache.obj \
- $(SLO)$/postuninstall.obj \
$(SLO)$/migrateinstallpath.obj \
$(SLO)$/completeinstallpath.obj \
$(SLO)$/checkdirectory.obj \
diff --git a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx b/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx
deleted file mode 100644
index 2ae1769..0000000
--- a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define _WIN32_WINDOWS 0x0410
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <msiquery.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <malloc.h>
-
-#ifdef UNICODE
-#define _UNICODE
-#define _tstring wstring
-#else
-#define _tstring string
-#endif
-#include <tchar.h>
-#include <string>
-
-#include <io.h>
-
-static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
-{
- std::_tstring result;
- TCHAR szDummy[1] = TEXT("");
- DWORD nChars = 0;
-
- if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA )
- {
- DWORD nBytes = ++nChars * sizeof(TCHAR);
- LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
- ZeroMemory( buffer, nBytes );
- MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
- result = buffer;
- }
-
- return result;
-}
-
-
-static BOOL ExecuteCommand( LPCTSTR lpCommand, BOOL bSync )
-{
- BOOL fSuccess = FALSE;
- STARTUPINFO si;
- PROCESS_INFORMATION pi;
-
- ZeroMemory( &si, sizeof(si) );
- si.cb = sizeof(si);
-
- fSuccess = CreateProcess(
- NULL,
- (LPTSTR)lpCommand,
- NULL,
- NULL,
- FALSE,
- 0,
- NULL,
- NULL,
- &si,
- &pi
- );
-
- if ( fSuccess )
- {
- if ( bSync )
- WaitForSingleObject( pi.hProcess, INFINITE );
-
- CloseHandle( pi.hProcess );
- CloseHandle( pi.hThread );
- }
-
- return fSuccess;
-}
-
-extern "C" UINT __stdcall ExecutePostUninstallScript( MSIHANDLE handle )
-{
- TCHAR szValue[8192];
- DWORD nValueSize = sizeof(szValue);
- HKEY hKey;
- std::_tstring sInstDir;
-
- std::_tstring sProductKey = GetMsiProperty( handle, TEXT("FINDPRODUCT") );
-
- // MessageBox( NULL, sProductKey.c_str(), "Titel", MB_OK );
-
- if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER, sProductKey.c_str(), &hKey ) )
- {
- if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
- {
- sInstDir = szValue;
- }
- RegCloseKey( hKey );
- }
- else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE, sProductKey.c_str(), &hKey ) )
- {
- if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
- {
- sInstDir = szValue;
- }
- RegCloseKey( hKey );
- }
- else
- return ERROR_SUCCESS;
-
- std::_tstring sInfFile = sInstDir + TEXT("program\\postuninstall.inf");
- std::_tstring sCommand = _T("RUNDLL32.EXE ");
-
- // MessageBox( NULL, sInfFile.c_str(), "Titel", MB_OK );
-
- sCommand += _T("setupapi.dll");
-
- sCommand += _T(",InstallHinfSection PostUninstall 132 ");
- sCommand += sInfFile;
-
- if ( 0 == _taccess( sInfFile.c_str(), 2 ) )
- ExecuteCommand( sCommand.c_str(), TRUE );
-
- DeleteFile( sInfFile.c_str() );
-
- return ERROR_SUCCESS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit bc20ba9cd6502b59853d1ca6e2818936290a720a
Author: Andras Timar <atimar at suse.com>
Date: Tue Jan 29 13:06:42 2013 +0100
convert SetAdminInstallProperty CustomAction to type 51
It does not make sense to call a dll function to set a single property to 1.
Change-Id: I4e3cb35d2d3b644805d1d7573c9bf1dc45befbd4
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
index ede3f7c..2377f5c 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
@@ -11,3 +11,4 @@ InstallFinalize 400
InstallInitialize 250
InstallValidate 200
ScheduleReboot ISSCHEDULEREBOOT 375
+SetAdminInstallProperty 248
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index dd128b2..8df102c 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -12,3 +12,4 @@ SetLanguageSelected 51 LANG_SELECTED 1
ResetLanguageSelected 51 LANG_SELECTED 0
SetApplicationSelected 51 APP_SELECTED 1
ResetApplicationSelected 51 APP_SELECTED 0
+SetAdminInstallProperty 51 ADMININSTALL 1
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index e3b5b759..d0f630e 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -176,15 +176,6 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll7
Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallValidate");
End
-WindowsCustomAction gid_Customaction_Set_Admininstall
- Name = "SetAdminInstallProperty";
- Typ = "65";
- Source = "shlxtmsi.dll";
- Target = "SetAdminInstallProperty";
- Inbinarytable = 1;
- Assignment1 = ("AdminExecuteSequence", "", "InstallInitialize");
-End
-
WindowsCustomAction gid_Customaction_Check_Install_Directory
Name = "CheckInstallDirectory";
Typ = "65";
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp
index aa86c2e..b9fbe18 100644
--- a/setup_native/source/win32/customactions/shellextensions/exports.dxp
+++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp
@@ -6,7 +6,6 @@ ExecutePostUninstallScript
CompleteInstallPath
MigrateInstallPath
CheckInstallDirectory
-SetAdminInstallProperty
CreateLayerLinks
RemoveLayerLinks
DotNetCheck
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 5309614..93eaaa8 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -44,7 +44,6 @@ SLOFILES = \
$(SLO)$/migrateinstallpath.obj \
$(SLO)$/completeinstallpath.obj \
$(SLO)$/checkdirectory.obj \
- $(SLO)$/setadmininstall.obj \
$(SLO)$/layerlinks.obj \
$(SLO)$/dotnetcheck.obj \
$(SLO)$/copyeditiondata.obj \
diff --git a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
deleted file mode 100644
index bc010c6..0000000
--- a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define _WIN32_WINNT 0x0401
-
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <msiquery.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <malloc.h>
-#include <assert.h>
-
-#ifdef UNICODE
-#define _UNICODE
-#define _tstring wstring
-#else
-#define _tstring string
-#endif
-#include <tchar.h>
-#include <string>
-#include <queue>
-#include <stdio.h>
-
-#include <systools/win32/uwinapi.h>
-#include <../tools/seterror.hxx>
-
-static void SetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
-{
- MsiSetProperty(handle, sProperty.c_str(), TEXT("1"));
-}
-
-extern "C" UINT __stdcall SetAdminInstallProperty(MSIHANDLE handle)
-{
- SetMsiProperty(handle, TEXT("ADMININSTALL"));
- return ERROR_SUCCESS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d61d1face977022ea8c6d93aad49a2c97a0abd17
Author: Andras Timar <atimar at suse.com>
Date: Tue Jan 29 12:32:54 2013 +0100
remove stray, old, obsolete CustomAction: RegCleanOld
Change-Id: I6d524a2342390658062cfc0108853756c543bd7c
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index ff30c5a..e3b5b759 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -226,15 +226,6 @@ WindowsCustomAction gid_Customaction_CopyExtensionData
Assignment2 = ("AdminExecuteSequence", "", "end");
End
-WindowsCustomAction gid_Customaction_RegCleanOld
- Name = "RegCleanOld";
- Typ = "65";
- Source = "regcleanold.dll";
- Target = "CleanCurUserOldSystemRegistryFromSetup";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And Not ALLUSERS=\"\"", "end");
-End
-
WindowsCustomAction gid_Customaction_Patch_Regpatchactivex_Patchactivexcontrol
Name = "PatchActiveXControl";
Typ = "65";
commit e0ea85f61a5914508921b5e73119516219afa158
Author: Andras Timar <atimar at suse.com>
Date: Mon Jan 28 21:56:48 2013 +0100
we don't build language packs on Windows
Change-Id: I672886764e9451a983b823ec3666f126b758bd1e
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt
deleted file mode 100644
index becf9cc..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt
+++ /dev/null
@@ -1,71 +0,0 @@
-Action Description Template
-s72 L0 L0
-65001 ActionText Action
-Advertise OOO_ACTIONTEXT_1
-AllocateRegistrySpace OOO_ACTIONTEXT_2 OOO_ACTIONTEXT_3
-AppSearch OOO_ACTIONTEXT_4 OOO_ACTIONTEXT_5
-BindImage OOO_ACTIONTEXT_6 OOO_ACTIONTEXT_7
-caCreateVRoots OOO_ACTIONTEXT_8
-caRemoveVRoots OOO_ACTIONTEXT_9
-CCPSearch OOO_ACTIONTEXT_10
-CostFinalize OOO_ACTIONTEXT_11
-CostInitialize OOO_ACTIONTEXT_12
-CreateFolders OOO_ACTIONTEXT_13 OOO_ACTIONTEXT_14
-CreateShortcuts OOO_ACTIONTEXT_15 OOO_ACTIONTEXT_16
-DeleteServices OOO_ACTIONTEXT_17 OOO_ACTIONTEXT_18
-DuplicateFiles OOO_ACTIONTEXT_19 OOO_ACTIONTEXT_20
-FileCost OOO_ACTIONTEXT_21
-FindRelatedProducts OOO_ACTIONTEXT_22 OOO_ACTIONTEXT_23
-GenerateScript OOO_ACTIONTEXT_24 OOO_ACTIONTEXT_25
-InstallAdminPackage OOO_ACTIONTEXT_26 OOO_ACTIONTEXT_27
-InstallFiles OOO_ACTIONTEXT_28 OOO_ACTIONTEXT_29
-InstallODBC OOO_ACTIONTEXT_30
-InstallServices OOO_ACTIONTEXT_31 OOO_ACTIONTEXT_32
-InstallSFPCatalogFile OOO_ACTIONTEXT_33 OOO_ACTIONTEXT_34
-InstallValidate OOO_ACTIONTEXT_35
-LaunchConditions OOO_ACTIONTEXT_36
-MigrateFeatureStates OOO_ACTIONTEXT_37 OOO_ACTIONTEXT_38
-MoveFiles OOO_ACTIONTEXT_39 OOO_ACTIONTEXT_40
-PatchFiles OOO_ACTIONTEXT_41 OOO_ACTIONTEXT_42
-ProcessComponents OOO_ACTIONTEXT_43
-PublishComponents OOO_ACTIONTEXT_44 OOO_ACTIONTEXT_45
-PublishFeatures OOO_ACTIONTEXT_46 OOO_ACTIONTEXT_47
-PublishProduct OOO_ACTIONTEXT_48
-RegisterClassInfo OOO_ACTIONTEXT_49 OOO_ACTIONTEXT_50
-RegisterComPlus OOO_ACTIONTEXT_51 OOO_ACTIONTEXT_52
-RegisterExtensionInfo OOO_ACTIONTEXT_53 OOO_ACTIONTEXT_54
-RegisterFonts OOO_ACTIONTEXT_55 OOO_ACTIONTEXT_56
-RegisterMIMEInfo OOO_ACTIONTEXT_57 OOO_ACTIONTEXT_58
-RegisterProduct OOO_ACTIONTEXT_59 OOO_ACTIONTEXT_60
-RegisterProgIdInfo OOO_ACTIONTEXT_61 OOO_ACTIONTEXT_62
-RegisterTypeLibraries OOO_ACTIONTEXT_63 OOO_ACTIONTEXT_64
-RegisterUser OOO_ACTIONTEXT_65 OOO_ACTIONTEXT_66
-RemoveDuplicateFiles OOO_ACTIONTEXT_67 OOO_ACTIONTEXT_68
-RemoveEnvironmentStrings OOO_ACTIONTEXT_69 OOO_ACTIONTEXT_70
-RemoveExistingProducts OOO_ACTIONTEXT_71 OOO_ACTIONTEXT_72
-RemoveFiles OOO_ACTIONTEXT_73 OOO_ACTIONTEXT_74
-RemoveFolders OOO_ACTIONTEXT_75 OOO_ACTIONTEXT_76
-RemoveIniValues OOO_ACTIONTEXT_77 OOO_ACTIONTEXT_78
-RemoveODBC OOO_ACTIONTEXT_79
-RemoveRegistryValues OOO_ACTIONTEXT_80 OOO_ACTIONTEXT_81
-RemoveShortcuts OOO_ACTIONTEXT_82 OOO_ACTIONTEXT_83
-RMCCPSearch OOO_ACTIONTEXT_84
-Rollback OOO_ACTIONTEXT_85 OOO_ACTIONTEXT_86
-RollbackCleanup OOO_ACTIONTEXT_87 OOO_ACTIONTEXT_88
-SetODBCFolders OOO_ACTIONTEXT_93
-StartServices OOO_ACTIONTEXT_94 OOO_ACTIONTEXT_95
-StopServices OOO_ACTIONTEXT_96 OOO_ACTIONTEXT_97
-UnmoveFiles OOO_ACTIONTEXT_98 OOO_ACTIONTEXT_99
-UnpublishComponents OOO_ACTIONTEXT_100 OOO_ACTIONTEXT_101
-UnpublishFeatures OOO_ACTIONTEXT_102 OOO_ACTIONTEXT_103
-UnpublishProduct OOO_ACTIONTEXT_104
-UnregisterClassInfo OOO_ACTIONTEXT_105 OOO_ACTIONTEXT_106
-UnregisterComPlus OOO_ACTIONTEXT_107 OOO_ACTIONTEXT_108
-UnregisterExtensionInfo OOO_ACTIONTEXT_109 OOO_ACTIONTEXT_110
-UnregisterFonts OOO_ACTIONTEXT_111 OOO_ACTIONTEXT_112
-UnregisterMIMEInfo OOO_ACTIONTEXT_113 OOO_ACTIONTEXT_114
-UnregisterProgIdInfo OOO_ACTIONTEXT_115 OOO_ACTIONTEXT_116
-UnregisterTypeLibraries OOO_ACTIONTEXT_117 OOO_ACTIONTEXT_118
-WriteEnvironmentStrings OOO_ACTIONTEXT_119 OOO_ACTIONTEXT_120
-WriteIniValues OOO_ACTIONTEXT_121 OOO_ACTIONTEXT_122
-WriteRegistryValues OOO_ACTIONTEXT_123 OOO_ACTIONTEXT_124
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminExe.idt
deleted file mode 100644
index ede3f7c..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminExe.idt
+++ /dev/null
@@ -1,13 +0,0 @@
-Action Condition Sequence
-s72 S255 I2
-AdminExecuteSequence Action
-CostFinalize 150
-CostInitialize 50
-CreateFolders 325
-FileCost 100
-InstallAdminPackage 300
-InstallFiles 350
-InstallFinalize 400
-InstallInitialize 250
-InstallValidate 200
-ScheduleReboot ISSCHEDULEREBOOT 375
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminUIS.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminUIS.idt
deleted file mode 100644
index 3d92e28..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminUIS.idt
+++ /dev/null
@@ -1,14 +0,0 @@
-Action Condition Sequence
-s72 S255 I2
-AdminUISequence Action
-AdminWelcome Not PATCH 250
-CostFinalize 200
-CostInitialize 100
-ExecuteAction 350
-FileCost 150
-PatchWelcome PATCH 260
-SetupCompleteError -3
-SetupCompleteSuccess -1
-SetupInitialization 50
-SetupInterrupted -2
-SetupProgress 300
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdvtExec.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdvtExec.idt
deleted file mode 100644
index 32b74d6..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdvtExec.idt
+++ /dev/null
@@ -1,19 +0,0 @@
-Action Condition Sequence
-s72 S255 I2
-AdvtExecuteSequence Action
-CostFinalize 100
-CostInitialize 50
-CreateShortcuts 250
-InstallFinalize 700
-InstallInitialize 200
-InstallValidate 150
-MsiPublishAssemblies 575
-PublishComponents 550
-PublishFeatures 600
-PublishProduct 650
-RegisterClassInfo 300
-RegisterExtensionInfo 350
-RegisterMIMEInfo 450
-RegisterProgIdInfo 400
-RegisterTypeLibraries 500
-ScheduleReboot ISSCHEDULEREBOOT 675
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary.idt
deleted file mode 100644
index 6eb76f1..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary.idt
+++ /dev/null
@@ -1,18 +0,0 @@
-Name Data
-s72 v0
-Binary Name
-ImageBmp Image.bmp
-BannerBmp Banner.bmp
-CautionIco caution.ico
-DontInstallIco dontinstall.ico
-OpenFolderIco openfolder.ico
-InstallIco install.ico
-InstallPartialIco installpartial.ico
-InstallStateMenuIco installstatemenu.ico
-NewFolderIco newfolder.ico
-SetupCompleteIco setupcomplete.ico
-SetupIco setup.ico
-SetupPartialIco setuppartial.ico
-SetupRepairIco setuprepair.ico
-TrashcanIco trashcan.ico
-UpIco up.ico
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
deleted file mode 100644
index 23a5d59..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ /dev/null
@@ -1,309 +0,0 @@
-Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help
-s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50
-65001 Control Dialog_ Control
-AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp
-AdminChangeFolder BannerLine Line 0 44 374 0 1
-AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText
-AdminChangeFolder Combo DirectoryCombo 21 64 277 80 458755 TARGETDIR Up
-AdminChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_5 Combo
-AdminChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_6
-AdminChangeFolder DlgLine Line 0 234 374 0 1
-AdminChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_7
-AdminChangeFolder List DirectoryList 21 90 332 97 7 TARGETDIR TailText
-AdminChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIco List OOO_CONTROL_9
-AdminChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_10 Cancel
-AdminChangeFolder Tail PathEdit 21 207 332 17 3 TARGETDIR OK
-AdminChangeFolder TailText Text 21 193 99 13 3 OOO_CONTROL_12 Tail
-AdminChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONTROL_13
-AdminNetworkLocation Back PushButton 164 243 66 17 3 OOO_CONTROL_14 InstallNow
-AdminNetworkLocation Banner Bitmap 0 0 374 44 1 BannerBmp
-AdminNetworkLocation BannerLine Line 0 44 374 0 1
-AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
-AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
-AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
-AdminNetworkLocation DlgLine Line 0 234 374 0 1
-AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
-AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
-AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
-AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit
-AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse
-AdminWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_24 Next
-AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back
-AdminWelcome DlgLine Line 0 234 326 0 1
-AdminWelcome Image Bitmap 0 0 122 234 1 ImageBmp
-AdminWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_26 Cancel
-AdminWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_27
-AdminWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_28
-CancelSetup Icon Icon 15 15 24 24 5242881 CautionIco
-CancelSetup No PushButton 135 57 66 17 3 OOO_CONTROL_29 Yes
-CancelSetup Text Text 48 15 194 30 3 OOO_CONTROL_30
-CancelSetup Yes PushButton 62 57 66 17 3 OOO_CONTROL_31 No
-CustomerInformation Back PushButton 164 243 66 17 3 OOO_CONTROL_32 Next
-CustomerInformation Banner Bitmap 0 0 374 44 1 BannerBmp
-CustomerInformation BannerLine Line 0 44 374 0 1
-CustomerInformation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_35 NameLabel
-CustomerInformation CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 RadioGroup
-CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit
-CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38
-CustomerInformation DlgLine Line 0 234 374 0 1
-CustomerInformation DlgRadioGroupText Text 21 161 300 14 3 OOO_CONTROL_39
-CustomerInformation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_40
-CustomerInformation NameEdit Edit 21 63 237 17 3 USERNAME OOO_CONTROL_41 CompanyLabel
-CustomerInformation NameLabel Text 21 52 75 10 3 OOO_CONTROL_42 NameEdit
-CustomerInformation Next PushButton 230 243 66 17 3 OOO_CONTROL_43 Cancel
-CustomerInformation RadioGroup RadioButtonGroup 63 170 300 50 3 ApplicationUsers Back
-CustomSetup Back PushButton 164 243 66 17 3 OOO_CONTROL_46 Next
-CustomSetup Banner Bitmap 0 0 374 44 1 BannerBmp
-CustomSetup BannerLine Line 0 44 374 0 1
-CustomSetup Cancel PushButton 301 243 66 17 3 OOO_CONTROL_49 Tree
-CustomSetup ChangeFolder PushButton 301 203 66 17 3 OOO_CONTROL_50 Help
-CustomSetup Details PushButton 93 243 66 17 3 OOO_CONTROL_51 Back
-CustomSetup DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_52
-CustomSetup DlgLine Line 0 234 374 0 1
-CustomSetup DlgText Text 9 51 360 10 3 OOO_CONTROL_53
-CustomSetup DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_54
-CustomSetup FeatureGroup GroupBox 235 67 131 120 1 OOO_CONTROL_55
-CustomSetup Help PushButton 22 243 66 17 3 OOO_CONTROL_56 Details
-CustomSetup InstallLabel Text 8 190 360 10 3 OOO_CONTROL_57
-CustomSetup ItemDescription Text 241 80 120 50 3 OOO_CONTROL_58
-CustomSetup Location Text 8 203 291 20 3 OOO_CONTROL_59
-CustomSetup Next PushButton 230 243 66 17 3 OOO_CONTROL_60 Cancel
-CustomSetup Size Text 241 133 120 50 3 OOO_CONTROL_61
-CustomSetup Tree SelectionTree 8 70 220 118 7 _BrowseProperty ChangeFolder
-CustomSetupTips Banner Bitmap 0 0 374 44 1 BannerBmp
-CustomSetupTips BannerLine Line 0 44 374 0 1
-CustomSetupTips DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_64
-CustomSetupTips DlgLine Line 0 234 374 0 1
-CustomSetupTips DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_65
-CustomSetupTips DontInstall Icon 21 155 24 24 5242881 DontInstallIco
-CustomSetupTips DontInstallText Text 60 155 300 20 3 OOO_CONTROL_66
-CustomSetupTips Install Icon 21 105 24 24 5242881 InstallIco
-CustomSetupTips InstallPartial Icon 21 130 24 24 5242881 InstallPartialIco
-CustomSetupTips InstallStateMenu Icon 21 52 24 24 5242881 InstallStateMenuIco
-CustomSetupTips InstallStateText Text 21 91 300 10 3 OOO_CONTROL_68
-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
-DestinationFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_84 Next
-DestinationFolder Banner Bitmap 0 0 374 44 1 BannerBmp
-DestinationFolder BannerLine Line 0 44 374 0 1
-DestinationFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_87 ChangeFolder
-DestinationFolder ChangeFolder PushButton 301 125 66 17 3 OOO_CONTROL_88 Back
-DestinationFolder DestFolder Icon 21 112 24 24 5242881 OpenFolderIco
-DestinationFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_304
-DestinationFolder DlgLine Line 114 234 260 0 1
-DestinationFolder DlgTitle Text 13 6 280 25 65539 {&MSSansBold8}[ProductName]
-DestinationFolder Location Text 57 128 240 40 3 _BrowseProperty [INSTALLLOCATION]
-DestinationFolder LocLabel Text 57 115 290 10 3 OOO_CONTROL_92
-DestinationFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_93 Cancel
-DestinationFolder LabelStartInstall Text 21 52 290 30 2 OOO_CONTROL_300
-DestinationFolder LabelInvalidDir Text 21 52 290 30 2 OOO_CONTROL_301
-DestinationFolder LabelWrongProduct Text 21 52 290 30 2 OOO_CONTROL_303
-DestinationFolder LabelStartInstall2 Text 21 82 290 30 2 OOO_CONTROL_305
-DestinationFolder LabelInvalidDir2 Text 21 82 290 30 2 OOO_CONTROL_307
-DestinationFolder LabelWrongProduct2 Text 21 82 290 30 2 OOO_CONTROL_306
-DiskSpaceRequirements Banner Bitmap 0 0 374 44 1 BannerBmp
-DiskSpaceRequirements BannerLine Line 0 44 374 0 1
-DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_96
-DiskSpaceRequirements DlgLine Line 0 234 374 0 1
-DiskSpaceRequirements DlgText Text 10 185 358 41 3 OOO_CONTROL_97
-DiskSpaceRequirements DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_98
-DiskSpaceRequirements List VolumeCostList 8 55 358 125 393223 {120}{70}{70}{70}{70}
-DiskSpaceRequirements OK PushButton 301 243 66 17 3 OOO_CONTROL_100
-FilesInUse Banner Bitmap 0 0 374 44 1 BannerBmp
-FilesInUse BannerLine Line 0 44 374 0 1
-FilesInUse DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_103
-FilesInUse DlgLine Line 0 234 374 0 1
-FilesInUse DlgText Text 21 51 348 29 3 OOO_CONTROL_104
-FilesInUse DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_105
-FilesInUse Exit PushButton 301 243 66 17 3 OOO_CONTROL_106 List
-FilesInUse Ignore PushButton 230 243 66 17 3 OOO_CONTROL_107 Exit
-FilesInUse List ListBox 21 87 331 135 7 FileInUseProcess Retry
-FilesInUse Retry PushButton 164 243 66 17 3 OOO_CONTROL_108 Ignore
-FileTypeDialog Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
-FileTypeDialog Banner Bitmap 0 0 374 44 1 BannerBmp
-FileTypeDialog BannerLine Line 0 44 374 0 1
-FileTypeDialog Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 CheckBox1
-FileTypeDialog CheckBox1 CheckBox 41 106 200 10 3 SELECT_WORD OOO_CONTROL_270 CheckBox2
-FileTypeDialog CheckBox2 CheckBox 41 131 200 10 3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
-FileTypeDialog CheckBox3 CheckBox 41 156 200 10 3 SELECT_POWERPOINT OOO_CONTROL_272 Back
-FileTypeDialog DlgDesc Text 21 20 272 25 65539 OOO_CONTROL_274
-FileTypeDialog DlgLine Line 0 234 374 0 1
-FileTypeDialog DlgText Text 21 56 326 40 3 OOO_CONTROL_275
-FileTypeDialog DlgText2 Text 21 190 326 30 3 OOO_CONTROL_309
-FileTypeDialog DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_278
-FileTypeDialog Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
-InstallChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp
-InstallChangeFolder BannerLine Line 0 44 374 0 1
-InstallChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_111 ComboText
-InstallChangeFolder Combo DirectoryCombo 21 64 302 80 4128779 _BrowseProperty Up
-InstallChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_113 Combo
-InstallChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_114
-InstallChangeFolder DlgLine Line 114 234 260 0 1
-InstallChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_115
-InstallChangeFolder List DirectoryList 21 90 332 97 15 _BrowseProperty TailText
-InstallChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_118 Cancel
-InstallChangeFolder Tail PathEdit 21 207 332 17 15 _BrowseProperty OK
-InstallChangeFolder TailText Text 21 193 99 13 3 OOO_CONTROL_120 Tail
-InstallChangeFolder Up PushButton 333 64 19 19 3670019 UpIco List OOO_CONTROL_121
-InstallWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_122 Copyright
-InstallWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_123 Back
-InstallWelcome Copyright Text 135 144 228 73 65539 OOO_CONTROL_124 Next
-InstallWelcome DlgLine Line 0 234 374 0 1
-InstallWelcome Image Bitmap 0 0 122 234 1 ImageBmp
-InstallWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_125 Cancel
-InstallWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_126
-InstallWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_127
-MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
-MaintenanceType Banner Bitmap 0 0 374 44 1 BannerBmp
-MaintenanceType BannerLine Line 0 44 374 0 1
-MaintenanceType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 RadioGroup
-MaintenanceType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_139
-MaintenanceType DlgLine Line 0 234 374 0 1
-MaintenanceType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_140
-MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupRepairIco
-MaintenanceType Ico2 Icon 35 135 24 24 5242881 TrashcanIco
-MaintenanceType Next PushButton 230 243 66 17 3 OOO_CONTROL_141 Cancel
-MaintenanceType RadioGroup RadioButtonGroup 21 55 290 170 3 _IsMaintenance Back
-MaintenanceType Text1 Text 80 72 260 35 3 OOO_CONTROL_144
-MaintenanceType Text2 Text 80 135 260 35 3 OOO_CONTROL_145
-MaintenanceWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_146 Next
-MaintenanceWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_147 Back
-MaintenanceWelcome DlgLine Line 0 234 374 0 1
-MaintenanceWelcome Image Bitmap 0 0 122 234 1 ImageBmp
-MaintenanceWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_148 Cancel
-MaintenanceWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_149
-MaintenanceWelcome TextLine2 Text 135 55 228 50 65539 OOO_CONTROL_150
-OutOfSpace Banner Bitmap 0 0 374 44 1 BannerBmp
-OutOfSpace BannerLine Line 0 44 374 0 1
-OutOfSpace DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_153
-OutOfSpace DlgLine Line 0 234 374 0 1
-OutOfSpace DlgText Text 21 51 326 43 3 OOO_CONTROL_154
-OutOfSpace DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_155
-OutOfSpace List VolumeCostList 21 95 332 120 393223 OOO_CONTROL_156
-OutOfSpace Resume PushButton 301 243 66 17 3 OOO_CONTROL_157
-PatchWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_158 Next
-PatchWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_159 Back
-PatchWelcome DlgLine Line 0 234 374 0 1
-PatchWelcome Image Bitmap 0 0 122 234 1 ImageBmp
-PatchWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_160 Cancel
-PatchWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_161
-PatchWelcome TextLine2 Text 135 54 228 45 65539 OOO_CONTROL_162
-ReadyToInstall Back PushButton 164 243 66 17 3 OOO_CONTROL_163 InstallNow
-ReadyToInstall Banner Bitmap 0 0 374 44 1 BannerBmp
-ReadyToInstall BannerLine Line 0 44 374 0 1
-ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 Back
-ReadyToInstall DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_167
-ReadyToInstall DlgLine Line 0 234 374 0 1
-ReadyToInstall DlgText Text 21 51 326 20 3 OOO_CONTROL_168
-ReadyToInstall DlgText1 Text 21 70 330 24 3 OOO_CONTROL_169
-ReadyToInstall DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_170
-ReadyToInstall DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_171
-ReadyToInstall DlgTitle3 Text 13 6 280 25 65538 OOO_CONTROL_172
-ReadyToInstall InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel
-ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow
-ReadyToRemove Banner Bitmap 0 0 374 44 1 BannerBmp
-ReadyToRemove BannerLine Line 0 44 374 0 1
-ReadyToRemove Cancel PushButton 301 243 66 17 3 OOO_CONTROL_177 Back
-ReadyToRemove DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_178
-ReadyToRemove DlgLine Line 0 234 374 0 1
-ReadyToRemove DlgText Text 21 51 326 24 3 OOO_CONTROL_179
-ReadyToRemove DlgText1 Text 21 79 330 23 3 OOO_CONTROL_180
-ReadyToRemove DlgText2 Text 21 102 330 24 3
-ReadyToRemove DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_181
-ReadyToRemove RemoveNow PushButton 230 243 66 17 3 OOO_CONTROL_182 Cancel
-SetupCompleteError Back PushButton 164 243 66 17 1 OOO_CONTROL_183 Finish
-SetupCompleteError Cancel PushButton 301 243 66 17 1 OOO_CONTROL_184 Back
-SetupCompleteError DlgLine Line 0 234 374 0 1
-SetupCompleteError Finish PushButton 230 243 66 17 3 OOO_CONTROL_185 Cancel
-SetupCompleteError FinishText1 Text 135 80 228 50 65539 OOO_CONTROL_186
-SetupCompleteError FinishText2 Text 135 135 228 25 65539 OOO_CONTROL_187
-SetupCompleteError Image Bitmap 0 0 122 234 1 ImageBmp
-SetupCompleteError RestContText1 Text 135 80 228 50 65539 OOO_CONTROL_188
-SetupCompleteError RestContText2 Text 135 135 228 25 65539 OOO_CONTROL_189
-SetupCompleteError TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_190
-SetupCompleteError TextLine2 Text 135 55 228 25 65539 OOO_CONTROL_191
-SetupCompleteSuccess Back PushButton 164 243 66 17 1 OOO_CONTROL_192 OK
-SetupCompleteSuccess Cancel PushButton 301 243 66 17 1 OOO_CONTROL_193 Image
-SetupCompleteSuccess DlgLine Line 0 234 374 0 1
-SetupCompleteSuccess Image Bitmap 0 0 122 234 1 ImageBmp Back
-SetupCompleteSuccess OK PushButton 230 243 66 17 3 OOO_CONTROL_197 Cancel
-SetupCompleteSuccess TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_198
-SetupCompleteSuccess TextLine2 Text 135 55 228 45 65538 OOO_CONTROL_199
-SetupCompleteSuccess TextLine3 Text 135 55 228 45 65538 OOO_CONTROL_200
-SetupError A PushButton 192 80 66 17 3 OOO_CONTROL_204
-SetupError C PushButton 192 80 66 17 3 OOO_CONTROL_205
-SetupError ErrorText Text 50 15 200 50 3 OOO_CONTROL_206
-SetupError I PushButton 192 80 66 17 3 OOO_CONTROL_207
-SetupError N PushButton 192 80 66 17 3 OOO_CONTROL_208
-SetupError O PushButton 192 80 66 17 3 OOO_CONTROL_209
-SetupError R PushButton 192 80 66 17 3 OOO_CONTROL_210
-SetupError WarningIcon Icon 15 15 24 24 5242881 CautionIco
-SetupError Y PushButton 192 80 66 17 3 OOO_CONTROL_211
-SetupInitialization ActionData Text 135 125 228 12 65539
-SetupInitialization ActionText Text 135 109 220 36 65539
-SetupInitialization Back PushButton 164 243 66 17 1 OOO_CONTROL_214
-SetupInitialization Cancel PushButton 301 243 66 17 3 OOO_CONTROL_215
-SetupInitialization DlgLine Line 0 234 374 0 1
-SetupInitialization Image Bitmap 0 0 122 234 1 ImageBmp
-SetupInitialization Next PushButton 230 243 66 17 1 OOO_CONTROL_216
-SetupInitialization TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_217
-SetupInitialization TextLine2 Text 135 55 228 30 65539 OOO_CONTROL_218
-SetupInterrupted Back PushButton 164 243 66 17 1 OOO_CONTROL_219
-SetupInterrupted Cancel PushButton 301 243 66 17 1 OOO_CONTROL_220
-SetupInterrupted DlgLine Line 0 234 374 0 1
-SetupInterrupted Finish PushButton 230 243 66 17 3 OOO_CONTROL_221
-SetupInterrupted FinishText1 Text 135 80 228 50 65539 OOO_CONTROL_222
-SetupInterrupted FinishText2 Text 135 135 228 25 65539 OOO_CONTROL_223
-SetupInterrupted Image Bitmap 0 0 122 234 1 ImageBmp
-SetupInterrupted RestContText1 Text 135 80 228 50 65539 OOO_CONTROL_224
-SetupInterrupted RestContText2 Text 135 135 228 25 65539 OOO_CONTROL_225
-SetupInterrupted TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_226
-SetupInterrupted TextLine2 Text 135 55 228 25 65539 OOO_CONTROL_227
-SetupProgress ActionProgress95 ProgressBar 59 113 275 12 65537 OOO_CONTROL_228
-SetupProgress ActionText Text 59 100 275 12 3
-SetupProgress Back PushButton 164 243 66 17 1 OOO_CONTROL_230 Next
-SetupProgress Banner Bitmap 0 0 374 44 1 BannerBmp
-SetupProgress BannerLine Line 0 44 374 0 1
-SetupProgress Cancel PushButton 301 243 66 17 3 OOO_CONTROL_233 Back
-SetupProgress DlgDesc Text 21 23 272 25 65538 OOO_CONTROL_234
-SetupProgress DlgDesc2 Text 21 23 272 25 65538 OOO_CONTROL_235
-SetupProgress DlgLine Line 0 234 374 0 1
-SetupProgress DlgText Text 59 51 275 30 65538 OOO_CONTROL_236
-SetupProgress DlgText2 Text 59 51 275 30 65538 OOO_CONTROL_237
-SetupProgress DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_238
-SetupProgress DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_239
-SetupProgress LbSec Text 172 139 32 12 2 OOO_CONTROL_240
-SetupProgress LbStatus Text 59 85 70 12 3 OOO_CONTROL_241
-SetupProgress Next PushButton 230 243 66 17 1 OOO_CONTROL_242 Cancel
-SetupProgress SetupIcon Icon 21 51 24 24 5242881 SetupIco
-SetupProgress ShowTime Text 155 139 17 12 2
-SetupProgress TextTime Text 59 139 96 12 2 OOO_CONTROL_244
-SetupResume Back PushButton 164 243 66 17 1 OOO_CONTROL_245 Next
-SetupResume Cancel PushButton 301 243 66 17 3 OOO_CONTROL_246 Back
-SetupResume DlgLine Line 0 234 374 0 1
-SetupResume Image Bitmap 0 0 122 234 1 ImageBmp
-SetupResume Next PushButton 230 243 66 17 3 OOO_CONTROL_247 Cancel
-SetupResume PreselectedText Text 135 55 228 45 65539 OOO_CONTROL_248
-SetupResume ResumeText Text 135 46 228 45 65539 OOO_CONTROL_249
-SetupResume TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_250
-SetupType Back PushButton 164 243 66 17 3 OOO_CONTROL_251 Next
-SetupType Banner Bitmap 0 0 374 44 1 BannerBmp
-SetupType BannerLine Line 0 44 374 0 1
-SetupType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_254 RadioGroup
-SetupType CompleteIco Icon 34 94 24 24 5242881 SetupCompleteIco
-SetupType CompText Text 80 94 246 35 3 OOO_CONTROL_255
-SetupType CustomIco Icon 34 154 24 24 5242881 SetupPartialIco
-SetupType CustText Text 80 154 246 35 3 OOO_CONTROL_256
-SetupType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_257
-SetupType DlgLine Line 0 234 374 0 1
-SetupType DlgText Text 21 51 326 10 3 OOO_CONTROL_258
-SetupType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_259
-SetupType Next PushButton 230 243 66 17 3 OOO_CONTROL_260 Cancel
-SetupType RadioGroup RadioButtonGroup 21 79 264 120 3 _IsSetupTypeMin Back
-SplashBitmap Back PushButton 164 243 66 17 1 OOO_CONTROL_262 Next
-SplashBitmap Cancel PushButton 301 243 66 17 3 OOO_CONTROL_265 Back
-SplashBitmap DlgLine Line 0 234 374 0 1
-SplashBitmap Image Bitmap 13 12 114 211 1 ImageBmp
-SplashBitmap Next PushButton 230 243 66 17 3 OOO_CONTROL_266 Cancel
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
deleted file mode 100644
index 9e3faef..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
+++ /dev/null
@@ -1,57 +0,0 @@
-Dialog_ Control_ Action Condition
-s72 s50 s50 s255
-ControlCondition Dialog_ Control_ Action Condition
-CustomerInformation DlgRadioGroupText Hide NOT Privileged
-CustomerInformation DlgRadioGroupText Hide ProductState > 0
-CustomerInformation DlgRadioGroupText Hide Version9X
-CustomerInformation RadioGroup Hide NOT Privileged
-CustomerInformation RadioGroup Hide ProductState > 0
-CustomerInformation RadioGroup Hide Version9X
-CustomSetup ChangeFolder Hide Installed
-CustomSetup Details Hide Installed
-CustomSetup InstallLabel Hide Installed
-InstallWelcome Copyright Hide SHOWCOPYRIGHT="No"
-InstallWelcome Copyright Show SHOWCOPYRIGHT="Yes"
-ReadyToInstall DlgTitle Show ProgressType0="Modify"
-ReadyToInstall DlgTitle2 Show ProgressType0="Repair"
-ReadyToInstall DlgTitle3 Show ProgressType0="install"
-SetupCompleteError Back Default UpdateStarted
-SetupCompleteError Back Disable NOT UpdateStarted
-SetupCompleteError Back Enable UpdateStarted
-SetupCompleteError Cancel Disable NOT UpdateStarted
-SetupCompleteError Cancel Enable UpdateStarted
-SetupCompleteError Finish Default NOT UpdateStarted
-SetupCompleteError FinishText1 Hide UpdateStarted
-SetupCompleteError FinishText1 Show NOT UpdateStarted
-SetupCompleteError FinishText2 Hide UpdateStarted
-SetupCompleteError FinishText2 Show NOT UpdateStarted
-SetupCompleteError RestContText1 Hide NOT UpdateStarted
-SetupCompleteError RestContText1 Show UpdateStarted
-SetupCompleteError RestContText2 Hide NOT UpdateStarted
-SetupCompleteError RestContText2 Show UpdateStarted
-SetupCompleteSuccess TextLine2 Show ProgressType2="installed"
-SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled"
-SetupInterrupted Back Default UpdateStarted
-SetupInterrupted Back Disable NOT UpdateStarted
-SetupInterrupted Back Enable UpdateStarted
-SetupInterrupted Cancel Disable NOT UpdateStarted
-SetupInterrupted Cancel Enable UpdateStarted
-SetupInterrupted Finish Default NOT UpdateStarted
-SetupInterrupted FinishText1 Hide UpdateStarted
-SetupInterrupted FinishText1 Show NOT UpdateStarted
-SetupInterrupted FinishText2 Hide UpdateStarted
-SetupInterrupted FinishText2 Show NOT UpdateStarted
-SetupInterrupted RestContText1 Hide NOT UpdateStarted
-SetupInterrupted RestContText1 Show UpdateStarted
-SetupInterrupted RestContText2 Hide NOT UpdateStarted
-SetupInterrupted RestContText2 Show UpdateStarted
-SetupProgress DlgDesc Show ProgressType2="installed"
-SetupProgress DlgDesc2 Show ProgressType2="uninstalled"
-SetupProgress DlgText Show ProgressType3="installs"
-SetupProgress DlgText2 Show ProgressType3="uninstalls"
-SetupProgress DlgTitle Show ProgressType1="Installing"
-SetupProgress DlgTitle2 Show ProgressType1="Uninstalling"
-SetupResume PreselectedText Hide RESUME
-SetupResume PreselectedText Show NOT RESUME
-SetupResume ResumeText Hide NOT RESUME
-SetupResume ResumeText Show RESUME
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
deleted file mode 100644
index 63ea995..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ /dev/null
@@ -1,125 +0,0 @@
-Dialog_ Control_ Event Argument Condition Ordering
-s72 s50 s50 s255 S255 I2
-ControlEvent Dialog_ Control_ Event Argument Condition
-AdminChangeFolder Cancel EndDialog Return 1 2
-AdminChangeFolder Cancel Reset 0 1 1
-AdminChangeFolder NewFolder DirectoryListNew 0 1 0
-AdminChangeFolder OK EndDialog Return 1 0
-AdminChangeFolder OK SetTargetPath TARGETDIR 1 1
-AdminChangeFolder Up DirectoryListUp 0 1 0
-AdminNetworkLocation Back NewDialog AdminWelcome 1 0
-AdminNetworkLocation Browse SpawnDialog AdminChangeFolder 1 0
-AdminNetworkLocation Cancel SpawnDialog CancelSetup 1 0
-AdminNetworkLocation InstallNow EndDialog Return OutOfNoRbDiskSpace <> 1 3
-AdminNetworkLocation InstallNow NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 2
-AdminNetworkLocation InstallNow SetTargetPath TARGETDIR 1 1
-AdminWelcome Cancel SpawnDialog CancelSetup 1 0
-AdminWelcome Next NewDialog AdminNetworkLocation 1 0
-CancelSetup No EndDialog Return 1 0
-CancelSetup Yes EndDialog Exit 1 2
-CustomerInformation Back NewDialog InstallWelcome 1 1
-CustomerInformation Cancel SpawnDialog CancelSetup 1 0
-CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2
-CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1
-CustomerInformation Next NewDialog SetupType 1 3
-CustomSetup Back NewDialog MaintenanceType Installed 0
-CustomSetup Back NewDialog SetupType NOT Installed 0
-CustomSetup Cancel SpawnDialog CancelSetup 1 0
-CustomSetup ChangeFolder SelectionBrowse InstallChangeFolder 1 0
-CustomSetup Details SelectionBrowse DiskSpaceRequirements 1 1
-CustomSetup Help SpawnDialog CustomSetupTips 1 1
-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
-DestinationFolder Back NewDialog InstallWelcome 1 0
-DestinationFolder Cancel SpawnDialog CancelSetup 1 1
-DestinationFolder ChangeFolder [_BrowseProperty] INSTALLLOCATION 1 2
-DestinationFolder ChangeFolder NewDialog InstallChangeFolder 1 1
-DestinationFolder Next NewDialog ReadyToInstall 1 0
-DiskSpaceRequirements OK EndDialog Return 1 0
-FilesInUse Exit EndDialog Exit 1 0
-FilesInUse Ignore EndDialog Ignore 1 0
-FilesInUse Retry EndDialog Retry 1 0
-FileTypeDialog Back NewDialog CustomSetup Installed OR _IsSetupTypeMin = "Custom" 2
-FileTypeDialog Back NewDialog SetupType NOT Installed AND _IsSetupTypeMin <> "Custom" 1
-FileTypeDialog Cancel SpawnDialog CancelSetup 1 0
-FileTypeDialog Next NewDialog ReadyToInstall 1 0
-InstallChangeFolder Cancel NewDialog DestinationFolder 1 2
-InstallChangeFolder Cancel Reset 0 1 1
-InstallChangeFolder OK NewDialog DestinationFolder 1 3
-InstallChangeFolder OK SetTargetPath [_BrowseProperty] 1 2
-InstallChangeFolder Up DirectoryListUp 0 1 0
-InstallWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 1
-InstallWelcome Cancel SpawnDialog CancelSetup 1 0
-InstallWelcome Next NewDialog DestinationFolder 1 0
-MaintenanceType Back NewDialog MaintenanceWelcome 1 0
-MaintenanceType Cancel SpawnDialog CancelSetup 1 0
-MaintenanceType Next [ProgressType0] Modify _IsMaintenance = "Change" 2
-MaintenanceType Next [ProgressType0] Repair _IsMaintenance = "Reinstall" 1
-MaintenanceType Next [ProgressType1] Modifying _IsMaintenance = "Change" 3
-MaintenanceType Next [ProgressType1] Repairing _IsMaintenance = "Reinstall" 4
-MaintenanceType Next [ProgressType2] modified _IsMaintenance = "Change" 6
-MaintenanceType Next [ProgressType2] repairs _IsMaintenance = "Reinstall" 5
-MaintenanceType Next [ProgressType3] modifies _IsMaintenance = "Change" 7
-MaintenanceType Next [ProgressType3] repairs _IsMaintenance = "Reinstall" 8
-MaintenanceType Next NewDialog CustomSetup _IsMaintenance = "Change" 12
-MaintenanceType Next NewDialog ReadyToInstall _IsMaintenance = "Reinstall" 13
-MaintenanceType Next NewDialog ReadyToRemove _IsMaintenance = "Remove" 11
-MaintenanceType Next Reinstall ALL _IsMaintenance = "Reinstall" 10
-MaintenanceType Next ReinstallMode [ReinstallModeText] _IsMaintenance = "Reinstall" 9
-MaintenanceWelcome Cancel SpawnDialog CancelSetup 1 0
-MaintenanceWelcome Next NewDialog MaintenanceType 1 0
-OutOfSpace Resume NewDialog AdminNetworkLocation ACTION = "ADMIN" 0
-OutOfSpace Resume NewDialog DestinationFolder ACTION <> "ADMIN" 0
-PatchWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 0
-PatchWelcome Cancel SpawnDialog CancelSetup 1 1
-PatchWelcome Next EndDialog Return 1 3
-PatchWelcome Next Reinstall ALL PATCH And REINSTALL="" 1
-PatchWelcome Next ReinstallMode omus PATCH And REINSTALLMODE="" 2
-ReadyToInstall Back NewDialog DestinationFolder Installed OR _IsSetupTypeMin = "Custom" 2
-ReadyToInstall Back NewDialog DestinationFolder Installed AND _IsMaintenance = "Reinstall" 3
-ReadyToInstall Back NewDialog DestinationFolder NOT Installed 1
-ReadyToInstall Cancel SpawnDialog CancelSetup 1 0
-ReadyToInstall InstallNow [ProgressType1] Installing 1 0
-ReadyToInstall InstallNow [ProgressType2] installed 1 0
-ReadyToInstall InstallNow [ProgressType3] installs 1 0
-ReadyToInstall InstallNow EndDialog Return OutOfNoRbDiskSpace <> 1 0
-ReadyToInstall InstallNow NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 0
-ReadyToRemove Back NewDialog MaintenanceType 1 0
-ReadyToRemove Cancel SpawnDialog CancelSetup 1 0
-ReadyToRemove RemoveNow [ProgressType1] Uninstalling 1 0
-ReadyToRemove RemoveNow [ProgressType2] uninstalled 1 0
-ReadyToRemove RemoveNow [ProgressType3] uninstalls 1 0
-ReadyToRemove RemoveNow EndDialog Return OutOfNoRbDiskSpace <> 1 2
-ReadyToRemove RemoveNow NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 2
-ReadyToRemove RemoveNow Remove ALL 1 1
-SetupCompleteError Back [Suspend] {} 1 1
-SetupCompleteError Back EndDialog Return 1 2
-SetupCompleteError Cancel [Suspend] 1 1 1
-SetupCompleteError Cancel EndDialog Return 1 2
-SetupCompleteError Finish EndDialog Exit 1 2
-SetupCompleteSuccess OK EndDialog Exit 1 2
-SetupError A EndDialog ErrorAbort 1 0
-SetupError C EndDialog ErrorCancel 1 0
-SetupError I EndDialog ErrorIgnore 1 0
-SetupError N EndDialog ErrorNo 1 0
-SetupError O EndDialog ErrorOk 1 0
-SetupError R EndDialog ErrorRetry 1 0
-SetupError Y EndDialog ErrorYes 1 0
-SetupInitialization Cancel SpawnDialog CancelSetup 1 0
-SetupInterrupted Back [Suspend] {} 1 1
-SetupInterrupted Back EndDialog Exit 1 2
-SetupInterrupted Cancel [Suspend] 1 1 1
-SetupInterrupted Cancel EndDialog Exit 1 2
-SetupInterrupted Finish EndDialog Exit 1 2
-SetupProgress Cancel SpawnDialog CancelSetup 1 0
-SetupResume Cancel SpawnDialog CancelSetup 1 0
-SetupResume Next EndDialog Return OutOfNoRbDiskSpace <> 1 0
-SetupResume Next NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 0
-SetupType Back NewDialog CustomerInformation 1 0
-SetupType Cancel SpawnDialog CancelSetup 1 0
-SetupType Next NewDialog CustomSetup _IsSetupTypeMin = "Custom" 0
-SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 0
-SplashBitmap Cancel SpawnDialog CancelSetup 1 0
-SplashBitmap Next NewDialog InstallWelcome 1 0
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
deleted file mode 100644
index 997515a..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
+++ /dev/null
@@ -1,9 +0,0 @@
-Action Type Source Target
-s72 i2 S64 S255
-CustomAction Action
-setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
-SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
-setUserProfileNT 51 USERPROFILE [%USERPROFILE]
-SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
-NewProductFound 19 OOO_CUSTOMACTION_1
-SameProductFound 19 OOO_CUSTOMACTION_2
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
deleted file mode 100644
index 7e97dd8..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
+++ /dev/null
@@ -1,31 +0,0 @@
-Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel
-s72 i2 i2 i2 i2 I4 L128 s50 S50 S50
-Dialog Dialog
-AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
-AdminNetworkLocation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel
-AdminWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
-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
-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
-FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel
-InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
-InstallWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
-MaintenanceType 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel
-MaintenanceWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
-OutOfSpace 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Resume Resume Resume
-PatchWelcome 50 50 374 266 3 [ProductName] Patch - [STR_INSTALLATION_WIZARD] Next Next Cancel
-ReadyToInstall 50 50 374 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel
-ReadyToRemove 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RemoveNow RemoveNow Cancel
-SetupCompleteError 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Finish Finish Finish
-SetupCompleteSuccess 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
-SetupError 50 10 270 110 65543 [ProductName] [STR_INSTALLATION_WIZARD] ErrorText O C
-SetupInitialization 50 50 374 266 5 [ProductName] - [STR_INSTALLATION_WIZARD] Cancel Cancel Cancel
-SetupInterrupted 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Finish Finish Finish
-SetupProgress 50 50 374 266 5 [ProductName] - [STR_INSTALLATION_WIZARD] Cancel Cancel Cancel
-SetupResume 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
-SetupType 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel
-SplashBitmap 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt
deleted file mode 100644
index 2f3a591..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt
+++ /dev/null
@@ -1,133 +0,0 @@
-Error Message
-i2 L0
-65001 Error Error
-0 OOO_ERROR_1
-1 OOO_ERROR_2
-2 OOO_ERROR_3
-4 OOO_ERROR_4
-5 OOO_ERROR_5
-7 OOO_ERROR_6
-8 OOO_ERROR_7
-9 OOO_ERROR_8
-10 OOO_ERROR_9
-11 OOO_ERROR_10
-12 OOO_ERROR_11
-13 OOO_ERROR_12
-14 OOO_ERROR_13
-15 OOO_ERROR_14
-16 OOO_ERROR_15
-17 OOO_ERROR_16
-18 OOO_ERROR_17
-19 OOO_ERROR_18
-20 OOO_ERROR_19
-21 OOO_ERROR_20
-22 OOO_ERROR_21
-23 OOO_ERROR_22
-32 OOO_ERROR_23
-33 OOO_ERROR_24
-1101 OOO_ERROR_25
-1301 OOO_ERROR_26
-1302 OOO_ERROR_27
-1303 OOO_ERROR_28
-1304 OOO_ERROR_29
-1305 OOO_ERROR_30
-1306 OOO_ERROR_31.
-1307 OOO_ERROR_32
-1308 OOO_ERROR_33
-1309 OOO_ERROR_34
-1310 OOO_ERROR_35
-1311 OOO_ERROR_36
-1312 OOO_ERROR_37
-1313 OOO_ERROR_38
-1314 OOO_ERROR_39
-1315 OOO_ERROR_40
-1316 OOO_ERROR_41.
-1317 OOO_ERROR_42
-1318 OOO_ERROR_43
-1319 OOO_ERROR_44
-1320 OOO_ERROR_45
-1321 OOO_ERROR_46
-1322 OOO_ERROR_47
-1323 OOO_ERROR_48
-1324 OOO_ERROR_49
-1325 OOO_ERROR_50
-1326 OOO_ERROR_51
-1327 OOO_ERROR_52
-1328 OOO_ERROR_53
-1401 OOO_ERROR_54
-1402 OOO_ERROR_55
-1403 OOO_ERROR_56
-1404 OOO_ERROR_57
-1405 OOO_ERROR_58
-1406 OOO_ERROR_59
-1407 OOO_ERROR_60
-1408 OOO_ERROR_61
-1409 OOO_ERROR_62
-1410 OOO_ERROR_63
-1500 OOO_ERROR_64
-1501 OOO_ERROR_65
-1502 OOO_ERROR_66
-1503 OOO_ERROR_67
-1601 OOO_ERROR_68
-1602 OOO_ERROR_69
-1603 OOO_ERROR_70
-1604 OOO_ERROR_71
-1605 OOO_ERROR_72
-1606 OOO_ERROR_73
-1607 OOO_ERROR_74
-1608 OOO_ERROR_75
-1701 OOO_ERROR_76
-1702 OOO_ERROR_77
-1703 OOO_ERROR_78
-1704 OOO_ERROR_79
-1705 OOO_ERROR_80
-1706 OOO_ERROR_81
-1707 OOO_ERROR_82
-1708 OOO_ERROR_83
-1709 OOO_ERROR_84
-1710 OOO_ERROR_85
-1711 OOO_ERROR_86
-1712 OOO_ERROR_87
-1713 OOO_ERROR_88
-1714 OOO_ERROR_89
-1801 OOO_ERROR_90
-1802 OOO_ERROR_91
-1803 OOO_ERROR_92
-1804 OOO_ERROR_93
-1805 OOO_ERROR_94
-1806 OOO_ERROR_95
-1807 OOO_ERROR_96
-1901 OOO_ERROR_97
-1902 OOO_ERROR_98
-1903 OOO_ERROR_99
-1904 OOO_ERROR_100.
-1905 OOO_ERROR_101
-1906 OOO_ERROR_102
-1907 OOO_ERROR_103
-1908 OOO_ERROR_104
-1909 OOO_ERROR_105
-1910 OOO_ERROR_106
-1911 OOO_ERROR_107
-1912 OOO_ERROR_108
-1913 OOO_ERROR_109
-1914 OOO_ERROR_110
-1915 OOO_ERROR_111
-1916 OOO_ERROR_112
-1917 OOO_ERROR_113
-1918 OOO_ERROR_114
-1919 OOO_ERROR_115
-1920 OOO_ERROR_116
-1921 OOO_ERROR_117
-1922 OOO_ERROR_118
-1923 OOO_ERROR_119
-1924 OOO_ERROR_120
-1925 OOO_ERROR_121
-1926 OOO_ERROR_122
-1927 OOO_ERROR_123
-1928 OOO_ERROR_124
-1929 OOO_ERROR_125
-1930 OOO_ERROR_126
-1931 OOO_ERROR_127
-1932 OOO_ERROR_128
-1933 OOO_ERROR_129
-1934 OOO_ERROR_130
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/EventMap.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/EventMap.idt
deleted file mode 100644
index ae76b6a..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/EventMap.idt
+++ /dev/null
@@ -1,19 +0,0 @@
-Dialog_ Control_ Event Attribute
-s72 s50 s50 s50
-EventMapping Dialog_ Control_ Event
-CustomSetup ItemDescription SelectionDescription Text
-CustomSetup Location SelectionPath Text
-CustomSetup Next SelectionPathOn Enabled
-CustomSetup Size SelectionSize Text
-SetupInitialization ActionData ActionData Text
-SetupInitialization ActionText ActionText Text
-SetupProgress ActionProgress95 AdminInstallFinalize Progress
-SetupProgress ActionProgress95 InstallFiles Progress
-SetupProgress ActionProgress95 MoveFiles Progress
-SetupProgress ActionProgress95 RemoveFiles Progress
-SetupProgress ActionProgress95 RemoveRegistryValues Progress
-SetupProgress ActionProgress95 SetProgress Progress
-SetupProgress ActionProgress95 UnmoveFiles Progress
-SetupProgress ActionProgress95 WriteIniValues Progress
-SetupProgress ActionProgress95 WriteRegistryValues Progress
-SetupProgress ActionText ActionText Text
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
deleted file mode 100644
index 3d29abe..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
+++ /dev/null
@@ -1,71 +0,0 @@
-Action Condition Sequence
-s72 S255 I2
-InstallExecuteSequence Action
-AllocateRegistrySpace NOT Installed 750
-AppSearch 25
-BindImage 2100
-CCPSearch CCP_TEST 200
-CostFinalize 500
-CostInitialize 350
-CreateFolders 1850
-CreateShortcuts 2150
-DeleteServices VersionNT 1000
-DuplicateFiles 2050
-FileCost 400
-FindRelatedProducts NOT ISSETUPDRIVEN 100
-InstallFiles 1950
-InstallFinalize 3150
-InstallInitialize 700
-InstallODBC 2600
-InstallServices VersionNT 2750
-InstallValidate 650
-IsolateComponents 450
-LaunchConditions 50
-MigrateFeatureStates 600
-MoveFiles 1900
-MsiPublishAssemblies 3025
-MsiUnpublishAssemblies 875
-NewProductFound NEWPRODUCTS 110
-PatchFiles 2000
-ProcessComponents 800
-PublishComponents 3000
-PublishFeatures 3050
-PublishProduct 3100
-RegisterClassInfo 2200
-RegisterComPlus 2700
-RegisterExtensionInfo 2250
-RegisterFonts 2550
-RegisterMIMEInfo 2350
-RegisterProduct 2950
-RegisterProgIdInfo 2300
-RegisterTypeLibraries 2650
-RegisterUser 2900
-RemoveDuplicateFiles 1700
-RemoveEnvironmentStrings 1650
-RemoveExistingProducts 675
-RemoveFiles 1750
-RemoveFolders 1800
-RemoveIniValues 1550
-RemoveODBC 1200
-RemoveRegistryValues 1300
-RemoveShortcuts 1600
-RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250
-SameProductFound SAMEPRODUCTS 120
-ScheduleReboot ISSCHEDULEREBOOT 3125
-SetARPInstallLocation 990
-SetODBCFolders 550
-StartServices VersionNT 2800
-StopServices VersionNT 950
-UnpublishComponents 850
-UnpublishFeatures 900
-UnregisterClassInfo 1350
-UnregisterComPlus 1050
-UnregisterExtensionInfo 1400
-UnregisterFonts 1250
-UnregisterMIMEInfo 1500
-UnregisterProgIdInfo 1450
-UnregisterTypeLibraries 1150
-ValidateProductID 300
-WriteEnvironmentStrings 2500
-WriteIniValues 2450
-WriteRegistryValues 2400
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallU.idt
deleted file mode 100644
index 7b6bbd4..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallU.idt
+++ /dev/null
@@ -1,30 +0,0 @@
-Action Condition Sequence
-s72 S255 I2
-InstallUISequence Action
-AppSearch 25
-CCPSearch CCP_TEST 250
-CostFinalize 550
-CostInitialize 400
-ExecuteAction 850
-FileCost 450
-FindRelatedProducts 150
-InstallWelcome Not Installed 650
-IsolateComponents 500
-LaunchConditions 50
-MaintenanceWelcome Installed And Not RESUME And Not Preselected And Not PATCH 750
-MigrateFeatureStates 600
-NewProductFound NEWPRODUCTS 160
-PatchWelcome Installed And PATCH And Not IS_MAJOR_UPGRADE 625
-ResolveSource Not Installed And Not PATCH 525
-RMCCPSearch Not CCP_SUCCESS And CCP_TEST 300
-SameProductFound SAMEPRODUCTS 170
-setAllUsersProfile2K VersionNT >= 500 512
-SetAllUsersProfileNT VersionNT = 400 511
-SetupCompleteError -3
-SetupCompleteSuccess -1
-SetupInitialization 100
-SetupInterrupted -2
-SetupProgress 800
-SetupResume Installed And (RESUME Or Preselected) And Not PATCH 700
-setUserProfileNT VersionNT 510
-ValidateProductID 350
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt
deleted file mode 100644
index e4d3f33..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Condition Description
-s255 l255
-65001 LaunchCondition Condition
-Privileged OOO_LAUNCH_1
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ListBox.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ListBox.idt
deleted file mode 100644
index e62653d..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ListBox.idt
+++ /dev/null
@@ -1,3 +0,0 @@
-Property Order Value Text
-s72 i2 s64 L64
-ListBox Property Order
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
deleted file mode 100644
index b8a970c..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
+++ /dev/null
@@ -1,55 +0,0 @@
-Property Value
-s72 l0
-65001 Property Property
-_IsMaintenance Reinstall
-_IsSetupTypeMin Typical
-AgreeToLicense No
-ApplicationUsers AllUsers
-ALLUSERS 1
-ARPCOMMENTS ARPCOMMENTSTEMPLATE
-ARPCONTACT OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK OOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE OOO_ARPHELPTELEPHONETEMPLATE
-ARPURLINFOABOUT OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO OOO_ARPURLUPDATEINFOTEMPLATE
-DefaultUIFont Tahoma8
-DialogCaption Windows Installer
-DiskPrompt [1]
-Display_IsBitmapDlg 1
-DisplayNameCustom IDPROP_SETUPTYPE_CUSTOM
-DisplayNameMinimal IDPROP_SETUPTYPE_COMPACT
-DisplayNameTypical IDPROP_SETUPTYPE_TYPICAL
-DWUSINTERVAL 30
-ErrorDialog SetupError
-InstallChoice AR
-INSTALLLEVEL INSTALLLEVELTEMPLATE
-ISCHECKFORPRODUCTUPDATES ISCHECKFORPRODUCTUPDATESTEMPLATE
-ISSCRIPT_VERSION_MISSING IDS_ISSCRIPT_VERSION_MISSING
-ISSCRIPT_VERSION_OLD IDS_ISSCRIPT_VERSION_OLD
-ISVROOT_PORT_NO 0
-Manufacturer MANUFACTURERTEMPLATE
-PIDTemplate 12345<###-%%%%%%%>@@@@@
-ProductCode PRODUCTCODETEMPLATE
-ProductID none
-ProductLanguage PRODUCTLANGUAGETEMPLATE
-ProductName PRODUCTNAMETEMPLATE
-ProductVersion PRODUCTVERSIONTEMPLATE
-ProgressType0 install
-ProgressType1 Installing
-ProgressType2 installed
-ProgressType3 installs
-RebootYesNo Yes
-ReinstallModeText omus
-SecureCustomProperties NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
-SetupType Typical
-STR_NEW_DISPLAY_NAME OOO_STR_NEW_DISPLAY_NAME
-STR_EDIT OOO_STR_EDIT
-STR_MS_WORD_DOCUMENT OOO_STR_MS_WORD_DOCUMENT
-STR_MS_WORD_TEMPLATE OOO_STR_MS_WORD_TEMPLATE
-STR_MS_EXCEL_WORKSHEET OOO_STR_MS_EXCEL_WORKSHEET
-STR_MS_EXCEL_TEMPLATE OOO_STR_MS_EXCEL_TEMPLATE
-STR_MS_POWERPOINT_PRESENTATION OOO_STR_MS_POWERPOINT_PRESENTATION
-STR_MS_POWERPOINT_TEMPLATE OOO_STR_MS_POWERPOINT_TEMPLATE
-STR_MS_POWERPOINT_SHOW OOO_STR_MS_POWERPOINT_SHOW
-STR_INSTALLATION_WIZARD OOO_STR_INSTALLATION_WIZARD
-UpgradeCode UPGRADECODETEMPLATE
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt
deleted file mode 100644
index 287f33d..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt
+++ /dev/null
@@ -1,11 +0,0 @@
-Property Order Value X Y Width Height Text Help
-s72 i2 s64 i2 i2 i2 i2 L64 L50
-65001 RadioButton Property Order
-_IsMaintenance 1 Reinstall 0 0 290 14 OOO_RADIOBUTTON_2
-_IsMaintenance 2 Remove 0 60 290 14 OOO_RADIOBUTTON_3
-_IsSetupTypeMin 1 Typical 0 0 264 14 OOO_RADIOBUTTON_4
-_IsSetupTypeMin 2 Custom 0 60 264 14 OOO_RADIOBUTTON_5
-AgreeToLicense 1 No 0 15 295 15 OOO_RADIOBUTTON_6
-AgreeToLicense 2 Yes 0 0 295 15 OOO_RADIOBUTTON_7
-ApplicationUsers 1 AllUsers 1 7 290 14 OOO_RADIOBUTTON_8
-ApplicationUsers 2 OnlyCurrentUser 1 23 290 14 OOO_RADIOBUTTON_9
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/TextStyl.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/TextStyl.idt
deleted file mode 100644
index b4575c1..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/TextStyl.idt
+++ /dev/null
@@ -1,25 +0,0 @@
-TextStyle FaceName Size Color StyleBits
-s72 s32 i2 I4 I2
-TextStyle TextStyle
-Arial8 Arial 8
-Arial9 Arial 9
-ArialBlue10 Arial 10 16711680
-ArialBlueStrike10 Arial 10 16711680 8
-CourierNew8 Courier New 8
-CourierNew9 Courier New 9
-MSGothic9 MS Gothic 9
-MSSansBold8 Tahoma 8 1
-MSSansSerif8 MS Sans Serif 8
-MSSansSerif9 MS Sans Serif 9
-MSSGreySerif8 MS Sans Serif 8 8421504
-MSSWhiteSerif8 Tahoma 8 16777215
-Tahoma10 Tahoma 10
-Tahoma8 Tahoma 8
-Tahoma9 Tahoma 9
-TahomaBold10 Tahoma 10 1
-TahomaBold8 Tahoma 8 1
-Times8 Times New Roman 8
-Times9 Times New Roman 9
-TimesItalic12 Times New Roman 12 2
-TimesItalicBlue10 Times New Roman 10 16711680 2
-TimesRed16 Times New Roman 16 255
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt
deleted file mode 100644
index 82edac4..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt
+++ /dev/null
@@ -1,53 +0,0 @@
-Key Text
-s72 L255
-65001 UIText Key
-AbsentPath
-bytes OOO_UITEXT_1
-GB OOO_UITEXT_2
-KB OOO_UITEXT_3
-MB OOO_UITEXT_4
-MenuAbsent OOO_UITEXT_5
-MenuAdvertise OOO_UITEXT_6
-MenuAllCD OOO_UITEXT_7
-MenuAllLocal OOO_UITEXT_8
-MenuAllNetwork OOO_UITEXT_9
-MenuCD OOO_UITEXT_10
-MenuLocal OOO_UITEXT_11
-MenuNetwork OOO_UITEXT_12
-NewFolder OOO_UITEXT_13
-SelAbsentAbsent OOO_UITEXT_14
-SelAbsentAdvertise OOO_UITEXT_15
-SelAbsentCD OOO_UITEXT_16
-SelAbsentLocal OOO_UITEXT_17
-SelAbsentNetwork OOO_UITEXT_18
-SelAdvertiseAbsent OOO_UITEXT_19
-SelAdvertiseAdvertise OOO_UITEXT_20
-SelAdvertiseCD OOO_UITEXT_21
-SelAdvertiseLocal OOO_UITEXT_22
-SelAdvertiseNetwork OOO_UITEXT_23
-SelCDAbsent OOO_UITEXT_24
-SelCDAdvertise OOO_UITEXT_25
-SelCDCD OOO_UITEXT_26
-SelCDLocal OOO_UITEXT_27
-SelChildCostNeg OOO_UITEXT_28
-SelChildCostPos OOO_UITEXT_29
-SelCostPending OOO_UITEXT_30
-SelLocalAbsent OOO_UITEXT_31
-SelLocalAdvertise OOO_UITEXT_32
-SelLocalCD OOO_UITEXT_33
-SelLocalLocal OOO_UITEXT_34
-SelLocalNetwork OOO_UITEXT_35
-SelNetworkAbsent OOO_UITEXT_36
-SelNetworkAdvertise OOO_UITEXT_37
-SelNetworkLocal OOO_UITEXT_38
-SelNetworkNetwork OOO_UITEXT_39
-SelParentCostNegNeg OOO_UITEXT_40
-SelParentCostNegPos OOO_UITEXT_41
-SelParentCostPosNeg OOO_UITEXT_42
-SelParentCostPosPos OOO_UITEXT_43
-TimeRemaining OOO_UITEXT_44
-VolumeCostAvailable OOO_UITEXT_45
-VolumeCostDifference OOO_UITEXT_46
-VolumeCostRequired OOO_UITEXT_47
-VolumeCostSize OOO_UITEXT_48
-VolumeCostVolume OOO_UITEXT_49
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt
deleted file mode 100644
index 0759d33..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt
+++ /dev/null
@@ -1,459 +0,0 @@
-Table Column Nullable MinValue MaxValue KeyTable KeyColumn Category Set Description
-s32 s32 s4 I4 I4 S255 I2 S32 S255 S255
-_Validation Table Column
-_Validation Category Y Text;Formatted;Template;Condition;Guid;Path;Version;Language;Identifier;Binary;UpperCase;LowerCase;Filename;Paths;AnyPath;WildCardFilename;RegPath;KeyFormatted;CustomSource;Property;Cabinet;Shortcut;URL String category
-_Validation Column N Identifier Name of column
-_Validation Description Y Text Description of column
-_Validation KeyColumn Y 1 32 Column to which foreign key connects
-_Validation KeyTable Y Identifier For foreign key, Name of table to which data must link
-_Validation MaxValue Y -2147483647 2147483647 Maximum value allowed
-_Validation MinValue Y -2147483647 2147483647 Minimum value allowed
-_Validation Nullable N Y;N Whether the column is nullable
-_Validation Set Y Text Set of values that are permitted
-_Validation Table N Identifier Name of table
-ActionText Action N Identifier Name of action to be described.
-ActionText Description Y Text Localized description displayed in progress dialog and log when action is executing.
-ActionText Template Y Template Optional localized format template used to format action data records for display during action execution.
-AdminExecuteSequence Action N Identifier Name of action to invoke, either in the engine or the handler DLL.
-AdminExecuteSequence Condition Y Condition Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminExecuteSequence Sequence Y -4 32767 Number that determines the sort order in which the actions are to be executed. Leave blank to suppress action.
-AdminUISequence Action N Identifier Name of action to invoke, either in the engine or the handler DLL.
-AdminUISequence Condition Y Condition Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminUISequence Sequence Y -4 32767 Number that determines the sort order in which the actions are to be executed. Leave blank to suppress action.
-AdvtExecuteSequence Action N Identifier Name of action to invoke, either in the engine or the handler DLL.
-AdvtExecuteSequence Condition Y Condition Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtExecuteSequence Sequence Y -4 32767 Number that determines the sort order in which the actions are to be executed. Leave blank to suppress action.
-AdvtUISequence Action N Identifier Name of action to invoke, either in the engine or the handler DLL.
-AdvtUISequence Condition Y Condition Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtUISequence Sequence Y -4 32767 Number that determines the sort order in which the actions are to be executed. Leave blank to suppress action.
-AppId ActivateAtStorage Y 0 1
-AppId AppId N Guid
-AppId DllSurrogate Y Text
-AppId LocalService Y Text
-AppId RemoteServerName Y Formatted
-AppId RunAsInteractiveUser Y 0 1
-AppId ServiceParameters Y Text
-AppSearch Property N Identifier The property associated with a Signature
-AppSearch Signature_ N Signature;RegLocator;IniLocator;DrLocator;CompLocator 1 Identifier The Signature_ represents a unique file signature and is also the foreign key in the Signature, RegLocator, IniLocator, CompLocator and the DrLocator tables.
-BBControl Attributes Y 0 2147483647 A 32-bit word that specifies the attribute flags to be applied to this control.
-BBControl BBControl N Identifier Name of the control. This name must be unique within a billboard, but can repeat on different billboard.
-BBControl Billboard_ N Billboard 1 Identifier External key to the Billboard table, name of the billboard.
-BBControl Height N 0 32767 Height of the bounding rectangle of the control.
-BBControl Text Y Text A string used to set the initial text contained within a control (if appropriate).
-BBControl Type N Identifier The type of the control.
-BBControl Width N 0 32767 Width of the bounding rectangle of the control.
-BBControl X N 0 32767 Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
-BBControl Y N 0 32767 Vertical coordinate of the upper left corner of the bounding rectangle of the control.
-Billboard Action Y Identifier The name of an action. The billboard is displayed during the progress messages received from this action.
-Billboard Billboard N Identifier Name of the billboard.
-Billboard Feature_ N Feature 1 Identifier An external key to the Feature Table. The billboard is shown only if this feature is being installed.
-Billboard Ordering Y 0 32767 A positive integer. If there is more than one billboard corresponding to an action they will be shown in the order defined by this column.
-Binary Data N Binary The unformatted binary data.
-Binary Name N Identifier Unique key identifying the binary data.
-BindImage File_ N File 1 Identifier The index into the File table. This must be an executable file.
-BindImage Path Y Paths A list of ; delimited paths that represent the paths to be searched for the import DLLS. The list is usually a list of properties each enclosed within square brackets [] .
-CCPSearch Signature_ N Signature;RegLocator;IniLocator;DrLocator;CompLocator 1 Identifier The Signature_ represents a unique file signature and is also the foreign key in the Signature, RegLocator, IniLocator, CompLocator and the DrLocator tables.
-CheckBox Property N Identifier A named property to be tied to the item.
-CheckBox Value Y Formatted The value string associated with the item.
-Class AppId_ Y AppId 1 Guid Optional AppID containing DCOM information for associated application (string GUID).
-Class Argument Y Formatted optional argument for LocalServers.
-Class Attributes Y 32767 Class registration attributes.
-Class CLSID N Guid The CLSID of an OLE factory.
-Class Component_ N Component 1 Identifier Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-Class Context N Identifier The numeric server context for this server. CLSCTX_xxxx
-Class DefInprocHandler Y Filename 1;2;3 Optional default inproc handler. Only optionally provided if Context=CLSCTX_LOCAL_SERVER. Typically "ole32.dll" or "mapi32.dll"
-Class Description Y Text Localized description for the Class.
-Class Feature_ N Feature 1 Identifier Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
-Class FileTypeMask Y Text Optional string containing information for the HKCRthis CLSID) key. If multiple patterns exist, they must be delimited by a semicolon, and numeric subkeys will be generated: 0,1,2...
-Class Icon_ Y Icon 1 Identifier Optional foreign key into the Icon Table, specifying the icon file associated with this CLSID. Will be written under the DefaultIcon key.
-Class IconIndex Y -32767 32767 Optional icon index.
-Class ProgId_Default Y ProgId 1 Text Optional ProgId associated with this CLSID.
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list