Change-Id: Icf18e8be2ec07bb4bcd6edce3e41a6e88ecefca7
(cherry picked from commit 56d62036)

Background Tab was replaced with Area Tab on Paragraph Style
Dialog. With that we lost the opportunity to set character background
color. So bring back the Background tab as Highlighting.

(cherry picked from commit 9874db20)

Change-Id: I29925f72816fbd27243060231d551e6590f1b9d9
Reviewed-on: https://gerrit.libreoffice.org/16324Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

Use 'Highlighting' also on Character Dialog.

(cherry picked from commit 3588a04f)

Options: Background -> Highlighting

(cherry picked from commit b47151f5)

Search By Format: Background -> Highlighting

(cherry picked from commit 16d202f2)

Make this string localizable

(cherry picked from commit a676ad5e)

Change-Id: Ifa48799bb9e415d17f4e323008fac57270bae34b
Reviewed-on: https://gerrit.libreoffice.org/16322Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

Change-Id: I541577e0b99b0144a755e5755adc890c0ca8d204
(cherry picked from commit ffc1ffed)

Undo of a delete always leaves a pam that points to the start of the undone
area and a mark to the end of the undone area, even if that area is empty. (In
the normal where there is a selection this can be seen by selecting something,
deleting it, and undoing and the newly undeleted stuff is again selected)

The table overwrite/paste thing looks to see if a mark is set and goes off to
"do something very complex" if its set. So if after each undo cycle, you
physically click at the point where the cursor is flashing (which clears the
mark) and then paste, undo, *click*, paste you get a wonderfully stable
experience.

It seems reasonable to me to "do the simple thing" if there is no mark, or if
the mark and point are the same, i.e. there is nothing actually selected by the
PaM.

Change-Id: Ib451090f3863fde41209cc1fc9cfa0c747d0be58
(cherry picked from commit e06905df)

Change-Id: Ic46be8ac6da04663096e682d17faa214b324e8bf
(cherry picked from commit ff2dd794)

Change-Id: If6948e523fd681dbe289909df68364806628ead6
(cherry picked from commit 56f5a402)

Addition of .uno:StyleApply , .uno:StyleUpdateByExample and .uno:StyleNewByExample uno commands to the sidebar

Change-Id: Iab6f1fb465066fce523fd376038a059189f1b842
Reviewed-on: https://gerrit.libreoffice.org/16279Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
(cherry picked from commit e436f311)
Reviewed-on: https://gerrit.libreoffice.org/16306Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Debugging with Visual-Studio, attach to soffice.bin

Description:
Start
  make debugrun
after the start of LO, in VS-Debugger
  "Attach to Process" to the soffice.bin
then start in other box the test with
  make gb_JunitTest_DEBUGRUN=T JunitTest_YYY"

Change-Id: I44571d1d4feafe9ce836d71781eaf793fe72cb92
Reviewed-on: https://gerrit.libreoffice.org/16290Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 335ea181)
Signed-off-by: Michael Stahl <mstahl@redhat.com>

By "complex selection" I mean:
1. Selection with an empty paragraph that has a bullet.
2. Selection that has different font sizes.

This is a regression of
5b32d9c4 that tried to
fix tdf#61492. In reality in order to fix that, it seems
to be enough to pass an empty SfxItemSet, because what we
really need is to invalidate the bullet width (by setting
it to -1), thus force recalculation, and this occurs
anyway.

Change-Id: I92545192f8c78ef7f1d66d72f0d8e8f256f87604
(cherry picked from commit 2a05cb81)

The items count of NumberingTypeMgr is limited by 8, but
some languages have more items, so remove that limitation.

Also fix the behavior of the 10th item. The old sidebar
popup had a "None" item, whose id was 10 (defined by
DEFAULT_NONE from include/svx/nbdtmg.hxx), and that causes
now the 10th item to behave as on/off toggle. Since we
don't have a "None" item anymore, get rid of that behavior
completely.

Change-Id: I5546ca637f9951cc093a7bbf8fda11dc35341d4e
(cherry picked from commit 71b35212)

Change-Id: I74d799f10d4a1d88256c683f913b8c639d2694c1
(cherry picked from commit 4331aa3c)

Change-Id: Id3cf58660bfcaf7424d027773894ce6888df788a
(cherry picked from commit ef530d39)

Regression from ed6b7d97.
These buttons are implemented inside the sidebar, so just
changing command names in the ui file won't work.
Also, following the decision to use indent buttons across all
modules, there is no need for 2 separate toolboxes anymore.

Change-Id: Id9af0cd10fd0517be86b9793c187cd6508029732
Reviewed-on: https://gerrit.libreoffice.org/16199Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit a861a234)

Change-Id: I9d4fc8e3edac699c8543ab9dce8d0e35bbf40e5b
(cherry picked from commit 9ef67136)

... not in cell areas of all sheets.

Change-Id: I8d19c15c6d8d89652ac5695214bc4dd930783087
(cherry picked from commit 80ec99db)

There's a fly anchored at a paragraph inside of a table inside of a
redline, and for some reason MoveRange() calls SwTableNode::MakeFrms(),
which asserts in frmtool.cxx AppendObjs().

The problem is that _SaveFlyInRange() removes the frame format from the
SpzFrmFmts but it is still reachable from the SwNode::m_pAnchoredFlys.

Change-Id: I3853c0072662bfb4f71f78451d3604ed567cd584
(cherry picked from commit a624cf52)

(cherry picked from commit dbd09317)

Fix previous commit

(cherry picked from commit f96313d1)

56b5212595f7750965a7620498fb063422f2eae0

Change-Id: If25443f27ff09aca8b38d00ab80ecfdc00ab2642

Actually the RPN token needs to be replaced as well if it was
referenced.

Change-Id: Ie548568dceadaf315ae5596c480916730bed2dca
(cherry picked from commit d53ad925)

Change-Id: I98fbcb9849f2c2b1f26109a54ecbf5347cdd8b4e
(cherry picked from commit 1d463600)

with the exception of -h|--help.

It only makes sense to run unopkg with root priviledges if adding,
deleting etc. extensions system-wide for all users (i.e with --shared
or --bundled switch). In all other cases it only messes up access
rights to extensions, so prevent that.

Fusion of 723e0999 and 9444ffc9

Change-Id: Ifa273a4d66b85d9d7ed7e8e22036ccc821507fd2
Reviewed-on: https://gerrit.libreoffice.org/16293Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

Issue exposed by fix for tdf#91727.

Change-Id: Ia1eafbd4db28bcfa6c90e0d58735e232c7449f83
Reviewed-on: https://gerrit.libreoffice.org/16252Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

This clobbers the functionality from commit:

    06d73142

    make idle timers actually activate only when idle

Since now all rendering and re-sizing is done in idle handlers it
does effectively the opposite of what was intended. A better solution
would allow special-casing the processing of just rendering,
re-sizing and window management to spin for eg. progress bar
rendering.

Also add helpful debugging labels to the idle & timeouts.

Also cleanup the Idle vs. Scheduler handling.

Also ensure that starting an Idle triggers a mainloop wakeup.

Also add a unit test.

Change-Id: Ifb0756714378fdb790be599b93c7a3ac1f9209e6

Change-Id: I015306a37abeaef17830ceab0f39cb2f3a98155c
(cherry picked from commit 14aa5c58)

The line with in the sc version is only 1px as a test.
Changed the icons to fit better into impress, modify insertfootnote ("i" slighty moved down).

Change-Id: I3d7813a016b78f5c6568686ae123009d58b9cc3c
Reviewed-on: https://gerrit.libreoffice.org/16261Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit e60e55ce)

Change-Id: I3eeaee8b774ab23fb4ff07c03630747cd4cac487
Reviewed-on: https://gerrit.libreoffice.org/16284Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 39bfba3e)

Change-Id: I8f6a988ef8bd3642fe6997170dfb50935e6bf3b6
(cherry picked from commit dfba7454)

Change-Id: I4c02d7613743a1b11594fd96f6131219afd102ef
(cherry picked from commit 814867c7)

the paint timer is activating after we ask gtk to
size the window but before we/gtk get the ConfigureNotify
that updates gtk knowledge of the size. So the gtk drawing
calls are clipped to the previous ConfigureNotify size.

So, lets try postponing paints if we have set a size but
not received a configure notify yet

(cherry picked from commit 8f324aeb)

Change-Id: If5e993f8e0e65053b59234fce0785398b93c1c46

another stab at tdf#91393

block paints only if the new requested size is larger than the original and
unblock on explicit expose events as well as configure ones

Change-Id: I72829a5b6e55d6bbdaf934af427ee3b50fe11fd4
(cherry picked from commit 6dc1d270)
Reviewed-on: https://gerrit.libreoffice.org/16291Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

(cherry-picked from d505f160)

Change-Id: I415ccb6132b802f62c93367a050242aee3c128b1
Reviewed-on: https://gerrit.libreoffice.org/16286Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

Change-Id: Ic743bb74894a3873f72333a5d33211964e7bcdaf
(cherry picked from commit 92d77c1c)

fixed by commits 4dd2e61e and fae87e03

Change-Id: Ib6ca689af61187b32283753f80abaed96406f409
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit f36ac1aa)
Signed-off-by: Michael Stahl <mstahl@redhat.com>

commit 9f01951b also did the extra
Remove/Add for Draw fly objects, and it turns out that that's actually
wrong because SwTextFlyCnt::SetAnchor() will set the anchor without
locking anything if it's a Draw object.  Replace it with a different
hack in SetAnchor() that applies only if it calls LockModify().

Thanks to Varun Dhall for creating a reproducer document.

Not sure if the LockModify() could be replaced completely, perhaps it's
just an optimization to avoid re-creating layout frames for the fly.

(cherry picked from commit fae87e03)

Conflicts:
	sw/source/core/txtnode/atrflyin.cxx

Change-Id: Ib3236f289c2c4202d48ac378a53ce02130d4ce2c

Change-Id: I72aecb66d0de4ba2bc3a44f664aab8170ffb3d0f
(cherry picked from commit dc4d9481)

Change-Id: I39766373811a48a683706c391aa46a9bf89b3462
Reviewed-on: https://gerrit.libreoffice.org/15924Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
(cherry picked from commit da79caf3)
Signed-off-by: Michael Stahl <mstahl@redhat.com>

The corresponding feature may or may not be part of libreoffice-5-0, for
now just add a string, so that it's in before the string freeze.

(partially cherry picked from commit
ef0217f2)

Change-Id: Iea9984af3f08ed214815b9477019695f2339a7f3

(cherry-picked from 17cdc92e)

Change-Id: I5d44ff6d514d2e40df23f6c419463b980f39d2c7
Reviewed-on: https://gerrit.libreoffice.org/16287Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

this appears to be a mismerge of

commit e0ad036e
Author: Luboš Luňák <l.lunak@collabora.com>
Date:   Thu Feb 19 16:39:06 2015 +0100

    mailmerge doesn't need to use the singlefile technique for printing

    It should be sufficient for every record to just update the fields and print
    the document. The printing code apparently rather expects to do the printing
    in one go, so split the functions up there.

    Conflicts:
        include/sfx2/viewsh.hxx
        include/vcl/print.hxx
        sfx2/source/view/viewprn.cxx
        sw/source/uibase/dbui/dbmgr.cxx
        sw/source/uibase/uno/unomailmerge.cxx
        vcl/source/gdi/print3.cxx

where the else if block is positioned at a nutty location

Change-Id: Ia22e9e53c27256131283babaf779e57f157ba6b8
(cherry picked from commit af8f9385)
Reviewed-on: https://gerrit.libreoffice.org/16292Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Similar to 47f002cb the RPN tokens have
to be adjusted to catch also references generated from named expressions
and the like. Quite likely this may fix some non-obvious cases of
reference update bugs and listener problems. If some cases worked so far
it means we're recompiling too much..

Change-Id: I29e8427f72afdd29aa45047cb52ba59161c18892
(cherry picked from commit bff9eddb)

Change-Id: Idf1bfbac1adc083f6d697d19ca41110f765955e9
Reviewed-on: https://gerrit.libreoffice.org/16171Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 30c4467d)