summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2017-07-04tdf#105095 DOCX import: conditionally ignore leading tab in footnotesMiklos Vajna
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. Change-Id: I9d419bf2fd3b4899208489210cbe9809a2ab0736 Reviewed-on: https://gerrit.libreoffice.org/39490 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-07-04loplugin:casttovoid in VCL_BUILDER_DECL_FACTORYStephan Bergmann
Change-Id: I4b0dd08963cf50daa41901975c6f92fe21db2048
2017-07-03Restore copyright headerSamuel Mehrbrodt
Change-Id: I390ba8851bb16ca37c2af97d2fa0ab6bdf4a9a14 Reviewed-on: https://gerrit.libreoffice.org/39481 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-07-03tdf#108524 sw: attempt to split section frames inside table cells, take twoMiklos Vajna
Tables-in-sections were already split across multiple pages, but not secions-in-tables. To be safe still don't allow sections-in-tables-in-sections, so you can combine these in both orders now, but not recursively. To achieve this, relax two "not in table" conditions to just require "not in a table that is already in a section", and define that in case a section-in-table is to be split, the follow section frame should be inserted under the follow of its cell. With this, finally the section frame in the bugdoc is split into two, and the second section frame is moved to the second page as expected. This restores commit f991b842addddeada6dc45c4054deeca5aa7f17b, but this second take makes sure that we do not crash while laying out ooo61225-1.sxw. GetNextSctLeaf() used to assume that SwTableFrame::Split() created the follow cell frames; and when that wasn't the case, it crashed. Still don't attempt to create the cell frame in GetNextSctLeaf(), but handle when the cell follow frame is missing, and return early, as it used to be the case before this commit. Change-Id: I9dcc76b4c61b39b9d23b140b84420e89cf274cf3 Reviewed-on: https://gerrit.libreoffice.org/39471 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-07-03loplugin:unusedfields bIsMarked in SvTreeListEntryNoel Grandin
write-only since GetIsMarked was removed in commit 06ea347b939895d3091ce747c26de58f4d4a766a "loplugin:unusedmethods svtools" which in was unused since introduced by commit b755fb8c0f6b1282f62c12f378c0a5ecac64d490 Author: Steve Yin <steve_y@apache.org> Date: Mon Nov 25 16:15:58 2013 +0000 Integrate branch of IAccessible2 Change-Id: I1342d4c020e53380f4c52fadcbf36ff520efaad4 Reviewed-on: https://gerrit.libreoffice.org/39470 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-03C++11 remove std::unary_function bases from functorsJochen Nitschke
std::unary_function is deprecated since C++11 and removed in C++17 90% done with regexp magic. removed obsolete <functional> includes. The std::unary_function base class was used in 3 places: * chart2/source/tools/DataSeriesHelper.cxx: lcl_MatchesRole is used in a std::not1 function helper who uses the members return_type and argument_type. - replace deprecated std::not1 with a lambda * chart2/source/tools/ModifyListenerHelper.cxx: lcl_weakReferenceToSame used the argument_type member in the operator() parameter. - inline the parameter type. * xmloff/source/chart/SchXMLExport.cxx: lcl_SequenceToMapElement used result_type and argument_type in operator(). - inline the types Also fix compile error with gcc about finding std::for_each. Change-Id: I073673beb01410c3108e7d0346d9e7d6b9ad2e2f Reviewed-on: https://gerrit.libreoffice.org/39358 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2017-07-03Fix typosAndrea Gelmini
Change-Id: Iaf63c488f895c446bb54119d8c9f15e0adcd1eff Reviewed-on: https://gerrit.libreoffice.org/39454 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-07-03sw: prefix members of TemporarySwapMiklos Vajna
Change-Id: I7792ccb06d25a532605ff8eee1bffe17d41c6ad5
2017-07-03loplugin:unusedfields in swNoel Grandin
Change-Id: I807f93757bfddf17f71568f1e3c174229f169f18 Reviewed-on: https://gerrit.libreoffice.org/39409 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-03use sal_Int64 in tools::DateTimeNoel Grandin
instead of long which has platform-dependent bitlength Change-Id: I888458d7807027e237772940d4b2cc15c2971243 Reviewed-on: https://gerrit.libreoffice.org/39434 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-02loplugin:casttovoid: swStephan Bergmann
Change-Id: I224e9995962901e8740bfaed06d57f7c0389236c
2017-07-02SwInsertChart's parameters are unusedStephan Bergmann
...ever since the function's introduction in 28c9973206e2a97b36bb8343e452d7fda8b0bd5d "INTEGRATION: CWS chart2mst3" Change-Id: I090c8eb5451d29f9f3e04242e7ba27b914f7b3de
2017-07-02WW8SwFlyPara ctor nPgLeft parameter is unusedStephan Bergmann
...ever since its last use in OLD_ANCHORING-conditional code got removed with 2e755e2d09c584e8d7eead5883cf5c13f3752e23 "INTEGRATION: CWS swobjpos04" Change-Id: Ibdbab544bc94667c4f04b5fbd1b1042d165f1fa8
2017-07-02Clean up SwLangHelper::ResetLanguagesStephan Bergmann
Change-Id: Ia6e98eabad2405f6b064e541c800a56bb9ea3a2e
2017-07-02dbg_out(SwRewriter) is unusedStephan Bergmann
Change-Id: I2ebdba0a162bd02d0b36f6577af09b6f95b356d2
2017-07-01tdf#108448 ww8export: endnote unit testJustin Luth
Change-Id: I3559e51c7fe9fedf616857b5ae612b4a8f6c67d5 Reviewed-on: https://gerrit.libreoffice.org/39431 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
2017-07-01tdf#108448 ww8export: skip sectionbreak for endnotesJustin Luth
MSWord ignores page-breaks in endnotes, and just adds endnotes at the end of the last page. LO automatically page-breaks with pageStyle Endnotes. It must be built into the code that handles endnotes. Don't try to export that page-break - it doesn't work anyway. Change-Id: I2f266b20a6fa97d0522878f71fe0a6822833d89c Reviewed-on: https://gerrit.libreoffice.org/38727 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
2017-07-01sw:findtext - remove useless nStart = nProxyStartJustin Luth
...since the clause is immediately followed by nStart = nEnd. Change-Id: I306f6012b4e8f69288d3470214853c17546906e7 Reviewed-on: https://gerrit.libreoffice.org/39359 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
2017-06-29related tdf#82173 writerfilter: ensure Xnote para-style round-trippingJustin Luth
MSO Xnote styles are "footnote text"/"endnote text". LO Xnote styles are "Footnote"/"Endnote", and exports Footnote as "Footnote Text" and Endnote as "Endnote Text" The mapping ensures that the same Xnote style applies to both existing (loaded) notes, as well as newly inserted notes. This patch does two things: 1.) Endnote should not translate into Endnote Symbol. 2.) Prepare for when style mapping becomes case sensitive again Change-Id: I9881c069a3124f83cd0bc2a428577c4a382a8377 Reviewed-on: https://gerrit.libreoffice.org/39395 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
2017-06-29tdf#108836 sw: don't enable Undo if Steps configured to 0Michael Stahl
It doesn't work. Change-Id: Iafc3eb50f481faffee60592aa3b6fd2ed4387b90
2017-06-29improve refcounting lopluginNoel Grandin
to find ref-counted classes being managed via other smart pointer classes. Hopefully prevent needing fixes like 642ae256ea5b8083ba0b3c097ca8ea52304b9cdb "ChangedUIEventListener is refcounted, mustn't be helt by unique_ptr" Change-Id: I6b0c5f8f87ce3546a8a1104ce1000470c09459bd Reviewed-on: https://gerrit.libreoffice.org/39378 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-28Watermark: tdf#91687 correct size in the .docSzymon Kłos
Export: * Watermarks saved using Writer were very small in the MSO. Export fUsegtextFStretch property in the Geometry Text Boolean Properties. * tdf#91687: SnapRect contains size of Watermark after rotation. We have to export size without rotation. Import: * When import set height depending on used font and width. Text will keep the ratio. Remember the padding for export. * added unit test * introduced enum to avoid magic numbers for stretch and best fit properties. Change-Id: I3427afe78488d499f13c543ca401c096161aaf34 Reviewed-on: https://gerrit.libreoffice.org/38979 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2017-06-28SvXMLEmbeddedObjectHelper::Create bDirect parameter is unusedStephan Bergmann
...ever since 63d13cb2ee2c4725599714f6184bcd6e77a1eab7 "#87246#: OLE object support through SAX interface" Change-Id: Ib1d63a3a6adf64e2b5d3a16df5a7c6473d46abfb Reviewed-on: https://gerrit.libreoffice.org/39364 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-06-28sw lok: rename return values UNDO_CONFLICT to SID_REPAIRPACKAGEHenry Castro
To be consistent with sc, sd and sw Change-Id: I273101de6e59be08eb61b1a77647bc1dd26ff387 Reviewed-on: https://gerrit.libreoffice.org/39369 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Henry Castro <hcastro@collabora.com>
2017-06-28sw:findtxt - whitespace cleanupJustin Luth
Change-Id: I4294617a1cc6cf123dd4bb8efd8c233ba782fdfe Reviewed-on: https://gerrit.libreoffice.org/39360 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org>
2017-06-28tdf#108826 sw: also handle RES_REMOVE_UNO_OBJECT in SwCallMouseEventMichael Stahl
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
2017-06-28remove default-able copy ctors and copy operatorsJochen Nitschke
The implicit defined ctors and operators will copy all members (and bases). Since C++11 implicit copy is depreciated if there is a non-default dtor, keep such copies. This commit includes only types that had either copy ctor or copy operator and were found by cppcheck. Change-Id: I93ee687fb3b3c5884f475a2c6054955cdde57ed7 Reviewed-on: https://gerrit.libreoffice.org/39351 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-28-Werror=ignored-qualifiers (GCC 8)Stephan Bergmann
Change-Id: Icc576de378c27764aa50457f8d548564eb4a3aec
2017-06-28-Werror=catch-value= (GCC 8)Stephan Bergmann
Change-Id: I63c264a39bcec5ebd80c73acb55c72713fd706e2
2017-06-28tdf#108714 follow-up: handle deferred break in character groupMike Kaganski
If an out-of-order break happens immediately after a table, then in following paragraph group (before character group start) the table level is > 0, and break is ignored. Since out-of-order break only happens at top level, the following character group necessarily designates a new paragraph group, so it's OK to handle that at the character group level, where table level is already updated. Change-Id: Ic1b1bb89e12407b050c2e880ad971794311845a5 Reviewed-on: https://gerrit.libreoffice.org/39347 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-06-28tdf#107880: Make use of ScopedVclPtrChristian Barth
Make the use of VclPtr<VirtualDevice> exception safe by using ScopedVclPtr<VirtualDevice> when disposeAndClear() is called in same method. Change-Id: I684eb7fb92c2bf16c30e74dce8e691dfca1a1f45 Signed-off-by: Christian Barth <Christian.Barth@zoho.com> Reviewed-on: https://gerrit.libreoffice.org/39321 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-28use std::vector in BigPtrArrayNoel Grandin
Change-Id: Ibf63213eb44ef2bb51042607cbdedcb66181b51a Reviewed-on: https://gerrit.libreoffice.org/39302 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-27tdf#108714: allow <w:br> as direct child of <w:body>Mike Kaganski
LibreOffice doesn't accept <w:br> element as a child of <w:body>. ECMA-376-1:2016 17.3.3.1 describes br as element of a run content, and points to CT_Br in §A.1. CT_Br may appear only as part of EG_RunInnerContent. In turn, EG_RunInnerContent may appear only inside CT_R. So, using <w:br> outside of <w:r> produces ill-formed OOXML. Open XML SDK 2.5 Productivity Tool for Microsoft Office confirms that, showing OpenXmlUnknownElement error. However, Word accepts it as direct child of <w:body>. It behaves as if the <w:br> were used as first element in first run of the following <w:p> (thus creating page break after next paragraph). Another Word bug that provokes third-parties to create ill-formed documents, and requires LibreOffice to be bug-to-bug compatible. This commit makes the following changes: 1. Registers a dedicated complex type CT_Br_OutOfOrder to handle those unusual breaks, with corresponding handler function. 2. In the handler function, saves the gathered property set to parser state to use later in next paragraph group handler. This reproduces Word behaviour. Change-Id: I5df6927e2de9266b58f87807319ad1c4977e45a7 Reviewed-on: https://gerrit.libreoffice.org/39168 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-06-27tdf#100075 DOCX frame height rule updatedVasily Melenchuk
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>
2017-06-27use std::array in BlockInfoNoel Grandin
Change-Id: I28a13592e5993454ae96b0a32ba328013da7856e Reviewed-on: https://gerrit.libreoffice.org/39296 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-27loplugin:oncevar in swNoel Grandin
Change-Id: Ia96172489eec09607113d388a5b683bb6e0d2dec Reviewed-on: https://gerrit.libreoffice.org/39290 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-27inline ElementPtrNoel Grandin
Change-Id: I93a9527283a819a95563565a252a5088253c91c0 Reviewed-on: https://gerrit.libreoffice.org/39293 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-27sw: fix the assertion in SwModule::Notify()Michael Stahl
This assertion (for i#116192) is actually triggered while loading fdo65932.html in CppunitTest_sw_filters_test: The perverted LoadHiddenDocument() hack in SwHTMLParser::SetControlSize() may create a view too early, before loading finishes, but this shouldn't be a problem because HTML is never a template, so move the assertion into the place where we actually modify the document directly without going via the shell. Change-Id: Ifa4b1ec4ab4142f4159daf5785cd90b5468f7e3e
2017-06-27fdo#43157 convert OSL_ASSERT to assert in sw/sourceBernhard Widl
Change-Id: Ibef2f8deb36e2123f22bd925d1360c34de0ce47b Reviewed-on: https://gerrit.libreoffice.org/39270 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-27tdf#108806: convert CRLF into space in OOXML textMike Kaganski
Change-Id: I8e2e108a705ecdb55c096a589d83d51c48b0b83c Reviewed-on: https://gerrit.libreoffice.org/39286 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-06-26Avoid loplugin:unreffunStephan Bergmann
...after 272d5a02a3de2350f8af7a93281b651316b24ae5 "Revert 'tdf#108524 sw: attempt to split section frames inside table cells'" Change-Id: Ic1ec8cd3284e2ba98630552c80d99b5d67fc7efd
2017-06-26Revert "tdf#108524 sw: attempt to split section frames inside table cells"Michael Stahl
This reverts commit f991b842addddeada6dc45c4054deeca5aa7f17b. It doesn't really work and crashes on ooo61225-1.sxw in 1 in SwFrame::FindTabFrame() (this=0x0) at sw/source/core/inc/frame.hxx:913 2 in SwFrame::GetNextSctLeaf(MakePageType) (this=0x3137130, eMakePage=MAKEPAGE_INSERT) at sw/source/core/layout/sectfrm.cxx:1529 3 in SwFrame::GetLeaf(MakePageType, bool) (this=0x3137130, eMakePage=MAKEPAGE_INSERT, bFwd=true) at sw/source/core/layout/flowfrm.cxx:805 4 in SwFlowFrame::MoveFwd(bool, bool, bool) (this=0x31371d8, bMakePage=true, bPageBreak=false, bMoveAlways=false) at sw/source/core/layout/flowfrm.cxx:1861 The code added in GetNextSctLeaf() looks unfinished to me: it assumes that something else has added a follow-frame for the SwCellFrame containing the SwSectionFrame already, but AFAICT the GetNextSctLeaf() function is responsible for creating that SwCellFrame follow. The caller (in GetLeaf()) specifically checks for this condition and avoids calling GetNextCellLeaf(). Change-Id: I51875830771f07f5d2fec293f6063c73fc68d468
2017-06-26Revert "crashtesting failure on ooo61225-1.sxw"Michael Stahl
This reverts commit 55d4cc340068b0f590ab3a2119a2a2a71a3f8e5e. It's obviously bogus to have mbInfTab set but ImplFindTabFrame return null. Also, just loading the document still crashes with the same problem in a different place.
2017-06-26fdo#43157 convert OSL_ASSERT to assert in sw/source/coreBernhard Widl
Change-Id: I6ffd9832ff1085c84fde8763045f3d1cb02137e2 Reviewed-on: https://gerrit.libreoffice.org/38974 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-26use implicit default copy assignmentJochen Nitschke
I guess Coverity complained that there was a copy assignment operator but no copy ctor, move assignment and move ctor defined. Change-Id: I10641c9f403e609406b2a1420b22abbfc9dbc6fc Reviewed-on: https://gerrit.libreoffice.org/39240 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-06-26Fix typosAndrea Gelmini
Change-Id: I2ce725f87ee6f8ebcffbac268cc7e7f8850023e5 Reviewed-on: https://gerrit.libreoffice.org/39232 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2017-06-26s/catched/caughtNoel Grandin
Change-Id: I7ea6977a9749e86f8058b78cdb91cd2c62da8264 Reviewed-on: https://gerrit.libreoffice.org/39164 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-25crashtesting failure on ooo61225-1.sxwCaolán McNamara
Change-Id: Ia953443ba352aea1b33b6efd312a0e95a6b8918e Reviewed-on: https://gerrit.libreoffice.org/39244 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-06-24Set OK as default button in MM Assign Fields dialogGabor Kelemen
Shut this warning up: warn:vcl.layout:28925:1:vcl/source/window/builder.cxx:519: No default button defined in modules/swriter/ui/assignfieldsdialog.ui Change-Id: Ide113c694ac6cf20361a81ed53c474494f172921 Reviewed-on: https://gerrit.libreoffice.org/39190 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-06-24tdf#98800 Enable Next button on the third page of the MM WizardGabor Kelemen
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>
generated by cgit (git 2.34.1) at 2025-01-01 10:40:17 +0000