Clean up function declarations and some unused functions

Change-Id: Ie81d270267b6c3c3620ade62eb393b28d995a654

3 files changed, 35 insertions, 4 deletions

diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 2a4f33a12dcf..3345acda1a20 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -42,6 +42,8 @@
 
 #include <config_vclplug.h>
 
+#include <npwrap.hxx>
+
 extern PluginConnector* pConnector;
 extern XtAppContext app_context;
 extern int wakeup_fd[];
@@ -51,8 +53,6 @@ extern Display* pXtAppDisplay;
 extern int nAppArguments;
 extern char** pAppArguments;
 
-void* CreateNewShell( void**, XLIB_Window );
-
 // begin Netscape plugin api calls
 extern "C" {
 
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index afed65bbfc88..196d913ba3c7 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -45,6 +45,8 @@
 
 #include <config_vclplug.h>
 
+#include <npwrap.hxx>
+
 PluginConnector* pConnector = NULL;
 
 int         nAppArguments = 0;
@@ -55,8 +57,6 @@ Display*    pXtAppDisplay = NULL;
 extern oslModule pPluginLib;
 extern NPError (*pNP_Shutdown)();
 
-void LoadAdditionalLibs(const char*);
-
 XtAppContext app_context;
 Widget topLevel = NULL, topBox = NULL;
 int wakeup_fd[2] = { 0, 0 };
diff --git a/extensions/source/plugin/unx/npwrap.hxx b/extensions/source/plugin/unx/npwrap.hxx
new file mode 100644
index 000000000000..d2b6c96ba77b
--- /dev/null
+++ b/extensions/source/plugin/unx/npwrap.hxx
@@ -0,0 +1,31 @@
+/* -*- 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_EXTENSIONS_SOURCE_PLUGIN_UNX_NPWRAP_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_UNX_NPWRAP_HXX
+
+#include <sal/config.h>
+
+void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow );
+
+void LoadAdditionalLibs(const char*);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */