diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-06-15 20:02:53 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-06-15 20:02:53 +0200 |
| commit | 5ed103d2dd5f8ee2f13183263c0930f84437bdc7 (patch) | |
| tree | ab1c7cf7a0b884df473eeda6048030ee8629972b /xmlscript | |
| parent | f9561071999b3c5c8505d648c14fff7b1bcd0caa (diff) | |
mib16: contributed bugfixes and various new symbols in VBA compatibility implementation
Diffstat (limited to 'xmlscript')
| -rw-r--r-- | xmlscript/inc/xmlscript/xmlmod_imexp.hxx | 1 | ||||
| -rw-r--r-- | xmlscript/source/xmlmod_imexp/xmlmod_export.cxx | 3 | ||||
| -rw-r--r-- | xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx index c7c1d6d1acdc..a2873542d10c 100644 --- a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx +++ b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx @@ -45,6 +45,7 @@ struct ModuleDescriptor ::rtl::OUString aName; ::rtl::OUString aLanguage; ::rtl::OUString aCode; + ::rtl::OUString aModuleType; // VBA }; void diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx index ba23ad031f91..781d2d779dda 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx @@ -65,6 +65,9 @@ SAL_CALL exportScriptModule( rMod.aName ); pModElement->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_SCRIPT_PREFIX ":language") ), rMod.aLanguage ); + if( rMod.aModuleType.getLength()>0 ) + pModElement->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_SCRIPT_PREFIX ":moduleType") ), + rMod.aModuleType ); xOut->ignorableWhitespace( OUString() ); xOut->startElement( aModuleName, xAttributes ); diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index b995817c1eb9..7f38f915aa62 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -188,11 +188,14 @@ Reference< xml::input::XElement > ModuleImport::startRootElement( else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("module") )) { mrModuleDesc.aName = xAttributes->getValueByUidName( - XMLNS_LIBRARY_UID, + XMLNS_SCRIPT_UID, OUString( RTL_CONSTASCII_USTRINGPARAM("name") ) ); mrModuleDesc.aLanguage = xAttributes->getValueByUidName( - XMLNS_XLINK_UID, + XMLNS_SCRIPT_UID, OUString( RTL_CONSTASCII_USTRINGPARAM("language") ) ); + mrModuleDesc.aModuleType = xAttributes->getValueByUidName( + XMLNS_SCRIPT_UID, + OUString( RTL_CONSTASCII_USTRINGPARAM("moduleType") ) ); return new ModuleElement( rLocalName, xAttributes, 0, this ); } |