[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - scp2/source

Tomaž Vajngerl tomaz.vajngerl at collabora.co.uk
Wed Aug 5 01:09:41 PDT 2015


 scp2/source/ooo/directory_ooo.scp  |    5 +++++
 scp2/source/ooo/file_extra_ooo.scp |    7 +++++++
 scp2/source/ooo/module_ooo.scp     |    1 +
 3 files changed, 13 insertions(+)

New commits:
commit 9361579ffbc1da89ddbf90f1910e23af6e027b6d
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Fri Jul 24 16:54:44 2015 +0900

    Add "styles" template folder + content to installation
    
    Change-Id: Ibb674e17eedfc325d3e335aa074391ad7b2b2aa2
    (cherry picked from commit 6c853a986444294dd937cd570a4dc0a31943e432)
    Reviewed-on: https://gerrit.libreoffice.org/17486
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 1337098..0f76c94 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -588,6 +588,11 @@ Directory gid_Dir_Template_Common_Presnt
     DosName = "presnt";
 End
 
+Directory gid_Dir_Template_Common_Styles
+    ParentID = gid_Dir_Template_Common;
+    DosName = "styles";
+End
+
 Directory gid_Brand_Dir_Program_Services
 #if defined MACOSX
     ParentID = gid_Brand_Dir_Share;
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index c2cc985..f56c028 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -192,6 +192,13 @@ File gid_File_Extra_Tplpresnt
     Name = "extras_tplpresnt.filelist";
 End
 
+File gid_File_Extra_Tpl_styles
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_tpl_styles.filelist";
+End
+
 File gid_File_Extra_Tplpersonal
     Dir = FILELIST_DIR;
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 50066d3..9acfbe8 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -80,6 +80,7 @@ Module gid_Module_Root
              gid_File_Extra_Tplofficorr,
              gid_File_Extra_Tploffimisc,
              gid_File_Extra_Tplpresnt,
+             gid_File_Extra_Tpl_styles,
              gid_File_Extra_Tplpersonal,
              gid_File_Extra_Tplwizbitmap,
              gid_File_Extra_Tplwizletter,


More information about the Libreoffice-commits mailing list