diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-26 16:06:37 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 10:04:11 -0600 |
commit | 412c47ded694df2f955b4c590f096238eb549d3d (patch) | |
tree | c648fe29f9e24e5648e693ddd0640252e1e053f4 /lingucomponent/source/thesaurus | |
parent | Remove visual noise from odk (diff) | |
download | core-412c47ded694df2f955b4c590f096238eb549d3d.tar.gz core-412c47ded694df2f955b4c590f096238eb549d3d.zip |
Remove visual noise from lingucomponent
Change-Id: I6021eabab1474c99868f38ecd0d466eb0d97054e
Reviewed-on: https://gerrit.libreoffice.org/8279
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'lingucomponent/source/thesaurus')
5 files changed, 1 insertions, 55 deletions
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx index c928958d7071..6cc4b911cd25 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx @@ -31,12 +31,9 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; - namespace linguistic { -/////////////////////////////////////////////////////////////////////////// - Meaning::Meaning( const OUString &rTerm, sal_Int16 nLang) : @@ -51,12 +48,10 @@ Meaning::Meaning( #endif } - Meaning::~Meaning() { } - OUString SAL_CALL Meaning::getMeaning() throw(RuntimeException) { @@ -64,7 +59,6 @@ OUString SAL_CALL Meaning::getMeaning() return aTerm; } - Sequence< OUString > SAL_CALL Meaning::querySynonyms() throw(RuntimeException) { @@ -72,7 +66,6 @@ Sequence< OUString > SAL_CALL Meaning::querySynonyms() return aSyn; } - void Meaning::SetSynonyms( const Sequence< OUString > &rSyn ) { MutexGuard aGuard( GetLinguMutex() ); diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx index 7e098419e676..ec16610353ef 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx @@ -20,11 +20,9 @@ #ifndef _LINGUISTIC_THESDTA_HXX_ #define _LINGUISTIC_THESDTA_HXX_ - #include <com/sun/star/linguistic2/XMeaning.hpp> #include <cppuhelper/implbase1.hxx> - namespace linguistic { @@ -64,5 +62,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index a373e30226a6..15b590db013e 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/uno/Reference.h> #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> @@ -55,9 +54,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; - -/////////////////////////////////////////////////////////////////////////// - static uno::Reference< XLinguServiceManager2 > GetLngSvcMgr_Impl() { uno::Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); @@ -79,7 +75,6 @@ Thesaurus::Thesaurus() : prevLocale = LANGUAGE_DONTKNOW; } - Thesaurus::~Thesaurus() { if (aThes) @@ -117,7 +112,6 @@ Thesaurus::~Thesaurus() } } - PropertyHelper_Thesaurus& Thesaurus::GetPropHelper_Impl() { if (!pPropHelper) @@ -130,7 +124,6 @@ PropertyHelper_Thesaurus& Thesaurus::GetPropHelper_Impl() return *pPropHelper; } - Sequence< Locale > SAL_CALL Thesaurus::getLocales() throw(RuntimeException) { @@ -138,7 +131,6 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales() // this routine should return the locales supported by the installed // dictionaries. - if (!numthes) { SvtLinguConfig aLinguCfg; @@ -258,8 +250,6 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales() return aSuppLocales; } - - sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale) throw(RuntimeException) { @@ -281,7 +271,6 @@ sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale) return bRes; } - Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryMeanings( const OUString& qTerm, const Locale& rLocale, const PropertyValues& rProperties) @@ -528,7 +517,6 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes return noMeanings; } - Reference< XInterface > SAL_CALL Thesaurus_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) throw(Exception) @@ -537,7 +525,6 @@ Reference< XInterface > SAL_CALL Thesaurus_CreateInstance( return xService; } - OUString SAL_CALL Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ ) throw(RuntimeException) { @@ -545,7 +532,6 @@ OUString SAL_CALL Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ ) return OUString( "OpenOffice.org New Thesaurus" ); } - void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException) { @@ -571,8 +557,6 @@ void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments ) } } - - OUString SAL_CALL Thesaurus::makeLowerCase(const OUString& aTerm, CharClass * pCC) { if (pCC) @@ -580,7 +564,6 @@ OUString SAL_CALL Thesaurus::makeLowerCase(const OUString& aTerm, CharClass * pC return aTerm; } - OUString SAL_CALL Thesaurus::makeUpperCase(const OUString& aTerm, CharClass * pCC) { if (pCC) @@ -588,7 +571,6 @@ OUString SAL_CALL Thesaurus::makeUpperCase(const OUString& aTerm, CharClass * pC return aTerm; } - OUString SAL_CALL Thesaurus::makeInitCap(const OUString& aTerm, CharClass * pCC) { sal_Int32 tlen = aTerm.getLength(); @@ -606,8 +588,6 @@ OUString SAL_CALL Thesaurus::makeInitCap(const OUString& aTerm, CharClass * pCC) return aTerm; } - - void SAL_CALL Thesaurus::dispose() throw(RuntimeException) { @@ -627,7 +607,6 @@ void SAL_CALL Thesaurus::dispose() } } - void SAL_CALL Thesaurus::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { @@ -637,7 +616,6 @@ void SAL_CALL Thesaurus::addEventListener( const Reference< XEventListener >& rx aEvtListeners.addInterface( rxListener ); } - void SAL_CALL Thesaurus::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { @@ -655,7 +633,6 @@ OUString SAL_CALL Thesaurus::getImplementationName() return getImplementationName_Static(); } - sal_Bool SAL_CALL Thesaurus::supportsService( const OUString& ServiceName ) throw(RuntimeException) { @@ -674,7 +651,7 @@ Sequence< OUString > Thesaurus::getSupportedServiceNames_Static() { MutexGuard aGuard( GetLinguMutex() ); - Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich + Sequence< OUString > aSNS( 1 ); // more than 1 service is possible, too aSNS.getArray()[0] = SN_THESAURUS; return aSNS; } @@ -699,7 +676,4 @@ void * SAL_CALL Thesaurus_getFactory( const sal_Char * pImplName, return pRet; } - -/////////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx index bf00ab064f5b..ecfb4be8b725 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx @@ -56,11 +56,6 @@ namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; }}}} - - -/////////////////////////////////////////////////////////////////////////// - - class Thesaurus : public cppu::WeakImplHelper5 < @@ -98,7 +93,6 @@ class Thesaurus : return pPropHelper ? *pPropHelper : GetPropHelper_Impl(); } - public: Thesaurus(); virtual ~Thesaurus(); @@ -126,7 +120,6 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); - static inline OUString getImplementationName_Static() throw(); static Sequence< OUString > @@ -151,9 +144,6 @@ inline OUString Thesaurus::getImplementationName_Static() throw() return OUString( "org.openoffice.lingu.new.Thesaurus" ); } - -/////////////////////////////////////////////////////////////////////////// - #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 56213005096c..c2e3ac5084bf 100644 --- a/lingucomponent/source/thesaurus/libnth/ntreg.cxx +++ b/lingucomponent/source/thesaurus/libnth/ntreg.cxx @@ -25,19 +25,13 @@ 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" { @@ -54,6 +48,4 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL lnth_component_getFactory( } -/////////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |