From 9ef17d48ac06acf33659686afbc8de84ac179d16 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Jan 13 2014 13:40:54 +0000 Subject: Merge branch 'f20' into f19 --- 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 1d19dc9..1bd2750 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -266,6 +266,7 @@ Patch26: 0001-Resolves-rhbz-1038189-refresh-printer-list-when-prin.patch Patch27: 0001-make-dragging-and-dropping-slides-stop-crashing.patch Patch28: 0001-Related-rhbz-1039517-ml-short-cut-keys-are-unavailab.patch Patch29: 0001-n-839727-Crash-fix.patch +Patch30: 0001-Related-rhbz-1047871-conditional-formatting-doesn-t-.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -1031,6 +1032,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch27 -p1 -b .make-dragging-and-dropping-slides-stop-crashing.patch %patch28 -p1 -b .rhbz-1039517-ml-short-cut-keys-are-unavailab.patch %patch29 -p1 -b .n839727-Crash-fix.patch +%patch30 -p1 -b .rhbz-1047871-conditional-formatting-doesn-t-.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2120,8 +2122,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Wed Jan 08 2014 Caolán McNamara - 1:4.1.4.2-4-UNBUILT +* Mon Jan 13 2014 Caolán McNamara - 1:4.1.4.2-4 - Resolves: rhbz#1038176 fix crash in loading certain charts +- Related: rhbz#1047871 conditional formatting doesn't fix on screen * Tue Jan 07 2014 David Tardon - 1:4.1.4.2-3 - Resolves: rhbz#1047017 All the selected toolbars became unselected