diff options
Diffstat (limited to 'filter/source/svg/svgfilter.hxx')
| -rw-r--r-- | filter/source/svg/svgfilter.hxx | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 37037ac9766a..2dcfa01685c0 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -32,9 +32,11 @@ #ifndef SVGFILTER_HXX #define SVGFILTER_HXX +#include <com/sun/star/animations/XAnimationNodeSupplier.hpp> #include <com/sun/star/drawing/XMasterPageTarget.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/container/XNamed.hpp> + #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> @@ -91,18 +93,21 @@ #include <cstdio> -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::lang; + +using namespace ::com::sun::star::animations; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::java; +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::document; using namespace ::com::sun::star::drawing; +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::java; +using namespace ::com::sun::star::lang; using namespace ::com::sun::star::presentation; -using namespace ::com::sun::star::document; -using namespace ::com::sun::star::text; using namespace ::com::sun::star::style; -using namespace ::com::sun::star::io; +using namespace ::com::sun::star::text; +using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; + using namespace ::std; // ----------- @@ -261,7 +266,6 @@ class SVGFilter : public cppu::WeakImplHelper4 < XFilter, { public: typedef ::boost::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap; - typedef ::std::vector< ::rtl::OUString > UniqueIdVector; typedef ::boost::unordered_set< Reference< XInterface >, HashReferenceXInterface > ObjectSet; typedef Sequence< Reference< XInterface > > ObjectSequence; typedef Sequence< Reference< XDrawPage > > XDrawPageSequence; @@ -298,11 +302,6 @@ private: XDrawPageSequence mSelectedPages; XDrawPageSequence mMasterPageTargets; - UniqueIdVector maUniqueIdVector; - sal_Int32 mnMasterSlideId; - sal_Int32 mnSlideId; - sal_Int32 mnDrawingGroupId; - sal_Int32 mnDrawingId; Link maOldFieldHdl; sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); @@ -315,6 +314,7 @@ private: sal_Bool implGenerateScript(); sal_Bool implExportDocument(); + sal_Bool implExportAnimations(); sal_Bool implExportPages( const XDrawPageSequence& rxPages, sal_Int32 nFirstPage, sal_Int32 nLastPage, @@ -329,7 +329,9 @@ private: sal_Bool implCreateObjectsFromBackground( const Reference< XDrawPage >& rxMasterPage ); ::rtl::OUString implGetClassFromShape( const Reference< XShape >& rxShape ); - ::rtl::OUString implGetValidIDFromInterface( const Reference< XInterface >& rxIf, sal_Bool bUnique = sal_False ); + void implRegisterInterface( const Reference< XInterface >& rxIf ); + const ::rtl::OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf ); + ::rtl::OUString implGetInterfaceName( const Reference< XInterface >& rxIf ); sal_Bool implLookForFirstVisiblePage(); Any implSafeGetPagePropSet( const ::rtl::OUString & sPropertyName, const Reference< XPropertySet > & rxPropSet, @@ -357,9 +359,9 @@ public: virtual ~SVGFilter(); }; +// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- class SvStream; class Graphic; |