Clean up function declarations

Change-Id: If482545f87a9b0c066f91639c55b73bee4d01b5c

5 files changed, 97 insertions, 30 deletions

diff --git a/xmlscript/source/inc/unoservices.hxx b/xmlscript/source/inc/unoservices.hxx
new file mode 100644
index 000000000000..a146a0ce1632
--- /dev/null
+++ b/xmlscript/source/inc/unoservices.hxx
@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_XMLSCRIPT_SOURCE_INC_UNOSERVICES_HXX
+#define INCLUDED_XMLSCRIPT_SOURCE_INC_UNOSERVICES_HXX
+
+#include <sal/config.h>
+
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+    class XInterface;
+} } } }
+
+namespace xmlscript {
+
+css::uno::Sequence<OUString> SAL_CALL
+getSupportedServiceNames_DocumentHandlerImpl();
+
+OUString SAL_CALL getImplementationName_DocumentHandlerImpl();
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL create_DocumentHandlerImpl(
+    css::uno::Reference<css::uno::XComponentContext> const & xContext)
+    SAL_THROW((css::uno::Exception));
+
+css::uno::Sequence<OUString> SAL_CALL
+getSupportedServiceNames_XMLBasicExporter();
+
+OUString SAL_CALL getImplementationName_XMLBasicExporter();
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLBasicExporter(
+    css::uno::Reference<css::uno::XComponentContext> const & xContext)
+    SAL_THROW((css::uno::Exception));
+
+css::uno::Sequence<OUString> SAL_CALL
+getSupportedServiceNames_XMLOasisBasicExporter();
+
+OUString SAL_CALL getImplementationName_XMLOasisBasicExporter();
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLOasisBasicExporter(
+    css::uno::Reference<css::uno::XComponentContext> const & xContext)
+    SAL_THROW((css::uno::Exception));
+
+css::uno::Sequence<OUString> SAL_CALL
+getSupportedServiceNames_XMLBasicImporter();
+
+OUString SAL_CALL getImplementationName_XMLBasicImporter();
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLBasicImporter(
+    css::uno::Reference<css::uno::XComponentContext> const & xContext)
+    SAL_THROW((css::uno::Exception));
+
+css::uno::Sequence<OUString> SAL_CALL
+getSupportedServiceNames_XMLOasisBasicImporter();
+
+OUString SAL_CALL getImplementationName_XMLOasisBasicImporter();
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLOasisBasicImporter(
+    css::uno::Reference<css::uno::XComponentContext> const & xContext)
+        SAL_THROW((css::uno::Exception));
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx
index 78f165446e10..2b9e43c3828e 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -19,41 +19,13 @@
 
 #include <cppuhelper/implementationentry.hxx>
 
+#include <unoservices.hxx>
+
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 
 namespace xmlscript
 {
-    Sequence< OUString > SAL_CALL getSupportedServiceNames_DocumentHandlerImpl();
-    OUString SAL_CALL getImplementationName_DocumentHandlerImpl();
-    Reference< XInterface > SAL_CALL create_DocumentHandlerImpl(
-        Reference< XComponentContext > const & xContext )
-            SAL_THROW( (Exception) );
-
-    Sequence< OUString > SAL_CALL getSupportedServiceNames_XMLBasicExporter();
-    OUString SAL_CALL getImplementationName_XMLBasicExporter();
-    Reference< XInterface > SAL_CALL create_XMLBasicExporter(
-        Reference< XComponentContext > const & xContext )
-            SAL_THROW( (Exception) );
-
-    Sequence< OUString > SAL_CALL getSupportedServiceNames_XMLOasisBasicExporter();
-    OUString SAL_CALL getImplementationName_XMLOasisBasicExporter();
-    Reference< XInterface > SAL_CALL create_XMLOasisBasicExporter(
-        Reference< XComponentContext > const & xContext )
-            SAL_THROW( (Exception) );
-
-    Sequence< OUString > SAL_CALL getSupportedServiceNames_XMLBasicImporter();
-    OUString SAL_CALL getImplementationName_XMLBasicImporter();
-    Reference< XInterface > SAL_CALL create_XMLBasicImporter(
-        Reference< XComponentContext > const & xContext )
-            SAL_THROW( (Exception) );
-
-    Sequence< OUString > SAL_CALL getSupportedServiceNames_XMLOasisBasicImporter();
-    OUString SAL_CALL getImplementationName_XMLOasisBasicImporter();
-    Reference< XInterface > SAL_CALL create_XMLOasisBasicImporter(
-        Reference< XComponentContext > const & xContext )
-            SAL_THROW( (Exception) );
-
     static const struct ::cppu::ImplementationEntry s_entries [] =
     {
         {
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index 04e26d1169f8..617b89f1e4de 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include "unoservices.hxx"
 #include "xml_import.hxx"
 
 #include <cppuhelper/factory.hxx>
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index 87a9b5583675..65eef7ad8815 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include "unoservices.hxx"
 #include "xmlbas_export.hxx"
 #include <xmlscript/xmlns.h>
 #include <xmlscript/xml_helper.hxx>
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index 6c59c5d46b10..50ea54e413ce 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include "unoservices.hxx"
 #include "xmlbas_import.hxx"
 #include <xmlscript/xmlns.h>
 #include <xmlscript/xml_helper.hxx>