summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-08-23fdo#80534 bad default value (0) for the number of rowsThomas Arnhold1-0/+1
Change-Id: I39604cf13d1e5714f701dd663ab37a8aed924fa2 (cherry picked from commit 9aede3befb65524d71a2cb8081ded6eb7aa67f55) Reviewed-on: https://gerrit.libreoffice.org/11085 Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org> Tested-by: Joren De Cuyper <jorendc@libreoffice.org>
2014-08-23Resolves: fdo#82747 Crash on opening wikipedia ODT BookJulien Nabet1-0/+1
Test if there's indeed a subnode before testing its type Cherry-picked from 3d34eb4612fa59fae7594399d3d6f798ddb35582 Change-Id: I1bb32652ceb82b0818a8d2cd8d71b46dd96ef2aa Reviewed-on: https://gerrit.libreoffice.org/11050 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org> Reviewed-on: https://gerrit.libreoffice.org/11083
2014-08-22correct references after sort, fdo#79441Eike Rathke6-10/+111
5c6ee09126631342939ae8766fe36083d8c011e3 introduced a different algorithm for reference handling during sort. Unfortunately that clashed with the SC_CLONECELL_ADJUST3DREL introduced a little earlier resulting in relative 3D references effectively being "adjusted" twice. Furthermore, in-sort-range range references to one row (or column) were not adapted to the move at all if the formula within the range listened only to ranges and not a single cell. Added collecting and adjusting area listeners for this. Last but not least, external (relative) references need to be treated the same as internal 3D references, making them point to the same location after the sort. (cherry picked from commit 69adec3ec051ff94f600ab899506ca9d645a8b56) Conflicts: sc/inc/types.hxx sc/source/core/data/bcaslot.cxx Plus necessary parts of 27182231acd3a0c9898a8dba78b76dc8a827b4c0 related to bcaslot changes. Change-Id: I492768b525f95f1c43d1c6e7a63a36cce093fa5a Reviewed-on: https://gerrit.libreoffice.org/10929 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-08-22resolved fdo#82936 do not clear the 3D flag on refupdateEike Rathke1-1/+2
Change-Id: I2ae1368a2ffc20e988ff3ab66590a9f98902b862 (cherry picked from commit 75aad687cb5e63a41303aea568bf68b2b5f15d31) Reviewed-on: https://gerrit.libreoffice.org/11066 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-22fix reading even/odd page breaks from .docx (bnc#519228)Luboš Luňák4-75/+138
We map Word's even/odd page breaks to Writer's left/right page styles. And we cannot just set any page style to be left/right, because that could set e.g. the default page style as such, which would make all normal pages that way. So instead we need to make a copy of the relevant page style, as the original page style as its follow, copy all the properties and headers/footers, and use this copy to get the page break. (cherry picked from commit b32881b6723072c8d1a652ea147d12e75766d504) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Id0d2568de91ac2de4afb0ba3a6eedd9cec46f878 Reviewed-on: https://gerrit.libreoffice.org/11025 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-21out-of-bounds string accessEike Rathke1-1/+1
... when parsing ='foo'# with no character following. Change-Id: Id65fce721cb47a4d3c947c677323bdcaa2ce957f (cherry picked from commit 07b18860ae03ecb66b5605201f34c2aef3a55ad6) Reviewed-on: https://gerrit.libreoffice.org/11062 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-21write COLOR function with extension namespaceEike Rathke4-3/+7
and add to Excel import/export maps so it survives saving in that format Change-Id: I3a8e07fdd1bded77d4bad60eefffeb0b1dbdd734 (cherry picked from commit 7c6a82d66ebe55fa5ce106bf60f841dd7758d2bc) Reviewed-on: https://gerrit.libreoffice.org/11059 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-21fix(?) windows buildLuboš Luňák1-2/+2
Change-Id: Idc57210f23f1a053fc21d47e85206f55704c5880
2014-08-21avoid crash on document ending before contained table endsCaolán McNamara1-0/+2
Change-Id: I003b7e00673cd5a4b4f0ed5218e2d30cfef04ffb (cherry picked from commit 5a2123376dc010ca4e3f0a19d7dbbfaeb25ea963) Reviewed-on: https://gerrit.libreoffice.org/11056 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21gdb: print the SwNodeIndex properly if there are multiple blocksMichael Stahl1-2/+6
Change-Id: I178d365e71ef3377b1a2cfc115bb297640161efe (cherry picked from commit 4f211a0d0c4ef0c248fd3d4493994c1a122c2eb9) Reviewed-on: https://gerrit.libreoffice.org/11045 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21Updated coreAndras Timar1-0/+0
Project: help 888531eda1e60931d7bf6923710cea396de9166d remove conditional text, because wiki conversion fails on it Change-Id: I184d58b0c58feee11010cd174e31641f4dc170ed Reviewed-on: https://gerrit.libreoffice.org/11053 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21add missing parameter flagEike Rathke1-1/+1
in dbgutil build gave: warn:legacy.osl:27022:1:tools/source/rc/resmgr.cxx:701: file:///build/libo/dev/instdir/program/../program/resource/scen-US.res Class: 272, Id: 436. Classpointer not at the end! Resource Stack Class: 272, Id: 25044 and the following value of the suppress flag was taken in place of the parameter flag, which was identical and didn't harm in this case, but ... Change-Id: I951381ef2a5c2d7d7d44892ad5c34ea77ace51ce (cherry picked from commit c08fea639ca1a757df086ffe34f2bd5cf6573b6c) Reviewed-on: https://gerrit.libreoffice.org/11058 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21bnc#529470: I can't remove a path in AutoText dialogTor Lillqvist1-5/+31
This is, not surprisingly, somewhat weird code, but I think this patch does what is necessary, it does fix the bug. Change-Id: Ie1947b311f1455ba48a904f5ef42ad92899fac31 Reviewed-on: https://gerrit.libreoffice.org/11031 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-08-21Fix showing calc/draw types in some file pickersMaxim Monastirsky12-12/+12
Having the same UIName for several filters, causes some file pickers (gtk & generic) to drop the whole group. Change-Id: I6d18a751cb77a6a83e8e2a46338e41b7c72180ff Reviewed-on: https://gerrit.libreoffice.org/10730 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2014-08-20sw: ww8: fix another ~SwIndexReg() assertionMichael Stahl1-2/+4
If the position is the same as the body text anchor position, don't delete the node. Probably something should have inserted more nodes between StartApo() and StopApo(). Change-Id: I41110a47d840e764f6d2a24e43bf6938b1282972 (cherry picked from commit 404f16e97f1c2fcd8f9a1297bdfa46cba970467e) Reviewed-on: https://gerrit.libreoffice.org/11046 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-20Resolves: fdo#79227 labels are truncatedCaolán McNamara1-4/+2
Change-Id: I9d5cd9491325aab6c844c889bf4db6baab2e75c8 (cherry picked from commit 71804294c79136ef43a8f91b5c961e266d32187a) Reviewed-on: https://gerrit.libreoffice.org/11043 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20fix crash on loading ooo83574-1.docCaolán McNamara1-3/+5
Change-Id: Ia959dde8bac2d663cf1a5bec0358ee89dcaf42ed (cherry picked from commit 17ccc09ec27bde00e5ed7a9fe6055a991992b0ed) Reviewed-on: https://gerrit.libreoffice.org/11038 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20fdo#82427 disambiguate "NOT LIKE 'foo'"Lionel Elie Mamane1-2/+2
Change-Id: Iab383639ea73cc87c03f4f42433bc9ccfcd988ef Reviewed-on: https://gerrit.libreoffice.org/11008 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20guard against division by 0Caolán McNamara1-12/+17
valgrind + bff Change-Id: I5fa40f7a9759c98bb70ee6eb854dd9b376401f89 (cherry picked from commit 1ab0e8717bee9fee6c42015647bccfbf1683b8fc) Reviewed-on: https://gerrit.libreoffice.org/11036 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20only subtract height of hscroll if visibleCaolán McNamara1-2/+5
otherwise infinite loop in extensions update check Change-Id: I0dbf4f34208f1bf0854e365006a79470b26571f3 (cherry picked from commit 749f7548b4ee746d69c20a828ea6d3b853eba8d3) Reviewed-on: https://gerrit.libreoffice.org/11033 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20fdo#82757 call convertStringToNumber and detectNumberFormat with same localeLionel Elie Mamane1-1/+18
So that they agree (among others) on date recognition patterns. Change-Id: I964142702b5bb23bca2c62433e52f76dfa4bdacb Reviewed-on: https://gerrit.libreoffice.org/11003 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20Resolves: fdo#82355 crash on loading pptCaolán McNamara1-2/+3
regression probably triggered by... commit 2e3c45afc6c5ea74f1f8b4a7dce806e537870546 Date: Fri Mar 4 07:38:16 2011 -0800 Remove usage of deprecated List container. but that just stopped at the first NULL by chance Change-Id: I767e3bc3130d99cedceb4172857d1741c677b19b (cherry picked from commit f47baab6d35752b0babba768e299416ea5dd447d) Reviewed-on: https://gerrit.libreoffice.org/11028 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20valgrind + bff: Integer divide by zeroCaolán McNamara1-9/+22
Change-Id: I4c47d17a421f1c6d2d6cc29c7b92ec930bdf901f (cherry picked from commit a1fab361cb3325b2d012942e43660f2c0a2a4b96) Reviewed-on: https://gerrit.libreoffice.org/11021 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20Make Draw use paper size when printing - fdo#63905Eilidh McAdam1-5/+28
Previously, Draw/Impress use the default size from the printer. Now Draw uses the paper size (specified in page formatting). Impress still uses the old method - not sure if this is correct but printing handouts etc probably complicate print/paper size. Change-Id: If90bae4ac59cd95dd50fcd8deb25fd900756193e Reviewed-on: https://gerrit.libreoffice.org/9866 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com> (cherry picked from commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c)
2014-08-20facepalm: nAvailHeight is not derived from allocation WidthCaolán McNamara1-1/+1
Change-Id: Ic99c6519b02c546e0d3574cb756e3fb172d1ff52 (cherry picked from commit 36490fff3f4d1b4a7e4b7902a866abb177a0bf54) Reviewed-on: https://gerrit.libreoffice.org/11023 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-08-19DOCX import: fix FooterBodyDistance for first pagesMiklos Vajna3-0/+8
The root cause was that code in SectionPropertyMap::PrepareHeaderFooterProperties() saved member variables on the stack, modified them, then restored them at the end of the method, but forgot to restore m_nBottomMargin there. The result of this was that First Page's FooterBodyDistance got set to zero, which is not the same as Default Style's FooterBodyDistance (150), so on export sw::util::IsPlausableSingleWordSection() returned false, which turned the page break into a section break. Change-Id: I1afa2603de1313ae1e2aaefd4b7c771fce27e21e (cherry picked from commit 8cf681c5049970573020d8b808c990441b9cf828) Signed-off-by: Luboš Luňák <l.lunak@collabora.com>
2014-08-19fdo#81102: fix .doc import of blank even page headerLuke Deller3-4/+17
Honour the "different odd & even pages" header/footer setting from the doc file even if there is no content for an even page header or footer. Conflicts: sw/qa/extras/ww8import/ww8import.cxx Reviewed on: https://gerrit.libreoffice.org/10191 (cherry picked from commit b5bb15013617c6b9f1cdd089acae0bfb7104fa3a) Signed-off-by: Luboš Luňák <l.lunak@collabora.com> Conflicts: sw/qa/extras/ww8import/ww8import.cxx Change-Id: I963f7f7189e399b1d859db0788fbfd291e868c54
2014-08-19Copy first-header-footer test from ww8 to ooxmlLuke Deller4-43/+44
The test document was converted from doc to docx using MS Word 2010. Several fixes were required to make this test pass: - Do not clear the "FirstIsShared" property on page styles, as the code instead uses the old fashioned method of translating a Word section with "different first page header/footer": two page styles linked together, the first page style and the follow page style. (Also remove a wrong test case which checks the FirstIsShared property) - Do not clear the "HeaderIsShared"/"FooterIsShared" properties on the first page style, only on the follow page style. - Actually set the "FollowStyle" property on the first page style to link it to the follow page style. This didn't matter for the very first Word section because it was mapped to the default page styles "First Page" and "Standard" which are already linked, but it does matter for subsequent Word sections. - For some reason setting a new page style at a section break was excluded in the case where the following section had a title page. Remove this exclusion. - The exclusion mentioned in the last point was masking that bnc#751077 was not entirely fixed. To resolve that issue: When checking if the last paragraph of the section is empty, consider not just text content but also shapes. - Remove a workaround for bnc#780843 involving copying of headers and footers from the "Standard" (first section) page style in the case where the following section had a title page. This workaround is no longer needed as the test case passes without it. Change-Id: Iacc9bba0720c11414da3e852892cff301ebbc4fe (cherry picked from commit b4ccde72b8e2e45e7276d5b08b182495a1b1a617) Signed-off-by: Luboš Luňák <l.lunak@collabora.com>
2014-08-19Fix Insert 3D Model file dialog's "All supported formats" filterZolnai Tamás1-1/+1
It seems on some system the file dialog does not like spaces between the formats. (cherry picked from commit fd63ba45742e0886f15f907c03025b9dcc84d8ab) Conflicts: sd/source/ui/func/fuinsert.cxx Change-Id: Ifa69f4f210061209f7f0aa9223417d06b06b577a Reviewed-on: https://gerrit.libreoffice.org/11016 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-19fix build, coverity#1209547 Unchecked dynamic_castCaolán McNamara1-4/+7
(cherry picked from commit f4c80aaf3f2b97661ecf1cfd014aaa5ad00da846) Change-Id: Ibf614156aeafcd74be444cf388e02a9273d38d5f Reviewed-on: https://gerrit.libreoffice.org/11018 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-19detect * with no character following as invalid format codeEike Rathke1-0/+5
... so adding it to the list in Format Numbers using the checkmark button is not possible. Change-Id: I57ca6a7a3617583a82a99c87291373b1fe4e246d (cherry picked from commit bf674ab0f3097ad122c727b4d86f004f8cce1f61) Reviewed-on: https://gerrit.libreoffice.org/10998 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-19Let's not export sheet tab color when it's not set.Kohei Yoshida1-2/+3
COL_AUTO is the default value which is treated as color not being set. The old code would export it as a white color which is not correct. Change-Id: Ib68fccfb228333f2059edc4cfffeed90880ebc60 (cherry picked from commit 3104f95254530c76c3fc0c3b840254912c067ad8) Reviewed-on: https://gerrit.libreoffice.org/11004 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-18prevent out-of-bounds string accessEike Rathke2-27/+47
... while entering a * star symbol format code and there's no fill character following the * yet, for example "xxx"* (cherry picked from commit 839cc63e7d1b78c56e04bafb46037e898ce2c455) more out-of-bounds string accesses (cherry picked from commit 349c93e0f5c9f231b2ff6854fcb795ca5881ca2d) Change-Id: I006f125ceefccba6a95ea033fd434d98e5d4f1c2 Reviewed-on: https://gerrit.libreoffice.org/10994 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-18check for empty m_aStatesCaolán McNamara2-0/+4
valgrind + bff Change-Id: Ib818d508e10877a845b733c4aa223d1e2cbbc05e (cherry picked from commit e2b9531e43d37677109aa13eb6e2ebf857961016) Reviewed-on: https://gerrit.libreoffice.org/10958 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-18Resolves: icu#11054 crashes in bracketAddOpeningCaolán McNamara2-0/+45
(cherry picked from commit d79d2f0ef7a0e300a3ee4be128c625121d0c4b26) Conflicts: external/icu/UnpackedTarball_icu.mk Change-Id: I5dd63fa41c1568e8bf2d120cc0de5d2c44dd789c Reviewed-on: https://gerrit.libreoffice.org/10907 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-08-18check len before memcpying into itCaolán McNamara1-0/+15
valgrind + bff on sf_3e0068c9b19bb548826bed0599f65745-CrdWMI-minimized.gif Change-Id: I74cc21609f1c97a27e13615593f678cbbc8463e3 (cherry picked from commit d4e64d030092984077021a9af9d281cd64c476bf) Reviewed-on: https://gerrit.libreoffice.org/10991 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-18libgltf: check for #version string in the shader before add an own one.Zolnai Tamás1-12/+19
Change-Id: I69dbbabc5774cbce7943e77f41bb42ed7a118bcf (cherry picked from commit 6be202585f201deaf07c57e0f2cf722cce91165e) Reviewed-on: https://gerrit.libreoffice.org/10957 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-18fix reading a .doc that has frame anchored to the end of page (bnc#787942)Luboš Luňák4-1/+21
MSWord, unlike Writer, can anchor even to a page break (i.e. after the last paragraph). When this document was read, what happended was: - the last paragraph was read and the current position PaM was set to point after it - frame was read and anchored to the PaM - page break was read, making everything following be moved to the next page; including whatever ended up at the PaM position Handle this by checking for this case and inserting an extra empty paragraph before the break. This shouldn't affect layout of the page itself anyway, since the break should leave room for it (and MSWord shows a page break there if control characters are enabled, so there is room). (cherry picked from commit 4a1888a97eab4ead2e0bec76cd1cba410a8e7e13) Conflicts: sw/qa/extras/ww8import/ww8import.cxx Change-Id: Ia2a13bf5cf1c959b5aa228254365019a00a22679 Reviewed-on: https://gerrit.libreoffice.org/10951 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-08-18copy conditional formatting for single cells, fdo#82503Markus Mohrhard1-0/+5
Change-Id: I22f239fbbbfa3ac562b860efb990dff10d0e0e24 Reviewed-on: https://gerrit.libreoffice.org/10942 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-18bnc#865381 DOCX import: handle <w:hideMark> table cell propertyMiklos Vajna6-0/+71
(cherry picked from commit d1278ef4849661b9ae0eb7aaf4d74fbf91ccaf11) Conflicts: writerfilter/source/dmapper/PropertyIds.cxx writerfilter/source/dmapper/PropertyIds.hxx Change-Id: Id0dd34110376168e34df4956869608895b86abfe Reviewed-on: https://gerrit.libreoffice.org/10922 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-18check that AddToTable can be done validlyCaolán McNamara2-7/+19
Change-Id: I0ee69279e3bb1d9871feba17b908b8307f0ec5b4 (cherry picked from commit 43b39d3e47ffd179071732c0a8fc201c31b2bb46) Reviewed-on: https://gerrit.libreoffice.org/10949 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-18check TRG_HasMasterPage before TRG_GetMasterPageCaolán McNamara1-1/+1
bff + valgrind Change-Id: Ie08ddfe06dc0850cf44955cc9f9079b3856b19e3 (cherry picked from commit fad62d928a4b4cd3aa96e16d7ab8f8db0331b8c0) Reviewed-on: https://gerrit.libreoffice.org/10955 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-18Updated coreAndras Timar1-0/+0
Project: translations c05911bb115479f0ae29e30a4d8a91eb3c55f81e
2014-08-17libgltf: Append shader language version to the shader filesZolnai Tamás3-12/+32
In general glTF shader files does not contain version directives and in some case it make shader compiler using GLSL 1.1 which leads to that the shader compiler fails. So we need to append the choosen version number which is GLSL 1.3 in case of libgltf, but this also means that from that point OpenGL 3.0 is the new reuirements since GLSL 1.3 is available only from that version. (cherry picked from commit c67026f27023008d124c8ab76533169f032b04f6) Conflicts: external/libgltf/UnpackedTarball_libgltf.mk Change-Id: Ic4382266432ea474aeb3e603b32a998b9aeed280 Reviewed-on: https://gerrit.libreoffice.org/10947 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-17use correct namespace for table protection elements, fdo#82128Markus Mohrhard3-4/+7
Change-Id: I5b9cb4a76739a0c91597c0470c737439d2b07e4f Reviewed-on: https://gerrit.libreoffice.org/10943 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-16configure: don't try to use Win32 make on release branchMichael Stahl1-2/+12
Change-Id: Icd8c1b45659ca323aef25a55803f5b1ce078b9d3 Reviewed-on: https://gerrit.libreoffice.org/10932 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-08-16fdo#48110 disable the "Automatically" currency unless already usedEike Rathke1-1/+14
This disables the "Automatically" currency listbox entry in the number formats dialog and makes it unselectable, unless such currency format was already used at the current position of a loaded document. Getting completely rid of the listbox entry if not used is more cumbersome as the positions are tied to the list entries in SvxNumberFormatShell::aCurCurrencyList, but at least the disabled entry prevents accidental or ill intended selection of that awkward format. Change-Id: I16f3e88feede34e3f83afb108f253fb53d82d34d (cherry picked from commit 2e3d7c742a1c1253c4bb2af1c3d1b1506d2e7af4) Reviewed-on: https://gerrit.libreoffice.org/10939 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-15fdo#82644 write sal_Unicode chars as UnicodeDavid Tardon1-1/+1
Regression from commit de84529b55f5b295b089043a7119d6b0d8b92408. Change-Id: I8f0b148ec7df4f676341f588c04780a705c80a5c (cherry picked from commit 92240691d1c11a003474a322596fcd1ac3513eb5) Reviewed-on: https://gerrit.libreoffice.org/10937 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-08-15fdo#81787 attrs are already XML-encoded by libodfgenosnola1-1/+102
Change-Id: Icee62e1ec9cee71930bcd52dbab850396fc96efa (cherry picked from commit 46f52010e08ebc03c8a8efacd887b0ab526efaed) Reviewed-on: https://gerrit.libreoffice.org/10901 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-14fdo#82165: ODF import: clear all shapes when removing header contentMichael Stahl3-2/+21
Shapes anchored to the first or last paragraph survive setString("") so need to be deleted with some ruse. (regression from b8499fc3dcf474050f026b8d5cd1d9037bbe42b7) Change-Id: I00a8132583c45d1953c207932cc7f02f3065ae77 (cherry picked from commit 555c988f3b896e16afc7bdd1bd98e48229599637) Reviewed-on: https://gerrit.libreoffice.org/10894 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>