Change-Id: I57522b3fe0bff145a66a50bc944717aeaba9025b

Change-Id: I6679d397754f1777441b35910059bda9a917ae2d

Change-Id: I05c4c964e88f9123d75751c1eb7c8aae4d41f524

Change-Id: I864d5e3fbb7f8f8278c45b721be70f805c6a6713

Looks like 7d9bb549 "Related: #i124638# Second
step of DrawingLayer FillAttributes..." accidentally garbled this.

Change-Id: I4cdaad4fdebb8b9947e79afbec4a6e0973c55cac

Change-Id: I7d4534649361e1bfa2c285e67e6765a4be55ec69

Change-Id: I826cd15923ecb2088161e4cf9650b2f388fd84b5

Change-Id: I38d7372f713c115b7c975e2aad84ae14e3cf8e1f

Without this, all character properties defined inside automatic styles
are ignored.

Change-Id: I3c25f5d36503a9f40834dd88573a40c34380b967

I'm not completely sure about this, but without this, automatic color is
translated back as rgba(114, 159, 207, 255), which sounds even worse.

Change-Id: I9f96f26b3797d9e289119a4795d2535b6d72262e

At least now beans::UnknownPropertyException is not thrown when it is
written.

Change-Id: I6d4f8dbb1ac7caffc4bfdfb9c4c1c84eb9179883

Change-Id: I3cfe170091f11a3039ff6443b283fb45773a4e70

Change-Id: Ia7099e87baa553ce6f5537908e1fb65c268d3940

hide the DrawingLayer FillStyle entries by moving them to the front of
aXMLParaPropMap and using a higher index for construction

(cherry picked from commit 35f3ceaf)

Change-Id: I8244e4dc685a2aa35e4154a43455ff62c8ee58fe

DocShell in Writer, made SwDrawModel and handling more known

(includes suspicious removal of setting SID_ATTR_LINEEND_WIDTH_DEFAULT)

(cherry picked from commit a7ccadbf)

Conflicts:
	sw/inc/IDocumentDrawModelAccess.hxx
	sw/inc/doc.hxx
	sw/inc/docsh.hxx
	sw/inc/dpage.hxx
	sw/inc/drawdoc.hxx
	sw/source/core/access/accmap.cxx
	sw/source/core/doc/doc.cxx
	sw/source/core/doc/docdesc.cxx
	sw/source/core/doc/docdraw.cxx
	sw/source/core/doc/docfly.cxx
	sw/source/core/doc/doclay.cxx
	sw/source/core/doc/docnew.cxx
	sw/source/core/draw/dcontact.cxx
	sw/source/core/draw/dpage.cxx
	sw/source/core/draw/drawdoc.cxx
	sw/source/core/frmedt/feshview.cxx
	sw/source/core/layout/fly.cxx
	sw/source/core/layout/frmtool.cxx
	sw/source/core/layout/newfrm.cxx
	sw/source/core/layout/paintfrm.cxx
	sw/source/core/undo/docundo.cxx
	sw/source/core/undo/unattr.cxx
	sw/source/core/unocore/unodraw.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/view/vdraw.cxx
	sw/source/core/view/viewimp.cxx
	sw/source/core/view/viewsh.cxx
	sw/source/filter/html/htmldrawreader.cxx
	sw/source/filter/rtf/rtffly.cxx
	sw/source/filter/rtf/swparrtf.cxx
	sw/source/filter/ww8/docxattributeoutput.cxx
	sw/source/filter/ww8/rtfattributeoutput.cxx
	sw/source/filter/ww8/wrtw8esh.cxx
	sw/source/filter/ww8/wrtww8.cxx
	sw/source/filter/ww8/ww8graf.cxx
	sw/source/filter/xml/swxml.cxx
	sw/source/filter/xml/xmlexp.cxx
	sw/source/filter/xml/xmlimp.cxx
	sw/source/ui/app/docshdrw.cxx
	sw/source/ui/uiview/view.cxx
	sw/source/ui/uno/unodefaults.cxx
	sw/source/uibase/app/docst.cxx
	sw/source/uibase/app/docstyle.cxx
	sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
	sw/source/uibase/lingu/sdrhhcwrap.cxx
	sw/source/uibase/shells/drwbassh.cxx
	sw/source/uibase/shells/frmsh.cxx
	sw/source/uibase/shells/grfsh.cxx
	sw/source/uibase/shells/textsh1.cxx
	sw/source/uibase/uno/unotxdoc.cxx
	sw/source/uibase/utlui/content.cxx

Conflicts:
	sw/source/uibase/app/docshdrw.cxx

Change-Id: Icb99eaa7bfb1eb8922a9fd928b5e4149821130dd

with DrawingLayer FillAttributes for all systems and AA/nonAA

(cherry picked from commit fcc24448)

Change-Id: I1b3d66061132d1d276080f99e94c421b429de936

Change-Id: Id441a91e86b89bf8fe6bfd778ca09e732e054103

for Writer objects, now added support for Paragraph and PageStyle (including
Header and Footer) for direct attributes and style attributes

(cherry picked from commit cc25c58f)

Conflicts:
	cui/source/factory/dlgfact.cxx
	cui/source/factory/dlgfact.hxx
	cui/source/inc/bbdlg.hxx
	cui/source/inc/cuires.hrc
	cui/source/tabpages/bbdlg.cxx
	cui/source/tabpages/bbdlg.src
	cui/source/tabpages/page.cxx
	cui/source/tabpages/tparea.cxx
	include/svx/pagectrl.hxx
	include/svx/svxdlg.hxx
	include/svx/svxids.hrc
	include/xmloff/PageMasterStyleMap.hxx
	include/xmloff/prstylei.hxx
	include/xmloff/txtprmap.hxx
	svx/Package_inc.mk
	svx/inc/svx/hdft.hxx
	svx/source/dialog/hdft.cxx
	svx/source/dialog/pagectrl.cxx
	svx/source/tbxctrls/tbxcolorupdate.cxx
	svx/source/unodraw/unobrushitemhelper.cxx
	sw/Library_sw.mk
	sw/inc/fillattributes.hxx
	sw/inc/format.hxx
	sw/inc/frmatr.hxx
	sw/inc/frmfmt.hxx
	sw/inc/hintids.hxx
	sw/inc/hints.hxx
	sw/inc/ndtxt.hxx
	sw/inc/node.hxx
	sw/inc/swunohelper.hxx
	sw/inc/unobrushitemhelper.hxx
	sw/inc/unoprnms.hxx
	sw/source/core/attr/format.cxx
	sw/source/core/attr/hints.cxx
	sw/source/core/doc/docdesc.cxx
	sw/source/core/doc/docdraw.cxx
	sw/source/core/doc/docfmt.cxx
	sw/source/core/doc/docnew.cxx
	sw/source/core/doc/docredln.cxx
	sw/source/core/doc/poolfmt.cxx
	sw/source/core/doc/visiturl.cxx
	sw/source/core/docnode/node.cxx
	sw/source/core/inc/frame.hxx
	sw/source/core/inc/frmtool.hxx
	sw/source/core/inc/rolbck.hxx
	sw/source/core/layout/atrfrm.cxx
	sw/source/core/layout/fillattributes.cxx
	sw/source/core/layout/findfrm.cxx
	sw/source/core/layout/paintfrm.cxx
	sw/source/core/txtnode/ndtxt.cxx
	sw/source/core/txtnode/thints.cxx
	sw/source/core/txtnode/txtedt.cxx
	sw/source/core/undo/rolbck.cxx
	sw/source/core/unocore/swunohelper.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/unocore/unomap.cxx
	sw/source/core/unocore/unoparagraph.cxx
	sw/source/core/unocore/unoprnms.cxx
	sw/source/core/unocore/unostyle.cxx
	sw/source/ui/chrdlg/paradlg.src
	sw/source/ui/chrdlg/pardlg.cxx
	sw/source/ui/fmtui/tmpdlg.cxx
	sw/source/ui/fmtui/tmpdlg.src
	sw/source/uibase/app/docst.cxx
	sw/source/uibase/app/docstyle.cxx
	sw/source/uibase/frmdlg/colex.cxx
	sw/source/uibase/shells/basesh.cxx
	sw/source/uibase/shells/textsh1.cxx
	sw/source/uibase/uiview/viewstat.cxx
	sw/source/uibase/utlui/uitool.cxx
	xmloff/inc/PageMasterImportContext.hxx
	xmloff/inc/xmloff/XMLShapeStyleContext.hxx
	xmloff/source/draw/XMLShapeStyleContext.cxx
	xmloff/source/draw/sdpropls.hxx
	xmloff/source/style/PageMasterExportPropMapper.cxx
	xmloff/source/style/PageMasterImportContext.cxx
	xmloff/source/style/PageMasterPropHdlFactory.cxx
	xmloff/source/style/PageMasterStyleMap.cxx
	xmloff/source/style/prstylei.cxx
	xmloff/source/text/txtexppr.cxx
	xmloff/source/text/txtprhdl.cxx
	xmloff/source/text/txtprmap.cxx
	xmloff/source/text/txtstyli.cxx

Conflicts:
	svx/source/dialog/hdft.cxx
	sw/source/core/doc/visiturl.cxx
	sw/source/core/txtnode/thints.cxx
	sw/source/core/txtnode/txtatr2.cxx
	sw/source/core/unocore/unostyle.cxx

Change-Id: I7e8779db6c0cbd1e242b63eab888f468f2de509a

fixes build errors like:
  ./workdir/CustomTarget/writerfilter/source/ooxml/model_preprocessed.xml: No such file or directory

Change-Id: I1ee4e6247e9b87548a0314914fd3fc6499783ea6
Reviewed-on: https://gerrit.libreoffice.org/10008Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

Change-Id: If8d82a39af7a506f42b6c13d8408ffc479b564e7

Change-Id: I41d4c99216cc19302f2d65db1471cb49016a784a

Change-Id: I3f015ea89a9a542226d18d0d203eb493f08b46a0

Change-Id: Icef20c193a64b7de410e21124edaa4d0699d8a66

also avoid pointless double Guard

Change-Id: Ie7707fc3baf46f9363fdef6213df098123183ab9

Change-Id: If10c9643474620855e21caaa1fdcbbc4b7fd07ac

Change-Id: I54329e8dc914ac2698c441c02dfc9da03b56614f

Change-Id: I1f44dd938bd0033ad4a5b6af4d24d1ba3e76d852

Change-Id: I243ecb42d7ba2ce58f4c1a0bf97ad74de947d8bd

Change-Id: I27aad830a4e211601a78a15b2eb42d44275f1abe

Change-Id: I9c2b946ec3616a59ef06bf958ee4a81e1751e7ea

Change-Id: I30c097ac6731b742779af5528200ff99451d04b0

Change-Id: Id6b15e8515d73cb5bdf4bc6d02d235ebc7e282da

Change-Id: I9a40cee6e807599e8e3d9f3df52186fd6226f7e1

Change-Id: Iba3d2b8cddcd9e0f228d5b9fef1ce3290047c8b0

Change-Id: I0f5d8a72e545337525a90d86aa2fb87a180f4e63

Change-Id: I7c67c62622e2b46bc565ae148c1605f4954ffa39

Change-Id: If020fd537c15c41fe33134f554b7df1f10f18570

Change-Id: I26cf7c33089ddfcbb7faf81295b9a9776c6a9065

Change-Id: I622a7c41c9083f2deec21dc8c37572f978874127

Change-Id: I4bdfb074b3cf6fcb49765322308dfa4b9ed67713