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/TrackChangesHandler.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/TrackChangesHandler.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/TrackChangesHandler.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.cxx b/writerfilter/source/dmapper/TrackChangesHandler.cxx index 383ce1442dbc..3801c28f8a81 100644 --- a/writerfilter/source/dmapper/TrackChangesHandler.cxx +++ b/writerfilter/source/dmapper/TrackChangesHandler.cxx @@ -10,13 +10,14 @@ #include <PropertyMap.hxx> #include <ConversionHelper.hxx> #include <ooxml/resourceids.hxx> -#include <ooxml/OOXMLFastTokens.hxx> +#include <oox/token/tokens.hxx> #include "dmapperLoggers.hxx" namespace writerfilter { namespace dmapper { using namespace ::com::sun::star; +using namespace oox; TrackChangesHandler::TrackChangesHandler( sal_Int32 nToken ) : @@ -69,16 +70,16 @@ uno::Sequence<beans::PropertyValue> TrackChangesHandler::getRedlineProperties() OUString sType; switch ( m_pRedlineParams->m_nToken & 0xffff ) { - case OOXML_tableRowInsert: + case XML_tableRowInsert: sType = rPropNameSupplier.GetName( PROP_TABLE_ROW_INSERT ); break; - case OOXML_tableRowDelete: + case XML_tableRowDelete: sType = rPropNameSupplier.GetName( PROP_TABLE_ROW_DELETE ); break; - case OOXML_tableCellInsert: + case XML_tableCellInsert: sType = rPropNameSupplier.GetName( PROP_TABLE_CELL_INSERT ); break; - case OOXML_tableCellDelete: + case XML_tableCellDelete: sType = rPropNameSupplier.GetName( PROP_TABLE_CELL_DELETE ); break; } |