summaryrefslogtreecommitdiff
path: root/lotuswordpro/source
AgeCommit message (Collapse)AuthorFilesLines
2016-02-08Consistently represent bullet char as OUStringStephan Bergmann5-14/+10
(One difference is that for an XFListLevelBullet for which SetBulletChar has not been called, ToXml will use an empty string now instead of a string containing a single NUL character. But given that initializing m_chBullet to zero in the XFListLevelBullet ctor was only added recently with 72069675955aaf0b72a7842453347e3e7293f56d "coverity#738770: Unitialized scalar field," assume that ToXml is supposed to be only called after SetBulletChar has been called.) (cherry picked from commit 153ea761e32238d1dd882823cf27da1b11c4d66a) Change-Id: I7a5d7496b038cd094ab11ef8cbc1823ffc5bc130 (cherry picked from commit 735b9ebbef5ca9018c8eef5bbe8e0dab55775972)
2016-02-08Remove unnecessary variableStephan Bergmann1-3/+1
Change-Id: Ibec141be604f15d1c6358d3365a7a3e60c135f1f (cherry picked from commit 6776d52be6dfe3b8725fadb77b87e20a7cc639d0)
2016-02-06remove some unnecessary typedefs to pointerNoel Grandin6-17/+12
that were really not helping make the code any clearer. Found with a search git grep -P 'typedef\s+\w+\s*\*\s*\w+\;' and manual inspection (cherry picked from commit d16d9f950f8cb6d8948875372c9ff1f0aae9fb7a) Change-Id: I6a5c031e9e060ad3623a7586ec8a8cc4fe6252e9
2016-02-06Fix typosAndrea Gelmini2-2/+2
Reviewed-on: https://gerrit.libreoffice.org/16582 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 1a8915ef8302b13b781977209ae1fa41f5f659dc) Change-Id: I1c5e4970d4e90bdea68a901294594104de5e189e
2016-02-06Use a more straightforward hash functionStephan Bergmann1-10/+2
...instead of assembling a OUString and calling OUString::hashCode. It appears that these hash values are only used in std::unordered_map instantiations, not used as part of a stable file format. Change-Id: Ie3f78b2cc9e162ac9777c7e5f4164a12bc9a62a4 (cherry picked from commit 8d057b3ca924cca0aafcaabf250189cf6aa41cfd)
2016-02-06loplugin:loopvartoosmallNoel Grandin4-9/+9
(cherry picked from commit 55bc128636596032c23ee855904822ad813986fc) Change-Id: I86ff38a90018a2ddfb2db3babf67168b0e6257a5
2016-02-06Fix typosAndrea Gelmini1-1/+1
Change-Id: I80995af6459af9f647e66d1c85da2eedad2647b9 Reviewed-on: https://gerrit.libreoffice.org/16523 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 5d5dc059cb4b88fe19e5d92e7d9b9ae581afce98)
2016-02-06Fix typosAndrea Gelmini2-2/+2
Change-Id: Ifd126a535f18db79a18aaec61b76cdf26ab33dff Reviewed-on: https://gerrit.libreoffice.org/16522 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 69c88a32aad2cafde197e98557868ad069795d60)
2016-02-06Fix typosAndrea Gelmini1-1/+1
Change-Id: I2297bf392a405f02be2450f4624f1c9fc0b512ce Reviewed-on: https://gerrit.libreoffice.org/16373 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com> (cherry picked from commit 9ed033917b0bdaeb663395224a5e5b8b20a67169)
2016-02-06Catch inadvertent uses of OUString(sal_Unicode) ctorStephan Bergmann1-9/+9
...with numeric values that are not meant to be characters. Inspired by <https://gerrit.libreoffice.org/#/c/16339/> "OUString: add constructor from single Unicode code point" and ecaf1cb3861c1b519a1495487fc796884cf37b92 "seems to be what was meant." Found e46e8d19458fd64ff20b1013e5eeabd07e62379c "Shall this produce a string representation of a number?" and f2a0e4032734d6be635f14ade3dea499c29ec6c2 "Don't truncate a UTF-32 code point to a UTF-16 code unit." (LIBO_INTERNAL_ONLY mostly because it uses a C++11 delegating ctor for simplicity, but also because it requires mild modifications to client code, see additional changes in this commit and some other recent commits.) Change-Id: I8a156f01d1b772c6052d7afaa088ae13ed234e2b (cherry picked from commit cbe944e323edb20f958bb46ea644de659b75382e)
2016-02-06Replace boost::scoped_array<T> with std::unique_ptr<T[]>Takeshi Abe2-4/+4
This may reduce some degree of dependency on boost. Done by running a script like: git grep -l '#include *.boost/scoped_array.hpp.' \ | xargs sed -i -e 's@#include *.boost/scoped_array.hpp.@#include <memory>@' git grep -l '\(boost::\)\?scoped_array<\([^<>]*\)>' \ | xargs sed -i -e 's/\(boost::\)\?scoped_array<\([^<>]*\)>/std::unique_ptr<[]>/' ... and then killing duplicate or unnecessary includes, while changing manually m_xOutlineStylesCandidates in xmloff/source/text/txtimp.cxx, extensions/source/ole/unoconversionutilities.hxx, and extensions/source/ole/oleobjw.cxx. Reviewed-on: https://gerrit.libreoffice.org/16289 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 09800956191c90035872cbc18cd304fee043c710) Change-Id: I3955ed3ad99b94499a7bd0e6e3a09078771f9bfd
2016-02-06Fix typosAndrea Gelmini1-1/+1
Reviewed-on: https://gerrit.libreoffice.org/16310 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 3fa7b0b70f8f21c65603aa2b7db53392fdbceec4) Change-Id: Id8c7cf460cba5af89891c470e1aaa61b227d356e
2016-02-06remove unnecessary check for null when calling deleteNoel Grandin20-128/+57
Idea originally from caolan. Found using the following command: find . -name *.cxx | xargs /opt/local/bin/grep -zlP '(?m)if\s*\(\s*\w+\s*\)\s*delete\s+\w+\;' Change-Id: I3338f4e22193a6dfd6219c8c75835224a3392763 (cherry picked from commit 4729774b244db7a175077ed0c70aa48be62bc60e)
2016-02-06cppcheck:redundantAssignmentNoel Grandin1-3/+1
(cherry picked from commit 4ea281a3ccb5bd21e1808d8cb127a91a1bb72691) Change-Id: I1167d0ce6b6f6e48309d0551c1d2a283d79546a7
2016-02-06Fix typosAndrea Gelmini1-1/+1
Change-Id: Ifaa52b49b717d893846fc1e7ae4ac50735f824ac Reviewed-on: https://gerrit.libreoffice.org/16260 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 1f408db49740f8cc6ba67d72b54f49d2e4fdae9b)
2016-02-05loplugin:unnecessaryvirtualsNoel Grandin2-3/+3
Improve the plugin a little. Create a python script to process the output. Run it again. Change-Id: I05c21d8a21c8f4243af739c412fda0a521f9b5f0 (cherry picked from commit 81b954718f0cdac6873927e869b3e41f863562e7)
2016-01-08guard against infinite recursion in MarginsSameAsParentCaolán McNamara2-4/+15
(cherry picked from commit e8dc85c2b3fd197aa5d484be3fc2cb25f7bd2412) (cherry picked from commit 54fe17fabaa258a48e18c4a19c29da2d2cf634ca) Change-Id: I09c1ccb850f0cb2365e52ee6ffd293ccf34ad00e Reviewed-on: https://gerrit.libreoffice.org/21033 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit a586293844de4d9c0e36dd20b7c157f19ca60a9e)
2016-01-04return early if Container invalidatedCaolán McNamara1-0/+2
Change-Id: I3983070f1fe447e4b75b956cf95d3b3c5266b3f9 (cherry picked from commit 78c6be9cf3c9c3c87d2f41981bdc61047171eafe) (cherry picked from commit 312ae095c17812f40d08997acc058a1314675af5) Reviewed-on: https://gerrit.libreoffice.org/21001 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 7fd61a5e182597ddf41bb957dcaef11fe0eef816)
2016-01-04guard against infinite recursion in GetGeometryCaolán McNamara2-5/+18
(cherry picked from commit 9ec011f6874cf663db54d0420c41d9299e4ed882) (cherry picked from commit 02c113a3ab57d7880bb1f794e192fb42aea078e1) Change-Id: I901f77f5846512cb528f2e14bbc50409fa29bef2 Reviewed-on: https://gerrit.libreoffice.org/20988 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit ab8c84b1b1d14adc0cabbc063ba8a5132a540201)
2016-01-04guard against missing FoundryCaolán McNamara1-2/+2
Change-Id: I5ba66ff020b8226ac01af985f68c3ef67057c01a (cherry picked from commit 7f9b57bda4d88262ecbe45188888c744913b9770) (cherry picked from commit 5ae038d2341e4a7f8dedb77be75efd557d01bcc9) Reviewed-on: https://gerrit.libreoffice.org/20967 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 934e28385b5e7462a36780a04a08013d00924fb5)
2016-01-04guard against missing Container LayoutCaolán McNamara1-2/+5
Change-Id: Ie43b13448a6cacd3af4822b85f06ed84a2d38ff9 (cherry picked from commit 932c74e38ca397d82d609831e79ceaef2183cf64) (cherry picked from commit 1b2015281ee34f187fdb747db5f6223e8de63df4) Reviewed-on: https://gerrit.libreoffice.org/20968 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 7f4fcdbda41753c7923974c0af58271e38cdabe3)
2016-01-04guard against missing DropcapMgr and FoundryCaolán McNamara1-2/+7
Change-Id: I1007d4fac2514bc165941c70109cd8e3d57153cd (cherry picked from commit 330127baf96c417e0eeaef9808d124788b547cf3) (cherry picked from commit e616ff7e29ee10d0c3ea2dc6a8fc135b87b572b7) Reviewed-on: https://gerrit.libreoffice.org/20910 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit ec066b44392f8ed1015540220b6b4620facd873e)
2016-01-04guard against missing ContentContainerCaolán McNamara1-4/+6
Change-Id: I4f2c5d53148deb02d990edc42140c23f02409cea (cherry picked from commit 8a05b74eeb8d5e0955fbe3cefd945cdc9bffa3f5) (cherry picked from commit e439aebde0f60e7fe9bb19e96964eb3d26e50e3c) Reviewed-on: https://gerrit.libreoffice.org/20884 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 3968eec7145d20b398a196bf72ce51f16cebae9e)
2016-01-04coverity#1343623 Logically dead codeCaolán McNamara4-22/+33
(cherry picked from commit 8f3c796ecf926f81f6229fbb040095286c8adbfe) coverity#1343624 Unchecked dynamic_cast (cherry picked from commit 26fddc3196c7ab932ada544b84b74da06fa2596d) coverity#1343625 Unchecked dynamic_cast (cherry picked from commit 9e83e31019cdc68e5324a10ef76417b46720cfe9) coverity#1343626 Unchecked dynamic_cast (cherry picked from commit c2f1731685014b9df386dfb59900783c3ca3acb7) coverity#1343627 Unchecked dynamic_cast (cherry picked from commit 1276f6daf28f61d911da9885e0cac738931e4de4) coverity#1343629 Unchecked dynamic_cast (cherry picked from commit 274d265e42ab89be29af21ef5cc1cbf20b3d35a2) 1343630 Dereference after null check (cherry picked from commit 960cfb7e3ba56fe06f45c523e086ee6d4b95e685) (cherry picked from commit 7e6e8aa8c51e13b016118720fc28f39a572bb8e4) Change-Id: Ibcf05263f7bea50f70d55f4d8944d0a41d54851d a303a5dc97fb5e491e86a3484040e657f1b480d4 b534e4e8ecf50a9159c5e98e2c899bf13f44c654 52e6d6c9cb48880185293fb9825d7a6530ee767d 83c0febcbbf0f19a05818e0575921d1d6254935f 93b7298d785e57a4ef854cea3e9cd5c2c0f35849 81223b868f069755e8a46c57bfe0282021f26de7 Reviewed-on: https://gerrit.libreoffice.org/20832 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b8b7669d2e48f491cd9d8e6a32f61a121ae8034f)
2016-01-04guard against missing XFContentContainerCaolán McNamara1-1/+1
Change-Id: Ic974159f816bae465339e1b9abd2e247bbc2f206 (cherry picked from commit 0063b891424ba7023d376d12a7c54522bca087c6) (cherry picked from commit b2cc385892c24dba6481bff396d4125f58c92f65) Reviewed-on: https://gerrit.libreoffice.org/20795 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 01ef568cbc3f33092c1ed3f04afced7cb85badf3)
2015-12-21guard against null FoundryCaolán McNamara1-3/+3
Change-Id: I8aabc68e8dfb9376cafe4cc709b18344da083a01 (cherry picked from commit 2f0fba494e78ede3b6691534983f6dd7e0677a7e) (cherry picked from commit 51a1b41ab4a840544e5454d1d4234b443edd5466) Reviewed-on: https://gerrit.libreoffice.org/20755 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit f1c1380c3257b27c558145a33c7b6d6e0fdf2957)
2015-12-21loplugin:implicitboolconversionStephan Bergmann1-1/+1
Change-Id: I3bd1222642ab3e8d24bf0f5cca897c2ce638757a (cherry picked from commit fd433a12691649604bd67732ad08e892ba47f23a) (cherry picked from commit 485821dea88ff086b9b4d7622c4fd66433eb50e4)
2015-12-21more recursion protectionCaolán McNamara2-4/+15
(cherry picked from commit e3d2e376426b5237ded121d172324ef4ced5c3e0) (cherry picked from commit 6d4d9cb5716ed452a5ff3f30c68203e2794c832f) Change-Id: I0a7b6c1037ea9442001b4eb9a9bb96778c0dedb6 Reviewed-on: https://gerrit.libreoffice.org/20718 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 968192760af54797a28da34895feaefca48121ac)
2015-12-21add missing includeDavid Tardon1-0/+3
Change-Id: I326d306af89dcb0611e07689d2c26a828f3896ee (cherry picked from commit 6be05a082543acb0e8005f369551157a8a99f242) Signed-off-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 71efb50c1cf35e112c70399ad8ed4092d293733e)
2015-12-21lwp cycle 1 fixesCaolán McNamara41-563/+754
guard against missing Foundry (cherry picked from commit 92c15e8b299504ef76847cceb5911ef6c7ff26f1) guard against missing grandfather layout (cherry picked from commit f9164c1785432996092d376fb3983e1a3f78dad7) guard against corrupt LwpTocSuperLayout (cherry picked from commit e0dca588239c0902ea90fcdc2b6d0ee2b1525ec2) don't trust that this is what its supposed to be (cherry picked from commit f792baefbfb645eafd5e6b7073bfe6e389d666dc) guard against missing HeadHolder (cherry picked from commit ca868de5e41b45a077949e40ef80f063c362892b) avoid divide by zero (cherry picked from commit 92b936e3ef947cc096b1445455332625900c3024) guard against missing Foundry (cherry picked from commit ed09d4f55d752dbc7d815fdc90e6cbe2656690b7) check is within legal bounds (cherry picked from commit 8410527550ef6db8348e8590eb0c52bccbe40310) don't trust that this is what its supposed to be (cherry picked from commit 9ad6f07e0b5494e55d70642120f173961845ce30) check dynamic casts (cherry picked from commit 54e95789adf05c6852db18b80a549b789a40d6d3) guard against missing Foundry (cherry picked from commit 6093ba6065ea339c5c6de162294eabf0eebe3c80) guard against missing range (cherry picked from commit 1aff042d88b2d6d3c3b7ed9db4b36bed640a0f06) there can be 0 columns (cherry picked from commit 6857a386a4cfe4ddb42515cb00df5bd6648d0964) need dynamic casts here, etc. (cherry picked from commit 46fe3bddebf30775ae19eaa0fefe1d8e2f78eced) add a reference to ensure pPara exists until end of scope (cherry picked from commit 61f55b25c62eaa2714ad8b991edcf54be5e41e0c) this needs to be a dynamic cast (cherry picked from commit 67296edb5c8c7cbb185fe2d31c46eadc5dd927b8) detect infinite recurse in object creation (cherry picked from commit 48c3eb3c91fd98c313bcec18f24cc949d6e788b3) check for null content (cherry picked from commit 4a573e67c67ddf15403a79e7ec8d984d189dc83a) check for null Modifiers (cherry picked from commit 6834384e80cf5cd374cdec471ce385ba2ca94580) guard against broken formula and bad lengths (cherry picked from commit 1e0b9881b4dc7d002d5da767f1476fb1c2147fc7) guard against empty Story (cherry picked from commit ef68438d384ed6dd919fa0f1a3830d2171f8e002) need a dynamic cast here 53rd and final distinct crash fix of this sequence (cherry picked from commit 3735b05668ffcaa37fcecf2907478616db52f2b4) coverity#1341875 Division or modulo by float zero (cherry picked from commit 18952ac1de81b522f5fef36ff922c4a0dc29499d) guard against missing m_pXFContainer (cherry picked from commit 13eaf4dad1324b4f2d909424b2bf06f75102f01f) guard against missing table (cherry picked from commit 0034019480167d50df33865389a6d21e8d5b9cec) guard against empty XFDrawObjects (cherry picked from commit e9801b286b7af0a6043a3a70090a49c5959abe16) this cast needs to be dynamic (cherry picked from commit 8d57f2fb953f031c48892366ce52f6d4fcb9c025) this cast needs to be dynamic (cherry picked from commit 25632b8ffe53dd18faaab2f5c019f7a401ebf579) check all obj().get() casts with dynamic_cast (cherry picked from commit 411dc2058d222a5c2f9b8b159b9384086c9219a5) guard against missing Container Layout (cherry picked from commit dd43c614980ed330936df1abcc484452e1c71a09) guard against null pContent (cherry picked from commit c910e229aa19edd0502aa05dffedc91dd727da6f) guard against infinite recursion (cherry picked from commit 5df326438fd3a5613a52b4de1935426911ff1301) cppcheck: fix memleak in lotuswordpro (cherry picked from commit 6e1efd486dfd5a4bcff1405158c9e40e0c2b6524) infinite recurse protection (cherry picked from commit fb8cba16caa87bf21fdd2747b22d90d913557dac) need more dynamic casts here (cherry picked from commit 5d8449cd14aa3d08929bb25626ab54aa7515f47d) recursion protection (cherry picked from commit 4e6df6de1a95b6b4194cf930cabaae7fde3b6960) protect against missing Foundry (cherry picked from commit ddc7d96a399822c2f29dcaca8222dfb96c383576) guard against missing header rows (cherry picked from commit 2487ba80581d8b0f50be40a26255789e1a050e95) deploy references to keep layout alive long enough (cherry picked from commit 1deae8a2d92747ad69b024513ddae93cc8927d29) use more references to fix life cycles (cherry picked from commit 62a6cadbab6c7bdfbd605c1c75c250904ed10442) use more references to fix life cycles (cherry picked from commit a1426bc54b11eb48fdefaf7e8dfd7996e5c7e4d5) deploy references to keep layout alive long enough (cherry picked from commit fdf122378d5dfa7160fa29eace026424b125e3e4) use more references to fix life cycles (cherry picked from commit 0876868a14c7d139ed2a79ece989c84239a2c853) protect both EnumNamedProperty branches the same way (cherry picked from commit a065eda2383e8d2d8de3cf0a280f6699c05da425) guard against no container layout (cherry picked from commit c6a2df4061de028eb9d7fb752051ecb9f1621fef) guard against invalid Layout Scale (cherry picked from commit c66ed9591217a612c7adc22757ea2b760a716ee3) use more references to fix life cycles (cherry picked from commit a258c3a6503b4fd76ad2b0f705fdd7f472f58c4b) use more references to fix life cycles (cherry picked from commit a23f7b3c14ad0e88264aca197a979aefcc9c0670) use more references to fix life cycles (cherry picked from commit 64cfe976c36cb930e0a96557ba7d9eb99442fc59) hold WaterMarkLayout by reference (cherry picked from commit 80509545cc43893776dd24f441e9b95567ce06db) most casts and checks (cherry picked from commit 01f920f2cece7a05ea075130c19229029efe7c0f) font might be null (cherry picked from commit 00bccc565d1bcd4bd620bb9b33b9f1d07fb5f13e) more use of references to avoid crashing (cherry picked from commit 69d166a0277d21d63b97ffc965d82bb301d55502) more lifecycle protection (cherry picked from commit 012bdecfcd7094403516c98bd5231fe1ef6f7e9d) guard against infinite recursion (cherry picked from commit 76220aafe0bffe20f10b07c725cd096adb56b108) need more References for life cycle fixes here 32nd and final distinct crash fix of this sequence (cherry picked from commit 9550737e5db7415a679aec8a64d6f724962b8750) Change-Id: Id6961e7c35df56ca37d5cb57c2d3d1e03e31dd6d 1282b2c3c920ef89460aa57026d89c8928155116 18648e74d16b932cfa6fbd2057d1e9987c498fd4 f0450bdab2c315a94a75060e1fadf2f8513f9dae c12ee6f4366285fc05fd59b94ec371d8ca013a4a 7d6502c752a7b9f39f94d5cddd5f44240e0b6d04 d15a2692f8aa572c0b5db87f04761ca3eac0249e e3f9e52575436b9505a412b20c7e1b24fa61f6cb 8ae6252039729a1cba8c2fe34f72222c94e3e449 cc3eee0776fb385a5c750293811dec796458a26b 7e76589689d2c9e79a8823d594e8f3ca030e26cf cdb0694b9c1771a475368aeeb4cb11f4ba8b84f3 e367e88df7165d728015a1b3987b220a23203765 578343719d2d7feff51775ff1b073b6584e76f82 0067ead587c25296ab195b80f461fb0766b1899a d606e58292a25309adb67cf05cc9b9a237e83f81 e56eb27bb1827860b2600a5586e866e39cd31518 824c29b39fe1e9e631a21f09611758bea03b0ca9 842122f7e2cba48d4798905f41f63b3e06775d00 ab13d67fdc218c84400a4d84e177e5096bb68379 de44aed9a3189b0fd21a8adc039eb61bd3d3dc14 d170132c2082fd4905192adc840125088ef5da27 3a07361bb66a62533475618c9b50f184d791a799 5c0800c353b46ea1fe359a893bdd8215f70cd809 00bde6564be6fb7c7f6d2ccb1faa7dd94e414635 9deb28a3a5420a43f8604a56145c8274bb4cc8d9 af8e7a46be9c92a7cd11136cb903cc4b9ffe54f5 6d02cc8dc894ef7e2903874b0ab973f7f1b3225d 763aa5874d0c1f977decff88414eea6247f96405 d9525918eab822b39576a1efce7dc3a3bd93e78d a4f2dff9c3cb81bb5056f005b23420cab1ca49e5 7c55986fba87dea0c519f60240605db03262dfe9 15b8aa6b95264d56018fbd5c22bcb0d04e43cf91 7139e67e7b5bcd7e1867dff1cfbd53fa0f5748b7 df84ababeeb109a411c03a18d3a9aa6e136c7ef4 66fda143ba1f0fa6f2638a8bd4936c75a6c40980 e5c0317f842258fe42f894dbace0ea0e328f288a aa28ef00572eb9c4ba3a6d8ae0c668b7b0132f56 670f00b0beb77e5014c3dd4a4798e69ece882b87 b70b5ebc498e6517ef40d0515e69e2e77288c1b5 0c903533542608c1d7a3c97e2be7f2b7624b265b cac22d3c179eca42e01a724f7592ee4b34dd45e3 54931f0dccabb2d9a58cc92ef5ebf3469f93f03c 93669a6460806c1d4c35669a639667b0c6f3f4ab f615c68bfaf145d81dab96b05e7b903c1a6b03cf 84541445e44f14244030b9970e0a48e72edacea7 50fd30114b45d1225adb7bfd5d77cb89a229aac8 83928638a390f434c431487b1cb13633f24de9ec b14639d532da5bffdfe7e0a7bb362b20a7f25dfb 7dc7739ee7b958319ddd4e0cf262254728ef0569 8be1b8298f096791628d1f51d36ceeabdc804f9a d0d9bb1d1abe6f6c9440bf979407d13db49696c4 03748695efbe17d59aba09f88d5c6fcd174113c9 158632de6898685e34d362cc274e959bb5c2e2d7 1b566c835b6cdc733d0aa4393d3b3ce2ff7b764f b9f41091737e66995f332c06083d51408eb1497b clear objects from duplicate ids early Change-Id: I0caab9e329a465e10bf3ed321c55c287371bd437 (cherry picked from commit 480fb6ca369f5a347489414e9d314c802b1ee7aa) Reviewed-on: https://gerrit.libreoffice.org/20698 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit d1d9e61de393aaa8e08edf8f96f134ba1eea9578)
2015-12-10guard against missing table layoutCaolán McNamara2-3/+8
(cherry picked from commit 0c876483d278e3e5ba43e9eaf40ca713b6099703) Reviewed-on: https://gerrit.libreoffice.org/20576 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4bc26e006dd4bde95eef706de43228679a41c4f7) Change-Id: I4bc7a7283f63124ccb50957ea64791644e01e267 Reviewed-on: https://gerrit.libreoffice.org/20577 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit e81d193d56f219610da5b8b10717741d8c5dc63c)
2015-12-10guard against infinite recursion on parsing objectsCaolán McNamara5-8/+21
Change-Id: Ia6502afde54dbf379bc9951c80c6594f1f436ef5 (cherry picked from commit fbd329800340a496def839181858964b1e3709a5) Reviewed-on: https://gerrit.libreoffice.org/20579 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 564687e728c98fec5ba6ffa39007793b2b4aa4e8)
2015-12-10guard against infinite recursionCaolán McNamara1-1/+1
Change-Id: I43e195df570990f21c780311a98be64b682e5315 (cherry picked from commit 338c6ba3a0983009cfd1faff52ac56d6ea092d6f) Reviewed-on: https://gerrit.libreoffice.org/20582 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 1aba52d136d6a2abe7fbb7d6e17c6f1e7c6eed6a)
2015-12-10guard against missing spacing propertyCaolán McNamara1-9/+11
(cherry picked from commit 10de96bf0fb820b38607b0c25a0d3219ad343819) Reviewed-on: https://gerrit.libreoffice.org/20569 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit cb6f34b370da1d45e1c2b945b60cbcaf7b9c3a45) Change-Id: If5c50cddfee88cc92852737c1459ebe94b7256bb Reviewed-on: https://gerrit.libreoffice.org/20570 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 50ca71d16e37cb7612dd26172f5c876882cb700d)
2015-12-10guard against missing geometryCaolán McNamara1-2/+2
Change-Id: I6b2945f1d5a1654f6b5d6a5f5287b4cb9514d97c (cherry picked from commit d4d247866eac108162f43dae2c6ddbd9c12382a6) (cherry picked from commit 6a9f91915afbcff71121b3485376ab6f1fdcecee) Reviewed-on: https://gerrit.libreoffice.org/20596 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 8f2cfef6bc3d876cae6718f31cc45fde499c0a52)
2015-12-10use of uninitialized variableCaolán McNamara1-1/+1
Change-Id: I1149eb9f5946228a2448c121e7ec7211861b3b3d (cherry picked from commit 65deab68f7918c82026951b04a414eefee2683b2) (cherry picked from commit 84facdc8305f1d00f661e58aa0c474c7233d47dc) Reviewed-on: https://gerrit.libreoffice.org/20593 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 7638b0a939a09b23d095bb956051b539d1d9c9d7)
2015-12-10guard against missing table containerCaolán McNamara1-1/+1
Change-Id: I11f6381374c7fc12374cd5089e581ddc777005e2 (cherry picked from commit c732a1ae8cc0cc94bfeddba243657a0b9e52a0f9) Reviewed-on: https://gerrit.libreoffice.org/20580 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b54e5c8154edaae9b553cfa7d3c0141c1d4ccce1)
2015-12-10protect against missing Ruby MarkerCaolán McNamara1-0/+2
Change-Id: I04809443b5dc50904654936e608360b57c2e85c3 (cherry picked from commit 215516a52fd01170bb4a79828b0f0948884b727a) (cherry picked from commit 6c296afad6b04328a596a92326aa50b1b480aba0) Reviewed-on: https://gerrit.libreoffice.org/20584 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit d0bda255ad97d45f68a4d1fb3dcfcf0be4d4c4bc)
2015-12-10guard against missing parent layoutCaolán McNamara1-1/+3
Change-Id: Ib08403edf805367c7392325fcfb66bc7ed4d6f6a (cherry picked from commit 713d737b1ff73e76c6543198ce9299e1c83ac147) (cherry picked from commit 5f469a2a1af8bff36fc3a5849a1500345febdba4) Reviewed-on: https://gerrit.libreoffice.org/20586 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 6fac6b9cd02a3f26edd800b312ceca7a1c19ee52)
2015-12-10guard against missing FoundryCaolán McNamara1-2/+2
Change-Id: I9147dc2bab312639a04d2e822cf99745d38d3b8d (cherry picked from commit 22ee3194c930682ad8ac7f994084e877aa00d191) Reviewed-on: https://gerrit.libreoffice.org/20574 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 479b1863a546c6022d058f27745b240dba9e1c05)
2015-12-10protect against missing Table LayoutCaolán McNamara1-2/+3
Change-Id: Ie7f4cd2b411eb678642ea859d261b1b672752d94 (cherry picked from commit 08fe513b89ea5102a3a233ee0bac472dc8e6b219) Reviewed-on: https://gerrit.libreoffice.org/20567 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 78e612e265a4b7853ed7be9ed015cff6f64154e5)
2015-12-10guard against missing paragraph containerCaolán McNamara1-0/+2
Change-Id: I6ac074c7fe2821983b4a056e28fc5379f7a93974 (cherry picked from commit 130eaf02de89c8996ff6e817a005993dcbd586e6) Reviewed-on: https://gerrit.libreoffice.org/20564 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit be6ceb6dd7922c26faef12c866eeed03bc6581da)
2015-12-10add missing #include <stdexcept>David Tardon1-0/+2
Change-Id: I9cf72b27219489a5508786881ecd95e5820c71ac (cherry picked from commit 1ff0a3880c48227656d2b4a823cd66a6d5c74af0) Signed-off-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 7476205a8d05f1be5cc427ef884d94d86b32148c)
2015-12-10guard against infinite recursion on registering stylesCaolán McNamara14-26/+36
(cherry picked from commit 66686e443b568ad5aab1b32b3f25eb73487cfef6) Reviewed-on: https://gerrit.libreoffice.org/20554 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 282b1aa32c27a513eb2858ad6e7e534ef52c1b99) Change-Id: Iabedfcce9d8ef21172e6bd0d654f3a258aae97e3 Reviewed-on: https://gerrit.libreoffice.org/20555 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit fdc0c739c0b4925485f6a8a2ece8113c895e4ca3)
2015-12-10bounds check GetNameByIndex like OverrideCaolán McNamara1-0/+5
Change-Id: If83e255da1683779458556a3ab1af4f00b19265b (cherry picked from commit 8c67b1b51f21643036c5f5371a6af0a4558e7da2) Reviewed-on: https://gerrit.libreoffice.org/20547 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 59ced109fccf0acbaba357a96243972a5f400902)
2015-12-10guard against missing alignment propertyCaolán McNamara1-9/+13
(cherry picked from commit 7e341379ecec218c0ff2ff0e8db9f14468b125f6) Reviewed-on: https://gerrit.libreoffice.org/20543 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3b9e2bb22e782d073d8e67ae975ebb8ca5eea552) Change-Id: I1d4825c2136e516baf759f4b2c40c911547b93d7 Reviewed-on: https://gerrit.libreoffice.org/20544 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 3592f0020b3136b17f6b8289f433462563a46759)
2015-12-10guard against missing SuperTableCaolán McNamara1-1/+3
Change-Id: Ic7cc6c807905e0c4ffbf2a3f009b27be6100cdf0 (cherry picked from commit 0cde3ca230364492aa6b7f634b97178164268728) Reviewed-on: https://gerrit.libreoffice.org/20541 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit a57ceea18a1632fb18fa57a7bb101bd3ad382415)
2015-12-10guard against missing paragraph storyCaolán McNamara1-2/+1
Change-Id: I217c0aedca4eadc347c103899d96c70cf9606038 (cherry picked from commit dbc830aecc722d34971d773470da478ef4c38714) Reviewed-on: https://gerrit.libreoffice.org/20539 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d4b850fe8bc45bfb018f0a8750e09a436c49d7df)
2015-12-10guard against missing indent propertyCaolán McNamara1-6/+7
(cherry picked from commit ae94fc5b28105c920b2e9d336f463b27cae5b0e1) Reviewed-on: https://gerrit.libreoffice.org/20535 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d9f6f9063d34f29eb44d82159c411646dc19c83f) Change-Id: I2d3369aed4b242acc936a71ee9be573c1ebc7a8f Reviewed-on: https://gerrit.libreoffice.org/20536 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 9498d2023543eba23d047b91ea25d63af41f614f)
2015-12-10guard against styles based on themselvesCaolán McNamara4-112/+99
which leads to stack exhaustion when queries, make m_BasedOnStyle private and replace it with a call to GetBasedOnStyle which checks that the base style is not itself (cherry picked from commit da5e8ba393b8522a8f7501ebeb1e9a98d544a7ba) Reviewed-on: https://gerrit.libreoffice.org/20531 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7e5b93bf127aeb83e4ab22e0701b731ec1934253) Change-Id: I093546793755f8a3a6e8a3c23fb8565ad27b75da Reviewed-on: https://gerrit.libreoffice.org/20532 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 1ff36e1435dfb5e40ce4b651557b89c1f2c176eb)