and de-ifdef-per-platform the patch makefile so an upgrade attempt on one
platform tests the patchs applying on all platforms

ubsan.patch.0 was effectively applied upstream while need
to add http://rt.openssl.org/Ticket/Display.html?id=3650 to build
under windows

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

moving to a new row will set the new type, but initially
its not set because the ListStore property was set after
the model is connected to the database so at the initial
connection time there isn't a available set of values
to map the row to.

So move that connection code from general.cxx to datman.cxx
and put it before the connection is established

we can then remove the intermediate aBibTypeArr list and
those resources then need to be global bib ones.

Change-Id: I12276c3df9955ec399e1b5de6d0836c69ebb1ebb

Change-Id: Iebdc66d1c994e3702efa5609fb36b5b2b9273c86
Reviewed-on: https://gerrit.libreoffice.org/15217Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>

...as follow-up clean-up after 71fefe1d "Change
'blink times' to be of type sal_uInt64 and thus consistent with
Timer::Get/SetTimeout since 9c7016b5 'Scheduler:
Changed uLong to uInt32/uInt64.'"

Transitively meant to change quite a number of further time-related places from
sal_uLong/sal_uIntPtr to consistently use sal_uInt64.

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

Ensure that only desired tokens are obtained and the resulting new token
is actually the current one upon return.

Change-Id: I624c324b861d8658accf3285cad2cfc5a598b450

Change-Id: I1263f190d769254949701b3a257b2af5d6ea61a2

Change-Id: I73109e5a862b2f4bc456dff512bddf5d23586a6d

Change-Id: Ia4a52a5e605474738983d48a925b6b3ba90877d4

but the PanelLayout didn't

Change-Id: I38a8975f1488fa2a2ffe91b66745e1a1c6c48a28

Nothing obvious that would speak against converting from the original
SvStringsDtor to plain std::vector<...> instead of slavishly sticking to
boost::ptr_vector<boost::nullable<...>>.  Also, prevents a false -fsanitize=null
warning about "reference binding to null pointer of type 'rtl::OUString'" in
boost::void_ptr_iterator<...>::operator*() during ~SvxClipboardFmtItem_Impl().

Change-Id: I08d8fc573ff99a5bddd67c0d2be4e7ea38025958

Regression from commit bb00a009 (do not
bother with nice unique names during mailmerge, 2014-11-08),
SwAttrSet::CopyToModify() expects that in case SwDoc::FindNumRulePtr()
returns 0 for a name, then the call to SwDoc::MakeNumRule() will use the
not found name (as SwDoc::GetUniqueNumRuleName() will return the just
checked name).

As a result, simply always returning a random unique name during mail
merge is a problem. Only return a cheap random unique name if no hint is
given.

Change-Id: I49d65009ced97d00aa2e8db35a529f2f30ac9ae5

Change-Id: I92c171b5900d770195bcad71a7df2a282649d479

resize *after* setting visibility of controls and not before

Change-Id: I9318b8a5bc1f4afc6f4ceb4503af3425d0f6364b

this reverts

    commit f0ee8ed4
    Author:     Caolán McNamara <caolanm@redhat.com>

        see if we can merge floating window and dialog child size/pos setting

seeing as we apparently can't merge them the way that tried to do

Change-Id: I25fb741c9ae73375124b469f98bf1eecd76ff3c1

Change-Id: Id9ba3dbd1df46638eb4ca2ef84ba1b40ca424108

Conflicts:
	sw/source/ui/chrdlg/numpara.cxx

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

Conflicts:
	sfx2/source/dialog/mgetempl.cxx

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

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

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

Change-Id: I715374b531da2850434b2436633b6042ecb9ebe0

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

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

Change-Id: I13cbde947d6252c1157ec79a5f2190df24cca978

When tiled rendering, we always want to create some kind of selection
when long pushing on a table cell. If there is at least one word in the
cell, then we want to select the nearest cell, and when it's empty, then
we want to select the cell itself.

In case there is a table with 1 rows and 2 columns, and A1 is empty, but
A2 has multiple lines, then in A1 there is an area that's outside the
text frame of the empty paragraph, but inside the A1 cell frame. When
clicking on that area, the cursor position gets corrected. With this
change, we get a proper selection on long push even when pushing on that
"outside text, inside cell" area, too.

Change-Id: Ic61743014708f127087243cb7b129f8abd72edaa

Change-Id: Id4194f4d5bb6fcf064985fddc6f7344a4d34ca04

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

Change-Id: Ie348778ea666c24e95e048386547f301083a0017

this has niggled me for decades

http://german.stackexchange.com/questions/7528/meaning-of-behind-when-translated-from-german

summarizes it well

"'Behind' is typically used when the context has meanings of depth, and as such
becomes ambiguous when used in a flat list ... 'After'/'before' contain
meanings of ordering which are unambiguous"

Change-Id: Ib2e7244f1dc0a66a9ca30df3a20e31de7a9b9d09

more 'extern C' fallout from my conversion of enum to scoped enum

Change-Id: I4c9aabbfbd255775a8f3edc2b7c8c62647f539eb

Change-Id: I77914d1b6fe538f3f38beb449e68f50ae36b0798

since after my converting stuff in include/registry/types.h to use 'enum
class', it can obviously no longer be "extern C", so drop the "extern C"
and rename the file to reflect that.

Change-Id: Ia30f5731316525e48531c4785ab7471a428bcf6f

Change-Id: I033cc6fce66203ad2967064211f9144b0edf8d1e

Change-Id: I2177e424d54dc2b5e26b7bbfe073b524e9cc5bab
Reviewed-on: https://gerrit.libreoffice.org/15187Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

Change-Id: If1649e8f3b9d200b0b176bef7deea41445bd3f2f

Change-Id: If0a2eeeabbb0bea48d2f2f86dc04266812c0ecd2

Change-Id: I8320f6f42d5579fbd09450ddca61c4c066de98e4

Change-Id: I81599570698eb92abf14fa6386d8545c2031e863

Change-Id: Ifef0aaae6208f18c1352fef7c471deb60a97820d

Change-Id: I55977c38578cb59deb195d91f8948da2e0905b6a

Change-Id: Ic672e75db4d7323760577b19490ffa28d38965b6