Commit graph

155 commits

Author SHA1 Message Date
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
Thomas Arnhold
d0c187cc8c OSL_TRACE: Use format string 2011-03-12 14:19:49 +01:00
Thomas Arnhold
7f656740d8 Move OSL_ENSURE(0,...) to OSL_FAIL(...) 2011-03-12 14:19:49 +01:00
Thomas Arnhold
adc6fe00e3 Move OSL_ENSURE(0,...) 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
Fridrich Strba
aac09aee67 move bridges to boost::unordered_map 2011-02-04 00:02:36 +01:00
Hans-Joachim Lankenau
2482b35619 ause128: #i115964# add creating libjava_uno.jnilib for tests that may need it 2010-12-08 15:17:09 +01:00
Takeshi Abe
36e2296bf8 Replace all occured, occurance etc. 2010-12-06 09:16:29 +00:00
Caolán McNamara
da5cef0ab4 add modelines to .h and .c files as well 2010-10-27 16:04:46 +01:00
Caolán McNamara
85c44ad8b3 #i101100# strict-alias clean 2010-10-20 08:53:25 +01:00
Sebastian Spaeth
a715e1b3d0 Add vim/emacs modelines to all source files
Fixes #fdo30794
Based on bin/add-modelines script (originally posted in mail
1286706307.1871.1399280959@webmail.messagingengine.com)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-14 17:04:31 +02:00
J. Graeme Lingard
bda7aaeb74 Remove redundant #include, #define & comments 2010-10-13 12:51:10 +02:00
sb
1fb62ab5e4 sb120: non-fatal OSL_ENSURE -> OSL_TRACE 2010-04-19 11:48:59 +02:00
Jens-Heiner Rechtien
7c80db2eb3 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Vladimir Glazounov
d8cb0da0ae CWS-TOOLING: integrate CWS mingwport22
2009-08-19 16:18:46 +0200 tono  r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-08-05 12:27:41 +0200 tono  r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk@274622 (milestone: DEV300:m54)
2009-08-01 00:56:35 +0200 tono  r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-27 00:13:27 +0200 tono  r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 06:19:59 +0200 tono  r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static"
2009-07-25 06:13:56 +0200 tono  r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread
2009-07-25 06:05:22 +0200 tono  r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section
2009-07-25 05:54:09 +0200 tono  r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope
2009-07-25 05:44:58 +0200 tono  r274328 : i#103799: mingw gcc-4.4.0 port: add some #include
2009-07-25 05:33:09 +0200 tono  r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path
2009-07-25 05:24:42 +0200 tono  r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge
2009-07-25 05:16:20 +0200 tono  r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 04:01:59 +0200 tono  r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-07-25 02:44:01 +0200 tono  r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging
2009-07-25 02:28:21 +0200 tono  r274321 : i#103791: mingw port fix typo
2009-08-26 06:36:38 +00:00
Rüdiger Timm
de29a6ecf9 INTEGRATION: CWS changefileheader (1.5.170); FILE MERGED
2008/03/28 16:30:47 rt 1.5.170.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:09:01 +00:00
Rüdiger Timm
4183723bd8 INTEGRATION: CWS changefileheader (1.8.154); FILE MERGED
2008/03/28 16:30:47 rt 1.8.154.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:08:44 +00:00
Rüdiger Timm
c9ccd0fcdd INTEGRATION: CWS changefileheader (1.6.170); FILE MERGED
2008/03/28 16:30:46 rt 1.6.170.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:08:26 +00:00
Rüdiger Timm
0b32910922 INTEGRATION: CWS changefileheader (1.5.100); FILE MERGED
2008/03/28 16:30:45 rt 1.5.100.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:08:11 +00:00
Rüdiger Timm
caeade5743 INTEGRATION: CWS changefileheader (1.8.32); FILE MERGED
2008/03/28 16:30:45 rt 1.8.32.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:07:52 +00:00
Rüdiger Timm
6ef0fcca28 INTEGRATION: CWS changefileheader (1.23.60); FILE MERGED
2008/03/28 16:30:44 rt 1.23.60.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:07:39 +00:00
Rüdiger Timm
092f485759 INTEGRATION: CWS changefileheader (1.26.60); FILE MERGED
2008/03/28 16:30:44 rt 1.26.60.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:07:21 +00:00
Rüdiger Timm
32a8208d4e INTEGRATION: CWS changefileheader (1.14.122); FILE MERGED
2008/03/28 16:30:43 rt 1.14.122.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:07:02 +00:00
Rüdiger Timm
305cf2a544 INTEGRATION: CWS changefileheader (1.21.100); FILE MERGED
2008/03/28 16:30:43 rt 1.21.100.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:06:44 +00:00
Rüdiger Timm
f977033a71 INTEGRATION: CWS changefileheader (1.9.108); FILE MERGED
2008/03/28 16:30:43 rt 1.9.108.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:06:20 +00:00
Rüdiger Timm
174e68b575 INTEGRATION: CWS changefileheader (1.22.100); FILE MERGED
2008/03/28 16:30:42 rt 1.22.100.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:06:00 +00:00
Rüdiger Timm
eaccb5f10c INTEGRATION: CWS changefileheader (1.11.170); FILE MERGED
2008/03/28 16:30:42 rt 1.11.170.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:05:39 +00:00
Rüdiger Timm
50128fbab0 INTEGRATION: CWS changefileheader (1.17.100); FILE MERGED
2008/03/28 16:30:42 rt 1.17.100.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:04:48 +00:00
Rüdiger Timm
eb0f030daa INTEGRATION: CWS changefileheader (1.13.134); FILE MERGED
2008/03/28 16:30:42 rt 1.13.134.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:04:20 +00:00
Vladimir Glazounov
e2130dedee INTEGRATION: CWS sb71 (1.7.110); FILE MERGED
2007/06/14 15:04:36 sb 1.7.110.1: #i75466# Adapted to new APP|SHLnRPATH.
2007-10-15 10:59:07 +00:00
Vladimir Glazounov
8b936950a1 INTEGRATION: CWS mingwport03 (1.21.22); FILE MERGED
2006/11/07 16:36:28 vg 1.21.22.2: RESYNC: (1.21-1.22); FILE MERGED
2006/09/07 09:21:09 vg 1.21.22.1: #i53572# MinGW port
2007-03-26 12:16:08 +00:00
Vladimir Glazounov
163a165407 INTEGRATION: CWS mingwport03 (1.24.12); FILE MERGED
2006/11/07 16:36:20 vg 1.24.12.2: RESYNC: (1.24-1.25); FILE MERGED
2006/09/07 09:21:09 vg 1.24.12.1: #i53572# MinGW port
2007-03-26 12:15:43 +00:00
Oliver Bolte
bb40752390 INTEGRATION: CWS pchfix02 (1.4.22); FILE MERGED
2006/09/01 17:17:40 kaib 1.4.22.1: #i68856# Added header markers and pch files
2006-09-16 14:58:42 +00:00
Oliver Bolte
07b371787e INTEGRATION: CWS pchfix02 (1.21.20); FILE MERGED
2006/09/01 17:17:40 kaib 1.21.20.1: #i68856# Added header markers and pch files
2006-09-16 14:58:29 +00:00
Oliver Bolte
6a3f30ec5c INTEGRATION: CWS pchfix02 (1.24.10); FILE MERGED
2006/09/01 17:17:40 kaib 1.24.10.1: #i68856# Added header markers and pch files
2006-09-16 14:58:17 +00:00
Oliver Bolte
acdbc61f1e INTEGRATION: CWS pchfix02 (1.20.22); FILE MERGED
2006/09/01 17:17:39 kaib 1.20.22.1: #i68856# Added header markers and pch files
2006-09-16 14:57:56 +00:00
Oliver Bolte
2b517aea38 INTEGRATION: CWS pchfix02 (1.21.22); FILE MERGED
2006/09/01 17:17:39 kaib 1.21.22.1: #i68856# Added header markers and pch files
2006-09-16 14:57:42 +00:00
Oliver Bolte
ca84dc8e0a INTEGRATION: CWS pchfix02 (1.16.22); FILE MERGED
2006/09/01 17:17:39 kaib 1.16.22.1: #i68856# Added header markers and pch files
2006-09-16 14:57:28 +00:00
Ivo Hinkelmann
1adf4dbec3 INTEGRATION: CWS pj55 (1.8.24); FILE MERGED
2006/07/15 10:03:25 pjanik 1.8.24.1: #i67342#: Prevent warning ("has not yet been assigned a value").
2006-08-01 10:48:28 +00:00
Kurt Zenker
c930ed0f1c INTEGRATION: CWS sb55 (1.22.30); FILE MERGED
2006/07/10 14:58:05 sb 1.22.30.2: RESYNC: (1.22-1.23); FILE MERGED
2006/07/10 14:27:27 sb 1.22.30.1: #i64789# Array bounds error.
2006-07-20 15:15:42 +00:00
Jens-Heiner Rechtien
8856135575 INTEGRATION: CWS warnings01 (1.3.4); FILE MERGED
2006/02/28 15:00:33 sb 1.3.4.1: #i53898# Made code waring-free.
2006-06-19 22:47:55 +00:00
Jens-Heiner Rechtien
5df4abc41a INTEGRATION: CWS warnings01 (1.19.14); FILE MERGED
2006/06/09 14:35:07 sb 1.19.14.4: #i53898# Made code warning-free for OSL_DEBUG_LEVEL>1.
2006/02/28 15:00:33 sb 1.19.14.3: #i53898# Made code waring-free.
2005/09/22 18:31:08 sb 1.19.14.2: RESYNC: (1.19-1.20); FILE MERGED
2005/09/09 12:37:55 sb 1.19.14.1: #i53898# Made code warning-free.
2006-06-19 22:47:42 +00:00
Jens-Heiner Rechtien
989f85908c INTEGRATION: CWS warnings01 (1.20.8); FILE MERGED
2006/01/25 20:21:05 sb 1.20.8.4: RESYNC: (1.21-1.22); FILE MERGED
2005/09/22 18:30:58 sb 1.20.8.3: RESYNC: (1.20-1.21); FILE MERGED
2005/09/09 12:37:53 sb 1.20.8.2: #i53898# Made code warning-free.
2005/09/05 14:25:22 sb 1.20.8.1: #i53898# Made code warning-free.
2006-06-19 22:47:30 +00:00
Jens-Heiner Rechtien
bbbf0d4d78 INTEGRATION: CWS warnings01 (1.11.14); FILE MERGED
2006/05/23 23:08:29 sb 1.11.14.3: RESYNC: (1.12-1.13); FILE MERGED
2005/09/22 18:30:47 sb 1.11.14.2: RESYNC: (1.11-1.12); FILE MERGED
2005/09/05 14:25:21 sb 1.11.14.1: #i53898# Made code warning-free.
2006-06-19 22:47:18 +00:00
Jens-Heiner Rechtien
935f822c76 INTEGRATION: CWS warnings01 (1.17.8); FILE MERGED
2006/05/26 13:42:19 sb 1.17.8.5: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170.
2006/05/23 23:08:07 sb 1.17.8.4: RESYNC: (1.18-1.19); FILE MERGED
2005/09/22 18:30:36 sb 1.17.8.3: RESYNC: (1.17-1.18); FILE MERGED
2005/09/09 12:37:52 sb 1.17.8.2: #i53898# Made code warning-free.
2005/09/05 14:25:21 sb 1.17.8.1: #i53898# Made code warning-free.
2006-06-19 22:47:07 +00:00
Jens-Heiner Rechtien
8c8d910cf2 INTEGRATION: CWS warnings01 (1.19.14); FILE MERGED
2005/09/22 18:30:04 sb 1.19.14.3: RESYNC: (1.19-1.20); FILE MERGED
2005/09/09 12:37:49 sb 1.19.14.2: #i53898# Made code warning-free.
2005/09/05 14:25:20 sb 1.19.14.1: #i53898# Made code warning-free.
2006-06-19 22:46:54 +00:00
Jens-Heiner Rechtien
608a6f1774 INTEGRATION: CWS warnings01 (1.14.4); FILE MERGED
2006/05/23 23:07:02 sb 1.14.4.2: RESYNC: (1.14-1.15); FILE MERGED
2006/02/28 15:00:33 sb 1.14.4.1: #i53898# Made code waring-free.
2006-06-19 22:46:40 +00:00
Jens-Heiner Rechtien
0ae6a32269 INTEGRATION: CWS sb49 (1.12.32); FILE MERGED
2006/03/16 15:55:36 sb 1.12.32.1: #i62429# Use Class.forName instead of ClassLoader.loadClass, as the latter is not specified to work for arrays.
2006-04-19 12:44:09 +00:00
Jens-Heiner Rechtien
bd9adcd460 INTEGRATION: CWS sb49 (1.18.32); FILE MERGED
2006/03/28 13:44:21 sb 1.18.32.2: #i63710# Avoid unbounded recursion in JNI_context::get_stack_trace (when it encounters an exception in find_class).
2006/03/16 15:55:35 sb 1.18.32.1: #i62429# Use Class.forName instead of ClassLoader.loadClass, as the latter is not specified to work for arrays.
2006-04-19 12:43:57 +00:00
Jens-Heiner Rechtien
93af338f30 INTEGRATION: CWS sb49 (1.7.34); FILE MERGED
2006/03/28 13:44:21 sb 1.7.34.2: #i63710# Avoid unbounded recursion in JNI_context::get_stack_trace (when it encounters an exception in find_class).
2006/03/16 15:55:35 sb 1.7.34.1: #i62429# Use Class.forName instead of ClassLoader.loadClass, as the latter is not specified to work for arrays.
2006-04-19 12:43:46 +00:00