summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorMichael Brauer <mib@openoffice.org>2001-03-21 09:19:54 +0000
committerMichael Brauer <mib@openoffice.org>2001-03-21 09:19:54 +0000
commita3324f58dc860858cf185c12dbbd11668349ab0c (patch)
treec09887b2d1d34e7cfcfe37219211fc9409f6d96f /sw/source/filter
parent6cd9ef2741cf090ee336c0d6abaa7feefce5b45a (diff)
additional floating frame properties
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/xml/xmlexp.cxx8
-rw-r--r--sw/source/filter/xml/xmltexte.cxx166
-rw-r--r--sw/source/filter/xml/xmltexte.hxx15
-rw-r--r--sw/source/filter/xml/xmltexti.cxx95
-rw-r--r--sw/source/filter/xml/xmltexti.hxx15
5 files changed, 254 insertions, 45 deletions
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 123b95ad3d56..9c2481d417d2 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmlexp.cxx,v $
*
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
*
- * last change: $Author: fs $ $Date: 2001-03-20 14:08:46 $
+ * last change: $Author: mib $ $Date: 2001-03-21 10:19:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -463,6 +463,7 @@ void SwXMLExport::GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::
sal_Int32 i=0;
Any aAny;
+#if 0
for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst();
pFrame;
i++, pFrame = SfxViewFrame::GetNext(*pFrame ) )
@@ -472,6 +473,7 @@ void SwXMLExport::GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::
aAny <<= aSequence;
xBox->insertByIndex(i, aAny);
}
+#endif
aAny <<= Reference < XIndexAccess > ( xBox, UNO_QUERY );
aProps.realloc( NUM_EXPORTED_PROPERTIES ); // Currently exporting 9 properties
@@ -593,10 +595,12 @@ void SwXMLExport::_ExportContent()
Reference<XFormsSupplier> xFormSupp(xPage, UNO_QUERY);
if (xFormSupp->getForms()->hasElements())
{
+#if 0
::xmloff::OOfficeFormsExport aOfficeForms(*this);
GetFormExport()->seekPage(xPage);
GetFormExport()->exportForms(xPage);
+#endif
}
}
}
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index ceb00e10f88d..5ac1c3bd4deb 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmltexte.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: mib $ $Date: 2001-03-16 12:50:14 $
+ * last change: $Author: mib $ $Date: 2001-03-21 10:19:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,6 +65,9 @@
#pragma hdrstop
+#ifndef _SOT_CLSIDS_HXX
+#include <sot/clsids.hxx>
+#endif
#ifndef _IPOBJ_HXX
#include <so3/ipobj.hxx>
#endif
@@ -78,6 +81,9 @@
#ifndef _XMLOFF_XMLKYWD_HXX
#include <xmloff/xmlkywd.hxx>
#endif
+#ifndef _XMLOFF_TXTPRMAP_HXX
+#include <xmloff/txtprmap.hxx>
+#endif
#include <svx/svdobj.hxx>
#ifndef _DOC_HXX //autogen wg. SwDoc
@@ -258,7 +264,11 @@ SwXMLTextParagraphExport::SwXMLTextParagraphExport(
SvXMLAutoStylePoolP& rAutoStylePool ) :
XMLTextParagraphExport( rExp, rAutoStylePool ),
sTextTable( RTL_CONSTASCII_USTRINGPARAM( "TextTable" ) ),
- sEmbeddedObjectProtocol( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" ) )
+ sEmbeddedObjectProtocol( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" ) ),
+ aAppletClassId( SO3_APPLET_CLASSID ),
+ aPluginClassId( SO3_PLUGIN_CLASSID ),
+ aIFrameClassId( SO3_IFRAME_CLASSID ),
+ aOutplaceClassId( SO3_OUT_CLASSID )
{
}
@@ -281,7 +291,7 @@ void SwXMLTextParagraphExport::getTextEmbeddedObjectProperties(
if( pInfo )
{
SvGlobalName aClassName( pInfo->GetClassName() );
- rExtern = !SvFactory::IsIntern( aClassName, 0 );
+ rExtern = aOutplaceClassId == aClassName;
}
}
@@ -321,27 +331,117 @@ static void lcl_addURL ( SvXMLExport &rExport, const String &rURL)
}
}
+void lcl_addFrameProperties(
+ const SfxFrameDescriptor *pDescriptor,
+ const XMLPropertyState **pStates,
+ const UniReference < XMLPropertySetMapper >& rMapper )
+{
+ if( ScrollingAuto != pDescriptor->GetScrollingMode() )
+ {
+ sal_Bool bValue = ScrollingYes == pDescriptor->GetScrollingMode();
+ Any aAny( &bValue, ::getBooleanCppuType() );
+ *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_FRAME_DISPLAY_SCROLLBAR ), aAny );
+ pStates++;
+ }
+ if( pDescriptor->IsFrameBorderSet() )
+ {
+ sal_Bool bValue = pDescriptor->IsFrameBorderOn();
+ Any aAny( &bValue, ::getBooleanCppuType() );
+ *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_FRAME_DISPLAY_BORDER ), aAny );
+ pStates++;
+ }
+ const Size& rMargins = pDescriptor->GetMargin();
+ if( SIZE_NOT_SET != rMargins.Width() )
+ {
+ Any aAny;
+ aAny <<= (sal_Int32)rMargins.Width();
+ *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_FRAME_MARGIN_HORI ), aAny );
+ pStates++;
+ }
+ if( SIZE_NOT_SET != rMargins.Height() )
+ {
+ Any aAny;
+ aAny <<= (sal_Int32)rMargins.Height();
+ *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_FRAME_MARGIN_VERT ), aAny );
+ pStates++;
+ }
+}
+
+void SwXMLTextParagraphExport::_collectTextEmbeddedAutoStyles(
+ const Reference < XPropertySet > & rPropSet )
+{
+ SwOLENode *pOLENd = GetNoTxtNode( rPropSet )->GetOLENode();
+ SwOLEObj& rOLEObj = pOLENd->GetOLEObj();
+ SvPersist *pPersist = pOLENd->GetDoc()->GetPersist();
+ ASSERT( pPersist, "no persist" );
+ const SvInfoObject *pInfo = pPersist->Find( rOLEObj.GetName() );
+ ASSERT( pInfo, "no info" );
+
+ SvGlobalName aClassId( pInfo->GetClassName() );
+
+ if( aIFrameClassId == aClassId )
+ {
+ SfxFrameObjectRef xFrame( rOLEObj.GetOleRef() );
+ ASSERT( xFrame.Is(), "wrong class id for frame" );
+
+ const XMLPropertyState *aStates[5] = { 0, 0, 0, 0, 0 };
+ lcl_addFrameProperties( xFrame->GetFrameDescriptor(), aStates,
+ GetAutoFramePropMapper()->getPropertySetMapper() );
+
+ Add( XML_STYLE_FAMILY_TEXT_FRAME, rPropSet, aStates );
+ const XMLPropertyState **pStates = aStates;
+ while( *pStates )
+ {
+ delete *pStates;
+ pStates++;
+ }
+ }
+ else
+ {
+ XMLTextParagraphExport::_collectTextEmbeddedAutoStyles( rPropSet );
+ }
+}
+
void SwXMLTextParagraphExport::_exportTextEmbedded(
const Reference < XPropertySet > & rPropSet,
const Reference < XPropertySetInfo > & rPropSetInfo )
{
SwOLENode *pOLENd = GetNoTxtNode( rPropSet )->GetOLENode();
SwOLEObj& rOLEObj = pOLENd->GetOLEObj();
- SvPlugInObjectRef pPlugin ( rOLEObj.GetOleRef() );
- SvAppletObjectRef pApplet ( rOLEObj.GetOleRef() );
- SfxFrameObjectRef pFrame ( rOLEObj.GetOleRef() );
+ SvPersist *pPersist = pOLENd->GetDoc()->GetPersist();
+ ASSERT( pPersist, "no persist" );
+ const SvInfoObject *pInfo = pPersist->Find( rOLEObj.GetName() );
+ ASSERT( pInfo, "no info" );
+
+ SvGlobalName aClassId( pInfo->GetClassName() );
+
SvEmbeddedObjectTypes nType = SV_EMBEDDED_UNKNOWN;
+ SvPlugInObjectRef xPlugin;
+ SvAppletObjectRef xApplet;
+ SfxFrameObjectRef xFrame;
+ if( aPluginClassId == aClassId )
+ {
+ xPlugin = SvPlugInObjectRef( rOLEObj.GetOleRef() );
+ ASSERT( xPlugin.Is(), "wrong class id for plugin" );
+ nType = SV_EMBEDDED_PLUGIN;
+ }
+ else if( aAppletClassId == aClassId )
+ {
+ xApplet = SvAppletObjectRef( rOLEObj.GetOleRef() );
+ ASSERT( xApplet.Is(), "wrong class id for applet" );
+ nType = SV_EMBEDDED_APPLET;
+ }
+ else if( aIFrameClassId == aClassId )
+ {
+ xFrame = SfxFrameObjectRef( rOLEObj.GetOleRef() );
+ ASSERT( xFrame.Is(), "wrong class id for frame" );
+ nType = SV_EMBEDDED_FRAME;
+ }
+
SvULongs aParams;
sal_Char *pElementName;
SvXMLExport &rExport = GetExport();
- if (pApplet.Is())
- nType = SV_EMBEDDED_APPLET;
- else if (pPlugin.Is())
- nType = SV_EMBEDDED_PLUGIN;
- else if (pApplet.Is())
- nType = SV_EMBEDDED_APPLET;
-
if ( nType == SV_EMBEDDED_UNKNOWN )
{
XMLTextParagraphExport::_exportTextEmbedded ( rPropSet, rPropSetInfo );
@@ -357,8 +457,20 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
aAny >>= sStyle;
}
+ const XMLPropertyState *aStates[5] = { 0, 0, 0, 0, 0 };
+ if( SV_EMBEDDED_FRAME == nType )
+ lcl_addFrameProperties( xFrame->GetFrameDescriptor(), aStates,
+ GetAutoFramePropMapper()->getPropertySetMapper() );
+
OUString sAutoStyle( sStyle );
- sAutoStyle = Find( XML_STYLE_FAMILY_TEXT_FRAME, rPropSet, sStyle );
+ sAutoStyle = Find( XML_STYLE_FAMILY_TEXT_FRAME, rPropSet, sStyle,
+ aStates );
+ const XMLPropertyState **pStates = aStates;
+ while( *pStates )
+ {
+ delete *pStates;
+ pStates++;
+ }
if( sAutoStyle.getLength() )
rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_style_name,
sAutoStyle );
@@ -369,17 +481,17 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
case SV_EMBEDDED_APPLET:
{
// It's an applet!
- const XubString & rURL = pApplet->GetCodeBase();
+ const XubString & rURL = xApplet->GetCodeBase();
if (rURL.Len() )
lcl_addURL(rExport, rURL);
- const String &rName = pApplet->GetName();
+ const String &rName = xApplet->GetName();
if (rName.Len())
- rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_name, rName );
+ rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_applet_name, rName );
- rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_code, pApplet->GetClass() );
+ rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_code, xApplet->GetClass() );
- const SvCommandList& rCommands = pApplet->GetCommandList();
+ const SvCommandList& rCommands = xApplet->GetCommandList();
ULONG i = rCommands.Count();
while ( i > 0 )
@@ -393,7 +505,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
aParams.Insert( i, aParams.Count() );
}
- if ( pApplet->IsMayScript ( ) )
+ if ( xApplet->IsMayScript ( ) )
rExport.AddAttributeASCII( XML_NAMESPACE_DRAW, sXML_may_script, sXML_true );
else
rExport.AddAttributeASCII( XML_NAMESPACE_DRAW, sXML_may_script, sXML_false );
@@ -403,8 +515,8 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
case SV_EMBEDDED_PLUGIN:
{
// It's a plugin!
- lcl_addURL( rExport, pPlugin->GetURL()->GetMainURL() );
- const String &rType = pPlugin->GetMimeType();
+ lcl_addURL( rExport, xPlugin->GetURL()->GetMainURL() );
+ const String &rType = xPlugin->GetMimeType();
if (rType.Len())
rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_mime_type, rType );
pElementName = sXML_plugin;
@@ -413,13 +525,13 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
case SV_EMBEDDED_FRAME:
{
// It's a floating frame!
- const SfxFrameDescriptor *pDescriptor = pFrame->GetFrameDescriptor();
+ const SfxFrameDescriptor *pDescriptor = xFrame->GetFrameDescriptor();
lcl_addURL( rExport, pDescriptor->GetURL().GetMainURL() );
const String &rName = pDescriptor->GetName();
if (rName.Len())
- rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_name, rName );
+ rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_frame_name, rName );
pElementName = sXML_floating_frame;
break;
}
@@ -429,7 +541,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, pElementName, sal_False, sal_True );
if ( nType == SV_EMBEDDED_APPLET)
{
- const SvCommandList& rCommands = pApplet->GetCommandList();
+ const SvCommandList& rCommands = xApplet->GetCommandList();
USHORT ii = aParams.Count();
while ( ii > 0 )
{
@@ -439,7 +551,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
}
else if (nType == SV_EMBEDDED_PLUGIN )
{
- const SvCommandList& rCommands = pPlugin->GetCommandList();
+ const SvCommandList& rCommands = xPlugin->GetCommandList();
ULONG nCommands = rCommands.Count();
for ( ULONG i = 0; i < nCommands; i++)
{
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 6ff7e0702490..a71cf928efc6 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmltexte.hxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: mib $ $Date: 2001-03-16 12:50:15 $
+ * last change: $Author: mib $ $Date: 2001-03-21 10:19:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,6 +65,9 @@
#ifndef _XMLOFF_TEXTPARAE_HXX_
#include <xmloff/txtparae.hxx>
#endif
+#ifndef _GLOBNAME_HXX
+#include <tools/globname.hxx>
+#endif
class SwXMLExport;
class SvXMLAutoStylePoolP;
@@ -78,6 +81,11 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport
const ::rtl::OUString sTextTable;
const ::rtl::OUString sEmbeddedObjectProtocol;
+ const SvGlobalName aAppletClassId;
+ const SvGlobalName aPluginClassId;
+ const SvGlobalName aIFrameClassId;
+ const SvGlobalName aOutplaceClassId;
+
SwNoTxtNode *GetNoTxtNode(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& rPropSet ) const;
@@ -87,6 +95,9 @@ protected:
const ::com::sun::star::uno::Reference<
::com::sun::star::style::XStyle > & rStyle );
+ virtual void _collectTextEmbeddedAutoStyles(
+ const ::com::sun::star::uno::Reference <
+ ::com::sun::star::beans::XPropertySet > & rPropSet );
virtual void _exportTextEmbedded(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropSet,
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 7c9ff829d993..fb485b56f602 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmltexti.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: mtg $ $Date: 2001-03-09 16:05:55 $
+ * last change: $Author: mib $ $Date: 2001-03-21 10:19:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -74,6 +74,18 @@
#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_
#include <com/sun/star/lang/XUnoTunnel.hpp>
#endif
+#ifndef _XMLOFF_PRSTYLEI_HXX_
+#include <xmloff/prstylei.hxx>
+#endif
+#ifndef _XMLOFF_PROPMAPPINGTYPES_HXX
+#include <xmloff/maptype.hxx>
+#endif
+#ifndef _XMLOFF_PROPERTYSETMAPPER_HXX
+#include <xmloff/xmlprmap.hxx>
+#endif
+#ifndef _XMLOFF_TXTPRMAP_HXX
+#include <xmloff/txtprmap.hxx>
+#endif
#ifndef _UNOCRSR_HXX
#include "unocrsr.hxx"
#endif
@@ -187,7 +199,6 @@ sal_Bool SwXMLTextImportHelper::IsInHeaderFooter() const
Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
SvXMLImport& rImport,
const OUString& rHRef,
- const OUString& rClassId,
sal_Int32 nWidth, sal_Int32 nHeight )
{
Reference < XPropertySet > xPropSet;
@@ -218,9 +229,9 @@ Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
return xPropSet;
}
-Reference< XPropertySet > SwXMLTextImportHelper::createApplet(
- const OUString &rCode,
+Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
const OUString &rName,
+ const OUString &rCode,
sal_Bool bMayScript,
const OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight )
@@ -246,7 +257,7 @@ Reference< XPropertySet > SwXMLTextImportHelper::createApplet(
xPropSet = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
return xPropSet;
}
-Reference< XPropertySet > SwXMLTextImportHelper::createPlugin(
+Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
const OUString &rMimeType,
const OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight )
@@ -281,8 +292,10 @@ Reference< XPropertySet > SwXMLTextImportHelper::createPlugin(
xPropSet = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
return xPropSet;
}
-Reference< XPropertySet > SwXMLTextImportHelper::createFloatingFrame(
+Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFrame(
+ const OUString& rName,
const OUString& rHRef,
+ const OUString& rStyleName,
sal_Int32 nWidth, sal_Int32 nHeight )
{
Reference < XPropertySet > xPropSet;
@@ -301,6 +314,74 @@ Reference< XPropertySet > SwXMLTextImportHelper::createFloatingFrame(
SfxFrameDescriptor *pFrameDesc = new SfxFrameDescriptor( 0 );
pFrameDesc->SetURL( INetURLObject::RelToAbs( rHRef ) );
+ pFrameDesc->SetName( rName );
+
+ ScrollingMode eScrollMode = ScrollingAuto;
+ sal_Bool bHasBorder = sal_False;
+ sal_Bool bIsBorderSet = sal_False;
+ Size aMargin( SIZE_NOT_SET, SIZE_NOT_SET );
+ const XMLPropStyleContext *pStyle = 0;
+ if( rStyleName.getLength() )
+ {
+ pStyle = FindAutoFrameStyle( rStyleName );
+ if( pStyle )
+ {
+ UniReference < SvXMLImportPropertyMapper > xImpPrMap =
+ pStyle->GetStyles()
+ ->GetImportPropertyMapper(pStyle->GetFamily());
+ ASSERT( xImpPrMap.is(), "Where is the import prop mapper?" );
+ if( xImpPrMap.is() )
+ {
+ UniReference<XMLPropertySetMapper> rPropMapper =
+ xImpPrMap->getPropertySetMapper();
+
+ sal_Int32 nCount = pStyle->GetProperties().size();
+ for( sal_Int32 i=0; i < nCount; i++ )
+ {
+ const XMLPropertyState& rProp = pStyle->GetProperties()[i];
+ sal_Int32 nIdx = rProp.mnIndex;
+ if( -1 == nIdx )
+ continue;
+
+ switch( rPropMapper->GetEntryContextId(nIdx) )
+ {
+ case CTF_FRAME_DISPLAY_SCROLLBAR:
+ {
+ sal_Bool bYes = *(sal_Bool *)rProp.maValue.getValue();
+ eScrollMode = bYes ? ScrollingYes : ScrollingNo;
+ }
+ break;
+ case CTF_FRAME_DISPLAY_BORDER:
+ {
+ bHasBorder = *(sal_Bool *)rProp.maValue.getValue();
+ bIsBorderSet = sal_True;
+ }
+ break;
+ case CTF_FRAME_MARGIN_HORI:
+ {
+ sal_Int32 nVal = SIZE_NOT_SET;
+ rProp.maValue >>= nVal;
+ aMargin.Width() = nVal;
+ }
+ break;
+ case CTF_FRAME_MARGIN_VERT:
+ {
+ sal_Int32 nVal = SIZE_NOT_SET;
+ rProp.maValue >>= nVal;
+ aMargin.Height() = nVal;
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
+ pFrameDesc->SetScrollingMode( eScrollMode );
+ if( bIsBorderSet )
+ pFrameDesc->SetFrameBorder( bHasBorder );
+ else
+ pFrameDesc->ResetBorder();
+ pFrameDesc->SetMargin( aMargin );
SvStorageRef pStor = new SvStorage( aEmptyStr, STREAM_STD_READWRITE );
SfxFrameObjectRef pFrame = new SfxFrameObject();
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index c21de3e374b8..f85394174c6e 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.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: mtg $ $Date: 2001-03-09 16:05:43 $
+ * last change: $Author: mib $ $Date: 2001-03-21 10:19:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -101,28 +101,29 @@ public:
::com::sun::star::beans::XPropertySet>
createAndInsertOLEObject( SvXMLImport& rImport,
const ::rtl::OUString& rHRef,
- const ::rtl::OUString& rClassId,
sal_Int32 nWidth, sal_Int32 nHeight );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
- createApplet(
- const ::rtl::OUString &rCode,
+ createAndInsertApplet(
const ::rtl::OUString &rName,
+ const ::rtl::OUString &rCode,
sal_Bool bMayScript,
const ::rtl::OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
- createPlugin(
+ createAndInsertPlugin(
const ::rtl::OUString &rMimeType,
const ::rtl::OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
- createFloatingFrame(
+ createAndInsertFloatingFrame(
const ::rtl::OUString &rName,
+ const ::rtl::OUString &rHRef,
+ const ::rtl::OUString &rStyleName,
sal_Int32 nWidth, sal_Int32 nHeight );
virtual void endAppletOrPlugin(