New branch 'feature/aoo-fillattribute' available with the following commits:
commit 171d3cf83703085065b72bf756754375efd79372
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jun 20 16:03:03 2014 +0100
fix tests
Change-Id: Ia7099e87baa553ce6f5537908e1fb65c268d3940
commit 066b83430cef5c3f97c78bfa5c7955078cc97eeb
Author: Armin Le Grand <a...@apache.org>
Date: Thu Jun 5 12:24:35 2014 +0000
Resolves: #i125045# For XMLPropertyMapper using TEXT_PROP_MAP_SHAPE_PARA...
hide the DrawingLayer FillStyle entries by moving them to the front of
aXMLParaPropMap and using a higher index for construction
(cherry picked from commit 35f3ceaf60f109f45aa7fef7077aead398bed53f)
Change-Id: I8244e4dc685a2aa35e4154a43455ff62c8ee58fe
commit 67d40b7d8333f0c5f27a386d5c1e46d50c0c9154
Author: Armin Le Grand <a...@apache.org>
Date: Thu Jun 5 08:44:38 2014 +0000
Related: #i124638# Corrected relationship between DrawModel and...
DocShell in Writer, made SwDrawModel and handling more known
(includes suspicious removal of setting SID_ATTR_LINEEND_WIDTH_DEFAULT)
(cherry picked from commit a7ccadbf3b1ac378ca15d3630d48f48734700e5c)
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
Change-Id: Icb99eaa7bfb1eb8922a9fd928b5e4149821130dd
commit e1d734c71807b7c46bf00282442f40e0cf959896
Author: Armin Le Grand <a...@apache.org>
Date: Tue Jun 3 16:43:56 2014 +0000
Related: #i124638# Corrected paints of Writer Frames...
with DrawingLayer FillAttributes for all systems and AA/nonAA
(cherry picked from commit fcc24448899577e220db70f265bad59f0ffa8428)
Change-Id: I1b3d66061132d1d276080f99e94c421b429de936
commit 5e37fbd36f706d6903857a176732eeead8ffa976
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jun 20 12:42:59 2014 +0100
hook up new drawing support to .uis
Change-Id: Id441a91e86b89bf8fe6bfd778ca09e732e054103
commit 57629920a81c99431d4b0f342fdbc3c1a4cbddd7
Author: Armin Le Grand <a...@apache.org>
Date: Mon Jun 2 15:00:50 2014 +0000
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
Change-Id: I7e8779db6c0cbd1e242b63eab888f468f2de509a
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
