strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS xmlfilter03_DEV300 (1.2.4); FILE MERGED

Browse source 
2008/02/04 13:31:51 dr 1.2.4.1: rework of fragment handler/context handler base classes
This commit is contained in:
Kurt Zenker 2008-03-05 16:57:57 +00:00
parent bb67864e2b
commit 8832dff6cb
11 changed files with 58 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
oox/inc/oox/ppt/backgroundproperties.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: backgroundproperties.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:47 $
* last change: $Author: kz $ $Date: 2008-03-05 17:54:32 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -36,7 +36,7 @@
#ifndef OOX_POWERPOINT_BACKGROUNDPROPERTIES_HXX
#define OOX_POWERPOINT_BACKGROUNDPROPERTIES_HXX
#include "oox/core/context.hxx"
#include "oox/core/contexthandler.hxx"
#include "oox/drawingml/fillproperties.hxx"
namespace oox { namespace drawingml {
@ -44,10 +44,10 @@ namespace oox { namespace drawingml {
// ---------------------------------------------------------------------
class BackgroundPropertiesContext : public ::oox::core::Context
class BackgroundPropertiesContext : public ::oox::core::ContextHandler
{
public:
BackgroundPropertiesContext( const ::oox::core::FragmentHandlerRef& xParser, ::oox::drawingml::FillPropertiesPtr pFillPropertiesPtr ) throw();
BackgroundPropertiesContext( ::oox::core::ContextHandler& rParent, ::oox::drawingml::FillPropertiesPtr pFillPropertiesPtr ) throw();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
protected:

11
oox/inc/oox/ppt/layoutfragmenthandler.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: layoutfragmenthandler.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:47 $
* last change: $Author: kz $ $Date: 2008-03-05 17:54:45 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -42,17 +42,14 @@
namespace oox { namespace ppt {
class LayoutFragmentHandler : public ::oox::ppt::SlideFragmentHandler
class LayoutFragmentHandler : public SlideFragmentHandler
{
public:
LayoutFragmentHandler( const oox::core::XmlFilterRef& xFilter, const ::rtl::OUString& rFragmentPath, oox::ppt::SlidePersistPtr pMasterPersistPtr ) throw();
LayoutFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) throw();
virtual ~LayoutFragmentHandler() throw();
virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
private:
};
} }

8
oox/inc/oox/ppt/pptshapecontext.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: pptshapecontext.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:47 $
* last change: $Author: kz $ $Date: 2008-03-05 17:55:21 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -42,10 +42,10 @@ namespace oox { namespace ppt {
class PPTShapeContext : public ::oox::drawingml::ShapeContext
{
oox::ppt::SlidePersistPtr mpSlidePersistPtr;
SlidePersistPtr mpSlidePersistPtr;
public:
PPTShapeContext( const oox::ppt::SlidePersistPtr pSlidePersistPtr, const ::oox::core::FragmentHandlerRef& xHandler, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr );
PPTShapeContext( ::oox::core::ContextHandler& rParent, const SlidePersistPtr pSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
};

6
oox/inc/oox/ppt/pptshapepropertiescontext.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: pptshapepropertiescontext.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:47 $
* last change: $Author: kz $ $Date: 2008-03-05 17:55:54 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -43,7 +43,7 @@ namespace oox { namespace ppt {
class PPTShapePropertiesContext : public ::oox::drawingml::ShapePropertiesContext
{
public:
PPTShapePropertiesContext( const ::oox::core::ContextRef& xParent, ::oox::drawingml::Shape& rShape );
PPTShapePropertiesContext( ::oox::core::ContextHandler& rParent, ::oox::drawingml::Shape& rShape );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);

6
oox/inc/oox/ppt/presentationfragmenthandler.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: presentationfragmenthandler.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:47 $
* last change: $Author: kz $ $Date: 2008-03-05 17:56:07 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -52,7 +52,7 @@ namespace oox { namespace ppt {
class PresentationFragmentHandler : public ::oox::core::FragmentHandler
{
public:
PresentationFragmentHandler( const oox::core::XmlFilterRef& xFilter, const ::rtl::OUString& rFragmentPath ) throw();
PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath ) throw();
virtual ~PresentationFragmentHandler() throw();
virtual void SAL_CALL startDocument( ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);

14
oox/inc/oox/ppt/slidefragmenthandler.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: slidefragmenthandler.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:47 $
* last change: $Author: kz $ $Date: 2008-03-05 17:56:28 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -51,19 +51,19 @@ namespace oox { namespace ppt {
class SlideFragmentHandler : public ::oox::core::FragmentHandler
{
public:
SlideFragmentHandler( const oox::core::XmlFilterRef& xFilter, const ::rtl::OUString& rFragmentPath, oox::ppt::SlidePersistPtr pPersistPtr, const oox::ppt::ShapeLocation eShapeLocation ) throw();
SlideFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation ) throw();
virtual ~SlideFragmentHandler() throw();
virtual void SAL_CALL endDocument( ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
protected:
::oox::ppt::SlidePersistPtr mpSlidePersistPtr;
::oox::ppt::ShapeLocation meShapeLocation;
SlidePersistPtr mpSlidePersistPtr;
ShapeLocation meShapeLocation;
private:
::rtl::OUString maSlideName;
PropertyMap maSlideProperties;
::rtl::OUString maSlideName;
PropertyMap maSlideProperties;
};
} }

12
oox/inc/oox/ppt/slidemastertextstylescontext.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: slidemastertextstylescontext.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:47 $
* last change: $Author: kz $ $Date: 2008-03-05 17:56:40 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -37,21 +37,21 @@
#define OOX_DRAWINGML_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
#include "oox/drawingml/theme.hxx"
#include "oox/core/context.hxx"
#include "oox/core/contexthandler.hxx"
#include "oox/core/fragmenthandler.hxx"
#include "oox/ppt/slidepersist.hxx"
namespace oox { namespace ppt {
class SlideMasterTextStylesContext : public oox::core::Context
class SlideMasterTextStylesContext : public oox::core::ContextHandler
{
public:
SlideMasterTextStylesContext( const ::oox::core::FragmentHandlerRef& xHandler, oox::ppt::SlidePersistPtr pSlidePersistPtr );
SlideMasterTextStylesContext( ::oox::core::ContextHandler& rParent, SlidePersistPtr pSlidePersistPtr );
~SlideMasterTextStylesContext();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
protected:
oox::ppt::SlidePersistPtr mpSlidePersistPtr;
SlidePersistPtr mpSlidePersistPtr;
};
} }

11
oox/inc/oox/ppt/slidetimingcontext.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: slidetimingcontext.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:47 $
* last change: $Author: kz $ $Date: 2008-03-05 17:57:20 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -36,20 +36,19 @@
#ifndef OOX_PPT_SLIDETIMINGCONTEXT
#define OOX_PPT_SLIDETIMINGCONTEXT
#include <com/sun/star/animations/XTimeContainer.hpp>
#include "oox/ppt/timenode.hxx"
#include "oox/core/context.hxx"
#include "oox/core/contexthandler.hxx"
#include <stack>
#include <vector>
namespace oox { namespace ppt {
class SlideTimingContext : public ::oox::core::Context
class SlideTimingContext : public ::oox::core::ContextHandler
{
public:
SlideTimingContext( const ::oox::core::FragmentHandlerRef& xHandler, TimeNodePtrList & aTimeNodeList ) throw();
SlideTimingContext( ::oox::core::ContextHandler& rParent, TimeNodePtrList & aTimeNodeList ) throw();
virtual ~SlideTimingContext() throw();
virtual void SAL_CALL endDocument( ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);

18
oox/inc/oox/ppt/slidetransitioncontext.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: slidetransitioncontext.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:47 $
* last change: $Author: kz $ $Date: 2008-03-05 17:57:32 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -36,30 +36,28 @@
#ifndef OOX_PPT_SLIDETRANSITIONCONTEXT
#define OOX_PPT_SLIDETRANSITIONCONTEXT
#include "oox/core/context.hxx"
#include "oox/core/contexthandler.hxx"
#include "oox/ppt/slidetransition.hxx"
namespace oox { class PropertyMap; }
namespace oox { namespace ppt {
class SlideTransitionContext : public ::oox::core::Context
class SlideTransitionContext : public ::oox::core::ContextHandler
{
public:
SlideTransitionContext( const ::oox::core::FragmentHandlerRef& xHandler,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes,
PropertyMap & aProperties ) throw();
SlideTransitionContext( ::oox::core::ContextHandler& rParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes,
PropertyMap & aProperties ) throw();
virtual ~SlideTransitionContext() throw();
virtual void SAL_CALL endFastElement( sal_Int32 aElement ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext( ::sal_Int32 Element,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
private:
PropertyMap& maSlideProperties;
::sal_Bool mbHasTransition;
SlideTransition maTransition;

10
oox/inc/oox/ppt/soundactioncontext.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: soundactioncontext.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:47 $
* last change: $Author: kz $ $Date: 2008-03-05 17:57:45 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -37,16 +37,16 @@
#ifndef OOX_PPT_SOUNDACTIONCONTEXT
#define OOX_PPT_SOUNDACTIONCONTEXT
#include "oox/core/context.hxx"
#include "oox/core/contexthandler.hxx"
namespace oox { class PropertyMap; }
namespace oox { namespace ppt {
class SoundActionContext : public ::oox::core::Context
class SoundActionContext : public ::oox::core::ContextHandler
{
public:
SoundActionContext( const ::oox::core::FragmentHandlerRef & xHandler, PropertyMap & aProperties ) throw();
SoundActionContext( ::oox::core::ContextHandler& rParent, PropertyMap & aProperties ) throw();
virtual ~SoundActionContext() throw();
virtual void SAL_CALL endFastElement( sal_Int32 aElement ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);

17
oox/inc/oox/ppt/timenodelistcontext.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: timenodelistcontext.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2008-01-17 08:05:48 $
* last change: $Author: kz $ $Date: 2008-03-05 17:57:57 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -36,7 +36,7 @@
#ifndef OOX_PPT_TIMENODELISTCONTEXT
#define OOX_PPT_TIMENODELISTCONTEXT
#include "oox/core/context.hxx"
#include "oox/core/contexthandler.hxx"
#include "oox/ppt/timenode.hxx"
#include <com/sun/star/animations/XTimeContainer.hpp>
@ -44,15 +44,15 @@
namespace oox { namespace ppt {
class TimeNodeContext : public ::oox::core::Context
class TimeNodeContext : public ::oox::core::ContextHandler
{
public:
virtual ~TimeNodeContext() throw();
static TimeNodeContext * SAL_CALL makeContext( const ::oox::core::FragmentHandlerRef& xHandler, sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
static TimeNodeContext * SAL_CALL makeContext( ::oox::core::ContextHandler& rParent, sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
protected:
TimeNodeContext( const ::oox::core::FragmentHandlerRef& xHandler, sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw();
TimeNodeContext( ::oox::core::ContextHandler& rParent, sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw();
sal_Int32 mnElement;
TimeNodePtr mpNode;
@ -61,11 +61,10 @@ namespace oox { namespace ppt {
/** FastParser context for XML_tnLst, XML_subTnLst and XML_childTnLst */
class TimeNodeListContext : public ::oox::core::Context
class TimeNodeListContext : public ::oox::core::ContextHandler
{
public:
TimeNodeListContext( const ::oox::core::FragmentHandlerRef& xHandler,
TimeNodePtrList & aList ) throw();
TimeNodeListContext( ::oox::core::ContextHandler& rParent, TimeNodePtrList & aList ) throw();
virtual ~TimeNodeListContext() throw();