com::sun::star->css in include/ucbhelper to include/xmlscript

Change-Id: Iaa7f0b8455a601d3992c08cde0943c709c417256

4 files changed, 39 insertions, 56 deletions

diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx
index 940aa15218b3..c66c592d4976 100644
--- a/include/xmlscript/xml_helper.hxx
+++ b/include/xmlscript/xml_helper.hxx
@@ -39,7 +39,7 @@ namespace xmlscript
 
 
 class XMLSCRIPT_DLLPUBLIC XMLElement
-    : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList >
+    : public ::cppu::WeakImplHelper1< css::xml::sax::XAttributeList >
 {
 public:
     inline XMLElement( OUString const & name )
@@ -51,13 +51,13 @@ public:
         @param xElem element reference
     */
     void SAL_CALL addSubElement(
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > const & xElem );
+        css::uno::Reference< css::xml::sax::XAttributeList > const & xElem );
 
     /** Gets sub element of given index.  The index follows order in which sub elements were added.
 
         @param nIndex index of sub element
     */
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > SAL_CALL getSubElement( sal_Int32 nIndex );
+    css::uno::Reference< css::xml::sax::XAttributeList > SAL_CALL getSubElement( sal_Int32 nIndex );
 
     /** Adds an attribute to elements.
 
@@ -71,27 +71,27 @@ public:
         @param xOut document handler to be written to
     */
     void SAL_CALL dump(
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > const & xOut );
+        css::uno::Reference< css::xml::sax::XDocumentHandler > const & xOut );
     /** Dumps out sub elements (and all further sub elements).
 
         @param xOut document handler to be written to
     */
     void SAL_CALL dumpSubElements(
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > const & xOut );
+        css::uno::Reference< css::xml::sax::XDocumentHandler > const & xOut );
 
     // XAttributeList
     virtual sal_Int16 SAL_CALL getLength()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getNameByIndex( sal_Int16 nPos )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getTypeByIndex( sal_Int16 nPos )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getTypeByName( OUString const & rName )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getValueByIndex( sal_Int16 nPos )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getValueByName( OUString const & rName )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 protected:
     OUString _name;
@@ -99,8 +99,8 @@ protected:
     ::std::vector< OUString > _attrNames;
     ::std::vector< OUString > _attrValues;
 
-    ::std::vector< ::com::sun::star::uno::Reference<
-                   ::com::sun::star::xml::sax::XAttributeList > > _subElems;
+    ::std::vector< css::uno::Reference<
+                      css::xml::sax::XAttributeList > > _subElems;
 };
 
 
@@ -110,11 +110,11 @@ protected:
 
 ##################################################################################################*/
 
-XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::io::XInputStream >
 SAL_CALL createInputStream(
     ::rtl::ByteSequence const & rInData );
 
-XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::io::XOutputStream >
 SAL_CALL createOutputStream(
     ::rtl::ByteSequence * pOutData );
 
diff --git a/include/xmlscript/xmldlg_imexp.hxx b/include/xmlscript/xmldlg_imexp.hxx
index 92dd0f0c6765..3436e1b8c562 100644
--- a/include/xmlscript/xmldlg_imexp.hxx
+++ b/include/xmlscript/xmldlg_imexp.hxx
@@ -33,42 +33,29 @@ namespace xmlscript
 {
 
 XMLSCRIPT_DLLPUBLIC void SAL_CALL exportDialogModel(
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::container::XNameContainer > const & xDialogModel,
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::frame::XModel > const & xDocument );
+    css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > const & xOut,
+    css::uno::Reference< css::container::XNameContainer > const & xDialogModel,
+    css::uno::Reference< css::frame::XModel > const & xDocument );
 
-XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
+XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::xml::sax::XDocumentHandler >
 SAL_CALL importDialogModel(
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::container::XNameContainer > const & xDialogModel,
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::uno::XComponentContext > const & xContext,
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::frame::XModel > const & xDocument );
+    css::uno::Reference< css::container::XNameContainer > const & xDialogModel,
+    css::uno::Reference< css::uno::XComponentContext > const & xContext,
+    css::uno::Reference< css::frame::XModel > const & xDocument );
 
 // additional functions for convenience
 
-XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >
+XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::io::XInputStreamProvider >
 SAL_CALL exportDialogModel(
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::container::XNameContainer > const & xDialogModel,
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::uno::XComponentContext > const & xContext,
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::frame::XModel > const & xDocument );
+    css::uno::Reference< css::container::XNameContainer > const & xDialogModel,
+    css::uno::Reference< css::uno::XComponentContext > const & xContext,
+    css::uno::Reference< css::frame::XModel > const & xDocument );
 
 XMLSCRIPT_DLLPUBLIC void SAL_CALL importDialogModel(
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::io::XInputStream > const & xInput,
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::container::XNameContainer > const & xDialogModel,
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::uno::XComponentContext > const & xContext,
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::frame::XModel > const & xDocument );
+    css::uno::Reference< css::io::XInputStream > const & xInput,
+    css::uno::Reference< css::container::XNameContainer > const & xDialogModel,
+    css::uno::Reference< css::uno::XComponentContext > const & xContext,
+    css::uno::Reference< css::frame::XModel > const & xDocument );
 
 }
 
diff --git a/include/xmlscript/xmllib_imexp.hxx b/include/xmlscript/xmllib_imexp.hxx
index 2820fa017ebc..f30b69449b34 100644
--- a/include/xmlscript/xmllib_imexp.hxx
+++ b/include/xmlscript/xmllib_imexp.hxx
@@ -40,7 +40,7 @@ struct XMLSCRIPT_DLLPUBLIC LibDescriptor
     bool bLink;
     bool bReadOnly;
     bool bPasswordProtected;
-    ::com::sun::star::uno::Sequence< OUString > aElementNames;
+    css::uno::Sequence< OUString > aElementNames;
     bool bPreload;
 };
 
@@ -58,23 +58,21 @@ struct XMLSCRIPT_DLLPUBLIC LibDescriptorArray
 
 XMLSCRIPT_DLLPUBLIC void
 SAL_CALL exportLibraryContainer(
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::xml::sax::XWriter > const & xOut,
+    css::uno::Reference< css::xml::sax::XWriter > const & xOut,
     const LibDescriptorArray* pLibArray );
 
-XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference<
-    ::com::sun::star::xml::sax::XDocumentHandler >
+XMLSCRIPT_DLLPUBLIC css::uno::Reference<
+    css::xml::sax::XDocumentHandler >
 SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray );
 
 
 XMLSCRIPT_DLLPUBLIC void
 SAL_CALL exportLibrary(
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::xml::sax::XWriter > const & xOut,
+    css::uno::Reference< css::xml::sax::XWriter > const & xOut,
     const LibDescriptor& rLib );
 
-XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference<
-    ::com::sun::star::xml::sax::XDocumentHandler >
+XMLSCRIPT_DLLPUBLIC css::uno::Reference<
+    css::xml::sax::XDocumentHandler >
 SAL_CALL importLibrary( LibDescriptor& rLib );
 
 }
diff --git a/include/xmlscript/xmlmod_imexp.hxx b/include/xmlscript/xmlmod_imexp.hxx
index 74274a71b257..412487b279e5 100644
--- a/include/xmlscript/xmlmod_imexp.hxx
+++ b/include/xmlscript/xmlmod_imexp.hxx
@@ -42,12 +42,10 @@ struct XMLSCRIPT_DLLPUBLIC ModuleDescriptor
 
 XMLSCRIPT_DLLPUBLIC void
 SAL_CALL exportScriptModule(
-    ::com::sun::star::uno::Reference<
-    ::com::sun::star::xml::sax::XWriter > const & xOut,
+    css::uno::Reference< css::xml::sax::XWriter > const & xOut,
     const ModuleDescriptor& rMod );
 
-XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference<
-    ::com::sun::star::xml::sax::XDocumentHandler >
+XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::xml::sax::XDocumentHandler >
 SAL_CALL importScriptModule( ModuleDescriptor& rMod );
 
 }