[Libreoffice-commits] core.git: scp2/source

[Stephan Bergmann]

 scp2/source/ooo/profileitem_ooo.scp |   76 ------------------------------------
 1 file changed, 76 deletions(-)

New commits:
commit bee4c09ba233fa269aa70461537b4cc8dea769f6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 26 08:32:53 2014 +0100

    Remove gid_Profile_Setup_Ini junk
    
    884bb65da9414f9217cbbc77ae6fb9a2e4c41f4f "INTEGRATION: CWS native141: #i87732#
    version number in package names" removed gid_Profile_Setup_Ini and
    b857e4618b2ca37798a9aaa3121c5ff926df346f "INTEGRATION: CWS native141: #i87732#
    version number in package names" removed its nine correpsonding
    gid_Profileitems, but 00de796b0253e7374cf65ad59ef6d391dbdafaa7 "INTEGRATION: CWS
    odfversion241_DEV300" brought back seven of the gid_Profileitems (but not the
    gid _Profile_Setup_Ini itself; probably due to a merge conflict; then
    fd1db0b8eba8e86c5a7e1a3c685e76975d21d93c "Undo basis/brand split: move
    program/classes/ from basis to brand" removed one of the gid_Profileitems
    again).  Now remove the remaining six.
    
    Change-Id: I464ac1258217b2ecf8e94b2c7e59b795306d5b06

diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 210aedc..6ca5dba 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -27,82 +27,6 @@ Profile gid_Profile_Louno_ini
     Styles = (NETWORK);
 End
 
-ProfileItem gid_Profileitem_Setup_Uno_Services
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "UNO_SERVICES";
-    Value = "$ORIGIN/setup_services.rdb";
-End
-
-ProfileItem gid_Profileitem_Setup_Uno_Types
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 3;
-    Key = "UNO_TYPES";
-    Value = "$ORIGIN/types.rdb";
-End
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Alluserset
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "ALLUSERS";
-    Value = "[ALLUSERS]";
-    Inifiletablekey = "AllUsersSet";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-
-#endif
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Findproduct
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 5;
-    Key = "FINDPRODUCT";
-    Value = "[FINDPRODUCT]";
-    Inifiletablekey = "FindProductSet";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-
-#endif
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Productcode
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 6;
-    Key = "ProductCode";
-    Value = "<productcode>";
-End
-
-#endif
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Upgradecode
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 7;
-    Key = "UpgradeCode";
-    Value = "<upgradecode>";
-End
-
-#endif
-
 ProfileItem gid_Profileitem_Louno_Uno_Bundled_Extensions
     ProfileID = gid_Profile_Louno_ini;
     ModuleID = gid_Module_Root;