diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-06-28 13:17:16 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-06-28 13:17:16 +0000 |
| commit | 981c7c3d98270c46bccd1e5503703f7427e3c700 (patch) | |
| tree | 5e7a3a27aee7ac7fecf7f67ce0c997a0708631d4 /cppuhelper | |
| parent | 9c69356d86a288dc864d026b55f2563193e4b5ab (diff) | |
INTEGRATION: CWS tbe10 (1.17.2); FILE MERGED
2004/06/07 14:32:36 tbe 1.17.2.1: #i29939# ::cppu::bootstrap(): use get_this_libpath() instead of $ORIGIN
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/bootstrap.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 5d3f22ea2b38..0c21bb3ee08b 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: obo $ $Date: 2004-05-28 15:58:42 $ + * last change: $Author: hr $ $Date: 2004-06-28 14:17:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,7 +94,6 @@ #include "com/sun/star/beans/PropertyValue.hpp" #include "com/sun/star/io/IOException.hpp" #include "com/sun/star/bridge/XUnoUrlResolver.hpp" -#include "com/sun/star/util/XMacroExpander.hpp" #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define ARLEN(x) sizeof (x) / sizeof *(x) @@ -547,12 +546,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() throw BootstrapException( OUSTR( "no local component context!" ) ); // URL to office executable - Reference<util::XMacroExpander> xMacroExpander( - xLocalContext->getValueByName( - OUSTR( "/singletons/com.sun.star.util.theMacroExpander" ) ), - UNO_QUERY_THROW ); - OUString sOfficeURL( xMacroExpander->expandMacros( OUSTR( "$ORIGIN" ) ) - + OUSTR( "/soffice" ) ); + OUString sOfficeURL( get_this_libpath() + OUSTR( "/soffice" ) ); // create a random pipe name rtlRandomPool hPool = rtl_random_createPool(); |