446656 Commits

Author SHA1 Message Date
Caolán McNamara
f2818681e9 set-focus doesn't exist in GtkEventBox, only GtkWindow
Change-Id: I7e8ba4891a34fa585831e11fd4e2fcbbfe7b859d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88595
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-13 13:37:42 +01:00
Michael Stahl
da164e4377 tdf#45589 sw: add tooltip to Formatting Aids dialog Bookmark label
Thanks to sdc.blanco for the suggestion.

Change-Id: Ib9a1874eeba1e9e1bf594e725be6883e79ed9a67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88541
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-13 12:56:34 +01:00
Luboš Luňák
6ba3425d43 set up properly Vulkan context creation also for Windows
This was somehow missing in aafe540f5a4c3593d8e56bbdbeb5f508994fe6d9.

Change-Id: I5bdcc490b10c73ac4bc55aa6af29d08815cd18d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88532
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-13 12:38:31 +01:00
Mohamed Sameh
76d6b4d02d tdf#124176: Use pragma once instead of include guards
Change-Id: I33a9c770142a2fcc2d899b5071cc45d5a42c8664
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88473
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-02-13 11:59:05 +01:00
Stephan Bergmann
38dcd3bc73 Get rid of some unnecessary llvm::StringRef -> std::string conversions
(as discussed in the commit message of ce1d8e20a708ed031f2336770a41fbe501fe8225
"Adapt to '[ADT] Make StringRef's std::string conversion operator explicit'";
there are more of those that cannot easily be dropped, though).

Change-Id: Ib2e223f7de96ad8859eab165daa759b480326c7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88582
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-13 11:24:43 +01:00
John Zhang
03d2fa836e Prefer array over vector for 3 elements container
Change-Id: I3d9bb84e067fdda3486ee21cfd5b5ffa59bc8c5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86591
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-13 11:22:40 +01:00
Tünde Tóth
a96ec04a07 tdf#130225 implement ODF export of deleted legend entries of pie charts
Follow-up of the following commits related to the new UNO property
DeletedLegendEntries for pie charts:

commit 86be3422cd55fa9e44104f1628648061bb6a3495
(tdf#129857 Chart OOXML export: fix deleted legend entries)

commit 6e847aa817999ab18acd534f9e6a86685bb268fc
(tdf#129859 XLSX import: don't show deleted legend entries)

Change-Id: Id24cddefa83e50dde1ec6555d02891753483dd5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88018
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-13 11:15:56 +01:00
Michael Stahl
8daffb60dd tdf#45589 sw: fix Formatting Aids options page for Writer/Web
The pre-existing problem of the lone "tab" label was compounded by the
new bookmark label.

There is no Insert->Bookmark in Writer/Web so i guess the Bookmark
checkbox shouldn't be shown.

Change-Id: I5a2348599562bb20d7a8de916d0268a133771a0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88535
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-13 10:25:21 +01:00
Samuel Mehrbrodt
d92463c88a tdf#130325 Fix listbox used as dropdown
In this case, the listbox is not used as a static widget,
also not as a combobox with dropdown.
Instead the listbox is placed in a popup to choose values from.
Need to handle this case similiar to the combobox dropdown
(Cursor movement only travels through items, Return selects one item).

Regression from 7de9417d5f65d35227c7f80f6d587c2a56bde4e0

Change-Id: Idadc3da5847e12e1408203b13ab59eb53fe14eea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88581
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-02-13 10:16:40 +01:00
Gabor Kelemen
176e06c116 tdf#119138 Show custom chart title if autoTitleDeleted is missing
autoTitleDeleted might be omitted by generators other than Excel
while providing custom title. mbAutoTitleDel is set only based on the attribute value
and the default also varies on whether MSO 2007 or newer is the generator, see tdf#78080

ECMA-376 Part 1 at 21.2.2.7 says:
A value of 1 or true specifies that the property is applied.
This is the default value for this attribute, and is implied
when the parent element is present, but this attribute is omitted.

Change-Id: If3457fe850e13ae8af207bb9beceecc9e887b797
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88151
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-13 09:54:40 +01:00
Caolán McNamara
dcf6fd8bb6 tdf#130623 host gtk FieldControl within the design view
to make this work in master

Change-Id: I96a4e7fc0993fbdcf28e2ccad17573b93f4f99dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88570
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-13 09:50:16 +01:00
Caolán McNamara
2921147f01 tdf#130623 owner of FieldControl needs to set its allocation
which works fine automatically when its in a dialog (copy table)
but not automatically when hosted inside the design view

this will make the gen case work in master, and the gen and gtk
case work in 6-4

Change-Id: I530cfa0a7e1f5b62c6812ffde255c1edf478930d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88569
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-13 09:49:58 +01:00
Caolán McNamara
4a3bb10b2f Resolves: tdf#130593 set correct range for spinbutton
Change-Id: I6691f2709aa4053798fcc1744f9f41c3c3866a33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88554
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-13 09:49:39 +01:00
Caolán McNamara
9733174ea0 inherit MediaControl from InterimItemWindow
to de-dup some code

Change-Id: I8bf20d4b57f3ec7bd2902f01e11278da8ded194b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88550
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-13 09:49:00 +01:00
Caolán McNamara
b8d0c50eff remove unneeded includes and update pch
Change-Id: I6b38e96e6eb509e9d1ea0acaf30cb2a542bdbc2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88546
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-13 09:48:36 +01:00
Caolán McNamara
7c81a8f5a1 tdf#130161 detect if a node already had an expansion attempt
and so isn't in child-on-demand mode anymore, in which case in basctl new
module/dialog children should be appended to it similarly to how they are added
if had been expanded in the earlier attempt

Change-Id: I75255fb743852c70e194bbf4828cd90b9112db79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88544
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-13 09:48:14 +01:00
Caolán McNamara
9fd9da5739 tdf#130161 adding a document dialog or modules doesn't update catalog
in basctl UI, seems to be since...

commit 44861f2435a0c487d4fb5b196f7e4fe7f9569396
Date:   Fri Aug 17 07:29:20 2012 +0200

    Object Catalog in Dialog Editor

if it even really worked before that changed UpdateObjectCatalog
to only get called for non-document changes

Change-Id: I77a94bb4859cc399e86d75fdf2c9ca7c50288b35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88543
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-13 09:47:54 +01:00
Szabolcs Toth
125dd0be47 tdf#95495 DOCX import: fix inherited list level of custom styles
in DOCX export of MSO 2003, 2007 and 2010, where ilvl and outlinelvl
settings are missing, based on the settings of the parent styles.

Change-Id: I01d239db505d46a89d7f3b9118ef0b55697bc7fc
CO-Author: Balázs Nádasdy (NISZ)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87328
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-13 09:37:51 +01:00
Stephan Bergmann
f4b6f6a8ae Hack to dynamically adapt to __cxa_exceptiom in LLVM 11 libcxxabi
(where the new change to __cxa_exception effectively reverts the change that
prompted 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 "Hack to dynamically adapt to
__cxa_exceptiom in LLVM 5.0 libcxxabi")

Change-Id: Iec4ef1dc188bea2223d99b1b7eb8adec636c98e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88583
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-13 09:23:01 +01:00
Miklos Vajna
919f639c72 find-unneeded-includes: silence broken o3tl::optional -> std::optional proposal
This is just a workaround, see the upstream bugreport for the details.

Change-Id: I2334fb3ad86db7f43bd49c694eea3c240316bfa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88566
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-13 09:04:19 +01:00
Stephan Bergmann
379d6e1dbe aImmediateMacro is unused
...ever since fdc50b0a1b9741c5610a2b6c793c8fcdf5573c76 "new
loplugin:returnconstant"

Change-Id: Ib7f8760a95112aa31e1dd2ae15229c42e5fee812
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88547
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
2020-02-13 08:14:08 +01:00
Andreas Heinisch
d75781dcd6 tdf#57307 - Expand word boundaries to include connector punctuations
Include connector punctuations when adding a variable to the watch
window using "Enable Watch (F7)" in order to add the correct variable name.

Change-Id: Idaf7699dde3f4147d603c6aea4b2381e2af497a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88575
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-13 07:20:20 +01:00
Muhammet Kara
7a27ac1060 mobile: Center inserted shapes on visible area
Change-Id: I366ef5d01ee3afb072b1f67d24015c889a41f4b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88488
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-13 06:56:01 +01:00
Xisco Faulí
09e6824bc8 tdf#130614: Revert "tdf#125520 Fix OLE objects drag&drop with 'Insert as Copy'"
This reverts commit e4cea049c80f4fd6d2a586e73fe9fa08ebd08371.

Change-Id: Ic925cb5660df152208cdc63bfee62d82fe912717
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88493
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-02-12 22:28:22 +01:00
Serge Krot
0c6ef9ba32 tdf#130610 docx export: handle bold as toggle properties
Change-Id: I4c60b7eab6430a64ea1c8bcf40d0036d0b38516f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88460
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
2020-02-12 22:24:19 +01:00
Miklos Vajna
99847d6b30 DOCX import: fix ZOrder of inline vs anchored shapes
Shapes which are anchored but are not in the background should be always
on top of as-char anchored shapes in OOXML terms. Writer supports a
custom ZOrder even for as-char shapes, so make sure that they are
always behind anchored shapes.

To avoid unnecessary work, make sure that when there are multiple inline
shapes, we don't pointlessly reorder them (the old vs new style of the
sorting controls exactly this, what happens when two shapes have the
same ZOrder, and all inline shapes have a 0 ZOrder).

Adapt a few tests that used ZOrder indexes to access shapes, but the
intention was to just refer to a shape: fix the index and migrate to
shape names where possible.

Change-Id: I670e4dc2acbd2a0c6d47fe964cb5e3f2300e6848
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88540
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
2020-02-12 21:34:28 +01:00
Dennis Francis
7155d0011e Classify shape(s) selections as 'complex'...
in isComplex() of XTransferable2 implementation SwTransferable.
This method is used by online via doc_getSelectionType() to determine the
type of selection. In writer this method used to classify shape objects as
non-complex which translates to 'text' in online, so if a shape is selected
in online, the js code there would treat it as text. This is problematic
when you want to send the correct align uno commands based on selection type.
So returning true in isComplex() for writer would correctly treat the shape
selections as 'complex' in online Writer.

Change-Id: I09fcd9e4fab48aa0d7e7d04c88bae9e1281a1b0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88158
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit c7178a12e6e57e3d85cecd09e9c0373ececbb33f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88495
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12 21:27:58 +01:00
Ashod Nakashian
c70d31a274 vcl: avoid accessing null member on unloading views
Change-Id: If4e416c7257c861b9e13352b3329d9719b159e61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87830
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88538
Tested-by: Jenkins
2020-02-12 21:27:09 +01:00
Andrea Gelmini
88d54208f1 Fix typo
Change-Id: I2b0fe68cf5346a6788bbd63242eadf872d58a87e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88556
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-02-12 19:56:13 +01:00
Caolán McNamara
4a72d6f474 drop newly unused TreeListBox
Change-Id: Iea157bb472ee409a1a15b9f6c9cfe0adc21d1a03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88449
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12 17:55:27 +01:00
Caolán McNamara
1ac2c003a2 weld ObjectCatalog
Change-Id: I1979c6f8f5705360aa0df8cb7aeaeca00cd66ce9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88448
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12 17:55:12 +01:00
Noel Grandin
607be34d37 crashtesting: convert assert to SAL_WARN_IF
Change-Id: I70a9922960dee978be05218ebf16a8186c3bc0c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88524
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12 17:35:16 +01:00
Alex Henrie
1ff2bf54e9 Add case table for Medefaidrin
Change-Id: I7325311a4a0957b1a43c36d04cbefde2ea7461eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88420
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
2020-02-12 17:33:39 +01:00
Caolán McNamara
d81489fe40 only freeze/thaw if we have to
because gtk will relayout and things jump around confusingly
and unnecessarily

Change-Id: I817e803f8ad7e523e5855326fc097f8798ddb679
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88526
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12 17:28:50 +01:00
Noel Grandin
5b1a757993 add some more libs to libmerged
Change-Id: I2d3c3d64f1fb1d3635bdde761f6502ba05221f95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88522
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-12 17:26:12 +01:00
Caolán McNamara
c5d2c4cac8 we always want to expand/collapse on double click
Change-Id: Idf5496b44f5e2d5782d99317029aa0e9cb99e8d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88527
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12 17:05:39 +01:00
Caolán McNamara
18dd0254a3 cypress: mobile: Font size combobox is broken on core/master.
a) for vcl version, listen to modify and select, instead of just modify so
we can get the artificial select via uiobject that the mobile makes use of.
(and disregard the modify which we know will lead to select so we get just
one event in that case)

b) default to assuming something has been picked "directly" unless we
know otherwise.

ideally the result is that
https://cgit.freedesktop.org/libreoffice/online/commit/?id=08d6c3fdf9bac4ad8318151ab1402690eb950f52
isn't needed

Change-Id: Ibbf33eab88dabd55d0c329aa00c8adaf001a4f50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88476
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12 16:46:49 +01:00
Stephan Bergmann
6dd94a4dd8 Blind fix for Linux aarch64 with libcxxabi
...after untested a7d1fed24557b203acb5016a98af26f4ef24d27a "Hack to dynamically
adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi" had been submitted

Change-Id: I68694645825ddebb249a90d9af9b8ba04c0bdbb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88519
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-12 16:20:15 +01:00
Noel Grandin
b54e6db754 crashtesting: remove assert in SvXMLImportContext::SvXMLImportContext
which came from
    commit 813118bfbb453f812be9e1a30f84908b4e0bfb51
    Date:   Fri Dec 20 14:34:56 2019 +0200
    add checks to optional fields in SvXMLImportContext
but it turns out various places abuse this field and pass stuff that is
not a element name, including empty strings

Change-Id: I33cfc7e44e0aafe0fdb084482a199d5cffde6a76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88523
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-12 15:34:49 +01:00
Henry Castro
0373e37748 lok: add "type" information when a graphic is selected
Change-Id: I67a36d3aabbc197d9ac8f6ca4509dafd6f2620f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87991
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12 14:59:04 +01:00
Jan Holesovsky
16fb30a16d android: Don't show the multiline toggle in the formula input bar on phones.
The interaction there currently distorts the view and occupies too much
space anyway.

Change-Id: I093432dcfc223e4ea8b0f5a3cc45368f90c3cc0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88477
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88481
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12 14:33:41 +01:00
Dennis Francis
f5f39903f4 Get the align states of draw-shapes in...
SwDrawBaseShell::GetState() so that the align buttons are informed
(in core desktop and online via statechange messages)

Change-Id: Ic69fb03bc98f39b1a6a389d50d3d6404fefd7f29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88159
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88453
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12 14:25:17 +01:00
Dennis Francis
da07683479 Allow boolean valued statechange messages for...
object align commands :

ObjectAlignLeft [SID_OBJECT_ALIGN_LEFT]
ObjectAlignRight [SID_OBJECT_ALIGN_RIGHT]
AlignCenter [SID_OBJECT_ALIGN_CENTER]

What is pending is to set correct align state items for Impress in
DrawViewShell::GetMenuStateSel(). For doing that we need to store
the object align state somewhere when we execute SID_OBJECT_ALIGN_*
in DrawViewShell::FuTemporary().

For Writer the align state information was already available in
frame-format-manager object.

Change-Id: I86fcf59cfc66af98097611277201ecaa3b8c22cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88077
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88452
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12 14:24:52 +01:00
László Németh
f15d674429 tdf#129575 DOCX import: fix table style preference
handling by recognizing docDefault properties
instead of default-value based heuristics.

Change-Id: I3bab9d85d77d0e5f1c357121b1caf02cbe4899c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88457
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-12 14:16:30 +01:00
Noel Grandin
1f625b3f74 move some svx/ headers inside the module
Change-Id: I8d9a50039a8139caebb2cfb83ca476d39432f255
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88238
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-12 13:11:28 +01:00
Michael Stahl
1b4f6c81de ofz#20455 sw: add some checks in SwTable::CheckConsistency()
Check consistency of number of boxes in SwTable and nodes.

Change-Id: I617f99282b900b17a65ecd18fdd8e8f8860896db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88471
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-12 13:08:02 +01:00
Caolán McNamara
086e431480 ofz#20455 sw: HTML import: fix invalid table in footer
The obvious problem was that a bookmark failed to be copied to the
correct node, it was created on a SwStartNode, which failed in
makeMark() and caused a null-pointer.

The target position was off by 1 node because there was a spurious
StartNode/EndNode pair directly below the table:

[  41]   0x5b13430          TableNode ,
[  42]    0x5b1d010         StartNode ,
[  43]     0x5b12a50        StartNode ,
[  44]      0x5b135f0        TextNode "",

This was created by a special case in SwTableNode::MakeCopy() because
.GetTabSortBoxes().size() == 1.

But the table had actually quite a bunch more cells in the nodes-array,
just they were not yet in the SwTable.

In an exciting twist of events, it turns out the table was copied while
it was not yet finished parsing: the problem was that in the middle of
the table, some CSS set some page attributes, and this caused a
first-page page style to be created in SwCSS1Parser::ParseStyleSheet(),
by copying the master page style.

Unfortunately the table was in the <div title="footer">, so it was
copied in this incomplete and inconsistent state.

It might be possible to get rid of the special case in
SwTableNode::MakeCopy() by restricting the special case skipping of
StartNodes at the start in SwNodes::CopyNodes() a bit so that StartNodes
whose EndNodes are copied aren't skipped; at least that's the most
reasonable explanation for the special case.

But for now just fix the HTML import.

Additionally, only on MacOSX, using libc++, this triggered an assert:
  Assertion failed: (!pImpl->mpStaticDefaults || typeid(rItem) == typeid(GetDefaultItem(nWhich))), function PutImpl, file /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/svl/source/items/itempool.cxx, line 611.

Probably because SdrTextAniCountItem is not marked DLLPUBLIC.

Change-Id: Ia167265e7540eea649801eaac2b89f9e18b685cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87859
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-12 13:07:39 +01:00
László Németh
a9ba8e57a4 Revert "tdf#118947 sw tablestyle: manually scan parents for ::SET"
Except its unit test.

This reverts commit 6bced3c6a1bf8d4652dd6ba75e41b128ce1bfc5c.

Change-Id: I525edd59b9d4d522048b272575285f13675413e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88456
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-12 12:54:09 +01:00
László Németh
362437b58a Revert "related tdf#118947 sw tablestyle: no need to avoid numbered para"
This reverts commit 6ed87cc5a4f755f360951550cac836e8967fc6bf.

Change-Id: Idd56da3056b60a60228875c644d57099b3d2520f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88455
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-12 12:53:42 +01:00
László Németh
c90b6a208d Revert "revert obsolete writerfilter hacks for tdf#119054 and tdf#128752"
This reverts commit 749fd6508504cf3b2e3822eca52a67fa36d75fb8.

Change-Id: Iad4cd836e2908e2c21e70013f88af213b3a1822d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88142
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-12 12:53:24 +01:00