summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2006-12-19 16:27:43 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2006-12-19 16:27:43 +0000
commit0b7d12221b8a4a4dfe9266ae6867d69f422c06d1 (patch)
tree8d0b51a1f636bab31e20fd3f3910b6e0f303bde4 /xmloff
parent00f682b9c8d20d958bca64b8635ff732b9e990a4 (diff)
INTEGRATION: CWS aw038 (1.70.38); FILE MERGED
2006/12/18 16:39:59 cl 1.70.38.1: #i68101# support title&description for draw:frames
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 36d9a7cdaf65..f1678b453a34 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: XMLTextFrameContext.cxx,v $
*
- * $Revision: 1.70 $
+ * $Revision: 1.71 $
*
- * last change: $Author: obo $ $Date: 2006-10-12 14:53:32 $
+ * last change: $Author: ihi $ $Date: 2006-12-19 17:27:43 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1618,9 +1618,14 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
}
}
}
+ else if( p_nPrefix == XML_NAMESPACE_SVG && // #i68101#
+ (IsXMLToken( rLocalName, XML_TITLE ) || IsXMLToken( rLocalName, XML_DESC ) ) )
+ {
+ pContext = m_xImplContext->CreateChildContext( p_nPrefix, rLocalName, xAttrList );
+ }
else
{
- // the child is a drawinh�g shape
+ // the child is a drawing shape
pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
&m_xImplContext, p_nPrefix, rLocalName, xAttrList );
}