diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-16 12:11:50 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-16 12:11:50 +0000 |
| commit | 39493cb254b77dce905a0111e043b3699da3928a (patch) | |
| tree | 9d7f22e3c56627788439ac26363e1ee29d7299ac /xmloff | |
| parent | 615b3824b258d09e24d92b0135827e03bfd97da7 (diff) | |
INTEGRATION: CWS impressrng01_SRC680 (1.63.98); FILE MERGED
2007/03/28 13:37:23 cl 1.63.98.1: #i42375# allow import of draw:frame that are empty placeholders and are empty
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 60bd9adec08a..154ee6261c48 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shapeimport.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.64 $ * - * last change: $Author: obo $ $Date: 2006-09-17 10:29:57 $ + * last change: $Author: ihi $ $Date: 2007-04-16 13:11:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -908,7 +908,8 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext( const SvXMLTokenMap& rTokenMap = GetFrameShapeElemTokenMap(); SvXMLAttributeList *pAttrList = new SvXMLAttributeList( rAttrList ); - pAttrList->AppendAttributeList( rFrameAttrList ); + if( rFrameAttrList.is() ) + pAttrList->AppendAttributeList( rFrameAttrList ); uno::Reference < xml::sax::XAttributeList > xAttrList = pAttrList; |