diff options
Diffstat (limited to 'oox/source/drawingml/chart/datasourcecontext.cxx')
| -rw-r--r-- | oox/source/drawingml/chart/datasourcecontext.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx index 6a750286d2d6..087e6fd57abc 100644 --- a/oox/source/drawingml/chart/datasourcecontext.cxx +++ b/oox/source/drawingml/chart/datasourcecontext.cxx @@ -27,11 +27,8 @@ ************************************************************************/ #include "oox/drawingml/chart/datasourcecontext.hxx" -#include "oox/drawingml/chart/datasourcemodel.hxx" -using ::rtl::OUString; -using ::oox::core::ContextHandler2Helper; -using ::oox::core::ContextHandlerRef; +#include "oox/drawingml/chart/datasourcemodel.hxx" namespace oox { namespace drawingml { @@ -39,6 +36,12 @@ namespace chart { // ============================================================================ +using ::oox::core::ContextHandler2Helper; +using ::oox::core::ContextHandlerRef; +using ::rtl::OUString; + +// ============================================================================ + DoubleSequenceContext::DoubleSequenceContext( ContextHandler2Helper& rParent, DataSequenceModel& rModel ) : DataSequenceContextBase( rParent, rModel ), mnPtIndex( -1 ) @@ -88,7 +91,7 @@ ContextHandlerRef DoubleSequenceContext::onCreateContext( sal_Int32 nElement, co return 0; } -void DoubleSequenceContext::onEndElement( const OUString& rChars ) +void DoubleSequenceContext::onCharacters( const OUString& rChars ) { switch( getCurrentElement() ) { @@ -105,8 +108,8 @@ void DoubleSequenceContext::onEndElement( const OUString& rChars ) * be values. * TODO: NumberFormat conversion, remove the check then. */ - if( isPreviousElement( C_TOKEN( cat ), 4 ) || - isPreviousElement( C_TOKEN( xVal ), 4 ) ) + if( isParentElement( C_TOKEN( cat ), 4 ) || + isParentElement( C_TOKEN( xVal ), 4 ) ) mrModel.maData[ mnPtIndex ] <<= rChars; else mrModel.maData[ mnPtIndex ] <<= rChars.toDouble(); @@ -171,7 +174,7 @@ ContextHandlerRef StringSequenceContext::onCreateContext( sal_Int32 nElement, co return 0; } -void StringSequenceContext::onEndElement( const OUString& rChars ) +void StringSequenceContext::onCharacters( const OUString& rChars ) { switch( getCurrentElement() ) { |