summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-10-23bump product version to 6.3.3.2.0+libreoffice-6-3-3Christian Lohmaier1-1/+1
Change-Id: Ifae41643ff3f281cf43630d53105d67080cd237d
2019-10-23update creditsChristian Lohmaier1-1559/+1571
Change-Id: Iad1765bef9e47d5a1588f43b170245c05d590f9a (cherry picked from commit e7deccd775ba653701e2fdce2807554e5ce08146) (cherry picked from commit 3b8047cd8fc6b433763bfefd1ec071bdff6946d0)
2019-10-23tdf#128188 sw_redlinehide: fix off-by-1 footnote numbers...Michael Stahl3-1/+218
... in sections with "Collect at end of text" set when "Track Changes->Show" is off; the pre-increment erroneously became a post-increment. (regression from fe1d3328997741b55202aca7b3dc566ca833a5f4) Change-Id: Ie438418883bdf91a519d553c10e8d9952a94a52d Reviewed-on: https://gerrit.libreoffice.org/81234 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 891b8036c746f7eab9ef3380c049eecf3860acac) Reviewed-on: https://gerrit.libreoffice.org/81238 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 38db98d643ae301f4293f34617a8fce932cff873) Reviewed-on: https://gerrit.libreoffice.org/81375 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-10-23tdf#128076: throw exception only if it's not alive and it's not a descriptionXisco Fauli3-3/+19
According to a comment from https://gerrit.libreoffice.org/#/c/74533/ okay... then i guess there are different kinds of callers: those who actually want to check if its a descriptor, and those who want to check that it isn't "live" so check if it's a description even if it's not alive Change-Id: I1526fdbcb006506cc67d29cbe3f65138f90843dc Reviewed-on: https://gerrit.libreoffice.org/80677 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 802d034c55876c9a933206176a7882ac1ae7566e) Reviewed-on: https://gerrit.libreoffice.org/80764 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 52485e1f3464ab69b38d2e240c8c364d6b78ceb8) Reviewed-on: https://gerrit.libreoffice.org/80877 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-10-23Resolves: tdf#128140 stabilize formula dialog widthCaolán McNamara2-7/+9
Change-Id: Ifdb80adfd4b399035ed793f8636f31b90cf50094 Reviewed-on: https://gerrit.libreoffice.org/80801 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 198fc5e09784afe32cf681f65009e5ac43e67ba4) Reviewed-on: https://gerrit.libreoffice.org/80875 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-10-23Don't use uninitialized memory when reading from the stream failsStephan Bergmann1-5/+9
Flathub arm builds (but not other arches) had often (but not always) failed when processing sc/qa/unit/data/qpro/pass/ofz14090-1.wb2 in CppunitTest_sc_filters_test (e.g., <https://flathub.org/builds/#/builders/1/builds/724>: > Test name: ScFiltersTest::testCVEs > equality assertion failed > - Expected: 1 > - Actual : 0 > - file:///run/build/libreoffice/sc/qa/unit/data/qpro/pass/ofz14090-1.wb2 ) Valgrind revealed that this was due to using unintialized memory when the various maIn.Read... in QProToSc::Convert failed, starting with the use of uninitialized nFmla[i] after maIn.ReadUChar( nFmla[i] ); At least make things deterministic by setting the relevant variables to zero. (Another approach could be returning early with some ConvErr status.) Change-Id: I4c06aa8da5f777170cdc7bbe3ca1d61b23d3f326 Reviewed-on: https://gerrit.libreoffice.org/80947 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 2704b9e3783aae9d8372f2e3ad3253a2cb49ae87) Reviewed-on: https://gerrit.libreoffice.org/80956 Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit e31f35c892b282258bd4ece30175e4bc48b6b823) Reviewed-on: https://gerrit.libreoffice.org/81030 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-22Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-3-3' - update translations for 6.3.3 rc2 and force-fix errors using pocheck Change-Id: Ib0214e1ca97d2fbac297258dfe82795eb6e77afa (cherry picked from commit c7858b0e1cbda51f96034e7fd42009d7fda9e99e)
2019-10-21tdf#128232: fix crash when trying to delete unused User FieldJulien Nabet1-2/+1
mpFieldTypes is std::unique_ptr<SwFieldTypes> (see https://opengrok.libreoffice.org/xref/core/sw/source/core/inc/DocumentFieldsManager.hxx?r=99a97d38#104) See bt: https://bugs.documentfoundation.org/attachment.cgi?id=155132 Change-Id: Iea8eddd4b1bdc9ce3c01988fc97004b7ec7a6e5f (cherry picked from commit 09a3762fe0fc4c4815c842098094082bf1b90de6) Reviewed-on: https://gerrit.libreoffice.org/81120 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 9b1f906ea2aa946e9d6245baacd4937233bb58c6) Reviewed-on: https://gerrit.libreoffice.org/81220 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-17aarch64 callVirtualFunction needs to be compiled w/o -fstack-clash-protectionStephan Bergmann3-1/+20
At least when doing an aarch64 Flatpak build against org.freedesktop.Sdk//19.08, which uses GCC 9.2.0 and passes in `CXXFLAGS=-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection`, callVirtualMethod (in bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx) would decrement the stack pointer another 16 bytes after the stackargs = alloca(...); and before the asm block, so in the called virtual function, arguments read from the stack would read garbage (and CustomTarget_testtools/uno_test would fail with SIGSEGV at > #0 0x0000ffffb733eb48 in rtl::OUString::operator= (this=0xaaaaf9c1ac30, str=...) at /run/build/libreoffice/include/rtl/ustring.hxx:453 > #1 0x0000ffffb733a7bc in bridge_object::assign (rData=..., bBool=true, cChar=64 u'@', nByte=17 '\021', nShort=4660, nUShort=65244, nLong=305419896, nULong=4275878552, nHyper=0, nUHyper=187651311381888, fFloat=17.0814991, fDouble=3.1415926358999999, eEnum=-1698898192, rStr=..., xTest=..., rAny=...) at /run/build/libreoffice/testtools/source/bridgetest/cppobj.cxx:99 > #2 0x0000ffffb733a87c in bridge_object::assign (rData=..., bBool=true, cChar=64 u'@', nByte=17 '\021', nShort=4660, nUShort=65244, nLong=305419896, nULong=4275878552, nHyper=0, nUHyper=187651311381888, fFloat=17.0814991, fDouble=3.1415926358999999, eEnum=-1698898192, rStr=..., xTest=..., rAny=..., rSequence=...) at /run/build/libreoffice/testtools/source/bridgetest/cppobj.cxx:115 > #3 0x0000ffffb733ade4 in bridge_object::Test_Impl::setValues (this=0xaaaaf9c1abb0, bBool=1 '\001', cChar=64 u'@', nByte=17 '\021', nShort=4660, nUShort=65244, nLong=305419896, nULong=4275878552, nHyper=0, nUHyper=187651311381888, fFloat=17.0814991, fDouble=3.1415926358999999, eEnum=-1698898192, rStr=..., xTest=..., rAny=..., rSequence=..., rStruct=...) at /run/build/libreoffice/testtools/source/bridgetest/cppobj.cxx:548 > #4 0x0000ffffb740bff4 in callVirtualFunction (function=281473755360772, gpr=0xffffd1ab1f28, fpr=0xffffd1ab1f68, stack=0xffffd1ab1d40, sp=8, ret=0xffffd1ab22c0) at /run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx:63 > #5 0x0000ffffb740ca70 in (anonymous namespace)::call (proxy=0xaaaaf9c291c0, slot=..., returnType=0xaaaaf9c00770, count=17, parameters=0xaaaaf9c3a210, returnValue=0xffffd1ab22c0, arguments=0xffffd1ab2230, exception=0xffffd1ab2370) at /run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx:178 > #6 0x0000ffffb740d4c4 in bridges::cpp_uno::shared::unoInterfaceProxyDispatch (pUnoI=0xaaaaf9c291c0, pMemberDescr=0xaaaaf9c55950, pReturn=0xffffd1ab22c0, pArgs=0xffffd1ab2230, ppException=0xffffd1ab2370) at /run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx:361 > #7 0x0000ffffb740720c in (anonymous namespace)::call (proxy=0xaaaaf9c549c0, description=..., returnType=0xaaaaf9c00770, count=17, parameters=0xaaaaf9c3a210, gpr=0xffffd1ab2510, fpr=0xffffd1ab2550, stack=0xffffd1ab2590, indirectRet=0xffffb7d24790) at /run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx:120 > #8 0x0000ffffb74079a0 in (anonymous namespace)::vtableCall (functionIndex=40, vtableOffset=0, gpr=0xffffd1ab2510, fpr=0xffffd1ab2550, stack=0xffffd1ab2590, indirectRet=0xffffb7d24790) at /run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx:291 > #9 0x0000ffffb7407b00 in (anonymous namespace)::vtableSlotCall (gpr0=187651311618536, gpr1=1, gpr2=64, gpr3=17, gpr4=4660, gpr5=65244, gpr6=305419896, gpr7=4275878552, fpr0=5.4321266044931319e-315, fpr1=3.1415926358999999, fpr2=0, fpr3=4.0039072046065485, fpr4=0, fpr5=4.003911019303815, fpr6=8.9589789687541617e+102, fpr7=-4.4588500238274385e-308) at /run/build/libreoffice/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx:348 > #10 0x0000ffffb739e60c in bridge_test::performTest (xContext=..., xLBT=..., noCurrentContext=false) at /run/build/libreoffice/testtools/source/bridgetest/bridgetest.cxx:378 > #11 0x0000ffffb73a3d58 in bridge_test::TestBridgeImpl::run (this=0xaaaaf9c18550, rArgs=...) at /run/build/libreoffice/testtools/source/bridgetest/bridgetest.cxx:1162 > #12 0x0000aaaad292a3ec in sal_main () at /run/build/libreoffice/cpputools/source/unoexe/unoexe.cxx:509 > #13 0x0000aaaad29297a0 in main (argc=8, argv=0xffffd1ab31b8) at /run/build/libreoffice/cpputools/source/unoexe/unoexe.cxx:349 .) By experiment, I found the problematic thing to be -fstack-clash-protection, which can apparently be cancelled with a subsequent -fno-stack-clash-protection at least on that GCC 9.2.0. (And -f[no-]stack-clash-protection appears to only be available since GCC 8, and not at all for Clang, so check for it with HAVE_GCC_STACK_CLASH_PROTECTION.) Reviewed-on: https://gerrit.libreoffice.org/80701 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5efb8624760e57dc1c2dd9abbeb13d5652f1fe07) Conflicts: bridges/Library_cpp_uno.mk configure.ac Change-Id: If667fdf704b1ba20a04593b38d2d1f079280df41 Reviewed-on: https://gerrit.libreoffice.org/80703 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ddcba628482f5c9d3a0b4ac79db4107fc906f403) Reviewed-on: https://gerrit.libreoffice.org/80749 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-17tdf#128138 sw_redlinehide: fix infinite loop in FindAttrsImpl()Michael Stahl1-3/+6
The code looked wrong previously, always assigning the end of the text node regardless of direction, but it turns out the improvement caused an infinite loop... let's just swap things after the loop, seems simpler than adding another if at the assignments. (regression from 4caef398af256be5f0c2a159129b528ee3702e5c) Change-Id: I098f5265fa86d6a2511a80a02230899a7a303a88 Reviewed-on: https://gerrit.libreoffice.org/80774 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 4e0241697371c40f4348bdfb6585a872d4cbcbf6) Reviewed-on: https://gerrit.libreoffice.org/80876 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-17tdf#40534 correctly match page with memory slabJan-Marek Glogowski2-52/+24
LO has a page manager to match system memory backbuffers with graphics memory on DX accelerated Windows. Internally this uses an other rectangle implementation, the SurfaceRect, which had some great comments like: // a size of [0,0] therefore denotes a one-by-one rectangle. In commit 230dbe2e43f3ee2cd285f9cdfe0d57e1ca08b8fe ("#144866# Add one pixel border around textures, a bunch of drivers clobber those with dirt), the allocation was increased by a pixel border, but this doesn't work correctly, because now an allocation of the page size wouldn't fit anymore into a page, because the pages size is decreased before comparison. In the end the mixup suffered from hard to handle off-by-one problems. This patch fixes the bug, but eventually SurfaceRect should be replaced by an extended basegfx::B2IBox. But since B2IBox uses two ranges, instead of a point and a size, it would need a lot of conversations to I2Point and I2Size objects with the current Page::insert algorithm. Change-Id: Ia725b4f8ed4fb270f2eb3734e492062bc7f13793 Reviewed-on: https://gerrit.libreoffice.org/80628 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 194e7ce17ae7ca278c12d03bc25684b7437f9785) Reviewed-on: https://gerrit.libreoffice.org/80669 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit edcb363f5eeefcc2ce28a2ab7a57d61b744466cd) Reviewed-on: https://gerrit.libreoffice.org/80878 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-10-11bump product version to 6.3.3.1.0+Christian Lohmaier1-1/+1
Change-Id: Ib7a975dc388db9f838afacfa7f96d0071fa1b6dd
2019-10-11Branch libreoffice-6-3-3Christian Lohmaier4-1/+1
This is 'libreoffice-6-3-3' - the stable branch for the 6.3.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.3.x release, please use the 'libreoffice-6-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: If919c36ef6fa12e2f99af04e0b418092f03c034b
2019-10-11tdf#124601 sw FollowTextFlow: fix hori pos of objects outside the current cellMiklos Vajna4-5/+37
The problem is that the image in the bugdoc's footer is anchored in one cell, but its position has a value that shifts it to the next column and next row. The next column is the problem for the horizontal position. So build on top of the previous vertical position fix, and make sure that CalcRelPosX() doesn't limit the position inside the current cell for an in-table, follow-text-flow, wrap-though image. Once that's in place, make sure that we don't try to grow the cell due to follow-text-flow, wrap-though objects in CalcPosition(), since in a wrap-through vs follow-text-flow situation, the wrap-though should have priority (should not affect size of cells). Finally, now that cells don't grow in this case, the previously added special-casing of footers in SwFlyFreeFrame::CheckClip() is no longer necessary. Not growing the cells means we don't try to re-position the object. (cherry picked from commit 29d7ece94318d3f03d079dff33ec15ff74f8febf) Change-Id: Ic55e4b5188704fa70314f91fe9a01987b6a56d7b Reviewed-on: https://gerrit.libreoffice.org/80650 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-11tdf#124601 sw FollowTextFlow: fix vert pos of objects outside the current cellMiklos Vajna4-3/+30
There were two problems here: 1) CalcHeightWithFlys() considered all follow-text-flow objects when determining the cell size, while wrap-through objects should never influence the layout of text (i.e. when they conflict, the second should have priority). 2) Once the cell had correct height, the oscillaction described in the SwFlyFreeFrame::CheckClip() comment started. Such a position update was already disabled for headers, but footers have exactly the same problem. In the case of the bugdoc, we jumped between 14618 and 14744 twips, till finally layout loop control kicked in. [ FollowTextFlow is meant to be same behavior as Word's layoutInCell shape property, so this is expected to improve rendering of existing documents. It's not likely that any user would opt in for FollowTextFlow to have the old close-but-not-exactly-matching behavior. ] (cherry picked from commit 489eef894e7034873ad262f9dfca554022db1b09) Conflicts: sw/qa/extras/layout/layout.cxx Change-Id: I6b3b672fc82c6c67dbbdd35c349613fe4cda610d Reviewed-on: https://gerrit.libreoffice.org/80595 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-10-11sw: WW8: fix crashtesting asserts on fdo45983-1.doc export to ODTMichael Stahl1-0/+3
The problem is that a redline is created that contains the CH_TXT_ATR_FIELDSTART but not the corresponding CH_TXT_ATR_FIELDEND: (rr) p aRegion $39 = SwPaM = { point = SwPosition (node 443, offset 185), mark = SwPosition (node 442, offset 0) } (rr) p aRegion.GetText() $40 = "\aDie Studierendenvertiefen ihre Fertigkeit bei einfachen Handverletzungen, einen Befund zu stellen, Therapieziele zu formulieren, einen ergotherapeutischen Behandlungsplan zu erstellen und durchzuführen" This is because commit d195a3e5f4ec5c616ae83f99d48f5d4eefe5f22e only adapted one place in SwWW8ImplReader::End_Field() where a fieldmark is inserted, but there's a second one ... Change-Id: Ib931c6b0d55f42e4f6bc170216f495f1f6e931e1 Reviewed-on: https://gerrit.libreoffice.org/80622 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 954c158acb87eb0385c51fdfff38fff84f154051) Reviewed-on: https://gerrit.libreoffice.org/80642 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-11sw: WW8: do not create fieldmark with start in frame and end in bodyMichael Stahl2-1/+7
Actually the start and end must have the same start node; presumably CheckNodesRange(..., true) does that. Change-Id: I04b34b593a4383b565289254bdb756d95c2b7916 Reviewed-on: https://gerrit.libreoffice.org/80594 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 06767a5394f1dfba71c4f0a2a07daa5664bdbd01) Reviewed-on: https://gerrit.libreoffice.org/80625 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-11Pass LDFLAGS into external/postgresqlStephan Bergmann1-1/+1
This will be needed when building against Flatpak org.freedesktop.Sdk//19.08, which no longer bundles krb5, so we will have a bundled libgssapi_krb5.so at /app/lib (instead of under /usr), but which requires LDFLAGS=-L/app/lib to be found. Change-Id: I8767740ab0cbb02b6ae682b7f0e21ec90ea5ddd7 Reviewed-on: https://gerrit.libreoffice.org/80620 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit cfd06eb99b8f366bfe96e4a6d3112e4c6057098b) Reviewed-on: https://gerrit.libreoffice.org/80633 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-10update creditsChristian Lohmaier1-1311/+1339
Change-Id: Ib98367116f9727f6ec54372d4cd90b657258b0d7 (cherry picked from commit 70ae1da67310a596e5bc49f1053c7ff72c84f539)
2019-10-10Related: tdf#124601 DOC import: always allow floating tables in header/footerMiklos Vajna3-0/+18
So now the DOC import is in sync with the DOCX one, see commit 81ef96a2417c7843dfed0558c920ad3064e58921 (tdf#79639 DOCX import: don't delay text frame conversion of in-header tables, 2015-06-01). The bugdoc used to have 2 additional pages in Writer (compared to Word), it has only 1 after this. (cherry picked from commit 8165cdad2e128ec5fabb50d3330c41a8b0f021d8) Change-Id: I24f0dc28599e608737dc19a0143e72832202a034 Reviewed-on: https://gerrit.libreoffice.org/80435 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-10-10tdf#107784: DOCX Import: Show citation's title in fields (2nd take)Xisco Fauli3-1/+25
Regression from 06f7d1a96eef5aa69d4872ff6d96eb5085296d09 The problem as I see it is that LibreOffice uses the identifier plus optionals prefix and suffix to display the bibliographic references. On the other hand, MSO displays the title for references starting with CITATION. So do the same MSO does, when working with CITATION refs We already add CITATION when we export to ooxml. See case SwFieldIds::TableOfAuthorities in AttributeOutputBase::TextField Change-Id: I144f27f711926658c8b6f89e69f0ddeeb7e7890c Reviewed-on: https://gerrit.libreoffice.org/79477 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit c02b5cf6472ccb45a916369db493a40ed3e21d60) Reviewed-on: https://gerrit.libreoffice.org/79545 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-10-10tdf#127676: avoid flickering in line width popupXisco Fauli1-0/+5
Change-Id: Ie69a5b4d33d12316e6fd7e443b92851cffc95b8c Reviewed-on: https://gerrit.libreoffice.org/79667 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 25cc6dcef22e51c1bfa01e8fbed5046439bb1428) Reviewed-on: https://gerrit.libreoffice.org/79748 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-10-10tdf#126321: avoid flickering in page size popupXisco Fauli1-0/+6
In a Tabbed notebookbar, Layout - Page Size Change-Id: I74ab54e96486de960d1ccc7bcb3c2679e25a6e9e Reviewed-on: https://gerrit.libreoffice.org/79753 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
2019-10-09Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-3' - update translations for 6.3.3 rc1 and force-fix errors using pocheck Change-Id: Iddec8e75a6e5f00f381c3facbf359991502e816a
2019-10-09tdf#127825 DOCX import: fix handling for tbrl, auto-height and rel size shapesMiklos Vajna4-2/+46
Regression from commit ff17478e069cc82681df62514876c06365dd5cd6 (sw btlr writing mode: implement DOCX shape import for tbrl, 2019-04-25), there were two problems here: 1) Relative size currently only works properly for the lrtb direction, so disable that during import till sw core is improved. 2) When SwFlyFrame::Format() auto-grows a text frame which is the textbox of a shape, it needs to notify the shape about the physical size of the frame, not the logical one. So going via the SwRectFnSet abstraction is not correct in this case. (cherry picked from commit 9c81d0a268cca4ff36eff94c0842361b9c0287ef) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport2.cxx Change-Id: Ie185c7415d90594434eac8f459630d6a3212328a Reviewed-on: https://gerrit.libreoffice.org/80427 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-09remove still pending timeout in dtorCaolán McNamara1-0/+2
Change-Id: I8ec8c62a9cd5349fa6e58c2d0515bd57edede97a Reviewed-on: https://gerrit.libreoffice.org/80524 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-09tdf#128013: fix Crash when linking an odp fileJulien Nabet1-4/+7
See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=154847 Regression introduced by: https://cgit.freedesktop.org/libreoffice/core/commit/?id=3c86ffd8ded628e6f2b4187948a1b1056f6a0f56 Change-Id: Id9355958b0c4a56215ff98f0e5be13a3074ce45f Reviewed-on: https://gerrit.libreoffice.org/80500 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 1dc4c8266d45eb2f5c3de303eaa9233e3b52f058) Reviewed-on: https://gerrit.libreoffice.org/80506 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-10-09tdf#124391 Fix doubled menu in global menuSamuel Mehrbrodt1-2/+6
Regression from 3bedbfd9b3cee5a8d2da6ee0486859bd725979ba Change-Id: I56473a2b0620f90f23b1bcde3ae1290801021038 Reviewed-on: https://gerrit.libreoffice.org/80464 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-08tdf#127529 vertical text not drawn in slideshow canvasCaolán McNamara9-53/+115
because the canvas text drawing impl falls back to using an OutputDevice view of the canvas to use the vcl text drawing apis to achieve vertical text To get an OutputDevice view of the canvas there is a specific VirtualDevice ctor available to create a VirtualDevice that, unlike the normal case, doesn't have its own specific backing buffer, but instead draws to the underlying target provided via the SystemGraphicsData arg The svp/gtk impl missed that understanding and provided an ordinary VirtualDevice with its own backing buffer, not a VirtualDevice that would draw to the expected target surface of the canvas. So the vertical text was drawn to a different surface than the intended one, and was just discarded. The cairo use in the canvas long precedes the use of cairo in vcl itself. Seeing as text is now rendered with cairo in all cases where the canvas uses cairo its probably now pointless for canvas to have its own text rendering path. Change-Id: Ie3b0a43ca2b746cbfe25e2d0415315b3d5403cd2 Reviewed-on: https://gerrit.libreoffice.org/80192 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-08openssl 1.0.2tCaolán McNamara1-2/+2
Change-Id: Ideb980a07632e75e2bc7fffa851b8419e727c13b Reviewed-on: https://gerrit.libreoffice.org/80341 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-08autocorrect dialog width grows on change of new to replaceCaolán McNamara3-9/+11
the sizegroup isn't working as I'd expect, so just make the replace button visible, get the preferred width of the buttonbox, lock that down then hide the place button and the container will stay at the max width that will be wanted Change-Id: Idfe632aa5af404abb92fc8f7267f0dda5cdbe295 Reviewed-on: https://gerrit.libreoffice.org/79863 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-08Related: tdf#127645 update dialog has a slave extension dialogCaolán McNamara2-11/+50
when the update dialog is shown, the extension dialog was created but not executed, so there isn't a dialog execution context to end, just the unexecuted dialog to "close" Change-Id: If4b522ca5f880d3ece8403b5350c846bd14a2992 Reviewed-on: https://gerrit.libreoffice.org/79283 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-08missing treeview modelCaolán McNamara1-1/+26
Change-Id: Id1a405bb8f5c3d71b48c54e12b1e8ba23a27d842 Reviewed-on: https://gerrit.libreoffice.org/79405 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-08Resolves: tdf#127645 ignore floating windows like we do tooltipsCaolán McNamara1-1/+6
Change-Id: I727e10a1e884841554437e376bde2ff483d278a4 Reviewed-on: https://gerrit.libreoffice.org/79284 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-08should use DialogController hereCaolán McNamara2-6/+3
Change-Id: Ie0ad42e98d574d15172c6ed3a58714c3f87593cd Reviewed-on: https://gerrit.libreoffice.org/79356 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-08set wait on the dialog, not the page parentCaolán McNamara1-2/+1
Change-Id: If782e774fee91a427d4bda575b2f404fd636f534 Reviewed-on: https://gerrit.libreoffice.org/79320 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-08tdf#83618 Make line spacing values agreeJim Raykowski2-3/+7
Change-Id: I372a673bbad442d28314498248b12ce7f86fce09 Reviewed-on: https://gerrit.libreoffice.org/73737 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit 849b837d1a3b185a8dd893a8f6eaed53605bcab1) Reviewed-on: https://gerrit.libreoffice.org/80314 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-08Related: tdf#124601 DOC import: improve fLayoutInCell handlingMiklos Vajna5-4/+37
There were 3 problems here: First, SwWW8ImplReader::IsObjectLayoutInTableCell() should not use m_nProduct to determine the Word version. It depends on an undocumented field of the [MS-DOC] format and the bugdoc shows how it interprets a Word 2007-produced document as a Word 97 one. Instead, parse the cswNew field of the file header, which is a more or less documented way to find out if this file was produced by >=2000 or 97. See e.g. <https://docs.microsoft.com/en-us/openspecs/office_file_formats/ms-doc/841b5f72-487e-4fe7-8657-ec90d5af8750> where the Dop structure maps cswNew values to Word versions. Second, parse the fLayoutInCell correctly: it's part of a bitfield, with two variables: a bool and an other one which decides if the bool should be read at all. The bugdoc's case was evaluated as false, so do the proper parsing in that case and leave the existing logic as-is for now. Third, there doesn't seem to be a reason to exclude the wrap-through case for the fLayoutInCell -> follows-text-flow mapping. The bugdoc shows that Word interprects fLayoutInCell the same way for wrap-though objects, too. (cherry picked from commit d630f69d90f15bc652a62648b05ea515de78d16a) Change-Id: Iaddd5e522e0380b731899f32a17c14ce4442ac35 Reviewed-on: https://gerrit.libreoffice.org/80346 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-10-07tdf#127958 crash adding 2 or more files into writer master documentNoel Grandin2-13/+18
clean up the memory management here, the SfxMedium wants to own the passed-in SfxItemSet Change-Id: I1bafa520ca7b833c4d2df7593649c3720c46e2ce Reviewed-on: https://gerrit.libreoffice.org/80332 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 8f6f9e4217d03d874fb1ce391730a1c893ab6844) Reviewed-on: https://gerrit.libreoffice.org/80344
2019-10-07lok: comments: fix hidden text cursor and sudden document scrollMarco Cecchetti1-0/+8
On Android, SwAnnotationWin::Rescale leads to invoke ImpEditEngine::UpdateViews which hides the text cursor. Moreover it causes sudden document scroll when modifying a commented text. Not clear the root cause, anyway skipping this method fixes the problem, and there should be no side effect, since the client has disabled annotations rendering. Change-Id: I572a9c6b3fe39473a596209413945d777bd79506 Reviewed-on: https://gerrit.libreoffice.org/80246 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2019-10-07related tdf#99602 writerfilter: deferredCharProps unhandled in StylesJustin Luth3-1/+11
...so don't add deferred properties during style import. Otherwise, the first paragraph picks up those attributes and applies them. Regression from 2012 - only affects subscript/superscript. Truly fixing this for Character Styles will be tricky, because it depends on the final fontsize - regardless of where it is set. So at the style level, the deferred property needs to be percentized based on SOMETHING, and then at appendText time the fontsize needs to be determined. If escapement is inherited from a style, then the escapement needs to be converted BACK into pointsize (based on style charsize), and then the final percentage can be calculated and directly applied. Yuck. I'm inclined to treat charstyle escapement like pre-2012, which just assigned default values and ignored the actual/given amount. Change-Id: I8e3783533ec18740e1c7d0b36c58b6c7e8ce107f Reviewed-on: https://gerrit.libreoffice.org/80178 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 8eb0d8daa526d1c53363954d4d8730cad55f1910) Reviewed-on: https://gerrit.libreoffice.org/80202 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-10-06Resolves: tdf#122011 fix ValidExternal() checkEike Rathke2-3/+6
Tab==-1 may have been the condition 10 years ago, but at least since commit 296baa2fb6dd4150a7855114093a9703cdc18b09 CommitDate: Tue Oct 5 18:14:37 2010 -0400 Ported calc-extref-interpreter-rework-*.diff from ooo-build. that's not the case anymore. The check is only used in ScRefTokenHelper::compileRangeRepresentation() that is only used when creating chart data sources and sequences, thus may have gone undetected. Change-Id: I2eeb20ec740d286918b6ea29c017c32d03f970ad Reviewed-on: https://gerrit.libreoffice.org/80163 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 354b29ace32b19a1b40e46612349b8d76f00c0c6) Reviewed-on: https://gerrit.libreoffice.org/80168 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-05Resolves: tdf#127882 gtk 3.18 crash in property dialog teardownCaolán McNamara2-1/+2
due to the menubutton popovers in the custom property page workaround by reordering so scrolling window is torn down after the menubutton is destroyed and clear the popover in the menubutton dtor Change-Id: Icf06d912524af13a5590f160150f1a4e15f3e9f7 Reviewed-on: https://gerrit.libreoffice.org/80118 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-05Resolves: tdf#120209 reload names if setting for their language changesCaolán McNamara2-1/+35
Change-Id: I386a598ae680c90e7d31bf821e7fb58391e5d45c Reviewed-on: https://gerrit.libreoffice.org/80131 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-05tdf#127710: fix sending documents to Claws MailJulien Nabet1-1/+1
Thanks to the Paul's (paul@claws-mail.org) contribution Change-Id: Ie4144ab78691b33d8d341d4520c40c56010a0dd8 Reviewed-on: https://gerrit.libreoffice.org/79423 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 1c03df6e82e4bf30294fc0b9e64de5cc39efc5c4) Reviewed-on: https://gerrit.libreoffice.org/79460 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-05return should activate okCaolán McNamara1-0/+1
Change-Id: Id9bfa9badb6b4661d6ad4c0a04323c60c4a3c749 Reviewed-on: https://gerrit.libreoffice.org/79864 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-05tdf#127422 draw text with correct pKernArray values.Mark Hung1-18/+10
Prior to 5f62b97ae7891b8c601f6093a1ec5358feb20790, Starting position was specified and DrawText was used to render the text without referring to pKernArray. After the patch, DrawTextArray was used but pKernArray was not update correctly. Instead of draw each substring seprated by space, this patch increases the values pKernArray when a space is encountered and call DrawTextArray only once. Change-Id: I9e61b2d0608400f26136490248740c5f00b56cc3 Reviewed-on: https://gerrit.libreoffice.org/79544 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com> (cherry picked from commit d744838991594eebe27acc4c7d9fb4579d654853) Reviewed-on: https://gerrit.libreoffice.org/80221
2019-10-04Resolves: tdf#127887 Fix libwps wrong Lotus version detectionEike Rathke2-0/+45
Also return the proper kind and creator values set in WKS4Parser::checkHeader() to callers of WPSDocument::isFileFormatSupported() Change-Id: I3adfde0e18669b80956a9b577080fe8388dd3b1f Reviewed-on: https://gerrit.libreoffice.org/79981 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 5a7d4ee6c4dd92758e0fd213671251e96d6e7f08) Reviewed-on: https://gerrit.libreoffice.org/80015 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-03Resolves: tdf#127262 validity out of order focus in and out problemCaolán McNamara1-17/+34
Resolves: tdf#127904 modal depth dips below 0 when validation dialog is run modally, but changed itself to unmodal during execution. only NotifyModalHierarchy on modal<->unmodal transition and not on modality depth Change-Id: I06f5fd0ce32a9f2d799f6003b7d22b13e865b8c6 Reviewed-on: https://gerrit.libreoffice.org/79612 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-10-03Resolves: tdf#127873 accept ',' comma group separator in number entities againEike Rathke1-1/+6
Existing documents unwittingly may have used that as decimal separator in such locales (though it never was as this is always the en-US locale). "Regression" from commit 9336286a7ea5385541344f444e6f8702c85bdacb CommitDate: Fri Nov 30 22:15:22 2018 +0100 [API CHANGE] Resolves: tdf#42518 new KParseTokens::GROUP_SEPARATOR_IN_NUMBER Change-Id: I0ffc1b8ec7c1820fccd8277036c64093dddf82fe Reviewed-on: https://gerrit.libreoffice.org/80023 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 2caa9d7ddcff3f6e380c306b737e9b5e9cdaf4c2) Reviewed-on: https://gerrit.libreoffice.org/80044 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-23 16:28:45 +0000