[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-1' - scp2/source

[Maxim Monastirsky]

 scp2/source/ooo/file_ooo.scp             |    2 ++
 scp2/source/ooo/module_hidden_ooo.scp    |    1 +
 scp2/source/ooo/module_lang_template.scp |    1 +
 3 files changed, 4 insertions(+)

New commits:
commit c6beff5dc531890bd8758115f792a9ef0440ff08
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Aug 10 18:08:28 2014 +0300

    fdo#78845 Packaging of fpicker ui files
    
    Change-Id: I78e217032af52b365cc2d07909bda68daaf028a1
    Reviewed-on: https://gerrit.libreoffice.org/10857
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 24884b2007a7dc48fa13bd3fd32d36109536403c)
    Reviewed-on: https://gerrit.libreoffice.org/10867
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 6f5d715..9b11d66 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -498,6 +498,7 @@ UI_FILELIST(dbtdata, "UIConfig/modules/dbtdata.filelist")
 #endif
 UI_FILELIST(desktop, "UIConfig/desktop.filelist")
 UI_FILELIST(filter, "UIConfig/filter.filelist")
+UI_FILELIST(fps, "UIConfig/fps.filelist")
 UI_FILELIST(sabpilot, "UIConfig/modules/sabpilot.filelist")
 #ifdef DBCONNECTIVITY
 UI_FILELIST(sbibliography, "UIConfig/modules/sbibliography.filelist")
@@ -535,6 +536,7 @@ UI_FILELIST_ALL_LANG(spropctrlr, modules/spropctrlr)
 #endif
 UI_FILELIST_ALL_LANG(desktop, desktop)
 UI_FILELIST_ALL_LANG(filter, filter)
+UI_FILELIST_ALL_LANG(fps, fps)
 UI_FILELIST_ALL_LANG(sabpilot, modules/sabpilot)
 UI_FILELIST_ALL_LANG(scalc, modules/scalc)
 UI_FILELIST_ALL_LANG(schart, modules/schart)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index c269045..d9cc9bd 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -240,6 +240,7 @@ Module gid_Module_Root_Files_6
 #endif
         gid_File_Share_Config_Sofficecfg_uiconfig_desktop,
         gid_File_Share_Config_Sofficecfg_uiconfig_filter,
+        gid_File_Share_Config_Sofficecfg_uiconfig_fps,
 #ifdef DBCONNECTIVITY
         gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography,
 #endif
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 0ac4ea0..8facc54 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -32,6 +32,7 @@ Module gid_Module_Langpack_Basis_Template
 #endif
              gid_File_Share_Config_Sofficecfg_uiconfig_desktop_Lang,
              gid_File_Share_Config_Sofficecfg_uiconfig_filter_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_fps_Lang,
              gid_File_Share_Config_Sofficecfg_uiconfig_sabpilot_Lang,
              gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang,
              gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang,