summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2018-03-07sw: add some sanity check to SwFrame::GetNextSctLeaf()Michael Stahl1-0/+70
Check that the parents of the section follow frame are the same type as the parents of the original section frame. Change-Id: I9845e48834d57b8a93f9b850cb89b6c5544d9ab2 Reviewed-on: https://gerrit.libreoffice.org/50807 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-03-07use more Color in swNoel Grandin40-101/+104
Change-Id: I51d575c40228bbd2ff384f12da33c1cd8bda2dda Reviewed-on: https://gerrit.libreoffice.org/50800 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-07Revert "tdf#115432 footnote separator position remain in the left side"Noel Grandin2-6/+8
This reverts commit d4a8d91abd40dee7f7bd739a678a502a6e34cb59. because it changes the type of an UNO property defined in a published IDL file Change-Id: I4d3db3532b27552a30f34fcd4201856565eb0a3b Reviewed-on: https://gerrit.libreoffice.org/50825 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-07xmloff: convert XMLTextParagraphExport to get rid of "GraphicURL"Tomaž Vajngerl2-5/+2
Change-Id: I10cc1115bfe628dc296b67b75e386e1a2e4a6c46 Reviewed-on: https://gerrit.libreoffice.org/50789 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2018-03-07Move BackGraphicURL property & friends to BackGraphic + fixesTomaž Vajngerl9-99/+83
This moves BackGraphicURL, HeaderGraphicURL, FooterGraphicURL and ParaBackGraphicURL properties to BackGraphic, HeaderBackGraphic, FooterBackGraphic and ParaBackGraphic. With this the property type changes from String to XGraphic. This change also fixes a bunch of test failures, changes the tests to use the new properties and the correct type, changes the import and export filters like xmloff and oox, to make the tests happy. Change-Id: Ie66097514203c6dc36ab27420faf265322e9279e Reviewed-on: https://gerrit.libreoffice.org/50760 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2018-03-07MID_GRAPHIC as alternative to set graphic to the SvxBrushItemTomaž Vajngerl3-1/+11
Change-Id: I6e17d1a34f0bd17a0eafd7c741162f23279e9d1a Reviewed-on: https://gerrit.libreoffice.org/50539 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2018-03-07uitest - Writer Line Numbering dialog; tdf#86185 testZdeněk Crhonek1-0/+121
Change-Id: I4b721284bf38480f30d8b54f155e5dafa883631a Reviewed-on: https://gerrit.libreoffice.org/50529 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-03-07if the arg is true, the dialog dispatchs InsertSpecialChar itselfCaolán McNamara3-63/+6
and GetOutputItemSet is unused and the args won't be there. While they are there if the arg is false Change-Id: I934e99479f8fdf4d5102e47f6082fbbda8ececcd Reviewed-on: https://gerrit.libreoffice.org/50838 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-06disambiguate CreateSfxDialogCaolán McNamara7-15/+9
Change-Id: I6a02d7b197c3cc31a4c9b2eec3d5bd786544df3c Reviewed-on: https://gerrit.libreoffice.org/50837 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-06sw XHTML import: map nested <object> to replacement graphicMiklos Vajna6-0/+53
Handle the case when the native data is the outer element and the replacement image is the inner one. Change-Id: Ifc3c8b8bc8c0903562a4dab1f0bf15e9de5c98ac Reviewed-on: https://gerrit.libreoffice.org/50812 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-06sw: convert that to assert tooMichael Stahl1-1/+1
Change-Id: I4f06fc4871cbb92b40d950b31a06b5e185aed321 Reviewed-on: https://gerrit.libreoffice.org/50806 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-06sw: convert checks about mbInfTab and cell parent to assert()Michael Stahl1-2/+2
Change-Id: Ia9e517936d546f60f76ae99062ff57a09209dc8a Reviewed-on: https://gerrit.libreoffice.org/50805 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-06forcepoint #18 sw: fix condition for detecting section-in-table splitsMichael Stahl1-2/+2
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. Checking for CanContainSplitSection() at this point doesn't make sense to me: if it's not allowed to split the section, we can't just split it anyway and put the follow outside the table. Just removing it fails in testTableInNestedSection() but it turns out that the problem there is that the mbInfTab flag is set on a outermost SwTabFrame itself, so we need to check the parent's flag instead to check if this frame needs to go into a cell. (regression from 652556ec3e9218655a67b4c4de4e26fbe81855de) Change-Id: I79663391fb1b2cb10f008676feb01a2607cfb33d Reviewed-on: https://gerrit.libreoffice.org/50804 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-06Fix typosAndrea Gelmini1-1/+1
Change-Id: I005023337dbe593e0ac1d76f7b10848d24f314a5 Reviewed-on: https://gerrit.libreoffice.org/50785 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-03-06tdf#115861 DOCX import: avoid last-paragraph removal when discarding footerMiklos Vajna2-0/+7
Discarding header/footer is necessary when the document or section settings request to ignore first or even headers/footers. In the bugdoc case settings.xml didn't opt-in for different even/odd footers, but there was an even footer to be ignored. Handle this state at two more places, so we don't end up in a situation where we ignore the footer but not its "remove last (empty) paragraph at the end of the footer" action. Also make the debug dumper for text ranges more robust to have a working token dump when we try to get the string for a table. Change-Id: I6395f37aa40c42304e2c918d87dadecb21e9d378 Reviewed-on: https://gerrit.libreoffice.org/50786 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-06add some color conversion methods to sax::ConverterNoel Grandin1-2/+2
to make the call-sites less verbose Change-Id: Ifddcbb03a454a241bef93f31a8025801b84a66fc Reviewed-on: https://gerrit.libreoffice.org/50578 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-06Resolves: tdf#113805 insert special character fails in insert footnote, etc ↵Caolán McNamara7-7/+7
dialog i.e. since commit 710a39414569995bd5a8631a948c939dc73bcef9 Date: Thu May 11 13:27:38 2017 +0530 GSoC: Glyph View and Recent Characters Control in Special Characters dialog Change-Id: Ia55f3fefe7c14327cff2e996ab0038dc52f9b017 it inserts into the document, extend the fix of commit 4020945651b4f3c636980e2103db440b5c55459c Author: Daniel <danielfaleirosilva@gmail.com> Date: Sun Sep 24 17:55:19 2017 -0300 tdf#111739 fix Selecting a custom character as a bullet symbol insertion to do the old thing that existing code depends on if this is not an "insert" dialog, and bubble that setting around from the callers Change-Id: Id8acf16955d0167beffae43e3b201e500ee7a929 Reviewed-on: https://gerrit.libreoffice.org/50781 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-05Resolves: tdf#116188 set min version on all .ui files to 3.18Caolán McNamara155-155/+155
which is already the min for the runtime Change-Id: Ifebe099f1f94a36f65a31989689400327a823dcd Reviewed-on: https://gerrit.libreoffice.org/50776 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-05lokdialog: more, convert the dialog to async execHenry Castro1-13/+12
ClassificationDialog SwWatermarkDialog Change-Id: I835648df8df5ad3ee5a404a582c2179e5b3b276a Reviewed-on: https://gerrit.libreoffice.org/50771 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Henry Castro <hcastro@collabora.com>
2018-03-05sw XHTML import: map <object> to OLE objectsMiklos Vajna6-12/+73
This handles native data only so far, replacement image still needs doing. Change-Id: I5f51bc7d837309fa0b88b277c1b754e435cb4208 Reviewed-on: https://gerrit.libreoffice.org/50778 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-05Fix typosAndrea Gelmini1-2/+2
Change-Id: I70e7db0926f8c5815637ae14c1193130d52c3224 Reviewed-on: https://gerrit.libreoffice.org/50774 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-05there's already a way to pass around the SfxRequest source frameCaolán McNamara1-1/+1
Change-Id: I790497c3e651890e0971ee334d599a98a7aae7f0 Reviewed-on: https://gerrit.libreoffice.org/50768 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-05sw: prefix members of SwFontAccess, SwFontObj and SwRangeRedlineMiklos Vajna4-95/+95
Change-Id: I6440ea8d4fab730f3335d69c7f434684f7d6874b Reviewed-on: https://gerrit.libreoffice.org/50763 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-03-05drop long& returning methods in PointNoel Grandin1-7/+7
Change-Id: I5d23191fd5a549b867213acedf9d56c233e2fb13 Reviewed-on: https://gerrit.libreoffice.org/50761 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-05Translate German variable namesJohnny_M1-8/+8
Akt -> Current in crsrsh Change-Id: I64205dd776babedc4dc68c82e6fe7de7c7a78c79 Reviewed-on: https://gerrit.libreoffice.org/50666 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-05Translate German variable and function namesJohnny_M4-17/+17
Akt -> Current in ww8par Change-Id: I5adedc8edc6e8c0a6b9022ca55bca1293ab046fd Reviewed-on: https://gerrit.libreoffice.org/50670 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-05Translate German variable namesJohnny_M3-11/+11
Akt -> Current in MSWordAttrIter (Other occurrences will be done separately.) Change-Id: Ibec27cd626399d7c868272ea7f8e906d458a4c9a Reviewed-on: https://gerrit.libreoffice.org/50689 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-05Translate German variable and function namesJohnny_M2-39/+39
Akt -> Current in ww8par Change-Id: If8e0b00082748ef8fe05a25a4966e8b5c7b6c51c Reviewed-on: https://gerrit.libreoffice.org/50671 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-05tdf#107035 Fix field character style DOCX importLuke Deller3-0/+28
Reinstate a call to DontExpandFormat which was removed from appendTextContent in commit 232ad2f2588beff50cb5c1f3b689c581ba317583 This ensures that direct character formatting which ended immediately before the insertion point will not be expanded to cover the inserted content. Change-Id: Ie5fa6b5c5acee4f885f9e67535e98801af23661a Reviewed-on: https://gerrit.libreoffice.org/50729 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-03-05Removed duplicated includesAndrea Gelmini1-1/+0
Change-Id: I63312215af63b2e7726ca79c6e151772e6ca7192 Reviewed-on: https://gerrit.libreoffice.org/50479 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-03-05bccu#3100: Writer: Change tracking boxes aren't repositioned with editingTamás Zolnai8-1/+768
Emit a notification related to the node position change, so the track changes comment box is repositioned when the text node changes it's position. Change-Id: I34b5ec453b3dc43895865f15d71aaead46ae6f24 Reviewed-on: https://gerrit.libreoffice.org/50640 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2018-03-05weld SfxPasswordDialog DialogCaolán McNamara3-29/+29
Change-Id: If8c9757986f4af7b7927717221860e65c8c7285e Reviewed-on: https://gerrit.libreoffice.org/50755 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-04Translate German variable namesJohnny_M9-64/+65
Akt -> Current in MSWordExportBase (Other occurrences will be done separately.) Change-Id: Ibb9f8f79e73a36dae1d4cb92f202ff733d7bf673 Reviewed-on: https://gerrit.libreoffice.org/50687 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-03-04Translate German variable namesJohnny_M2-4/+4
Akt -> Current in inputwin Change-Id: Ia1ad41e247bbccda56f954cbfc927927f17b566f Reviewed-on: https://gerrit.libreoffice.org/50701 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-03-04Translate German variable namesJohnny_M2-17/+17
Akt -> Current in crsrsh (Including translation fix of a two-line comment, where it was no longer cleat that it is one.) Change-Id: Iccf33ef63c2b02dcde04504676bc273ea059c3f0 Reviewed-on: https://gerrit.libreoffice.org/50704 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-03-04Translate German variable namesJohnny_M2-11/+11
Akt -> Current in swcrsr Change-Id: I5c5dabefa6e2924620b8ab4829943b74dc7e6bcd Reviewed-on: https://gerrit.libreoffice.org/50665 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-03-03drop old tools/gen methodsNoel Grandin1-2/+2
Change-Id: I9b9d1503b476f84e91fa283e523875b562c6b837 Reviewed-on: https://gerrit.libreoffice.org/50166 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-02weld split table dialogCaolán McNamara7-56/+59
Change-Id: I329a57fa09e6eb0fe75b93b0726d9b7718426693 Reviewed-on: https://gerrit.libreoffice.org/50639 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-02weld convert text-to-table/table-to-text dialogCaolán McNamara5-174/+161
Change-Id: I81137c0fe0b0e243ebc5b836ac09448d746b2214 Reviewed-on: https://gerrit.libreoffice.org/50644 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-02sw: convert DELETEZ to unique_ptr in edlingu.cxxMichael Stahl1-24/+20
Change-Id: I7af773aec20d23b925a90eade56452e8aed93b5b Reviewed-on: https://gerrit.libreoffice.org/50623 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-02weld split cells dialogCaolán McNamara1-1/+2
Change-Id: I726c6d84807ab3efba509058eed554fe4c0ffced Reviewed-on: https://gerrit.libreoffice.org/50636 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-02sw: convert DELETEZ to unique_ptr in paintfrm.cxxMichael Stahl1-47/+41
This will now delete these globals on shutdown, hopefully it's only relatively primitive types... Change-Id: Ib7a4bb4507da500e1eb1bb69876bb6d670d99cd4 Reviewed-on: https://gerrit.libreoffice.org/50624 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-02forcepoint #17 nTextBreak is an index into pKernArray of len rInf.GetLen()Caolán McNamara1-2/+1
Change-Id: I3afeaf987cc5e75362560165fea7230904530933 Reviewed-on: https://gerrit.libreoffice.org/50628 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-02related forcepoint #18, reconcile GetPrevCellLeaf with GetNextCellLeafCaolán McNamara1-3/+3
Change-Id: I8998956676ba146cac6f8339a3f5c550f0aabc2e Reviewed-on: https://gerrit.libreoffice.org/50634 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-02tdf#35301 xmloff: load / store loext:ruby-position.Mark Hung2-0/+6
Add a new property loext:ruby-position to ODF filter for the new attribute value "inter-character". Change-Id: I193eb93fba0e2e7861b6c8635244cac36eb29a06 Reviewed-on: https://gerrit.libreoffice.org/48328 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2018-03-02use more Color in SfxWatermarkItemNoel Grandin2-3/+3
Change-Id: Ifbbce6509c02cf3d93d0500104af7c07c3216266 Reviewed-on: https://gerrit.libreoffice.org/50577 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-02forcepoint #13 null derefCaolán McNamara1-1/+4
Change-Id: I248316ff3a3df513b8b1d9a8f86ac48d4dc75bb0 Reviewed-on: https://gerrit.libreoffice.org/50603 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-02tdf#116070: Use a valid PaM when confirming the dialog.Jan Holesovsky1-2/+2
Change-Id: I8d45e709e6414814b3cf04bbd09588ab4e096e8c Reviewed-on: https://gerrit.libreoffice.org/50598 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2018-03-02delete colordata.hxxNoel Grandin5-5/+1
move what we still need into color.hxx Change-Id: Ied7e31eb16468aa334c666b1499a6262f16a6350 Reviewed-on: https://gerrit.libreoffice.org/50561 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-02sw HTML export: XHTML ns alias for table markupMiklos Vajna3-5/+11
This was forgotten from the previous mass-conversion of adding namespace aliases to written elements. Change-Id: Id9b7e961c941ec3b3614e3694963c3f9ef9e46eb Reviewed-on: https://gerrit.libreoffice.org/50595 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>