summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-07-05Updated coreChristian Lohmaier1-0/+0
Project: translations 80709c6b726465cc0b3859ec42a50c10845ccc70 update translations for 5.4.0 rc2 and force-fix errors using pocheck Change-Id: Ia9fda2cbbf1e572cbf585a8284fffbada72d0da2 (cherry picked from commit 60225a1ba7744aef045da360e5dbbfe3261636c2)
2017-07-05fix m68k build (again)Rene Engelhard1-6/+20
This reverts commit d5d6ee3b3e7cf3d93f892a452244051e4294fe6d and applies the patch cleanly again. somehow it got mis-applied. Change-Id: Id199d9086fb8e2e52bb810c8ddcbdd7fa7060676 Reviewed-on: https://gerrit.libreoffice.org/39279 Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Rene Engelhard <rene@debian.org> Reviewed-on: https://gerrit.libreoffice.org/39511 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-07-04Updated coreAron Budea1-0/+0
Project: dictionaries dc0d08d9dcd75895bf1b454330ca14d051cc9f3e tdf#108439: update Scottish Gaelic dictionary to 3.3 Change-Id: Id08f755bd6e4001d91a5c6129c0d07522d9cefec Reviewed-on: https://gerrit.libreoffice.org/38986 Reviewed-by: Aron Budea <aron.budea@collabora.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-07-04Set error on more than max params (255) per functionEike Rathke2-2/+7
Parameter count is size byte, so.. SUM(1,1,1,...) with 256 arguments resulted in 0 (uint8 wrapping around). (cherry picked from commit 209cc5c211260a6c20cc6fb5ac02fd5a88100314) Change-Id: Ib9997ad0d0d13d4c5171f276148b6c5cad570d5b Reviewed-on: https://gerrit.libreoffice.org/39505 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-07-04Break solenv/bin/assemble-flatpak.sh out of dev-tools flatpak/build.shStephan Bergmann1-0/+110
,,,in preparation of moving to a flatpak-builder manifest.json approach Change-Id: Ie9e90a85cc6e94ff7191161085c6e607512db0c4 (cherry picked from commit 19c13650c81ae7e0ad6cf0d7b8661f8440ee7892) Reviewed-on: https://gerrit.libreoffice.org/39508 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-07-04xmlsecurity: implement support for building against system-xmlsecMiklos Vajna8-3/+55
The only remaining difference is that in the system-xmlsec case we work with the default key manager, not with the one that's only added by our xmlsec patches. This works for me for the uses I know of (see <https://lists.freedesktop.org/archives/libreoffice/2017-February/076947.html> for the motivation): signing and verifying of different signatures (bad signature, good with non-trusted CA, good with trusted CA) with software-based certificates all behave as expected. Change-Id: If3f3e2b8373ab7397db3f98070a5a2ce51fa7c06 Reviewed-on: https://gerrit.libreoffice.org/39075 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/39274 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Rene Engelhard <rene@debian.org>
2017-07-04xmlsecurity nss: adopt the private key of the signing certificate explicitlyMiklos Vajna3-15/+29
xmlsec1-customkeymanage.patch.1 of our bundled xmlsec extends xmlSecNssKeyDataX509VerifyAndExtractKey(), so that it calls xmlSecNssPKIAdoptKey() for the private key of the signing certificate. Make this explicit in xmlsecurity/ code, so we don't depend on the patched xmlSecNssKeyDataX509VerifyAndExtractKey(). This is harmless for the patched xmlsec, but it prevents this error: warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48: keys.c:1246: xmlSecKeysMngrGetKey() '' 'xmlSecKeysMngrFindKey' 1 ' ' warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48: xmldsig.c:790: xmlSecDSigCtxProcessKeyInfoNode() '' '' 45 'details=NULL' warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48: xmldsig.c:503: xmlSecDSigCtxProcessSignatureNode() '' 'xmlSecDSigCtxProcessKeyInfoNode' 1 ' ' warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48: xmldsig.c:286: xmlSecDSigCtxSign() '' 'xmlSecDSigCtxSignatureProcessNode' 1 ' ' when xmlsec is not patched. (This is needed, but not enough to build against system xmlsec.) Change-Id: I5d68a8be7aefcb529566213f9b9c2985eab6a80a Reviewed-on: https://gerrit.libreoffice.org/39023 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/39273 Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Rene Engelhard <rene@debian.org>
2017-07-04tdf#105095 DOCX import: conditionally ignore leading tab in footnotesMiklos Vajna4-5/+30
Commit b38629ae210b204a6d24d6e9c5c62eaaf563d494 (cp#1000017 DOCX/RTF import: avoid fake tab char in footnotes, 2013-12-05) added code to strip leading tabs from footnote text to improve odt->docx->odt rountrip experience. Turns out that this is correct only in case the gap between the footnote number and the content is provided by a paragraph margin. In case there is no such margin, then the tab is wanted; so only conditionally ignore such leading tab characters. (cherry picked from commit abc440a691efb872afac385ce5ed28cd5db56c8c) Change-Id: I9d419bf2fd3b4899208489210cbe9809a2ab0736 Reviewed-on: https://gerrit.libreoffice.org/39494 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-07-04notify the clipboard terminate listener before any other terminate listenerMarkus Mohrhard4-1/+75
Otherwise we may have destroyed a service that is needed to generate one of the clipboard formats requested by the system clipboard. Change-Id: Id05de3ac569e3ed38cd97efc4c48326bc6a8db0b Reviewed-on: https://gerrit.libreoffice.org/39429 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 7250bc4721b334714bb0fa1345211c83330f94b2) Reviewed-on: https://gerrit.libreoffice.org/39489 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2017-07-04tdf#107505: Impress - crash with two people co-editing one slideTamás Zolnai1-0/+1
In tiledrendering mode cursor inside shapes are not handled very well now. Different LO instances manipulates the same cursor instead of having one separate cursor for all instances (as in case of simple text editing in Writer). Crashes caused by that one cursor is owned (created and destroyed) by one LO instance but used by an other instance in the meantime. We can avoid this by not making this cursor available to the other instances. Cursor is hidden anyway so don't need to have it set to the corresponding Window. Change-Id: Id78f79e73eda88f3c2c6aa7f534c32f3f8aba174 Reviewed-on: https://gerrit.libreoffice.org/39432 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 258df6f41d89a606a980942df6337d446634c0a6) Reviewed-on: https://gerrit.libreoffice.org/39435 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-04Resolves: tdf#108452 gtk3 xbm cursors invisible on black bgCaolán McNamara1-6/+15
Change-Id: I5c9b27862da6ac76ae38542f85a51f9aefdd013d Reviewed-on: https://gerrit.libreoffice.org/39112 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-04tdf#108836 sw: don't enable Undo if Steps configured to 0Michael Stahl2-2/+10
It doesn't work. Change-Id: Iafc3eb50f481faffee60592aa3b6fd2ed4387b90 (cherry picked from commit 5c4a9dfdc01606e0a35c5e2809571d0f6f03df39) Reviewed-on: https://gerrit.libreoffice.org/39390 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-04tdf#108863 svx: fix use-after-free in SdrEditView::DeleteMarkedObj()Michael Stahl2-19/+25
The sdr::ViewSelection has multiple vectors with pointers to the same SdrObjects, and those are only cleared in sdr::ViewSelection::SetEdgesOfMarkedNodesDirty(), so deleting SdrObjects that are marked must be delayed until after that is called. (cherry picked from commit a54ba50db2c341f0f0e47d77dbe64a6e588bc911) loplugin:unusedvariablecheck leftover from a54ba50db2c341f0f0e47d77dbe64a6e588bc911 "tdf#108863 svx: fix use- after-free in SdrEditView::DeleteMarkedObj()" (cherry picked from commit 77f98204ba2fbb51b0a0bb2ac94b839249eec9a4) Change-Id: I7ab18cb2116164a71dce29bf10eca974061ab424 Reviewed-on: https://gerrit.libreoffice.org/39418 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-04tdf#108838 accessibility: fix horrible memory leak in AccessibleTabBarBaseMichael Stahl1-1/+1
Reproducing tdf#108833 failed because applying the Master Page takes > 2 hours; the time is spent calling vcl::Window listeners, of which there were some 39525 after a couple minutes, almost all of which AccessibleTabBarBase. AccessibleTabBarBase::WindowEventListener() has an inverted condition that suppresses the event that is generated from TabBar::Clear() and thus when DrawViewShell::ResetActualPage() calls Clear() no AccessibleTabBarPage is removed but then the InsertPage() calls create duplicate objects that again register as listeners. The condition is obviously inverted given the CVS commit message: 1.2.88.1 log @#135353# do not pass VCLEVENT_TABBAR_PAGEREMOVED (all) to objects other than AccessibleTabBarPageList @ text a69 8 if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) && ( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() == TAB_PAGE_NOTFOUND ) && ( dynamic_cast< AccessibleTabBarPageList *> (this) != NULL ) ) { return 0; } Change-Id: I2a3b86bbd0f0251a966f41b316a3b313517df24f (cherry picked from commit b2b085441dc79fb78607dbf1969c12a40db58214) Reviewed-on: https://gerrit.libreoffice.org/39419 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-04tdf#108833 sd: don't unconditionally enable Undo after importMichael Stahl1-1/+2
Change-Id: Id637e649ccf3782658832d909b3a7150a0606229 (cherry picked from commit 3d59018b1ed816b4399cad4c2c4818cf25d4f4a1) Reviewed-on: https://gerrit.libreoffice.org/39420 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-04tdf#108863 sd: disable Undo earlier if no Undo StepsMichael Stahl1-0/+10
If 0 Undo Steps, the Undo is disabled by a timer somewhere calling SfxShell::SetUndoManager(). This seems a bit risky, so disable it already when the sd::UndoManager is created. Change-Id: I9caf14fe32251d1f92cb5fa0683838316275eab3 (cherry picked from commit 495284716f49072e432b8425944cc67dfe0df0e0) Reviewed-on: https://gerrit.libreoffice.org/39417 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-04tdf#101821 sw: fix layout footnote use-after-freeMichael Stahl2-3/+38
After inserting a header in the bugdoc, during SwFrame::Calc of a SwTextFrame that is in a footnote, it decides move forward to the next page. This deletes the SwFootnoteFrame and SwFootnoteContFrame that lcl_FormatContentOfLayoutFrame() are iterating over. For want of a more elegant solution, use a big hammer to prevent the problem and try to clean up so that no empty SwFootnoteFrame and SwFootnoteContFrame remain (as that is known to crash in other places, see commit c9fb347642729017ad0c613fe26310befd021db8) Invalid read of size 8 at 0x414E1F96: SwFrame::GetNext() (frame.hxx:485) by 0x41AFDD07: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:646) by 0x41AFDCC0: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:642) by 0x41AFDCC0: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:642) by 0x41AFDEA7: SwObjectFormatterTextFrame::FormatAnchorFrameAndItsPrevs(SwTextFrame&) (objectformattertxtfrm.cxx:696) by 0x41AAA680: SwFlyAtContentFrame::MakeAll(OutputDevice*) (flycnt.cxx:415) by 0x41A7F211: SwFrame::PrepareMake(OutputDevice*) (calcmove.cxx:346) by 0x41B75758: SwFrame::Calc(OutputDevice*) const (trvlfrm.cxx:1761) by 0x41AA8927: SwFlyFrame::Calc(OutputDevice*) const (fly.cxx:2559) by 0x41ADB36B: SwLayAction::FormatLayoutFly(SwFlyFrame*) (layact.cxx:1414) by 0x41AF9658: SwObjectFormatter::FormatObj_(SwAnchoredObject&) (objectformatter.cxx:321) by 0x41AFCB6E: SwObjectFormatterTextFrame::DoFormatObj(SwAnchoredObject&, bool) (objectformattertxtfrm.cxx:126) by 0x41AF9A6A: SwObjectFormatter::FormatObjsAtFrame_(SwTextFrame*) (objectformatter.cxx:443) by 0x41AFD275: SwObjectFormatterTextFrame::DoFormatObjs() (objectformattertxtfrm.cxx:328) by 0x41AF924A: SwObjectFormatter::FormatObjsAtFrame(SwFrame&, SwPageFrame const&, SwLayAction*) (objectformatter.cxx:191) by 0x41ADC213: SwLayAction::FormatContent(SwPageFrame const*) (layact.cxx:1633) by 0x41AD88DE: SwLayAction::InternalAction(OutputDevice*) (layact.cxx:760) by 0x41AD7080: SwLayAction::Action(OutputDevice*) (layact.cxx:351) by 0x41ADE32E: SwLayIdle::SwLayIdle(SwRootFrame*, SwViewShellImp*) (layact.cxx:2133) by 0x41FFC97E: SwViewShell::LayoutIdle() (viewsh.cxx:711) Address 0x505541a8 is 72 bytes inside a block of size 272 free'd at 0x4C2F21A: operator delete(void*) (vg_replace_malloc.c:576) by 0x41AD371A: SwFootnoteFrame::~SwFootnoteFrame() (ftnfrm.hxx:52) by 0x41B5B74C: SwFrame::DestroyFrame(SwFrame*) (ssfrm.cxx:391) by 0x41A97294: SwFlowFrame::CutTree(SwFrame*) (flowfrm.cxx:406) by 0x41A979AE: SwFlowFrame::MoveSubTree(SwLayoutFrame*, SwFrame*) (flowfrm.cxx:592) by 0x41ACFB69: SwContentFrame::MoveFootnoteCntFwd(bool, SwFootnoteBossFrame*) (ftnfrm.cxx:2756) by 0x41A9B78E: SwFlowFrame::MoveFwd(bool, bool, bool) (flowfrm.cxx:1813) by 0x41A85864: SwContentFrame::MakeAll(OutputDevice*) (calcmove.cxx:1681) by 0x41A7F211: SwFrame::PrepareMake(OutputDevice*) (calcmove.cxx:346) by 0x41B75758: SwFrame::Calc(OutputDevice*) const (trvlfrm.cxx:1761) by 0x41AFDCFB: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:644) by 0x41AFDCC0: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:642) by 0x41AFDCC0: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:642) by 0x41AFDCC0: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:642) by 0x41AFDEA7: SwObjectFormatterTextFrame::FormatAnchorFrameAndItsPrevs(SwTextFrame&) (objectformattertxtfrm.cxx:696) by 0x41AAA680: SwFlyAtContentFrame::MakeAll(OutputDevice*) (flycnt.cxx:415) by 0x41A7F211: SwFrame::PrepareMake(OutputDevice*) (calcmove.cxx:346) by 0x41B75758: SwFrame::Calc(OutputDevice*) const (trvlfrm.cxx:1761) by 0x41AA8927: SwFlyFrame::Calc(OutputDevice*) const (fly.cxx:2559) by 0x41ADB36B: SwLayAction::FormatLayoutFly(SwFlyFrame*) (layact.cxx:1414) by 0x41AF9658: SwObjectFormatter::FormatObj_(SwAnchoredObject&) (objectformatter.cxx:321) by 0x41AFCB6E: SwObjectFormatterTextFrame::DoFormatObj(SwAnchoredObject&, bool) (objectformattertxtfrm.cxx:126) by 0x41AF9A6A: SwObjectFormatter::FormatObjsAtFrame_(SwTextFrame*) (objectformatter.cxx:443) by 0x41AFD275: SwObjectFormatterTextFrame::DoFormatObjs() (objectformattertxtfrm.cxx:328) by 0x41AF924A: SwObjectFormatter::FormatObjsAtFrame(SwFrame&, SwPageFrame const&, SwLayAction*) (objectformatter.cxx:191) by 0x41ADC213: SwLayAction::FormatContent(SwPageFrame const*) (layact.cxx:1633) by 0x41AD88DE: SwLayAction::InternalAction(OutputDevice*) (layact.cxx:760) by 0x41AD7080: SwLayAction::Action(OutputDevice*) (layact.cxx:351) by 0x41ADE32E: SwLayIdle::SwLayIdle(SwRootFrame*, SwViewShellImp*) (layact.cxx:2133) by 0x41FFC97E: SwViewShell::LayoutIdle() (viewsh.cxx:711) Change-Id: I656cc2303eeccd5eef68ad3b8e81bb0fd47b94fb (cherry picked from commit 9dcb767c5bdccdf6606240afd6aa2c6bd3dcc9f4) Reviewed-on: https://gerrit.libreoffice.org/39102 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-04tdf#108826 sw: also handle RES_REMOVE_UNO_OBJECT in SwCallMouseEventMichael Stahl1-3/+5
This is sent from SwUndoFlyBase::DelFly(); the SwFrameFormat isn't deleted in this case but it's no longer part of the document, so an UI class like SwCallMouseEvent should stop pointing to it. Change-Id: I05349271d14bb1948ea30528cd85c68ed638f28e (cherry picked from commit e7c6301e707fcc461bdda5ac74c7499f568ff716) Reviewed-on: https://gerrit.libreoffice.org/39362 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-04tdf#101821 sw: layout: don't move endnotes into footnotes' containerMichael Stahl1-1/+2
The bugdoc has a single 1-column section from start to end, no footnotes but lots of endnotes, and the section has the settings "Footnotes - collect at end of text" unchecked and "Endnotes - collect at end of section" checked. This means that the SwFootnoteContFrame for footnotes would be put directly below the SwPageFrame (so that multiple sections on a single page can share it), but the SwFootnoteContFrame for the endnotes is put below the SwColumnFrame (which is created despite only 1 column) below the SwSectionFrame. Hence content in endnotes has the mbInfSct flag set, and the crash happens because the endnotes are moved from below the SwSectionFrame to a new SwFootnoteContFrame that is directly below a SwPageFrame, without clearing the mbInfSct flag. Fix the wrong call in SwFootnoteBossFrame::MoveFootnotes_() to FindFootnoteBossFrame() that resulted in the wrong (unsuitable for endnotes) SwFootnoteContFrame to be used as the target for the move. Change-Id: I64f6b86441e5ac1f16433f005e97c274a1c69dfa (cherry picked from commit 4c0b3520b66477334a7971dbed7ffcdcd265e749) Reviewed-on: https://gerrit.libreoffice.org/39101 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-04Revert "Workaround to call /app/bin/xdg-open when run under flatpak"Stephan Bergmann1-6/+1
This reverts commit 28a03248b1d1649e157b788e43dfe8326f165379 (and removes a stry empty line). There is no more need for our own /app/bin/xdg-open, as xdg-open in the freedesktop.org (and thus also GNOME) runtime (see <https://github.com/flatpak/flatpak-xdg-utils/blob/master/src/xdg-open.c>) by now knows to ask the Desktop portal, too. Change-Id: Ie4141d02ba5f43c0264afcfae9edfc2d3a8cdb16 (cherry picked from commit da5356b099c2504b3e9238f1afce410233847f9d) Reviewed-on: https://gerrit.libreoffice.org/39483 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-07-04tdf#108789: branch 5.4 onlyLionel Elie Mamane7-86/+221
- Calc: make the complete "what encoding to use" decision before calling the connectivity driver, so that the driver has no ambiguity about whether it should override our setting or not. To this end, factorise the part of the driver that reads the encoding from the file header into dbtools. - Calc: don't ask for encoding when the file's header give the encoding. - don't confuse CP850 (the default) and "don't know", including: * don't ignore CP850 user setting * don't overwrite user setting with CP850 Cherry-pick: - https://cgit.freedesktop.org/libreoffice/core/commit/?id=7f1465a9599e9665159dd2d823a6e9064cca5703 - https://cgit.freedesktop.org/libreoffice/core/commit/?id=857d64ed3ebbeb0ee4e8a75bfeaa4eb406944571 - https://cgit.freedesktop.org/libreoffice/core/commit/?id=9170d10cc57c3f0f3e82b27ce4b2cd9c897e669d Change-Id: Id80b7c505858b88f717b0ce6bd890527909e5fd1 Reviewed-on: https://gerrit.libreoffice.org/39451 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Jenkins <ci@libreoffice.org>
2017-07-04tdf#108609 rtl mode set on ruler when it should be ltrNoel Grandin1-1/+1
regression from commit 8ccbc16b5e3f94b8db105232d7085a8553e6bc03 "convert SvxFrameDirection to scoped enum" Change-Id: I2063ddf4344fb41b54f2ad96a471df4d3205406d Reviewed-on: https://gerrit.libreoffice.org/39478 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit eb104a28daf5b17f24c95da637fc292593eea99b) Reviewed-on: https://gerrit.libreoffice.org/39485 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-03handle SID_ENCRYPTIONDATA for shared password protected docs, tdf#56173Markus Mohrhard1-0/+7
Change-Id: Iadfe880b7be3186410a08568844d8812f176005d Reviewed-on: https://gerrit.libreoffice.org/39332 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 669c12d59b6131f44945f166c77ae98df52ebb9e) Reviewed-on: https://gerrit.libreoffice.org/39336 Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-03fix crash on windows with nullptr in operator<<Markus Mohrhard2-0/+13
E.g. http://crashreport.libreoffice.org/stats/crash_details/8962b764-6550-45c9-b08b-e99f5c968d61 Change-Id: I1153c0ab35266006ada10611e79b770ef1c0cd4f Reviewed-on: https://gerrit.libreoffice.org/39413 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/39424 Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-03always import page scaling, tdf#65848Markus Mohrhard1-1/+1
Change-Id: If5bad2336443280dd33d750b1b2749a06f2b5101 Reviewed-on: https://gerrit.libreoffice.org/39334 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit fef72f9623bac7f9aa50b4f2606e6ec6282cfe1f) Reviewed-on: https://gerrit.libreoffice.org/39339 Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-03we need gpgme header, tooLionel Elie Mamane1-0/+2
not only gpgmepp headers Change-Id: I46723ce751d631e165982c6c7bc2f820f9a5d0a8 Reviewed-on: https://gerrit.libreoffice.org/39484 Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Rene Engelhard <rene@debian.org>
2017-07-03tdf#108622: use correct type for last check timestamp during autocorrectAron Budea2-2/+2
It's only supposed to check the files once every 2-mins, with mismatching type that happens each time. Change-Id: Ie9243cf928d952e28989dd981508de86cb7dbddb Reviewed-on: https://gerrit.libreoffice.org/39428 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 51f616ddd7a2e3310e1b30dbd73d90e5138980ea) Reviewed-on: https://gerrit.libreoffice.org/39443
2017-07-03pBASM can be nullptr in copy docs, e.g. during insert sheet from docMarkus Mohrhard1-0/+3
Found through http://crashreport.libreoffice.org/stats/crash_details/3bd264ba-ec12-476a-9bb4-e832caca3445 Change-Id: I0a4e6dddca61a2538c0fe6bbc51770a9886c464d Reviewed-on: https://gerrit.libreoffice.org/39411 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit caf1ddedbef77ac648d8b8b35978a0613aa77da6) Reviewed-on: https://gerrit.libreoffice.org/39423 Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-03fix SDK paths (especially cat/sed) in bin/distro-install-sdkRene Engelhard1-5/+5
wonder how that ever worked. cat and sed are in /bin, not /usr/bin. Appparetly the BSDs have them there, though, so generalize though this is for distros and it probably shouldn't matter. Change-Id: I6efb3e92b8f8d15f3671090a3eaa9d8836f9998f Reviewed-on: https://gerrit.libreoffice.org/39276 Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Rene Engelhard <rene@debian.org> Reviewed-on: https://gerrit.libreoffice.org/39447 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-07-03Updated coreOlivier Hallot1-0/+0
Project: help 610919cb26ee24329ca3ba90d0b3074fcc1acef1 tdf#108871 Fix embed of RAWSUBTRACT in Help Fix also COLOR. Change-Id: I159b20f36e1452864fa466584ff2de283251f11c Reviewed-on: https://gerrit.libreoffice.org/39459 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2017-07-02xmlsecurity: avoid crash on empty security contextThorsten Behrens1-0/+2
This should prevent 8cf224c2-f9b9-44e1-9cb0-fc452e570886 Change-Id: I1ad4d8437923eb677d574c2c469cc62378c9c7a6 Reviewed-on: https://gerrit.libreoffice.org/39430 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 01985fd8fccf46749b74ee733391ce8b6ec1f1f8) Reviewed-on: https://gerrit.libreoffice.org/39444
2017-07-02Resolves: tdf#108796 let ScViewData::InsertTabs() insert the correct amountEike Rathke1-1/+1
... at the correct position. This only ever worked by chance, if at all, and now surfaced after commit 73dec49802ef8fc42c5719efaa42a33cde68e569 Date: Tue Mar 7 10:46:12 2017 +0100 Change-Id: I9bd0aeb5a471bd644c1497306effe9045c1daa97 (cherry picked from commit c9591f3b6153614c9849b8afbdcacbecc99c1f7c) Reviewed-on: https://gerrit.libreoffice.org/39373 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-07-01tdf#108794 gpg4libre: Use key id to get the right keySamuel Mehrbrodt3-6/+13
Change-Id: I5950d192e19e652cbb7680db426bfbd28907a1cb Reviewed-on: https://gerrit.libreoffice.org/39308 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 0d7b437260ec991ee70769e7fb1002973e431f12) Reviewed-on: https://gerrit.libreoffice.org/39346 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-06-29Don't let m_nGrabLevel become negative, tdf#108705 relatedEike Rathke1-3/+6
... which then later leads to 2 Giga loops on the next GtkSalFrame dtor call, for example on the second AutoFilter button popup in Calc. Fall-out from commit 9b32355ea6d8d5e34363ba0c57e74d75d7a7b1b7 Date: Fri Jun 23 12:48:12 2017 +0100 Resolves: tdf#108705 remove grabs on widget before destroying it that brought this to surface. Change-Id: I0edb7eec9384c716800f07ef1ed91fc8f1d7c119 (cherry picked from commit 637d917d7551fed19c9685f974fb3e732a8f97e2) Reviewed-on: https://gerrit.libreoffice.org/39387 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-29tdf#100075 DOCX frame height rule updatedVasily Melenchuk3-6/+49
According to "[MS-OE376]: Office Implementation Information for ECMA-376 Standards Support" Word treats default value for hRule attribute in a different way: if frame height is missing it is "auto" (as in specification), but if frame height exist, then default value for hRule is "atLeast". Change-Id: I0ce30b61d1a6b85febbbd8a6bf5af3eb1bb2767f Reviewed-on: https://gerrit.libreoffice.org/39065 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit d5b19100ca4d3670d1b5367e8000739af60a6892) Reviewed-on: https://gerrit.libreoffice.org/39384 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-06-28gpg4libre: Don't call production code inside an assert()Samuel Mehrbrodt2-4/+10
Won't work in non-debug builds Change-Id: I64f9c416890ddd02ec8efc0f59ded145cc17896a Reviewed-on: https://gerrit.libreoffice.org/39345 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 9a884b3d055ffdedbadb64c7f14e6d38078dedb1) Reviewed-on: https://gerrit.libreoffice.org/39353 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-06-28tdf#108798 Make CanSignWithGPG work with PDF docsSamuel Mehrbrodt1-1/+1
Change-Id: I09aa030bed3d6ce51ef71d8bab905b01fab5b699 Reviewed-on: https://gerrit.libreoffice.org/39309 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 84dfff475c1f25319bc22c7b6ad437d5501a7dc4) Reviewed-on: https://gerrit.libreoffice.org/39349 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-06-28Updated coreAndras Timar1-0/+0
Project: translations f3390ac0c16dcebcdd148cf7d1549c77995b90ea Updated Slovenian translation Change-Id: I4a3d7f470adb8ca01da3208ff8b56de752c48c27
2017-06-28tdf#108692 gpg4libre: List all gpg keysSamuel Mehrbrodt1-3/+10
Change-Id: I7300da36215233fa91b7a04a42b1c9bf907ad78b (cherry picked from commit 91ffe409e35479d024f629fe1b5ce474993a0f54) Reviewed-on: https://gerrit.libreoffice.org/39163 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-06-28tdf#108711 GPG key selection should only be possible for ODF >= 1.2 documentsSamuel Mehrbrodt4-2/+26
gpg4libre Change-Id: I6dbdaefddacf55c9381d156ada20cb3f25d4b3cb Reviewed-on: https://gerrit.libreoffice.org/39263 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit e2378bbf4539455e445205ad868c43246ec423ed) Reviewed-on: https://gerrit.libreoffice.org/39287 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-06-28Resolves: tdf#108708 set a min width for calc dropdown combobox buttonCaolán McNamara1-3/+2
Change-Id: I002350170cf30a3347ed0c4e4885109ef194458e Reviewed-on: https://gerrit.libreoffice.org/39179 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-06-27tdf#108814 sfx2: fix crash in sidebar when XUpdateModel not implementedMichael Stahl1-1/+4
com.sun.star.ui.XUpdateModel was added in 5.1 so pre-existing extensions don't implement it. (regression from 0635208edf1cdee4235ea87666a473ac81007555) Change-Id: I6749a9cf2fc82b9cd90d85a682247104e369e167 (cherry picked from commit d109948f0dd4190d7aca1e0fa7e2706ef3f40a6c) Reviewed-on: https://gerrit.libreoffice.org/39311 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-06-27gpg4libre: import public key payload if initial validation failsThorsten Behrens1-4/+59
Since maybe we don't know the key yet? Change-Id: I8b7e3f472d4731d9fb8bb675d81bdad257aa9230 Reviewed-on: https://gerrit.libreoffice.org/39194 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 2274deda0185f2f4b153a16f46a6a668394d3458) Reviewed-on: https://gerrit.libreoffice.org/39236 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-06-27gpg4libre: save some space, extract binary key/sign dataThorsten Behrens2-1/+7
Since callers will base64-encode this anyway, again Reviewed-on: https://gerrit.libreoffice.org/39193 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 72e7cfd776dee2edfa513f8f1a8f45136de1d8ba) Change-Id: I0962d102fa0f2b95eaa2e608539cc291125f0321 Reviewed-on: https://gerrit.libreoffice.org/39237 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-06-27gpg4libre: Warn before removing document signaturesKatarina Behrens3-1/+18
simple version, no "do not show this message again" checkbox Change-Id: Iba8ac8cda51acac748174c864aa5c205f2efcc8f Reviewed-on: https://gerrit.libreoffice.org/38962 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 7be0d5490517d41c20f99a006edb9fa651ce3d85) Reviewed-on: https://gerrit.libreoffice.org/39147 Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com> Reviewed-by: Sophie Gautier <gautier.sophie@gmail.com>
2017-06-27gpg4libre: Show certificate kind OpenPGP vs. X509 as 1 table columnKatarina Behrens4-4/+32
Shuffled the columns around a little bit Change-Id: Ib0a979458db680d712737ff997e1c3b4e4564f3f Reviewed-on: https://gerrit.libreoffice.org/38984 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 72f84c1a0efbce8da02cbf6d5947d2ddfd45c533) Reviewed-on: https://gerrit.libreoffice.org/39148 Reviewed-by: Sophie Gautier <gautier.sophie@gmail.com> Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>
2017-06-26ofz#2392 restored props don't match saved propsCaolán McNamara1-2/+13
Change-Id: Idb198f0121ac9c6b4083b157af07c5eb1cda66cb Reviewed-on: https://gerrit.libreoffice.org/39266 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-26gpg4libre: base64-encode and decode SignatureValueThorsten Behrens1-4/+17
which xmldsig-core actually requires Change-Id: I92a6e192865919d844009be042dad36106a19fc8 Reviewed-on: https://gerrit.libreoffice.org/39192 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 52b3ae1c08803fe370960f80668e3fb715617358) Reviewed-on: https://gerrit.libreoffice.org/39231 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-06-26gpp4libre: error handling, proper key extractionThorsten Behrens1-2/+10
Change-Id: I1cb219f825393309219a4ebfb406482050b91228 Reviewed-on: https://gerrit.libreoffice.org/39191 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 879fea59a0bcc1a439e51ab0923e1cc41dff5bfb) Reviewed-on: https://gerrit.libreoffice.org/39230 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-06-26tdf#98800 Enable Next button on the third page of the MM WizardGabor Kelemen1-0/+1
This seems to enable and disable the Next button even if the 'This page shall' checkbox is already enabled after a previous run. Change-Id: I9cba7649b9cd1df110c5a120d4eea3d97b3afcf1 Reviewed-on: https://gerrit.libreoffice.org/38553 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 511c16bd8c8671f43d2ff93f845209e733c6ae4d) Reviewed-on: https://gerrit.libreoffice.org/39207
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-16 07:27:00 +0000