Clean up function declarations and some unused functions

Change-Id: I68b488d45c77ebf82029bfede98dca2400e02f2f

5 files changed, 67 insertions, 12 deletions

diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index 9a7b5afffa12..89dcfaf6d05b 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -19,6 +19,7 @@
 
 
 #include "swfdialog.hxx"
+#include "swfuno.hxx"
 #include "impswfdialog.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/dialog.hxx>
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 1aeac4f70c1e..7cf9fd9fea6d 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -43,6 +43,7 @@
 #include <osl/file.hxx>
 
 #include "swfexporter.hxx"
+#include "swfuno.hxx"
 
 #include <string.h>
 
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index ec9352023691..5c4066b49f4a 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -24,23 +24,14 @@
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
+#include <swfuno.hxx>
+
 using namespace ::rtl;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 
-namespace swf {
-extern OUString FlashExportFilter_getImplementationName() throw ( RuntimeException );
-extern sal_Bool SAL_CALL FlashExportFilter_supportsService( const OUString& ServiceName ) throw ( RuntimeException );
-extern Sequence< OUString > SAL_CALL FlashExportFilter_getSupportedServiceNames()  throw ( RuntimeException );
-extern Reference< XInterface > SAL_CALL FlashExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw ( Exception );
-}
-
-extern OUString SWFDialog_getImplementationName () throw (com::sun::star::uno::RuntimeException);
-extern com::sun::star::uno::Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
-extern com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SWFDialog_createInstance( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( com::sun::star::uno::Exception );
-
 using namespace ::swf;
 
 extern "C"
diff --git a/filter/source/flash/swfuno.hxx b/filter/source/flash/swfuno.hxx
new file mode 100644
index 000000000000..1d5745340db6
--- /dev/null
+++ b/filter/source/flash/swfuno.hxx
@@ -0,0 +1,63 @@
+/* -*- 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_FILTER_SOURCE_FLASH_SWFUNO_HXX
+#define INCLUDED_FILTER_SOURCE_FLASH_SWFUNO_HXX
+
+#include <sal/config.h>
+
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace lang { class XMultiSerivceFactory; }
+    namespace uno { class XInterface; }
+} } }
+
+namespace swf {
+
+OUString FlashExportFilter_getImplementationName()
+    throw (css::uno::RuntimeException);
+
+css::uno::Sequence<OUString> SAL_CALL
+FlashExportFilter_getSupportedServiceNames() throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL
+FlashExportFilter_createInstance(
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+    throw (css::uno::Exception);
+
+}
+
+OUString SWFDialog_getImplementationName () throw (css::uno::RuntimeException);
+
+css::uno::Sequence<OUString> SAL_CALL SWFDialog_getSupportedServiceNames()
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL SWFDialog_createInstance(
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+    throw(css::uno::Exception);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 25b1fb566df5..c8bc2e885583 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -47,7 +47,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::beans;
 
-extern sal_uInt16 getMaxBitsUnsigned( sal_uInt32 nValue );
 extern sal_uInt16 getMaxBitsSigned( sal_Int32 nValue );
 
 static MapMode aTWIPSMode( MAP_TWIP );