INTEGRATION: CWS xmlfilter03_DEV300 (1.2.4); FILE MERGED

2008/02/04 13:31:51 dr 1.2.4.2: rework of fragment handler/context handler base classes
2008/02/01 09:54:34 dr 1.2.4.1: addShape() code cleanup, started xlsx drawing import

2 files changed, 42 insertions, 42 deletions

diff --git a/oox/inc/oox/ppt/pptshape.hxx b/oox/inc/oox/ppt/pptshape.hxx
index b5a61ca4c46e..2c5e3ed412ea 100644
--- a/oox/inc/oox/ppt/pptshape.hxx
+++ b/oox/inc/oox/ppt/pptshape.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pptshape.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:58 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -55,12 +55,13 @@ public:
 
     using oox::drawingml::Shape::addShape;
     // addShape is creating and inserting the corresponding XShape.
-    void addShape( const oox::core::XmlFilterBase& rFilterBase, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &rxModel,
-                    const oox::ppt::SlidePersist& rPersist,
-                        const oox::drawingml::ThemePtr, std::map< ::rtl::OUString,
-                            oox::drawingml::ShapePtr > &,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                                    const com::sun::star::awt::Rectangle* pShapeRect );
+    void addShape(
+            const oox::core::XmlFilterBase& rFilterBase,
+            const SlidePersist& rPersist,
+            const oox::drawingml::ThemePtr& rxTheme,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+            const com::sun::star::awt::Rectangle* pShapeRect = 0,
+            ::oox::drawingml::ShapeIdMap* pShapeMap = 0 );
 
     virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape );
 
diff --git a/oox/inc/oox/ppt/slidepersist.hxx b/oox/inc/oox/ppt/slidepersist.hxx
index 2541e75a7392..4d761b22d7ad 100644
--- a/oox/inc/oox/ppt/slidepersist.hxx
+++ b/oox/inc/oox/ppt/slidepersist.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: slidepersist.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:02 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -76,52 +76,51 @@ public:
 
     com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >    getPage() const { return mxPage; };
 
-    void                                                                    setMasterPersist( SlidePersistPtr pMasterPersistPtr ){ mpMasterPagePtr = pMasterPersistPtr; };
-    SlidePersistPtr                                                         getMasterPersist() const { return mpMasterPagePtr; };
+    void setMasterPersist( SlidePersistPtr pMasterPersistPtr ){ mpMasterPagePtr = pMasterPersistPtr; }
+    SlidePersistPtr getMasterPersist() const { return mpMasterPagePtr; }
 
-    void                                                                    setPath( const rtl::OUString& rPath ) { maPath = rPath; };
-    const rtl::OUString                                                     getPath() const { return maPath; };
+    void setPath( const rtl::OUString& rPath ) { maPath = rPath; }
+    const rtl::OUString getPath() const { return maPath; }
 
-    void                                                                    setLayoutPath( const rtl::OUString& rLayoutPath ) { maLayoutPath = rLayoutPath; };
-    const rtl::OUString                                                     getLayoutPath() const { return maLayoutPath; };
+    void setLayoutPath( const rtl::OUString& rLayoutPath ) { maLayoutPath = rLayoutPath; }
+    const rtl::OUString getLayoutPath() const { return maLayoutPath; }
 
-    void                                                                    setTheme( const oox::drawingml::ThemePtr pThemePtr ){ mpThemePtr = pThemePtr; };
-    oox::drawingml::ThemePtr                                                getTheme() const { return mpThemePtr; };
+    void setTheme( const oox::drawingml::ThemePtr pThemePtr ){ mpThemePtr = pThemePtr; }
+    oox::drawingml::ThemePtr getTheme() const { return mpThemePtr; }
 
-    void                                                                    setClrScheme( const oox::drawingml::ClrSchemePtr pClrSchemePtr ){ mpClrSchemePtr = pClrSchemePtr; };
-    oox::drawingml::ClrSchemePtr                                            getClrScheme() const { return mpClrSchemePtr; };
+    void setClrScheme( const oox::drawingml::ClrSchemePtr pClrSchemePtr ){ mpClrSchemePtr = pClrSchemePtr; }
+    oox::drawingml::ClrSchemePtr getClrScheme() const { return mpClrSchemePtr; }
 
-    void                                                                    setClrMap( const oox::drawingml::ClrMapPtr pClrMapPtr ){ mpClrMapPtr = pClrMapPtr; };
-    oox::drawingml::ClrMapPtr                                               getClrMap() const { return mpClrMapPtr; };
+    void setClrMap( const oox::drawingml::ClrMapPtr pClrMapPtr ){ mpClrMapPtr = pClrMapPtr; }
+    oox::drawingml::ClrMapPtr getClrMap() const { return mpClrMapPtr; }
 
-    void                                                                    setBackgroundProperties( const oox::drawingml::FillPropertiesPtr pFillPropertiesPtr ){ mpBackgroundPropertiesPtr = pFillPropertiesPtr; };
-    oox::drawingml::FillPropertiesPtr                                       getBackgroundProperties() const { return mpBackgroundPropertiesPtr; };
+    void setBackgroundProperties( const oox::drawingml::FillPropertiesPtr pFillPropertiesPtr ){ mpBackgroundPropertiesPtr = pFillPropertiesPtr; }
+    oox::drawingml::FillPropertiesPtr getBackgroundProperties() const { return mpBackgroundPropertiesPtr; }
 
-    sal_Bool                                                                isMasterPage() const { return mbMaster; };
-    sal_Bool                                                                isNotesPage() const { return mbNotes; };
+    sal_Bool isMasterPage() const { return mbMaster; }
+    sal_Bool isNotesPage() const { return mbNotes; }
 
-    void                                                                    setLayoutValueToken( sal_Int32 nLayoutValueToken ) { mnLayoutValueToken = nLayoutValueToken; };
-    short                                                                   getLayoutFromValueToken();
+    void setLayoutValueToken( sal_Int32 nLayoutValueToken ) { mnLayoutValueToken = nLayoutValueToken; }
+    short getLayoutFromValueToken();
 
-    oox::drawingml::TextListStylePtr                                        getTitleTextStyle() const { return maTitleTextStylePtr; };
-    oox::drawingml::TextListStylePtr                                        getBodyTextStyle() const { return maBodyTextStylePtr; };
-    oox::drawingml::TextListStylePtr                                        getNotesTextStyle() const { return maNotesTextStylePtr; };
-    oox::drawingml::TextListStylePtr                                        getOtherTextStyle() const { return maOtherTextStylePtr; };
+    oox::drawingml::TextListStylePtr getTitleTextStyle() const { return maTitleTextStylePtr; }
+    oox::drawingml::TextListStylePtr getBodyTextStyle() const { return maBodyTextStylePtr; }
+    oox::drawingml::TextListStylePtr getNotesTextStyle() const { return maNotesTextStylePtr; }
+    oox::drawingml::TextListStylePtr getOtherTextStyle() const { return maOtherTextStylePtr; }
 
-    oox::drawingml::ShapePtr                                                getShapes() { return maShapesPtr; };
-    ::std::list< boost::shared_ptr< TimeNode > >&                           getTimeNodeList() { return maTimeNodeList; };
+    oox::drawingml::ShapePtr getShapes() { return maShapesPtr; }
+    ::std::list< boost::shared_ptr< TimeNode > >& getTimeNodeList() { return maTimeNodeList; }
 
-    oox::vml::DrawingPtr                                                    getDrawing() { return mpDrawingPtr; };
+    oox::vml::DrawingPtr getDrawing() { return mpDrawingPtr; }
 
-    void createXShapes( const oox::core::XmlFilterBase& rFilterBase, com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel );
+    void createXShapes( const oox::core::XmlFilterBase& rFilterBase );
     void createBackground( const oox::core::XmlFilterBase& rFilterBase );
-    void applyTextStyles( com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel );
+    void applyTextStyles( const oox::core::XmlFilterBase& rFilterBase );
+
+    std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; };
+    ::oox::drawingml::ShapePtr getShape( const ::rtl::OUString & id ) { return maShapeMap[ id ]; }
+    ::oox::drawingml::ShapeIdMap& getShapeMap() { return maShapeMap; }
 
-    std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >&         getAnimNodesMap() { return maAnimNodesMap; };
-    ::oox::drawingml::ShapePtr getShape( const ::rtl::OUString & id )
-        { return maShapeMap[ id ]; }
-    std::map< ::rtl::OUString, ::oox::drawingml::ShapePtr >  & getShapeMap()
-        { return maShapeMap; }
 private:
     rtl::OUString                                                           maPath;
     rtl::OUString                                                           maLayoutPath;