Skip to content

C
core
Kaydet (Commit) 5cff3891 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

strip out trivial indirection 

Change-Id: If025c6ed77faa52383609367169611c2a3e89360
Reviewed-on: https://gerrit.libreoffice.org/43473Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst cdd4b528
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 218 deletions
lingucomponent/Library_MacOSXSpell.mk
Dosyayı görüntüle @ 5cff3891
......@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_externals,MacOSXSpell,\
))
$(eval $(call gb_Library_add_objcxxobjects,MacOSXSpell,\
lingucomponent/source/spellcheck/macosxspell/macreg \
lingucomponent/source/spellcheck/macosxspell/macspellimp \
))
......
lingucomponent/Library_hyphen.mk
Dosyayı görüntüle @ 5cff3891
......@@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_externals,hyphen,\
))
$(eval $(call gb_Library_add_exception_objects,hyphen,\
lingucomponent/source/hyphenator/hyphen/hreg \
lingucomponent/source/hyphenator/hyphen/hyphenimp \
))
......
lingucomponent/Library_lnth.mk
Dosyayı görüntüle @ 5cff3891
......@@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_externals,lnth,\
$(eval $(call gb_Library_add_exception_objects,lnth,\
lingucomponent/source/thesaurus/libnth/nthesdta \
lingucomponent/source/thesaurus/libnth/nthesimp \
lingucomponent/source/thesaurus/libnth/ntreg \
))
# vim: set noet sw=4 ts=4:
lingucomponent/Library_spell.mk
Dosyayı görüntüle @ 5cff3891
......@@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_externals,spell,\
))
$(eval $(call gb_Library_add_exception_objects,spell,\
lingucomponent/source/spellcheck/spell/sreg \
lingucomponent/source/spellcheck/spell/sspellimp \
))
......
lingucomponent/source/hyphenator/hyphen/hreg.cxx deleted 100644 → 0
Dosyayı görüntüle @ cdd4b528
/* -*- 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 .
*/
#include <cppuhelper/factory.hxx>
#include <rtl/string.hxx>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <hyphenimp.hxx>
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
// definition of the two functions that are used to provide the services
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL hyphen_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = Hyphenator_getFactory(
pImplName,
static_cast< XMultiServiceFactory * >( pServiceManager ) );
return pRet;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
Dosyayı görüntüle @ 5cff3891
......@@ -834,15 +834,18 @@ Sequence< OUString > Hyphenator::getSupportedServiceNames_Static()
return aSNS;
}
void * SAL_CALL Hyphenator_getFactory( const sal_Char * pImplName,
XMultiServiceFactory * pServiceManager )
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL hyphen_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
if ( Hyphenator::getImplementationName_Static().equalsAscii( pImplName ) )
{
Reference< XSingleServiceFactory > xFactory =
cppu::createOneInstanceFactory(
pServiceManager,
static_cast< XMultiServiceFactory * >( pServiceManager ),
Hyphenator::getImplementationName_Static(),
Hyphenator_CreateInstance,
Hyphenator::getSupportedServiceNames_Static());
......@@ -853,4 +856,5 @@ void * SAL_CALL Hyphenator_getFactory( const sal_Char * pImplName,
return pRet;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
Dosyayı görüntüle @ 5cff3891
......@@ -129,9 +129,6 @@ inline OUString Hyphenator::getImplementationName_Static() throw()
return OUString( "org.openoffice.lingu.LibHnjHyphenator" );
}
void * SAL_CALL Hyphenator_getFactory(
char const * pImplName, css::lang::XMultiServiceFactory * pServiceManager);
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
lingucomponent/source/spellcheck/macosxspell/macreg.mm deleted 100644 → 0
Dosyayı görüntüle @ cdd4b528
/* -*- 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 .
*/
#include <cppuhelper/factory.hxx>
#include <rtl/string.hxx>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <macspellimp.hxx>
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL MacOSXSpell_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = nullptr;
pRet = MacSpellChecker_getFactory(
pImplName,
static_cast< XMultiServiceFactory * >( pServiceManager ),
pRegistryKey );
return pRet;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
Dosyayı görüntüle @ 5cff3891
......@@ -123,9 +123,6 @@ inline OUString MacSpellChecker::getImplementationName_Static() throw()
return OUString( "org.openoffice.lingu.MacOSXSpellChecker" );
}
void * SAL_CALL MacSpellChecker_getFactory(
char const * pImplName, XMultiServiceFactory * pServiceManager, void *);
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
Dosyayı görüntüle @ 5cff3891
......@@ -523,15 +523,18 @@ Sequence< OUString > MacSpellChecker::getSupportedServiceNames_Static()
return aSNS;
}
void * SAL_CALL MacSpellChecker_getFactory( const sal_Char * pImplName,
XMultiServiceFactory * pServiceManager, void * )
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL MacOSXSpell_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
if ( MacSpellChecker::getImplementationName_Static().equalsAscii( pImplName ) )
{
Reference< XSingleServiceFactory > xFactory =
cppu::createOneInstanceFactory(
pServiceManager,
static_cast< XMultiServiceFactory * >( pServiceManager ),
MacSpellChecker::getImplementationName_Static(),
MacSpellChecker_CreateInstance,
MacSpellChecker::getSupportedServiceNames_Static());
......@@ -542,6 +545,7 @@ void * SAL_CALL MacSpellChecker_getFactory( const sal_Char * pImplName,
return pRet;
}
}
......
lingucomponent/source/spellcheck/spell/sreg.cxx deleted 100644 → 0
Dosyayı görüntüle @ cdd4b528
/* -*- 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 .
*/
#include <cppuhelper/factory.hxx>
#include <rtl/string.hxx>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <sspellimp.hxx>
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
// definition of the two functions that are used to provide the services
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL spell_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
pRet = SpellChecker_getFactory(
pImplName,
static_cast< XMultiServiceFactory * >( pServiceManager ) );
return pRet;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
lingucomponent/source/spellcheck/spell/sspellimp.cxx
Dosyayı görüntüle @ 5cff3891
......@@ -667,15 +667,18 @@ Sequence< OUString > SpellChecker::getSupportedServiceNames_Static()
return aSNS;
}
void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName,
XMultiServiceFactory * pServiceManager )
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL spell_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
if ( SpellChecker::getImplementationName_Static().equalsAscii( pImplName ) )
{
Reference< XSingleServiceFactory > xFactory =
cppu::createOneInstanceFactory(
pServiceManager,
static_cast< XMultiServiceFactory * >( pServiceManager ),
SpellChecker::getImplementationName_Static(),
SpellChecker_CreateInstance,
SpellChecker::getSupportedServiceNames_Static());
......@@ -686,4 +689,6 @@ void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName,
return pRet;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
lingucomponent/source/spellcheck/spell/sspellimp.hxx
Dosyayı görüntüle @ 5cff3891
......@@ -118,9 +118,6 @@ inline OUString SpellChecker::getImplementationName_Static() throw()
return OUString( "org.openoffice.lingu.MySpellSpellChecker" );
}
void * SAL_CALL SpellChecker_getFactory(
char const * pImplName, css::lang::XMultiServiceFactory * pServiceManager);
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
lingucomponent/source/thesaurus/libnth/nthesimp.cxx
Dosyayı görüntüle @ 5cff3891
......@@ -634,8 +634,10 @@ Sequence< OUString > Thesaurus::getSupportedServiceNames_Static()
return aSNS;
}
void * SAL_CALL Thesaurus_getFactory( const sal_Char * pImplName,
XMultiServiceFactory * pServiceManager )
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL lnth_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
if ( Thesaurus::getImplementationName_Static().equalsAscii( pImplName ) )
......@@ -643,7 +645,7 @@ void * SAL_CALL Thesaurus_getFactory( const sal_Char * pImplName,
Reference< XSingleServiceFactory > xFactory =
cppu::createOneInstanceFactory(
pServiceManager,
static_cast< XMultiServiceFactory * >( pServiceManager ),
Thesaurus::getImplementationName_Static(),
Thesaurus_CreateInstance,
Thesaurus::getSupportedServiceNames_Static());
......@@ -653,5 +655,6 @@ void * SAL_CALL Thesaurus_getFactory( const sal_Char * pImplName,
}
return pRet;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
lingucomponent/source/thesaurus/libnth/nthesimp.hxx
Dosyayı görüntüle @ 5cff3891
......@@ -130,9 +130,6 @@ 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);
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
lingucomponent/source/thesaurus/libnth/ntreg.cxx deleted 100644 → 0
Dosyayı görüntüle @ cdd4b528
/* -*- 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 .
*/
#include <cppuhelper/factory.hxx>
#include <rtl/string.hxx>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <nthesimp.hxx>
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
// definition of the two functions that are used to provide the services
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL lnth_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = Thesaurus_getFactory(
pImplName,
static_cast< XMultiServiceFactory * >( pServiceManager ) );
return pRet;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment