diff options
author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 18:23:31 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 18:23:31 +0000 |
commit | 36cb4013e1634ccf94e4bd223065fd59a9a58dd0 (patch) | |
tree | 43f7fc07c15d848bb929426b874073ab85ab5e67 /sw/source/filter/xml/xmltexti.hxx | |
parent | f2cddfb69c1b9464cac6377c4ab09890b9830dff (diff) |
INTEGRATION: CWS mav09 (1.21.680); FILE MERGED
2004/08/09 19:08:00 mav 1.21.680.3: RESYNC: (1.21-1.22); FILE MERGED
2004/06/30 09:06:17 mav 1.21.680.2: #i27773# import of linked objects
2004/05/18 16:51:42 mba 1.21.680.1: #i27773#: remove so3
Diffstat (limited to 'sw/source/filter/xml/xmltexti.hxx')
-rw-r--r-- | sw/source/filter/xml/xmltexti.hxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 873f3bfb4695..3514bc4ab04a 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltexti.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: rt $ $Date: 2004-07-13 09:09:52 $ + * last change: $Author: kz $ $Date: 2004-10-04 19:23:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,14 +69,6 @@ #include <xmloff/functional.hxx> #endif -#ifndef _PLUGIN_HXX //autogen -#include <so3/plugin.hxx> -#endif - -#ifndef _FRAMEOBJ_HXX //autogen -#include <sfx2/frameobj.hxx> -#endif - class XMLRedlineImportHelper; class SwApplet_Impl; class SvPlugInObjectRef; @@ -114,6 +106,13 @@ public: sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> + createAndInsertOOoLink( SvXMLImport& rImport, + const ::rtl::OUString& rHRef, + const ::rtl::OUString& rStyleName, + const ::rtl::OUString& rTblName, + sal_Int32 nWidth, sal_Int32 nHeight ); + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::beans::XPropertySet> createAndInsertApplet( const ::rtl::OUString &rName, const ::rtl::OUString &rCode, |