From e9abb43448b6d1366faf12ba3c923e5991296868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 23 May 2019 20:27:10 +0100 Subject: [PATCH] Resolves: rhbz#1712823 crash in extended tooltips over pattern editor --- ...12823-prefer-help-strings-to-a11y-st.patch | 80 + ...099-round-duration-results-in-interp.patch | 1750 +++++++++++++++++ libreoffice.spec | 10 +- 3 files changed, 1838 insertions(+), 2 deletions(-) create mode 100644 0001-Resolves-rhbz-1712823-prefer-help-strings-to-a11y-st.patch create mode 100644 0001-Resolves-tdf-125099-round-duration-results-in-interp.patch diff --git a/0001-Resolves-rhbz-1712823-prefer-help-strings-to-a11y-st.patch b/0001-Resolves-rhbz-1712823-prefer-help-strings-to-a11y-st.patch new file mode 100644 index 0000000..3da687a --- /dev/null +++ b/0001-Resolves-rhbz-1712823-prefer-help-strings-to-a11y-st.patch @@ -0,0 +1,80 @@ +From 623ad17227406b30e53436046831c43f160a6486 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 29 Mar 2019 15:23:28 +0000 +Subject: [PATCH] Resolves: rhbz#1712823 prefer help strings to a11y strings + when available +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed-on: https://gerrit.libreoffice.org/69934 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +Tested-by: Caolán McNamara +(cherry picked from commit b70053ba681a9b62afd6fa700ad94256d98d8dc7) + +Change-Id: I50b36f697b8dd9ff8108392d48a7050702edbfbe +--- + vcl/unx/gtk3/gtk3gtkinst.cxx | 29 ++++++++++++++++++----------- + 1 file changed, 18 insertions(+), 11 deletions(-) + +diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx +index a69e4df05806..5123db7c9f2e 100644 +--- a/vcl/unx/gtk3/gtk3gtkinst.cxx ++++ b/vcl/unx/gtk3/gtk3gtkinst.cxx +@@ -6514,6 +6514,13 @@ public: + return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8); + } + ++ virtual OUString get_accessible_description() const override ++ { ++ AtkObject* pAtkObject = default_drawing_area_get_accessible(m_pWidget); ++ const char* pStr = pAtkObject ? atk_object_get_description(pAtkObject) : nullptr; ++ return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8); ++ } ++ + virtual ~GtkInstanceDrawingArea() override + { + g_object_steal_data(G_OBJECT(m_pDrawingArea), "g-lo-GtkInstanceDrawingArea"); +@@ -7579,16 +7586,7 @@ namespace + const ImplSVData* pSVData = ImplGetSVData(); + if (pSVData->maHelpData.mbBalloonHelp) + { +- /*This is how I would prefer things to be, only a few like this though*/ +- AtkObject* pAtkObject = gtk_widget_get_accessible(pWidget); +- const char* pDesc = pAtkObject ? atk_object_get_description(pAtkObject) : nullptr; +- if (pDesc) +- { +- gtk_tooltip_set_text(tooltip, pDesc); +- return true; +- } +- +- /*So fallback to existing mechanism which needs help installed*/ ++ /*Current mechanism which needs help installed*/ + OString sHelpId = ::get_help_id(pWidget); + Help* pHelp = !sHelpId.isEmpty() ? Application::GetHelp() : nullptr; + if (pHelp) +@@ -7600,10 +7598,19 @@ namespace + return true; + } + } ++ ++ /*This is how I would prefer things to be, only a few like this though*/ ++ AtkObject* pAtkObject = gtk_widget_get_accessible(pWidget); ++ const char* pDesc = pAtkObject ? atk_object_get_description(pAtkObject) : nullptr; ++ if (pDesc && pDesc[0]) ++ { ++ gtk_tooltip_set_text(tooltip, pDesc); ++ return true; ++ } + } + + const char* pDesc = gtk_widget_get_tooltip_text(pWidget); +- if (pDesc) ++ if (pDesc && pDesc[0]) + { + gtk_tooltip_set_text(tooltip, pDesc); + return true; +-- +2.21.0 + diff --git a/0001-Resolves-tdf-125099-round-duration-results-in-interp.patch b/0001-Resolves-tdf-125099-round-duration-results-in-interp.patch new file mode 100644 index 0000000..6aaad5f --- /dev/null +++ b/0001-Resolves-tdf-125099-round-duration-results-in-interp.patch @@ -0,0 +1,1750 @@ +From f01e31762b02b8b896e726238eb2475c0e01ef82 Mon Sep 17 00:00:00 2001 +From: Eike Rathke +Date: Tue, 7 May 2019 23:17:45 +0200 +Subject: [PATCH] Resolves: tdf#125099 round duration results in interpreter + already +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + This is a combination of 3 commits. + +Resolves: tdf#125099 round duration results in interpreter already + +So wall clock time formats less likely display a one-off value, +duration formats are too rarely used if the expected duration is +less than 24 hours. + +Reviewed-on: https://gerrit.libreoffice.org/71909 +Tested-by: Jenkins +Reviewed-by: Eike Rathke +(cherry picked from commit 85c0521f01f5c726e9f754b3175a550121e566c8) + +Test RANK(), not the underlying floating point representation of duration + +The RANK() results depended on the floating point representation +of time differences (durations), which for visually equal MM:SS +display values don't have to be equal if similar durations result +from different start and end times. Change that to a well defined +duration in seconds. + +b69a6b43f48abd2d4fe605021acfd2800e75b5e1 +Reviewed-on: https://gerrit.libreoffice.org/71926 +Reviewed-by: Eike Rathke +Tested-by: Jenkins +(cherry picked from commit 8de7949050d63fd9f7ac41e1a2442849580b86fa) + +Fix typed flags bitmask, tdf#125099 follow-up + +25327cfcafc9e1f2e88b388677853c638dd9b0e6 +Reviewed-on: https://gerrit.libreoffice.org/71946 +Reviewed-by: Eike Rathke +Tested-by: Jenkins +(cherry picked from commit d27ad84ec7a0aafb07d6a6152c686f4bc802f661) + +Change-Id: I9b0872420699b17e3ed3f20993f8cfe02761f862 +Reviewed-on: https://gerrit.libreoffice.org/71935 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +Tested-by: Caolán McNamara +--- + include/svl/zforlist.hxx | 7 +- + offapi/com/sun/star/util/NumberFormat.idl | 7 + + .../data/functions/statistical/fods/rank.fods | 739 +++++++----------- + sc/source/core/tool/interpr4.cxx | 21 +- + sc/source/core/tool/interpr5.cxx | 9 +- + 5 files changed, 317 insertions(+), 466 deletions(-) + +diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx +index 143d14e03f50..cf7b1dec34a9 100644 +--- a/include/svl/zforlist.hxx ++++ b/include/svl/zforlist.hxx +@@ -109,9 +109,14 @@ enum class SvNumFormatType : sal_Int16 + @since LibreOffice 5.1 + */ + EMPTY = css::util::NumberFormat::EMPTY, // 4096 ++ /** @internal selects a time duration format. ++ 8192 + TIME (4) ++ @since LibreOffice 6.2 ++ */ ++ DURATION = css::util::NumberFormat::DURATION, // 8196 + }; + namespace o3tl { +- template<> struct typed_flags : is_typed_flags {}; ++ template<> struct typed_flags : is_typed_flags {}; + } + + /** enum values for SvNumberFormatter::GetFormatIndex +diff --git a/offapi/com/sun/star/util/NumberFormat.idl b/offapi/com/sun/star/util/NumberFormat.idl +index 2bc297aed425..e66a59d7e215 100644 +--- a/offapi/com/sun/star/util/NumberFormat.idl ++++ b/offapi/com/sun/star/util/NumberFormat.idl +@@ -99,6 +99,13 @@ published constants NumberFormat + */ + const short EMPTY = 4096; + ++ ++ /** @internal selects a time duration format. ++ 8192 + TIME (4) ++ @since LibreOffice 6.2 ++ */ ++ const short DURATION = 8196; ++ + }; + + +diff --git a/sc/qa/unit/data/functions/statistical/fods/rank.fods b/sc/qa/unit/data/functions/statistical/fods/rank.fods +index 880f3659032b..d12703d5ee55 100644 +--- a/sc/qa/unit/data/functions/statistical/fods/rank.fods ++++ b/sc/qa/unit/data/functions/statistical/fods/rank.fods +@@ -1,12 +1,12 @@ + + + +- 2017-01-02T17:08:37.518406343P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64 LibreOffice_project/ea860d52ade14b4a16289c81a0f8586799c6617f ++ 2017-01-02T17:08:37.518406343P0D1LibreOfficeDev/6.1.6.3.0$Linux_X86_64 LibreOffice_project/47b704879f52819423702f4efa17cbae8d7b7afa + + + 0 + 0 +- 58986 ++ 53248 + 8995 + + +@@ -32,7 +32,7 @@ + + + 4 +- 1 ++ 10 + 0 + 0 + 0 +@@ -50,7 +50,7 @@ + + + Sheet2 +- 1241 ++ 1861 + 0 + 100 + 60 +@@ -58,7 +58,7 @@ + true + true + true +- 12632256 ++ 12632256 + true + true + true +@@ -77,24 +77,13 @@ + + + 7 +- false +- false + true +- true +- false +- false +- false +- 1270 +- 1270 +- true +- true +- true +- true +- true + false +- 12632256 +- false +- Lexmark-E352dn ++ false ++ 0 ++ false ++ lwH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAuAAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCmNvbGxhdGU9ZmFsc2UKbWFyZ2luZGFqdXN0bWVudD0wLDAsMCwwCmNvbG9yZGVwdGg9MjQKcHNsZXZlbD0wCnBkZmRldmljZT0xCmNvbG9yZGV2aWNlPTAKUFBEQ29udGV4RGF0YQpQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY= ++ Generic Printer + + + cs +@@ -125,16 +114,28 @@ + + + +- true +- true ++ true + 3 +- 1 + true ++ false ++ true ++ true ++ 12632256 ++ true ++ true ++ false ++ true ++ false ++ true ++ false ++ true + 1 +- true +- lgH+/0xleG1hcmstRTM1MmRuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpMZXhtYXJrLUUzNTJkbgAAAAAAAAAAAAAAAAAWAAMAtwAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg== +- false +- 0 ++ false ++ 1270 ++ 1270 ++ false ++ 1 ++ true + + + +@@ -159,9 +160,11 @@ + + + ++ + + + ++ + + + +@@ -2971,6 +2974,9 @@ + + + ++ ++ ++ + + + +@@ -3100,9 +3106,6 @@ + + + +- +- +- + + + +@@ -3163,31 +3166,25 @@ + + + +- ++ + + +- ++ + + + + ++ ++ ++ + +- ++ + + +- +- +- +- +- +- +- +- +- + + +- +- ++ ++ + + + +@@ -3215,13 +3212,6 @@ + + + +- +- +- +- +- +- +- + + + +@@ -3253,26 +3243,19 @@ + + + +- ++ + + + + + +- ++ + + + + + + +- +- +- +- +- +- +- + + + +@@ -3389,15 +3372,15 @@ + + + +- ??? (???) ++ ???(???) + + +- 00/00/0000, 00:00:00 ++ 00/00/0000, 00:00:00 + + + + +- Page 1 / 99 ++ Page 1/ 99 + + + +@@ -3449,7 +3432,7 @@ + + + +- ++ + + Sheet + +@@ -3460,11 +3443,11 @@ + Description + + +- ++ + + 1 + +- ++ + TRUE + + +@@ -3481,27 +3464,7 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ + + + +@@ -3513,16 +3476,11 @@ + + + +- ++ + + + + +- +- +- +- +- + + + +@@ -3538,16 +3496,15 @@ + + + +- + +- ++ + + +- ++ + +- ++ + +- ++ + + Function + +@@ -3581,7 +3538,7 @@ + finish time + + +- time taken ++ time taken (s) + + + +@@ -3592,17 +3549,17 @@ + + + +- ++ + + +- ++ + + 4 + + + 4 + +- ++ + TRUE + + +@@ -3633,18 +3590,18 @@ + + + +- ++ + + + +- ++ + + 3 + + + 3 + +- ++ + TRUE + + +@@ -3667,8 +3624,8 @@ + + 34:45 + +- +- 17:34 ++ ++ 1054 + + + +@@ -3683,17 +3640,17 @@ + + + +- ++ + + +- ++ + + 3 + + + 3 + +- ++ + TRUE + + +@@ -3714,8 +3671,8 @@ + + 34:47 + +- +- 17:35 ++ ++ 1055 + + + +@@ -3729,17 +3686,17 @@ + + + +- ++ + + +- ++ + + 5 + + + 5 + +- ++ + TRUE + + +@@ -3757,8 +3714,8 @@ + + 34:45 + +- +- 17:32 ++ ++ 1052 + + + +@@ -3768,17 +3725,17 @@ + + + +- ++ + + +- +- +- 6 ++ ++ ++ 5 + +- +- 6 ++ ++ 5 + +- ++ + TRUE + + +@@ -3796,8 +3753,8 @@ + + 34:43 + +- +- 17:29 ++ ++ 1049 + + + +@@ -3805,17 +3762,17 @@ + + + +- ++ + + +- ++ + + 7 + + + 7 + +- ++ + TRUE + + +@@ -3831,24 +3788,24 @@ + + 34:50 + +- +- 17:34 ++ ++ 1054 + + + + + +- ++ + + +- ++ + + 4 + + + 4 + +- ++ + TRUE + + +@@ -3865,8 +3822,8 @@ + + 34:45 + +- +- 17:28 ++ ++ 1048 + + + +@@ -3874,17 +3831,17 @@ + + + +- ++ + + +- ++ + + 2 + + + 2 + +- ++ + TRUE + + +@@ -3900,8 +3857,8 @@ + + 34:47 + +- +- 17:29 ++ ++ 1049 + + + +@@ -3909,17 +3866,17 @@ + + + +- ++ + + +- ++ + + 5 + + + 5 + +- ++ + TRUE + + +@@ -3934,17 +3891,17 @@ + + + +- ++ + + +- ++ + + 1 + + + 1 + +- ++ + TRUE + + +@@ -3956,22 +3913,22 @@ + + + +- ++ + + + + +- ++ + + +- +- +- 3 ++ ++ ++ 2 + +- +- 3 ++ ++ 2 + +- ++ + TRUE + + +@@ -3985,21 +3942,21 @@ + + + +- ++ + + + +- ++ + + +- ++ + + #VALUE! + + + #VALUE! + +- ++ + TRUE + + +@@ -4010,20 +3967,20 @@ + + + +- ++ + + +- ++ + + +- ++ + + 3 + + + 3 + +- ++ + TRUE + + +@@ -4034,20 +3991,20 @@ + + + +- ++ + + +- ++ + + +- ++ + + 3 + + + 3 + +- ++ + TRUE + + +@@ -4060,16 +4017,16 @@ + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + +@@ -4078,16 +4035,16 @@ + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + +@@ -4097,16 +4054,16 @@ + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + +@@ -4116,16 +4073,16 @@ + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + +@@ -4134,16 +4091,16 @@ + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + +@@ -4152,32 +4109,32 @@ + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + +@@ -4186,16 +4143,16 @@ + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + +@@ -4204,64 +4161,64 @@ + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + +@@ -4270,80 +4227,80 @@ + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + +@@ -4352,382 +4309,242 @@ + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + +- ++ + + +- ++ + + +- +- ++ ++ + +- ++ + + + +- ++ + + +- ++ + + +- ++ + +- ++ + + + +- ++ + + +- ++ + + +- ++ + +- ++ + + + + +- ++ + + +- ++ + + +- ++ + +- ++ + + + +- ++ + + +- ++ + + +- ++ + + + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx +index cc3672cbdbeb..57ab5aec29a2 100644 +--- a/sc/source/core/tool/interpr4.cxx ++++ b/sc/source/core/tool/interpr4.cxx +@@ -4433,6 +4433,7 @@ StackVar ScInterpreter::Interpret() + case SvNumFormatType::DATE: + case SvNumFormatType::TIME: + case SvNumFormatType::DATETIME: ++ case SvNumFormatType::DURATION: + nRetIndexExpr = nFuncFmtIndex; + break; + default: +@@ -4547,13 +4548,26 @@ StackVar ScInterpreter::Interpret() + // unnecessarily duplicate the information. + if (pCur->GetDoubleType() != 0) + { +- const double fVal = PopDouble(); ++ double fVal = PopDouble(); + if (!bForcedResultType) + { + if (nCurFmtType != nFuncFmtType) + nRetIndexExpr = 0; // carry format index only for matching type + nRetTypeExpr = nFuncFmtType = nCurFmtType; + } ++ if (nRetTypeExpr == SvNumFormatType::DURATION) ++ { ++ // Round the duration in case a wall clock time ++ // display format is used instead of a duration ++ // format. To micro seconds which then catches ++ // the converted hh:mm:ss.9999997 cases. ++ if (fVal != 0.0) ++ { ++ fVal *= 86400.0; ++ fVal = rtl::math::round( fVal, 6); ++ fVal /= 86400.0; ++ } ++ } + PushTempToken( CreateFormulaDoubleToken( fVal)); + } + if ( nFuncFmtType == SvNumFormatType::UNDEFINED ) +@@ -4663,6 +4677,11 @@ StackVar ScInterpreter::Interpret() + else + nRetFmtType = SvNumFormatType::NUMBER; + ++ // Currently (2019-05-06) nothing else can cope with a duration format ++ // type, change to time as it was before. ++ if (nRetFmtType == SvNumFormatType::DURATION) ++ nRetFmtType = SvNumFormatType::TIME; ++ + if (nGlobalError != FormulaError::NONE && GetStackType() != svError ) + PushError( nGlobalError); + +diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx +index b18ddd7fb673..aefb26c920e3 100644 +--- a/sc/source/core/tool/interpr5.cxx ++++ b/sc/source/core/tool/interpr5.cxx +@@ -1129,15 +1129,16 @@ ScMatrixRef ScInterpreter::MatConcat(const ScMatrixRef& pMat1, const ScMatrixRef + return xResMat; + } + +-// for DATE, TIME, DATETIME ++// for DATE, TIME, DATETIME, DURATION + static void lcl_GetDiffDateTimeFmtType( SvNumFormatType& nFuncFmt, SvNumFormatType nFmt1, SvNumFormatType nFmt2 ) + { + if ( nFmt1 != SvNumFormatType::UNDEFINED || nFmt2 != SvNumFormatType::UNDEFINED ) + { + if ( nFmt1 == nFmt2 ) + { +- if ( nFmt1 == SvNumFormatType::TIME || nFmt1 == SvNumFormatType::DATETIME ) +- nFuncFmt = SvNumFormatType::TIME; // times result in time ++ if ( nFmt1 == SvNumFormatType::TIME || nFmt1 == SvNumFormatType::DATETIME ++ || nFmt1 == SvNumFormatType::DURATION ) ++ nFuncFmt = SvNumFormatType::DURATION; // times result in time duration + // else: nothing special, number (date - date := days) + } + else if ( nFmt1 == SvNumFormatType::UNDEFINED ) +@@ -1181,6 +1182,7 @@ void ScInterpreter::CalculateAddSub(bool _bSub) + case SvNumFormatType::DATE : + case SvNumFormatType::TIME : + case SvNumFormatType::DATETIME : ++ case SvNumFormatType::DURATION : + nFmt2 = nCurFmtType; + break; + case SvNumFormatType::CURRENCY : +@@ -1203,6 +1205,7 @@ void ScInterpreter::CalculateAddSub(bool _bSub) + case SvNumFormatType::DATE : + case SvNumFormatType::TIME : + case SvNumFormatType::DATETIME : ++ case SvNumFormatType::DURATION : + nFmt1 = nCurFmtType; + break; + case SvNumFormatType::CURRENCY : +-- +2.21.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 976b7ce..eb25412 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 3%{?libo_prerelease}%{?dist} +Release: 4%{?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 MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -245,6 +245,8 @@ Patch2: 0001-rhbz-1690732-basic-font-variation-support.patch Patch3: 0001-rhbz-1699347-__glibcxx_requires_subscript-enabled-in.patch Patch4: 0001-no-home-as-templates.patch Patch5: 0001-Resolves-rhbz-1702810-Prepare-for-upcoming-libebook-.patch +Patch6: 0001-Resolves-rhbz-1712823-prefer-help-strings-to-a11y-st.patch +Patch7: 0001-Resolves-tdf-125099-round-duration-results-in-interp.patch %if 0%{?rhel} # not upstreamed @@ -2134,7 +2136,11 @@ done %{_includedir}/LibreOfficeKit %changelog -* Thu May 21 2019 Caolán McNamara - 1:6.2.3.2-3 +* Thu May 23 2019 Caolán McNamara - 1:6.2.3.2-4 +- Resolves: rhbz#1712823 crash in extended tooltips over pattern editor +- Resolves: rhbz#1711143 calc not rounding time calculation correctly + +* Tue May 21 2019 Caolán McNamara - 1:6.2.3.2-3 - rebuild for e-d-s * Thu May 02 2019 Caolán McNamara - 1:6.2.3.2-2