summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-15 18:18:21 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-11-15 18:29:47 +0100
commit16aa2c1dd66d6ac8f26c460a7287a1ad6139eed3 (patch)
tree99a194b6e1892a17825003a6b7cb45698b2cc8f9 /instsetoo_native
parent240dc332ad59fc2c45eccb4b2f4923fde09a784b (diff)
Removed obsolete OOOBASEVERSION, OOOPACKAGEVERSION.
With the basis/brand split undone, they are always the same as PRODUCTVERSION and ABOUTBOXPRODUCTVERSION, respectively.
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt8
-rw-r--r--instsetoo_native/util/openoffice.lst2
2 files changed, 4 insertions, 6 deletions
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index 995f919993eb..61c329407599 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@ -1,7 +1,7 @@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
-basisinstalluser 1 Software\LibreOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstalluser_ 1 Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine 2 Software\LibreOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine_ 2 Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstalluser 1 Software\LibreOffice\Layers\Basis\[PRODUCTVERSION] BASISINSTALLLOCATION 2
+basisinstalluser_ 1 Software\LibreOffice\Layers_\Basis\[PRODUCTVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine 2 Software\LibreOffice\Layers\Basis\[PRODUCTVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine_ 2 Software\LibreOffice\Layers_\Basis\[PRODUCTVERSION] BASISINSTALLLOCATION 2
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index b8e2ef75a7c2..83a53b2de4a7 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,8 +4,6 @@ Globals
{
variables
{
- OOOBASEVERSION 3.5
- OOOPACKAGEVERSION 3.5.0
UREPACKAGEVERSION 3.5.0
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4