lingucomponent/source/hyphenator/hyphen/hreg.cxx | 8 ++------
lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx | 6 ++++++
lingucomponent/source/languageguessing/guesslang.cxx | 10 +++-------
lingucomponent/source/spellcheck/spell/sreg.cxx | 8 ++------
lingucomponent/source/spellcheck/spell/sspellimp.hxx | 6 ++++++
lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 4 ++++
lingucomponent/source/thesaurus/libnth/ntreg.cxx | 8 ++------
7 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 5b8ca52fe7ebe40761b9ecd84d313f90eba61687
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Apr 14 13:10:53 2014 +0200
Clean up function declarations
Change-Id: Ia811e9d3a6745e75fddddb6c6876316fde3629d8
diff --git a/lingucomponent/source/hyphenator/hyphen/hreg.cxx
b/lingucomponent/source/hyphenator/hyphen/hreg.cxx
index 9142dfa..493df8b 100644
--- a/lingucomponent/source/hyphenator/hyphen/hreg.cxx
+++ b/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"
{
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
index c99a954..919c64b 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
+++ b/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: */
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx
b/lingucomponent/source/languageguessing/guesslang.cxx
index ba7f1f3..b21f9ba 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/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) :
diff --git a/lingucomponent/source/spellcheck/spell/sreg.cxx
b/lingucomponent/source/spellcheck/spell/sreg.cxx
index e8b75ff..e018a4a 100644
--- a/lingucomponent/source/spellcheck/spell/sreg.cxx
+++ b/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"
{
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index 9c7c0d8..6aa649c 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/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: */
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index 0e49f25..25367c3 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/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: */
diff --git a/lingucomponent/source/thesaurus/libnth/ntreg.cxx
b/lingucomponent/source/thesaurus/libnth/ntreg.cxx
index c2e3ac5..4a6d272 100644
--- a/lingucomponent/source/thesaurus/libnth/ntreg.cxx
+++ b/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"
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
