[Libreoffice-commits] .: 2 commits - cppuhelper/source svl/inc

[Libreoffice Gerrit user]

 cppuhelper/source/defaultbootstrap.cxx |    9 +++++----
 svl/inc/svl/cntwids.hrc                |    4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit faef84abca7860227730351d7d1cd4e3c4b6e0e5
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Nov 12 16:36:39 2012 +0200

    Do stay backward-compatible also in 4.0 and later for now
    
    Change-Id: Ie8f2de8f11f8fec3a9f014bbcc46a506dfb3058d

diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index ccf7447..f27d82c 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);
 }
commit 66ae7df4726ac4a959d77ce258ad1c323f254b9f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Nov 12 16:31:54 2012 +0200

    Fix misleading comments
    
    Change-Id: Id85c063c7a5a44c3c71e4eee04342fdb1a38f487

diff --git a/svl/inc/svl/cntwids.hrc b/svl/inc/svl/cntwids.hrc
index 55fdaf1..5900c22 100644
--- a/svl/inc/svl/cntwids.hrc
+++ b/svl/inc/svl/cntwids.hrc
@@ -106,7 +106,7 @@
 #define WID_STORE_MSGS_TIMELIMIT            (WID_CHAOS_START + 124)
 
 //////////////////////////////////////////////////////////////////////////
-// WID's added after SO 4.0 release ( SUPD > 364 )
+// WIDs added after SO 4.0 release
 //////////////////////////////////////////////////////////////////////////
 
 // PROP BOXALL
@@ -184,7 +184,7 @@
 #define WID_HTTP_COOKIE                     (WID_CHAOS_START + 231)
 
 //////////////////////////////////////////////////////////////////////////
-// WID's added after SO 5.0 release ( SUPD > 505 )
+// WIDs added after SO 5.0 release
 //////////////////////////////////////////////////////////////////////////
 
 // PROP FOLDER