Commit graph

494 commits

Author SHA1 Message Date
Tor Lillqvist
5510127e89 Android code refactorig and hacking
Sorry for the large unstructured commit. But hey, the Android code is
experimental so far.

Extract the native lo-bootstrap code into a fairly normal library
built in sal. (Previously it was the JNI part of the "Bootstrap" app.)
Just linkink normally to liblo-bootstrap from C++ code that uses it
works fine, no need to do a dlsym lookup.

Bootstrap is still a subclass of NativeActivity and can thus still be
used as an "app" (to start unit tests, or whatever), but can also be
used from some other app's Java code to just get access to the
lo-bootstrap native methods.

Introduce a new top-level "module", android, for Bootstrap and the
experiments with DocumentLoader.

Note that the experimental DocumentLoader app still crashes. It can't
create the com.sun.star.frame.Desktop instance.

I spent lots of time debugging in the painfully inadequate
ndk-gdb. (Even the newer gdb build from the "mingw-and-ndk" project is
quite crappy in many ways.) I should really experiment with
corresponding code on a normal platform first before even trying on
Android. Basically, I think that if I just can get the concept of Java
code that instantiates and uses LO components *in-process* working on
a normal desktop platform, it should work on Android, too.
2011-11-30 21:52:52 +02:00
Norbert Thiebaud
c0bed9c72e remove precompiled_xxx.hxx/cxx 2011-11-27 18:07:55 -06:00
Norbert Thiebaud
bf1f1e9cba remove include of pch header from jvmfwk 2011-11-27 13:13:58 -06:00
Norbert Thiebaud
e4610ffd2d remove PCH support in dmake-module 2011-11-27 12:26:12 -06:00
Korrawit Pruegsanusak
c3dc018984 typos fixing 2011-11-27 15:12:07 +07:00
Tor Lillqvist
591191038e Use ENFORCEDSHLPREFIX for Android 2011-11-26 00:23:47 +02:00
Stephan Bergmann
f95052c29b duplicate "add Oracle Java 1.7.0 recognition" from javavendors_linux -> wnt 2011-11-25 11:01:34 +01:00
Tor Lillqvist
811de66d7f First attempt at getting access to the Java VM on Android 2011-11-25 01:40:23 +02:00
Stephan Bergmann
0c7bff0271 Changed sal/log.h -> sal/log.hxx, drop _S from C++ streaming log macros.
A compile time check ensures the common case of streaming just a plain
C-style string literal still produces reasonably compact call-site code.
The format-string variants are still available in sal/detail/log.h, but
only to be used in obsolete osl/diagnose.h etc., and going to be removed
again eventually.
2011-11-23 15:50:58 +01:00
Stephan Bergmann
70a6b9ffbd New sal/log.h obsoletes osl/diagnose.h and tools/debug.hxx.
* New SAL_INFO..., SAL_WARN... macros.
* New SAL_STREAM supersedes OSL_FORMAT.
* oustringostreaminserter.hxx moved from unotest to rtl (and always UTF-8 now).
* TODO to enable GCC __attribute__((format)) in sal/log.h (requires call-site
  cleanup).
* Further functionality in tools/debug.hxx (DBG_MEMTEST, DBG_CTOR, etc.) not yet
  addressed.
* Some replacements tools String -> rtl::OUString.
2011-11-22 09:41:47 +01:00
Tor Lillqvist
f20ffbd845 WaE: unreferenced formal parameters in the !SOLAR_JAVA case 2011-10-03 15:12:58 +03:00
Stephan Bergmann
b03f220061 Force JVM into interpreted mode when running under Valgrind, to avoid false error reports. 2011-09-17 10:59:17 +02:00
Fridrich Štrba
bb5bdbbdca Revert "Trying to chop out the uwinapi library"
This reverts commit 2dea0dab4f.
2011-09-16 16:26:03 +02:00
Fridrich Štrba
2dea0dab4f Trying to chop out the uwinapi library 2011-09-16 15:52:40 +02:00
Hanno Meyer-Thurow
549e54fb2f add Oracle Java 1.7.0 recognition 2011-09-13 13:23:28 +01:00
Julien Nabet
3b56b6ff5f small bugfix : bNeedsSave instead of *bNeedsSave 2011-09-12 07:37:01 +02:00
Rene Engelhard
6683b842e1 fix JFW_PLUGIN_ARCH for OpenJDK/mipsel 2011-08-23 18:15:13 +02:00
Tor Lillqvist
58c9036836 No i prefix for import library with MinGW thanks 2011-06-21 00:02:11 +03:00
Tor Lillqvist
c4bfa78019 Be less picky with library names to match also the static library built for iOS 2011-06-16 10:58:07 +03:00
Tor Lillqvist
7862e397af Drop %_EXT% which was always empty 2011-06-03 13:28:35 +03:00
Caolán McNamara
ae59ac8646 add salhelper::LinkResolver 2011-05-25 08:57:24 +01:00
Caolán McNamara
693d7797ac use comphelper::resolveLink 2011-05-25 08:57:24 +01:00
Caolán McNamara
71d97cfc1e resolve symbolic links to jvm dirs for especially smoketest inside ooenv 2011-05-24 15:49:45 +01:00
Julien Nabet
474d8ffd63 Some cppcheck cleaning 2011-05-17 12:44:26 +02:00
Christina Rossmanith
c776e24f16 remove FileStatusMask_XXX in favour of osl_FileStatus_Mask_XXX (ure) 2011-04-19 20:40:32 +02:00
Francois Tigeot
35e1b53c7e Remove OS/2 support. 2011-04-18 16:59:48 +02:00
Rene Engelhard
8890bf7cd2 jvmfwk-gij-paths.diff: more gij/libgcj paths 2011-04-01 14:19:44 +02:00
Petr Mladek
904afe741b tiny clean up; removed unwanted comma in array intialization 2011-03-30 20:07:46 +02:00
Petr Mladek
92a2b2fbb0 jvmfwk-modified-javavendors-xml.diff: autodetect java (i#99619)
select the java automatically when the system javavendors.xml is modified
do not force to do it the user manually
2011-03-30 14:49:41 +02:00
Takeshi Abe
e571d06fa3 Fixed typo 2011-03-24 23:38:25 +09:00
Takeshi Abe
40f04ac7b9 Fixed the source file name 2011-03-24 23:35:20 +09:00
Takeshi Abe
cde377f758 Removed an unchanged variable 2011-03-24 23:19:02 +09:00
Jan Holesovsky
a3a19632f4 Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
	bridges/source/remote/urp/urp_environment.cxx
	bridges/source/remote/urp/urp_propertyobject.cxx
	bridges/source/remote/urp/urp_reader.cxx
	remotebridges/source/factory/bridgefactory.cxx
	stoc/source/corereflection/crefl.cxx
	stoc/source/javavm/javavm.cxx
	stoc/source/simpleregistry/simpleregistry.cxx
2011-03-18 15:58:02 +01:00
Hanno Meyer-Thurow
6cd98b3d9d Merge Gentoo patches from old build and downstream repositories.
1. Do not add compiler default include and library path: potentially build
   against different version of system library than requested by the user.
2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
   available for more than two years. Noone cares, therefore rest in peace.
   Python2 is going to be ditched at some point. Simply do not fail then.
   Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it
   handled nowadays?
3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip
4. Add a configure option to search only in one place for JVMs, which is quite
   interesting for Linux Distributions. Enforce the user to place JVMs in one
   base directory.
5. Fix build for libxml-2.7.8 with ICU support.

* config_office-XINC-XLIB-defaults.diff: (1)
* disable-python.diff: (2)
* gentoo-sandbox.diff: (3)
* jvm-search-path.diff: (4)
* libxmlsec_fix_extern_c.diff: (5)
2011-03-14 18:51:13 +01:00
Thomas Arnhold
adc6fe00e3 Move OSL_ENSURE(0,...) to OSL_FAIL(...) 2011-03-12 14:19:48 +01:00
Thomas Arnhold
6488e5f120 Move OSL_ENSURE(false,...) to OSL_FAIL(...) 2011-03-12 14:19:48 +01:00
Norbert Thiebaud
d7fc91fcd1 Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* 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
2011-03-08 22:29:39 -06:00
Takeshi Abe
b406c51330 removed dead code; fix a comment 2011-03-04 01:41:18 +09:00
Julien Nabet
933e22880b Remove "using namespace ::rtl" 2011-03-02 21:53:12 +01:00
Thomas Arnhold
1d0fa44ad1 Move bogus OSL_ASSERT(msg) to OSL_FAIL(msg) 2011-02-26 10:35:54 +01:00
Hanno Meyer-Thurow
9f5042e4a5 search for server jvm if client jvm not found 2011-02-15 21:22:50 +00:00
Thomas Arnhold
83734eea36 Clean up makefiles 2011-02-04 12:45:54 +01:00
Thomas Arnhold
1a6617cf05 Clean up makefiles 2011-02-01 18:22:56 +01:00
Tor Lillqvist
d2d18606f8 Add the location of the 64-bit jvm.dll 2011-01-26 23:08:51 +02:00
Caolán McNamara
3bf43b8d8e cppunit: prefer prefix variant 2011-01-06 14:01:56 +00:00
Joachim Lingner
4d9bdb9e1a jl160 merge with DEV300m96 2011-01-04 12:01:53 +01:00
Caolán McNamara
5bbb8daba0 cppcheck: prefer prefix variant 2011-01-01 21:02:08 +00:00
Caolán McNamara
355a9a5c56 cppcheck: prefer prefix variant 2011-01-01 20:54:36 +00:00
Caolán McNamara
30d912dfc5 cppcheck: prefer prefix variants 2010-12-29 21:18:22 +00:00
Caolán McNamara
8d5581f95d cppcheck: prefer prefix variant 2010-12-23 21:02:38 +00:00