diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-05-01 13:05:06 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-01 13:05:06 +0200 |
| commit | 93e11e4fb697aaea63c99308f980e4c932bd1efa (patch) | |
| tree | 1892e49932d8d7b7656ae504113a40e4e39f876f /scp2 | |
| parent | a5b6a379a2d628040db98060c2adfe8f2fac5607 (diff) | |
| parent | c6786add5a58268e11aa027c47054344040db1bc (diff) | |
Merge tag 'libreoffice-4.0.3.2' into suse-4.0
Tag libreoffice-4.0.3.2
Conflicts:
basic/qa/cppunit/test_vba.cxx
basic/source/runtime/step2.cxx
dictionaries
helpcontent2
instsetoo_native/util/openoffice.lst
libvisio/UnpackedTarball_visio.mk
sc/source/ui/vba/vbaapplication.cxx
sc/source/ui/vba/vbavalidation.cxx
solenv/inc/minor.mk
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
translations
Change-Id: Ic1f06489175f3db92d6bbcebb9732fadc1c61fed
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 48 |
1 files changed, 33 insertions, 15 deletions
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 267105189160..b3d1919f9a0b 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -744,6 +744,14 @@ Module gid_Module_Root_Fonts_OOo_Hidden gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, gid_File_Fnt_DejaVuSerifCondensed_Italic, gid_File_Fnt_DejaVuSerifCondensed, + gid_File_Fnt_GentiumBasicRegular, + gid_File_Fnt_GentiumBasicBold, + gid_File_Fnt_GentiumBasicItalic, + gid_File_Fnt_GentiumBasicBoldItalic, + gid_File_Fnt_GentiumBookBasicRegular, + gid_File_Fnt_GentiumBookBasicBold, + gid_File_Fnt_GentiumBookBasicItalic, + gid_File_Fnt_GentiumBookBasicBoldItalic, gid_File_Fnt_LibSansNarrow_Regular, gid_File_Fnt_LibSansNarrow_Bold, gid_File_Fnt_LibSansNarrow_BoldItalic, @@ -759,21 +767,31 @@ Module gid_Module_Root_Fonts_OOo_Hidden gid_File_Fnt_LiberationSerif_Bold, gid_File_Fnt_LiberationSerif_BoldItalic, gid_File_Fnt_LiberationSerif_Italic, - gid_File_Fnt_LiberationSerif_Regular - gid_File_Fnt_PtSerif_Regular - gid_File_Fnt_PtSerif_Bold - gid_File_Fnt_PtSerif_Italic - gid_File_Fnt_PtSerif_BoldItalic - gid_File_Fnt_OpenSans_Regular - gid_File_Fnt_OpenSans_Bold - gid_File_Fnt_OpenSans_Italic - gid_File_Fnt_OpenSans_BoldItalic - gid_File_Fnt_SourceSans_Regular - gid_File_Fnt_SourceSans_Bold - gid_File_Fnt_SourceSans_Italic - gid_File_Fnt_SourceSans_BoldItalic - gid_File_Fnt_SourceCode_Regular - gid_File_Fnt_SourceCode_Bold); + gid_File_Fnt_LiberationSerif_Regular, + gid_File_Fnt_LinuxLibertineG_Regular, + gid_File_Fnt_LinuxLibertineG_Semibold, + gid_File_Fnt_LinuxLibertineG_Bold, + gid_File_Fnt_LinuxLibertineG_Italic, + gid_File_Fnt_LinuxLibertineG_SemiboldItalic, + gid_File_Fnt_LinuxLibertineG_BoldItalic, + gid_File_Fnt_LinuxBiolinumG_Regular, + gid_File_Fnt_LinuxBiolinumG_Bold, + gid_File_Fnt_LinuxBiolinumG_Italic, + gid_File_Fnt_PtSerif_Regular, + gid_File_Fnt_PtSerif_Bold, + gid_File_Fnt_PtSerif_Italic, + gid_File_Fnt_PtSerif_BoldItalic, + gid_File_Fnt_OpenSans_Regular, + gid_File_Fnt_OpenSans_Bold, + gid_File_Fnt_OpenSans_Italic, + gid_File_Fnt_OpenSans_BoldItalic, + gid_File_Fnt_SourceSans_Regular, + gid_File_Fnt_SourceSans_Bold, + gid_File_Fnt_SourceSans_Italic, + gid_File_Fnt_SourceSans_BoldItalic, + gid_File_Fnt_SourceCode_Regular, + gid_File_Fnt_SourceCode_Bold, + gid_File_FcLocal_Conf); End #endif |