Conflicts:
	include/vcl/settings.hxx
	svtools/source/table/tablecontrol_impl.cxx
	sw/source/core/frmedt/fecopy.cxx
	vcl/inc/canvasbitmap.hxx
	vcl/inc/headless/svpframe.hxx
	vcl/inc/unx/salframe.h
	vcl/inc/win/salframe.h
	vcl/inc/win/salprn.h
	vcl/inc/win/salvd.h
	vcl/osx/DragSource.cxx
	vcl/osx/DragSource.hxx
	vcl/osx/DropTarget.cxx
	vcl/osx/DropTarget.hxx
	vcl/osx/OSXTransferable.cxx
	vcl/osx/OSXTransferable.hxx
	vcl/osx/clipboard.cxx
	vcl/osx/clipboard.hxx
	vcl/osx/salprn.cxx
	vcl/qa/cppunit/canvasbitmaptest.cxx
	vcl/source/components/fontident.cxx
	vcl/source/control/edit.cxx
	vcl/source/control/spinfld.cxx
	vcl/source/gdi/gdimtf.cxx
	vcl/source/gdi/virdev.cxx
	vcl/source/helper/canvasbitmap.cxx
	vcl/source/window/dockwin.cxx
	vcl/unx/generic/dtrans/X11_selection.hxx
	vcl/unx/kde/UnxFilePicker.cxx
	vcl/unx/kde/UnxFilePicker.hxx
	vcl/unx/kde4/KDE4FilePicker.cxx
	vcl/unx/kde4/KDE4FilePicker.hxx
	vcl/unx/kde4/KDESalFrame.hxx

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