summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2018-08-31sw: fix inconsistent bookmark behavior around at-char/as-char anchored framesSerge Krot
Added unit test for Added fix for Change-Id: Ic1f173c85d3824afabb5b7ebf3a8594311eb9007 Change-Id: I38444587d00b96d52ff725dc7c5852e057bc6bd9 Reviewed-on: https://gerrit.libreoffice.org/59828 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-08-31sw: add unit test for the XHTML part of tdf#109202Thorsten Behrens
Change-Id: Ifb1b5b30e1c3586be75ff01f7bc0612a6b8b1f8d Reviewed-on: https://gerrit.libreoffice.org/59785 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-08-31tdf#118993 - Missing new Insert Special Character in WebRizal Muttaqin
Change-Id: Icbe68ac5f1ddb5ad59e0615ad1d558b829c6977f Reviewed-on: https://gerrit.libreoffice.org/59832 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
2018-08-30sw XHTML export: xml:lang is not relevant for ReqIFMiklos Vajna
I suppose if language is set, that happens in the wrapping ReqIF document, not in the XHTML fragments. Change-Id: I970c3810b7f02bbafc37dd85e095b254cc651330 Reviewed-on: https://gerrit.libreoffice.org/59810 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-08-30sw XHTML export: improve dummy OLE object handlingMiklos Vajna
It is possible that we not only have a dummy OLE object, but both the replacement image and the native data is missing. Handle these enough so that we don't give up exporting the document and also produce valid output. Change-Id: Ia973ecfbfb7e8fdecdc831b29d3a82c988ed7ea5 Reviewed-on: https://gerrit.libreoffice.org/59806 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins
2018-08-30tdf#115670 vml shadow: shadow is off unless explicitly set onJustin Luth
The absence of "on=" is treated in Word (tested 2003) as off. Change-Id: Ibc6b0e5ca0f25a9c3ca1b9505fa24c4d821bfd0 Reviewed-on: https://gerrit.libreoffice.org/59457 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-08-30Resolves: tdf#119572 addressee/sender formatting swappedCaolán McNamara
Change-Id: Icdb2ca0362711e87edcb952fb52117502d80d328 Reviewed-on: https://gerrit.libreoffice.org/59793 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-30Translate German commentsJohnny_M
Change-Id: I8e3b98e1ddc3f4f9826aa14383908d6b77f4827a Reviewed-on: https://gerrit.libreoffice.org/59592 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-30tdf#117823 Save mail merge config item in new viewIlhan Yesil
The config object is now saved in a newly created document. Regression from commit id 00fa85e701d4a8984cfa3a24c9b7a3963b031fa0. Change-Id: I2265de1dd69038d447e28dfda2e85c7cf89903c6 Reviewed-on: https://gerrit.libreoffice.org/59728 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-30tdf#113848 Sidebar: Get user-defined sizes while changing orientationIlhan Yesil
If the orientation of the page is changed, the user defined page sizes are now accessed directly to swap the sizes correctly. Change-Id: I91d256d35dcd910a8c3151a3f9e669413c9a57db Reviewed-on: https://gerrit.libreoffice.org/59577 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2018-08-30add SfxStyleDialogControllerCaolán McNamara
Change-Id: I5b55b8adb46d894f87dcf68c97f6fd56059354a2 Reviewed-on: https://gerrit.libreoffice.org/59768 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-30tdf#101856 Handle properties of nested bookmarksSerge Krot
Change-Id: I1a92d2001e58751c5bbe41f6480f4c46dcc8c9e7 Reviewed-on: https://gerrit.libreoffice.org/59766 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-08-29Replace find_if with proper quantifier algorithmsArkadiy Illarionov
Change-Id: Icc820a47ac891c358883f9c01224f676c58fdd11 Reviewed-on: https://gerrit.libreoffice.org/59744 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-29tdf#119232 ww8import: even page means default to start on page 2Justin Luth
I didn't see this mentioned in the sprm documentation, but that is how MS Word seems to implement it. Change-Id: I5b86ecf99a884e768877cdb0e71f43cdb9f2ad76 Reviewed-on: https://gerrit.libreoffice.org/59221 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-08-29loplugin:constantparam (3)Noel Grandin
Change-Id: Ifc47bb8e096c9a8563021b2fcb44199577740746 Reviewed-on: https://gerrit.libreoffice.org/59747 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-29tdf#119458 just wakeup Scheduler on active IdleJan-Marek Glogowski
So this almost returns the code to the original state, before I started fixing tdf#116370... a long way. This introduces the new Scheduler::Wakeup() function, which will just queue a Scheduler event in the System event queue unconditionally. This should prevent fdo#73165, which I couldn't reproduce, but just to be sure. More importantly this patch resets the m_bStartOnUnblock when the Idle job actually runs. This run should already determinates if more Idle work needs to be done, and others can still call BeginIdling() to ensure further processing. This also drops the IsBusyDoc() test from UnblockIdling(). We can't really know, if the document is still busy when the Scheduler is finally running, be it by the system timer or Application::Reschedule(). Change-Id: I6cc4a3c48dcaf62b6985c7bc1c95c96697443f3b Reviewed-on: https://gerrit.libreoffice.org/59730 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2018-08-29loplugin:constantparam (2)Noel Grandin
Change-Id: I528f22876497f87159e3b9453362ebbfb55b7092
2018-08-29replace rtl_allocateMemory with std::mallocNoel Grandin
where used directly, since rtl_allocateMemory now just calls into std::malloc Change-Id: I59f85bdb7efdf6baa30e8fcd2370c0f8e9c999ad Reviewed-on: https://gerrit.libreoffice.org/59685 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-29new loplugin:oustringbufferNoel Grandin
look for places where we are appending the temporary result of adding strings together, to an OUStringBuffer, where we could rather call append repeatedly and avoid the temporary creation Change-Id: I481435124291ac7fb54b91a78344a9fe5b379a82 Reviewed-on: https://gerrit.libreoffice.org/59708 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-29loplugin:constantparam (1)Noel Grandin
Change-Id: I25077e391ecca1b678062d261a83d88daadf0a58 Reviewed-on: https://gerrit.libreoffice.org/59701 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-29chmod -xTor Lillqvist
Change-Id: I6ba581f3665bc2934b8e3af5985ae853d60be39f
2018-08-28tdf#119458 fix sw background Idle unblockingJan-Marek Glogowski
We can't handle the correct state when blocking via a tasks mbActive bool, as this also schedules the task and starts the scheduler timer. So reintroduce a bool for the unblock state. Change-Id: I40991d0160b058fae3803fab002dc036fc0b0339 Reviewed-on: https://gerrit.libreoffice.org/59692 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2018-08-28writerfilter: not FirstParaInSection if IsInShapeJustin Luth
Since anchored objects can contain paragraphs, considering all of them to be "firstParagraphs" would generally be considered an incorrect result. Browsing through the existing uses of IsFirstPara.*InSection I didn't see any that looked like it should be considered true if IsInShape. Since this is the kind of gotcha that that the programmer should be aware of, add it directly into the function instead of requiring each use to have an additional qualification. The following ooxml unit tests match these conditions, but only one was fixed - the rest were unaffected since they just avoided adding/removing dummy paragraphs. fdo79540.docx - 5 tblppr-shape.docx - 5 ooo47778-3.odt- 5 ooo47778-4.odt- 5 textbox-rounded-corners.docx - 7 n780563.docx - 8 missing-path.docx - 10 floating-tables-anchor.docx - 10 tdf117805.odt - 11 (fixed - prevented extra section paragraphs) Change-Id: I841475e214c194a673321c1229d9254dd07205f8 Reviewed-on: https://gerrit.libreoffice.org/59659 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2018-08-27sw: fix inconsistent bookmark behavior around at-char/as-char anchored framesSerge Krot
Added fix for Change-Id: Ic1f173c85d3824afabb5b7ebf3a8594311eb9007 Reviewed-on: https://gerrit.libreoffice.org/46889 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> The problem was (the same condition of the bOnlyFrameStarts parameter was used during output of Start and End bookmarks): if (BkmType::Start == pPtr->nBkmType && !bOnlyFrameStarts) ... if (BkmType::End == pPtr->nBkmType && !bOnlyFrameStarts) ... Should be: if (BkmType::Start == pPtr->nBkmType && bOnlyFrameStarts) ... if (BkmType::End == pPtr->nBkmType && !bOnlyFrameStarts) ... I assume this was a simple copy-paste bug. Change-Id: I712a0dccc1638fed3b81c65628033a4dc06c1ca4 Reviewed-on: https://gerrit.libreoffice.org/59556 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-08-27tdf#119458 fix sw background Idle state handlingJan-Marek Glogowski
Starting the SwDocIdle in StartIdeling() just reintroduces the bug fixed in commit 401cba4c20fb ("tdf#116370 cleanup Writer idle job handing"), so trading one bug for the other. For the real solution we have to handle two states: 1. The SwDocIdle being active 2. The SwDocIdle being blocked For the first state we can just use the active state of the Idle itself. Since it's not a AutoIdle, it will be turned of, if invoked. Either some Idle handler will want to be run it again or some other thread might start it again, if needed. Since we're now tracking the wanted Idle state via the active task flag, we can drop the explicit mbStartIdleTimer handling. As a result of the first change, we can't stop the Idle anymore when blocking it. But the Idle itself checks its ready state via IsDocIdle() in its UpdateMinPeriod function, so we have to add the blocking state to IsDocIdle(). Change-Id: I33017a8e07208a6a3bce761cc899ac3ca944cd61 Reviewed-on: https://gerrit.libreoffice.org/59586 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2018-08-27tdf#119143: introduce tentative directional embedding import supportMike Kaganski
ECMA-376-1:2016 states that w:dir is functionally equivalent to LRE/RLE+PDF pair around the enclosed runs. So this patch does just that. Change-Id: Ibf9775338cc38a3bbc38a42a33fc64ae787b478f Reviewed-on: https://gerrit.libreoffice.org/59643 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-08-27tdf#116436 rtf export: add missing table background fillJustin Luth
MS formats only have support for Table and Cell fill. Interestingly, MS Word doesn't let the cells inherit from the Table fill setting, so that value also needs to be written out into every cell. Since Word apparently ignores the table color, I didn't bother trying to search out how to export that in RTF format. (I did add it to DOCX since it was so easy to find.) Change-Id: I7fe7723fb1603bc60608762aea79ff3b8122e073 Reviewed-on: https://gerrit.libreoffice.org/59282 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-08-27sw: prefix members of SwModuleOptionsMiklos Vajna
Change-Id: I1312371b1e95d93b6fa3e200851f5bfbf237d256 Reviewed-on: https://gerrit.libreoffice.org/59634 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-08-27Resolves: tdf#118382 crash on paste of rtfCaolán McNamara
into an existing document since.... commit deaa16bd24fba4a3a6b072ab2b94542a7dbd41c6 Author: Serge Krot <Serge.Krot@cib.de> Date: Mon Jan 29 12:17:06 2018 +0100 tdf#72942 Do not overwrite styles from the inserted doc During inserting of the text from the external document we should not change original default styles in currently opened document. because missing styles aren't created, so there's exceptons thrown on their use. I see that the m_bIsNewDoc flag is already checked for since... commit 5ebe826caf75e8d00656b3333385bf0bbc05cb27 Author: Miklos Vajna <vmiklos@collabora.co.uk> Date: Fri Oct 4 11:02:59 2013 +0200 fdo#69384 fix impress -> writer copy&paste Regression from 2ade07126971b79c92f729fae5709f2e2e2b495c (fdo#62044 RTF import: don't overwrite existing styles when pasting, 2013-06-04), during paste, if existing style was found, then the intention was to skip that style, but instead we tried to create one. in the body of the following loop, which should mean that existing styles are left alone and only missing styles created if we remove this hunk of the tdf#72942 commit Change-Id: Ia4aedb5e309c991490656061aa20d11ff24f4f9e Reviewed-on: https://gerrit.libreoffice.org/59519 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-08-27rename ENABLE_HEADLESS option to DISABLE_GUINoel Grandin
since it has nothing to do with the headless command line option, so use the name it has in the configure.ac file Change-Id: Ibf0615ed02695d6e48a797f5632e4f417c010c70 Reviewed-on: https://gerrit.libreoffice.org/59611 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-25tdf#70195 docx export: default header/footer at 720Justin Luth
This only impacts MSWord, which otherwise suggests a new header start at 0. LO ignores that 0 and uses a sane default. Change-Id: Id9790038086de1e20918d4ab498a0ce93ca53b5c Reviewed-on: https://gerrit.libreoffice.org/59523 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2018-08-24Remove redundant loop, tdf#96099 follow-upArkadiy Illarionov
Change-Id: I6318a526c8ea73ef32c18038c9bb5feeffc07b52 Reviewed-on: https://gerrit.libreoffice.org/59583 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-24document that nEndPos of -1 is all textCaolán McNamara
Change-Id: I4646e1ef09db3a637248cff53cbbafb214219cf8 Reviewed-on: https://gerrit.libreoffice.org/59542 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-24tdf#73547 fix ooxml export / import custom dashes.Mark Hung
Fix import logic as well as arithmatic precion of both import and export. Change-Id: I97e9bde847e0a2425421af2f2175d4d0b7af0cab Reviewed-on: https://gerrit.libreoffice.org/59306 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com>
2018-08-24coverity#1438527 Nesting level does not match indentationCaolán McNamara
Change-Id: I0b36a0fdb1c284ab8510740d10d9fc0202c71e44 Reviewed-on: https://gerrit.libreoffice.org/59554 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-08-24tdf#119458 always start the SwDocIdleJan-Marek Glogowski
The SwDocIdle prevents its own scheduling, while its document is busy. In theory something should kick the Idle, when the document isn't busy anymore, but SwViewOption doesn't have access to the doc easily. So this returns to the old state, where each StartIdling kicks the SwDocIdle, as long as it is not blocked. This is the way it has been working - out of luck - since ever. Eventually all the "other" Writer idle handling should be dropped in favour of the IDocumentTimerAccess interface, or otherwise be consolidated. Change-Id: I9e1cf5c309f614da579458981332ed1ee32c7c3f Reviewed-on: https://gerrit.libreoffice.org/59536 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2018-08-24tdf#119303 Preselect text in input field dialogMichael Weghorn
The text was no longer preselected since the dialog was welded in commit c8780642a5e8dc0bdcc97940ee7d9cacdc64c928 . Change-Id: I282336cf68ad4b363d5148f0f48f5f426826ed66 Reviewed-on: https://gerrit.libreoffice.org/59521 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-24pass DelFormats around using std::vectorNoel Grandin
instead of an array and a separate count Change-Id: Ia12a549da7e35092da2db35f8b2b9fc6a9e9c2be Reviewed-on: https://gerrit.libreoffice.org/59506 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-24tdf#91292 docx export: COL_AUTO != cleared fillJustin Luth
required for tdf#90906. If the color was COL_AUTO, then the fill was already marked as NONE, so that doesn't indicate a "change" made by the user since the document opened, and thus the original information shouldn't be tossed. Change-Id: I2e20c228c2a5f61826320798a2f07d94f0da024c Reviewed-on: https://gerrit.libreoffice.org/59442 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2018-08-24tdf#119236 Dimension dialog for Writer and CalcMaxim Monastirsky
Change-Id: Ifbc6c8959afcedac0fd9ec7a3f5e2cca63c11eda Reviewed-on: https://gerrit.libreoffice.org/59484 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2018-08-24Explicitly set line ends for measure linesMaxim Monastirsky
So they won't be lost on file export Change-Id: I7da183e4b392fd9f3019b1f3029db15a56eff84d Reviewed-on: https://gerrit.libreoffice.org/59483 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2018-08-23sw: Prefer std::vector to undemanded std::listTakeshi Abe
Change-Id: I2003538f3a7cff2163cbb85f948c0bab9187dfeb Reviewed-on: https://gerrit.libreoffice.org/59379 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-23Related rhbz#1618703: Properly handle failure encoding MS fileStephan Bergmann
...when e.g. FIPS mode makes EncryptRC4 (in sw/source/filter/ww8/wrtww8.cxx) fail, but which hadn't been propagated out to SwWW8Writer::WriteStorage (in sw/source/filter/ww8/wrtww8.cxx) Change-Id: I1123136ce1a25e181a0a27486954621a2dd095ea Reviewed-on: https://gerrit.libreoffice.org/59518 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-08-23loplugin:useuniqueptr in SwXMetaNoel Grandin
Change-Id: I10c75fd2cd7b78195661b499753a2fbb90e8793c Reviewed-on: https://gerrit.libreoffice.org/59485 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-23loplugin:useuniqueptr in sw dialogsNoel Grandin
Change-Id: Ief2cd941b95c640b70fd7024d9f27f5c0bd36da9 Reviewed-on: https://gerrit.libreoffice.org/59487 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-23loplugin:useuniqueptr in SwFltStackEntryNoel Grandin
Change-Id: I849c1d0377a3d8a5dafedb017a6dfdb3189b799d Reviewed-on: https://gerrit.libreoffice.org/59486 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-23related tdf#76683 docx export: use firstLine, not hangingJustin Luth
for negative first line indents. TwipMeasure must be positive even though contrary to their documentation, Microsoft still uses the negative number. So this should have no noticable impact, other than making the output valid. Change-Id: Iafd9411c748f086dde3165c2ac7229b17a2312ab Reviewed-on: https://gerrit.libreoffice.org/59423 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2018-08-22tdf#119360 - Inconsistent labels protect/protectedheiko tietze
Insert/Edit section dialogs use now the same label Change-Id: I9726c5e90d25d7b1285be53f6a365ae0eb017bdc Reviewed-on: https://gerrit.libreoffice.org/59460 Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
2018-08-22loplugin:useuniqueptr in SwSdrUndoNoel Grandin
Change-Id: I848f889f34dd7d3ffd83ff0cf209de8e69bbfeae Reviewed-on: https://gerrit.libreoffice.org/59447 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-22loplugin:useuniqueptr in SwTextLineNoel Grandin
Change-Id: I3c3cdf14d8d86028c452e190dea5fa1bb3da0cbb Reviewed-on: https://gerrit.libreoffice.org/59443 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>