Conflicts:
	extras/source/glade/libreoffice-catalog.xml.in

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

Change-Id: I768ffe9dc1226bbcca706e0c56c6103e043b2401

Change-Id: I2b9853dc5b85c034d767825ca2842738b61b54f5

Obviously, it's not safe to touch editeng :-/

This reverts commit f2d6eb4d.

instead of hand-rolling it's own reference counting

Change-Id: Ie90cdce49b9dab68f1bdf487b0f308e03464f893

tinderbox 50 is failing, trying to fix it

Change-Id: I81e3cbdb224110af3036f5726228fd88aba32748

a bit of mis-merge + a bit of underlying crashiness

regression from 378dc6ef

Change-Id: Id0f7b6b6f13e1ec70dc900c21d2d020a44cf6081

Change-Id: Ifd48526974b7fcb10872d53d42e26add3fe878d1

instead of re-implementing it's own reference counting

Change-Id: I2600b970544f1dfd84b987d1891c79e3c377bd1b

on some older boxes, after my commit
dac4ca5f "new loplugin: externalandnotdefined"

Change-Id: Ibcab5f39714fb531066709e91a7322270995a6a5

Find "missing headers," where a function is declared directly in the
.cxx (as extern) and not defined, and should arguably instead be declared
in an include file.

Change-Id: I6d83ee432b2ab0cd050aec2b27c3658d32ac02a2

Change-Id: I2e607156831321cc0ea5c3030befb635c5acaed1
Reviewed-on: https://gerrit.libreoffice.org/10156Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Change-Id: I5ec1ea40e57c7d9de337645421be89e1e4c5a867
Reviewed-on: https://gerrit.libreoffice.org/10157Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Change-Id: Ic4566e8a199d3f31d6d4cb2d3fd41ad7b762c02a
Reviewed-on: https://gerrit.libreoffice.org/10162Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Change-Id: I076c998f5c843b60ac5624381e51271a0924043f
Reviewed-on: https://gerrit.libreoffice.org/10161Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Change-Id: Ibfb6f7d23c0f3afbd7ef810093dbbec7f9134aaa
Reviewed-on: https://gerrit.libreoffice.org/10160Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Change-Id: I9223fc0620bf31389ab4ea0971835dd7a27feb7e
Reviewed-on: https://gerrit.libreoffice.org/10159Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Change-Id: I3b069278297c489b0aeb54ebef484c73dee503c0
Reviewed-on: https://gerrit.libreoffice.org/10158Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

This was missing in e07cefb4.

Change-Id: I1c9a3f88981ee67d9d5748f9e43eed1237422fb1

Could already be set up e.g. if a client application is using UNO
separately, in addition to LOK.

Change-Id: I50c3230b6f2456360273902a308c303576baac10

Change-Id: I8ffc8249a4d1b7530ee208cf84b48af832758a4d

Change-Id: I70bbbac0dff8c64bedcf8a46006378291a7fac23

We cannot call osl_setCommandArgs twice, however there is currently
no way to determine whether or not this has already been done. This is
necessary e.g. for LibreOfficeKit where we may also be using UNO
separately (and also for unit tests where LO is already set-up prior
to the unit test running, and therefore we can't set up osl again
from within LOK).

Change-Id: Id1f357ef604eb2b6b7814c9a04ac6933a39fd3eb

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

vcl/osx/salframeview.mm:201:16: warning: 'useOptimizedDrawing:' is deprecated: first deprecated in OS X 10.10 [-Wdeprecated-declarations]

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

vcl/osx/printaccessoryview.mm:362:37: warning: 'NSScaleProportionally' is deprecated: first deprecated in OS X 10.10 - Use NSImageScaleProportionallyDown instead [-Wdeprecated-declarations]

Available in OS X v10.0 and later. Deprecated in OS X v10.10.
enum {
   NSScaleProportionally = 0,
   NSScaleToFit,
   NSScaleNone
};

Available in OS X v10.5 and later.
enum {
   NSImageScaleProportionallyDown = 0,
   NSImageScaleAxesIndependently,
   NSImageScaleNone,
   NSImageScaleProportionallyUpOrDown
};

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

fpicker/source/aqua/SalAquaFilePicker.mm:220:14: warning: 'NSOKButton' is deprecated: first deprecated in OS X 10.10 - Use NSModalResponseOK instead [-Wdeprecated-declarations]
fpicker/source/aqua/SalAquaFilePicker.mm:225:14: warning: 'NSCancelButton' is deprecated: first deprecated in OS X 10.10 - Use NSModalResponseCancel instead [-Wdeprecated-declarations]
fpicker/source/aqua/SalAquaFolderPicker.mm:114:10: warning: 'NSOKButton' is deprecated: first deprecated in OS X 10.10 - Use NSModalResponseOK instead [-Wdeprecated-declarations]
fpicker/source/aqua/SalAquaFolderPicker.mm:119:10: warning: 'NSCancelButton' is deprecated: first deprecated in OS X 10.10 - Use NSModalResponseCancel instead [-Wdeprecated-declarations]

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

Project: help  c7229c8a250f7387c090f20a0fd9171fdcd576d1

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

Change-Id: Ie3cfad9f39d55095fce638a33ee6383c967d5475

Change-Id: I726f4d62ab062fbd41376183f60c26d8e6cfe33e

Reproduce:
- Insert two models
- Play first model
- Delete second model
Result: crash (windows) or first model disappear from the
opengl window (linux).

Change-Id: I940960754f42a2e4faf5b9f37c0d4a3c155e4650

In general, it's not a good idea to add a help text for a widget on
the importer code. And in this case is consistent with MS Office
behavior: help text shown only when the field is empty.

Change-Id: I18b640549f558a190c0fdada825e80e6a730f69d

Change-Id: Ie684da5922d9f645495a1965b9462d0ae2de2342

Project: help  9f3d8e13a9180997db0bc525030fbc5e8ba59f21

avoid opening again a document that is already available
apply to calc - refactoring ScStyleFamiliesObj::loadStylesFromURL

Change-Id: I6b26c91265dcafa73b472bc68ee684ba0733b0ac
Reviewed-on: https://gerrit.libreoffice.org/10214Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

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

Reviewed on:
	https://gerrit.libreoffice.org/9898

Change-Id: Idfe39761180ae1eeb0066ae3aac13de6ac6df0b9

and

coverity#706460 Uncaught exception
coverity#706458 Uncaught exception

Change-Id: I580e4dbcb1c65404fe7e93098eb44b5d5d004e8b

Change-Id: I4329eaaa29d5689471092c167104711e4f8c115c