Commit graph

16 commits

Author SHA1 Message Date
Tor Lillqvist
d2f90dc4d1 It's <windows.h>, not <Windows.h> 2011-06-21 00:02:11 +03: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
Hans-Joachim Lankenau
b57987d3d0 ause128: #i115964# create .jnilib file on request when linking; deliver .jnilib files instead of deliver magic 2010-12-07 19:13:10 +01:00
Caolán McNamara
da5cef0ab4 add modelines to .h and .c files as well 2010-10-27 16:04:46 +01:00
sb
462d351e9d sb120: #i110944# jpipe.dll wrapper around jpipx.dll 2010-04-16 16:24:56 +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
Rüdiger Timm
80e5d3c984 INTEGRATION: CWS changefileheader (1.7.46); FILE MERGED
2008/03/31 07:24:27 rt 1.7.46.1: #i87441# Change license header to LPGL v3.
2008-04-11 10:30:07 +00:00
Vladimir Glazounov
f1c94f5037 INTEGRATION: CWS sb71 (1.3.132); FILE MERGED
2007/07/18 14:24:38 sb 1.3.132.2: RESYNC: (1.3-1.4); FILE MERGED
2007/06/14 15:05:34 sb 1.3.132.1: #i75466# Adapted to new APP|SHLnRPATH.
2007-10-15 12:13:38 +00:00
Jens-Heiner Rechtien
cdf570fc4a INTEGRATION: CWS ause081 (1.3.134); FILE MERGED
2007/06/22 12:30:38 hjs 1.3.134.1: #i78393# remove now obsolete setting to avoid description
2007-06-26 16:58:58 +00:00
Jens-Heiner Rechtien
d9a7894220 INTEGRATION: CWS warnings01 (1.5.22); FILE MERGED
2005/11/28 09:05:52 sb 1.5.22.6: #i53898# Made code warning-free.
2005/11/09 08:26:46 sb 1.5.22.5: #i53898# Made code warning-free; fixed error introduced in 1.5.
2005/09/23 02:38:00 sb 1.5.22.4: RESYNC: (1.5-1.6); FILE MERGED
2005/09/07 15:02:56 sb 1.5.22.3: #i53898# Made code warning-free.
2005/09/06 11:48:29 sb 1.5.22.2: #i53898# Fixed use of SAL_INT_CAST to cast between pointer and integer types.
2005/09/01 08:21:33 sb 1.5.22.1: #i53898# Made code warning-free.
2006-06-19 20:53:50 +00:00
Rüdiger Timm
a04fb6c3f6 INTEGRATION: CWS ooo19126 (1.5.20); FILE MERGED
2005/09/05 15:18:43 rt 1.5.20.1: #i54170# Change license header: remove SISSL
2005-09-07 18:08:32 +00:00
Oliver Bolte
e5f90521eb INTEGRATION: CWS fwkfinal8 (1.4.48); FILE MERGED
2005/04/05 14:31:39 jl 1.4.48.1: #i46616# Before a JNI exception is thrown we make sure that ExceptionClear is called
2005-04-18 11:16:20 +00:00
Kurt Zenker
9712dee698 INTEGRATION: CWS kso11 (1.3.8); FILE MERGED
2004/03/10 15:45:29 kso 1.3.8.1: #115883# - Use osl Security when creating pipes.
2004-03-25 10:04:12 +00:00
Jens-Heiner Rechtien
534c8ca1eb INTEGRATION: CWS ooo20031216 (1.2.66); FILE MERGED
2003/12/25 12:47:01 waratah 1.2.66.1: #i1858# correct for some uninitialised variables
2004-02-04 11:14:32 +00:00
Vladimir Glazounov
6519b70ffe INTEGRATION: CWS geordi2q11 (1.2.72); FILE MERGED
2003/12/16 12:48:17 hr 1.2.72.1: #111934#: join CWS ooo111fix1
2003-12-17 19:36:09 +00:00
Jens-Heiner Rechtien
44bf5dacd7 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-26 11:41:32 +00:00