unoxml: huge namespacing cleanup

Change-Id: I2170e8fd9ef5ca0556545cb3f656a0e1ba49f43b

1 files changed, 71 insertions, 75 deletions

diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx
index f14eebd6943a..ff27d3d9dcc5 100644
--- a/unoxml/source/dom/element.hxx
+++ b/unoxml/source/dom/element.hxx
@@ -30,13 +30,9 @@
 
 #include <node.hxx>
 
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::xml::dom;
-
 namespace DOM
 {
-    typedef ::cppu::ImplInheritanceHelper1<CNode, XElement > CElement_Base;
+    typedef ::cppu::ImplInheritanceHelper1<CNode, css::xml::dom::XElement > CElement_Base;
 
     class CElement
         : public CElement_Base
@@ -44,8 +40,8 @@ namespace DOM
     private:
         friend class CDocument;
 
-        Reference< XAttr > setAttributeNode_Impl_Lock(
-                Reference< XAttr > const& xNewAttr, bool const bNS);
+        css::uno::Reference< css::xml::dom::XAttr > setAttributeNode_Impl_Lock(
+                css::uno::Reference< css::xml::dom::XAttr > const& xNewAttr, bool const bNS);
 
     protected:
         CElement(CDocument const& rDocument, ::osl::Mutex const& rMutex,
@@ -53,238 +49,238 @@ namespace DOM
 
     public:
 
-        virtual void saxify(const Reference< XDocumentHandler >& i_xHandler) SAL_OVERRIDE;
+        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) SAL_OVERRIDE;
 
         virtual void fastSaxify( Context& i_rContext ) SAL_OVERRIDE;
 
-        virtual bool IsChildTypeAllowed(NodeType const nodeType) SAL_OVERRIDE;
+        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) SAL_OVERRIDE;
 
         /**
         Retrieves an attribute value by name.
         */
         virtual OUString  SAL_CALL getAttribute(const OUString& name)
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         /**
         Retrieves an attribute node by name.
         */
-        virtual Reference< XAttr > SAL_CALL getAttributeNode(const OUString& name)
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNode(const OUString& name)
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         /**
         Retrieves an Attr node by local name and namespace URI.
         */
-        virtual Reference< XAttr > SAL_CALL getAttributeNodeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNodeNS(const OUString& namespaceURI, const OUString& localName)
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         /**
         Retrieves an attribute value by local name and namespace URI.
         */
         virtual OUString SAL_CALL getAttributeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         /**
         Returns a NodeList of all descendant Elements with a given tag name,
         in the order in which they are
         encountered in a preorder traversal of this Element tree.
         */
-        virtual Reference< XNodeList > SAL_CALL getElementsByTagName(const OUString& name)
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagName(const OUString& name)
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         /**
         Returns a NodeList of all the descendant Elements with a given local
         name and namespace URI in the order in which they are encountered in
         a preorder traversal of this Element tree.
         */
-        virtual Reference< XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI,
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI,
                 const OUString& localName)
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         /**
         The name of the element.
         */
         virtual OUString SAL_CALL getTagName()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         /**
         Returns true when an attribute with a given name is specified on this
         element or has a default value, false otherwise.
         */
         virtual sal_Bool SAL_CALL hasAttribute(const OUString& name)
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         /**
         Returns true when an attribute with a given local name and namespace
         URI is specified on this element or has a default value, false otherwise.
         */
         virtual sal_Bool SAL_CALL hasAttributeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         /**
         Removes an attribute by name.
         */
         virtual void SAL_CALL removeAttribute(const OUString& name)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
 
         /**
         Removes the specified attribute node.
         */
-        virtual Reference< XAttr > SAL_CALL removeAttributeNode(const Reference< XAttr >& oldAttr)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL removeAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& oldAttr)
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
 
         /**
         Removes an attribute by local name and namespace URI.
         */
         virtual void SAL_CALL removeAttributeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
 
         /**
         Adds a new attribute.
         */
         virtual void SAL_CALL setAttribute(const OUString& name, const OUString& value)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
 
         /**
         Adds a new attribute node.
         */
-        virtual Reference< XAttr > SAL_CALL setAttributeNode(const Reference< XAttr >& newAttr)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& newAttr)
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
 
         /**
         Adds a new attribute.
         */
-        virtual Reference< XAttr > SAL_CALL setAttributeNodeNS(const Reference< XAttr >& newAttr)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNodeNS(const css::uno::Reference< css::xml::dom::XAttr >& newAttr)
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
 
         /**
         Adds a new attribute.
         */
         virtual void SAL_CALL setAttributeNS(
                 const OUString& namespaceURI, const OUString& qualifiedName, const OUString& value)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
 
         /**
         sets the element name
         */
         virtual void SAL_CALL setElementName(const OUString& elementName)
-            throw (RuntimeException, DOMException);
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException);
 
         // overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
         virtual OUString SAL_CALL getNodeValue()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual Reference< XNamedNodeMap > SAL_CALL getAttributes()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
         virtual OUString SAL_CALL getLocalName()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         // resolve uno inheritance problems...
-        // --- delegation for XNde base.
-        virtual Reference< XNode > SAL_CALL appendChild(const Reference< XNode >& newChild)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE
+        // --- delegation for XNode base.
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
         {
             return CNode::appendChild(newChild);
         }
-        virtual Reference< XNode > SAL_CALL cloneNode(sal_Bool deep)
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::cloneNode(deep);
         }
-        virtual Reference< XNodeList > SAL_CALL getChildNodes()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::getChildNodes();
         }
-        virtual Reference< XNode > SAL_CALL getFirstChild()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::getFirstChild();
         }
-        virtual Reference< XNode > SAL_CALL getLastChild()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::getLastChild();
         }
         virtual OUString SAL_CALL getNamespaceURI()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::getNamespaceURI();
         }
-        virtual Reference< XNode > SAL_CALL getNextSibling()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::getNextSibling();
         }
-        virtual NodeType SAL_CALL getNodeType()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::xml::dom::NodeType SAL_CALL getNodeType()
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::getNodeType();
         }
-        virtual Reference< XDocument > SAL_CALL getOwnerDocument()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::getOwnerDocument();
         }
-        virtual Reference< XNode > SAL_CALL getParentNode()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::getParentNode();
         }
         virtual OUString SAL_CALL getPrefix()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::getPrefix();
         }
-        virtual Reference< XNode > SAL_CALL getPreviousSibling()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::getPreviousSibling();
         }
         virtual sal_Bool SAL_CALL hasAttributes()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::hasAttributes();
         }
         virtual sal_Bool SAL_CALL hasChildNodes()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::hasChildNodes();
         }
-        virtual Reference< XNode > SAL_CALL insertBefore(
-                const Reference< XNode >& newChild, const Reference< XNode >& refChild)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
         {
             return CNode::insertBefore(newChild, refChild);
         }
         virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             return CNode::isSupported(feature, ver);
         }
         virtual void SAL_CALL normalize()
-            throw (RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             CNode::normalize();
         }
-        virtual Reference< XNode > SAL_CALL removeChild(const Reference< XNode >& oldChild)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
         {
             return CNode::removeChild(oldChild);
         }
-        virtual Reference< XNode > SAL_CALL replaceChild(
-                const Reference< XNode >& newChild, const Reference< XNode >& oldChild)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
         {
             return CNode::replaceChild(newChild, oldChild);
         }
         virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
         {
             return CNode::setNodeValue(nodeValue);
         }
         virtual void SAL_CALL setPrefix(const OUString& prefix)
-            throw (RuntimeException, DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
         {
             return CNode::setPrefix(prefix);
         }