• Armin Le Grand's avatar
    Related: #i124638# Second step of DrawingLayer FillAttributes... · 7d9bb549
    Armin Le Grand yazdı
    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
    7d9bb549
unoframe.hxx 22.2 KB