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)

Change-Id: I17ea45f2b1dd46a7f1c0f3ce8c680bef9ec533fa
Reviewed-on: https://gerrit.libreoffice.org/16249Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 7dee641f)

After introduction of the Idle processing, something has changed so
that the underlying GetGdkWindow() does not update its size fast enough;
even though the gtk_window_resize() is called before the Window::Erase()
(that actually paints the background) etc.

The consequence of the not-yet-updated gdkDrawable is that we cache
something that has the correct background in the top left 200x200
pixels, but the rest is just copied from the screen.

Let's for now just not cache when the GetGdkWindow() is smaller than
what we actually paint; TODO find the root cause.

Change-Id: Ib6092668eb4613899f665bb0f12fc1eb15484e13

Change-Id: I3388a75bb8aa23d8a8998671f25b5297352efca8
(cherry picked from commit 688995bb)

with tons of missing styles

Change-Id: I93c41f1e461a6e148e9f4c1dd84a598ca0090b54

(cherry picked from commit 7750dfcc)

Change-Id: I04a3990b90bd84c680df56ab6a5dc9eca575e696

“1 is less quality, 100 is more quality.” You don’t say?!
These are things that any person can deduce by themselves
by looking at the sliding bar.

Let’s not assume users are idiots who need to be told
obvious things, and in *two* mostly identical sentences.

Change-Id: Id1de16b078712009a1fce4d21f7509f873d35bc0
(cherry picked from commit 543389a8)

Change-Id: I1534a0f43201a594b727ee8b42b697c8c1b5e224
(cherry picked from commit a952bf82)
Signed-off-by: David Tardon <dtardon@redhat.com>

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

Change-Id: I0354bca230395d8061bb6d9ce9f9b7a6229b73a7
Reviewed-on: https://gerrit.libreoffice.org/16234Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 5956cbcb)

fixes regression from commit 4467c67d,
where the new optimized code path failed to properly register
ScFormulaCell with ScExternalRefManager.
Introduces a new public method in ScExternalRefManager: insertRefCellAsTmpl
that registers a formula cell to listen to the same external references
as template cell
Introduces new property to ScFormulaCell: mbIsExtRef
that indicates that some external references are referenced by this cell

Change-Id: Iee07d7b51949fd31953b5fa662a213052eb85181
Reviewed-on: https://gerrit.libreoffice.org/16066Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 17282387)
Reviewed-on: https://gerrit.libreoffice.org/16219Tested-by: Jenkins <ci@libreoffice.org>

Change-Id: I302ab9e38831403cbb4aa96c61d4862f43537e8e

Change-Id: Ibdcfdd6175e6ccb8aded02d59b1b21e92a0fc120
(cherry picked from commit 6d7dcb81)

Similar to beb5879f8fea231a037acf010812df2dffbe302d it is not sufficient
to adjust only the parsed tokens, generated RPN tokens need to be
adjusted as well.

Quite likely also other Adjust...() functions have to handle this, need
to investigate.

Change-Id: I5de4e2238703b3ce134f7d46a87bd7a4fb940cff
(cherry picked from commit 47f002cb)

regression from

    commit 3d652128
    CommitDate: Thu Jul 31 22:14:25 2014 +0200

        fix memory leak around function descriptions

        Found by Lsan.

There are two implementations of getCategory, one (sc) returns a new one each
time (hence the leak fix) and the other (reportdesign) returns a pointer to one
that belongs to the manger (hence the crash).

The code in formula really looks to me to expect that the getCategory return a
pointer that "someone else" needs to look after, i.e. the reportdesign variant
is the more correct so revert 3d652128 and to
fix the leak make the sc own the ScFunctionCategories and just cache them like
the reportdesign one does

Change-Id: Ifd986301a54b4d20449e864697655cd973e0c4df
(cherry picked from commit 7c3abee2)

... in Writer.

This (partially) reverts commit ebabf6d1.
I did not see the point to open Fields dialog by default, but other uses
are fully valid.

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

Just in case someone had it in their MRU function list so will be
presented with the same function. It doesn't really matter.

Change-Id: I4f1023f9650719ccccad97a669b24f5cdd044f16
(cherry picked from commit 67360b28)

of CEILING and FLOOR

Change-Id: I9537d9bd8dbca2eac769e74e9d3d5b298b76f594
Reviewed-on: https://gerrit.libreoffice.org/16016Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit cb13c46d)

The fix is twofold:
1. retrieve transparency from colour in SvxBackgroundColorItem
(add QueryValue, PutValue methods, use additional memberID to
retrieve alpha channel as a bool property)
2. add CharBackTransparent bool property to Draw [text] shapes

Change-Id: I6e14b81cc82f6b4d7fdd4756ff2e4f75e9270361

Change-Id: Idb1c5051de5ddb0501b8d1440f8abe62074296bc
Reviewed-on: https://gerrit.libreoffice.org/16144Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>

Change-Id: I3be1a13a00e3219cb8912ef61a9627d37036d19a
(cherry picked from commit 29f6ef46)

Change-Id: I402bd7319d31859510a06644eb7dc786d56b312e
Reviewed-on: https://gerrit.libreoffice.org/16213Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

(cherry-picked from commit c8344322)

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

Change-Id: If711d2f1c7a5d586746d4f27dabc8e441c38a2aa

The CPython changelog says for version 2.4:

- Python no longer relies on the LC_NUMERIC locale setting to be
  the "C" locale; as a result, it no longer tries to prevent changing
  the LC_NUMERIC category.

(cherry picked from commit 1ee5e1a1)

Conflicts:
	pyuno/source/module/pyuno_runtime.cxx

Change-Id: I6d63c4dedca48c99bf81135d69285d9116a19740

Change-Id: I28b0c9712d3eb35181ccd323e583d947db06094d
(cherry picked from commit f6e5a0ac)

Change-Id: Iec22ad67c9deaada827ba8eac47581e08f934353
(cherry picked from commit 782c116b)

be1b3dae missed a few cases
* a deleted reference start was shifted by two sheets instead of one if
  the formula was on a sheet before the deleted one
* a deleted reference end was not correct if the formula was on a sheet
  behind the deleted one and used relative sheet reference
* #REF! wasn't set when the entire referenced range was deleted

Change-Id: Ib9c7492a651a8429fa1c411c8e447593e366e09d
(cherry picked from commit 20e4ccc6)

Change-Id: If2b25caf779830fdb34a7de6a33784a246d12531

Add a test to check if name already exists

Change-Id: Ie23de04c0b747f58ab61a6e498bf212bf38b346a
Reviewed-on: https://gerrit.libreoffice.org/16000Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3807946b)
Reviewed-on: https://gerrit.libreoffice.org/16055Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>