Commit Graph

904 Commits

Author SHA1 Message Date
4be7cca60b Merge commit 'ooo/DEV300_m103'
Conflicts:
	codemaker/source/bonobowrappermaker/corbaoptions.cxx
	codemaker/source/cppumaker/cppuoptions.cxx
	codemaker/source/cunomaker/cunooptions.cxx
	codemaker/source/idlmaker/idloptions.cxx
	codemaker/source/javamaker/javaoptions.cxx
	cppu/source/typelib/typelib.cxx
	idlc/source/options.cxx
	offapi/com/sun/star/util/PathSubstitution.idl
	offapi/drafts/com/sun/star/form/ListEntryEvent.idl
	offapi/drafts/com/sun/star/form/XBindableValue.idl
	offapi/drafts/com/sun/star/form/XListEntryListener.idl
	offapi/drafts/com/sun/star/form/XListEntrySink.idl
	offapi/drafts/com/sun/star/form/XListEntrySource.idl
	offapi/drafts/com/sun/star/form/XValueBinding.idl
	registry/tools/checksingleton.cxx
	registry/tools/options.hxx
	registry/tools/regcompare.cxx
	registry/tools/regmerge.cxx
	sal/cppunittester/cppunittester.cxx
	sal/osl/unx/socket.c
	sal/osl/w32/diagnose.c
	sal/prj/d.lst
	sal/rtl/source/alloc_fini.cxx
	sal/rtl/source/alloc_global.c
	sal/rtl/source/makefile.mk
2011-03-23 16:59:59 +01:00
5a7f6793ac Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...) 2011-03-19 14:12:37 +01:00
1fa55878d9 restore cppunit test, Sequence ctor from sal_Int32 is now explicit 2011-03-18 21:49:26 +00:00
88d7b9b03f Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/ure
Conflicts:
	sal/qa/rtl/math/rtl_math.cxx
	sal/qa/rtl/math/test_rtl_math.cxx
2011-03-18 16:13:58 +01:00
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
a4632bb6a2 only test this on certain archs 2011-03-18 13:37:29 +00:00
16d941cb03 Add PowerPC to the right branch 2011-03-18 14:30:33 +01:00
a02aae1d24 fix build error with better depend 2011-03-15 16:53:37 +00:00
7176db7752 Use format string on OSL_TRACE() 2011-03-15 16:55:52 +01:00
71dee2f153 move cppumaker test to cppu 2011-03-15 13:41:19 +00:00
b6e36a7fa9 Use explicitly cast zeros to avoid compilation error with MSVC2010
Could also use nullptr, is it supported by all compiler versions we use?
2011-03-14 12:20:35 +02:00
adc6fe00e3 Move OSL_ENSURE(0,...) to OSL_FAIL(...) 2011-03-12 14:19:48 +01:00
6488e5f120 Move OSL_ENSURE(false,...) to OSL_FAIL(...) 2011-03-12 14:19:48 +01:00
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
933e22880b Remove "using namespace ::rtl" 2011-03-02 21:53:12 +01:00
5f66037d6d remove empty TESTSHL2LIB 2011-02-24 20:44:46 +00:00
4dcc14fa7e debuglevels: merged to-be-m101 2011-02-23 09:58:44 +01:00
fb4f853ff6 debuglevels: removed yet another useless (aka: nearly-always-firing) assertion 2011-02-21 12:45:48 +01:00
60e454d12b debuglevels: removed useless assertions
Those assertions were dependent on OSL_DEBUG_LEVEL > 1 (i.e. only existent with "dmake=1"), and then always
fired. Which fulfills the definition of "useless", /me thinks.
2011-02-21 11:15:06 +01:00
f091f5b395 dragonfly stuff 2011-02-15 15:55:19 +00:00
81ef04be69 Trying to remove the stlport mention from the code 2011-02-09 19:58:43 +01:00
30a8393e50 Removing the ext_std masterpiece 2011-02-09 19:58:43 +01:00
259c35955a don't crash trying to erase one past end 2011-02-06 11:49:10 +01:00
93c5442bd2 Revert "revert this change for now as its triggering a crash in saxparser"
This reverts commit b73cf2b1ef3892b4c200c05fd617bfd099aceee5.
2011-02-06 11:47:56 +01:00
1d6bdb8380 revert this change for now as its triggering a crash in saxparser 2011-02-04 19:50:27 +00:00
4724f82bf2 move module cppu to boost unordered containers 2011-02-03 23:39:38 +01:00
31ca64f91e Remove double line spacing and correct indentation 2011-01-29 15:39:11 +01:00
8c2cd1675f WaE: gcc 4.6.0 various warnings 2011-01-24 10:55:39 +00:00
48252aada0 If CPPU_LEAK_STATIC_DATA is defined, don't bother with assertions
Re-introduce the possibility to define CPPU_LEAK_STATIC_DATA. This
time use it to bypass just the assertions that check that the type
description counts really are zero at the end of the
TypeDescriptor_Init_Impl destructor.

Add more informative debugging printout of which counts are non-zero.

Define CPPU_LEAK_STATIC_DATA for x64 Windows for now. But we do get
the same assertions also on x86 Windows if cppu is built with
OSL_DEBUG_LEVEL>1.
2011-01-23 01:05:45 +02:00
989bbfb350 Remove pointless debugging output
We do print out a message if struct size verifications fail. That is
enough. No point in printing out the same

> sizeof(AlignSize_Impl) = 16
> sizeof(M) = 8
> sizeof(N) = 12

etc messages every time a cppu-using program is run and cppu has been
built for debugging.
2011-01-23 00:55:20 +02:00
3e3482dc6e Use separate .map files for 64-bit MSVC build
Unfortunately the C++ name mangling in a 64-bit MSVC compilation is
slightly different from that in a 32-bit one:

-- An 'E' is inserted for pointers to indicate that they are 64
bits. I don't fully understand the rationale for this; isn't that the
only kind of pointer in 64-bit code produced by a C++ compiler anyway?

-- As there is only one calling convention on x64 Windows, __cdecl,
the indications for other calling conventions (here, especially
__thiscall) change to that for __cdecl.

It should be possible to write a tool to at least partially automate
conversion of 32-bit mangled names to 64-bit ones, and thus make it
easy to create mscx map files from the corresponding msci ones in
LibreOffice. Sure, it probably wouldn't work 100% correctly in all
cases, but it would help a lot.
2011-01-16 23:31:10 +02:00
d1d16c48ff fix break on parallel build 2011-01-15 18:10:49 +01:00
eba7563505 cppunit: enable these tests 2011-01-14 15:44:26 +00:00
387b321092 cppunit: port these tests over to canonical cppunit 2011-01-14 15:36:53 +00:00
39b67dcf71 add an explicit 2011-01-13 08:59:22 +00:00
6ca25e8192 Some cppcheck cleaning 2011-01-12 13:12:22 +00:00
sb
d06639e31c sb139: merged in DEV300_m97 2011-01-11 15:23:26 +01:00
sb
17be18e8a5 sb139: #i103789# various OSL_DEBUG_LEVEL>1 problems in uno/data.cxx 2011-01-10 14:57:31 +01:00
865df52045 dr77: rebase to DEV300m96 2010-12-27 12:33:29 +01:00
c7e4a291ec suppress compiler warning 2010-12-23 11:21:14 +01:00
c1d5abdc81 Handle NetBSD like the other BSDs in more cases. 2010-12-16 22:39:28 +01:00
36e2296bf8 Replace all occured, occurance etc. 2010-12-06 09:16:29 +00:00
1b11499074 Remove redundant comments 2010-12-05 20:28:21 +00:00
751c750a8c cppcheck: use prefix variant 2010-11-26 21:38:32 +00:00
f12505d596 Revert "Add workaround to avoid crash when exiting LibreOffice"
This reverts commit 146e2fbca20f5cba3410d3d042ae6222a565dd7e.

The workaround is has to be present in libreoffice-3-3, but we do not want to
have it in master, so that eventually it is fixed in the end :-)
2010-11-12 16:21:07 +01:00
8e7f25848a Add workaround to avoid crash when exiting LibreOffice
Reintroduce the horrible CPPU_LEAK_STATIC_DATA hack used in OOo 3.2.1,
but only for Windows builds. No idea what causes the crash. See
fdo#31494. Don't know if this hack has some bad consequences then,
i#107490 seems to say so.
2010-11-10 18:40:38 +02:00
4584f69f0d dr77: rebase to DEV300m92 2010-11-09 15:15:30 +01:00
30a34fcf31 Patches for ure, neeed by OpenBSD
Adds the necessary distinctions in the system abstraction layers.
2010-11-08 12:32:28 +01:00
c8540f0850 can undo this now with dial-down in solenv
(cherry picked from commit 23b34d1adafa71612f093d6b5aa015f307785a3f)
2010-11-05 16:18:38 +00:00
b7f08e5afe Workaround for the registration breakage on SUSE.
Commit 55c3066e52ad1843549c442e8d74f886507c58f4 seems to break the SUSE boxes,
this is a workaround for that.
2010-11-03 12:19:34 +01:00