summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-07-30bump product version to 5.3.5.2.0+libreoffice-5-3-5Christian Lohmaier
Change-Id: Ifb724727fa6548e204eb90a1c2c8f720c46f2a3b
2017-07-30update creditsChristian Lohmaier
Change-Id: I13b07b0a60fdb9fdf736431c6af87d2c2d123182 (cherry picked from commit b1fd54a408602126003ffd5032fb86e95b2744cb) (cherry picked from commit 8cfb5788cc602e0a81ae47832c65cf2402471034)
2017-07-30fix getrandom check in expat's configureChristian Lohmaier
https://github.com/libexpat/libexpat/issues/52 fixes /usr/include/sys/random.h:37:22: error: expected ')' misdetection of random.h feature, already fixed upstream: https://github.com/libexpat/libexpat/commit/602e6c78ca750c082b72f8cdf4a38839b312959f (cherry picked from commit f78ed1ec528604f6db9bdd2a07462c5e99e0ab99) Change-Id: I65e4aebaa838d2931a60cb34806d87b88861c4d8 Reviewed-on: https://gerrit.libreoffice.org/39909 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-07-30Updated coreChristian Lohmaier
Project: translations 980c539fa748c2eb777c0bd6844e0b1fa8ad2c08 update translations for 5.3.5 rc2 and force-fix errors using pocheck Change-Id: Icc4677c5377b3e2c1fd4d838f2fed4d9cdb219de (cherry picked from commit 16f34f6b436d7ce6d79a913fe8b34abe33f73107)
2017-07-30tdf#107975: Revert "fix deleting an image anchored to last paragraphMichael Stahl
... in document" This reverts commit 2903d85d6197829633d7f96c95cd55821c2c20ff. It was a good idea, but is not complete. Change-Id: Ia0da2640889ce6e78b89b27c75fae9d6508afd40 (cherry picked from commit 14d2255cbd254dea6e87a04f747e7d6d3d54ceb9) Reviewed-on: https://gerrit.libreoffice.org/40191 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 1450f9f56c2053a1584f2f1a9e40c54971b57edd) Reviewed-on: https://gerrit.libreoffice.org/40218 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-07-30Blind fix tdf#108612 explicitly checking for and against clipboard documentEike Rathke
This is a combination of 2 commits. Attempt to blind fix tdf#108612 explicitly checking for clipboard document It seems that for some yet unknown reason in an (un)certain constellation ScDocument::IsClipboardSource() returns true because ScModule::GetClipDoc() does not return the clipboard document but the actual document instead, so destroying the clipboard document executes ScDocument::ClosingClipboardSource() and (or in earlier versions) ScDocument::ForgetNoteCaptions() on the actual document instead. Check also that ScDocument::bIsClip is set, hopefully curing the symptom, the real cause is something else. (cherry picked from commit d5020f35aec54f0241fa58557dc6caadc149f5a9) Another attempt to blind fix tdf#108612 Oddly in that scenario on Windows there are two clipboard documents alive when destroying one, so the destroyed one erroneously is said to be a clipboard source and then detachs the comments' caption information. There's no legit case where a clipboard document could actually be the real original source of another clipboard document, so bail out if the caller already is one. (cherry picked from commit 52e09f2c03f7cc024b2973c4806283c324fc23df) 0f8d240d8ec13bf91b77176dc6439a541cf14eaa Change-Id: I5ffd0706592d2737808e7004630a56c53115295b Reviewed-on: https://gerrit.libreoffice.org/40252 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-07-30Resolves: tdf#75650 reset boolean number format to General for new formulaEike Rathke
Change-Id: Iec2feefcbb5a92c64f182d93b4055fc009dbe1e5 (cherry picked from commit 1c1783864a356a4394f80dec28db939f4cf572cd) Reviewed-on: https://gerrit.libreoffice.org/40055 Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-07-30tdf#108758 : do not write to undo document when...Dennis Francis
...updating references during a block move, for formula cells that are in the target range of the move operation. The fix is for formula cells that are not grouped. For the grouped case, it was already doing correctly. Added two unit tests in ucalc_formula.cxx for grouped formula and non-grouped formula cases. Reviewed-on: https://gerrit.libreoffice.org/39883 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 2caaf9bfe8d3f81517467daf36de0bd8ddd6b543) Conflicts: sc/qa/unit/ucalc.hxx sc/qa/unit/ucalc_formula.cxx Backported, excluding conflicting unit tests. Change-Id: I9f4d988f5e154f56670bd1c0cc366ee6704fb858 Reviewed-on: https://gerrit.libreoffice.org/39924 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-07-26Resolves: tdf#104186 spaces between function name and ( not allowed in OOXMLEike Rathke
(cherry picked from commit 7232980be6a4d67ed28a21b74ef3544cacb29d6a) Conflicts: formula/source/core/api/FormulaCompiler.cxx Backported. Change-Id: I6f6fcdab24a426d0f62052fa2d31f4098d1d893a Reviewed-on: https://gerrit.libreoffice.org/40088 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-07-21update credits - with aliases fixedChristian Lohmaier
Change-Id: I486428da5459e758d23dd58b189b539896886c4c (cherry picked from commit c48f659a38af4da57cd1c978f17f2598de19156a) (cherry picked from commit ef1d2ab292ec912d4e17bc45ff3b42f59ee5b405)
2017-07-21update creditsChristian Lohmaier
Change-Id: I3d2a7bd97c085c68dc5036b6cb3731c24ed63aa2 (cherry picked from commit 8f338d85a576dcc636907ce036cb34559e9c7e36) (cherry picked from commit 4d26a07058deb514c8e6602261ddf94828c7f7cb)
2017-07-12bump product version to 5.3.5.1.0+Christian Lohmaier
Change-Id: Id824929a029213f513f087bce73e3a74333c0db2
2017-07-12Branch libreoffice-5-3-5Christian Lohmaier
This is 'libreoffice-5-3-5' - the stable branch for the 5.3.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.3.x release, please use the 'libreoffice-5-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I68a4cfe54c0da057befc5c4c08fd21f0cea10b40
2017-07-12tdf#109050: Moving table object with ALT+Arrow keys does not work properlyTamás Zolnai
ALT+up/down behaves differently inside a table: cursor is moved to the left/right neighbouring cell instead of up/down. However when the whole table is selected a different behavior is expected: moving the table as an object. Change-Id: I82c7a3cc7d215b21f19fbf08dcdb7318a7e75289 Reviewed-on: https://gerrit.libreoffice.org/39810 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit f5637ae74ad6bb517255510a8ae786fd2a3cf977) Reviewed-on: https://gerrit.libreoffice.org/39838 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-07-12Updated coreChristian Lohmaier
Project: translations 8eeccc691033fa674c801d5d60933ca5df30714a update translations and force-fix errors using pocheck also update po files for low-completion-ratio (<10% in UI) langs Change-Id: I4dd21a88ccaabe2fa2bc9afa405a1aacf8a4b74e
2017-07-11Resolves: tdf#105740 select without selecting.. tdf#101588 b0rkEike Rathke
The initial color, if determined, must result in being selected. Differentiate between pre-selected and user-selected. Regression of commit 429be969b39867d6d9f36978c9ac15b601e78ba6 Date: Mon Dec 12 21:24:20 2016 +0100 Change-Id: I928af131d03c61a8e474e5cd356aea8b766112fa (cherry picked from commit aee66aa85e75f67135e5c6079a281e18402d261a) Reviewed-on: https://gerrit.libreoffice.org/39026 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-07-11tdf#103355 Hide Notebookbar during slide showSzymon Kłos
Change-Id: Ie3e1b9f9dfc109ecb48cd384972dfa5a5118c3fa Reviewed-on: https://gerrit.libreoffice.org/34401 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <eszkadev@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/38898 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-07-11make opengl transitions under X flicker free on enter/leaveCaolán McNamara
Change-Id: I109637dc6b3d23c0beca21f3cf0c7ba918ecb4f8 Reviewed-on: https://gerrit.libreoffice.org/38749 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 277395b6266c57a7709c3c47986f135f6789c8e7) Reviewed-on: https://gerrit.libreoffice.org/38753 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-11tdf#101821 sw: fix layout footnote use-after-freeMichael Stahl
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/39105 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-11tdf#108838 accessibility: fix horrible memory leak in AccessibleTabBarBaseMichael Stahl
Reproducing tdf#108833 failed because applying the Master Page takes > 2 hours; the time is spent calling vcl::Window listeners, of which there were some 39525 after a couple minutes, almost all of which AccessibleTabBarBase. AccessibleTabBarBase::WindowEventListener() has an inverted condition that suppresses the event that is generated from TabBar::Clear() and thus when DrawViewShell::ResetActualPage() calls Clear() no AccessibleTabBarPage is removed but then the InsertPage() calls create duplicate objects that again register as listeners. The condition is obviously inverted given the CVS commit message: 1.2.88.1 log @#135353# do not pass VCLEVENT_TABBAR_PAGEREMOVED (all) to objects other than AccessibleTabBarPageList @ text a69 8 if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) && ( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() == TAB_PAGE_NOTFOUND ) && ( dynamic_cast< AccessibleTabBarPageList *> (this) != NULL ) ) { return 0; } Change-Id: I2a3b86bbd0f0251a966f41b316a3b313517df24f (cherry picked from commit b2b085441dc79fb78607dbf1969c12a40db58214) Reviewed-on: https://gerrit.libreoffice.org/39416 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-11sw: fix use-after-free in SwAccessibleMap::FireEvents()Michael Stahl
As seen when running JunitTest_sw_unoapi_3 against "make debugrun", the damn thing can call itself recursively via an odd corner case in GetContext(): 0 in SwAccessibleEventList_Impl::~SwAccessibleEventList_Impl() (this=0x9a6a170, __in_chrg=<optimized out>) at sw/source/core/access/accmap.cxx:498 1 in SwAccessibleMap::FireEvents() (this=0x8198bb0) at sw/source/core/access/accmap.cxx:3023 2 in SwAccessibleMap::InvalidateCursorPosition(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> const&) (this=0x8198bb0, rAcc=uno::Reference to (SwAccessibleParagraph *) 0x9a439d8) at sw/source/core/access/accmap.cxx:1069 3 in SwAccessibleMap::GetContext(SwFrame const*, bool) (this=0x8198bb0, pFrame=0x825ca10, bCreate=true) at sw/source/core/access/accmap.cxx:1925 4 in SwAccessibleMap::GetContextImpl(SwFrame const*, bool) (this=0x8198bb0, pFrame=0x825ca10, bCreate=true) at sw/source/core/access/accmap.cxx:1936 5 in SwAccessibleContext::InvalidateChildPosOrSize(sw::access::SwAccessibleChild const&, SwRect const&) (this=0x405a350, rChildFrameOrObj=..., rOldFrame=SwRect = {...}) at sw/source/core/access/acccontext.cxx:1196 6 in SwAccessibleMap::FireEvent(SwAccessibleEvent_Impl const&) (this=0x8198bb0, rEvent=...) at sw/source/core/access/accmap.cxx:898 7 in SwAccessibleMap::FireEvents() (this=0x8198bb0) at sw/source/core/access/accmap.cxx:3018 8 in SwViewShellImp::FireAccessibleEvents() (this=0x7744dc0) at sw/source/core/view/viewimp.cxx:460 9 in SwLayIdle::SwLayIdle(SwRootFrame*, SwViewShellImp*) (this=0x7ffc63395e30, pRt=0x7745120, pI=0x7744dc0) at sw/source/core/layout/layact.cxx:2267 Presumably all of mpEvents, mpEventMap and mpShapes must live until the outermost FireEvents() completes. Change-Id: I4e5a053035bf7fc12d9407913437d721889950ae (cherry picked from commit ddf8d9a150e3e1725de65577c48d47918b4b11a8) Reviewed-on: https://gerrit.libreoffice.org/39567 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-11svx: assert on undisposed AbstractSvxHpLinkDlgMichael Stahl
3 in () at /lib64/libc.so.6 4 in VclPtr<AbstractSvxHpLinkDlg>::~VclPtr() (this=0x88d47e8, __in_chrg=<optimized out>) at include/vcl/vclptr.hxx:115 5 in SvxHlinkDlgWrapper::~SvxHlinkDlgWrapper() (this=0x88d47a0, __in_chrg=<optimized out>) at include/svx/hyperdlg.hxx:34 6 in SvxHlinkDlgWrapper::~SvxHlinkDlgWrapper() (this=0x88d47a0, __in_chrg=<optimized out>) at include/svx/hyperdlg.hxx:34 7 in SfxChildWindow::Destroy() (this=0x88d47a0) at sfx2/source/appl/childwin.cxx:182 8 in SfxWorkWindow::RemoveChildWin_Impl(SfxChildWin_Impl*) (this=0x6c83940, pCW=0x683bc20) at sfx2/source/appl/workwin.cxx:1425 9 in SfxWorkWindow::ToggleChildWindow_Impl(unsigned short, bool) (this=0x6c83940, nId=5678, bSetFocus=true) at sfx2/source/appl/workwin.cxx:1832 10 in SfxViewFrame::ToggleChildWindow(unsigned short) (this=0x6afdae0, nId=5678) at sfx2/source/view/viewfrm.cxx:2964 Change-Id: I84a1ba817dc8449dc1942b6ebd443ec955e8c622 (cherry picked from commit 07341af48ed8ec2368aee87d120942f3e6bb6d49) Reviewed-on: https://gerrit.libreoffice.org/39805 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-11Resolves: tdf#108452 gtk3 xbm cursors invisible on black bgCaolán McNamara
Change-Id: I5c9b27862da6ac76ae38542f85a51f9aefdd013d Reviewed-on: https://gerrit.libreoffice.org/39113 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-07-11tdf#107666: EDITING: No caret outside the textbox after inserting a textboxTamás Zolnai
This reverts commit 44555103217df34b218787f3dc6a2634b41fe52e. Now revert the related commit, need to revisit the original bug later. Change-Id: I08f42c4e859277ab411e4be5ad065fe3cca8bbb6 Reviewed-on: https://gerrit.libreoffice.org/38924 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-07-10tdf#108925: Too small bullet size confuses the userTamás Zolnai
Add a constraint for bullet relative size to avoid too small bullets which are hardly recognizable. Use the same 25% lower limit what MSO uses. Reviewed-on: https://gerrit.libreoffice.org/39696 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 11652be4071ef6d1d89b2c397aa1a32476e03bf6) Change-Id: Id956ecf3ec831c569188b944be58da03bf30a55e Reviewed-on: https://gerrit.libreoffice.org/39709 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2017-07-10Fix tdf#106029 - Add setting XML_doNotExpandShiftReturn when exporting to docxnikki
Change-Id: Ie8ffb0f2d5444c6ead13bdc894715c5a2e6d0baa Reviewed-on: https://gerrit.libreoffice.org/36485 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 9ad9c5183f348384b62ec88459a3a5922e423d83) Reviewed-on: https://gerrit.libreoffice.org/39749
2017-07-09tdf#79304 - Handle CrossedOutItems in HTML export.Sean Stangl
Change-Id: I766fedb34737a1a7815693bf496fa08c08f492b1 Reviewed-on: https://gerrit.libreoffice.org/39719 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 2f2eba56d1f8ec5cdcadb4852e8856858477c008) Reviewed-on: https://gerrit.libreoffice.org/39722 Tested-by: Jenkins <ci@libreoffice.org>
2017-07-07tdf#104640, tdf#108469: Insert image where the cursor isXisco Fauli
Partially revert 72a4987434368bfb0b15f5ebb70a52 Besides, add bDelta to the condition so the statement is false if the image is resized Change-Id: Ib07d328e040c38c63a30f6230ed9f6b605d76d9f Reviewed-on: https://gerrit.libreoffice.org/38705 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 3919d87210ea12ed3166c649ac52730026db01a4) Reviewed-on: https://gerrit.libreoffice.org/38772 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-07-06ofz: stay inside stringCaolán McNamara
Change-Id: Ia0d0ddfce4ee3d5f8763be6804fe52c514375bb3 Reviewed-on: https://gerrit.libreoffice.org/39629 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 073a2b2aef5c0b579aea8ed203dd9c1c5790b650) Reviewed-on: https://gerrit.libreoffice.org/39645 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-07-06ofz#2452 use shared_ptr for cshapeCaolán McNamara
Change-Id: Icf576c08b3502ea3e24fa4b3685b55f794e844db Reviewed-on: https://gerrit.libreoffice.org/39652 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-07-06backport various ofz findingsCaolán McNamara
hwp: avoid low hanging invalid input Change-Id: I06133d6db14edb9d915c38e4c120a9d0905495dd (cherry picked from commit b9483aacadf443e57f7708f8db64aeeba4666f2a) ofz#711: direct leak Change-Id: I65ec47b4290d845f1803b20b93f149d35d9a60ea (cherry picked from commit 86463ec54dcdc562121bdb57b1ac4e85b135b2df) ofz: ReadBlock has to be HWPIDLen to be useful Change-Id: Iaa349921972bb19b40bf68c6a3b0c7128cff4b8d (cherry picked from commit 425572b9d510cee805dc4160d7e81887d8f27577) ofz: oom in reading hwp data Change-Id: I1e4dc5f474b229d4d68d3fc34bc23c88767e5e50 (cherry picked from commit 76201c60a9162804b502726a0150ca925ee08719) Missing include Change-Id: I2fb82e3c5a9b26b1016cf99e943cf0cc30225495 (cherry picked from commit 64cca8d6237ef90c3b222df36de257dbb859d99e) ofz#860 clear old data before reading new data Change-Id: I3bf5c2072a328052004c4c0551c2b125cb8ab19b Reviewed-on: https://gerrit.libreoffice.org/35165 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 65dcd1d8195069c8c8acb3a188b8e5616c51029c) treat ParaShape like CharShape (cherry picked from commit 00aeabb61d1d535684b05145bcc98a8d8a3e10ab) Change-Id: I7870fdeee6bd097c94d7ae58b67506c4ab2a6fb5 Reviewed-on: https://gerrit.libreoffice.org/39651 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-07-06tdf#108789 quick fix for 5.3 branch onlyJulien Nabet
Change-Id: Ib3a9475a6eec1551a77fb5b5994ec1073f275708 Reviewed-on: https://gerrit.libreoffice.org/39449 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Jenkins <ci@libreoffice.org>
2017-07-06tdf#108873 fix merge data handling in fieldsJan-Marek Glogowski
This is a regression from tdf#70346 / commit 4851cde7b98226b0f82ae2b191c290173e9b06c6 It added the whole DB row as variables to the SwCalc hash set. This works correct for conditionals when hiding sections, but not for conditionals used in fields - actually they break. Previously the field would do a fallback to query the DB again, if no variable was in the dict and the only possible variables in the dict could have been user-defined fields. This handles the added variables correctly for fields. Also fixes a bug to store the DB number values as number variables and adds the record number, as SwCalc::VarLook does. Change-Id: Ib0dbeda68234e671768ede55b2012235a3680276 Reviewed-on: https://gerrit.libreoffice.org/39509 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit f54c6938f73b94fb6f722f3ea68454fee424e62e) Reviewed-on: https://gerrit.libreoffice.org/39613
2017-07-05Set error on more than max params (255) per functionEike Rathke
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/39506 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-07-04tdf#107976 sw: let a view handle multiple transferablesMiklos Vajna
Otherwise only the last transferable gets unregistered on closing the view, which means a use-after-free when trying to paste something copied from a closed document. (cherry picked from commit 336f893c57c3c0281d4899629ad55603837d5d40) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx sw/source/uibase/inc/uivwimp.hxx Change-Id: I65594e07fa4fefe7ae51a12455b755d64700a00d Reviewed-on: https://gerrit.libreoffice.org/39499 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-07-04tdf#101821 sw: layout: don't move endnotes into footnotes' containerMichael Stahl
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/39104 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-03handle SID_ENCRYPTIONDATA for shared password protected docs, tdf#56173Markus Mohrhard
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/39337 Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-03fix crash on windows with nullptr in operator<<Markus Mohrhard
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/39425 Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-03always import page scaling, tdf#65848Markus Mohrhard
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/39340 Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-03tdf#108622: use correct type for last check timestamp during autocorrectAron Budea
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> Reviewed-on: https://gerrit.libreoffice.org/39467
2017-07-03pBASM can be nullptr in copy docs, e.g. during insert sheet from docMarkus Mohrhard
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> Reviewed-on: https://gerrit.libreoffice.org/39426 Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-02Resolves: tdf#108671 mark named expression single reference #REF! if deletedEike Rathke
Probably broken already since commit f77c9d5b3cb65d9c2e2417f60bec1113feac50e1 Date: Mon Jul 29 14:47:07 2013 -0400 Change-Id: If90a959d000a1bf5ab0804deb22d5cfad413ea5e (cherry picked from commit 6580e171ad054dca38f55822e67a400191cecdf5) Reviewed-on: https://gerrit.libreoffice.org/39072 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-06-30Resolves: tdf#107959 SdrGrafObj leak triggers later crashCaolán McNamara
if the graphic doesn't change, then the cloned SdrGrafObj persists beyond stylesheet destruction and blows up Change-Id: I0013e7e118985c1334ab460507bc5c8271700160 (cherry picked from commit 118401aae4516bf4cc122e96b376d129ab3a3d5e) (cherry picked from commit e4db2fc10ba4447fa5393853d0cfed795b260f0b) Reviewed-on: https://gerrit.libreoffice.org/39261 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-29Don't let m_nGrabLevel become negative, tdf#108705 relatedEike Rathke
... 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/39388 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-27tdf#108814 sfx2: fix crash in sidebar when XUpdateModel not implementedMichael Stahl
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/39312 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-06-27Resolves: tdf#108419 use spinfield preferred size as transparency widget sizeCaolán McNamara
Change-Id: I7b5c8aeb087efe007c687dc1f206bcb0e8b0173e Reviewed-on: https://gerrit.libreoffice.org/38866 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-06-26ofz#2392 restored props don't match saved propsCaolán McNamara
Change-Id: Idb198f0121ac9c6b4083b157af07c5eb1cda66cb Reviewed-on: https://gerrit.libreoffice.org/39267 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-06-26tdf#108732 ListBox: in absence of a field, treat data as stringLionel Elie Mamane
so that one meaningfully compare it; default is DataType::OTHER, which is not comparable Change-Id: Ifc1e1c9b801f45d0a95a83d30cc205b91e647880 Reviewed-on: https://gerrit.libreoffice.org/39211 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-06-25Resolves: tdf#108475 swipe only if some reasonable movement was involvedCaolán McNamara
Change-Id: I5ee2a60f80728a2cca1401e43c8e27f852bfc657 Reviewed-on: https://gerrit.libreoffice.org/39118 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2017-06-24tdf#40713: dBASE, don't lose dbt fileJulien Nabet
if aDbtFile corresponds exactly to aTmpFile, we just have to return Reviewed-on: https://gerrit.libreoffice.org/39189 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 36d91a65ab2db0c4c81e09771f6b44e1905122a0) Change-Id: I1dde8efbe01838dc94f6025d5b81f5aee01932ac Reviewed-on: https://gerrit.libreoffice.org/39196 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Jenkins <ci@libreoffice.org>