mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS dr12 (1.49.66); FILE MERGED

Browse Source 
2004/07/30 11:50:50 sab 1.49.66.3: #i21253#; make notes work
2004/07/26 11:29:28 sab 1.49.66.2: RESYNC: (1.49-1.52); FILE MERGED
2004/07/23 20:59:58 sab 1.49.66.1: #i21253#; add formatted notes
This commit is contained in:
Jens-Heiner Rechtien
2004-09-08 12:40:00 +00:00
parent 72def86370
commit fbeb7e042e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xmloff/source/draw/shapeimport.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: shapeimport.cxx,v $
*
* $Revision: 1.52 $
* $Revision: 1.53 $
*
* last change: $Author: rt $ $Date: 2004-07-14 10:19:42 $
* last change: $Author: hr $ $Date: 2004-09-08 13:40:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -359,6 +359,8 @@ static __FAR_DATA SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
{ XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_GROUP_FRAME },
{ XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_GROUP_ANNOTATION },
XML_TOKEN_MAP_END
};
@@ -880,6 +882,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
break;
}
case XML_TOK_GROUP_CAPTION:
case XML_TOK_GROUP_ANNOTATION:
{
// draw:caption inside group context
pContext = new SdXMLCaptionShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );