diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:58:07 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:58:07 +0000 |
commit | dee696ff92776fda0543b9a360251743dc3a240e (patch) | |
tree | fdf8d3a9c9d8f9400572c6d7240e83e29ef3beda /oox | |
parent | 71481d27a7376ba61859e7d80263e3dfb1138412 (diff) |
INTEGRATION: CWS xmlfilter03_DEV300 (1.2.4); FILE MERGED
2008/02/05 14:08:07 dr 1.2.4.2: oox::core::ContextHandler2 and oox::core::FragmentHandler2 for convenience
2008/01/25 12:53:10 dr 1.2.4.1: simplified OoxContextHelper interface
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/xls/connectionsfragment.cxx | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/oox/source/xls/connectionsfragment.cxx b/oox/source/xls/connectionsfragment.cxx index 125e79cccc45..471f94424674 100644 --- a/oox/source/xls/connectionsfragment.cxx +++ b/oox/source/xls/connectionsfragment.cxx @@ -4,9 +4,9 @@ * * $RCSfile: connectionsfragment.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2008-01-17 08:06:08 $ + * last change: $Author: kz $ $Date: 2008-03-05 18:58:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -54,28 +54,33 @@ OoxConnectionsFragment::OoxConnectionsFragment( const WorkbookHelper& rHelper, c { } -bool OoxConnectionsFragment::onCanCreateContext( sal_Int32 nElement ) const +ContextWrapper OoxConnectionsFragment::onCreateContext( sal_Int32 nElement, const AttributeList& ) { - switch( getCurrentContext() ) + switch( getCurrentElement() ) { - case XML_ROOT_CONTEXT: return (nElement == XLS_TOKEN( connections )); - case XLS_TOKEN( connections ): return (nElement == XLS_TOKEN( connection )); - case XLS_TOKEN( connection ): return (nElement == XLS_TOKEN( webPr )) || - (nElement == XLS_TOKEN( textPr )) || - (nElement == XLS_TOKEN( dbPr )) || - (nElement == XLS_TOKEN( olapPr )) || - (nElement == XLS_TOKEN( parameters )); - case XLS_TOKEN( webPr ): return (nElement == XLS_TOKEN( tables )); - case XLS_TOKEN( tables ): return (nElement == XLS_TOKEN( m )) || - (nElement == XLS_TOKEN( s )) || - (nElement == XLS_TOKEN( x )); + case XML_ROOT_CONTEXT: + return (nElement == XLS_TOKEN( connections )); + case XLS_TOKEN( connections ): + return (nElement == XLS_TOKEN( connection )); + case XLS_TOKEN( connection ): + return (nElement == XLS_TOKEN( webPr )) || + (nElement == XLS_TOKEN( textPr )) || + (nElement == XLS_TOKEN( dbPr )) || + (nElement == XLS_TOKEN( olapPr )) || + (nElement == XLS_TOKEN( parameters )); + case XLS_TOKEN( webPr ): + return (nElement == XLS_TOKEN( tables )); + case XLS_TOKEN( tables ): + return (nElement == XLS_TOKEN( m )) || + (nElement == XLS_TOKEN( s )) || + (nElement == XLS_TOKEN( x )); } return false; } void OoxConnectionsFragment::onStartElement( const AttributeList& rAttribs ) { - switch ( getCurrentContext() ) + switch ( getCurrentElement() ) { case XLS_TOKEN( connection ): importConnection( rAttribs ); @@ -125,3 +130,4 @@ void OoxConnectionsFragment::importX( const AttributeList& /*rAttribs*/ ) } // namespace xls } // namespace oox + |