diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:45:30 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:45:30 +0200 |
| commit | e959581b2d44bff812ffddd34b750e4f9f29e187 (patch) | |
| tree | 257c72d3fd2bc409f391bc26892f5653241455bc /oox/source/token | |
| parent | 33df62ab4a0f3c4eca1abe981c942ff53477961a (diff) | |
| parent | 256c9ce014a463b7486c8a32e7119d3f4a2c9aa4 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
filter/source/graphicfilter/epict/epict.cxx
filter/source/svg/svgexport.cxx
filter/source/svg/svgfontexport.cxx
filter/source/svg/svgwriter.cxx
lotuswordpro/source/filter/lwpchartstreamtools.cxx
lotuswordpro/source/filter/lwpfrib.cxx
lotuswordpro/source/filter/lwpgrfobj.cxx
lotuswordpro/source/filter/lwpidxmgr.cxx
lotuswordpro/source/filter/lwpobjid.cxx
lotuswordpro/source/filter/lwpparaproperty.cxx
lotuswordpro/util/makefile.mk
oox/prj/d.lst
oox/source/drawingml/chart/chartdrawingfragment.cxx
oox/source/drawingml/makefile.mk
oox/source/drawingml/shape.cxx
oox/source/ppt/slidepersist.cxx
oox/source/token/namespaces.hxx.tail
oox/source/xls/drawingfragment.cxx
oox/source/xls/excelfilter.cxx
oox/source/xls/makefile.mk
oox/source/xls/workbookhelper.cxx
writerfilter/source/ooxml/makefile.mk
writerfilter/source/resourcemodel/makefile.mk
Diffstat (limited to 'oox/source/token')
| -rw-r--r-- | oox/source/token/namespaces.hxx.tail | 37 | ||||
| -rw-r--r-- | oox/source/token/properties.txt | 5 |
2 files changed, 25 insertions, 17 deletions
diff --git a/oox/source/token/namespaces.hxx.tail b/oox/source/token/namespaces.hxx.tail index 67ddce9280dc..47702d9cb00d 100644 --- a/oox/source/token/namespaces.hxx.tail +++ b/oox/source/token/namespaces.hxx.tail @@ -10,24 +10,27 @@ inline sal_Int32 getBaseToken( sal_Int32 nToken ) { return nToken & TOKEN_MASK; /** Returns the namespace without token identifier of the passed token. */ inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; } + // defines for tokens with specific namespaces -#define A_TOKEN( token ) (::oox::NMSP_dml | XML_##token) -#define AX_TOKEN( token ) (::oox::NMSP_ax | XML_##token) -#define C_TOKEN( token ) (::oox::NMSP_dmlChart | XML_##token) -#define CDR_TOKEN( token ) (::oox::NMSP_dmlChartDr | XML_##token) -#define DGM_TOKEN( token ) (::oox::NMSP_dmlDiagram | XML_##token) -#define O_TOKEN( token ) (::oox::NMSP_vmlOffice | XML_##token) -#define PC_TOKEN( token ) (::oox::NMSP_packageContentTypes | XML_##token) -#define PPT_TOKEN( token ) (::oox::NMSP_ppt | XML_##token) -#define PR_TOKEN( token ) (::oox::NMSP_packageRel | XML_##token) -#define R_TOKEN( token ) (::oox::NMSP_officeRel | XML_##token) -#define VML_TOKEN( token ) (::oox::NMSP_vml | XML_##token) -#define VMLX_TOKEN( token ) (::oox::NMSP_vmlExcel | XML_##token) -#define XDR_TOKEN( token ) (::oox::NMSP_dmlSpreadDr | XML_##token) -#define XLS_TOKEN( token ) (::oox::NMSP_xls | XML_##token) -#define XM_TOKEN( token ) (::oox::NMSP_xm | XML_##token) -#define XML_TOKEN( token ) (::oox::NMSP_xml | XML_##token) -#define MCE_TOKEN( token ) (::oox::NMSP_mce | XML_##token) +#define OOX_TOKEN( namespace, token ) (::oox::NMSP_##namespace | ::oox::XML_##token) + +#define A_TOKEN( token ) OOX_TOKEN( dml, token ) +#define AX_TOKEN( token ) OOX_TOKEN( ax, token ) +#define C_TOKEN( token ) OOX_TOKEN( dmlChart, token ) +#define CDR_TOKEN( token ) OOX_TOKEN( dmlChartDr, token ) +#define DGM_TOKEN( token ) OOX_TOKEN( dmlDiagram, token ) +#define MCE_TOKEN( token ) OOX_TOKEN( mce, token) +#define O_TOKEN( token ) OOX_TOKEN( vmlOffice, token ) +#define PC_TOKEN( token ) OOX_TOKEN( packageContentTypes, token ) +#define PPT_TOKEN( token ) OOX_TOKEN( ppt, token ) +#define PR_TOKEN( token ) OOX_TOKEN( packageRel, token ) +#define R_TOKEN( token ) OOX_TOKEN( officeRel, token ) +#define VML_TOKEN( token ) OOX_TOKEN( vml, token ) +#define VMLX_TOKEN( token ) OOX_TOKEN( vmlExcel, token ) +#define XDR_TOKEN( token ) OOX_TOKEN( dmlSpreadDr, token ) +#define XLS_TOKEN( token ) OOX_TOKEN( xls, token ) +#define XM_TOKEN( token ) OOX_TOKEN( xm, token ) +#define XML_TOKEN( token ) OOX_TOKEN( xml, token ) // ============================================================================ diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index 693ccb1be7dd..d3bf0b776c25 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -20,6 +20,7 @@ AutoShowInfo Autocomplete BackGraphicLocation BackGraphicURL +Background BackgroundColor BasicLibraries BlackDay @@ -81,6 +82,9 @@ CharUnderlineHasColor CharWeight CharWeightAsian CharWeightComplex +CircleEndAngle +CircleKind +CircleStartAngle CodeName Color ColumnGrand @@ -317,6 +321,7 @@ PercentageNumberFormat PersistName Perspective PolyPolygon +PolygonKind Position PositionBottom PositionLeft |