diff options
| author | Armin Le Grand <alg@apache.org> | 2014-03-19 16:17:02 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-28 14:31:08 +0100 |
| commit | 6e61ecd09679a66060f932835622821d39e92f01 (patch) | |
| tree | 4ce71adaa6da133cab09660b3efc1341104022a2 /sw/inc/unomap.hxx | |
| parent | c7190108f02921868cb617040aebdb2d22c02c1f (diff) | |
Merge back branch alg_writerframes to trunk
(cherry picked from commit b635b4fa4e42053d30ab639643d2236a20243f62)
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
Diffstat (limited to 'sw/inc/unomap.hxx')
| -rw-r--r-- | sw/inc/unomap.hxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index e95309217300..93c3fc5a7f95 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -309,6 +309,14 @@ #define WID_TXTCOL_AUTO_DISTANCE 6 #define WID_TXTCOL_LINE_STYLE 7 +//UUUU This define would need the include of <svx/unoshprp.hxx>, but this ends +// in a mess; there *are* double used symbols which are used in a #define in +// editengine and as an enum in sw; these will then collide and lead to severe +// problems which will be hard to detect at all (e.g. look for UNO_NAME_CHAR_COLOR). +// More of these are likely, so better use a local define here, but at least the same +// as in svx/inc/unoshprp.hxx +#define OWN_ATTR_FILLBMP_MODE (OWN_ATTR_VALUE_START+45) + class SwUnoPropertyMapProvider { SfxItemPropertyMapEntry const * aMapEntriesArr[PROPERTY_MAP_END]; |