diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-08-26 18:37:44 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-08-26 18:37:44 +0200 |
| commit | 04c272eb8396e58376d2b61baee01c4a95f993b4 (patch) | |
| tree | 489606116a897ec3c0186161269670b0e8c66146 /oox/source/xls/commentsfragment.cxx | |
| parent | 4d9f54e9f020c91c7fda048bcf3f7549d58bc2b4 (diff) | |
dr77: #i114128# import legacy drawing controls
Diffstat (limited to 'oox/source/xls/commentsfragment.cxx')
| -rw-r--r-- | oox/source/xls/commentsfragment.cxx | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/oox/source/xls/commentsfragment.cxx b/oox/source/xls/commentsfragment.cxx index c87d3028b7cb..44ae98ca7b43 100644 --- a/oox/source/xls/commentsfragment.cxx +++ b/oox/source/xls/commentsfragment.cxx @@ -56,7 +56,7 @@ ContextHandlerRef OoxCommentsFragment::onCreateContext( sal_Int32 nElement, cons if( nElement == XLS_TOKEN( commentList ) ) return this; break; case XLS_TOKEN( authors ): - if( nElement == XLS_TOKEN( author ) ) return this; // collect author in onEndElement() + if( nElement == XLS_TOKEN( author ) ) return this; // collect author in onCharacters() break; case XLS_TOKEN( commentList ): if( nElement == XLS_TOKEN( comment ) ) { importComment( rAttribs ); return this; } @@ -69,17 +69,16 @@ ContextHandlerRef OoxCommentsFragment::onCreateContext( sal_Int32 nElement, cons return 0; } -void OoxCommentsFragment::onEndElement( const OUString& rChars ) +void OoxCommentsFragment::onCharacters( const OUString& rChars ) { - switch( getCurrentElement() ) - { - case XLS_TOKEN( author ): - getComments().appendAuthor( rChars ); - break; - case XLS_TOKEN( comment ): - mxComment.reset(); - break; - } + if( isCurrentElement( XLS_TOKEN( author ) ) ) + getComments().appendAuthor( rChars ); +} + +void OoxCommentsFragment::onEndElement() +{ + if( isCurrentElement( XLS_TOKEN( comment ) ) ) + mxComment.reset(); } ContextHandlerRef OoxCommentsFragment::onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm ) @@ -109,12 +108,8 @@ ContextHandlerRef OoxCommentsFragment::onCreateRecordContext( sal_Int32 nRecId, void OoxCommentsFragment::onEndRecord() { - switch( getCurrentElement() ) - { - case OOBIN_ID_COMMENT: - mxComment.reset(); - break; - } + if( isCurrentElement( OOBIN_ID_COMMENT ) ) + mxComment.reset(); } // oox.core.FragmentHandler2 interface ---------------------------------------- |