Conflicts:
	sw/UIConfig_swriter.mk

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

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

Change-Id: I093586b0c979e492ea2a09dca9525b808de3ce70

And move striplanguagetags.sh to bin/ - possibly it's used.

Change-Id: I68e23ef543f4e26f617d9860681273234ec9174c
Reviewed-on: https://gerrit.libreoffice.org/4239Reviewed-by: Mathias M <matm@gmx.fr>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: I0eff88f165a737dfd9a2f348f04b17b6a6212e6f

Change-Id: Ic41fe1682f19c39faa0a2afc47c11b8a5bead212

eEncoding is assigned again a few lines below.

Change-Id: Ib475095bab30e0c2f066934a10cda650706c2c8a

Found by Clang static analyzer: Value stored to 'prio' is never read.

Change-Id: I7c0e90e5435b028f0a4b4bded304338cb57271cc

Signed-off-by: Miklos Vajna <vmiklos@suse.cz>

Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx

Change-Id: I328547c41bfc1a23f7e6233db57fbfa415e22cb3
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>

Change-Id: I7c61be2c3d368dfd3ea66427c77636f797a7e88a

Change-Id: I7744acc8cf1e8b6cad05d22df43f3d5a5beaa2f6

Change-Id: Id3ec71e8da07a8bf1c979585eb84cd5a9d6f7a77

Change-Id: I8c9ee84afd71481c2c6b002265b86e048f369f5c

Change-Id: I83a960cebb8347170a08d2fda7ed11050b8c4229

Change-Id: I941ef1dae00167460f2f0de39e472ed047539f27

Change-Id: I787371e95d9787616ca713c808098b80e40acab0

(cherry picked from commit 136976ef)

Conflicts:
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/source/gdi/bitmap4.cxx
	vcl/source/gdi/bitmapex.cxx

Change-Id: I9c3aeae76c155c9050404f67adeb91106502c3f1

Change-Id: Ia9f589752176849f7f6700483e933767e509edf3

Change-Id: Iba3b39086212803bc41384f5c8f51e42712a5249
Reviewed-on: https://gerrit.libreoffice.org/4349Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>

Change-Id: I298767cc0ec03c22d3ae687939f0f9d5ce1963c1
Reviewed-on: https://gerrit.libreoffice.org/4348Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>

Change-Id: Iba1eeb8d8fd0582f216b7552dc9ae21b69e66b4e
Reviewed-on: https://gerrit.libreoffice.org/4326Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>

Added accidentally removed {

Change-Id: Ied6c233cba113673f928c1a6b41a5217b9fff077
Reviewed-on: https://gerrit.libreoffice.org/4331Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>

better graphical preparation (currently BMP_SCALE_BESTQUALITY, but can
be changed in a single place now if wanted)

(cherry picked from commit d32f1d35)

Conflicts:
	svx/inc/svx/galtheme.hxx
	svx/source/gallery2/galctrl.cxx
	svx/source/gallery2/galtheme.cxx

Change-Id: I80879ca472c784f764126676046c1388e1167652

Change-Id: If11b5fbd96a107ed83e305127713630093ef00dc
Reviewed-on: https://gerrit.libreoffice.org/4346Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>

Change-Id: I5333ff8c4e50cbc4374b937bc8d7617c3b99ee97

Change-Id: I7db65ae46cd4fe5c36cdfda172adcb139b5ca4e0

Change-Id: I1c91b4c621c5a2da11cebdd8e58a5e5d0d86bf6c

(cherry picked from commit 144eb666)

Conflicts:
	drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
	drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
	vcl/inc/vcl/outdev.hxx

Change-Id: I89f378a4d7a8311b8922f10acff66b000a20a4b7

Project: help  d6621f90fda77c1d2232f511f42b3ed0dc38ac68

MSVC supports (a subset of) C++11 without any special switch, so always
"enable" support for it and use whatever features are detected by configure
checks

Change-Id: Ic03be5a1aabe7d20cf763bae6d26a7043a51f287

We don't run AC_PROG_C, which sets some necessary variables.

Change-Id: I21dc4a7e84990861afccbf0c914108737a54ec7d

Change-Id: I703e94b999382f52331a61050eaf3d31073f5a9c

Change-Id: I2537721bd6b0214c25590504751c39fb4661e2fe

Change-Id: I37d2d5a1d174a951c45f7f51d909535dacc2b7d0

Change-Id: Idd2130a0f8c0190ab075f5e80021aa99a57939e8

Project: help  9e61a73556425545fc6141adfbccde60488cc88d

Project: help  f44a3ad0eef863ee5b4dcdb79ca703fb01f744c3

Change-Id: I6e35b91092239275694eec3666b076f7ff7e54f6
Reviewed-on: https://gerrit.libreoffice.org/4335Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>

Change-Id: I78ba286be5aa4d731f734e5eb16adb77c686aad9
Reviewed-on: https://gerrit.libreoffice.org/4325Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>

Change-Id: Ia23f01ee28f1dfd8079abedda50bbef0a5a1beec
Reviewed-on: https://gerrit.libreoffice.org/4334Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>

Change-Id: I832473cab555d8ac5c6b2a47d51124ac63e996e9
Reviewed-on: https://gerrit.libreoffice.org/4333Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>