diff options
| author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2011-01-12 13:29:17 +0100 |
|---|---|---|
| committer | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2011-01-12 13:29:17 +0100 |
| commit | 97811e2bbb84b82dbc52619bc70f8ed2eba59ee7 (patch) | |
| tree | 45f02699fd4564954300f38338612539e6bcb74c /oox/source/drawingml/color.cxx | |
| parent | d4c7fa84b7856918328bee20a5387cb32442bec3 (diff) | |
| parent | db5c714536cc07744d37f900a26e68af068ddee4 (diff) | |
dr78: rebase to DEV300_m97
Diffstat (limited to 'oox/source/drawingml/color.cxx')
| -rw-r--r-- | oox/source/drawingml/color.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index ad626b670fae..de061a91fcb4 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -28,11 +28,11 @@ #include "oox/drawingml/color.hxx" #include <algorithm> #include <math.h> -#include "tokens.hxx" #include "oox/helper/containerhelper.hxx" #include "oox/helper/graphichelper.hxx" -#include "oox/core/namespaces.hxx" #include "oox/drawingml/drawingmltypes.hxx" +#include "oox/token/namespaces.hxx" +#include "oox/token/tokens.hxx" using ::rtl::OUString; @@ -314,7 +314,7 @@ void Color::addTransformation( sal_Int32 nElement, sal_Int32 nValue ) /* Execute alpha transformations directly, store other transformations in a vector, they may depend on a scheme base color which will be resolved in Color::getColor(). */ - sal_Int32 nToken = getToken( nElement ); + sal_Int32 nToken = getBaseToken( nElement ); switch( nToken ) { case XML_alpha: lclSetValue( mnAlpha, nValue ); break; @@ -336,7 +336,7 @@ void Color::addChartTintTransformation( double fTint ) void Color::addExcelTintTransformation( double fTint ) { sal_Int32 nValue = getLimitedValue< sal_Int32, double >( fTint * MAX_PERCENT + 0.5, -MAX_PERCENT, MAX_PERCENT ); - maTransforms.push_back( Transformation( NMSP_XLS | XML_tint, nValue ) ); + maTransforms.push_back( Transformation( XLS_TOKEN( tint ), nValue ) ); } void Color::clearTransformations() |