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

1 files changed, 0 insertions, 345 deletions

diff --git a/bridges/source/remote/urp/urp_marshal.hxx b/bridges/source/remote/urp/urp_marshal.hxx
deleted file mode 100644
index 60292cd23612..000000000000
--- a/bridges/source/remote/urp/urp_marshal.hxx
+++ /dev/null
@@ -1,345 +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.
- *
- ************************************************************************/
-#ifndef _URP_MARSHAL_HXX_
-#define _URP_MARSHAL_HXX_
-#include <rtl/ustrbuf.hxx>
-#include <rtl/byteseq.hxx>
-#include <com/sun/star/uno/Type.hxx>
-#include "urp_bridgeimpl.hxx"
-#include "urp_marshal_decl.hxx"
-
-#include <string.h>
-
-struct remote_Interface;
-
-namespace bridges_urp
-{
-    // methods for accessing marshaling buffer
-    inline void Marshal::finish( sal_Int32 nMessageCount )
-    {
-        sal_Int32 nSize = getSize() - 2*sizeof( sal_Int32 );
-
-        // save the state
-        sal_Int8 *pos = m_pos;
-        m_pos = m_base;
-        packInt32( &nSize );
-        packInt32( &nMessageCount );
-
-        // reset the state
-        m_pos = pos;
-    }
-
-    inline void Marshal::restart()
-    {
-        m_pos = m_base + 2*sizeof( sal_Int32 );
-    }
-
-    inline sal_Int8 *Marshal::getBuffer()
-    {
-        return m_base;
-    }
-
-    inline sal_Bool Marshal::empty() const
-    {
-        return ( m_pos - m_base ) == 2*sizeof( sal_Int32 );
-    }
-
-    inline sal_Int32 Marshal::getSize() const
-    {
-        return ((sal_Int32) (m_pos - m_base));
-    }
-
-    inline void Marshal::ensureAdditionalMem( sal_Int32 nMemToAdd )
-    {
-        sal_Int32 nDiff = m_pos - m_base;
-        if( nDiff + nMemToAdd > m_nBufferSize )
-        {
-            m_nBufferSize = m_nBufferSize * 2 > nDiff + nMemToAdd ?
-                m_nBufferSize* 2 :
-                nDiff + nMemToAdd;
-
-            m_base = ( sal_Int8 * ) rtl_reallocateMemory( m_base , m_nBufferSize );
-            m_pos = m_base + nDiff;
-        }
-    }
-
-    // marshaling methods
-    inline void Marshal::packInt8( void *pSource )
-    {
-        ensureAdditionalMem( 1 );
-        *m_pos = *((sal_Int8*) pSource );
-        m_pos++;
-    }
-
-    inline void Marshal::packInt16( void *pSource )
-    {
-        ensureAdditionalMem( 2 );
-        if( isSystemLittleEndian() )
-        {
-            m_pos[0] = ((unsigned char *)pSource)[1];
-            m_pos[1] = ((unsigned char *)pSource)[0];
-        }
-        else
-        {
-            m_pos[1] = ((unsigned char *)pSource)[1];
-            m_pos[0] = ((unsigned char *)pSource)[0];
-        }
-        m_pos +=2;
-    }
-
-    inline void Marshal::packByteSequence( sal_Int8 *pData , sal_Int32 nLength )
-    {
-        packCompressedSize( nLength );
-
-        ensureAdditionalMem( nLength );
-        memcpy( m_pos , pData , nLength );
-        m_pos += nLength;
-    }
-
-    inline void Marshal::packString( void *pSource )
-    {
-        rtl_uString *p = *( rtl_uString ** ) pSource;
-
-        // to be optimized !
-        // static buffer in marshal
-        ::rtl::OString o = ::rtl::OUStringToOString( p , RTL_TEXTENCODING_UTF8 );
-        sal_Int32 nLength = o.pData->length;
-        packCompressedSize( nLength );
-
-        ensureAdditionalMem( nLength );
-
-        memcpy( m_pos , o.pData->buffer , nLength  );
-        m_pos += nLength;
-    }
-
-    inline sal_Bool Marshal::packAny( void *pSource )
-    {
-        sal_Bool bSuccess = sal_True;
-        uno_Any *pAny = (uno_Any * ) pSource;
-
-        // pack the type
-        packType( &( pAny->pType ) );
-        // pack the value
-        typelib_TypeDescription *pType = 0;
-        TYPELIB_DANGER_GET( &pType, pAny->pType );
-        if( pType )
-        {
-            pack( pAny->pData , pType );
-            TYPELIB_DANGER_RELEASE( pType );
-        }
-        else
-        {
-            rtl::OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("couldn't get typedescription for type " ) );
-            buf.append( pAny->pType->pTypeName );
-            m_pBridgeImpl->addError( buf.makeStringAndClear() );
-            bSuccess = sal_False;
-        }
-        return bSuccess;
-    }
-
-    inline void Marshal::packInt32( void *pSource )
-    {
-        ensureAdditionalMem( 4 );
-        if( isSystemLittleEndian() )
-        {
-            m_pos[0] = ((unsigned char *)pSource)[3];
-            m_pos[1] = ((unsigned char *)pSource)[2];
-            m_pos[2] = ((unsigned char *)pSource)[1];
-            m_pos[3] = ((unsigned char *)pSource)[0];
-        }
-        else {
-            m_pos[3] = ((unsigned char *)pSource)[3];
-            m_pos[2] = ((unsigned char *)pSource)[2];
-            m_pos[1] = ((unsigned char *)pSource)[1];
-            m_pos[0] = ((unsigned char *)pSource)[0];
-        }
-        m_pos +=4;
-    }
-
-    inline void Marshal::packCompressedSize( sal_Int32 nSize )
-    {
-        ensureAdditionalMem( 5 );
-
-        if( nSize < 0xff )
-        {
-            *((sal_uInt8*)m_pos) = (sal_uInt8) nSize;
-            m_pos ++;
-        }
-        else
-        {
-            *((sal_uInt8*)m_pos) = 0xff;
-            m_pos ++;
-            packInt32( &nSize );
-        }
-    }
-
-    inline sal_Bool Marshal::pack( void *pSource , typelib_TypeDescription *pType )
-    {
-        sal_Bool bSuccess = sal_True;
-        switch( pType->eTypeClass )
-        {
-        case typelib_TypeClass_BYTE:
-        {
-            packInt8( pSource );
-            break;
-        }
-        case typelib_TypeClass_BOOLEAN:
-        {
-            ensureAdditionalMem( 1 );
-            *m_pos = ( *((sal_Bool*) pSource ) ) ? 1 : 0;
-            m_pos++;
-            break;
-        }
-
-        case typelib_TypeClass_CHAR:
-        case typelib_TypeClass_SHORT:
-        case typelib_TypeClass_UNSIGNED_SHORT:
-        {
-            packInt16( pSource );
-            break;
-        }
-        case typelib_TypeClass_ENUM:
-        case typelib_TypeClass_LONG:
-        case typelib_TypeClass_UNSIGNED_LONG:
-        case typelib_TypeClass_FLOAT:
-        {
-            packInt32( pSource );
-            break;
-        }
-        case typelib_TypeClass_DOUBLE:
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-        {
-            ensureAdditionalMem( 8 );
-            if( isSystemLittleEndian() )
-            {
-                m_pos[0] = ((unsigned char *)pSource)[7];
-                m_pos[1] = ((unsigned char *)pSource)[6];
-                m_pos[2] = ((unsigned char *)pSource)[5];
-                m_pos[3] = ((unsigned char *)pSource)[4];
-                m_pos[4] = ((unsigned char *)pSource)[3];
-                m_pos[5] = ((unsigned char *)pSource)[2];
-                m_pos[6] = ((unsigned char *)pSource)[1];
-                m_pos[7] = ((unsigned char *)pSource)[0];
-            }
-            else
-            {
-                m_pos[7] = ((unsigned char *)pSource)[7];
-                m_pos[6] = ((unsigned char *)pSource)[6];
-                m_pos[5] = ((unsigned char *)pSource)[5];
-                m_pos[4] = ((unsigned char *)pSource)[4];
-                m_pos[3] = ((unsigned char *)pSource)[3];
-                m_pos[2] = ((unsigned char *)pSource)[2];
-                m_pos[1] = ((unsigned char *)pSource)[1];
-                m_pos[0] = ((unsigned char *)pSource)[0];
-            }
-            m_pos += 8;
-            break;
-        }
-
-        case typelib_TypeClass_STRING:
-        {
-            packString( pSource );
-            break;
-        }
-        case typelib_TypeClass_TYPE:
-        {
-            packType( pSource );
-            break;
-        }
-        case typelib_TypeClass_ANY:
-        {
-            bSuccess = packAny( pSource );
-            break;
-        }
-        case typelib_TypeClass_TYPEDEF:
-        {
-            bSuccess = sal_False;
-            m_pBridgeImpl->addError( "can't handle typedef typedescriptions" );
-            break;
-        }
-        case typelib_TypeClass_INTERFACE:
-        {
-            remote_Interface *pRemoteI = *( remote_Interface ** )pSource;
-
-            ::rtl::OUString sOid;
-            sal_uInt16 nIndex = 0xffff;
-            if( pRemoteI )
-            {
-                m_callback( pRemoteI , &(sOid.pData) );
-
-                nIndex = m_pBridgeImpl->m_oidCacheOut.seek( sOid );
-                if( 0xffff == nIndex )
-                {
-                    nIndex = m_pBridgeImpl->m_oidCacheOut.put( sOid );
-                }
-                else
-                {
-                    // cached !
-                    sOid = ::rtl::OUString();
-                }
-            }
-            packString( &sOid );
-            packInt16( &nIndex );
-            break;
-        }
-        case typelib_TypeClass_VOID:
-        {
-            // do nothing
-            break;
-        }
-        case typelib_TypeClass_EXCEPTION:
-        case typelib_TypeClass_STRUCT:
-        case typelib_TypeClass_SEQUENCE:
-        {
-            bSuccess = packRecursive( pSource, pType );
-            break;
-        }
-        default:
-        {
-            bSuccess = sal_False;
-            rtl::OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "can't handle values with typeclass " ) );
-            buf.append( (sal_Int32 ) pType->eTypeClass , 10 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) );
-            buf.append( pType->pTypeName );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ")" ) );
-            m_pBridgeImpl->addError( buf.makeStringAndClear() );
-            break;
-        }
-        }
-        return bSuccess;
-    }
-}
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */