(cherry picked from commit ef3931ff)

Conflicts:
	automation/source/server/statemnt.cxx
	basic/source/runtime/methods.cxx
	canvas/source/vcl/devicehelper.cxx
	canvas/source/vcl/spritedevicehelper.cxx
	drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
	drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
	drawinglayer/source/tools/converters.cxx
	dtrans/source/win32/dtobj/FmtFilter.cxx
	editeng/source/items/bulitem.cxx
	extensions/source/scanner/sanedlg.cxx
	external/gcc3_specific/makefile.mk
	filter/source/graphicfilter/eos2met/eos2met.cxx
	filter/source/graphicfilter/ios2met/ios2met.cxx
	filter/source/msfilter/msdffimp.cxx
	fpicker/source/office/iodlg.cxx
	framework/source/fwe/classes/addonsoptions.cxx
	framework/source/fwe/helper/actiontriggerhelper.cxx
	sc/source/filter/excel/xiescher.cxx
	sc/source/ui/docshell/docsh.cxx
	sc/source/ui/inc/viewfunc.hxx
	sd/source/ui/app/sdxfer.cxx
	sd/source/ui/unoidl/unopage.cxx
	sd/source/ui/view/sdview3.cxx
	sfx2/source/appl/fileobj.cxx
	sfx2/source/appl/linkmgr2.cxx
	sfx2/source/dialog/filedlghelper.cxx
	sfx2/source/dialog/intro.cxx
	sfx2/source/doc/docinf.cxx
	sot/inc/sot/formats.hxx
	sot/source/base/formats.cxx
	svtools/bmpmaker/bmpcore.cxx
	svtools/bmpmaker/bmpsum.cxx
	svtools/inc/svtools/transfer.hxx
	svtools/source/filter/filter.cxx
	svtools/source/filter/wmf/emfwr.cxx
	svtools/source/filter/wmf/enhwmf.cxx
	svtools/source/filter/wmf/winwmf.cxx
	svtools/source/filter/wmf/wmfwr.cxx
	svtools/source/graphic/graphic.cxx
	svtools/source/graphic/provider.cxx
	svtools/source/misc/transfer.cxx
	svx/inc/svx/xoutbmp.hxx
	svx/source/sdr/overlay/overlaymanagerbuffered.cxx
	svx/source/xoutdev/_xoutbmp.cxx
	sw/source/core/view/viewsh.cxx
	sw/source/filter/ww1/w1filter.cxx
	sw/source/filter/ww8/ww8par.hxx
	sw/source/ui/dochdl/swdtflvr.cxx
	toolkit/source/awt/vclxbitmap.cxx
	toolkit/source/helper/vclunohelper.cxx
	vcl/Library_vcl.mk
	vcl/Package_inc.mk
	vcl/aqua/source/dtrans/DataFlavorMapping.cxx
	vcl/aqua/source/dtrans/OSXTransferable.cxx
	vcl/aqua/source/dtrans/PictToBmpFlt.cxx
	vcl/aqua/source/dtrans/PictToBmpFlt.hxx
	vcl/inc/vcl/alpha.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/inc/vcl/pngwrite.hxx
	vcl/inc/vcl/salbtype.hxx
	vcl/inc/vcl/wall.hxx
	vcl/source/gdi/animate.cxx
	vcl/source/gdi/bitmap2.cxx
	vcl/source/gdi/bitmapex.cxx
	vcl/source/gdi/bmpconv.cxx
	vcl/source/gdi/cvtsvm.cxx
	vcl/source/gdi/impgraph.cxx
	vcl/source/gdi/impimagetree.cxx
	vcl/source/gdi/metaact.cxx
	vcl/source/gdi/wall.cxx

Change-Id: I79938bc412c048c3d4e64f430f216e73bec16167

Change-Id: I8468286be1affc635838b5329d2df72b53f5c9de
(cherry picked from commit 6b10219e)

Change-Id: I60de04bba401632b01f0da7b772a91a98de5ff07

Change-Id: Idafcd96ff8b01139dfc22cf3d0d2f5e98759488e

Change-Id: Ifbe4a0b6b93c5be6dfd64b6c77ef7172d3f1c425

Fixup for 7cf2b580, makes sure cairo
has all data committed to the surface, and handle random errors.

Change-Id: I39e5b5777968c4563a8ce3870bac3d4182090f3b

Change-Id: I81b877e8e1b6945c2f1265947ad915ed1070800a

Previously such shapes landed in the middle of section properties.

Change-Id: I7993eaa721e2b53d8adb1cbdee40992bbeb11416

Change-Id: I7b18bebb878fc5027109121595e444ef1d6a7cfc

and some fixes in that region

(cherry picked from commit 2ece2411)

Conflicts:
	default_images/svx/res/cropmarkers.png
	default_images/svx/res/cropmarkers2.png
	default_images/svx/res/cropmarkersACC.png
	default_images/svx/res/markers.png
	default_images/svx/res/markers2.png
	default_images/svx/res/markersACC.png
	officecfg/registry/schema/org/openoffice/Office/Calc.xcs
	officecfg/registry/schema/org/openoffice/Office/Draw.xcs
	officecfg/registry/schema/org/openoffice/Office/Impress.xcs
	officecfg/registry/schema/org/openoffice/Office/Writer.xcs
	officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
	sc/source/core/tool/viewopti.cxx
	sd/source/ui/app/optsitem.cxx
	svx/inc/svx/svdhdl.hxx
	svx/source/svdraw/svdhdl.cxx
	svx/source/svdraw/svdstr.src
	sw/source/ui/config/viewopt.cxx
	sw/source/ui/docvw/edtwin.cxx

Change-Id: I4094c2ca18a3c29e8e24a15ddeb040808ce4605d

Project: translations  0951535c576e6a2693b25311832b25bcd67b7bb3

It definitely does not make sense for iOS, I assume. For Android the situation
is unclear, but let's disable it for now. It causes linking errors currently
anyway as the graphite_serverfont.cxx is not compiled for Android. (Whether it
could and should be compiled then instead of disabling Graphite, I don't
know.)

Change-Id: I1a874d304af508d2217da08e49dc158664f2e9d2

That auto here would mean black, potentially rendering the whole
document unreadable.

Change-Id: Ie17a6a9b00c9ab24204291d09175a3fba69cd4ea

We always should use the internal epm anyway on OS X, so no need to
look for PackageMaker.app in /Developer which doesn't even exist any
more.

Change-Id: I943f34e14e9ce0c3bec5bd7b86612a62e5b9e83d

...assuming the original intent of the code was to check for ASCII range 0x20--
0x7F.

Change-Id: I8033890a76e059d997efb01431207a453f00a981

Change-Id: I8a12d0ea18a60541d9a11db26cc417a190443ff4

...so that -Wstrict-aliasing, -Wstrict-overflow=1 included in -Wall do not only
produce warnings/errors in non-debug builds.

Change-Id: I4534427738fa7688853564e8c7255a0c3cd199e1

...in com_GCC_defs.mk

Change-Id: I0a3b29e1a91acf3425afa44dea0353bebf88f58f

Change-Id: Ia655865b621b1c8e37a52715b89534a00dcda1d7

...but do not pretty-print its dereferenced value.  This is in line with the
handling of css::uno::Reference, and avoids gdb Python exceptions when trying to
print uninitialized rtl::Reference instances (which can e.g. happen during a
"backtrace full").

Change-Id: I9a3c0a6441cf23cba748183226832d2ba23bd531

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

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

Change-Id: Icf9949bb00aa905d22aedfd8f2b297dfa89dfedb

Change-Id: If5d6f4baf49b5828a1765b638eb4d2225f7b5400

Change-Id: Ia41f28ed31fc254a6785c6444a78822eb969f2f9

Change-Id: Ie53e5475888b9a912f868c12c471b2521f6b0ea1

Change-Id: Ic1e4af8f8dd60ab48d701b5d713beafd0ddd22df

Change-Id: I37f2db8b073ad1257101af02118cfbc91ee60f26

Change-Id: Icac7b4dd5dd31f39e0db09e251e7136e61a064aa

Conflicts:
	Repository.mk

Change-Id: I1553317afe8df9877a41b1d4087c96d861ed1377

Change-Id: Icd0c258e83631de2356503c725139fac2035fb0b

Change-Id: Iafaac91fe3783118817d40f3831e5ca039be64e0

Change-Id: If211e08f0436dd3c2a0787fa60301bfafe1c5b70

Also put the vbaswobj lib in the right place, inside Writer

Change-Id: I52ecc75e26f5f1997d3a575682b78fbd673e4591

(cherry picked from commit 101e1cce)

Change-Id: Ib373406a44c00d812dc754d8091c94cb6a64a1b0

(cherry picked from commit 497e0d2c)

Change-Id: I9cf246c94236382bc9d58e3a76c855951dd5166a

when in rotated metafiles

(cherry picked from commit 2a063da1)

Conflicts:
	drawinglayer/Library_drawinglayer.mk
	drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
	drawinglayer/source/processor2d/vclhelpergradient.cxx
	drawinglayer/source/processor2d/vclhelpergradient.hxx
	drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
	drawinglayer/source/processor2d/vclpixelprocessor2d.cxx

Change-Id: I0e4ff1d3bebbc738fb6d301da19747faa2efbe3d

Change-Id: Ie576ba4497efac689a81c67474c61ec91c0a810b

(cherry picked from commit 4be8cc07)

Conflicts:
	vcl/source/gdi/bitmap3.cxx

Change-Id: I329ebc63df0dd96d4a2596ad42ff1aa14405bdd4

movement of objects in order to get back text selection via keys in a table

(cherry picked from commit 7d2515d9)

Conflicts:
	sw/source/ui/docvw/edtwin.cxx

Change-Id: Iee81649eae297108dbdb6137539f962611e9e636

Project: help  175185e2bb4a0607fdf10b33cad121831510a5cd

Change-Id: Ifc73c13a9e0695ee43158ea14965c01a2dbe6c59