diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:10:19 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:10:19 +0200 |
| commit | a093a28ffe7cae74fb731e84dd3de09102763303 (patch) | |
| tree | 8ce5586e27a76180d800c09f8b60d5cce3d1c140 /sw/source/filter/xml/xmlitemm.cxx | |
| parent | 8dc7fcfb5e5a8de2411d2bb29f450cabc3690859 (diff) | |
| parent | 99796d2482c2931a1023b8230a3f6b18d1f48ebf (diff) | |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
sw/source/core/docnode/ndnotxt.cxx
sw/source/core/inc/viewimp.hxx
sw/source/core/layout/fly.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/filter/ww8/WW8TableInfo.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtww8.cxx
sw/source/filter/ww8/wrtww8.hxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/filter/xml/xmlitemi.cxx
sw/source/filter/xml/xmlmeta.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/shells/grfsh.cxx
Diffstat (limited to 'sw/source/filter/xml/xmlitemm.cxx')
| -rw-r--r-- | sw/source/filter/xml/xmlitemm.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sw/source/filter/xml/xmlitemm.cxx b/sw/source/filter/xml/xmlitemm.cxx index 5bc92baa071c..16070cb505f4 100644 --- a/sw/source/filter/xml/xmlitemm.cxx +++ b/sw/source/filter/xml/xmlitemm.cxx @@ -47,6 +47,8 @@ using namespace ::xmloff::token; { XML_NAMESPACE_##p, XML_##l, w, MID_SW_FLAG_SPECIAL_ITEM_IMPORT|m } #define M_E_SE( p, l, w, m ) \ { XML_NAMESPACE_##p, XML_##l, w, MID_SW_FLAG_SPECIAL_ITEM_EXPORT|m } +#define M_E_SIE( p, l, w, m ) \ + { XML_NAMESPACE_##p, XML_##l, w, MID_SW_FLAG_SPECIAL_ITEM_EXPORT|MID_SW_FLAG_SPECIAL_ITEM_IMPORT|m } #define M_END { 0, XML_TOKEN_INVALID, 0, 0 } @@ -60,11 +62,12 @@ SvXMLItemMapEntry aXMLTableItemMap[] = // RES_PAPER_BIN // not required // TODO: RES_LR_SPACE - M_E_SE( FO, MARGIN_LEFT, RES_LR_SPACE, MID_L_MARGIN ), - M_E_SE( FO, MARGIN_RIGHT, RES_LR_SPACE, MID_R_MARGIN ), + M_E_SE( FO, MARGIN, -1, MID_SW_FLAG_NO_ITEM_IMPORT), + M_E_SIE( FO, MARGIN_LEFT, RES_LR_SPACE, MID_L_MARGIN ), + M_E_SIE( FO, MARGIN_RIGHT, RES_LR_SPACE, MID_R_MARGIN ), // RES_UL_SPACE - MAP_ENTRY( FO, MARGIN_TOP, RES_UL_SPACE, MID_UP_MARGIN ), - MAP_ENTRY( FO, MARGIN_BOTTOM, RES_UL_SPACE, MID_LO_MARGIN ), + M_E_SI( FO, MARGIN_TOP, RES_UL_SPACE, MID_UP_MARGIN ), + M_E_SI( FO, MARGIN_BOTTOM, RES_UL_SPACE, MID_LO_MARGIN ), // RES_PAGEDESC MAP_ENTRY( STYLE, PAGE_NUMBER, RES_PAGEDESC, MID_PAGEDESC_PAGENUMOFFSET), // RES_BREAK |