Change-Id: I4eda11bdeda2e9f2e7d124d19ba051fafc846321

which are used for e.g. TOC

(cherry picked from commit 52c89c2a)

Conflicts:
	sw/inc/tox.hxx
	sw/source/core/tox/tox.cxx
	sw/source/filter/ww8/ww8par5.cxx

Change-Id: Id14cecc07d09d3461c091a6451143cbce206e308

Change-Id: I0ab3c52fa12d519c6afcbaf701dd42f69c728ff0

Change-Id: Ia6219ebd5fb2d2644135ec20a986158b68b771fc

Change-Id: Ib0a4bd4f3d056c39156bfcfb0bd28c62f2f530b2

Change-Id: Iaaf36d012e353f73f083c9c0ebbbb6d0953b16c8

Change-Id: Ica865166d6f187bbe610ed537208eab809a77e5f

Change-Id: I920ffc647ca92276491b720e1312314f27ab58f2

Change-Id: I736ce8d12372b115e42319e9b3c352e36cbae346

Change-Id: I7b9ccef3de21d657b215f5225d8ef539921cc541

Change-Id: I28d228c0992660ca181a4c420736600ee79b3ea5

Change-Id: I36740cd276d2047552298606f24b2696ed61b36b

Change-Id: I1616d7e77071caa78ffd8c7d7857f50f3afa1bb7

Change-Id: I0822af84c04ab70b2a202d232720aa77d8472983

Change-Id: I05ecb627119eb545d1781fa42613e940fc22aac1

Change-Id: I9d7ca8354cef6a1474914ce290c476460f982bdd

Change-Id: Iaf07f77b4228d4debb2620625b14ce7dc41e3a98

(cherry picked from commit 6dc64444)

Change-Id: I42ec8b0cbfd9367bc98510bfbd1818543ac4b5be

Change-Id: I6c411254865bad6d951ee8dd16e25eeeeeb525a7

Change-Id: I8f7c00013d9fbf4d05d4c217d6f211c185ce1c9c

Change-Id: Ia714029c2e32e28c1bb6f4f59d0c7f357eccc236

Change-Id: I383021580f69ac51ca65f3464bf863b800ccd931

Change-Id: I843b02cb8d215c149aa646441f3c7b0ab5550906

Change-Id: I3817295a39e409cf5a9ab72b9b24d7b859f5a186

in table undo/redo (CellUndo)

(cherry picked from commit 88b1d351)

Change-Id: I407323bf6c96ad577d8fc24c82118afc6173f97d

For lolz, I kept the useful German word "GrafikFehler" in the message, though.

Change-Id: Ib714e27eef986cacfc979f132f1b2c29e603d9b0

Change-Id: I8ae538d9eb23efde04d18c8bcde348e97bc8d0f5

(cherry picked from commit b635b4fa)

Conflicts:
	comphelper/inc/comphelper/TypeGeneration.hxx
	comphelper/source/property/TypeGeneration.cxx
	cui/source/factory/dlgfact.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/tabpages/tabarea.cxx
	cui/source/tabpages/tabarea.hrc
	cui/source/tabpages/tabarea.src
	cui/source/tabpages/tparea.cxx
	drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
	drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
	drawinglayer/source/texture/texture.cxx
	editeng/inc/editeng/unotext.hxx
	editeng/source/items/frmitems.cxx
	include/drawinglayer/texture/texture.hxx
	include/editeng/brushitem.hxx
	include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
	include/svx/svxids.hrc
	include/xmloff/xmltypes.hxx
	reportdesign/source/ui/misc/UITools.cxx
	sc/source/ui/drawfunc/drawsh.cxx
	sfx2/source/dialog/tabdlg.cxx
	svl/source/undo/undo.cxx
	svx/inc/svx/unoshprp.hxx
	sw/Library_sw.mk
	sw/inc/doc.hxx
	sw/inc/format.hxx
	sw/inc/frmfmt.hxx
	sw/inc/swatrset.hxx
	sw/inc/unomap.hxx
	sw/inc/unoprnms.hxx
	sw/source/core/access/accpara.cxx
	sw/source/core/attr/format.cxx
	sw/source/core/attr/swatrset.cxx
	sw/source/core/doc/docdraw.cxx
	sw/source/core/doc/docfly.cxx
	sw/source/core/doc/notxtfrm.cxx
	sw/source/core/inc/frame.hxx
	sw/source/core/inc/frmtool.hxx
	sw/source/core/layout/atrfrm.cxx
	sw/source/core/layout/paintfrm.cxx
	sw/source/core/text/inftxt.cxx
	sw/source/core/text/porfld.cxx
	sw/source/core/text/txtfly.cxx
	sw/source/core/txtnode/fntcache.cxx
	sw/source/core/uibase/app/docst.cxx
	sw/source/core/uibase/app/docstyle.cxx
	sw/source/core/uibase/shells/drawdlg.cxx
	sw/source/core/uibase/shells/frmsh.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/unocore/unomap.cxx
	sw/source/core/unocore/unoprnms.cxx
	sw/source/core/unocore/unostyle.cxx
	sw/source/ui/fmtui/tmpdlg.cxx
	sw/source/ui/fmtui/tmpdlg.src
	sw/source/ui/frmdlg/frmdlg.cxx
	sw/source/ui/frmdlg/frmpage.src
	sw/source/ui/inc/frmsh.hxx
	xmloff/source/text/txtprhdl.cxx
	xmloff/source/text/txtprmap.cxx

Change-Id: Id3ffaa83bb5594d287f1ac8f2c1c9cf55c70946d

Change-Id: I2a233e60162fd89e4765a57a0de10b430babcaa6

annotated text range according the according view option which show/hides the
annotations/comments

(cherry picked from commit b8c79394)

Conflicts:
	sw/source/core/uibase/docvw/SidebarWin.cxx

Change-Id: I0701ee137317349c5d917841448c183015d5513a

Change-Id: Ic4a4c0fe411c359f5305f01c8ff79ca48384b484

Change-Id: Iabbecfd37ca7289c08c00e3588897c118665d62e

Change-Id: I6d0459d8cc8b9801e696cc4ab205b5213df5540e

Change-Id: I839e77594f6f7dbc516e0e6d08b1cf2517f96ec4

Change-Id: Iaee3b73ceed5df9928514e55d00ac6292b8b2249

Change-Id: I88c2fbea9265b729e21aa2f2d09bea89f91c01cb

Change-Id: Id8b6723e7d3d8a66f5a657628e1467edda509cfa

Change-Id: I1dbbda7e2be6426409ce8f03d6570fec451a01b5

Change-Id: I5f41ff8017879a75f088fc0aa1b8ce99f935a46f

Change-Id: I766d6c98371392a75c7d1097b7a3516a43d3fbe4