summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-13icu: do not include non-standardized xlocale.h if U_PLATFORM_IS_LINUX_BASEDdistro/cib/libreoffice-5-3Eike Rathke
... should be more platforms ... but be conservative. U_PLATFORM_IMPLEMENTS_POSIX does not hold what it promises. "The file and this data structure is not standardized. Don't rely on it. It can go away without warning." ... And since glibc 2.26 it's gone. https://ssl.icu-project.org/trac/ticket/13329 (cherry picked from commit 9e399bc613bb4ea1470bd52c64af920d4e9bc39b) Change-Id: I4c1f6130571f5d094cb35ce70e4d333763cee32a
2018-08-15nss: upgrade to release 3.38Michael Stahl
Fixes CVE-2018-0495 and "the ASN.1 code". (Remove one hunk of nss-android.patch.1 that should be obsolete with the current Android toolchain baseline (but that hunk didn't exist in libreoffice-6-0 or older anyway).) Change-Id: I5516edec17b72f53acd2749e8840805eead077bc Reviewed-on: https://gerrit.libreoffice.org/58697 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3ef76067bfa1f9f60ec3989bd6b40a5760137903) Reviewed-on: https://gerrit.libreoffice.org/58722 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e4874f777048535650a2bb1ce875e1a6e3e4b7ef)
2018-08-15nss: Upgrade to release 3.31.1 and update patchesGautam Prajapati
This commit updates the NSS to release 3.31.1 and NSPR to 4.15. It also updates the external/nss/nss.patch and external/nss/nss-android.patch to incorporate the NSS source changes. Change-Id: Icdd933b67e717f8d91622cd5f6001e34e261b746 Reviewed-on: https://gerrit.libreoffice.org/41636 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit c6df07f905cd9562132b06e44f90b0479b250f7a)
2018-08-15nss: try to remove nss.windowbuild.patch.0Michael Stahl
It's not obvious to me what problem this solves. Maybe the problem no longer exsists in the new upstream release? Change-Id: I16762e0024536afb821eac70c6ba3929d5b8927a Reviewed-on: https://gerrit.libreoffice.org/36798 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 489414f2395b6c8008ebcda7c37a150fd4ed7ad5)
2018-08-15xmlsecurity: nsscrypto_initialize: try to avoid profile migrationMichael Stahl
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.35_release_notes NSS 3.35 and later will automatically migrate migrate profiles from the old "dbm:" BDB format to the new "sql:" SQLite format. The new format can be read by NSS 3.12 and later, which is old enough that it can be assumed to be available. However LibreOffice still shouldn't migrate the profile on its own: LO typically uses a Mozilla Firefox or Thunderbird profile, and if it is a system Firefox with system NSS libraries, then it's probably a bad idea for LO to migrate the profile under Firefox's nose, particularly considering the "partial migration" scenario if the profile is password-protected. Try to avoid this by checking if the profile is the old format and explicitly using the "dbm:" prefix to prevent the migration. Change-Id: I06480522f830ce74e2fb7bf79fee84ad80979b82 Reviewed-on: https://gerrit.libreoffice.org/58756 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 61688aa1abd9db9adbb8dc5d5aacc6269b21fd27) Reviewed-on: https://gerrit.libreoffice.org/58974 (cherry picked from commit dc5474b2e2f361eec981c6955630dbb020442eae)
2018-08-15curl: in 7.52.1, the parameter is documented as --with-libidn2,Michael Stahl
but actually it is --with-libidn (it's consistent in later versions). Change-Id: Ib24767974173e4c737fc10d9420e6dbad3440239 (cherry picked from commit 66a2c1fe2e4fd57987ae62f6274a89fab0fab58a)
2018-08-14Default OpenGL to off on all platformsThorsten Behrens
Change-Id: Ide04d3b37b9fabb64d514fd87acbdfe9e49e6727
2018-07-12Disable crash reporter UI, add local store optionSamuel Mehrbrodt
- add build id to crash metadata - disable CrashReportUI - make crash directory configurable Change-Id: I8106ec674080ede7072581dab2e6700040de5828
2018-07-04./g: don't exit early on ./g checkout -fThorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/56822 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 5fce97a58b8f764e35bf98128591c9a89537da05) Change-Id: I33f54c365bce64ccccfeb1c58fc8e4faddb7ad77 Reviewed-on: https://gerrit.libreoffice.org/56916 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit dca20728ebe798ada1045ea3dabcb981166e2b9d)
2018-02-20download via https rather than httpCaolán McNamara
Change-Id: I2840d116d1a59e19f5869c0550c6ed3d1b911304 Reviewed-on: https://gerrit.libreoffice.org/37063 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2f3060d40a7c6972a2054514e59cea36e0437951)
2018-02-09CheckLinkFormulaNeedingCheck() for named expressionsEike Rathke
This is a combination of 3 commits. CheckLinkFormulaNeedingCheck() for .ods named expressions This is specifically necessary for named expressions that are used in conditional format formulas, for which RPN is generated at a later stage, not during import. (cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2) CheckLinkFormulaNeedingCheck() for .xls named expressions (cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616) CheckLinkFormulaNeedingCheck() for .xlsx named expressions (cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c) Conflicts: sc/source/filter/oox/defnamesbuffer.cxx e03cb5767c34f8157a492a6d6c3b0700d065052d 217c89822ab477a6c383d170ae739e44efd10fa3 Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc Reviewed-on: https://gerrit.libreoffice.org/48858 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 908854a7b281454332af434be9468ec45d420030)
2018-02-09CheckLinkFormulaNeedingCheck() for conditional format expressionsEike Rathke
This is a combination of 4 commits. Prepare CheckLinkFormulaNeedingCheck() to use either RPN or tokenized code Conditional format formulas aren't finally compiled until needed so the check will have to operate on the tokenized expression instead of RPN code. (cherry picked from commit faa0305ba3d0dc698fce4915d4f3a1fb52422380) CheckLinkFormulaNeedingCheck() for .ods conditional format expressions (cherry picked from commit 2930ba2ac5d9423f2848b968edcd8ddc71966186) CheckLinkFormulaNeedingCheck() for .xlsx conditional format expressions (cherry picked from commit fef24d9f999ee54d7936900485d97ff26656f517) CheckLinkFormulaNeedingCheck() for .xls conditional format expressions (cherry picked from commit af2a2a0c72db312902e466c36697b5c198041e82) 45eb1ab5efa0ec9da2663f20427d2474ce300826 31ede1a23223a798141a0891deeabd8cf88fff58 afa112cc591b411d80ead48bf726788d361f6eb3 Change-Id: I68837e9bd33f125ab47b10b1a6fa18175abd1627 Reviewed-on: https://gerrit.libreoffice.org/48719 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit dc44111ad5965bf4179fc654b677e1e445dea2f0)
2018-02-09CheckLinkFormulaNeedingCheck() for .xls and .xlsx formula cellsEike Rathke
This is a combination of 3 commits. Move implementation to CheckLinkFormulaNeedingCheck() for further reuse (cherry picked from commit 55e484c7bcd3ef218e08d3fd93f97bf98fd8cb7f) CheckLinkFormulaNeedingCheck() for .xlsx cell formulas (cherry picked from commit f96dbc3dd9c33202f75e29ef49d962386595995d) CheckLinkFormulaNeedingCheck() for .xls cell formulas (cherry picked from commit 6bc48275558c3f76c4da25eb8af3c48583ac5599) a6dd195f7eb4d43483e87eeca59f651e7bf2dcb8 2587fbc4fec39b6f2c8e733331815a2953dee308 Change-Id: I541d2b6e12a88371c064b901b00e71206ee0c18e Reviewed-on: https://gerrit.libreoffice.org/48143 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2bef4debcf7650f3b3922134dff0332d4a95da3f)
2018-02-09handle ocWebservice similarly to ocDdeCaolán McNamara
might have too much in here seeing as we don't need to worry about ocWebservice calling into itself Reviewed-on: https://gerrit.libreoffice.org/47819 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit e1946d75a1095c2596d7815600454ff01fcd3270) Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: I0145f38cc1c1f9ff514a496f7101d81cde9e7c67
2018-02-09Better handle ScDde formulas with missing dde-link entriesCaolán McNamara
typically each ScDde formula has a matching table:dde-link which results in a ScDdeLink getting inserted during the load. If that dde-link is missing then no ScDdeLink exists and ScDde() will create a new one without cached content. So detect that ScDde is used in the freshing loaded ods and defer fetching new content until the right time. only call GetHasMacroFunc to set SetHasMacroFunc and bHasMacroFunc is not accessed any other way, so this is an oxbow Reviewed-on: https://gerrit.libreoffice.org/47757 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit b0597ba5d745974fce752e1b677451a19350d351) Reviewed-on: https://gerrit.libreoffice.org/47818 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 4ede45eb239b1604bca900c22481b7d13e4c2790) Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: I016b53288076d83dd49e92e245346a5f7f560522
2018-02-09limit WEBSERVICE to http[s] protocolsCaolán McNamara
and like excel... 'For protocols that aren’t supported, such as ftp:// or file://, WEBSERVICE returns the #VALUE! error value.' Change-Id: I0e9c6fd3426fad56a199eafac48de9b0f23914b3
2018-01-31gbuild: populate local symstore on WindowsThorsten Behrens
Script based on Lubos' tb master script from http://nabble.documentfoundation.org/Daily-Win32-debug-builds-td4067279.html Change-Id: I7f3247367a63078881f3cf51cf3e2cad59ad67b5 Reviewed-on: https://gerrit.libreoffice.org/33088 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 17e9a5bf94eb08f88f8c78c9982dd0ce48a5e2d9)
2018-01-31cmis: add error handling on checkinThorsten Behrens
Change-Id: I3951a237789ee4b7697f70bc527ffbb6a626206a
2018-01-31libcmis: error handling for datetime string parserThorsten Behrens
Change-Id: Ie5be0307fa8ac0292f7692f9674e07776cb1948d
2018-01-31Branded images for msi installerKatarina Behrens
The sizes are 122 x 234, 374 x 44 installed units respectively, according to http://msdn.microsoft.com/de-de/library/windows/desktop/aa369490%28v=vs.85%29.aspx it is 163x312, 499x58 pixels at 96 dpi. I bumped dpi to 120 and it still looks pixelated, but it's as good as it gets. For better results, we need different graphics, with less fine details given the very limited space Change-Id: I4a7eafed16fd79f377d27afa8151cfab614b464b
2018-01-31Branded application iconsKatarina Behrens
sadly, this doesn't replace Windows taskbar icon, that must be living somewhere else. It works on Linux though. Conflicts: icon-themes/galaxy/res/main128.png icon-themes/galaxy/res/mainapp_16.png icon-themes/galaxy/res/mainapp_16_8.png icon-themes/galaxy/res/mainapp_32.png icon-themes/galaxy/res/mainapp_32_8.png icon-themes/galaxy/res/mainapp_48_8.png Change-Id: I028fc68d96f02113622c5e1ec3ed830ac797be0b
2018-01-31Point to CIB helpdeskKatarina Behrens
it's pretty mean, b/c German translation (which I can't change) says the site is in English, while CIB site is in German only and can't be switched to other lang Conflicts: sfx2/source/appl/appserv.cxx Change-Id: Ifbbb9e9d2bbee40998c07d1c68b61cd20d77dbc3
2018-01-31Point to CIB websiteKatarina Behrens
this idiotic postprocess script hard-codes libreoffice.org for some reason, grr Change-Id: Ide1f19d4da9a437e01118e8baf74c0d1a8ca2e10
2018-01-31CIB branding for start centerKatarina Behrens
Conflicts: icon-themes/galaxy/sfx2/res/startcenter-logo.png Change-Id: I9887fded72131c7888d6e1b1165a778c8da2952d
2018-01-10tdf#114628 correct line spacing for impresslibreoffice-5-3Szymon Kłos
* use line spacing also for the first line * correct spacing in case of > 100% proportional spacing * impedit2.cxx only code readability change Change-Id: I24832e7dc2fa8cfbb2f9cdfe7062eaaaa63f1729 Reviewed-on: https://gerrit.libreoffice.org/46925 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/47571 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-01-10tdf#114848 Don't save empty themesSzymon Kłos
Change-Id: I7136f5c0bc884a2f9ea945b4e0bc093a5ef2d8df Reviewed-on: https://gerrit.libreoffice.org/47481 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/47579 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-11-25Add ICU changeset-40324 fix for CVE-2017-14952Eike Rathke
(cherry picked from commit cebe1279665960b732c9cb05c18e481c33e778bb) Conflicts: external/icu/UnpackedTarball_icu.mk Change-Id: Ia457669c5ec6ef5c568f4550c44ef5df32a4be66 Reviewed-on: https://gerrit.libreoffice.org/44494 Tested-by: Eike Rathke <erack@redhat.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2017-11-09Resolves: tdf#111428 swap ScColumn::mnBlkCountFormulaEike Rathke
This is a combination of 2 commits. (cherry picked from commit 423df1fa929784c14e3a133c06468589fe9269cd) (cherry picked from commit 911e2aff3cc37cb7410292728ffea05fffbfb0b3) CellStoreEvent remembered the original ScColumn::mnBlkCountFormula, hence after inserting a column to the left the quick check of ScColumn::HasFormulaCell() whether there are any formula cells worked on the swapped in count (originally the one to the right) that happens to be empty in the scenario. Things worked correctly by accident if the next column to the right already contained a formula cell. c44fed96c49bea7365bf1200e06788860966795c Change-Id: If993856ceee657736f516a81c293506041a6b7eb Reviewed-on: https://gerrit.libreoffice.org/44210 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Eike Rathke <erack@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/44493
2017-11-08tdf#103978 textboxhelper: syncProperty OPAQUE (wrap in background)Justin Luth
Although the containing shape is in the background (and thus the normal paragraph text is still visible), the shape's text was still painting over top of the normal paragraph text because the textbox was set as opaque and not transparent. Setting the textbox to sync the opacity value of its containing shape. Change-Id: I02477e2fa7def1f13590afcaa7c6564dd79d6406 Reviewed-on: https://gerrit.libreoffice.org/39672 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit cc438f60d6ad0855f754dd32da9c9a80c7cabf92) Reviewed-on: https://gerrit.libreoffice.org/44431 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2017-11-08tdf#104602: don't re-draw page background when bOnlyTextBackgroundJustin Luth
In 2014 Writer gained support for Paragraph and PageStyle DrawingLayer FillAttributes, it changed some behaviour with PaintBackground, so that compat setting BACKGROUND_PARA_OVER_DRAWINGS now overwrote the entire "hell" layer as the page background was re-applied. Only DOCX uses this 2012 compatibility setting. Change-Id: I69517efb7d82acd719d6a27a09ba61554dbf1ec9 Reviewed-on: https://gerrit.libreoffice.org/41744 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit de0993097cad2fd5819f8bea5ff53cddce7cde41) Reviewed-on: https://gerrit.libreoffice.org/41902 (cherry picked from commit 7117e92448ea328bd4798e873a2faecda748a369) Reviewed-on: https://gerrit.libreoffice.org/44442 Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2017-10-31PPTX export: correct position of rotated groupsSzymon Kłos
* added testcase for tdf#113263 Change-Id: I7abf68d8fb4ffd8b883cfbf4d69916912add8182 Reviewed-on: https://gerrit.libreoffice.org/43794 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/44082 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2017-10-31PPTX export: remember color schemes in themeSzymon Kłos
Remember color scheme from loaded pptx file or use default values. Change-Id: Icb69c51603afc5f332c20c75e4ed5f659f4b5614 Reviewed-on: https://gerrit.libreoffice.org/43470 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/44081 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2017-10-31SmartArt: export text rotation in the PPTXSzymon Kłos
Change-Id: I74bfc172fe7434d14de468ecfd3412636e53780c Reviewed-on: https://gerrit.libreoffice.org/43202 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/44080 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-10-31ODP: export TextPreRotateAngleSzymon Kłos
Change-Id: I13eb005195ebbdee5016bf279cba423e388723a0 Reviewed-on: https://gerrit.libreoffice.org/43910 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/44079 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-10-24update creditsChristian Lohmaier
Change-Id: I6de45254981f24b05dbcc4bdde43d6ff25b7d001 (cherry picked from commit 49b338b76020682328acbb76cacf82b7699d8891)
2017-10-21tdf#113225 - hold the solar mutex when entering from UNO.Michael Meeks
http://crashreport.libreoffice.org/stats/crash_details/dff57662-1693-47f6-8b09-88f180d2e706 Change-Id: I4322c2113c300af97fb5854aac4a741b7027e6b1 Reviewed-on: https://gerrit.libreoffice.org/43623 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 254c49dcceaa8b181b2cb3338e34e5637be277b9) Reviewed-on: https://gerrit.libreoffice.org/43637 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-10-20tdf#97630 xmloff: ODF extended draw:fit-to-size messMichael Stahl
The plan: 1. As Regina points out, there is already (in ODF 1.2, but not ODF 1.1) a style:shrink-to-fit attribute for shapes, so use this to represent the AUTOFIT value. The fallback from AUTOFIT to draw:fit-to-size="true" was a stupid idea anyway, probably "false" is less annoying in practice. There are 2 different shapes that implement TextFitToSize property: a) text shapes already interpret ALLLINES and PROPORTIONAL exactly the same b) fontwork custom shapes interpret ALLLINES but do nothing for PROPORTIONAL As Regina points out, there is no shape that needs to distinguish between ALLLINES and PROPORTIONAL, so we do a minor behavioral API CHANGE and from now on interpret PROPORTIONAL as ALLLINES on fontwork custom shapes. This obviates the need to distinguish the values in ODF and so we don't need a new attribute, just use draw:fit-to-size="true" for both. On import, use MID_FLAG_MERGE_PROPERTY to combine the 2 attributes into one value. 2. Restrict the export of draw:fit-to-size to only the standard values "true"/"false". This implements step 1, the step 2 will be done in the future when most users have the import of the style:shrink-to-fit. Change-Id: I4a378aa110fdb82db7a99a839d7ff207248a73e7 Reviewed-on: https://gerrit.libreoffice.org/43521 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 33eb9fdb61033b3fd35d923900b1f5791f4b71c8) Reviewed-on: https://gerrit.libreoffice.org/43596 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-10-20Resolves: tdf#113214 change back to previous entry after 'more' is dispatcherCaolán McNamara
Change-Id: Ic5bd5f9182e47c6dfdab8fcd6399ffc482a4fb6a Reviewed-on: https://gerrit.libreoffice.org/43512 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7ff293f2d2793b30f30d2f499b332e5329d4ddb4) Reviewed-on: https://gerrit.libreoffice.org/43518 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-10-19tdf#113225 - reset framebuffer count when resetting OpenGLContextMichael Meeks
Otherwise we can fail to allocate a new one when we need it post reset. http://crashreport.libreoffice.org/stats/crash_details/e4f26191-15d5-441a-868f-9ada21ef4424 Change-Id: Icc5ec6c51338e18a0a1bc890f56670e8fe9c73ea Reviewed-on: https://gerrit.libreoffice.org/43508 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 856d734ee1665b6aa7304847c3a923af09066016) Reviewed-on: https://gerrit.libreoffice.org/43551 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-10-17Resolves: tdf#112933 correct number of one decimal in fraction of secondsEike Rathke
Regression from commit 0ac1e2ad19d4fdb46dcf54f67db2df081f4675bb Date: Wed Aug 2 09:39:43 2017 +0100 Resolves: ofz#2833 null deref and similar for date+time commit 42b894f80a6d0c39bb0f7092eb204a15c22c4f38 Date: Sat Aug 5 19:15:36 2017 +0100 ofz#2867 null deref Effectively revert the code changes of those, leaving the test case files intact, and "do the right thing" (switching two lines, to nPos = nPos + sStrArray[i].getLength(); i++; nPos actually had always to be incremented by the length of the *current* string position but was used after only as an error position indicator, meaningless if there was no error. (cherry picked from commit 4f72d2ec6c210232e0abd4965e215611e807c125) Conflicts: svl/source/numbers/zforscan.cxx Backported. Change-Id: I9bc4e5e56d70a275d26df0b72ed6a19e9297e0fa Reviewed-on: https://gerrit.libreoffice.org/43441 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-10-04bump product version to 5.3.8.0.0+Christian Lohmaier
Change-Id: Iced498da000209f0586549408f26a5485ab83782
2017-10-04gdb pretty-printers: fix StringPrinterHelper for gdb 8.0Michael Stahl
Latest gdb release "lazy_string" validates the array size: Traceback (most recent call last): File "/work/lo/master/solenv/gdb/libreoffice/util/string.py", line 29, in to_string return self.make_string(data, self.encoding, len) File "/work/lo/master/solenv/gdb/libreoffice/util/string.py", line 66, in make_string return data.lazy_string(encoding, length) gdb.error: Length is larger than array size. rtl_uString has "sal_Unicode buffer[1];", which is a lie as the real size is the same as "length". Taking the address of "buffer" appears to avoid the exception. Change-Id: I85710b1adfae584ba09c8d517e9b49b290e79d8a (cherry picked from commit 205677c88cb01e2bbee278443867baed2c89e5fe) Reviewed-on: https://gerrit.libreoffice.org/42942 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-10-04Updated coreChristian Lohmaier
Project: translations a19f72fff1301f4ff17251d901db5a211660dd82 update translations for 5.3.7 rc1 and force-fix errors using pocheck Change-Id: I5a27ea19f32a43495bd604f70a78c2bdbfd972e9
2017-10-04Resolves: tdf#112780 no ResetDirty() after SetHybridEmptyDisplayedAsString()Eike Rathke
Change-Id: Idea5c1bd8e8577eaf90fc47d39f88c79963c422b (cherry picked from commit df778416981ab02d42182e5c2e46dc09ba2e2a3c) Reviewed-on: https://gerrit.libreoffice.org/43048 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Eike Rathke <erack@redhat.com>
2017-10-02ofz#3527 ofz#3532 Invalid read of size 8Caolán McNamara
use numrule name to look up numrule instead of cached numrule pointer in case it was deleted on failure to apply the numrule over an invalid range Invalid read of size 8 at 0x1E875132: rtl::OUString::OUString(rtl::OUString const&) (ustring.hxx:143) by 0x1EB33D93: SwWW8ImplReader::StartAnl(unsigned char const*) (ww8par2.cxx:1094) by 0x1EB33003: SwWW8ImplReader::Read_ANLevelNo(unsigned short, unsigned char const*, short) (ww8par2.cxx:910) by 0x1EBA375D: SwWW8ImplReader::ImportSprm(unsigned char const*, int, unsigned short) (ww8par6.cxx:6337) by 0x1EAEEA24: SwWW8ImplReader::ReadTextAttr(int&, long, bool&) (ww8par.cxx:3810) by 0x1EAEF15A: SwWW8ImplReader::ReadAttrs(int&, int&, long, bool&) (ww8par.cxx:3921) by 0x1EAEF6E0: SwWW8ImplReader::ReadText(int, int, ManTypes) (ww8par.cxx:4003) by 0x1EAF6DCE: SwWW8ImplReader::CoreLoad(WW8Glossary const*) (ww8par.cxx:5219) Address 0x31831158 is 200 bytes inside a block of size 248 free'd at 0x4C2F21A: operator delete(void*) (vg_replace_malloc.c:576) by 0x253BC1B5: SwDoc::DelNumRule(rtl::OUString const&, bool) (docnum.cxx:1033) by 0x25CB943D: SwFltControlStack::SetAttrInDoc(SwPosition const&, SwFltStackEntry&) (fltshell.cxx:609) by 0x1EAE5011: SwWW8FltControlStack::SetAttrInDoc(SwPosition const&, SwFltStackEntry&) (ww8par.cxx:1445) by 0x25CB8A9E: SwFltControlStack::SetAttr(SwPosition const&, unsigned short, bool, long, bool) (fltshell.cxx:457) by 0x1EAE420E: SwWW8FltControlStack::SetAttr(SwPosition const&, unsigned short, bool, long, bool) (ww8par.cxx:1185) by 0x1EAE5C12: SwWW8ImplReader::Read_Tab(unsigned short, unsigned char const*, short) (ww8par.cxx:1625) by 0x1EBA35F0: SwWW8ImplReader::EndSprm(unsigned short) (ww8par6.cxx:6321) by 0x1EAEEA44: SwWW8ImplReader::ReadTextAttr(int&, long, bool&) (ww8par.cxx:3813) by 0x1EAEF15A: SwWW8ImplReader::ReadAttrs(int&, int&, long, bool&) (ww8par.cxx:3921) by 0x1EAEF6E0: SwWW8ImplReader::ReadText(int, int, ManTypes) (ww8par.cxx:4003) by 0x1EAF6DCE: SwWW8ImplReader::CoreLoad(WW8Glossary const*) (ww8par.cxx:5219) Change-Id: Ia7ab67e42fc7a162d8089722e77841285f72a671 Reviewed-on: https://gerrit.libreoffice.org/43030 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-10-01Resolves: tdf#100822 use sax::Converter::parseDateTime() for 'd' ISO 8601 dateEike Rathke
Instead of squeezing the string through the locale dependent number parser (which should force '.' Time100SecSeparator for 'T' ISO 8601 but apparently doesn't yet) that is a bottle neck anyway. Change-Id: I70f74e680322a715c9cc658c8be033620d9798e3 (cherry picked from commit 5374c04a89e1720490a3625dfd95406c2d60c0cd) Reviewed-on: https://gerrit.libreoffice.org/42971 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-09-30tdf#112679 sw: fix copying of fieldmarksMichael Stahl
Aha, now we know that the reason for the defensive programming in lcl_AssureFieldMarksSet() was that there are actually 2 different use-cases for it: usually a new mark is inserted, so there are no dummy characters and they must be inserted. However when copying text, the dummy characters are copied too, so they must not be inserted, or we get duplicate fieldmarks. This also reverts commit d4036d3a89b65a4912f62e3930eb1a31cd90a16b which fixed the problem only for CHECKBOX_FIELDMARK in a different way. (regression from bb069fe7b8b6a24f9ff4df4c7052961e17ea3a8c) (cherry picked from commit 421a23bb36bbf51edfabc58b7d2cd28ad37719d0) Silence --disable-assert-always-abort warnings (cherry picked from commit 7e76b983301b02dd7020636905b764b981b1fff0) loplugin:constparams (cherry picked from commit 14e2a82002042a3fe4d8866b635ee84a436a7a7c) Change-Id: I3c99b8c6d720951655198e682018794337859373 Reviewed-on: https://gerrit.libreoffice.org/42868 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2017-09-29Resolves: tdf#103734 propagate error from matrix to MIN()/MAX()Eike Rathke
(cherry picked from commit 9e694c747954078442d47d3d7bd1d4db283b96ff) Conflicts: sc/source/core/tool/interpr1.cxx Backported. Change-Id: I1ebc5baf4957ef9e3d1477b803cf7fee02754360 Reviewed-on: https://gerrit.libreoffice.org/41886 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-09-29Resolves: tdf#112523 do not use anything Ascii in UI contextEike Rathke
Change-Id: I0854f7b1e6e0bf51d8b4c7d846fad9b0ff25e763 (cherry picked from commit 86910087fa41956aad6a22943bfbeb158e205dcd) Reviewed-on: https://gerrit.libreoffice.org/42872 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-09-28tdf#112486 Do not force GDI in no OpenGLXisco Fauli
See: http://nabble.documentfoundation.org/Re-Minutes-of-ESC-call-2017-09-21-tt4223238.html Patch only for 5.3 branch Change-Id: I19bb4b58d2260fd23c32a687a9f504540c229985 Reviewed-on: https://gerrit.libreoffice.org/42898 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>