Clean up function declarations and some unused functions

Change-Id: I382289c7188dfdc9839ff9e6362b6e039ffc5f9e

3 files changed, 8 insertions, 27 deletions

diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 35065ad43975..5b443e264971 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -21,6 +21,7 @@
 
 #include "vcl/svapp.hxx"
 
+#include "factory.hxx"
 #include "svdata.hxx"
 #include "salinst.hxx"
 
@@ -61,9 +62,6 @@ class GenericClipboard :
     Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner;
     std::list< Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener > > m_aListeners;
 
-    void fireChangedContentsEvent();
-    void clearContents();
-
 public:
 
     GenericClipboard() : cppu::WeakComponentImplHelper2<
@@ -291,6 +289,7 @@ public:
     // XInitialization
     virtual void        SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE;
 
+#if !defined UNX
     static Sequence< OUString > getSupportedServiceNames_static()
     {
         Sequence< OUString > aRet( 1 );
@@ -302,6 +301,7 @@ public:
     {
         return OUString("com.sun.star.datatransfer.dnd.VclGenericDragSource");
     }
+#endif
 };
 
 GenericDragSource::~GenericDragSource()
@@ -401,6 +401,7 @@ public:
     virtual sal_Int8    SAL_CALL getDefaultActions() throw(std::exception) SAL_OVERRIDE;
     virtual void        SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception) SAL_OVERRIDE;
 
+#if !defined UNX
     static Sequence< OUString > getSupportedServiceNames_static()
     {
         Sequence< OUString > aRet( 1 );
@@ -412,6 +413,7 @@ public:
     {
         return OUString("com.sun.star.datatransfer.dnd.VclGenericDropTarget");
     }
+#endif
 };
 
 GenericDropTarget::~GenericDropTarget()
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index c078f510bd2b..e2adb731b48e 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -25,33 +25,11 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/dllapi.h>
 
+#include <factory.hxx>
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-// service implementation
-extern Sequence< OUString > SAL_CALL vcl_session_getSupportedServiceNames();
-extern OUString SAL_CALL vcl_session_getImplementationName();
-extern Reference< XInterface > SAL_CALL vcl_session_createInstance( const Reference< XMultiServiceFactory > & );
-
-namespace vcl
-{
-extern Sequence< OUString > SAL_CALL FontIdentificator_getSupportedServiceNames();
-extern OUString SAL_CALL FontIdentificator_getImplementationName();
-extern Reference< XInterface > SAL_CALL FontIdentificator_createInstance( const Reference< XMultiServiceFactory > & );
-
-extern OUString SAL_CALL Clipboard_getImplementationName();
-extern Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory( const Reference< XMultiServiceFactory > & );
-
-extern Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames();
-extern OUString SAL_CALL DragSource_getImplementationName();
-extern Reference< XInterface > SAL_CALL DragSource_createInstance( const Reference< XMultiServiceFactory > & );
-
-extern Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames();
-extern OUString SAL_CALL DropTarget_getImplementationName();
-extern Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMultiServiceFactory > & );
-
-}
-
 extern "C" {
 
     VCL_DLLPUBLIC void* SAL_CALL vcl_component_getFactory(
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index 683eef4c5fe5..dce92d30bf3b 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -20,6 +20,7 @@
 #include "vcl/svapp.hxx"
 #include "vcl/font.hxx"
 
+#include "factory.hxx"
 #include "svdata.hxx"
 
 #include <com/sun/star/lang/XServiceInfo.hpp>