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)

Project: translations  0908a57d3f1e4695d320127de6e4f5899804c94c

Updated Slovenian translation

Change-Id: I27f886da2abec97b9080dc3d03129259ff86a52c

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>

Project: translations  6e4baf512042b86cabea051f8fdebc97c66b6e44

Updated Slovenian translation

Change-Id: Ieb4f5011295523775d2b93bdabdab461be9e7b48

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)

Change-Id: Ia7281c853454e283150bba3c79aa9579363c7ca3
Signed-off-by: Jan Holesovsky <kendy@collabora.com>

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)

It causes trouble to localiztation tools and also
makes hard to distinguish these items on the UI.
e.g. Edit -> Find & Replace -> Other options
-> Attributes.

(cherry picked from commit dd79dbed)

Change-Id: Ie7a17e02947200a570b5e6209c8a99d1883a6860

Change-Id: I82c63358d9400b2c8bd391a88bba18ffae52a14b

The SystenChildWindow in question is owned by ViewMediaShape
Fixed ViewMediaShape to dispose the vcl objects it creates correctly.
Also fix another crash in MediaWindowImpl child window correctly disposing its children.

Change-Id: If4aebcb6e5824266c154416f7246d73c6cb3509c
Reviewed-on: https://gerrit.libreoffice.org/16230Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

Change-Id: I624e64745fd3874be3e1bd3df6bac18dfb17aebb
(cherry picked from commit c1fc84ac)

Change-Id: I8b39a210490759e9f548c195e516a26b94a8b3cb
(cherry picked from commit 113adfe3)

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

We can't derive from a VclPtr base-class, and also another base,
and then use boost::shared_ptr for that; re-factor to use a boost_ptr
to hold a VclPtr<> for now. Also fix leaking envelope dialog.

Change-Id: I2e1efbfaee3b6051e38ff7a14903a83ccd75136b
Reviewed-on: https://gerrit.libreoffice.org/16160Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

Change-Id: I5a991d3b86fec0a3800d8243f73eb764789c8c69
(cherry picked from commit 15f18d1b)