From 1e8643c575fc4d7271ff1547c4ccb660987191f0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Jan 13 2014 13:36:30 +0000 Subject: Related :rhbz#1047871 conditional formatting doesn't fit on screen --- diff --git a/0001-Related-rhbz-1047871-conditional-formatting-doesn-t-.patch b/0001-Related-rhbz-1047871-conditional-formatting-doesn-t-.patch new file mode 100644 index 0000000..7161e08 --- /dev/null +++ b/0001-Related-rhbz-1047871-conditional-formatting-doesn-t-.patch @@ -0,0 +1,87 @@ +From e42d03fa6ccd4b0d24e1560163326990ce2e560d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 13 Jan 2014 13:34:16 +0000 +Subject: [PATCH] Related: rhbz#1047871 conditional formatting doesn't fit on + screen + +Change-Id: I886030c056fe802279f9e16c6f85736b0c4587c6 +--- + sc/source/ui/src/condformatdlg.src | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src +index 0594c5b..4d476a0 100644 +--- a/sc/source/ui/src/condformatdlg.src ++++ b/sc/source/ui/src/condformatdlg.src +@@ -14,32 +14,32 @@ ModalDialog RID_SCDLG_CONDFORMAT + HelpID = "sc:ModalDialog:RID_SCDLG_CONDFORMAT"; + OutputSize = TRUE; + Hide = TRUE; +- Size = MAP_APPFONT ( 300, 300 ); ++ Size = MAP_APPFONT ( 300, 265 ); + Text [ en-US ] = "Conditional Formatting for"; + Moveable = TRUE; + Closeable = TRUE; + OkButton BTN_OK + { +- Pos = MAP_APPFONT ( 190, 280 ); ++ Pos = MAP_APPFONT ( 190, 245 ); + Size = MAP_APPFONT ( 50, 14 ); + TabStop = TRUE; + }; + CancelButton BTN_CANCEL + { +- Pos = MAP_APPFONT ( 245, 280 ); ++ Pos = MAP_APPFONT ( 245, 245 ); + Size = MAP_APPFONT ( 50, 14 ); + TabStop = TRUE; + }; + PushButton BTN_ADD + { +- Pos = MAP_APPFONT( 5, 245 ); ++ Pos = MAP_APPFONT( 5, 210 ); + Size = MAP_APPFONT( 50, 14 ); + Text [ en-US ] = "Add"; + TabStop = TRUE; + }; + PushButton BTN_REMOVE + { +- Pos = MAP_APPFONT( 60, 245 ); ++ Pos = MAP_APPFONT( 60, 210 ); + Size = MAP_APPFONT( 50, 14 ); + Text [ en-US ] = "Remove"; + TabStop = TRUE; +@@ -47,26 +47,26 @@ ModalDialog RID_SCDLG_CONDFORMAT + Control CTRL_LIST + { + Pos = MAP_APPFONT( 5, 20 ); +- Size = MAP_APPFONT( 290, 220 ); ++ Size = MAP_APPFONT( 290, 185 ); + DialogControl = TRUE; + Border = TRUE; + }; + FixedText FT_RANGE + { +- Pos = MAP_APPFONT( 5, 262 ); ++ Pos = MAP_APPFONT( 5, 227 ); + Size = MAP_APPFONT( 50, 16 ); + Text [ en-US ] = "Range:"; + }; + Edit ED_RANGE + { +- Pos = MAP_APPFONT( 60, 262 ); ++ Pos = MAP_APPFONT( 60, 227 ); + Size = MAP_APPFONT( 182, 14 ); + Border = TRUE; + TabStop = TRUE; + }; + ImageButton RB_RANGE + { +- Pos = MAP_APPFONT( 245, 262 ); ++ Pos = MAP_APPFONT( 245, 227 ); + Size = MAP_APPFONT( 14, 14 ); + Border = TRUE; + TabStop = TRUE; +-- +1.8.4.2 + diff --git a/libreoffice.spec b/libreoffice.spec index e54a18d..c7a5cd0 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,7 +46,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 1%{?libo_prerelease}%{?dist} +Release: 2%{?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/ @@ -263,6 +263,7 @@ Patch11: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch Patch12: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch Patch13: 0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch Patch14: 0001-Resolves-rhbz-1038189-refresh-printer-list-when-prin.patch +Patch15: 0001-Related-rhbz-1047871-conditional-formatting-doesn-t-.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -1012,6 +1013,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch12 -p1 -b .rhbz-1035092-no-shortcut-key-for-Italian-To.patch %patch13 -p1 -b .rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch %patch14 -p1 -b .rhbz-1038189-refresh-printer-list-when-prin.patch +%patch15 -p1 -b .rhbz-1047871-conditional-formatting-doesn-t-.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2113,6 +2115,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Jan 13 2014 Caolán McNamara - 1:4.2.0.2-2 +- Related :rhbz#1047871 conditional formatting doesn't fit on screen + * Thu Jan 09 2014 David Tardon - 1:4.2.0.2-1 - update to 4.2.0 rc2 - Resolves: rhbz#1049543 Include AppData files in packages