cppuhelper/source/servicemanager.cxx | 18 ------------------ 1 file changed, 18 deletions(-)
New commits: commit ffcd599c4f28ca4cfdd7e1505cd5aa5eb68cc32b Author: Gabor Kelemen <kelem...@ubuntu.com> AuthorDate: Sun Apr 24 20:17:06 2022 +0200 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Tue Apr 26 10:10:01 2022 +0200 Drop obsolete workaround for LanguageTool 1.7 Upstream patch for this issue was integrated for LT 1.8: https://sourceforge.net/p/languagetool/bugs/105/ some 10 years ago. It should be safe to drop this workaround now that LT 1.7 was dropped from core. Change-Id: I4ffec2247bcb6445cfcdb1c19018bdddec712c83 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133357 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index c128c4371e3f..d07c7697cac9 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -1085,24 +1085,6 @@ void cppuhelper::ServiceManager::insert(css::uno::Any const & aElement) insertLegacyFactory(info); return; } -// At least revisions up to 1.7 of LanguageTool.oxt (incl. the bundled 1.4.0 in -// module languagetool) contain an (actively registered) factory that does not -// implement XServiceInfo (see <http://sourceforge.net/tracker/? -// func=detail&aid=3526635&group_id=110216&atid=655717> "SingletonFactory should -// implement XServiceInfo"); the old OServiceManager::insert -// (stoc/source/servicemanager/servicemanager.cxx) silently did not add such -// broken factories to its m_ImplementationNameMap, so ignore them here for -// backwards compatibility of live-insertion of extensions, too. - -// (The plan was that this warning would go away (and we would do the -// throw instead) for the incompatible LO 4, but we changed our mind): - css::uno::Reference< css::lang::XSingleComponentFactory > legacy; - if ((aElement >>= legacy) && legacy.is()) { - SAL_WARN( - "cppuhelper", - "Ignored XSingleComponentFactory not implementing XServiceInfo"); - return; - } throw css::lang::IllegalArgumentException( "Bad insert element", static_cast< cppu::OWeakObject * >(this), 0);