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

4 files changed, 48 insertions, 57 deletions

diff --git a/ure/prj/build.lst b/ure/prj/build.lst
index 07fbfc484201..7618bf3299b7 100644
--- a/ure/prj/build.lst
+++ b/ure/prj/build.lst
@@ -1,2 +1,2 @@
-ur ure : cli_ure solenv NULL
+ur ure : LIBXSLT:libxslt binaryurp cli_ure io javaunohelper remotebridges solenv stoc NULL
 ur ure\source nmake - all ur_source NULL
diff --git a/ure/prj/d.lst b/ure/prj/d.lst
index 23524c981608..22cfb161c19a 100644
--- a/ure/prj/d.lst
+++ b/ure/prj/d.lst
@@ -1,9 +1,11 @@
 mkdir: %_DEST%\bin%_EXT%\ure
-..\%__SRC%\bin\ure\README %_DEST%\bin%_EXT%\ure\README
-..\%__SRC%\bin\ure\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\ure\THIRDPARTYLICENSEREADME.html
-..\%__SRC%\bin\ure\jvmfwk3.ini %_DEST%\bin%_EXT%\ure\jvmfwk3.ini
-..\%__SRC%\bin\ure\jvmfwk3rc %_DEST%\bin%_EXT%\ure\jvmfwk3rc
-..\%__SRC%\bin\ure\startup.sh %_DEST%\bin%_EXT%\ure\startup.sh
-..\%__SRC%\bin\ure\uno.ini %_DEST%\bin%_EXT%\ure\uno.ini
-..\%__SRC%\bin\ure\unorc %_DEST%\bin%_EXT%\ure\unorc
+mkdir: %_DEST%\xml%_EXT%\ure
 ..\%__SRC%\bin\uretest.zip %COMMON_DEST%\bin%_EXT%\uretest.zip
+..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\ure\services.rdb
+..\source\README %_DEST%\bin%_EXT%\ure\README
+..\source\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\ure\THIRDPARTYLICENSEREADME.html
+..\source\jvmfwk3.ini %_DEST%\bin%_EXT%\ure\jvmfwk3.ini
+..\source\jvmfwk3rc %_DEST%\bin%_EXT%\ure\jvmfwk3rc
+..\source\startup.sh %_DEST%\bin%_EXT%\ure\startup.sh
+..\source\uno.ini %_DEST%\bin%_EXT%\ure\uno.ini
+..\source\unorc %_DEST%\bin%_EXT%\ure\unorc
diff --git a/ure/source/README b/ure/source/README
index 6e5162d8f058..fdf1c7e85d9b 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -63,8 +63,8 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/bin/regcomp.bin  [private]
 /opt/openoffice.org/ure/lib/unorc  [private]
 /opt/openoffice.org/ure/lib/libreg.so.3  [private]
-/opt/openoffice.org/ure/lib/librmcxt.so.3  [private]
 /opt/openoffice.org/ure/lib/libstore.so.3  [private]
+/opt/openoffice.org/ure/lib/libxmlreader.so  [private]
 /opt/openoffice.org/ure/lib/libjvmaccessgcc3.so.3  [private; Linux x86 only]
 /opt/openoffice.org/ure/lib/libjvmaccessC52.so.3  [private; Solaris only]
 /opt/openoffice.org/ure/lib/libjvmfwk.so.3  [private]
@@ -74,7 +74,6 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/lib/libgcc3_uno.so  [private; Linux x86 only]
 /opt/openoffice.org/ure/lib/libsunpro5_uno.so  [private; Solaris only]
 /opt/openoffice.org/ure/lib/libjava_uno.so  [private]
-/opt/openoffice.org/ure/lib/liburp_uno.so  [private]
 /opt/openoffice.org/ure/lib/libunsafe_uno_uno.so  [private]
 /opt/openoffice.org/ure/lib/libaffine_uno_uno.so  [private]
 /opt/openoffice.org/ure/lib/liblog_uno_uno.so  [private]
@@ -82,8 +81,8 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/lib/libjuh.so  [private]
 /opt/openoffice.org/ure/lib/libjuhx.so  [private]
 /opt/openoffice.org/ure/lib/acceptor.uno.so  [private]
+/opt/openoffice.org/ure/lib/binaryurp.uno.so  [private]
 /opt/openoffice.org/ure/lib/bootstrap.uno.so  [private]
-/opt/openoffice.org/ure/lib/bridgefac.uno.so  [private]
 /opt/openoffice.org/ure/lib/connector.uno.so  [private]
 /opt/openoffice.org/ure/lib/introspection.uno.so  [private]
 /opt/openoffice.org/ure/lib/invocadapt.uno.so  [private]
@@ -93,7 +92,6 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/lib/namingservice.uno.so  [private]
 /opt/openoffice.org/ure/lib/proxyfac.uno.so  [private]
 /opt/openoffice.org/ure/lib/reflection.uno.so  [private]
-/opt/openoffice.org/ure/lib/remotebridge.uno.so  [private]
 /opt/openoffice.org/ure/lib/streams.uno.so  [private]
 /opt/openoffice.org/ure/lib/textinstream.uno.so  [private]
 /opt/openoffice.org/ure/lib/textoutstream.uno.so  [private]
@@ -126,8 +124,8 @@ Program Files\URE\misc\services.rdb
 Program Files\URE\bin\libxml2.dll  [external]
 Program Files\URE\bin\uno.ini  [private]
 Program Files\URE\bin\reg3.dll  [private]
-Program Files\URE\bin\rmcxt3.dll  [private]
 Program Files\URE\bin\store3.dll  [private]
+Program Files\URE\bin\xmlreader.dll  [private]
 Program Files\URE\bin\jvmaccess3MSC.dll  [private]
 Program Files\URE\bin\jvmfwk3.dll  [private]
 Program Files\URE\bin\sunjavaplugin.dll  [private]
@@ -136,7 +134,6 @@ Program Files\URE\bin\jvmfwk3.ini  [private]
 Program Files\URE\bin\msci_uno.dll  [private]
 Program Files\URE\bin\java_uno.dll  [private]
 Program Files\URE\bin\cli_uno.dll [private]
-Program Files\URE\bin\urp_uno.dll  [private]
 Program Files\URE\bin\unsafe_uno_uno.dll  [private]
 Program Files\URE\bin\affine_uno_uno.dll  [private]
 Program Files\URE\bin\log_uno_uno.dll  [private]
@@ -145,8 +142,8 @@ Program Files\URE\bin\jpipx.dll  [private]
 Program Files\URE\bin\juh.dll  [private]
 Program Files\URE\bin\juhx.dll  [private]
 Program Files\URE\bin\acceptor.uno.dll  [private]
+Program Files\URE\bin\binaryurp.uno.dll  [private]
 Program Files\URE\bin\bootstrap.uno.dll  [private]
-Program Files\URE\bin\bridgefac.uno.dll  [private]
 Program Files\URE\bin\connector.uno.dll  [private]
 Program Files\URE\bin\introspection.uno.dll  [private]
 Program Files\URE\bin\invocadapt.uno.dll  [private]
@@ -156,7 +153,6 @@ Program Files\URE\bin\javavm.uno.dll  [private]
 Program Files\URE\bin\namingservice.uno.dll  [private]
 Program Files\URE\bin\proxyfac.uno.dll  [private]
 Program Files\URE\bin\reflection.uno.dll  [private]
-Program Files\URE\bin\remotebridge.uno.dll  [private]
 Program Files\URE\bin\streams.uno.dll  [private]
 Program Files\URE\bin\textinstream.uno.dll  [private]
 Program Files\URE\bin\textoutstream.uno.dll  [private]
diff --git a/ure/source/makefile.mk b/ure/source/makefile.mk
index a1728b2773b4..bdd43656b32c 100644
--- a/ure/source/makefile.mk
+++ b/ure/source/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -25,52 +25,45 @@
 #
 #*************************************************************************
 
-PRJ := ..
-PRJNAME := ure
-TARGET := $(PRJNAME)
-
-.INCLUDE: settings.mk
-
-.IF "$(OS)" == "WNT" || "$(OS)" == "OS2"
-MY_RC = .ini
-.ELSE
-MY_RC = rc
-.ENDIF
+PRJ = ..
+PRJNAME = ure
+TARGET = source
 
 ZIP1TARGET = uretest
 ZIP1FLAGS = -r
 ZIP1LIST = uretest
 
-.INCLUDE: target.mk
-
-ALLTAR: \
-    $(BIN)$/ure$/README \
-    $(BIN)$/ure$/THIRDPARTYLICENSEREADME.html \
-    $(BIN)$/ure$/jvmfwk3$(MY_RC) \
-    $(BIN)$/ure$/uno$(MY_RC)
+my_components = \
+    acceptor \
+    binaryurp \
+    bootstrap \
+    connector \
+    introspection \
+    invocadapt \
+    invocation \
+    javaloader \
+    javavm \
+    juh \
+    namingservice \
+    proxyfac \
+    reflection \
+    stocservices \
+    streams \
+    textinstream \
+    textoutstream \
+    uuresolver
 
-$(BIN)$/ure$/README: README
-    -$(MKDIR) $(@:d)
-    $(COPY) $< $@
-
-$(BIN)$/ure$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
-    - $(MKDIR) $(@:d)
-    $(COPY) $< $@
-
-$(BIN)$/ure$/jvmfwk3$(MY_RC): jvmfwk3$(MY_RC)
-    -$(MKDIR) $(@:d)
-    $(COPY) $< $@
-
-$(BIN)$/ure$/uno$(MY_RC): uno$(MY_RC)
-    -$(MKDIR) $(@:d)
-    $(COPY) $< $@
-
-.IF "$(OS)" != "WNT"
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
 
-ALLTAR: $(BIN)$/ure$/startup.sh
+ALLTAR : $(MISC)/services.rdb
 
-$(BIN)$/ure$/startup.sh: startup.sh
-    -$(MKDIR) $(@:d)
-    $(COPY) $< $@
+$(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component")
+    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+        $(SOLARENV)/bin/packcomponents.xslt $(MISC)/services.input
 
-.ENDIF
+$(MISC)/services.input :
+    echo \
+        '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
+        > $@