Conflicts:
	avmedia/source/framework/modeltools.cxx
	basic/source/sbx/sbxbase.cxx
	sd/source/filter/eppt/pptx-epptooxml.cxx
	svx/qa/unit/svdraw/test_SdrTextObject.cxx
	sw/qa/core/uwriter.cxx
	sw/source/core/doc/CntntIdxStore.cxx
	sw/source/core/doc/DocumentLinksAdministrationManager.cxx
	sw/source/core/doc/docnew.cxx
	sw/source/core/doc/gctable.cxx
	sw/source/core/doc/htmltbl.cxx
	sw/source/core/doc/sortopt.cxx
	sw/source/core/doc/tblcpy.cxx
	sw/source/core/doc/tblrwcl.cxx
	sw/source/core/docnode/ndcopy.cxx
	sw/source/core/docnode/ndtbl.cxx
	sw/source/core/docnode/ndtbl1.cxx
	sw/source/core/frmedt/tblsel.cxx
	sw/source/core/text/itratr.cxx
	sw/source/core/tox/ToxLinkProcessor.cxx
	sw/source/filter/xml/xmltble.cxx

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