From f02b998363c6a5dc9d7d36977dc380e81b6233e7 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Tue, 13 Apr 2004 15:19:14 +0000
Subject: INTEGRATION: CWS unopkg1 (1.7.10); FILE MERGED 2004/03/24 10:32:26
dbo 1.7.10.2: RESYNC: (1.7-1.8); FILE MERGED 2003/11/04 14:50:41 dbo
1.7.10.1: #i20304# namespace mapping
---
xmlscript/source/xmllib_imexp/xmllib_import.cxx | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
(limited to 'xmlscript')
diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
index 08d99cf819dc..df521dec62e7 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmllib_import.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: obo $ $Date: 2004-03-17 13:42:51 $
+ * last change: $Author: hr $ $Date: 2004-04-13 16:19:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -174,18 +174,13 @@ LibElementBase::~LibElementBase()
//______________________________________________________________________________
void LibraryImport::startDocument(
- Reference< container::XNameAccess > const & xUidMapping )
+ Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
throw (xml::sax::SAXException, RuntimeException)
{
- if (!(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_LIBRARY_UID = xNamespaceMapping->getUidByUri(
+ OUSTR(XMLNS_LIBRARY_URI) );
+ XMLNS_XLINK_UID = xNamespaceMapping->getUidByUri(
+ OUSTR(XMLNS_XLINK_URI) );
}
//__________________________________________________________________________________________________
void LibraryImport::endDocument()
--
cgit