diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 15:19:35 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 15:19:35 +0000 |
commit | 1fdcf6ac733f6263ba57c951d82f8c897c070dab (patch) | |
tree | 328eb4a7c179ede3d4d18d4fab0292cd1dc703c8 /xmlscript | |
parent | c2d724cb7b03f8a15e552edfa568aa25419b6f56 (diff) |
INTEGRATION: CWS unopkg1 (1.5.10); FILE MERGED
2003/11/04 14:50:42 dbo 1.5.10.1: #i20304# namespace mapping
Diffstat (limited to 'xmlscript')
-rw-r--r-- | xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index 5d99913f4227..d9f34a3b506a 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlmod_import.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2003-09-04 09:20:27 $ + * last change: $Author: hr $ $Date: 2004-04-13 16:19:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -174,19 +174,15 @@ ModuleElement::~ModuleElement() //______________________________________________________________________________ void ModuleImport::startDocument( - Reference< container::XNameAccess > const & xUidMapping ) + Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping ) throw (xml::sax::SAXException, RuntimeException) { - if (!(xUidMapping->getByName( OUSTR(XMLNS_SCRIPT_URI) ) >>= - XMLNS_SCRIPT_UID) || - !(xUidMapping->getByName( OUSTR(XMLNS_LIBRARY_URI) ) >>= - XMLNS_LIBRARY_UID) || - !(xUidMapping->getByName( OUSTR(XMLNS_XLINK_URI) ) >>= - XMLNS_XLINK_UID)) - { - throw xml::sax::SAXException( - OUSTR("cannot get uids!"), Reference< XInterface >(), Any() ); - } + XMLNS_SCRIPT_UID = xNamespaceMapping->getUidByUri( + OUSTR(XMLNS_SCRIPT_URI) ); + XMLNS_LIBRARY_UID = xNamespaceMapping->getUidByUri( + OUSTR(XMLNS_LIBRARY_URI) ); + XMLNS_XLINK_UID = xNamespaceMapping->getUidByUri( + OUSTR(XMLNS_XLINK_URI) ); } //__________________________________________________________________________________________________ |