summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-03-06forcepoint #17 nTextBreak is an index into pKernArray of len rInf.GetLen()distro/collabora/cd-5.3Caolán McNamara1-2/+1
Change-Id: I3afeaf987cc5e75362560165fea7230904530933 Reviewed-on: https://gerrit.libreoffice.org/50630 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c21fbf68da2b1ac0da3668f9494f9a8f5c4322c8)
2018-03-06ofz#6656 -1 isn't a good flag for all elements filledCaolán McNamara1-4/+1
Change-Id: I163de8fd943859fbf986da0928f3e3552d063a09 Reviewed-on: https://gerrit.libreoffice.org/50626 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 88b1ca64c0cdb426025b246618e7e9e880c286d8)
2018-03-06forcepoint #14 check to see if we incremented at allCaolán McNamara1-3/+6
Change-Id: Ia4670adbddcc8501cf522be296b3061a3529f880 Reviewed-on: https://gerrit.libreoffice.org/50607 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 31deb001ab1d06832caf9439c6b1c061fc20e3d9)
2018-03-06set number of read bytes correctlyDavid Tardon1-1/+4
It was wrong if we read less than was expected. Thanks to Antti Levomäki and Christian Jalio from Forcepoint. Change-Id: I070c1731d1aace4c101fa01efed0c28734c44899 (cherry picked from commit 9534a8fe3e84bfcc7d0d2addac4dd8cd96746d99) Reviewed-on: https://gerrit.libreoffice.org/50463 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 1b1f416244ace9ab3eb532cc4ab242486cd1930d)
2018-03-06tdf#97614 Fixing initialization code for Bluetooth and IP Server for Impress.Rostislav Kondratenko2-7/+4
Change-Id: Icc385fb760b8a5ff337f58dc95ba3c3f86805eaa Reviewed-on: https://gerrit.libreoffice.org/50108 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit fb5f13671c50f7f84d654a779bc0ff07e31ce95e) Reviewed-on: https://gerrit.libreoffice.org/50414 (cherry picked from commit 424eb9e4282596818ed39943b9d4a64cb6888eef)
2018-03-06forcepoint #10 pop empty stackCaolán McNamara4-3/+200
Reviewed-on: https://gerrit.libreoffice.org/50359 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 befd67bcd0607bf2f0116a5418f3c7278e471631) Change-Id: I96452a86187a6b03251614625445d1b18a5ee218
2018-03-06forcepoint #7 check ksc5601_2uni_page21 boundsCaolán McNamara1-17/+11
Change-Id: I578e7a63bb50f2088d35174d88f075c00469bad3 Reviewed-on: https://gerrit.libreoffice.org/50287 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit bdf30af5c2323e6f84e4bea8c7fbbcafa1dc91b3)
2018-03-06tdf#88802 disable arrow if database or table or field not selectedekuiitr1-1/+12
Change-Id: I5a29b58f6e8981ee3de73ccaa83ed04e4ee71dc6 Reviewed-on: https://gerrit.libreoffice.org/49314 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-on: https://gerrit.libreoffice.org/50266 Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> (cherry picked from commit d631bc8370fca37a33c51b5a29aca6815760f258)
2018-03-06forcepoint #5 null derefCaolán McNamara1-5/+10
Change-Id: I95b67f98b7028d7ca7c4a9d1c15100e42d359816 Reviewed-on: https://gerrit.libreoffice.org/50243 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 6ba5fc85224b8bb0b8e2a5c5013e83644c622e30)
2018-03-06forcepoint #5 check for short readCaolán McNamara1-2/+5
a zip file within a structured storage stream. underlying storage stream claims larger size that it can satisfy on read Change-Id: I8516b12df33ad78b2525192826f5e3aef2622eb8 Reviewed-on: https://gerrit.libreoffice.org/50240 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 942e23ac0cf885c8d26884fa1fb17d430f42a5f5)
2018-03-06ofz#6450 use the rule name, not the rule itselfCaolán McNamara2-6/+5
Change-Id: I62541dc48b7e9d5a906f32791437a86a8283a7bf Reviewed-on: https://gerrit.libreoffice.org/49954 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 744c267f8f6de0ba4a829874992c1404b5b79e28)
2018-03-06ofz#6300 AbrtCaolán McNamara1-1/+2
Change-Id: I814b0e4255894d909d29a9a301488a23acf418a0 Reviewed-on: https://gerrit.libreoffice.org/49688 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 6be2c684effd6732c92df7ef75581772adb6dac3)
2018-03-06various sft fixesCaolán McNamara3-51/+106
backport removing unneeded code use ptr diff rather than int (cherry picked from commit 5b426038a7befcaf0d05824ffb20200ff8833ad3) fix mem leak (cherry picked from commit 603cb6cf31a5212d03736a552770e5734b0e8066) check more table sizes (cherry picked from commit 1828490bb22f1c8273c4a9f5b1db819b173ca70d) check cmap offset (cherry picked from commit 683d9883ad8fd6568e6a7832e5bb347c1d043e4b) check tableoffset against size (cherry picked from commit ae73c3ff112e1ed38eb4678ac5745990661a2e66) check ntables offset (cherry picked from commit 75a171a405afd6eac236af93aa9d29a9c3ec9c64) use safeint on calculations (cherry picked from commit 139b6c6cf898467098f3a6f29fa84013a182285f) simplify returns (cherry picked from commit e8b2aad1cb2107304761e68aa380b5c29d8ef22f) extend to cover the last byte needed (cherry picked from commit c7b0117f26a386c98a721ff3897479c268103d74) bounds check (cherry picked from commit bb32616bdd6e3b327654bab0e1d790d8d50b893d) move largest bounds check to start (cherry picked from commit f832198e6a33052c7cc86b25843badfb962a2ae8) android:update safeint header to use the else implementation with clang Clang toolchain does not defines the __builtin_mul_overflow for 32-bit ARM. So, fallback to else implementation of checked_multiply when building Android with Clang Reviewed-on: https://gerrit.libreoffice.org/39005 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 2149d4a88e9dc88c30e7475f8ea317e5c7b78529) add checked_add Reviewed-on: https://gerrit.libreoffice.org/43779 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 9cfb27ae6cb94f0a853ff70e9ad9f3109d305a94) Change-Id: I0b59f1b93d31a7cb5b8db2a21736db11aed46536 a174fd94c57cc3c899c10e1c0dc5968965a50427 0d329357ac282d4652b0f7ebc401cbd51963461b 004a6d322f60d916cc4635b362ce948e8a10d7c7 5aae26c38f3645020f0e1d6d7b6877c2727af1b4 a79be052dd3f6b6ed38fb326558924c853af5fff d75f5f4b578fd176c17e5763569f1403260c6594 c063786ba41aa9a985f505e62b43d3d543a0d48f 1a67cb2f1c686032438852fec1267a59fbd04d7f 5177d42b47a4bca614878dce4a69ab16b5cfe163 6d32a6b6f1dd91db42a3f154700ea55603f0e4dd 03fe80f9568759b829fac4e9bcfd496efebe6a26 6120606f521ce121541a5b7f1150229258012d55 10cba898bba528f5f1bfbd583e27a6821c789ab9 Reviewed-on: https://gerrit.libreoffice.org/49485 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 9826e506a64260d577d463fe49fe46d1e10848e6)
2018-03-06ofz#6173 check index before useCaolán McNamara1-1/+3
Change-Id: I09d15ab324af0a8b3566f11868eb3266a68c4afe Reviewed-on: https://gerrit.libreoffice.org/49500 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e355d7d691cfe9719b06e15129d86ec22a2bd7a4)
2018-03-06check O_head sizeCaolán McNamara1-2/+6
Change-Id: Idf5d30eaed0196cfa9266e35131c538c606a0960 Reviewed-on: https://gerrit.libreoffice.org/49365 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 b10ae2faae6f3c448bbab71585550387e18cc248) Reviewed-on: https://gerrit.libreoffice.org/49367 Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 9c8fb5055e49f31a179477937f7820f34a04ca33)
2018-03-06check O_hhea and O_vhea sizesCaolán McNamara1-3/+7
Change-Id: I82e47732815f0112801c8c3a3e5b0b09ac25610a Reviewed-on: https://gerrit.libreoffice.org/49439 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit e3308146244efb1985e1d84a5ddfb8ac1754d5c5)
2018-03-06check table size before reading nglyphsCaolán McNamara1-1/+2
Change-Id: Ib511fdf16006877ca76085137eb9200601b2f8f7 Reviewed-on: https://gerrit.libreoffice.org/49363 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 08dd51bfcaa6b493e134bcc7787cc18c36ad5db1) Reviewed-on: https://gerrit.libreoffice.org/49436 Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 419361ac5c0eacfb1c766a4fa042a6000d96ba7d)
2018-03-06ofz#6112 wrong start off sets for korean KSC5601 tableCaolán McNamara1-2/+2
Change-Id: If986352478f34f54015f1969c97c26e2ef05c06c Reviewed-on: https://gerrit.libreoffice.org/49446 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a704756d92d0dcb4822e7115a293192378151859)
2018-03-06return early on short streamCaolán McNamara1-0/+2
Change-Id: Ia9cb4dec5358281322a2428c5f2153836a1ee1af Reviewed-on: https://gerrit.libreoffice.org/49375 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 43b1e91ec376ae69c843e576cf7352f085d356b6)
2018-03-06stay within font boundsCaolán McNamara1-1/+6
Change-Id: Ie8ed610b71cb1b20963827c2be97155d2d8aa22c Reviewed-on: https://gerrit.libreoffice.org/49371 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 358808aeb353e9d17e54c6255dd10be4a7517136)
2018-03-06what matters is the availability of the last element, not the firstCaolán McNamara1-2/+3
Change-Id: I23d3abdbe62b735d66261fb337613da88cc4206b Reviewed-on: https://gerrit.libreoffice.org/49380 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit f975fbf50ef6da9d610885eb7ca46d93ef779481)
2018-03-06check kern table sizeCaolán McNamara1-2/+2
Change-Id: I65b5f0a8950d54c00d6fd7c385ca1c5dca2ef2c8 Reviewed-on: https://gerrit.libreoffice.org/49384 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit d566c200995d2124fb76adc9484cb8ef58ab78ae)
2018-03-06sanity check cmap table sizeCaolán McNamara1-0/+6
Change-Id: I010c2fd221bcd86a62efd9996a0c34930828cb6d Reviewed-on: https://gerrit.libreoffice.org/49350 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit a39e2684d48046d18bd486d145b9d4a3d2044e8a)
2018-03-06MemoryByteGrabber sequence has to exist for Grabber lifetimeCaolán McNamara1-3/+5
it just takes a c++ ref, so a temp is an unsuitable arg Change-Id: I40490e94d977df91b985bc4ae458b68ee85d5dfe Reviewed-on: https://gerrit.libreoffice.org/49323 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit a224d33cbf098c361a7244569d5088044561f3ee)
2018-03-06rhbz#1541486: Fix localized'ness of ooSetupFactoryUIName propsStephan Bergmann1-1/+1
8f44fb5ee0bd21d192820ffd359504f6d1c68a52 "Mark Base window titles for localisation" localized some uses of ooSetupFactoryUIName in officecfg/registry/data/org/openoffice/Setup.xcu, but failed to mark the prop as oor:localized="true" in officecfg/registry/schema/org/openoffice/Setup.xcs. (So some arbitrary localized version of the prop would win at runtime, potentially displaying certain window titles in wrong languages.) Other uses of ooSetupFactoryUIName in Setup.xcu (for "Calc", "Impress", "Writer", etc.) have never been localized, and are probably not meant to be localized. AFAICS, irrespective of oor:localized="true" in Setup.xcs, their values not being marked with xml:lang="en-US" in Setup.xcu will mean that they will not appear in translations/source/*/officecfg/registry/data/org/openoffice.po and will not accidentally start to be translated after this commit. (Theoretically, inconsistencies between oor:localized in xcs and uses of xml:lang in xcu could statically be caught at build time, e.g., with officecfg/util/sanity.xsl. However, those checks work on each XML file individually, so don't have the schema information available when looking at the data in the xcu file. And those checks are written in XSLT, which makes writing new checks rather, erm, unpleasant.) Change-Id: I9c61e8ebf75d3d54f7e5b6688eac47a6ed8dc5c3 Reviewed-on: https://gerrit.libreoffice.org/49252 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit ffd8369b909c86653ef30593fddf67c9f5308583) Reviewed-on: https://gerrit.libreoffice.org/49271 Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit e9d8b260708bc12e00bf79ff436cb87e12922fab)
2018-03-06ofz#5435 sw: fix SwCache::Insert() stale pointersMichael Stahl1-7/+25
If SwCache::Insert() happens to delete the object that m_pFirst or m_pRealFirst point to, which is unlikely as it means every other object is locked, then these pointers must be updated. This sometimes happens in the bugdoc after scrolling around for some time. Change-Id: I13f04d28c37969469efa4e1109c7f5b751ceba96 Reviewed-on: https://gerrit.libreoffice.org/49151 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 269d6d3366eea8541d965181dfdda1fdc5ef2d00) Reviewed-on: https://gerrit.libreoffice.org/49234 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e6c9b806cd4eaf166bfe8cfc1a4b6741f2be83f0)
2018-03-06tdf#114596 dbaccess: fix mysterious dataloss bugMichael Stahl3-3/+9
OBookmarkContainer actually re-uses the reference count of ODatabaseSource, so converting ODatabaseSource::m_aBookmark to Reference created a cycle, which somehow causes the dataloss, because evidently something as important as storing the data must be done in the destructor. (regression from 2660d24a07866e083c5135ea263030f3e3a2e729) (cherry picked from commit 96ae2a3300811897c24cccb20f8c2faf382483df) tdf#114596 compilerplugins: add exception to [loplugin:refcounting] (cherry picked from commit e80da60895b45309fa1d018760d5f11cca4367f4) Change-Id: I4cad01dc9cdaf405c1eb31d6c0e161eb6712b78f Reviewed-on: https://gerrit.libreoffice.org/49026 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit b5440ce23b17d84f7971cb7ea35512d5cac69c9f)
2018-03-06tdf#112033: enable the xml source feature when the experimental features are ↵Markus Mohrhard1-1/+5
enabled Change-Id: I066b2927c5e22664b7a4e96549da3a02ec4c99d3 Reviewed-on: https://gerrit.libreoffice.org/41085 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 65722772f00a40b8ca8adf21e31c22295ef7d215) Reviewed-on: https://gerrit.libreoffice.org/47696 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 4ac1a46f712f38fee3323e7c4ed121880469a9d3)
2018-03-06tdf#115044: do not load external documents if it is not allowedVasily Melenchuk1-0/+9
Referenced external document data can be loaded after user permission from dialog or corresponding settings. Change-Id: If3aec37c8bbdee4aebeb99c7807e87c26df8e592 Reviewed-on: https://gerrit.libreoffice.org/48398 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 8b98991a66197a71953dbb900dc3aece6b4f9e3a) Reviewed-on: https://gerrit.libreoffice.org/48870 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0e7c8c3a1be5c266f8ba7ad42fd9ce80beae5264)
2018-03-06tdf#106780 Fix for invalid attribute in impress ODFAbhishek Shrivastava1-2/+16
This patch fixes the invalid ODF generated in impress. In tables now the attribute is shown as table:name="default" instead of "text:style-name". For strict XML version we only set table:name="default" For Extended/Compatibility XML we set both text:style-name and table:name Change-Id: I894fd31f5f0eed3f77b216b3114b5da53acf1f9f Reviewed-on: https://gerrit.libreoffice.org/48373 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e3e2f6911d6231c706ce8c77e5cd6733335d6342) Reviewed-on: https://gerrit.libreoffice.org/48812 (cherry picked from commit 5563f111d5700bb03884cd469288b09281e37dd1) Reviewed-on: https://gerrit.libreoffice.org/48825 (cherry picked from commit fa3b7206f1b6f11dc3d133d06289aaaad3e422fd)
2018-03-06ofz#5747 short->sal_Int32 like in StgDataStrmCaolán McNamara1-2/+2
Change-Id: I254c00b1142d7187beabe5d18532efec036de494 Reviewed-on: https://gerrit.libreoffice.org/48757 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 59cf6c6128f67d807de58fae2d7fae2b4909ad68)
2018-03-06ofz: check state in readblockCaolán McNamara2-16/+14
and change state to a bool and reuse it more Change-Id: Iaa46004b144836431dd386a68a8ab688fd1477f2 Reviewed-on: https://gerrit.libreoffice.org/48689 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit bc1bf9a4fd7f75e6b7fec997d147f0f90eb8e639)
2018-03-06tdf#115080 menu id collisionCaolán McNamara1-5/+5
21 collides with the pattern field menu id Change-Id: Ia90995861adabbe1615e24ee10defe25cee76c56 Reviewed-on: https://gerrit.libreoffice.org/48487 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 2b4ad9183d7fc0da40dc1fdd523bdc613612024c)
2018-03-06ofz#5566 sw: HTML import: ignore <DIV> in table structure elementsMichael Stahl3-13/+25
Looking at the HTML4 DTD https://www.w3.org/TR/html4/sgml/dtd.html, inside TABLE only various elements defining the structure of the table allowed, except inside cells (TD and TH elements). DIV in a table but outside cells may cause cursor positions to go off the rails, so better ignore such invalid DIV tags. Reviewed-on: https://gerrit.libreoffice.org/48359 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 8b1a83bffe35ae0e71735569512c1586bcb37b25) Reviewed-on: https://gerrit.libreoffice.org/48526 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 7283bdaf9cdc81dbec55c915ecd8c2571478bc4d) Change-Id: Ia6195d80670631669c252d572242874b13642b74
2018-03-06ofz: check nLevel against maParaSprms sizeCaolán McNamara1-4/+4
Reviewed-on: https://gerrit.libreoffice.org/48521 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit bc75f71139a2f711813013fe2380d9a61e383574) Change-Id: I9bcaf176e6a2f70348712ca98c4176125c2f455e
2018-03-06its defineresource not define resourceCaolán McNamara1-1/+1
regression from commit 64d624b65124ac02d8ee59b135593fd9d8eb9067 Date: Sat Jan 9 22:55:28 2016 +0100 Fix typos Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86 Reviewed-on: https://gerrit.libreoffice.org/21209 Tested-by: Jenkins <ci@libreoffice.org> Change-Id: Ifdf45e97b81523c84c73b93d14ed75b7b6909f77 Reviewed-on: https://gerrit.libreoffice.org/48357 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 75520f7c427237e10f751c685012dcb86a345836)
2018-03-06ofz#4754 sw: HTML import: fix invalid tables being createdMichael Stahl1-0/+1
This 75-byte horror creates 2 nested tables, where one SwTableBox is in the SwTableLine of the inner SwTable but in the SwSortBoxes of the outer table, which is of course invalid. The root cause is that in SwHTMLParser::SplitAttrTab(), we move the m_pPam backward once and forward twice, moving it ouside the inner table. Change-Id: I63f6508afe1270ccdeb05da6f222b0aba5259889 (cherry picked from commit e1a4a8c180f98aac0ab21a22a6a03d2109c712be) Reviewed-on: https://gerrit.libreoffice.org/48146 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 01f4bfdc21dbee3599943b82c96266d5f9aa6a2a)
2018-03-06Related: tdf#114251 disable vectorization of svDoubleRefEike Rathke2-1/+15
It doesn't work, not knowing how to handle implicit intersections not only produces huge unnecessary matrix operations but also delivers wrong results. Unit test will follow as a separate commit. Change-Id: I14982d4a53d6af57196da998e53d426502c22fec Reviewed-on: https://gerrit.libreoffice.org/46647 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 67444cbe5dae6e24db776ab712017ad063319276) Reviewed-on: https://gerrit.libreoffice.org/46670 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 811b40327c15e197b0967393e4071f48a60af42a)
2018-03-06Type svIndex does not necessarily mean range name, tdf#114251 relatedEike Rathke1-0/+7
Change-Id: I5e7930b7f93ee44fb0d6b4c86f261afde8ed2ccc Reviewed-on: https://gerrit.libreoffice.org/46615 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit ecac94f3a6872538c19827603b52f1ed7e671a4c) Reviewed-on: https://gerrit.libreoffice.org/46668 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 0443eb8bf5ed79d13ec1aa49ac83ed2b2e8eea54)
2018-03-06copy ScAddress before possibly joining itCaolán McNamara2-1/+3
Change-Id: Ib1148584b9771da67d3f4b3141184228e1bbe3a2 Reviewed-on: https://gerrit.libreoffice.org/48271 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 f6eefd96cb16a9b5607fe59bdbf9b1121c9b56e8) Reviewed-on: https://gerrit.libreoffice.org/48298 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 915ce86d14eb219fee467443fe57a984648f3836)
2018-03-06ofz#5477 if the para is already oversize, nums would go negativeCaolán McNamara1-4/+5
Change-Id: I183e1377747f662da1204e90a24fb4f8f2268699 Reviewed-on: https://gerrit.libreoffice.org/48158 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 4c73f977bc21e2f2c8304c6a331dac6b03339197)
2018-03-06Resolves: rhbz#1535541 fdo#88004 mimetypes are .macroEnabled not .macroenabledCaolán McNamara22-57/+57
Reviewed-on: https://gerrit.libreoffice.org/48121 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 10b07347911aee87d13b343072bac01abe0e535a) Change-Id: If7942ec9d4cd40f29fae2b9a8f76df1ef08bfc17 Reviewed-on: https://gerrit.libreoffice.org/48125 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 1af9b9ecfb946a6c29e5d7241d57dc6ab892b06b)
2018-03-06ofz#5447 on plcf save force current Fkp to stick in cacheCaolán McNamara2-5/+21
Change-Id: Id7b6c442df10c6de7226702a9bf3ba559a0c2e9a Reviewed-on: https://gerrit.libreoffice.org/48054 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 29ed64eb53427e51a9a0f6102c4d41d7f13ff01c)
2018-03-02backport various ofz findingsCaolán McNamara6-27/+52
hwp: avoid low hanging invalid input Change-Id: I06133d6db14edb9d915c38e4c120a9d0905495dd (cherry picked from commit b9483aacadf443e57f7708f8db64aeeba4666f2a) ofz#711: direct leak Change-Id: I65ec47b4290d845f1803b20b93f149d35d9a60ea (cherry picked from commit 86463ec54dcdc562121bdb57b1ac4e85b135b2df) ofz: ReadBlock has to be HWPIDLen to be useful Change-Id: Iaa349921972bb19b40bf68c6a3b0c7128cff4b8d (cherry picked from commit 425572b9d510cee805dc4160d7e81887d8f27577) ofz: oom in reading hwp data Change-Id: I1e4dc5f474b229d4d68d3fc34bc23c88767e5e50 (cherry picked from commit 76201c60a9162804b502726a0150ca925ee08719) Missing include Change-Id: I2fb82e3c5a9b26b1016cf99e943cf0cc30225495 (cherry picked from commit 64cca8d6237ef90c3b222df36de257dbb859d99e) ofz#860 clear old data before reading new data Change-Id: I3bf5c2072a328052004c4c0551c2b125cb8ab19b Reviewed-on: https://gerrit.libreoffice.org/35165 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 65dcd1d8195069c8c8acb3a188b8e5616c51029c) treat ParaShape like CharShape (cherry picked from commit 00aeabb61d1d535684b05145bcc98a8d8a3e10ab) Change-Id: I7870fdeee6bd097c94d7ae58b67506c4ab2a6fb5 Reviewed-on: https://gerrit.libreoffice.org/39651 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 4f949e1c3f6a378eb9c04bc7107b8972815661ea)
2018-03-02ofz: stay inside stringCaolán McNamara1-1/+1
Change-Id: Ia0d0ddfce4ee3d5f8763be6804fe52c514375bb3 Reviewed-on: https://gerrit.libreoffice.org/39629 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 073a2b2aef5c0b579aea8ed203dd9c1c5790b650) Reviewed-on: https://gerrit.libreoffice.org/39645 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit e2be5d28877a817ae302b3dca7af2f71597a912f)
2018-03-02tdf#108838 accessibility: fix horrible memory leak in AccessibleTabBarBaseMichael Stahl1-1/+1
Reproducing tdf#108833 failed because applying the Master Page takes > 2 hours; the time is spent calling vcl::Window listeners, of which there were some 39525 after a couple minutes, almost all of which AccessibleTabBarBase. AccessibleTabBarBase::WindowEventListener() has an inverted condition that suppresses the event that is generated from TabBar::Clear() and thus when DrawViewShell::ResetActualPage() calls Clear() no AccessibleTabBarPage is removed but then the InsertPage() calls create duplicate objects that again register as listeners. The condition is obviously inverted given the CVS commit message: 1.2.88.1 log @#135353# do not pass VCLEVENT_TABBAR_PAGEREMOVED (all) to objects other than AccessibleTabBarPageList @ text a69 8 if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) && ( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() == TAB_PAGE_NOTFOUND ) && ( dynamic_cast< AccessibleTabBarPageList *> (this) != NULL ) ) { return 0; } Change-Id: I2a3b86bbd0f0251a966f41b316a3b313517df24f (cherry picked from commit b2b085441dc79fb78607dbf1969c12a40db58214) Reviewed-on: https://gerrit.libreoffice.org/39416 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 5f345e3a19bf7cad56951ed90fdf78f03a15b96a)
2018-03-02ofz#2759 null dereferenceCaolán McNamara1-4/+6
(cherry picked from commit 6f5841e60ed29ae2577e63623edacc9fe1467ba5) Change-Id: I23671f0cea592c92a05b34b3cf284a47a73962b1 Reviewed-on: https://gerrit.libreoffice.org/40506 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 26222c3baca76eaed5f45dde4592a059e0e4a85d)
2018-03-02ofz: survive missing macro supportCaolán McNamara1-0/+3
Change-Id: Ica9c66fe09f7340f76f62e536527dc63b3735d90 (cherry picked from commit aa529a1957fce324c500753039ae7766b8dcf6a6) Reviewed-on: https://gerrit.libreoffice.org/40523 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a9a1306266e2fc67e8ac3029584d7a264fe37ff0)
2018-03-02Resolves: tdf#111308 crash after load designs with no design selectedCaolán McNamara1-1/+1
Change-Id: Ia7d5e1d0c4c960700d94cfec01a8a01799f89d9a Reviewed-on: https://gerrit.libreoffice.org/40732 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 e325a5442ab350e8eb66458aed98d38ce21aec06) Reviewed-on: https://gerrit.libreoffice.org/40750 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 2b4ebf00d21f6305966c78f82336f9ac76425804)
2018-03-02CVE-2017-11742: Expat 2.2.3Caolán McNamara4-2/+5
Reviewed-on: https://gerrit.libreoffice.org/40718 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 f680e5a441cecba4d238f031fc417ef3bccfd792) Change-Id: I1a1de789eaa5a78d2dc0e41ef861d10fa97b689b Reviewed-on: https://gerrit.libreoffice.org/40749 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 2351570154e43fe919e5b9dd756bbe13a6b9c60d)