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

3 files changed, 4 insertions, 352 deletions

diff --git a/cpputools/source/regcomplazy/makefile.mk b/cpputools/source/regcomplazy/makefile.mk
deleted file mode 100755
index 0a4fe8477..000000000
--- a/cpputools/source/regcomplazy/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# 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
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=cpputools
-TARGET=regcomplazy
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-DEPOBJFILES= \
-    $(OBJ)$/regcomplazy.obj 
-
-APP1TARGET=$(TARGET)
-APP1OBJS=$(DEPOBJFILES)  
-
-APP1STDLIBS= \
-    $(SALLIB) \
-    $(SALHELPERLIB) \
-    $(REGLIB)
-
-.INCLUDE :  target.mk
-
diff --git a/cpputools/source/regcomplazy/regcomplazy.cxx b/cpputools/source/regcomplazy/regcomplazy.cxx
deleted file mode 100644
index fec0f6a8e..000000000
--- a/cpputools/source/regcomplazy/regcomplazy.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <stdio.h>
-
-#include "sal/main.h"
-#include <osl/diagnose.h>
-#include <osl/thread.h>
-#include <osl/file.hxx>
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
-
-#include <vector>
-
-#include <registry/registry.hxx>
-
-
-#define OSToOUS(x) ::rtl::OStringToOUString(x, osl_getThreadTextEncoding()) 
-#define OUSToOS(x) ::rtl::OUStringToOString(x, osl_getThreadTextEncoding()) 
-using namespace ::rtl;
-
-typedef ::std::vector< ::rtl::OString > OSVector;
-
-struct CompDescriptor {    
-    OString sImplementationName;
-    OString sComponentName;
-    OString sLoaderName;
-    OSVector vSupportedServices;
-};
-
-typedef ::std::vector< CompDescriptor > CDescrVector;
-
-static void print_options() SAL_THROW( () )
-{
-    printf(
-        "\nusage: regcomplazy [-v]registry_file cmp_descr_file ...\n\n"
-        "Register a cmponent using a comp description file.\n"
-        "Option -v prints verbose output on stdout.\n" );
-}
-
-static bool checkImplValue(RegistryValueList<sal_Char*>* pValueList, OString sImplName) {
-    for (sal_uInt32 i=0; i < pValueList->getLength(); i++) {
-        if (sImplName.equals(pValueList->getElement(i)))
-            return true;
-    }
-
-    return false;
-}
-
-//==================================================================================================
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-{
-    if (argc < 3)
-    {
-        print_options();
-        return 1;
-    }
-
-    bool bVerbose = false;
-    int nPos = 1;
-    if ('-' == argv[ nPos ][ 0 ] && 'v' == argv[ nPos ][ 1 ])
-    {
-        if ('\0' != argv[ nPos ][ 2 ])
-        {
-            print_options();
-            return 1;
-        }
-        bVerbose = true;
-        ++nPos;
-    }
-
-    OUString sys_path( ::rtl::OUString::createFromAscii( argv[ nPos ] ) );
-    OUString reg_url;
-    oslFileError rc = osl_getFileURLFromSystemPath( sys_path.pData, &reg_url.pData );
-    if (osl_File_E_None != rc)
-    {
-        if (bVerbose)
-            fprintf( stderr, "\nERROR: cannot make file url out of %s\n", argv[nPos]);
-        return 1;
-    }
-
-    FILE* fDescr = fopen(argv[ ++nPos ], "r");
-    OStringBuffer sBuffer(512);
-
-    if ( fDescr) {
-        size_t totalSize = 0;
-        size_t readSize  = 0;
-        char   pBuffer[513];
-        
-        while ( !feof(fDescr) )            
-        {
-            if ( (readSize = fread(pBuffer, 1, 512, fDescr)) > 0
-                 && !ferror(fDescr) ) {
-                totalSize += readSize;
-                if (totalSize >= 512)
-                    sBuffer.ensureCapacity(totalSize * 2);
-
-                sBuffer.append(pBuffer, readSize);
-            }            
-        }
-    fclose(fDescr);
-    fDescr = 0; // just to be sure noone tries to use the file ever after
-    }
-    
-    OString sDescr = sBuffer.makeStringAndClear();
-    sal_Int32 nTokenIndex = 0;
-
-    CDescrVector vDescr;
-    CompDescriptor descr;
-    bool bFirst = true;
-    
-    do {
-        OString sTmp = sDescr.getToken(0, '\x0A', nTokenIndex);
-        OString sToken(sTmp);
-        if (sTmp.pData->buffer[sTmp.getLength()-1] == '\x0D')
-            sToken = sTmp.copy(0, sTmp.getLength()-1);
-        if ( sToken.indexOf("[ComponentDescriptor]") >= 0) {
-            if (bFirst)
-                bFirst = false;
-            else
-                vDescr.push_back(descr);
-
-            descr = CompDescriptor();
-        }
-        else if ( sToken.indexOf("ImplementationName=") >= 0) {
-            descr.sImplementationName = sToken.copy(19);
-        }
-        else if ( sToken.indexOf("ComponentName=") >= 0) {
-            descr.sComponentName = sToken.copy(14);
-        }
-        else if ( sToken.indexOf("LoaderName=") >= 0) {
-            descr.sLoaderName = sToken.copy(11);
-        }
-        else if ( (sToken.indexOf("[SupportedServices]") < 0) &&
-                  (sToken.getLength() > 0) &&
-                  (sToken.pData->buffer[0] != '[') ) {
-            descr.vSupportedServices.push_back(sToken);
-        }      
-    } while (nTokenIndex >= 0 );
-    // insert the last descriptor
-    vDescr.push_back(descr);
-
-    Registry *pReg = new Registry;
-    
-    RegistryKey rootKey, key, subKey, serviceKey;
-    
-    if (pReg->open(reg_url, REG_READWRITE))
-    {
-        if (pReg->create(reg_url))
-        {
-            if (bVerbose)
-                fprintf(stderr, "ERROR: open registry \"%s\" failed\n", argv[1]);
-            return 1;
-        }
-    }
-    if (pReg->openRootKey(rootKey)) {
-        if (bVerbose)
-            fprintf(stderr, "ERROR: open root key failed\n");
-        return 1;
-    }
-
-    CDescrVector::const_iterator comp_iter = vDescr.begin();
-    do {  
-        OString sImplName = (*comp_iter).sImplementationName;
-        OUStringBuffer sbImpl;
-        sbImpl.appendAscii("/IMPLEMENTATIONS/");
-        sbImpl.append(OSToOUS(sImplName));
-        OUString sImplKeyName = sbImpl.makeStringAndClear();
-
-        if (rootKey.openKey(sImplKeyName, key) == REG_NO_ERROR) {
-            if (bVerbose) {
-               fprintf(stderr, "WARNING: implementation entry for \"%s\" already exists, existing entries are overwritten\n", sImplName.getStr());
-            }
-        } else {
-            if (rootKey.createKey(sImplKeyName, key)) {
-                if (bVerbose) {
-                    fprintf(stderr, "ERROR: can't create new implementation entry \"%s\".\n", sImplName.getStr());
-                }
-                return 1;
-            }
-        }
-        
-        OString sLoaderName = (*comp_iter).sLoaderName;
-        OUString usKeyName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/ACTIVATOR")));
-        key.createKey(usKeyName, subKey);
-        subKey.setValue(OUString(), RG_VALUETYPE_STRING,
-                        (sal_Char*)sLoaderName.getStr(), sLoaderName.getLength()+1);
-        
-        OString sCompName = (*comp_iter).sComponentName;
-        usKeyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/LOCATION"));
-        key.createKey(usKeyName, subKey);
-        subKey.setValue(OUString(), RG_VALUETYPE_STRING,
-                        (sal_Char*)sCompName.getStr(), sCompName.getLength()+1);
-        
-        usKeyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/SERVICES"));
-        key.createKey(usKeyName, subKey);
-        
-        rootKey.createKey(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/SERVICES")), serviceKey);
-        
-        OSVector::const_iterator serv_iter = ((*comp_iter).vSupportedServices).begin();
-        OUString usServiceKeyName;
-        do {            
-            usServiceKeyName = OSToOUS(*serv_iter);
-            // write service key in impl section
-            subKey.createKey(usServiceKeyName, key);
-            
-            if (serviceKey.openKey(usServiceKeyName, key) == REG_NO_ERROR) {
-                RegistryValueList<sal_Char*> valueList;
-                serviceKey.getStringListValue(usServiceKeyName, valueList);
-                if ( checkImplValue(&valueList, sImplName) ) {
-                    serv_iter++;
-                    continue;
-                }
-
-                sal_uInt32 nServices = valueList.getLength()+1;
-                sal_Char** pImplList = (sal_Char**)rtl_allocateZeroMemory(
-                    nServices * sizeof(sal_Char*));
-                pImplList[0] = (sal_Char*)rtl_allocateZeroMemory(
-                    sImplName.getLength()+1 * sizeof(sal_Char));
-                rtl_copyMemory(pImplList[0], (sal_Char*)sImplName.getStr(),
-                               sImplName.getLength()+1);
-                for (sal_uInt32 i=0; i < valueList.getLength(); i++) {
-                    pImplList[i+1]=valueList.getElement(i);
-                }
-                key.setStringListValue(OUString(), pImplList, nServices);
-
-                // free memory
-                rtl_freeMemory(pImplList[0]);
-                rtl_freeMemory(pImplList);
-                
-            } else {
-                serviceKey.createKey(usServiceKeyName, key);
-                
-                sal_Char* pImplList[1];
-                pImplList[0] = (sal_Char*)rtl_allocateZeroMemory(
-                    sImplName.getLength()+1 * sizeof(sal_Char));
-                rtl_copyMemory(pImplList[0], (sal_Char*)sImplName.getStr(),
-                               sImplName.getLength()+1);
-                key.setStringListValue(OUString(), pImplList, 1);
-                
-                // free memory
-                rtl_freeMemory(pImplList[0]);
-            }          
-            serv_iter++;
-        } while (serv_iter != (*comp_iter).vSupportedServices.end());
-        
-        comp_iter++;
-    } while (comp_iter != vDescr.end());
-        
-    key.closeKey();
-    subKey.closeKey();
-    serviceKey.closeKey();
-    rootKey.closeKey();
-    pReg->close();
-    delete pReg;
-    
-    return 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 32aaa3eb0..7b1f4d3b1 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -280,23 +280,14 @@ void createInstance(
                         OUString( RTL_CONSTASCII_USTRINGPARAM(
                                       "com.sun.star.comp.io.Connector") ),
                         xSF, Reference< XRegistryKey >() ) ) );
-                    // iiop bridge
-                    xSet->insert( makeAny( loadSharedLibComponentFactory(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                      "remotebridge.uno" SAL_DLLEXTENSION) ),
-                        OUString(),
-                        OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                      "com.sun.star.comp.remotebridges."
-                                      "Bridge.various") ),
-                        xSF, Reference< XRegistryKey >() ) ) );
                     // bridge factory
                     xSet->insert( makeAny( loadSharedLibComponentFactory(
                         OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                      "bridgefac.uno" SAL_DLLEXTENSION) ),
+                                      "binaryurp.uno" SAL_DLLEXTENSION) ),
                         OUString(),
-                        OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                      "com.sun.star.comp.remotebridges."
-                                      "BridgeFactory") ),
+                        OUString(
+                            RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.comp.bridge.BridgeFactory") ),
                         xSF, Reference< XRegistryKey >() ) ) );
                 }
                 s_bSet = sal_True;