diff --git a/0001-Resolves-fdo-37130-use-10pt-Default-style-font-for-c.patch b/0001-Resolves-fdo-37130-use-10pt-Default-style-font-for-c.patch new file mode 100644 index 0000000..04d2b87 --- /dev/null +++ b/0001-Resolves-fdo-37130-use-10pt-Default-style-font-for-c.patch @@ -0,0 +1,32 @@ +From a7228e0bdbb06de56145d1edeacfe4ede1a7a7d4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Sat, 12 Apr 2014 13:35:20 +0100 +Subject: [PATCH] Resolves: fdo#37130 use 10pt Default style font for comments + +instead of 10pt UI font + +Change-Id: I92e2b415ff37f8baae67a00cc077e431b12b924c +--- + sw/source/core/uibase/docvw/SidebarWin.cxx | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/sw/source/core/uibase/docvw/SidebarWin.cxx b/sw/source/core/uibase/docvw/SidebarWin.cxx +index fb78b3b..930b95b 100644 +--- a/sw/source/ui/docvw/SidebarWin.cxx ++++ b/sw/source/ui/docvw/SidebarWin.cxx +@@ -270,12 +270,6 @@ SfxItemSet SwSidebarWin::DefaultItem() + { + SfxItemSet aItem( mrView.GetDocShell()->GetPool() ); + aItem.Put(SvxFontHeightItem(200,100,EE_CHAR_FONTHEIGHT)); +- aItem.Put(SvxFontItem(FAMILY_SWISS, +- GetSettings().GetStyleSettings().GetFieldFont().GetName(), +- OUString(), +- PITCH_DONTKNOW, +- RTL_TEXTENCODING_DONTKNOW, +- EE_CHAR_FONTINFO)); + return aItem; + } + +-- +1.9.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 111757f..ab0cc57 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 5%{?libo_prerelease}%{?dist} +Release: 6%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 Group: Applications/Productivity URL: http://www.libreoffice.org/default/ @@ -301,6 +301,7 @@ Patch34: 0001-table-not-resizing-when-rows-columns-added-to-it.patch Patch35: 0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch Patch36: 0001-Resolves-rhbz-1089377-crash-on-loading-a-specific-rt.patch Patch37: 0001-add-a-format-all-comments-feature.patch +Patch38: 0001-Resolves-fdo-37130-use-10pt-Default-style-font-for-c.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2292,6 +2293,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Wed Apr 23 2014 Caolán McNamara - 1:4.2.4.1-6-UNBUILT +- Resolves: fdo#37130 use 10pt Default style font for comments + * Wed Apr 23 2014 Caolán McNamara - 1:4.2.4.1-5 - add a 'format all comments' feature