summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-06-19 11:50:43 +0200
committerMichael Stahl <mstahl@redhat.com>2013-09-09 22:09:09 +0200
commitd78e4f0c461d80c17aa813c7ee6c04b5cee881b0 (patch)
treea4a81ff049723e0c86760801672c70c8ab3528fe /scp2/source
parent451ee8a4d75d08e8162147f4c467c4d0673ba31f (diff)
scp2: a little cleaning
Change-Id: I4b41f8c2c6dd82956cb2493676c9854744eecbad
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/ooo/common_brand.scp9
-rw-r--r--scp2/source/ooo/directory_ooo.scp12
-rw-r--r--scp2/source/ooo/ooo_brand.scp41
-rw-r--r--scp2/source/ooo/profile_ooo.scp26
-rw-r--r--scp2/source/ooo/profileitem_ooo.scp7
5 files changed, 28 insertions, 67 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e706330ebe3e..5d95ba7e1105 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -812,6 +812,15 @@ End
// ProfileItems
+ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
+ ProfileID = gid_Brand_Profile_Bootstrap_Ini;
+ ModuleID = gid_Module_Root_Brand;
+ Section = "ErrorReport";
+ Order = 8;
+ Key = "ErrorReportServer";
+ Value = "report.libreoffice.org";
+End
+
ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
ProfileID = gid_Brand_Profile_Bootstrap_Ini;
ModuleID = gid_Module_Root_Brand;
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 36d652290598..ded453fff7a9 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -18,6 +18,18 @@
#include "macros.inc"
+#ifndef MACOSX
+Directory gid_Dir_Brand_Root
+ ParentID = PREDEFINED_PROGDIR;
+ #ifdef WNT
+ HostName = "${WINDOWSBASISROOTNAME}";
+ #else
+ HostName = ".";
+ #endif
+ Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
+End
+#endif
+
#ifdef MACOSX
Directory gid_Dir_Bundle_Contents_Resources
ParentID = gid_Dir_Bundle_Contents;
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
deleted file mode 100644
index 1f8b536fdfd9..000000000000
--- a/scp2/source/ooo/ooo_brand.scp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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 "macros.inc"
-
-#ifndef MACOSX
-Directory gid_Dir_Brand_Root
- ParentID = PREDEFINED_PROGDIR;
- #ifdef WNT
- HostName = "${WINDOWSBASISROOTNAME}";
- #else
- HostName = ".";
- #endif
- Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
-End
-#endif
-
-ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
- ProfileID = gid_Brand_Profile_Bootstrap_Ini;
- ModuleID = gid_Module_Root_Brand;
- Section = "ErrorReport";
- Order = 8;
- Key = "ErrorReportServer";
- Value = "report.libreoffice.org";
-End
-
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
deleted file mode 100644
index a5bb3e896d7e..000000000000
--- a/scp2/source/ooo/profile_ooo.scp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 "macros.inc"
-
-Profile gid_Profile_Uno_Ini
- ModuleID = gid_Module_Root;
- Name = PROFILENAME(uno);
- Dir = GID_BRAND_DIR_ETC;
- Styles = (NETWORK);
-End
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 5709a7378c67..0611a631845f 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -20,6 +20,13 @@
#include "config_folders.h"
+Profile gid_Profile_Uno_Ini
+ ModuleID = gid_Module_Root;
+ Name = PROFILENAME(uno);
+ Dir = GID_BRAND_DIR_ETC;
+ Styles = (NETWORK);
+End
+
ProfileItem gid_Profileitem_Setup_Uno_Services
ProfileID = gid_Profile_Setup_Ini;
ModuleID = gid_Module_Root;