diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-05 19:09:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-05 19:16:03 +0200 |
| commit | 459603e36a03e91310c236555f80ae612f02d6b2 (patch) | |
| tree | 2f1f072690260e12e749ed93afd8c5087f86a999 /writerfilter/source/dmapper/TablePropertiesHandler.cxx | |
| parent | 91573182c8474297ef893f98bb04e830f3095cc2 (diff) | |
writerfilter: bin OOXML_something duplication of oox::XML_something constants
workdir/CustomTarget/writerfilter/source/ooxml/OOXMLFastTokens.hxx was a
duplication of workdir/CustomTarget/oox/generated/oox/token/tokens.hxx,
except when the oox generator changed, the writerfilter copy was not
adjusted and Bad Things happened. We don't need this.
Change-Id: Id92481f110b04ec24cb424421aa0ec029b7896f3
Diffstat (limited to 'writerfilter/source/dmapper/TablePropertiesHandler.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/TablePropertiesHandler.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index 0832ec28bdb7..de66b335feee 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -32,9 +32,10 @@ #include <com/sun/star/text/SizeType.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <dmapperLoggers.hxx> -#include <ooxml/OOXMLFastTokens.hxx> +#include <oox/token/tokens.hxx> using namespace com::sun::star; +using namespace oox; namespace writerfilter { namespace dmapper { @@ -124,10 +125,10 @@ namespace dmapper { switch( nSprmId ) { case NS_ooxml::LN_CT_TrPr_ins: - nToken = OOXML_tableRowInsert; + nToken = XML_tableRowInsert; break; case NS_ooxml::LN_CT_TrPr_del: - nToken = OOXML_tableRowDelete; + nToken = XML_tableRowDelete; break; }; TrackChangesHandlerPtr pTrackChangesHandler( new TrackChangesHandler( nToken ) ); @@ -152,10 +153,10 @@ namespace dmapper { switch( nSprmId ) { case NS_ooxml::LN_CT_TcPrBase_cellIns: - nToken = OOXML_tableCellInsert; + nToken = XML_tableCellInsert; break; case NS_ooxml::LN_CT_TcPrBase_cellDel: - nToken = OOXML_tableCellDelete; + nToken = XML_tableCellDelete; break; default: throw ::com::sun::star::lang::IllegalArgumentException("illegal redline token type", NULL, 0); |