Kaydet (Commit) faef84ab authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Do stay backward-compatible also in 4.0 and later for now

Change-Id: Ie8f2de8f11f8fec3a9f014bbcc46a506dfb3058d
üst 66ae7df4
...@@ -1100,9 +1100,10 @@ void ServiceManager::insert(css::uno::Any const & aElement) ...@@ -1100,9 +1100,10 @@ void ServiceManager::insert(css::uno::Any const & aElement)
// implement XServiceInfo"); the old OServiceManager::insert // implement XServiceInfo"); the old OServiceManager::insert
// (stoc/source/servicemanager/servicemanager.cxx) silently did not add such // (stoc/source/servicemanager/servicemanager.cxx) silently did not add such
// broken factories to its m_ImplementationNameMap, so ignore them here for // broken factories to its m_ImplementationNameMap, so ignore them here for
// backwards compatibility of live-insertion of extensions, too (can go again // backwards compatibility of live-insertion of extensions, too.
// for incompatible LO 4):
#if SUPD < 400 // (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; css::uno::Reference< css::lang::XSingleComponentFactory > legacy;
if ((aElement >>= legacy) && legacy.is()) { if ((aElement >>= legacy) && legacy.is()) {
SAL_WARN( SAL_WARN(
...@@ -1110,7 +1111,7 @@ void ServiceManager::insert(css::uno::Any const & aElement) ...@@ -1110,7 +1111,7 @@ void ServiceManager::insert(css::uno::Any const & aElement)
"Ignored XSingleComponentFactory not implementing XServiceInfo"); "Ignored XSingleComponentFactory not implementing XServiceInfo");
return; return;
} }
#endif
throw css::lang::IllegalArgumentException( throw css::lang::IllegalArgumentException(
"Bad insert element", static_cast< cppu::OWeakObject * >(this), 0); "Bad insert element", static_cast< cppu::OWeakObject * >(this), 0);
} }
......
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