Change-Id: If4337153f8b0edb424132ab60b50dc5a89ca25ee

PROTECT_FORM maps to enforcement = true, not "everything is protected".
"The enforcement of this property is determined by the documentProtection
element (§17.15.1.29), as it is possible to specify protection
without turning it on."

So, sections should retain their protected on/off status
regardless of the value of PROTECT_FORM. My guess was
that this was to offset the fact that DOCX import did not
import protected status, so this helped to protect the
sections that should not be unprotected. A followup
patch will address the import side.

patch initially developed to support tdf#120499.

Change-Id: I8ff6d31711651a4827cbb8520fd68e88273d6799
Reviewed-on: https://gerrit.libreoffice.org/61905
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit fa667b6d)

Change-Id: Ib4f100d4019643cde893ef1d8643a5c08b55ff8f
Reviewed-on: https://gerrit.libreoffice.org/61951
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 2ec0cf50)

Just because some sections are unprotected doesn't mean that
the document should not open in forms mode. MSWord 2016
opens it in "forms view" mode which also doesn't allow
editing those unrestricted settings. Only when choosing
the "Edit Document" view are the unprotected sections
editable - similar to LO turning off the Compatibility:
Protect Forms flag.

Unfortunately, the "I want to address this" comment
was from 2011, so obviously his temporarly solution
became more permanent that expected.

If this patch now blocks someone from being able to edit a
document (because now only the forms components of the
document are editable) they can remove the forms protection
by going to tools - options - LibreOffice Writer -
compatability - and disable Protect Form.

patch developed to support tdf#120499 and depends on the
patch for tdf#37778.

Change-Id: I86e26095ade6b2cf0ab8ea8fc941a92fa672a2f7
Reviewed-on: https://gerrit.libreoffice.org/61901
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 3e2e4907)

Protection is not related to fReadOnlyRecommended

In Word, documentProtection enforcement is a document level
setting which is required for the section protection setting
to be enforced. formprot: "The enforcement of this property
is determined by the documentProtection element (§17.15.1.29),
as it is possible to specify protection without turning it on."

In LO, section protection is honored if it is simply enabled,
so only enable a section's protection if the enforcement
variable is set. Round-tripping will lose the fact that
sections are marked as protected if the enforcement is off.

patch initially developed to support tdf#120499 where
the focus is on sections, not on read-only and the
fake section that was being created.

Change-Id: I08c37ea6a9cc8fd1bdf7f36771b2d719bf9c93d6
Reviewed-on: https://gerrit.libreoffice.org/61899Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 8ba20167)

Change-Id: I30a8fb0568f00253f8d7a55eab51279f639b33cc
Reviewed-on: https://gerrit.libreoffice.org/61982
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 2b276917)

Change-Id: I55814a6b4cdfda93a51621b5b31c166507a7e7a6
Reviewed-on: https://gerrit.libreoffice.org/62005
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 49d304c4)
Reviewed-on: https://gerrit.libreoffice.org/62028Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 79511385)

Change-Id: If352e7a0f6e8dab2a9acc9aa2cde56b40cedb50c
Reviewed-on: https://gerrit.libreoffice.org/61993
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 392ec204)

Change-Id: I73a617137bf0b3b567181ff817069944076eab0e
Reviewed-on: https://gerrit.libreoffice.org/62022Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3ec5fb84)

RTF export at the moment exports children of group shapes as a flat
shape list. This means that the order inside the group shape is not
relevant for the toplevel ZOrder, so just don't write it.

(cherry picked from commit 2b920bdc)

Reviewed-on: https://gerrit.libreoffice.org/61904Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 1c6bea8e)

Change-Id: I870707cb28c2f177c0e5d9cf5328260e76b661f3

Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7
Reviewed-on: https://gerrit.libreoffice.org/61969
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit b1c85cdb)

since...

commit b4bbb5e5
Date:   Sun May 17 22:56:46 2015 +0900

    refactor how font, fg. and bg. are applied in widgets/controls

revert the relevant piece, in this case there are two Windows/Contexts getting
their settings manipulated, rather than the usual one

Change-Id: I0a228aee6aaf1f58b2235fccf14dc63ffa96dd2d
Reviewed-on: https://gerrit.libreoffice.org/61317Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 0be3a5ee)
Reviewed-on: https://gerrit.libreoffice.org/61525
(cherry picked from commit 3e69c24b)

This results in a garbage OUString.

Change-Id: I03b8030a812d7016df5c29f1341749fbdedf1729
Reviewed-on: https://gerrit.libreoffice.org/61652
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit bf0276f0)
Reviewed-on: https://gerrit.libreoffice.org/61674Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 2c93c692)

Change-Id: I0ca70cdb9b80305c5339668d65d2c4c9977e7160
Reviewed-on: https://gerrit.libreoffice.org/61606
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 1d4fd993)

The parent is always the ScDBCollection that contains the
ScDBCollection::NamedDBs container, not the one the
ScDBCollection::NamedDBs was copy-constructed from.

Change-Id: Ia409347f3aeb9ad7a5e68da7af727adfac98d6a2
Reviewed-on: https://gerrit.libreoffice.org/60833Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 7ea5d339)
Reviewed-on: https://gerrit.libreoffice.org/60842Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 8755c986)

Change-Id: I05a9aff0d1bddf0efd2491f09fe0fbf7144e8b4d

* Update translations from branch 'distro/collabora/cp-6.0'
  - update translations for 6.0.7 rc2
    
    Change-Id: I2fbf6583f2f1c8cf73077a0325bfa0be3e7de893
    
  - update translations for 6.0.7 rc1
    
    Change-Id: I3d8c568a8fd73465e47c0334ad02679652128020
    

Regression from

    commit 0f4b3cb7
    CommitDate: Mon Aug 10 17:12:45 2015 +0200

The chart2/qa/extras/xshape/data/reference/tdf90839-?.xml
reference files were created with the then wrong default of two
decimals so need to be adapted.

For chart2/qa/extras/xshape/data/reference/tdf90839-1.xml this
meant to regenerate because of the changed positions and sizes of
labels.

Reviewed-on: https://gerrit.libreoffice.org/61826
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 9672d034)

Change-Id: Ib0c2c862af9399ab2af5178d01510aa5e4fff97c

fields are internal bookmarks. When the exporter runs
through the bookmarks, it will already write out a bookmark
entry, so don't output a separate one for the fieldmark.

Change-Id: I84af2989035507ac745d028f1585d60d8823ff8b
Reviewed-on: https://gerrit.libreoffice.org/61616
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 0a452b50)

Although this follows a very different code path, copy the ww8
import idea of "consuming" the bookmark of a BOOK_FIELD.

This is particularly important for textcontrols, especially
since LO keeps duplicating bookmarks as it adds another
bookmark for the field name at each save.

Existing unit tests that this matches are fdo53985.docx and
tdf111964.docx. I expected more, but apparently most fields
don't contain or represent any bookmarks.

This patch is for import only. A followup patch stops
the creation of duplicate bookmarks during export.

Reviewed-on: https://gerrit.libreoffice.org/61615
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 579c0749)

Change-Id: I1e11980e52dc523393fd6d621191228d676e9a17

When .uno:IconSetFormatDialog gets a parameter, it directly creates the
icon set conditional formatting with pre-selected values.

Change-Id: I75dda90e5ea9c191254acc24c564cda7b27243a5
Reviewed-on: https://gerrit.libreoffice.org/56429Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-on: https://gerrit.libreoffice.org/61660

Try to find >= 4.6 .NET SDK first.

+allow .NET SDK 4.7.2.

Change-Id: I64084e894ee829ecff091fe16a45f309a51eb4d5
Reviewed-on: https://gerrit.libreoffice.org/57550
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 9b8c8c70)
Reviewed-on: https://gerrit.libreoffice.org/59205Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

Change-Id: I20664f8c2dc2c49feec17ee6a1df72776d43cc40
Reviewed-on: https://gerrit.libreoffice.org/61635
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 9943f37e)

A bookmark cross-reference was trying to access the textform
field by name, but an autogenerated __Fieldmark__ name obviously
wasn't matching.

Change-Id: I1018fecf44fda5d947b214c599f1a405f311e2ee
Reviewed-on: https://gerrit.libreoffice.org/61565Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 4af4a473)

The area of a GroupBox indicates which radio buttons
are considered to be part of the same group. The
button needs to be fully inside of the groupbox
in order to participate. This patch resolves the last
worry of commit 9f969799

Reviewed-on: https://gerrit.libreoffice.org/61131
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 048b8e45)

Change-Id: Ie6057337c63bf9eb173a0615e30c8d4e4d0c7a19

This patch only affects calc. (Perhaps .xls* is the only
format that supports non-activeX radio buttons?)

Commit 9f969799 worried
about form and activeX buttons sharing the autoGroup_.
This patch prevents that.

Change-Id: Ia57a14f1cdd6363aa5d6d991469668fcc56016ca
Reviewed-on: https://gerrit.libreoffice.org/61095
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit a7756236)

Reviewed-on: https://gerrit.libreoffice.org/61388
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 2cae2ecf)

Change-Id: I72c79c1fed4d9a91bf02024eef23cd3b1a58632e

This is a combination of 3 commits.

1st commit:

Longer term the core Impress shape has to be improved so that it can have
text in multiple columns.

Shorter term, map text with multiple columns to table shapes, that gives
correct layout in many cases and requires changes to the import filter
only.

(cherry picked from commit aef569ed)

Commit #2:

Related: tdf#120028 PPTX import: fix font size of multi-col shape text

Normal shapes have a TextFitToSize property for this, but table cell
content has to be scaled manually, as the rendering has no automatic
support for them. Luckily the file format has the info we need to scale
at import time.

(cherry picked from commit c8b2849d)

Commit #3:

Related: tdf#120028 PPTX import: fix font color of multi-col shape text

Not just font color, anything defined via list styles were not imported.

(cherry picked from commit 800bf107)

Conflicts:
	oox/inc/drawingml/textbodyproperties.hxx

Reviewed-on: https://gerrit.libreoffice.org/61244
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 6f1fb474)

Change-Id: Id7942b16882ab1f083ded2f0e577e8c9e128697c

Change-Id: Ibe331066cb584d45391bdaad971e51ed958463c9

For MYSQL connections there is an extra window which determines how to
connect to a mysql/mariadb database. This functionality is handled in
OGeneralPageWizard::approveDatasourceType.

Change-Id: Ia3c548103b694731cba47ff5390c34b072a938a0
Reviewed-on: https://gerrit.libreoffice.org/60893Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Tested-by: Tamás Bunth <btomi96@gmail.com>
(cherry picked from commit 37dba4f2)

Change-Id: I8ef476e06f54ddd57be907488a8a65314abda3ee
Reviewed-on: https://gerrit.libreoffice.org/60828
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit c5d9823a)

affects doc, docx, xls, xlsx (at least). Handling optionbutton
groups is new since 2017, so incremental enhancements are OK.

In LO, if an option button with an empty groupName (like any form
control which has no groupName option), then it stands alone,
which is a ridiculous position to be in for a radio button.
So, lets put them all together into an automatic group.

In MSO, buttons without any explicit group stick together,
so the effective group is the entire document, or entire sheet.

One complication is that ActiveX radio buttons don't
interact with Form radio buttons, even if all of them
have no group name. That situation is not handled by
this patch (and not very likely to happen since ActiveX
defaults the group name to the sheet name).

(A Group Box can also be used, which automatically groups
all buttons fully within its area. That will be much harder
to implement since every object will need to first be
categorized as groupbox or optionControl - meaning that everything
must first be imported. That implies a function call from every
application doing the import.)

Change-Id: I204adaea75ce99999a16c0cc4e9c3b8b08da9433
Reviewed-on: https://gerrit.libreoffice.org/61064
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 9f969799)
Reviewed-on: https://gerrit.libreoffice.org/61072Tested-by: Michael Meeks <michael.meeks@collabora.com>

This reverts commit 3d92276f.

Change-Id: Iaf9c8e2ed72115e1f82d2541ae2a1d4803795a46
Reviewed-on: https://gerrit.libreoffice.org/60752
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 088af440)
Reviewed-on: https://gerrit.libreoffice.org/60768Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 005be0cd)

Change-Id: Ifbe81b851b17858a915105c102af6f4d8f2c81fa
Reviewed-on: https://gerrit.libreoffice.org/60800Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 4a63deae)

Change-Id: I1a8c8bc20ee7e97b47f0602dcfaa3cb1b771de8f
(cherry picked from commit bb26bd61)
(cherry picked from commit 606c2208)

Change-Id: Ie29c2213d8efccd7750396325ce05b4909c09d02
Reviewed-on: https://gerrit.libreoffice.org/60592Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 79093cce)
Reviewed-on: https://gerrit.libreoffice.org/60678Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 0ed572e4)

The interesting part of the layout of page 2 is:

- frame #40 is a section frame with a text frame which is in a list
  ("A")
- frame #48 is a section frame after that, with the same top=19213

Given that frame #40 has height > 0, they overlap when the page is
rendered. What happens is:

- frame #40 grows
- there are other section frames between #40 and #48 in-between, but
  they don't have an SwSection
- these frames are skipped
- then the position of #48 is invalidated

So the next time we calculate the position of #48, we look the last
skipped (previous) section frame (which still has top=19213, since its
position was not invalidated above), and since its height is 0, we
conclude that our current top=19213 is valid after all.

This is like this since commit 84a3db80
(initial import, 2000-09-18), so leave the code there that invalidates
not only the next frame, but all the way down to the first
non-SwSection-less-SwSectionFrame. But instead of just invalidating the
last frame, invalidate the in-between SwSection-less-SwSectionFrames as
well.

In practice this did not cause a problem in case the document has no
layout cache. If it does, then the frames are created on pages hinted by
the cache, then later moved to their final place. In practice this bug
was visible only in this later case. (I.e. such a layout cache can be
only created if the machine that saved the document last time does not
have the fonts needed by the document installed; and then the document
is opened on an other machine which has those fonts.)

(cherry picked from commit b5937112)

Conflicts:
	sw/qa/extras/layout/layout.cxx

Reviewed-on: https://gerrit.libreoffice.org/60658
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit e850b5a1)

Change-Id: I02ae9f63d0b4b5e9d014df53ed2cf21a04b15090

of cells of blank rows.

This workaround is probably a fix for problems of most users, but for
a full solution it needs to extend the workaround for all rows with not
default settings, also avoiding of the possible performance problems.

Note: the number 1000 of the extra rows came from a similar workaround used in
XLSX export of Google Spreadsheets, but instead of listing extra empty 1000
rows in OOXML, this fix writes only the cells with not default settings from
the extra 1000 blank rows.

Reviewed-on: https://gerrit.libreoffice.org/58575
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 99b9ea63)
Reviewed-on: https://gerrit.libreoffice.org/58812Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit d7cbaac6)

Change-Id: Icac9441b7eb1520dcd20fc04337e070d070591c7

Change-Id: Idee779cea587e11f6d0f7902182c9394e73d46eb
Reviewed-on: https://gerrit.libreoffice.org/60488
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/60544Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>