diff options
Diffstat (limited to 'oox/source/drawingml/chart/seriescontext.cxx')
| -rw-r--r-- | oox/source/drawingml/chart/seriescontext.cxx | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index d06ca9716944..014ca51e869d 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -26,27 +26,30 @@ ************************************************************************/ #include "oox/drawingml/chart/seriescontext.hxx" + #include "oox/drawingml/shapepropertiescontext.hxx" #include "oox/drawingml/textbodycontext.hxx" #include "oox/drawingml/chart/datasourcecontext.hxx" #include "oox/drawingml/chart/seriesmodel.hxx" #include "oox/drawingml/chart/titlecontext.hxx" -using ::rtl::OUString; -using ::oox::core::ContextHandler2; -using ::oox::core::ContextHandler2Helper; -using ::oox::core::ContextHandlerRef; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using ::oox::core::ContextHandler2; +using ::oox::core::ContextHandler2Helper; +using ::oox::core::ContextHandlerRef; +using ::rtl::OUString; + +// ============================================================================ + namespace { -ContextHandlerRef lclDataLabelSharedCreateContext( - ContextHandler2& rContext, sal_Int32 nElement, const AttributeList& rAttribs, DataLabelModelBase& orModel ) +ContextHandlerRef lclDataLabelSharedCreateContext( ContextHandler2& rContext, + sal_Int32 nElement, const AttributeList& rAttribs, DataLabelModelBase& orModel ) { if( rContext.isRootElement() ) switch( nElement ) { @@ -79,7 +82,7 @@ ContextHandlerRef lclDataLabelSharedCreateContext( orModel.mobShowVal = rAttribs.getBool( XML_val ); return 0; case C_TOKEN( separator ): - // collect separator text in onEndElement() + // collect separator text in onCharacters() return &rContext; case C_TOKEN( spPr ): return new ShapePropertiesContext( rContext, orModel.mxShapeProp.create() ); @@ -89,14 +92,10 @@ ContextHandlerRef lclDataLabelSharedCreateContext( return 0; } -void lclDataLabelSharedEndElement( ContextHandler2& rContext, const OUString& rChars, DataLabelModelBase& orModel ) +void lclDataLabelSharedCharacters( ContextHandler2& rContext, const OUString& rChars, DataLabelModelBase& orModel ) { - switch( rContext.getCurrentElement() ) - { - case C_TOKEN( separator ): - orModel.moaSeparator = rChars; - break; - } + if( rContext.isCurrentElement( C_TOKEN( separator ) ) ) + orModel.moaSeparator = rChars; } } // namespace @@ -127,9 +126,9 @@ ContextHandlerRef DataLabelContext::onCreateContext( sal_Int32 nElement, const A return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel ); } -void DataLabelContext::onEndElement( const OUString& rChars ) +void DataLabelContext::onCharacters( const OUString& rChars ) { - lclDataLabelSharedEndElement( *this, rChars, mrModel ); + lclDataLabelSharedCharacters( *this, rChars, mrModel ); } // ============================================================================ @@ -159,9 +158,9 @@ ContextHandlerRef DataLabelsContext::onCreateContext( sal_Int32 nElement, const return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel ); } -void DataLabelsContext::onEndElement( const OUString& rChars ) +void DataLabelsContext::onCharacters( const OUString& rChars ) { - lclDataLabelSharedEndElement( *this, rChars, mrModel ); + lclDataLabelSharedCharacters( *this, rChars, mrModel ); } // ============================================================================ @@ -305,7 +304,7 @@ ContextHandlerRef TrendlineContext::onCreateContext( sal_Int32 nElement, const A mrModel.mfIntercept = rAttribs.getDouble( XML_val, 0.0 ); return 0; case C_TOKEN( name ): - return this; // collect name in onEndElement() + return this; // collect name in onCharacters() case C_TOKEN( order ): mrModel.mnOrder = rAttribs.getInteger( XML_val, 2 ); return 0; @@ -323,14 +322,10 @@ ContextHandlerRef TrendlineContext::onCreateContext( sal_Int32 nElement, const A return 0; } -void TrendlineContext::onEndElement( const ::rtl::OUString& rChars ) +void TrendlineContext::onCharacters( const OUString& rChars ) { - switch( getCurrentElement() ) - { - case C_TOKEN( name ): - mrModel.maName = rChars; - break; - } + if( isCurrentElement( C_TOKEN( name ) ) ) + mrModel.maName = rChars; } // ============================================================================ @@ -757,4 +752,3 @@ ContextHandlerRef SurfaceSeriesContext::onCreateContext( sal_Int32 nElement, con } // namespace chart } // namespace drawingml } // namespace oox - |