* commit 'ooo/DEV300_m101': (185 commits) chart52: cleanup unused legend entry stuff in preparation of issue #i82802# masterfix: #i10000# add missing dependency in offapi sb138: #i115619# fix for MinGW sb138: #i115619#, #i116038# use osl_setThreadName in binaryurp sb138: #i115619# osl_setThreadName gridsort: i116682: update UnoControlDialog to reflect XDialog gridsort: minor changes to the new API: - renamed XMutableGridDataModel::setRowHeading to updateRowHeading for consistency reasons - renamed XSortableGridDataModel to XSortableGridData - actually, this is not a full-fledged model in itself. gridsort: grid control related unit tests (first set, more to come) sb138: #i116038# fresh implementation of binary URP bridge chart52: #28670# make the legend within charts resizeable - part 2 gridsort: re-did the column resizing - introduced XGridColumn.Flexibility, determining to which degree the column is resized during auto-column-resizing - removed XGridColumn.PreferredWidth - there really is no need for this anymore now - documented the relationship between XGridColumn.Flexibility and XGridColumn.Resizeable - re-implemented TableControl_Impl::impl_ni_updateColumnWidths, with (hopefully) less magic sb139: #i116530# improve Java URP bridge error notification by utilizing the java.lang.Throwable cause facility gridsort: document the relationship between soorting the data and notifying XGridDataListeners gridsort: introduce XGridColumn::DataModelIndex. this allows for column removal/insertion at the GridColumnModel, without the need to touch the GridDataModel locales34: #i112431# adapt documentation to reality gridsort: introduce XSortableGridDataModel::removeColumnSort gridsort: #163172# added UNO API support for sorting grid data. Implementation still unfinished. Things missing in the SortableGridData implementation - add as listener to the delegator, so we're notified of changes - translate and multiplex those changes - do own notifications (XGridDataListener.dataChanged) when the sort order changed - (possibly) update the sort order when the data in the current sort-column changed gridsort: made the row title a row heading, being an Any instead of a string gridsort: XMutableGridData: renamed updateRow to updateRowData for consistency; introduced updateRowToolTip as shortcut for multiple updateCellToolTip calls gridsort: updateCell->updateCellData, setCellToolTip->updateCellToolTip; in both methods, have (Col,Row) params instead of (Row,Col), for consistency reasons ... Conflicts: bridges/inc/bridges/remote/bridgeimpl.hxx bridges/inc/bridges/remote/connection.h bridges/inc/bridges/remote/context.h bridges/inc/bridges/remote/helper.hxx bridges/inc/bridges/remote/mapping.hxx bridges/inc/bridges/remote/proxy.hxx bridges/inc/bridges/remote/remote.h bridges/inc/bridges/remote/remote.hxx bridges/inc/bridges/remote/stub.hxx bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx bridges/source/remote/context/context.cxx bridges/source/remote/static/helper.cxx bridges/source/remote/static/mapping.cxx bridges/source/remote/static/proxy.cxx bridges/source/remote/static/remote.cxx bridges/source/remote/static/remote_types.cxx bridges/source/remote/static/remote_types.hxx bridges/source/remote/static/stub.cxx bridges/source/remote/urp/urp_bridgeimpl.cxx bridges/source/remote/urp/urp_bridgeimpl.hxx bridges/source/remote/urp/urp_cache.h bridges/source/remote/urp/urp_cache.hxx bridges/source/remote/urp/urp_dispatch.cxx bridges/source/remote/urp/urp_dispatch.hxx bridges/source/remote/urp/urp_environment.cxx bridges/source/remote/urp/urp_job.cxx bridges/source/remote/urp/urp_job.hxx bridges/source/remote/urp/urp_log.cxx bridges/source/remote/urp/urp_log.hxx bridges/source/remote/urp/urp_marshal.cxx bridges/source/remote/urp/urp_marshal.hxx bridges/source/remote/urp/urp_marshal_decl.hxx bridges/source/remote/urp/urp_property.hxx bridges/source/remote/urp/urp_propertyobject.cxx bridges/source/remote/urp/urp_propertyobject.hxx bridges/source/remote/urp/urp_reader.cxx bridges/source/remote/urp/urp_reader.hxx bridges/source/remote/urp/urp_replycontainer.hxx bridges/source/remote/urp/urp_threadid.cxx bridges/source/remote/urp/urp_threadid.hxx bridges/source/remote/urp/urp_unmarshal.cxx bridges/source/remote/urp/urp_unmarshal.hxx bridges/source/remote/urp/urp_writer.cxx bridges/source/remote/urp/urp_writer.hxx cppu/source/threadpool/threadpool.cxx cppu/util/target.pmk cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx cppuhelper/source/interfacecontainer.cxx cpputools/source/regcomplazy/regcomplazy.cxx jurt/prj/d.lst jvmfwk/source/elements.cxx offapi/com/sun/star/awt/grid/GridDataEvent.idl offapi/com/sun/star/awt/grid/XGridColumn.idl offapi/com/sun/star/awt/tab/makefile.mk offapi/com/sun/star/chart2/ExplicitIncrementData.idl offapi/com/sun/star/chart2/XPlotter.idl offapi/com/sun/star/chart2/XUndoHelper.idl offapi/com/sun/star/document/MediaDescriptor.idl offapi/com/sun/star/document/makefile.mk offapi/com/sun/star/linguistic2/XLanguageGuessing.idl offapi/com/sun/star/script/ModuleInfo.idl offapi/com/sun/star/script/ModuleType.idl offapi/com/sun/star/text/TextMarkupType.idl offapi/com/sun/star/util/XTextSearch.idl offapi/com/sun/star/xml/sax/XFastAttributeList.idl pyuno/source/loader/makefile.mk remotebridges/source/bridge/bridge_connection.cxx remotebridges/source/bridge/bridge_connection.hxx remotebridges/source/bridge/bridge_provider.cxx remotebridges/source/bridge/remote_bridge.cxx remotebridges/source/bridge/remote_bridge.hxx remotebridges/source/dynamicloader/dynamicloader.cxx remotebridges/source/factory/bridgefactory.cxx remotebridges/source/factory/bridgeimpl.cxx remotebridges/source/factory/bridgeimpl.hxx remotebridges/source/factory/makefile.mk sal/cppunittester/cppunittester.cxx sal/inc/osl/diagnose.h sal/osl/os2/system.h sal/osl/unx/diagnose.c sal/osl/unx/file_misc.cxx sal/osl/unx/process_impl.cxx sal/osl/w32/diagnose.c sal/osl/w32/process.cxx sal/prj/build.lst sal/qa/rtl/math/makefile.mk sal/qa/rtl/math/rtl_math.cxx sal/qa/rtl/math/rtl_old_testint64.cxx sal/qa/rtl/math/test_rtl_math.cxx sal/systools/win32/kill/kill.cxx sal/textenc/tencinfo.c sal/util/sal.map stoc/source/inspect/introspection.cxx stoc/source/security/file_policy.cxx stoc/source/simpleregistry/simpleregistry.cxx
242 lines
8.0 KiB
C++
242 lines
8.0 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*************************************************************************
|
|
*
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
*
|
|
************************************************************************/
|
|
|
|
#include <pyuno/pyuno.hxx>
|
|
|
|
#include <osl/process.h>
|
|
#include <osl/file.h>
|
|
#include <osl/thread.h>
|
|
|
|
#include <rtl/ustrbuf.hxx>
|
|
#include <rtl/strbuf.hxx>
|
|
#include <rtl/bootstrap.hxx>
|
|
|
|
#include <cppuhelper/implementationentry.hxx>
|
|
#include <cppuhelper/factory.hxx>
|
|
|
|
using rtl::OUString;
|
|
using rtl::OUStringBuffer;
|
|
using rtl::OString;
|
|
|
|
using pyuno::PyRef;
|
|
using pyuno::Runtime;
|
|
using pyuno::PyThreadAttach;
|
|
|
|
using com::sun::star::registry::XRegistryKey;
|
|
using com::sun::star::uno::Reference;
|
|
using com::sun::star::uno::XInterface;
|
|
using com::sun::star::uno::Sequence;
|
|
using com::sun::star::uno::XComponentContext;
|
|
using com::sun::star::uno::RuntimeException;
|
|
|
|
namespace pyuno_loader
|
|
{
|
|
|
|
static void raiseRuntimeExceptionWhenNeeded() throw ( RuntimeException )
|
|
{
|
|
if( PyErr_Occurred() )
|
|
{
|
|
PyRef excType, excValue, excTraceback;
|
|
PyErr_Fetch( (PyObject **)&excType, (PyObject**)&excValue,(PyObject**)&excTraceback);
|
|
Runtime runtime;
|
|
com::sun::star::uno::Any a = runtime.extractUnoException( excType, excValue, excTraceback );
|
|
OUStringBuffer buf;
|
|
buf.appendAscii( "python-loader:" );
|
|
if( a.hasValue() )
|
|
buf.append( ((com::sun::star::uno::Exception *)a.getValue())->Message );
|
|
throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface> () );
|
|
}
|
|
}
|
|
|
|
static PyRef getLoaderModule() throw( RuntimeException )
|
|
{
|
|
PyRef module(
|
|
PyImport_ImportModule( const_cast< char * >("pythonloader") ),
|
|
SAL_NO_ACQUIRE );
|
|
raiseRuntimeExceptionWhenNeeded();
|
|
if( !module.is() )
|
|
{
|
|
throw RuntimeException(
|
|
OUString( RTL_CONSTASCII_USTRINGPARAM( "pythonloader: Couldn't load pythonloader module" ) ),
|
|
Reference< XInterface > () );
|
|
}
|
|
return PyRef( PyModule_GetDict( module.get() ));
|
|
}
|
|
|
|
static PyRef getObjectFromLoaderModule( const char * func )
|
|
throw ( RuntimeException )
|
|
{
|
|
PyRef object( PyDict_GetItemString(getLoaderModule().get(), (char*)func ) );
|
|
if( !object.is() )
|
|
{
|
|
OUStringBuffer buf;
|
|
buf.appendAscii( "pythonloader: couldn't find core element pythonloader." );
|
|
buf.appendAscii( func );
|
|
throw RuntimeException(buf.makeStringAndClear(),Reference< XInterface >());
|
|
}
|
|
return object;
|
|
}
|
|
|
|
OUString getImplementationName()
|
|
{
|
|
return OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.pyuno.Loader" ) );
|
|
}
|
|
|
|
Sequence< OUString > getSupportedServiceNames()
|
|
{
|
|
OUString serviceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Python" ) );
|
|
return Sequence< OUString > ( &serviceName, 1 );
|
|
}
|
|
|
|
static void setPythonHome ( const OUString & pythonHome )
|
|
{
|
|
OUString systemPythonHome;
|
|
osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) );
|
|
OString o = rtl::OUStringToOString( systemPythonHome, osl_getThreadTextEncoding() );
|
|
rtl_string_acquire(o.pData); // leak this string (thats the api!)
|
|
Py_SetPythonHome( o.pData->buffer);
|
|
}
|
|
|
|
static void prependPythonPath( const OUString & pythonPathBootstrap )
|
|
{
|
|
rtl::OUStringBuffer bufPYTHONPATH( 256 );
|
|
sal_Int32 nIndex = 0;
|
|
while( 1 )
|
|
{
|
|
sal_Int32 nNew = pythonPathBootstrap.indexOf( ' ', nIndex );
|
|
OUString fileUrl;
|
|
if( nNew == -1 )
|
|
{
|
|
fileUrl = OUString( &( pythonPathBootstrap[nIndex] ) );
|
|
}
|
|
else
|
|
{
|
|
fileUrl = OUString( &(pythonPathBootstrap[nIndex]) , nNew - nIndex );
|
|
}
|
|
OUString systemPath;
|
|
osl_getSystemPathFromFileURL( fileUrl.pData, &(systemPath.pData) );
|
|
bufPYTHONPATH.append( systemPath );
|
|
bufPYTHONPATH.append( static_cast<sal_Unicode>(SAL_PATHSEPARATOR) );
|
|
if( nNew == -1 )
|
|
break;
|
|
nIndex = nNew + 1;
|
|
}
|
|
const char * oldEnv = getenv( "PYTHONPATH");
|
|
if( oldEnv )
|
|
bufPYTHONPATH.append( rtl::OUString(oldEnv, strlen(oldEnv), osl_getThreadTextEncoding()) );
|
|
|
|
rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("PYTHONPATH"));
|
|
rtl::OUString envValue(bufPYTHONPATH.makeStringAndClear());
|
|
osl_setEnvironment(envVar.pData, envValue.pData);
|
|
}
|
|
|
|
Reference< XInterface > CreateInstance( const Reference< XComponentContext > & ctx )
|
|
{
|
|
Reference< XInterface > ret;
|
|
|
|
if( ! Py_IsInitialized() )
|
|
{
|
|
OUString pythonPath;
|
|
OUString pythonHome;
|
|
OUString path( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR/program/" SAL_CONFIGFILE("pythonloader.uno" )));
|
|
rtl::Bootstrap::expandMacros(path); //TODO: detect failure
|
|
rtl::Bootstrap bootstrap(path);
|
|
|
|
// look for pythonhome
|
|
bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONHOME") ), pythonHome );
|
|
bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONPATH" ) ) , pythonPath );
|
|
|
|
// pythonhome+pythonpath must be set before Py_Initialize(), otherwise there appear warning on the console
|
|
// sadly, there is no api for setting the pythonpath, we have to use the environment variable
|
|
if( pythonHome.getLength() )
|
|
setPythonHome( pythonHome );
|
|
|
|
if( pythonPath.getLength() )
|
|
prependPythonPath( pythonPath );
|
|
|
|
// initialize python
|
|
Py_Initialize();
|
|
PyEval_InitThreads();
|
|
|
|
PyThreadState *tstate = PyThreadState_Get();
|
|
PyEval_ReleaseThread( tstate );
|
|
}
|
|
|
|
PyThreadAttach attach( PyInterpreterState_Head() );
|
|
{
|
|
if( ! Runtime::isInitialized() )
|
|
{
|
|
Runtime::initialize( ctx );
|
|
}
|
|
Runtime runtime;
|
|
|
|
PyRef pyCtx = runtime.any2PyObject(
|
|
com::sun::star::uno::makeAny( ctx ) );
|
|
|
|
PyRef clazz = getObjectFromLoaderModule( "Loader" );
|
|
PyRef args ( PyTuple_New( 1 ), SAL_NO_ACQUIRE );
|
|
PyTuple_SetItem( args.get(), 0 , pyCtx.getAcquired() );
|
|
PyRef pyInstance( PyObject_CallObject( clazz.get() , args.get() ), SAL_NO_ACQUIRE );
|
|
runtime.pyObject2Any( pyInstance ) >>= ret;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
}
|
|
|
|
|
|
static struct cppu::ImplementationEntry g_entries[] =
|
|
{
|
|
{
|
|
pyuno_loader::CreateInstance, pyuno_loader::getImplementationName,
|
|
pyuno_loader::getSupportedServiceNames, cppu::createSingleComponentFactory,
|
|
0 , 0
|
|
},
|
|
{ 0, 0, 0, 0, 0, 0 }
|
|
};
|
|
|
|
extern "C"
|
|
{
|
|
|
|
//==================================================================================================
|
|
void SAL_CALL component_getImplementationEnvironment(
|
|
const sal_Char ** ppEnvTypeName, uno_Environment ** )
|
|
{
|
|
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
|
|
}
|
|
//==================================================================================================
|
|
void * SAL_CALL component_getFactory(
|
|
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
|
|
{
|
|
return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
|
|
}
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|