[Libreoffice-commits] .: 3 commits - configmgr/source instsetoo_native/util scp2/source solenv/bin

[Stephan Bergmann]

 configmgr/source/xcuparser.cxx                   |    3 +-
 instsetoo_native/util/openoffice.lst             |    3 --
 scp2/source/ooo/directory_ooo.scp                |   27 -----------------------
 scp2/source/ooo/ure_into_ooo.scp                 |    2 -
 solenv/bin/modules/installer/windows/property.pm |    6 -----
 5 files changed, 3 insertions(+), 38 deletions(-)

New commits:
commit cbaadc7b05974ee13795ac182afd1b3121708d60
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 27 10:24:24 2011 +0200

    Undo basis/brand split: removed obsoleted BASISROOTNAME.

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 35c927d..c9c0e20 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -8,7 +8,6 @@ Globals
   			OOOPACKAGEVERSION 3.5.0
 			UREPACKAGEVERSION 3.5.0
 			URELAYERVERSION 1
-			BASISROOTNAME LibreOffice
 			UNIXBASISROOTNAME libreoffice3.5
 			SERVICETAG_PRODUCTNAME LibreOffice 3.5
 			SERVICETAG_PRODUCTVERSION 3.5
@@ -186,7 +185,6 @@ LibreOffice_Dev
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION alpha0
-			BASISROOTNAME LibO-dev
 			UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
@@ -346,7 +344,6 @@ LibreOffice_Dev_SDK
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION alpha0
-            BASISROOTNAME LibO-dev
             UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 7a2bc51..110271b 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -298,12 +298,6 @@ sub set_important_properties
         push(@{$propertyfile}, $onepropertyline);
     }
 
-    if ( $allvariables->{'BASISROOTNAME'} )
-    {
-        my $onepropertyline = "BASISROOTNAME" . "\t" . $allvariables->{'BASISROOTNAME'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);
-    }
-
     if ( $allvariables->{'EXCLUDE_FROM_REBASE'} )
     {
         my $onepropertyline =  "EXCLUDE_FROM_REBASE" . "\t" . $allvariables->{'EXCLUDE_FROM_REBASE'} . "\n";
commit 977506ef8f19e9c2c719547537872df64f8c56d3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 27 10:23:52 2011 +0200

    Undo basis/brand split: removed obsoleted basis directories.

diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 9ee91e9..8c52897 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -69,33 +69,6 @@ Directory gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents
 End
 #endif
 
-#ifndef MACOSX
-Directory gid_Dir_Ooo_Openofficeorg
-    ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
-    HostName = "${BASISROOTNAME}";
-  #else
-    HostName = ".";
-  #endif
-End
-#endif
-
-#ifndef MACOSX
-Directory gid_Dir_Ooo_Basis
-  #ifdef WNT
-    ParentID = gid_Dir_Brand_Root;
-  #else
-    ParentID = gid_Dir_Ooo_Openofficeorg;
-  #endif
-  #ifdef WNT
-    HostName = "Basis";
-  #else
-    HostName = "basis${OOOBASEVERSION}";
-  #endif
-    Styles = (BASISDIRECTORY, CREATE);
-End
-#endif
-
 #if defined MACOSX
 Unixlink gid_Unixlink_Applications
     BIN_FILE_BODY;
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index a67a508..c2dd9bc 100644
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
@@ -32,7 +32,7 @@ Directory gid_Dir_Common_Ure
   #ifdef WNT
     ParentID = gid_Dir_Brand_Root;
   #else
-    ParentID = gid_Dir_Ooo_Openofficeorg;
+    ParentID = PREDEFINED_PROGDIR;
   #endif
   #ifdef WNT
     HostName = "URE";
commit 9d9f9939bd1bd0f599f4461c30b6433aa92cb101
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 27 08:33:55 2011 +0200

    Fixed previous configmgr layer numbering fix.

diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 4746bcf..7d5a2a7 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -1109,7 +1109,8 @@ void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
             bool known = i != set->getMembers().end();
             if (known && !state_.top().locked &&
                 finalizedLayer >= valueParser_.getLayer() &&
-                (!mandatory || mandatoryLayer > valueParser_.getLayer()))
+                (mandatoryLayer == Data::NO_LAYER ||
+                 mandatoryLayer > valueParser_.getLayer()))
             {
                 set->getMembers().erase(i);
             }