From faef84abca7860227730351d7d1cd4e3c4b6e0e5 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 12 Nov 2012 16:36:39 +0200 Subject: Do stay backward-compatible also in 4.0 and later for now Change-Id: Ie8f2de8f11f8fec3a9f014bbcc46a506dfb3058d --- cppuhelper/source/defaultbootstrap.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cppuhelper') diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx index ccf744769d4b..f27d82c5c114 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -1100,9 +1100,10 @@ void ServiceManager::insert(css::uno::Any const & aElement) // 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 (can go again -// for incompatible LO 4): -#if SUPD < 400 +// 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( @@ -1110,7 +1111,7 @@ void ServiceManager::insert(css::uno::Any const & aElement) "Ignored XSingleComponentFactory not implementing XServiceInfo"); return; } -#endif + throw css::lang::IllegalArgumentException( "Bad insert element", static_cast< cppu::OWeakObject * >(this), 0); } -- cgit