diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-12 09:18:09 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-12 09:18:09 +0000 |
| commit | e591a08dc3d37e13703c855a7f4056faa4e34406 (patch) | |
| tree | b68b0ea9d11b8450db6dbcf1040a12c918a44f1a /stoc | |
| parent | 788a7beaa020b50e9f657a4e53d1c41c6ef78f1d (diff) | |
CWS-TOOLING: integrate CWS sb103
2009-01-15 15:28:08 +0100 sb r266375 : #i97629# set UNO_PATH in python start program and use it in bootstrap function in officehelper.py (and do not erroneously encode a vnd.sun.star.pathname URE_BOOTSTRAP value in tools::extendApplicationEnvironment)
2009-01-15 10:40:17 +0100 sb r266338 : #i97424# explicit shut down of ImplImageTree singleton in DeInitVCL still required
2009-01-14 12:07:15 +0100 sb r266276 : CWS-TOOLING: rebase CWS sb103 to trunk@265758 (milestone: DEV300:m38)
2009-01-14 08:53:02 +0100 sb r266266 : #i96284# remove implementation of unused (but expensive) link feature; plus some general cleanup
2009-01-08 14:42:59 +0100 sb r266010 : #i96683# enable dlclose for GCC 3 (based on a patch by cmc)
2009-01-06 14:18:23 +0100 sb r265920 : #i97424# spurious unreferenced local variables
2008-12-19 15:33:39 +0100 sb r265727 : #i57359# no need for a special glibc 2.2.4 based libgcc_s.so.1 for URE any more as the general one used for OOo is guaranteed to be based on at least glibc 2.2.4, anyway
2008-12-19 13:54:37 +0100 sb r265724 : #i97424# clean up and speed up vcl ImplImageTree
2008-12-18 14:28:10 +0100 sb r265690 : #i97132# spread usage of the rtl::Static pattern (patch by cmc)
2008-12-15 14:33:00 +0100 sb r265499 : #i90492# generate UTF-8 encoded output (patch by tora)
2008-12-15 11:45:05 +0100 sb r265469 : #i95593# -Djava.library.path to find libtest_javauno_any.so
2008-12-15 11:23:14 +0100 sb r265468 : #i93769# it appears that Java nowadays expects file URIs in UTF-8, so ExternalUriReferenceTranslator.toExternal must not be called
2008-12-10 12:02:50 +0100 sb r265164 : #i93219# use (corrected) signal handling instead of forking again (to avoid unintended generation of core files)
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 73556dd5971c..e7c9ff1a5851 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -61,7 +61,6 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XCurrentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" -#include "com/sun/star/uri/ExternalUriReferenceTranslator.hpp" #include "com/sun/star/util/XMacroExpander.hpp" #include "com/sun/star/container/XNameAccess.hpp" #include "cppuhelper/exc_hlp.hxx" @@ -1642,18 +1641,6 @@ void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) { "com::sun::star::lang::IllegalArgumentException")), static_cast< cppu::OWeakObject * >(this)); } - if (baseUrl.getLength() > 0) { - baseUrl = css::uri::ExternalUriReferenceTranslator::create(m_xContext)-> - translateToExternal(baseUrl); - if (baseUrl.getLength() == 0) { - throw css::uno::RuntimeException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.uri.ExternalUriReferenceTranslator." - "translateToExternal failed")), - static_cast< cppu::OWeakObject * >(this)); - } - } rtl::OUString classPath; try { classPath = exp->expandMacros( |