Conflicts:
	sw/source/core/docnode/ndnotxt.cxx
	sw/source/core/inc/viewimp.hxx
	sw/source/core/layout/fly.cxx
	sw/source/core/layout/paintfrm.cxx
	sw/source/filter/ww8/WW8TableInfo.cxx
	sw/source/filter/ww8/wrtw8nds.cxx
	sw/source/filter/ww8/wrtww8.cxx
	sw/source/filter/ww8/wrtww8.hxx
	sw/source/filter/ww8/ww8atr.cxx
	sw/source/filter/xml/xmlitemi.cxx
	sw/source/filter/xml/xmlmeta.cxx
	sw/source/ui/app/docsh2.cxx
	sw/source/ui/dialog/swdlgfact.cxx
	sw/source/ui/shells/grfsh.cxx