Related: #i124638# Second step of DrawingLayer FillAttributes...

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

(cherry picked from commit cc25c58f7052827bfebdc9fbeec668c8fa29ed1b)

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

2 files changed, 209 insertions, 0 deletions

diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx
index bf9306d27110..876773da9499 100644
--- a/xmloff/inc/PageMasterImportContext.hxx
+++ b/xmloff/inc/PageMasterImportContext.hxx
@@ -25,7 +25,12 @@
 
 class PageStyleContext : public XMLPropStyleContext
 {
+private:
     OUString sPageUsage;
+
+    //UUUU
+    bool                m_bIsFillStyleAlreadyConverted : 1;
+
 protected:
 
     virtual void SetAttribute( sal_uInt16 nPrefixKey,
diff --git a/xmloff/inc/xmlsdtypes.hxx b/xmloff/inc/xmlsdtypes.hxx
new file mode 100644
index 000000000000..fb13d9f1e77b
--- /dev/null
+++ b/xmloff/inc/xmlsdtypes.hxx
@@ -0,0 +1,204 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _XMLSDTYPES_HXX
+#define _XMLSDTYPES_HXX
+
+//#include <xmloff/xmlnume.hxx>
+//#include <xmloff/maptype.hxx>
+#include <xmloff/xmltypes.hxx>
+//#include <xmloff/xmlement.hxx>
+//#include <xmloff/prhdlfac.hxx>
+//#include <xmloff/xmlprmap.hxx>
+//#include "xmloff/XMLTextListAutoStylePool.hxx"
+//#include <xmloff/xmlexppr.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+// types of own properties
+
+#define XML_SD_TYPE_STROKE                          (XML_SD_TYPES_START +  0)
+#define XML_SD_TYPE_PRESPAGE_TYPE                   (XML_SD_TYPES_START +  1)
+#define XML_SD_TYPE_PRESPAGE_STYLE                  (XML_SD_TYPES_START +  2)
+#define XML_SD_TYPE_PRESPAGE_SPEED                  (XML_SD_TYPES_START +  3)
+#define XML_SD_TYPE_PRESPAGE_DURATION               (XML_SD_TYPES_START +  4)
+#define XML_SD_TYPE_PRESPAGE_VISIBILITY             (XML_SD_TYPES_START +  5)
+#define XML_SD_TYPE_MARKER                          (XML_SD_TYPES_START +  6 )
+#define XML_SD_TYPE_OPACITY                         (XML_SD_TYPES_START +  7 )
+#define XML_SD_TYPE_LINEJOIN                        (XML_SD_TYPES_START +  8 )
+#define XML_SD_TYPE_FILLSTYLE                       (XML_SD_TYPES_START +  9 )
+#define XML_SD_TYPE_GRADIENT                        (XML_SD_TYPES_START + 10 )
+#define XML_SD_TYPE_GRADIENT_STEPCOUNT              (XML_SD_TYPES_START + 11 )
+#define XML_SD_TYPE_SHADOW                          (XML_SD_TYPES_START + 12 )
+#define XML_SD_TYPE_TEXT_CROSSEDOUT                 (XML_SD_TYPES_START + 13 )
+#define XML_SD_TYPE_NUMBULLET                       (XML_SD_TYPES_START + 14 )
+#define XML_SD_TYPE_WRITINGMODE                     (XML_SD_TYPES_START + 15 )
+#define XML_SD_TYPE_BITMAP_MODE                     (XML_SD_TYPES_START + 16 )
+#define XML_SD_TYPE_BITMAPREPOFFSETX                (XML_SD_TYPES_START + 17 )
+#define XML_SD_TYPE_BITMAPREPOFFSETY                (XML_SD_TYPES_START + 18 )
+#define XML_SD_TYPE_FILLBITMAPSIZE                  (XML_SD_TYPES_START + 19 )
+#define XML_SD_TYPE_LOGICAL_SIZE                    (XML_SD_TYPES_START + 20 )
+#define XML_SD_TYPE_BITMAP_REFPOINT                 (XML_SD_TYPES_START + 21 )
+#define XML_SD_TYPE_PRESPAGE_BACKSIZE               (XML_SD_TYPES_START + 22 )
+#define XML_TYPE_TEXT_ANIMATION_BLINKING            (XML_SD_TYPES_START + 23 )
+#define XML_TYPE_TEXT_ANIMATION_STEPS               (XML_SD_TYPES_START + 24 )
+#define XML_SD_TYPE_TEXT_ALIGN                      (XML_SD_TYPES_START + 25 )
+#define XML_SD_TYPE_VERTICAL_ALIGN                  (XML_SD_TYPES_START + 26 )
+#define XML_SD_TYPE_FITTOSIZE                       (XML_SD_TYPES_START + 27 )
+#define XML_SD_TYPE_MEASURE_HALIGN                  (XML_SD_TYPES_START + 28 )
+#define XML_SD_TYPE_MEASURE_VALIGN                  (XML_SD_TYPES_START + 29 )
+#define XML_SD_TYPE_MEASURE_UNIT                    (XML_SD_TYPES_START + 30 )
+#define XML_SD_TYPE_MEASURE_PLACING                 (XML_SD_TYPES_START + 31 )
+#define XML_SD_TYPE_CONTROL_BORDER                  (XML_SD_TYPES_START + 32 )
+#define XML_SD_TYPE_CONTROL_BORDER_COLOR            (XML_SD_TYPES_START + 33 )
+#define XML_SD_TYPE_IMAGE_SCALE_MODE                (XML_SD_TYPES_START + 34 )
+#define XML_SD_TYPE_LINECAP                         (XML_SD_TYPES_START + 35 )
+
+//////////////////////////////////////////////////////////////////////////////
+// 3D property types
+#define XML_SD_TYPE_BACKFACE_CULLING                (XML_SD_TYPES_START + 40 )
+#define XML_SD_TYPE_NORMALS_KIND                    (XML_SD_TYPES_START + 41 )
+#define XML_SD_TYPE_NORMALS_DIRECTION               (XML_SD_TYPES_START + 42 )
+#define XML_SD_TYPE_TEX_GENERATION_MODE_X           (XML_SD_TYPES_START + 43 )
+#define XML_SD_TYPE_TEX_GENERATION_MODE_Y           (XML_SD_TYPES_START + 44 )
+#define XML_SD_TYPE_TEX_KIND                        (XML_SD_TYPES_START + 45 )
+#define XML_SD_TYPE_TEX_MODE                        (XML_SD_TYPES_START + 46 )
+
+//////////////////////////////////////////////////////////////////////////////
+// #FontWork# types
+#define XML_SD_TYPE_FONTWORK_STYLE                  (XML_SD_TYPES_START + 47 )
+#define XML_SD_TYPE_FONTWORK_ADJUST                 (XML_SD_TYPES_START + 48 )
+#define XML_SD_TYPE_FONTWORK_SHADOW                 (XML_SD_TYPES_START + 49 )
+#define XML_SD_TYPE_FONTWORK_FORM                   (XML_SD_TYPES_START + 50 )
+
+//////////////////////////////////////////////////////////////////////////////
+// Caption types
+#define XML_SD_TYPE_CAPTION_ANGLE_TYPE              (XML_SD_TYPES_START + 60 )
+#define XML_SD_TYPE_CAPTION_IS_ESC_REL              (XML_SD_TYPES_START + 61 )
+#define XML_SD_TYPE_CAPTION_ESC_REL                 (XML_SD_TYPES_START + 62 )
+#define XML_SD_TYPE_CAPTION_ESC_ABS                 (XML_SD_TYPES_START + 63 )
+#define XML_SD_TYPE_CAPTION_ESC_DIR                 (XML_SD_TYPES_START + 64 )
+#define XML_SD_TYPE_CAPTION_TYPE                    (XML_SD_TYPES_START + 65 )
+
+//////////////////////////////////////////////////////////////////////////////
+// header & footer types
+#define XML_SD_TYPE_DATETIMEUPDATE                  (XML_SD_TYPES_START + 70 )
+#define XML_SD_TYPE_DATETIME_FORMAT                 (XML_SD_TYPES_START + 71 )
+
+//////////////////////////////////////////////////////////////////////////////
+// new types for merged style:protect attribute
+#define XML_SD_TYPE_MOVE_PROTECT                    (XML_SD_TYPES_START + 72 )
+#define XML_SD_TYPE_SIZE_PROTECT                    (XML_SD_TYPES_START + 73 )
+
+//////////////////////////////////////////////////////////////////////////////
+// new type for style:mirror attribute
+#define XML_TYPE_SD_MIRROR                          (XML_SD_TYPES_START + 74 )
+
+//////////////////////////////////////////////////////////////////////////////
+// new smil transition types for pages
+#define XML_SD_TYPE_TRANSITION_TYPE                 (XML_SD_TYPES_START + 75 )
+#define XML_SD_TYPE_TRANSTIION_SUBTYPE              (XML_SD_TYPES_START + 76 )
+#define XML_SD_TYPE_TRANSTIION_DIRECTION            (XML_SD_TYPES_START + 77 )
+#define XML_SD_TYPE_HEADER_FOOTER_VISIBILITY_TYPE   (XML_SD_TYPES_START + 78 )
+
+//////////////////////////////////////////////////////////////////////////////
+
+#define CTF_NUMBERINGRULES          1000
+#define CTF_CONTROLWRITINGMODE      1001
+#define CTF_WRITINGMODE             1002
+#define CTF_REPEAT_OFFSET_X         1003
+#define CTF_REPEAT_OFFSET_Y         1004
+#define CTF_PAGE_SOUND_URL          1005
+#define CTF_PAGE_VISIBLE            1006
+#define CTF_PAGE_TRANS_TYPE         1007
+#define CTF_PAGE_TRANS_STYLE        1008
+#define CTF_PAGE_TRANS_SPEED        1009
+#define CTF_PAGE_TRANS_DURATION     1010
+#define CTF_PAGE_BACKSIZE           1011
+#define CTF_DASHNAME                1012
+#define CTF_LINESTARTNAME           1013
+#define CTF_LINEENDNAME             1014
+#define CTF_FILLGRADIENTNAME        1015
+#define CTF_FILLHATCHNAME           1016
+#define CTF_FILLBITMAPNAME          1017
+#define CTF_FILLTRANSNAME           1018
+#define CTF_TEXTANIMATION_BLINKING  1019
+#define CTF_TEXTANIMATION_KIND      1020
+
+#define CTF_PAGE_TRANSITION_TYPE        1021
+#define CTF_PAGE_TRANSITION_SUBTYPE     1022
+#define CTF_PAGE_TRANSITION_DIRECTION   1023
+#define CTF_PAGE_TRANSITION_FADECOLOR   1024
+
+//////////////////////////////////////////////////////////////////////////////
+// #FontWork#
+#define CTF_FONTWORK_STYLE              1021
+#define CTF_FONTWORK_ADJUST             1022
+#define CTF_FONTWORK_DISTANCE           1023
+#define CTF_FONTWORK_START              1024
+#define CTF_FONTWORK_MIRROR             1025
+#define CTF_FONTWORK_OUTLINE            1026
+#define CTF_FONTWORK_SHADOW             1027
+#define CTF_FONTWORK_SHADOWCOLOR        1028
+#define CTF_FONTWORK_SHADOWOFFSETX      1029
+#define CTF_FONTWORK_SHADOWOFFSETY      1030
+#define CTF_FONTWORK_FORM               1031
+#define CTF_FONTWORK_HIDEFORM           1032
+#define CTF_FONTWORK_SHADOWTRANSPARENCE 1033
+
+//////////////////////////////////////////////////////////////////////////////
+// OLE part 1
+#define CTF_SD_OLE_VIS_AREA_IMPORT_LEFT     1040
+#define CTF_SD_OLE_VIS_AREA_IMPORT_TOP      1041
+#define CTF_SD_OLE_VIS_AREA_IMPORT_WIDTH    1042
+#define CTF_SD_OLE_VIS_AREA_IMPORT_HEIGHT   1043
+#define CTF_SD_OLE_ISINTERNAL               1044
+
+#define CTF_SD_MOVE_PROTECT             1045
+#define CTF_SD_SIZE_PROTECT             1046
+
+//////////////////////////////////////////////////////////////////////////////
+// caption
+#define CTF_CAPTION_ISESCREL            1047
+#define CTF_CAPTION_ESCREL              1048
+#define CTF_CAPTION_ESCABS              1049
+
+//////////////////////////////////////////////////////////////////////////////
+// header&footer
+#define CTF_HEADER_VISIBLE              1050
+#define CTF_FOOTER_VISIBLE              1051
+#define CTF_PAGE_NUMBER_VISIBLE         1052
+#define CTF_DATE_TIME_VISIBLE           1053
+#define CTF_HEADER_TEXT                 1054
+#define CTF_FOOTER_TEXT                 1055
+#define CTF_DATE_TIME_TEXT              1056
+#define CTF_DATE_TIME_FORMAT            1057
+#define CTF_DATE_TIME_UPDATE            1058
+
+//////////////////////////////////////////////////////////////////////////////
+// OLE part 2
+#define CTF_SD_OLE_ASPECT                   1059
+#define CTF_SD_OLE_VIS_AREA_EXPORT_LEFT     1060
+#define CTF_SD_OLE_VIS_AREA_EXPORT_TOP      1061
+#define CTF_SD_OLE_VIS_AREA_EXPORT_WIDTH    1062
+#define CTF_SD_OLE_VIS_AREA_EXPORT_HEIGHT   1063
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif  // _XMLSDTYPES_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */