summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2018-03-29Propagate BeginPutDoc failure out of SwDOCXReader::MakeEntriesStephan Bergmann
(BeginPutDoc can fail if the document is a read-only file) Change-Id: I2ee6f421e73459daf75adce67dedb47b23931d7c Reviewed-on: https://gerrit.libreoffice.org/52045 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-29loplugin:useuniqueptr in SwNumRuleNoel Grandin
Change-Id: Id74c0dac582b1dc52076488332e26c88e5e7b4c3 Reviewed-on: https://gerrit.libreoffice.org/52033 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-29loplugin:useuniqueptr in SaveRedlEndPosForRestoreNoel Grandin
Change-Id: I529ca5016ab22a8e57655da7fe5ec4f3344a05d5 Reviewed-on: https://gerrit.libreoffice.org/52032 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-29loplugin:useuniqueptr in DocumentFieldsManagerNoel Grandin
Change-Id: I79d18cb8fdb029afbe6008edd058265b1503e5eb Reviewed-on: https://gerrit.libreoffice.org/52031 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-29loplugin:useuniqueptr in DocumentDeviceManagerNoel Grandin
Change-Id: I051f63173a7b58819d340b00ea237a4164b1dbad Reviewed-on: https://gerrit.libreoffice.org/52030 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-29loplugin:useuniqueptr in CompareDataNoel Grandin
Change-Id: Id089f39a03f3793f2a5d9c24130d25ce6823df5a Reviewed-on: https://gerrit.libreoffice.org/52029 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-29loplugin:virtualdown in vclNoel Grandin
Change-Id: Iea173295b7bc5e7f8a5e0215dc13ab32190c6f8f Reviewed-on: https://gerrit.libreoffice.org/51999 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-29Always pass in a TextInsertModeRangeStephan Bergmann
...otherwise testCopyPastePageStyle would have caused the call to xFilter->filter in paste() to fail, throwing an "End of content node doesn't have the proper start node" RuntimeException in SwXBodyText::createTextCursorByRange (sw/source/core/unocore/unotext.cxx) called from the writerfilter::dmapper::DomainMapper_Impl ctor (writerfilter/source/dmapper/DomainMapper_Impl.cxx) (and which would be caught and swallowed in RtfFilter::filter (writerfilter/source/filter/RtfFilter.cxx), causing it to return false). Change-Id: I83b720a365e06edc41c3d9c82614df488ee33d35 Reviewed-on: https://gerrit.libreoffice.org/52013 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-29Fix typosAndrea Gelmini
Change-Id: I0f606816871d90173dedaa9fc4eb7e6ccebe0b1a Reviewed-on: https://gerrit.libreoffice.org/51919 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jens Carl <j.carl43@gmx.de>
2018-03-28tdf#116407 - option "Border" for new table redundantheiko tietze
Function removed Change-Id: I2346a0ba91afb72c7c68a6d50fc103d0409ae374 Reviewed-on: https://gerrit.libreoffice.org/51896 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
2018-03-28Translate German variable namesJohnny_M
Akt -> Current in table Change-Id: I108136bd79dcc603649c996ecd58c74d67d7dab9 Reviewed-on: https://gerrit.libreoffice.org/51805 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-03-28Translate German function namesJohnny_M
Akt -> Current in ww8 Change-Id: I3beb046cbce7727c7ff485de9ff956ee087c443c Reviewed-on: https://gerrit.libreoffice.org/51802 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-03-28tdf#108122 HTML export: fix lost images on copyMiklos Vajna
As in the copy part of copy&paste. The problem was that the document has an empty base URL during copy, and this was images were not exported at all. An alternative fix would be to use embedded images, but sadly Word's HTML import doesn't understand that markup, so use tempfiles instead. Change-Id: Iab8c555ac244d943c4958f24f8ac61cba4ec3aba Reviewed-on: https://gerrit.libreoffice.org/52003 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-28fix duplicate strings in notebookbarChristian Lohmaier
and also one in alreadyexistsdialog Change-Id: Ib503f742ca6e99246d1e8fc07a9d2cd418ba2133
2018-03-28Pasted-in document need only be opened for readingStephan Bergmann
Otherwise, if SRCDIR is a read-only tree, CppunitTest_sw_rtfimport would fail with the CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, pStream->GetError()); from <https://gerrit.libreoffice.org/#/c/51992/> "Check successful stream creation". (And before that, it would have more obscurely failed with the CPPUNIT_ASSERT_EQUAL(2, getParagraphs()); in testTdf90260Par failing with 1 vs. 2.) Change-Id: I55fcc932c66e6a4b84cd391f8821257a0de2abb8 Reviewed-on: https://gerrit.libreoffice.org/51993 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-28Check successful filter operationStephan Bergmann
Change-Id: I220905486cc2287f2157f57b537c0df0b325bd36 Reviewed-on: https://gerrit.libreoffice.org/51994 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-28tdf#116570 ww8 export: skip sectionbreak for footnotesJustin Luth
An extra CR was added at the start of each footnote. I'm guessing these documents started life as "end of document" footnotes in Word. SectionBreaksAndFrames is only used by .doc, so this will not affect .docx and .rtf (which are both fine anyway). I forgot that I recently fixed the same problem for endnotes in tdf#108448. Nice to have found example footnote documents also. Change-Id: Ib496e02d9ff46dbc2337a6d3dfe164a625b09a83 Reviewed-on: https://gerrit.libreoffice.org/51771 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-03-28Check successful stream creationStephan Bergmann
Change-Id: Iea7dea13684a15ed1960d2c8562253f5a2e64c34 Reviewed-on: https://gerrit.libreoffice.org/51992 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-28loplugin:virtualdown in swNoel Grandin
Change-Id: Ia4053970a23d62ac7483f18d6caa559ddf43b176 Reviewed-on: https://gerrit.libreoffice.org/51988 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-28drop newly unused HTMLMODE_NO_BR_AT_PARENDCaolán McNamara
Change-Id: I4e1c0355a10e0334439beb04c54bde24dada0dd2 Reviewed-on: https://gerrit.libreoffice.org/51960 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-28sw: fix some IWYU warningsMiklos Vajna
Change-Id: I96a6401f0cc7bf9f219717671e41932d7d8570b7 Reviewed-on: https://gerrit.libreoffice.org/51972 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-27sw: add debug helper to dump topmost SwFrameManfred Blume
Change-Id: Iad239da91a995235997c4986a755640721550abd Reviewed-on: https://gerrit.libreoffice.org/43925 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-03-27ditch HelpEx hackCaolán McNamara
in since initial commit, no sign of it in use Change-Id: I7f4a072f5d8620c088ec4750c8dbcefc89667cf5 Reviewed-on: https://gerrit.libreoffice.org/51958 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-27sw HTML paste: add debug env var to capture outgoing contentMiklos Vajna
Similar to existing SW_DEBUG_RTF_PASTE_TO. Change-Id: I5d6fe72929ab6ddd3e6e175ed344781fc4e3cb31 Reviewed-on: https://gerrit.libreoffice.org/51961 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-27msfilter: extract duplicated WriteHex() from HTML/RTF filterMiklos Vajna
The RtfAttributeOutput one is a superset of the HTML one, so use that. Change-Id: I3e342113a7ba26946320f43a164e457d6cbb6946 Reviewed-on: https://gerrit.libreoffice.org/51937 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-27sw XHTML export: support OLE2-in-RTF objectsMiklos Vajna
Need to repeat what OLE1 calls the class name in the OLE1 and RTF wrappers, so parse our own OLE2 data during export. Change-Id: Ic14fa648d1f78c29579bd9ba49ce6f491d4541b5 Reviewed-on: https://gerrit.libreoffice.org/51906 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-27tdf#116410 DOCX import: restrict increased object spacing to multiple shapesMiklos Vajna
This anchored object handling is just there to be bug-compatible with Word, it's not needed for the case when there is a single shape in the paragraph. Change-Id: I5e3dc4ba9a4a6f459ec6217e8974ebc2d7303bcc Reviewed-on: https://gerrit.libreoffice.org/51922 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-26NB tabbed compact: add space between font name and font sizeandreas kainz
Change-Id: I6b071ab6c3992083af832e6c34bc599ddbdb4415 Reviewed-on: https://gerrit.libreoffice.org/51897 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-03-26forcepoint #3: sw: don't do section-in-table splits when this is tableMichael Stahl
The problem with the bugdoc is that SwFrame::GetNextSctLeaf() creates a follow frame for a section in a table, and puts it outside the table, below the page's body frame, while moving text frames that have the mbInfTab flag set into the follow frame. The situation is different from forcepoint #18 though: the frame "this" is a SwTabFrame here, and GetNextCellLeaf() *does* return a plausible looking follow cell frame, however it's ignored later because CanContainSplitSection(this) is false since it's a SwTabFrame. IIRC table-in-section-in-table should not be split anyway, so just add a check here and return early. (regression f8a76d218305a56d15b82b9dac4fafa558872780) Revert "forcepoint #3" This reverts commit 34627ad7d03f93b89689b2e48a3985574d10f965 because it was just a work-around not to crash with the invalid table frames. Change-Id: I54692a67edade23c6b8e0a9be806728b0012a3fd Reviewed-on: https://gerrit.libreoffice.org/51751 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-03-26use boost::optional in swNoel Grandin
instead of std::unique_ptr, where we end up needlessly putting small objects separately on the heap Change-Id: I107421e7530c9580869b7a0f088ea7b0514bcf36 Reviewed-on: https://gerrit.libreoffice.org/51863 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-26tdf#106746: pDelPam is a bit specialAron Budea
Regression from db17d3c17c40d6b0e92392cf3c6e343d1d17b771 Change-Id: I17e2fef2eb16a900cc487b75c3b9dbba2764ac71 Reviewed-on: https://gerrit.libreoffice.org/51814 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Aron Budea <aron.budea@collabora.com>
2018-03-26tdf#62182 - print/web layout are toggles instead of set commandsheiko tietze
Reverted the menu entries to radio buttons Change-Id: I8cf70c1f30c19a446a1d9502a9e1191a94ffa00a Reviewed-on: https://gerrit.libreoffice.org/51823 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
2018-03-26tdf#39312 Reorder buttons in “Paragraph Style” dialogheiko tietze
New sequence: Help <-> Reset, Standard, , Ok, Apply, Cancel Change-Id: I4f539f68952850b5714d2b058099e4feccc9f4c2 Reviewed-on: https://gerrit.libreoffice.org/51698 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
2018-03-26sw: prefix members of SwReadOnlyPopupMiklos Vajna
Change-Id: I812730498695c6349bcd5e8256f3d1efddb12188 Reviewed-on: https://gerrit.libreoffice.org/51849 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-26forcepoint #28 missing cell on abw importCaolán McNamara
Change-Id: I7633a17afab5aa2eb9e47a552bd5d92c87d383c7 Reviewed-on: https://gerrit.libreoffice.org/51851 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-26tdf93121 MS export: only one fake tab per footnoteJustin Luth
Every paragraph was getting the fake tab added. The fake tab is only inserted by LO in order to emulate the spacing between the footnote character and the footnote paragraph, so it is not desirable to insert it before additional paragraphs. The fake tab is also only removed once per footnote during the import process, so this fake tab was altering the document during the first round-trip. Change-Id: Ia54cea1b04c747a021032f46f22b673fe6658995 Reviewed-on: https://gerrit.libreoffice.org/51755 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-03-26Writer tabbed notebookbar sync with tabbed compact layoutandreas kainz
Change-Id: Id8119b3d4720ab9f8d45cc7cdd87b3965a1889d5 Reviewed-on: https://gerrit.libreoffice.org/51843 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-03-26tdf#113925 doubleclick in ruler opens relevant dialogNickson Thanda
Change-Id: Ic56ea52e2b2d840a5ddba7d4204caf86b96411b5 Reviewed-on: https://gerrit.libreoffice.org/51470 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-03-25fix typo in dialog about rotation to standard orientationStanislav Horacek
Change-Id: Ia587c7fb41ed17e0c46845ca1823049ed6dfd67c
2018-03-25ofz#7110 ensure join is called on std::exceptions as well as uno::ExceptionCaolán McNamara
Change-Id: I1d17301e4d7f951b7176d5a91c0dca0ef051b2a2 Reviewed-on: https://gerrit.libreoffice.org/51830 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-25xmloff: export ruby-position in a more compatible way.Mark Hung
Export both style:ruby-position and loext:ruby-position. The later one only allows "above" and "below", obeying ODF standard while the former one allows "inter-character", which is added lately. Also use ODFVER_012_EXT_COMPAT so that loext:ruby-position isn't exported only in extended mode. Change-Id: I7b9208f289f8253a835b2f7751549206361274e0 Reviewed-on: https://gerrit.libreoffice.org/51007 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2018-03-24tdf#97622: Apply Asian spacing only to Asian textKhaled Hosny
The option “Apply spacing between Asian, Latin and complex text” (which is on by default) should only apply the extra spacing if one side of the text is Asian since that is the requirement of CJK typography, but Writer seems to apply it to any script change (e.g. between CTL and Western). This matches the behaviour in edit engine wich was changed back in 2002 in commit e314e1b8aa3f1d98f2b33ce3f546d07eafa0f799. Change-Id: Ia9f7167251bce7166c4087b347788a7b89e8b347 Reviewed-on: https://gerrit.libreoffice.org/51208 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
2018-03-24Fix typosAndrea Gelmini
Change-Id: I6c515e716b232fecfe1750b806f0a5624f648de5
2018-03-23msfilter: extract copy&pasted RTF code from sw and writerfilterMiklos Vajna
Both the hexdump and the OLE1 reader can be shared. Change-Id: I97d72a8deeb9c79fc8e8c4a73c613213badfa744 Reviewed-on: https://gerrit.libreoffice.org/51783 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-23sw XHTML import: support OLE2-in-RTF objectsMiklos Vajna
If you like layering things on top of each other, then this commit message is for you. So it's possible to have a PPTX file in the following wrappers: - wrap PPTX in a binary OLE2 container - wrap that in an OLE1 container - wrap that in an RTF fragment - wrap that in an XHTML fragment (in a ReqIF file) Turns out that only the RTF and OLE1 unwrapping was missing, the rest worked already, so implement the missing piece in a new SwReqIfReader namespace. Finally extend OleEmbeddedObject to be able to read its native data stream when the object is opened, reading it from the storage would fail, as the object already opened the storage stream. Change-Id: I2934c9fb7474e981ff6bb2f7eb253a3a86cfd98b Reviewed-on: https://gerrit.libreoffice.org/51772 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-23lok: don't post events on disposed windowPranav Kant
Change-Id: I7721380b1bb6e9ec21338a72523326d0cae6729e Reviewed-on: https://gerrit.libreoffice.org/51777 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: pranavk <pranavk@collabora.co.uk>
2018-03-23[API CHANGE] Fix typo in prop implemented by stardiv.UnoControls.FrameControlStephan Bergmann
There is exactly one implementation of css.frame.FrameControl (which demands a property named "ComponentUrl" not "ComponentURL"), and exactly one place where that property is used. So switch those two places to use the spelling of the property name as documented in the UNOIDL service. (Even though that can be considered an incompatible change, in the unlikely case that 3rd party code expects to be able to access the given implementation's property with the mis- spelled name.) Change-Id: I4fa3f21851b61079c09deea1a24aac22bc96f36f Reviewed-on: https://gerrit.libreoffice.org/51766 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-23loplugin:useuniqueptr in SwCursorNoel Grandin
storing a struct with two integer values in it, in a linked list, just seems inefficient Change-Id: I2913aa867cc978271d7778f06546d47fa6c57973 Reviewed-on: https://gerrit.libreoffice.org/51761 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-03-23tdf#116525 writer, no shadow around boxNoel Grandin
regression from commit 2ccde70d60d3a5074faf49260e8fe0ccdb91ff26 teach redundantcast plugin about functional casts because we are now passing the same variable as a both an in-parameter and an out-parameter Change-Id: I6454103fbc46530180cde5f725273e062eb2e25d Reviewed-on: https://gerrit.libreoffice.org/51757 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-23Typo: GetSelectItemId -> GetSelectedItemIdSamuel Mehrbrodt
Change-Id: Ieebb50b73f1f341c924693f3966f8cd2b09a136b Reviewed-on: https://gerrit.libreoffice.org/51750 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>