Kaydet (Commit) d0431b4c authored tarafından Oliver Bolte's avatar Oliver Bolte

INTEGRATION: CWS jmf2 (1.58.12); FILE MERGED

2004/07/28 19:57:14 ka 1.58.12.1: #i3316#: support for media objects
üst 8b12658d
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: XMLTextFrameContext.cxx,v $ * $RCSfile: XMLTextFrameContext.cxx,v $
* *
* $Revision: 1.58 $ * $Revision: 1.59 $
* *
* last change: $Author: rt $ $Date: 2004-07-13 08:36:31 $ * last change: $Author: obo $ $Date: 2004-08-12 08:51:02 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -1491,7 +1491,35 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( ...@@ -1491,7 +1491,35 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
pContext = GetImport().GetShapeImport()->CreateFrameChildContext( pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
GetImport(), nPrefix, rLocalName, xAttrList, xShapes, m_xAttrList ); GetImport(), nPrefix, rLocalName, xAttrList, xShapes, m_xAttrList );
} }
else else if( XML_TEXT_FRAME_PLUGIN == nFrameType )
{
bool bMedia = false;
// check, if we have a media object
for( sal_Int16 n = 0, nAttrCount = ( xAttrList.is() ? xAttrList->getLength() : 0 ); n < nAttrCount; ++n )
{
OUString aLocalName;
sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( n ), &aLocalName );
if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( aLocalName, XML_MIME_TYPE ) )
{
if( 0 == xAttrList->getValueByIndex( n ).compareToAscii( "application/vnd.sun.star.media" ) )
bMedia = true;
// leave this loop
n = nAttrCount - 1;
}
}
if( bMedia )
{
Reference < XShapes > xShapes;
pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
GetImport(), nPrefix, rLocalName, xAttrList, xShapes, m_xAttrList );
}
}
if( !pContext )
{ {
pContext = new XMLTextFrameContext_Impl( GetImport(), nPrefix, pContext = new XMLTextFrameContext_Impl( GetImport(), nPrefix,
...@@ -1500,6 +1528,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( ...@@ -1500,6 +1528,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
nFrameType, nFrameType,
m_xAttrList ); m_xAttrList );
} }
m_xImplContext = pContext; m_xImplContext = pContext;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment