summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-06-23loplugin:oncevar in cppcanvas..drawinglayerNoel Grandin35-215/+142
Change-Id: I5456aad61fb0dfe6830eae62b91d1a6399d6343f Reviewed-on: https://gerrit.libreoffice.org/39128 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-23loplugin:unusedfields in jvmfwk..mysqlcNoel Grandin12-40/+5
Change-Id: If9c7a3239fceba9a2db3a5905ccaa7fa9adadb08 Reviewed-on: https://gerrit.libreoffice.org/39099 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-23loplugin:unusedfields in registry..saxNoel Grandin12-29/+2
Change-Id: Ie0e2ecaadb49273cb4e78bc894111523940e7c8e Reviewed-on: https://gerrit.libreoffice.org/39098 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-23inline some ERRCODE_AREA aliasesNoel Grandin4-12/+5
and drop unused ERRCODE_AREA_OFA_END constant Change-Id: Ic34ecda7f842c5db93807b3f21aa1062966ca523 Reviewed-on: https://gerrit.libreoffice.org/39089 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-23writerfilter: map endnote text to EndnoteJustin Luth3-0/+7
I'm not exactly sure what role the Endnote Symbol char style plays, but it is only related to Endnote Characters, not the main footnote text. Note: the existing mapping rarely takes effect since MSWord exports the stylename in lower-case. Unfortunately, there is no history to indicate why "Endnote Text" is mapped to "Endnote Symbol". That looks like an error to me. related to tdf#82173 which exposed this issue. Change-Id: Ie92f527b1e594fd571f1118d18a8ff225cfc2314 Reviewed-on: https://gerrit.libreoffice.org/38605 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
2017-06-23tdf#89139: dump pivotField itemsMike Kaganski1-5/+98
This makes the pivot table exported to XLSX refreshable (does not crash Excel on pivot table refresh). Change-Id: Icc35795cd116e091b75bb1d4a603c52ccc71c44d Reviewed-on: https://gerrit.libreoffice.org/39018 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2017-06-23osl: doxygen fixes for headersChris Sherlock13-402/+406
Change-Id: I3f30b5ab985c2ff709116568905b941c5d50fd1a
2017-06-23osl: document osl_mapFile parameters and return valuesChris Sherlock1-0/+28
Change-Id: I307662ef0d8360da3cbc7edc96890575715bbf07
2017-06-23osl: typo from last commitChris Sherlock1-1/+1
Change-Id: I3dce45da77c6ab21be5a999d4ea5b7944a07bbd7
2017-06-22osl: File map flag constants documentedChris Sherlock1-21/+38
Change-Id: I8f02cfdcaa1a5d2ce981b5de1b9754da36760649 Reviewed-on: https://gerrit.libreoffice.org/39124 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2017-06-22tdf#108682 DOCX import: fix <w:spacing w:line=...> for negative valuesMiklos Vajna3-3/+24
I didn't find UI in Word to create <w:spacing w:line="-260" w:lineRule="auto"/> the equivalent markup when you set line spacing to exactly 13pt for new documents is: <w:spacing w:line="260" w:lineRule="exact"/> The OOXML spec and Microsoft's implementer notes ([MS-OI29500]) is also pretty silent about what a negative value means. However, if this markup is converted to WW8 by Word, then the WW8 LPSD structure is like this (as presented by doc-dumper): <lspd type="LSPD" offset="5086"> <dyaLine value="0xfefc"/> <fMultLinespace value="0x1"/> </lspd> For the 0xfefc value the [MS-DOC] spec clearly states that means the type of the spacing is "exactly", with the value of 0x10000-0xfefc, i.e. the same 260 twips. Change-Id: I84b485d02dea49c610b6df2e06ccce03e1d29d21 Reviewed-on: https://gerrit.libreoffice.org/39091 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-22gitignore: compile_commands.jsonMuhammet Kara1-0/+3
This file is generated by "make vim-ide-integration" Change-Id: I9355bc36b2a654efd6183b268662b10b224f2117 Reviewed-on: https://gerrit.libreoffice.org/39108 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-06-22Unit test for named single reference pointing to deleted row, tdf#108671Eike Rathke1-1/+37
Change-Id: Idb22bd00572d362eb2cc0137fe01835d6c28fcf8
2017-06-22expat-2.2.1 patch to allow compile on macOS and othersjan Iversen2-0/+22
xmlparse.c has a #define buffer something later #include something that happens to use buffer as a parameter. Change-Id: I7378aa9481b30364097c70317c794c0bcca2f05c Reviewed-on: https://gerrit.libreoffice.org/39109 Reviewed-by: jan iversen <jani@libreoffice.org> Tested-by: jan iversen <jani@libreoffice.org>
2017-06-22Resolves: tdf#108475 swipe only if some reasonable movement was involvedCaolán McNamara1-1/+3
Change-Id: I5ee2a60f80728a2cca1401e43c8e27f852bfc657 Reviewed-on: https://gerrit.libreoffice.org/39116 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-06-22assert( nX < nC && nY < nR ); cause of tdf#108292Eike Rathke1-0/+1
Change-Id: Iaa23361510b1aa1eebfa6618b526fc7d9d6fa537
2017-06-22Resolves: tdf#108452 gtk3 xbm cursors invisible on black bgCaolán McNamara1-6/+15
Change-Id: I5c9b27862da6ac76ae38542f85a51f9aefdd013d Reviewed-on: https://gerrit.libreoffice.org/39111 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-06-22Add RemoveEntry method to SvTreeListBoxMuhammet Kara2-0/+9
Allows you to remove an entry along with its children without selecting the entry. Change-Id: Ie833df5e0d2d3bc86ed01a70dc6f042ebb6d6a47 Reviewed-on: https://gerrit.libreoffice.org/38971 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-06-22add factory function mapping for libspelllo archivebrainbreaker1-1/+2
Change-Id: I7cbea9381bc993e7894603c731ab0ac54e80d4b4 Reviewed-on: https://gerrit.libreoffice.org/39049 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-22xmlsecurity: 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>
2017-06-22tdf#101821 sw: fix layout footnote use-after-free in SwRootFrameMichael Stahl1-10/+14
The ClearSwLayouterEntries() accesses anchored objects and if they are anchored in footnotes then RemoveFootnotes() has already deleted them. (regression from 962d0500c4debaef43e5f146e47e08c66d851562) Invalid write of size 1 at 0x4143CCB3: SwAnchoredObject::SetTmpConsiderWrapInfluence(bool) (anchoredobject.cxx:739) by 0x414D8A21: SwObjsMarkedAsTmpConsiderWrapInfluence::Clear() (objstmpconsiderwrapinfl.cxx:58) by 0x414C943E: SwLayouter::ClearObjsTmpConsiderWrapInfluence(SwDoc const&) (layouter.cxx:401) by 0x411DBE57: sw::DocumentLayoutManager::ClearSwLayouterEntries() (DocumentLayoutManager.cxx:504) by 0x414D05D9: SwRootFrame::DestroyImpl() (newfrm.cxx:594) by 0x41535AB3: SwFrame::DestroyFrame(SwFrame*) (ssfrm.cxx:389) by 0x419E8171: std::_Sp_counted_deleter<SwRootFrame*, void (*)(SwFrame*), std::allocator<void>, (__gnu_cxx::_Lock_policy)2>::_M_dispose() (shared_ptr_base.h:464) by 0x40EB6DB5: std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release() (shared_ptr_base.h:150) by 0x40EB5E76: std::__shared_count<(__gnu_cxx::_Lock_policy)2>::~__shared_count() (shared_ptr_base.h:662) by 0x419E65F9: std::__shared_ptr<SwRootFrame, (__gnu_cxx::_Lock_policy)2>::~__shared_ptr() (shared_ptr_base.h:928) by 0x419E6615: std::shared_ptr<SwRootFrame>::~shared_ptr() (shared_ptr.h:93) by 0x419E619D: SwViewShell::~SwViewShell() (vnew.cxx:285) Address 0x5feb6eee is 334 bytes inside a block of size 488 free'd at 0x4C2F21A: operator delete(void*) (vg_replace_malloc.c:576) by 0x41488962: SwFlyAtContentFrame::~SwFlyAtContentFrame() (flyfrms.hxx:134) by 0x41535AFC: SwFrame::DestroyFrame(SwFrame*) (ssfrm.cxx:391) by 0x415360BD: SwLayoutFrame::DestroyImpl() (ssfrm.cxx:477) by 0x41535AB3: SwFrame::DestroyFrame(SwFrame*) (ssfrm.cxx:389) by 0x414A2FF4: sw_RemoveFootnotes(SwFootnoteBossFrame*, bool, bool) (ftnfrm.cxx:852) by 0x414A3104: sw_RemoveFootnotes(SwFootnoteBossFrame*, bool, bool) (ftnfrm.cxx:874) by 0x414A321A: SwRootFrame::RemoveFootnotes(SwPageFrame*, bool, bool) (ftnfrm.cxx:897) by 0x414D0558: SwRootFrame::DestroyImpl() (newfrm.cxx:585) by 0x41535AB3: SwFrame::DestroyFrame(SwFrame*) (ssfrm.cxx:389) by 0x419E8171: std::_Sp_counted_deleter<SwRootFrame*, void (*)(SwFrame*), std::allocator<void>, (__gnu_cxx::_Lock_policy)2>::_M_dispose() (shared_ptr_base.h:464) by 0x40EB6DB5: std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release() (shared_ptr_base.h:150) by 0x40EB5E76: std::__shared_count<(__gnu_cxx::_Lock_policy)2>::~__shared_count() (shared_ptr_base.h:662) by 0x419E65F9: std::__shared_ptr<SwRootFrame, (__gnu_cxx::_Lock_policy)2>::~__shared_ptr() (shared_ptr_base.h:928) by 0x419E6615: std::shared_ptr<SwRootFrame>::~shared_ptr() (shared_ptr.h:93) by 0x419E619D: SwViewShell::~SwViewShell() (vnew.cxx:285) Change-Id: I147f46d49c90de46189ad34feed66c289adddc15
2017-06-22Bin a couple way too verbose SAL_INFOsTor Lillqvist1-17/+0
Use temporary SAL_DEBUGs in your local tree instead if/when you need to trace these constructors and destructors. Change-Id: Icc52c905205914f0e5b911a2dae8322e99e9234e
2017-06-22Removed duplicated includeAndrea Gelmini1-1/+0
Change-Id: Ibbd83a7d69a27ab96b99d28e1d4a1f65af63b82f Reviewed-on: https://gerrit.libreoffice.org/39037 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-22Explicit --with-valgrind, to not accidentally miss Valgrind supportStephan Bergmann1-1/+8
Change-Id: If4de6e4cdebb082cbe8faa9392fceb61c3f8fb9e
2017-06-22tdf#39468 Translate some random German comments/termsJens Carl8-8/+8
Change-Id: I38cb79abb2a495ccca454903bc46b407009e8290 Reviewed-on: https://gerrit.libreoffice.org/39084 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-06-22iwyu: add language standard defines to flagsJochen Nitschke1-1/+1
for some reason they are not set and cause parse warnings Change-Id: I1bbc14da8cd7f4cbde8e59934b6ace932245e2a1 Reviewed-on: https://gerrit.libreoffice.org/39093 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-06-22update externals in bin/gen-iwyu-dummy-lib scriptJochen Nitschke1-1/+1
tde and mozilla externals are gone. breakpad, bzip2 and mDNSResponder are omitted. filter out 'orcus-parser\' line, 'orcus-parser' is still in iwyu_EXTERNALS Change-Id: Ida7155b8b00b651146c4307286e9eafbdadb5917 Reviewed-on: https://gerrit.libreoffice.org/39092 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-22reformat bin/gen-iwyu-dummy-lib scriptJochen Nitschke1-43/+49
no logic change intended. follow some shellcheck advises: use block for redirects to same file for better style (SC2129) double quote vars (SC2086) ignore false positive warnings SC1003 and SC2016 Change-Id: Ic3a01484d4d13c8d23662ee24c46b166ee006cd4 Reviewed-on: https://gerrit.libreoffice.org/39090 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-22related: gpg4libre: Init xmlsec in one place before creating the servicesThorsten Behrens1-21/+2
Last holdout for separate xmlSec init removed, cf. ed92db7a50be36fcfe6e9b316f4b7f7570060c0d Change-Id: I46a05074706bba77ebc488f0df296e35e2b7d553
2017-06-22xsec_gpg lib is no more, so don't attempt to package itChristian Lohmaier1-1/+0
removed with 06d7dbb3568889aa50f46d6307a39fa53a17313b Change-Id: I7e01cc1f3551cd18c8fe09e908b6dbab75e2ae2d
2017-06-22Introduce a range-based iterator for 'references' in a FormulaTokenArrayTor Lillqvist4-17/+112
Take it into use in a couple of places. Change-Id: I72127f4236220fbe6fbf9ea25cdd56470be89961 Reviewed-on: https://gerrit.libreoffice.org/38997 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2017-06-22--enable-optimized should be orthogonal to --enable-debug/--enable-dbgutilStephan Bergmann14-17/+42
Change-Id: I277f30129560ea9fa76d6439a60bb191358df99d Reviewed-on: https://gerrit.libreoffice.org/39088 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2017-06-22Revert "Temporary debg output to find out why tinderboxes still don't find ↵Stephan Bergmann1-1/+0
program" This reverts commit d36dc7b3ce28e6fe1590aa7cb72e53e2d745c073. Turns out e.g. tb75-lilith has a 'file' command that doesn't print "execfn:" information, just > /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/workdir/UITest/calc_demo/done.core/core.24697: ELF 64-bit LSB core file x86-64, version 1 (SYSV), SVR4-style, from '/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/instdir/program/soffice' (<https://ci.libreoffice.org/job/lo_tb_master_linux_dbg/13930/console>), but with a truncated "from:" path, so would probably be little benefit to try to get the path from the "from:" instead of (or in addition to) the "execfn:" information (where the latter appears to be more accurate at least with my local file-5.29-4.fc25.x86_64).
2017-06-22Improve tdf#106942: always erase empty/corrupt lockfileJuergen Funk1-2/+4
also when we could not create lockfile, not only when open as readonly Change-Id: Ied53bbfe47669f62553d97d81f0bed156ae58887 Reviewed-on: https://gerrit.libreoffice.org/39054 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-06-22iOS, update menus for menu pickerjan Iversen2-98/+95
Change-Id: Idb4ee77ed83c17f8040cf1a5852ae1ac8fa855d6
2017-06-22Temporary debg output to find out why tinderboxes still don't find programStephan Bergmann1-0/+1
...that dumped a core file. Is it just that the pathname is too long and gets truncated? To be reverted again. Change-Id: I2e571cf7d5d3a128e8875e01df37bfccadefe80a
2017-06-22formula: remove indirection and use unique_ptrJochen Nitschke5-53/+45
Change-Id: Ib0c083803024d223f62b91ec54850b84eb68a758 Reviewed-on: https://gerrit.libreoffice.org/39033 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
2017-06-22sw: dump more connections of those obnoxious footnotes in layout.xmlMichael Stahl1-0/+10
Change-Id: I62caffcacb710aa079ddc9c81fb49f702cdc84af
2017-06-22tdf#101821 sw: fix another layout footnote use-after-freeMichael Stahl1-0/+20
In SwContentFrame::MakeAll() the pPre (previous frame) is deleted in a call to MoveFwd(). This SwTextFrame is inside of a footnote, and the SwFlowFrame::CutTree() for whatever reason wants to format all of the SwTextFrames inside the same SwFootnoteFrame, which causes the pPre to be joined with another one. Let's try to avoid that by checking that it's still in the layout after the call to MoveFwd(); on the one hand it's not obvious that this frame is important enough that it should be kept alive with ForbidDelete(), on the other hand i have no idea if simply removing the ValidateSz() call would introduce new loops or whatever. Invalid read of size 4 at 0x414E8D14: SwFrame::IsSctFrame() const (frame.hxx:1018) by 0x41A85A29: SwContentFrame::MakeAll(OutputDevice*) (calcmove.cxx:1713) by 0x41A7F499: SwFrame::OptPrepareMake() (calcmove.cxx:368) by 0x41ADF0CF: SwFrame::OptCalc() const (frame.hxx:892) by 0x41ADCC07: SwLayAction::FormatContent_(SwContentFrame const*, SwPageFrame const*) (layact.cxx:1789) by 0x41ADC195: SwLayAction::FormatContent(SwPageFrame const*) (layact.cxx:1620) 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 0x530ccf80 is 160 bytes inside a block of size 264 free'd at 0x4C2ED4A: free (vg_replace_malloc.c:530) by 0x4E5BCD0: rtl_freeMemory_SYSTEM(void*) (alloc_global.cxx:271) by 0x4E5C00A: rtl_freeMemory (alloc_global.cxx:341) by 0x4E5AAA0: rtl_cache_free (alloc_cache.cxx:1231) by 0xEFC9A6F: FixedMemPool::Free(void*) (mempool.cxx:49) by 0x41CA7DFA: SwTextFrame::operator delete(void*, unsigned long) (txtfrm.hxx:377) by 0x41C9F7B6: SwTextFrame::~SwTextFrame() (txtfrm.cxx:415) by 0x41B5B74C: SwFrame::DestroyFrame(SwFrame*) (ssfrm.cxx:391) by 0x41C1589A: SwTextFrame::JoinFrame() (frmform.cxx:656) by 0x41C153B1: SwTextFrame::AdjustFollow_(SwTextFormatter&, int, int, unsigned char) (frmform.cxx:555) by 0x41C172E1: SwTextFrame::FormatAdjust(SwTextFormatter&, WidowsAndOrphans&, int, bool) (frmform.cxx:1108) by 0x41C18D5E: SwTextFrame::Format_(SwTextFormatter&, SwTextFormatInfo&, bool) (frmform.cxx:1550) by 0x41C19340: SwTextFrame::Format_(OutputDevice*, SwParaPortion*) (frmform.cxx:1660) by 0x41C19CD8: SwTextFrame::Format(OutputDevice*, SwBorderAttrs const*) (frmform.cxx:1807) by 0x41A847A1: SwContentFrame::MakeAll(OutputDevice*) (calcmove.cxx:1393) by 0x41A7F211: SwFrame::PrepareMake(OutputDevice*) (calcmove.cxx:346) by 0x41B75758: SwFrame::Calc(OutputDevice*) const (trvlfrm.cxx:1761) by 0x41A973E7: SwFlowFrame::CutTree(SwFrame*) (flowfrm.cxx:424) 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 0x41A7F499: SwFrame::OptPrepareMake() (calcmove.cxx:368) by 0x41ADF0CF: SwFrame::OptCalc() const (frame.hxx:892) by 0x41ADCC07: SwLayAction::FormatContent_(SwContentFrame const*, SwPageFrame const*) (layact.cxx:1789) by 0x41ADC195: SwLayAction::FormatContent(SwPageFrame const*) (layact.cxx:1620) 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: I35b27a32608d4dcf98e0933cce76ce5ddb1c09d9
2017-06-22tdf#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
2017-06-22tdf#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
2017-06-22expat: upgrade to release 2.2.1Michael Stahl1-2/+2
fixes CVE-2017-9233 and CVE-2016-9063 Change-Id: Iee70d1265ff4e9dd4d0bff9602bd70b85d6b83f3 Reviewed-on: https://gerrit.libreoffice.org/39078 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-22xmlsecurity: remove newly introduced redundant namespace alias, used only onceMiklos Vajna1-2/+1
Change-Id: Ia93ec62863d16d3cc60878968b79ed0ccc5fba9b
2017-06-22xmlsecurity: fix loplugin:passstuffbyref warningsMiklos Vajna4-4/+4
Change-Id: I627abfe33e9c2fc4243276706c1624ce19943678
2017-06-22xmlsecurity: fix loplugin:unusedvariablecheck warningMiklos Vajna1-1/+0
Change-Id: Ia59a1f00203fbbaad6df460c7cba4a984e206a1c
2017-06-22loplugin:unusedfields in sdextNoel Grandin12-101/+9
Change-Id: Ib4ce46f370298a0ae86fa95141abb253c2bbfff8 Reviewed-on: https://gerrit.libreoffice.org/39058 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-22loplugin:unusedfields in sd part3Noel Grandin25-102/+8
Change-Id: Id8277e4b3dc9776715a7bd85e1a4f6610aad9b19 Reviewed-on: https://gerrit.libreoffice.org/39061 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-22loplugin:unusedfields in sd part2Noel Grandin16-64/+18
Change-Id: I14b34e08d7bb000bce1625bd0d16050b1269f3e8 Reviewed-on: https://gerrit.libreoffice.org/39060 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-22loplugin:unusedfields in sd part1Noel Grandin13-59/+3
Change-Id: I8e25d68eecbc3a96d734d9c10b125aed5d01cbc5 Reviewed-on: https://gerrit.libreoffice.org/39059 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-22loplugin:unusedfields in sw part4Noel Grandin20-76/+3
Change-Id: I1ffd51ab74b2ca809153f07f8de85e9c490749fd Reviewed-on: https://gerrit.libreoffice.org/39042 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>