Clean up function declarations

Change-Id: Ia811e9d3a6745e75fddddb6c6876316fde3629d8

lingucomponent/source/hyphenator/hyphen/hreg.cxx

@@ -22,15 +22,11 @@
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
+#include <hyphenimp.hxx>
+
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 
-// declaration of external RegEntry-functions defined by the service objects
-extern void * SAL_CALL Hyphenator_getFactory(
-    const sal_Char * pImplName,
-    XMultiServiceFactory * pServiceManager,
-    void * /*pRegistryKey*/ );
-
 // definition of the two functions that are used to provide the services
 extern "C"
 {

lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx

@@ -40,6 +40,8 @@
 #include <lingutil.hxx>
 #include <stdio.h>
 
+#include <hyphen.h>
+
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -132,6 +134,10 @@ inline OUString Hyphenator::getImplementationName_Static() throw()
     return OUString( "org.openoffice.lingu.LibHnjHyphenator" );
 }
 
+void * SAL_CALL Hyphenator_getFactory(
+    char const * pImplName, css::lang::XMultiServiceFactory * pServiceManager,
+    void *);
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

lingucomponent/source/languageguessing/guesslang.cxx

@@ -19,6 +19,7 @@
 
 #include <iostream>
 
+#include <boost/noncopyable.hpp>
 #include <tools/debug.hxx>
 
 #include <sal/config.h>
@@ -77,15 +78,13 @@ static osl::Mutex &  GetLangGuessMutex()
 class LangGuess_Impl :
     public ::cppu::WeakImplHelper2<
         XLanguageGuessing,
-        XServiceInfo >
+        XServiceInfo >,
+    private boost::noncopyable
 {
     SimpleGuesser   m_aGuesser;
     bool            m_bInitialized;
     css::uno::Reference< css::uno::XComponentContext >  m_xContext;
 
-    LangGuess_Impl( const LangGuess_Impl & ); // not defined
-    LangGuess_Impl & operator =( const LangGuess_Impl & ); // not defined
-
     virtual ~LangGuess_Impl() {}
     void    EnsureInitialized();
 
@@ -108,9 +107,6 @@ public:
 
     // implementation specific
     void SetFingerPrintsDB( const OUString &fileName ) throw (RuntimeException);
-
-    static const OUString & SAL_CALL getImplementationName_Static() throw();
-
 };
 
 LangGuess_Impl::LangGuess_Impl(css::uno::Reference< css::uno::XComponentContext > const & rxContext) :

lingucomponent/source/spellcheck/spell/sreg.cxx

@@ -22,15 +22,11 @@
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
+#include <sspellimp.hxx>
+
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 
-// declaration of external RegEntry-functions defined by the service objects
-extern void * SAL_CALL SpellChecker_getFactory(
-    const sal_Char * pImplName,
-    XMultiServiceFactory * pServiceManager,
-    void * /*pRegistryKey*/ );
-
 // definition of the two functions that are used to provide the services
 extern "C"
 {

lingucomponent/source/spellcheck/spell/sspellimp.hxx

@@ -43,6 +43,8 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::linguistic2;
 
+class Hunspell;
+
 class SpellChecker :
     public cppu::WeakImplHelper6
     <
@@ -119,6 +121,10 @@ inline OUString SpellChecker::getImplementationName_Static() throw()
     return OUString( "org.openoffice.lingu.MySpellSpellChecker" );
 }
 
+void * SAL_CALL SpellChecker_getFactory(
+    char const * pImplName, css::lang::XMultiServiceFactory * pServiceManager,
+    void *);
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

lingucomponent/source/thesaurus/libnth/nthesimp.hxx

@@ -144,6 +144,10 @@ inline OUString Thesaurus::getImplementationName_Static() throw()
     return OUString( "org.openoffice.lingu.new.Thesaurus" );
 }
 
+void * SAL_CALL Thesaurus_getFactory(
+    char const * pImplName, css::lang::XMultiServiceFactory * pServiceManager,
+    void *);
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

lingucomponent/source/thesaurus/libnth/ntreg.cxx

@@ -22,15 +22,11 @@
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
+#include <nthesimp.hxx>
+
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 
-// declaration of external RegEntry-functions defined by the service objects
-extern void * SAL_CALL Thesaurus_getFactory(
-    const sal_Char * pImplName,
-    XMultiServiceFactory * pServiceManager,
-    void * /*pRegistryKey*/ );
-
 // definition of the two functions that are used to provide the services
 extern "C"
 {