diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 15:46:41 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 15:46:41 +0000 |
| commit | 31160bc08560e633a8f0517933612635a2dd1f71 (patch) | |
| tree | 9d2cd39b48b181b95778924e43971f004adb9cde /xmloff/source/draw/ximpshap.cxx | |
| parent | e1b2c0d260c34c40322acd5b77af261ceeb65ac3 (diff) | |
INTEGRATION: CWS rptchart01_DEV300 (1.122.54); FILE MERGED
2008/03/05 09:10:23 oj 1.122.54.2: RESYNC: (1.122-1.123); FILE MERGED
2008/01/24 13:26:34 oj 1.122.54.1: change PTR_CAST calls
Diffstat (limited to 'xmloff/source/draw/ximpshap.cxx')
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index bef789da0340..b9bb0e686eb9 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ximpshap.cxx,v $ * - * $Revision: 1.123 $ + * $Revision: 1.124 $ * - * last change: $Author: obo $ $Date: 2008-02-26 13:37:09 $ + * last change: $Author: kz $ $Date: 2008-03-05 16:46:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -805,7 +805,8 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) if( NULL == GetImport().GetShapeImport()->GetAutoStylesContext()) break; - XMLPropStyleContext* pStyle = PTR_CAST( XMLPropStyleContext, GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(XML_STYLE_FAMILY_TEXT_PARAGRAPH, maTextStyleName) ); + const SvXMLStyleContext* pTempStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(XML_STYLE_FAMILY_TEXT_PARAGRAPH, maTextStyleName); + XMLPropStyleContext* pStyle = PTR_CAST( XMLPropStyleContext, pTempStyle ); // use temp var, PTR_CAST is a bad macro, FindStyleChildContext will be called twice if( pStyle == NULL ) break; |