diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-19 07:55:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-19 07:55:03 +0000 |
| commit | 7858ab2ffefbf1eb7da431d53dd2250668888705 (patch) | |
| tree | 8b2a9f0d27acbdf590914fa561f571851711e2b4 /xmloff | |
| parent | 337462f152b470f1b77d47a8243355aaf4c3f2f3 (diff) | |
INTEGRATION: CWS scriptingf4 (1.30.152); FILE MERGED
2004/04/28 14:39:41 toconnor 1.30.152.2: RESYNC: (1.30-1.31); FILE MERGED
2004/04/27 14:25:48 toconnor 1.30.152.1: #i28384# - implement Macro Selector specification
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/shapeexport2.cxx | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 98511230fee0..23df8b15daef 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeexport2.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: rt $ $Date: 2004-03-30 16:15:15 $ + * last change: $Author: rt $ $Date: 2004-05-19 08:55:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -375,7 +375,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x if( pProperties->Value >>= eClickAction ) nFound |= FOUND_CLICKACTION; } - else if( ( ( nFound & FOUND_MACRO ) == 0 ) && pProperties->Name == msMacroName ) + else if( ( ( nFound & FOUND_MACRO ) == 0 ) && ( pProperties->Name == msMacroName || pProperties->Name == msScript ) ) { if( pProperties->Value >>= aStrMacro ) nFound |= FOUND_MACRO; @@ -548,6 +548,19 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SCRIPT, XML_EVENT, sal_True, sal_True); } } + else if( aStrEventType == msScript ) + { + if( nFound & FOUND_MACRO ) + { + SvXMLElementExport aEventsElemt(rExport, XML_NAMESPACE_OFFICE, XML_EVENTS, sal_True, sal_True); + + rExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, XML_SCRIPT ); + rExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, OUString( RTL_CONSTASCII_USTRINGPARAM( "on-click" ) ) ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro ); + + SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SCRIPT, XML_EVENT, sal_True, sal_True); + } + } } while(0); } |