[Libreoffice-commits] .: 3 commits - cppuhelper/source

[Tor Lillqvist]

 cppuhelper/source/servicefactory.cxx |   17 +++++------------
 cppuhelper/source/shlib.cxx          |    2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 7702cc5a7aea3d20138cba0cde86ef8a952619f0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 8 14:12:33 2011 +0300

    OSL_TRACE adds trailing newline itself

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index daea364..9f6ff0c 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -263,7 +263,7 @@ static OUString makeComponentPath(
     OUString out( buf.makeStringAndClear() );
 #if OSL_DEBUG_LEVEL > 1
     OString str( OUStringToOString( out, RTL_TEXTENCODING_ASCII_US ) );
-    OSL_TRACE( "component path=%s\n", str.getStr() );
+    OSL_TRACE( "component path=%s", str.getStr() );
 #endif
 
     return out;
commit cc13807356e73d0ac51f37b8e27f43d86602221d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 8 14:11:20 2011 +0300

    Add XServiceInfo.hpp needed when OSL_DEBUG_LEVEL > 1

diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index da9f89d..e796a96 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -47,6 +47,7 @@
 #include "com/sun/star/uno/DeploymentException.hpp"
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/lang/XInitialization.hpp"
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include "com/sun/star/lang/XSingleServiceFactory.hpp"
 #include "com/sun/star/lang/XSingleComponentFactory.hpp"
 #include "com/sun/star/beans/XPropertySet.hpp"
commit c89d682d94386495da324644f96cc6cd0887e46e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 8 14:09:57 2011 +0300

    Factor out "bootstrap.uno" repeated for all bootstrap services

diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index 1e40cf3..da9f89d 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -316,7 +316,7 @@ static void add_access_control_entries(
 
 namespace {
 void addFactories(
-    char const * const * ppNames /* lib, implname, ..., 0 */,
+    char const * const * ppNames /* implname, ..., 0 */,
     OUString const & bootstrapPath,
     Reference< lang::XMultiComponentFactory > const & xMgr,
     Reference< registry::XRegistryKey > const & xKey )
@@ -328,11 +328,11 @@ void addFactories(
 
     while (*ppNames)
     {
-        OUString lib( OUString::createFromAscii( *ppNames++ ) );
         OUString implName( OUString::createFromAscii( *ppNames++ ) );
 
         Any aFac( makeAny( loadSharedLibComponentFactory(
-                               lib, bootstrapPath, implName, xSF, xKey ) ) );
+                               OUSTR("bootstrap.uno" SAL_DLLEXTENSION),
+                               bootstrapPath, implName, xSF, xKey ) ) );
         xSet->insert( aFac );
 #if OSL_DEBUG_LEVEL > 1
         if (xSet->has( aFac ))
@@ -365,7 +365,7 @@ void addFactories(
         {
             OStringBuffer buf( 64 );
             buf.append( "### failed inserting shared lib \"" );
-            buf.append( ppNames[ -2 ] );
+            buf.append( "bootstrap.uno" SAL_DLLEXTENSION );
             buf.append( "\"!!!" );
             OString str( buf.makeStringAndClear() );
             OSL_FAIL( str.getStr() );
@@ -394,21 +394,13 @@ Reference< lang::XMultiComponentFactory > bootstrapInitialSF(
 
     // add initial bootstrap services
     static char const * ar[] = {
-        "bootstrap.uno" SAL_DLLEXTENSION,
         "com.sun.star.comp.stoc.OServiceManagerWrapper",
-        "bootstrap.uno" SAL_DLLEXTENSION,
         "com.sun.star.comp.stoc.DLLComponentLoader",
-        "bootstrap.uno" SAL_DLLEXTENSION,
         "com.sun.star.comp.stoc.SimpleRegistry",
-        "bootstrap.uno" SAL_DLLEXTENSION,
         "com.sun.star.comp.stoc.NestedRegistry",
-        "bootstrap.uno" SAL_DLLEXTENSION,
         "com.sun.star.comp.stoc.TypeDescriptionManager",
-        "bootstrap.uno" SAL_DLLEXTENSION,
         "com.sun.star.comp.stoc.ImplementationRegistration",
-        "bootstrap.uno" SAL_DLLEXTENSION,
         "com.sun.star.security.comp.stoc.AccessController",
-        "bootstrap.uno" SAL_DLLEXTENSION,
         "com.sun.star.security.comp.stoc.FilePolicy",
         0
     };