Commit graph

101 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
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
Francois Tigeot
f091f5b395 dragonfly stuff 2011-02-15 15:55:19 +00:00
Fridrich Strba
aac09aee67 move bridges to boost::unordered_map 2011-02-04 00:02:36 +01:00
sb
138ab06ecc sb138: #i116038# fresh implementation of binary URP bridge 2011-01-26 09:26:59 +01:00
Takeshi Abe
36e2296bf8 Replace all occured, occurance etc. 2010-12-06 09:16:29 +00:00
Robert Nagy
551898cdd2 Use linux bridge code on all BSDs.
Share the linux bridge code with all the BSDs to avoid code duplication
and the hassle of syncing. Discussed with Caolan McNamara
2010-11-06 00:15:04 +01:00
Caolán McNamara
da5cef0ab4 add modelines to .h and .c files as well 2010-10-27 16:04:46 +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
Petr Mladek
bcdb4cc866 more removed include guards using fixguard.py 2010-10-05 18:12:52 +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
bb490edf43 CWS-TOOLING: integrate CWS selinux01
2009-01-13 12:54:38 +0100 cmc  r266213 : #i97320# might as well be silent if we fallback
2009-01-07 11:17:16 +0100 cmc  r265957 : #i97320# use a double-mmap of an anonymous file under linux to keep onside of selinux
2009-01-20 10:20:47 +00:00
Rüdiger Timm
c130a70b95 INTEGRATION: CWS changefileheader (1.3.54); FILE MERGED
2008/03/28 16:29:55 rt 1.3.54.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:17:57 +00:00
Rüdiger Timm
ec1466bbef INTEGRATION: CWS changefileheader (1.2.100); FILE MERGED
2008/03/28 16:29:55 rt 1.2.100.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:17:36 +00:00
Rüdiger Timm
80e92c3671 INTEGRATION: CWS changefileheader (1.3.122); FILE MERGED
2008/03/28 16:29:54 rt 1.3.122.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:17:22 +00:00
Rüdiger Timm
e204bc94be INTEGRATION: CWS changefileheader (1.6.122); FILE MERGED
2008/03/28 16:29:54 rt 1.6.122.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:17:05 +00:00
Rüdiger Timm
c6865c6e05 INTEGRATION: CWS changefileheader (1.6.122); FILE MERGED
2008/04/01 15:02:33 thb 1.6.122.2: #i85898# Stripping all external header guards
2008/03/28 16:29:54 rt 1.6.122.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:16:48 +00:00
Rüdiger Timm
8942ed4a83 INTEGRATION: CWS changefileheader (1.4.170); FILE MERGED
2008/03/28 16:29:53 rt 1.4.170.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:15:52 +00:00
Rüdiger Timm
8ae2a0f1ae INTEGRATION: CWS changefileheader (1.5.100); FILE MERGED
2008/03/28 16:29:53 rt 1.5.100.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:15:35 +00:00
Rüdiger Timm
c788886c77 INTEGRATION: CWS changefileheader (1.7.158); FILE MERGED
2008/03/28 16:29:53 rt 1.7.158.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:15:16 +00:00
Rüdiger Timm
3ee88578d9 INTEGRATION: CWS changefileheader (1.3.170); FILE MERGED
2008/03/28 16:29:53 rt 1.3.170.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:14:55 +00:00
Rüdiger Timm
ac7bdc0905 INTEGRATION: CWS changefileheader (1.4.122); FILE MERGED
2008/03/28 16:29:53 rt 1.4.122.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:14:40 +00:00
Rüdiger Timm
34e93c4a72 INTEGRATION: CWS changefileheader (1.3.170); FILE MERGED
2008/03/28 16:29:52 rt 1.3.170.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:14:20 +00:00
Rüdiger Timm
2d0abc4262 INTEGRATION: CWS changefileheader (1.6.12); FILE MERGED
2008/03/28 16:29:52 rt 1.6.12.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:14:03 +00:00
Rüdiger Timm
776e3c73b8 INTEGRATION: CWS changefileheader (1.4.122); FILE MERGED
2008/03/28 16:29:52 rt 1.4.122.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:13:46 +00:00
Rüdiger Timm
2b70bdde0c INTEGRATION: CWS changefileheader (1.4.170); FILE MERGED
2008/03/28 16:29:52 rt 1.4.170.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:13:29 +00:00
Rüdiger Timm
75c86db7f4 INTEGRATION: CWS changefileheader (1.5.12); FILE MERGED
2008/03/28 16:29:52 rt 1.5.12.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:13:12 +00:00
Rüdiger Timm
d60d5a9db9 INTEGRATION: CWS changefileheader (1.3.170); FILE MERGED
2008/04/01 15:02:32 thb 1.3.170.2: #i85898# Stripping all external header guards
2008/03/28 16:29:52 rt 1.3.170.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:12:38 +00:00
Rüdiger Timm
933110cc80 INTEGRATION: CWS changefileheader (1.5.122); FILE MERGED
2008/04/01 15:02:32 thb 1.5.122.2: #i85898# Stripping all external header guards
2008/03/28 16:29:51 rt 1.5.122.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:12:20 +00:00
Rüdiger Timm
da439b5fde INTEGRATION: CWS changefileheader (1.15.170); FILE MERGED
2008/04/01 15:02:32 thb 1.15.170.3: #i85898# Stripping all external header guards
2008/04/01 10:49:06 thb 1.15.170.2: #i85898# Stripping all external header guards
2008/03/28 16:29:51 rt 1.15.170.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:12:00 +00:00
Rüdiger Timm
754d55a88e INTEGRATION: CWS changefileheader (1.2.94); FILE MERGED
2008/03/28 16:29:50 rt 1.2.94.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:11:42 +00:00
Oliver Bolte
a543460195 INTEGRATION: CWS ia64port01_DEV300 (1.5.116); FILE MERGED
2008/02/18 10:40:36 cmc 1.5.116.1: #i84999# follow sb's suggested pattern, stage 1, gcc3_linux_*
2008-02-27 08:47:22 +00:00
Oliver Bolte
eea6268c7c INTEGRATION: CWS ia64port01_DEV300 (1.4.104); FILE MERGED
2008/02/18 10:40:36 cmc 1.4.104.1: #i84999# follow sb's suggested pattern, stage 1, gcc3_linux_*
2008-02-27 08:47:08 +00:00
Kurt Zenker
97a800e1dc INTEGRATION: CWS pchfix04 (1.2.22); FILE MERGED
2006/12/13 16:21:39 hjs 1.2.22.3: #i71519# removed local headers
2006/11/27 17:24:33 kaib 1.2.22.2: #i71519# bridges working on msc
2006/11/27 13:07:23 mkretzschmar 1.2.22.1: #i71519# fill in bridges pch file. Builds fine on Mac OS X and Linux.
2007-05-10 14:13:42 +00:00
Rüdiger Timm
44cd9974a9 INTEGRATION: CWS ause060 (1.1.2); FILE ADDED
2006/09/22 17:58:41 hjs 1.1.2.1: #i69234# add required makefile
2006-10-30 07:14:29 +00:00
Oliver Bolte
c603507148 INTEGRATION: CWS pchfix02 (1.1.2); FILE ADDED
2006/09/01 17:17:27 kaib 1.1.2.1: #i68856# Added header markers and pch files
2006-09-16 14:42:06 +00:00
Ivo Hinkelmann
eb8343ead1 INTEGRATION: CWS sb56 (1.4.50); FILE MERGED
2006/07/07 08:58:57 sb 1.4.50.1: #i67105# Made code compile (warning-free) with debug=x.
2006-08-24 09:42:45 +00:00
Jens-Heiner Rechtien
917c71ccc6 INTEGRATION: CWS warnings01 (1.1.1.1.270); FILE MERGED
2005/09/22 18:08:16 sb 1.1.1.1.270.2: RESYNC: (1.1.1.1-1.2); FILE MERGED
2005/09/09 12:37:24 sb 1.1.1.1.270.1: #i53898# Made code warning-free.
2006-06-19 22:39:45 +00:00
Jens-Heiner Rechtien
4e4ace8282 INTEGRATION: CWS warnings01 (1.4.260); FILE MERGED
2005/09/22 18:08:07 sb 1.4.260.2: RESYNC: (1.4-1.5); FILE MERGED
2005/09/09 12:37:23 sb 1.4.260.1: #i53898# Made code warning-free.
2006-06-19 22:39:34 +00:00
Jens-Heiner Rechtien
cf067efdcd INTEGRATION: CWS warnings01 (1.4.242); FILE MERGED
2005/09/22 18:07:58 sb 1.4.242.2: RESYNC: (1.4-1.5); FILE MERGED
2005/09/09 12:37:23 sb 1.4.242.1: #i53898# Made code warning-free.
2006-06-19 22:39:21 +00:00
Jens-Heiner Rechtien
1ef4577e77 INTEGRATION: CWS warnings01 (1.1.1.1.270); FILE MERGED
2005/09/22 18:07:49 sb 1.1.1.1.270.2: RESYNC: (1.1.1.1-1.2); FILE MERGED
2005/09/09 12:37:23 sb 1.1.1.1.270.1: #i53898# Made code warning-free.
2006-06-19 22:39:10 +00:00
Jens-Heiner Rechtien
4edcce8e47 INTEGRATION: CWS warnings01 (1.1.1.1.270); FILE MERGED
2005/09/22 18:07:27 sb 1.1.1.1.270.2: RESYNC: (1.1.1.1-1.2); FILE MERGED
2005/09/09 12:37:22 sb 1.1.1.1.270.1: #i53898# Made code warning-free.
2006-06-19 22:38:47 +00:00
Jens-Heiner Rechtien
d02f65a0d1 INTEGRATION: CWS warnings01 (1.2.88); FILE MERGED
2005/09/22 18:06:29 sb 1.2.88.2: RESYNC: (1.2-1.3); FILE MERGED
2005/09/09 12:37:22 sb 1.2.88.1: #i53898# Made code warning-free.
2006-06-19 22:38:36 +00:00
Jens-Heiner Rechtien
96e4e6c967 INTEGRATION: CWS warnings01 (1.2.100); FILE MERGED
2005/09/22 18:05:35 sb 1.2.100.2: RESYNC: (1.2-1.3); FILE MERGED
2005/09/09 12:37:21 sb 1.2.100.1: #i53898# Made code warning-free.
2006-06-19 22:38:24 +00:00
Jens-Heiner Rechtien
f713752326 INTEGRATION: CWS warnings01 (1.2.100); FILE MERGED
2005/09/22 18:05:06 sb 1.2.100.2: RESYNC: (1.2-1.3); FILE MERGED
2005/09/09 12:37:19 sb 1.2.100.1: #i53898# Made code warning-free.
2006-06-19 22:38:14 +00:00
Jens-Heiner Rechtien
5f602cd501 INTEGRATION: CWS warnings01 (1.2.100); FILE MERGED
2005/09/22 18:04:56 sb 1.2.100.2: RESYNC: (1.2-1.3); FILE MERGED
2005/09/09 12:37:19 sb 1.2.100.1: #i53898# Made code warning-free.
2006-06-19 22:38:03 +00:00
Jens-Heiner Rechtien
1756efcc0c INTEGRATION: CWS warnings01 (1.4.4); FILE MERGED
2006/02/28 15:00:31 sb 1.4.4.1: #i53898# Made code waring-free.
2006-06-19 22:37:51 +00:00
Rüdiger Timm
478ffd7cb1 INTEGRATION: CWS mhu12 (1.4.38); FILE MERGED
2006/04/19 12:55:28 sb 1.4.38.1: #i47132# Adapted to new functionality from rtl/alloc.h to obtain executable memory for the raw vtable blocks (which contain code snippets together with the vtables).
2006-05-02 10:59:11 +00:00
Jens-Heiner Rechtien
48f3abc102 INTEGRATION: CWS pj43 (1.6.20); FILE MERGED
2005/12/06 08:46:20 kendy 1.6.20.1: #i57694#
sal_uInt32 -> sal_Size in memAlloc()
2005-12-28 16:32:03 +00:00