417 files changed, 14176 insertions, 13597 deletions

diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
index fd472b99f041..a087e8007520 100644
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -45,7 +45,7 @@ CDEFS+= -DVERBOSE
 
 # --- Files ----------------------------------
 
-CFLAGSCXX += -x objective-c++ -fobjc-exceptions
+CFLAGSCXX+=$(OBJCXXFLAGS)
 
 SLOFILES= \
         $(SLO)$/quicktimeuno.obj  \
diff --git a/basic/prj/build.lst b/basic/prj/build.lst
index ec6bd0e83930..994901580c86 100644
--- a/basic/prj/build.lst
+++ b/basic/prj/build.lst
@@ -1,4 +1,4 @@
-sb	basic	:    l10n offuh svtools sj2 xmlscript framework NULL
+sb	basic	:    l10n offuh svtools xmlscript framework NULL
 sb	basic									usr1	-	all	sb_mkout NULL
 sb	basic\inc								nmake	-	all	sb_inc NULL
 sb	basic\source\app						nmake	-	all	sb_app sb_class sb_inc NULL
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 7ff7cb76c7c5..af056b884826 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -303,6 +303,33 @@ SbxObject* SbTypeFactory::cloneTypeObjectImpl( const SbxObject& rTypeObj )
         if( pProp )
         {
             SbxProperty* pNewProp = new SbxProperty( *pProp );
+            if( pVar->GetType() & SbxARRAY )

+            {

+                SbxBase* pParObj = pVar->GetObject();

+                SbxDimArray* pSource = PTR_CAST(SbxDimArray,pParObj);

+                SbxDimArray* pDest = new SbxDimArray( pVar->GetType() );

+                INT32 lb = 0;

+                INT32 ub = 0;

+

+                pDest->setHasFixedSize( pSource->hasFixedSize() );

+                if ( pSource->GetDims() && pSource->hasFixedSize() )

+                {

+                    for ( INT32 j = 1 ; j <= pSource->GetDims(); ++j )

+                    {

+                        pSource->GetDim32( (INT32)j, lb, ub );

+                        pDest->AddDim32( lb, ub );

+                    }

+                }

+                else 

+                    pDest->unoAddDim( 0, -1 ); // variant array

+

+                USHORT nSavFlags = pVar->GetFlags();

+                pNewProp->ResetFlag( SBX_FIXED );

+                // need to reset the FIXED flag 

+                // when calling PutObject ( because the type will not match Object )    

+                pNewProp->PutObject( pDest );

+                pNewProp->SetFlags( nSavFlags );

+            }
             pProps->PutDirect( pNewProp, i );
         }
     }
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index a1bdb687b002..a6ae8cac29af 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -750,7 +750,11 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
             // SbUnoObject instanzieren
             String aName;
             SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue );
-            if ( SbiRuntime::isVBAEnabled() )
+            //If this is called externally e.g. from the scripting 

+            //framework then there is no 'active' runtime the default property will not be set up

+            //only a vba object will have XDefaultProp set anyway so... this

+            //test seems a bit of overkill

+            //if ( SbiRuntime::isVBAEnabled() )

             {
                 String sDfltPropName;
 
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index d242071784b6..54e98f401594 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -212,7 +212,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
 
     // #110004 It can also be a sub/function
     if( !bConst && (eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ||
-                    eCurTok == STATIC || eCurTok == ENUM ) )
+                    eCurTok == STATIC || eCurTok == ENUM || eCurTok == DECLARE) )
     {
         // Next token is read here, because !bConst
         bool bPrivate = ( eFirstTok == PRIVATE );
@@ -241,6 +241,12 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
             DefEnum( bPrivate );
             return;
         }
+        else if( eCurTok == DECLARE )

+        {

+            Next();

+            DefDeclare( bPrivate ); 

+            return;

+        }

     }
 
 #ifdef SHARED
@@ -546,7 +552,7 @@ void SbiParser::DefType( BOOL bPrivate )
     SbxObject *pType = new SbxObject(aSym);
 
     SbiSymDef* pElem;
-    SbiDimList* pDim;
+    SbiDimList* pDim = NULL;
     BOOL bDone = FALSE;
 
     while( !bDone && !IsEof() )
@@ -570,13 +576,6 @@ void SbiParser::DefType( BOOL bPrivate )
                 pElem = VarDecl(&pDim,FALSE,FALSE);
                 if( !pElem )
                     bDone = TRUE;   // Error occured
-                if( pDim )
-                {
-                    // HOT FIX, to be updated
-                    delete pDim;
-                    Error( SbERR_NO_STRINGS_ARRAYS );
-                }
-
         }
         if( pElem )
         {
@@ -586,6 +585,43 @@ void SbiParser::DefType( BOOL bPrivate )
             else
             {
                 SbxProperty *pTypeElem = new SbxProperty (pElem->GetName(),pElem->GetType());
+                if( pDim )

+                {

+                    SbxDimArray* pArray = new SbxDimArray( pElem->GetType() );  

+                    if ( pDim->GetSize() )

+                    {

+                        // Dimension the target array

+

+                        for ( short i=0; i<pDim->GetSize();++i )

+                        {

+                            INT32 ub = -1;

+                            INT32 lb = nBase;

+                            SbiExprNode* pNode =  pDim->Get(i)->GetExprNode();

+                            ub = pNode->GetNumber();

+                            if ( !pDim->Get( i )->IsBased() ) // each dim is low/up

+                            {

+                                if (  ++i >= pDim->GetSize() ) // trouble

+                                    StarBASIC::FatalError( SbERR_INTERNAL_ERROR );

+                                pNode =  pDim->Get(i)->GetExprNode();

+                                lb = ub;

+                                ub = pNode->GetNumber();

+                            }

+                            else if ( !bCompatible )

+                                ub += nBase;

+                            pArray->AddDim32( lb, ub );      

+                        }

+                        pArray->setHasFixedSize( true );

+                    }

+                    else

+                        pArray->unoAddDim( 0, -1 ); // variant array

+                    USHORT nSavFlags = pTypeElem->GetFlags();

+                    // need to reset the FIXED flag 

+                    // when calling PutObject ( because the type will not match Object )    

+                    pTypeElem->ResetFlag( SBX_FIXED );

+                    pTypeElem->PutObject( pArray );

+                    pTypeElem->SetFlags( nSavFlags );

+                }

+                delete pDim;
                 pTypeMembers->Insert( pTypeElem, pTypeMembers->Count() );
             }
             delete pElem;
@@ -872,6 +908,11 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
 
 void SbiParser::Declare()
 {
+    DefDeclare( FALSE );

+}

+

+void SbiParser::DefDeclare( BOOL bPrivate )

+{

     Next();
     if( eCurTok != SUB && eCurTok != FUNCTION )
       Error( SbERR_UNEXPECTED, eCurTok );
@@ -892,12 +933,16 @@ void SbiParser::Declare()
                     // Als Variable deklariert
                     Error( SbERR_BAD_DECLARATION, pDef->GetName() );
                     delete pDef;
+                    pDef = NULL;
                 }
                 else
                     pDef->Match( p );
             }
             else
                 aPublics.Add( pDef );
+
+            if ( pDef )

+                pDef->SetPublic( !bPrivate );

         }
     }
 }
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 319af5cbfbc5..b66006cb639a 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -144,6 +144,7 @@ public:
     SbiExprNode* GetRealNode();     // letzter Knoten in x.y.z
     short GetDepth();               // Tiefe eines Baumes berechnen
     const String& GetString()       { return aStrVal; }
+    short GetNumber()               { return (short)nVal; }

     SbiExprList* GetParameters()    { return aVar.pPar; }
     SbiExprListVector* GetMoreParameters()  { return aVar.pvMorePar; }
 
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 5f2ef47080c3..379ae962834b 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -66,6 +66,7 @@ class SbiParser : public SbiTokenizer
     void StmntBlock( SbiToken );    // Statement-Block abarbeiten
     void DefType( BOOL bPrivate );  // Parse type declaration
     void DefEnum( BOOL bPrivate );  // Parse enum declaration
+    void DefDeclare( BOOL bPrivate );

     void EnableCompatibility();
 public:
     SbxArrayRef   rTypeArray;       // das Type-Array
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 2c9c22f7f44a..dbd66a61575c 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -662,12 +662,15 @@ RTLFUNC(Array)
     }
 
     // Parameter ins Array uebernehmen
-    for( short i = 0 ; i < nArraySize ; i++ )
+    // ATTENTION: Using type USHORT for loop variable is
+    // mandatory to workaround a problem with the
+    // Solaris Intel compiler optimizer! See i104354
+    for( USHORT i = 0 ; i < nArraySize ; i++ )
     {
         SbxVariable* pVar = rPar.Get(i+1);
         SbxVariable* pNew = new SbxVariable( *pVar );
         pNew->SetFlag( SBX_WRITE );
-        short index = i;
+        short index = static_cast< short >(i);
         if ( bIncIndex )
             ++index;
         pArray->Put( pNew, &index );
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 7c3bd3b057ba..ca21908ece78 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1470,7 +1470,7 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
         bRes = TRUE;
     }
     else if( GetType() == SbxEMPTY && rOp.GetType() == SbxEMPTY )
-        bRes = TRUE;
+        bRes = !bVBAInterop ? TRUE : ( eOp == SbxEQ ? TRUE : FALSE );
     // Sonderregel 1: Ist ein Operand Null, ist das Ergebnis FALSE
     else if( GetType() == SbxNULL || rOp.GetType() == SbxNULL )
         bRes = FALSE;
diff --git a/configmgr/source/backendhelper/makefile.mk b/configmgr/source/backendhelper/makefile.mk
index 44b502b451b4..f9a27c8167b0 100644
--- a/configmgr/source/backendhelper/makefile.mk
+++ b/configmgr/source/backendhelper/makefile.mk
@@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings ---
 
 .INCLUDE : settings.mk
+.IF "$(L10N_framework)"==""
 .INCLUDE : $(PRJ)$/makefile.pmk
 DLLPRE =
 
@@ -66,6 +67,7 @@ DEF1EXPORTFILE=exports.dxp
 DEF1DES=Configuration: Backend Helper
 
 # --- Targets ---
+.ENDIF # L10N_framework
 
 .INCLUDE : target.mk
 
diff --git a/configmgr/source/platformbe/makefile.mk b/configmgr/source/platformbe/makefile.mk
index 19796b2442c2..9cbe53f5cf7d 100644
--- a/configmgr/source/platformbe/makefile.mk
+++ b/configmgr/source/platformbe/makefile.mk
@@ -42,6 +42,7 @@ SYSMGR_MAJOR=1
 # --- Settings ---
 
 .INCLUDE : settings.mk
+.IF "$(L10N_framework)"==""
 .INCLUDE : $(PRJ)$/makefile.pmk
 DLLPRE =
 
@@ -69,6 +70,7 @@ DEF1EXPORTFILE=exports.dxp
 DEF1DES=Configuration: System Integration Manager
 
 # --- Targets ---
+.ENDIF # L10N_framework
 
 .INCLUDE : target.mk
 
diff --git a/configmgr/util/makefile.mk b/configmgr/util/makefile.mk
index 6fd7c63195a4..eaea5d343503 100644
--- a/configmgr/util/makefile.mk
+++ b/configmgr/util/makefile.mk
@@ -36,6 +36,7 @@ TARGET=configmgr
 ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE : settings.mk
+.IF "$(L10N_framework)"==""
 .INCLUDE : $(PRJ)$/makefile.pmk
 .INCLUDE :  $(PRJ)$/version.mk
 DLLPRE = 
@@ -75,6 +76,7 @@ DEF1NAME=	$(SHL1TARGET)
 DEF1EXPORTFILE=	exports.dxp
 
 # --- Targets ----------------------------------
+.ENDIF # L10N_framework
 
 .INCLUDE : target.mk
 
diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx
index bd86e9ce4397..da68443bb68e 100755
--- a/connectivity/inc/connectivity/DriversConfig.hxx
+++ b/connectivity/inc/connectivity/DriversConfig.hxx
@@ -1,92 +1,95 @@
-/*************************************************************************

- *

- *  OpenOffice.org - a multi-platform office productivity suite

- *

- *  $RCSfile: makefile,v $

- *

- *  $Revision: 1.1 $

- *

- *  last change: $Author: st $ $Date: 2000/11/22 02:32:00 $

- *

- *  The Contents of this file are made available subject to

- *  the terms of GNU Lesser General Public License Version 2.1.

- *

- *

- *    GNU Lesser General Public License Version 2.1

- *    =============================================

- *    Copyright 2005 by Sun Microsystems, Inc.

- *    901 San Antonio Road, Palo Alto, CA 94303, USA

- *

- *    This library is free software; you can redistribute it and/or

- *    modify it under the terms of the GNU Lesser General Public

- *    License version 2.1, as published by the Free Software Foundation.

- *

- *    This library 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 for more details.

- *

- *    You should have received a copy of the GNU Lesser General Public

- *    License along with this library; if not, write to the Free Software

- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,

- *    MA  02111-1307  USA

- *

- ************************************************************************/

-#ifndef CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED

-#define CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED

-

-#include <comphelper/stl_types.hxx>

-#include <com/sun/star/lang/XMultiServiceFactory.hpp>

-#include <com/sun/star/beans/NamedValue.hpp>

-#include <com/sun/star/uno/Sequence.h>

-#include "connectivity/dbtoolsdllapi.hxx"

-#include <salhelper/singletonref.hxx>

-#include <comphelper/namedvaluecollection.hxx>

-#include <unotools/confignode.hxx>

-

-namespace connectivity

-{

-    typedef struct

-    {

-        ::comphelper::NamedValueCollection aProperties;

-        ::comphelper::NamedValueCollection aFeatures;

-        ::comphelper::NamedValueCollection aMetaData;

-        ::rtl::OUString sDriverFactory;

-        ::rtl::OUString sDriverTypeDisplayName;

-    } TInstalledDriver;

-    DECLARE_STL_USTRINGACCESS_MAP( TInstalledDriver, TInstalledDrivers);

-

+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: makefile,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: st $ $Date: 2000/11/22 02:32:00 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+#ifndef CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
+#define CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
+
+#include <comphelper/stl_types.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include "connectivity/dbtoolsdllapi.hxx"
+#include <salhelper/singletonref.hxx>
+#include <comphelper/namedvaluecollection.hxx>
+#include <unotools/confignode.hxx>
+
+namespace connectivity
+{
+    typedef struct
+    {
+        ::comphelper::NamedValueCollection aProperties;
+        ::comphelper::NamedValueCollection aFeatures;
+        ::comphelper::NamedValueCollection aMetaData;
+        ::rtl::OUString sDriverFactory;
+        ::rtl::OUString sDriverTypeDisplayName;
+    } TInstalledDriver;
+    DECLARE_STL_USTRINGACCESS_MAP( TInstalledDriver, TInstalledDrivers);
+
     class DriversConfigImpl
     {
-        ::utl::OConfigurationTreeRoot m_aInstalled;
+        mutable ::utl::OConfigurationTreeRoot   m_aInstalled;
+        mutable TInstalledDrivers       m_aDrivers;
+        void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const;
     public:
         DriversConfigImpl();
-        void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,TInstalledDrivers& _rDrivers);
-    };

-    //

-    // Allows to access all driver which are located in the configuration

-    //

-    class OOO_DLLPUBLIC_DBTOOLS DriversConfig

-    {

-        typedef salhelper::SingletonRef<DriversConfigImpl> OSharedConfigNode;

-        

-        const ::comphelper::NamedValueCollection& impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const;

-    public:

-        DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);

-        ~DriversConfig();

-

-        DriversConfig( const DriversConfig& );

-        DriversConfig& operator=( const DriversConfig& );

-

-        ::rtl::OUString getDriverFactoryName(const ::rtl::OUString& _sUrl) const;

-        ::rtl::OUString getDriverTypeDisplayName(const ::rtl::OUString& _sUrl) const;

-        const ::comphelper::NamedValueCollection& getProperties(const ::rtl::OUString& _sURL) const;

-        const ::comphelper::NamedValueCollection& getFeatures(const ::rtl::OUString& _sURL) const;

-        const ::comphelper::NamedValueCollection& getMetaData(const ::rtl::OUString& _sURL) const;

-        ::com::sun::star::uno::Sequence< ::rtl::OUString > getURLs() const;

-    private:

-        TInstalledDrivers   m_aDrivers;

-        OSharedConfigNode   m_aNode;

-    };

-}

-#endif // CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED

+
+        const TInstalledDrivers& getInstalledDrivers(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const { Load(_rxORB); return m_aDrivers; }
+    };
+    //
+    // Allows to access all driver which are located in the configuration
+    //
+    class OOO_DLLPUBLIC_DBTOOLS DriversConfig
+    {
+        typedef salhelper::SingletonRef<DriversConfigImpl> OSharedConfigNode;
+
+        const ::comphelper::NamedValueCollection& impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const;
+    public:
+        DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
+        ~DriversConfig();
+
+        DriversConfig( const DriversConfig& );
+        DriversConfig& operator=( const DriversConfig& );
+
+        ::rtl::OUString getDriverFactoryName(const ::rtl::OUString& _sUrl) const;
+        ::rtl::OUString getDriverTypeDisplayName(const ::rtl::OUString& _sUrl) const;
+        const ::comphelper::NamedValueCollection& getProperties(const ::rtl::OUString& _sURL) const;
+        const ::comphelper::NamedValueCollection& getFeatures(const ::rtl::OUString& _sURL) const;
+        const ::comphelper::NamedValueCollection& getMetaData(const ::rtl::OUString& _sURL) const;
+        ::com::sun::star::uno::Sequence< ::rtl::OUString > getURLs() const;
+    private:
+        OSharedConfigNode   m_aNode;
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
+    };
+}
+#endif // CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index 32662c5c157a..1ee1718247ae 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
@@ -177,6 +177,12 @@ namespace dbtools
         /** determines whether in the application UI, empty table folders (aka catalogs/schemas) should be displayed
         */
         bool displayEmptyTableFolders() const;
+
+        /** determines that threads are supported.
+        *
+        * \return <TRUE/> when threads are supported, otherwise <FALSE/>
+        */
+        bool supportsThreads() const;
     };
 
 //........................................................................
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index a72816d6427b..30c822b6f169 100755
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -112,32 +112,35 @@ DriversConfigImpl::DriversConfigImpl()
 {
 }
 // -----------------------------------------------------------------------------
-void DriversConfigImpl::Load(const uno::Reference< lang::XMultiServiceFactory >& _rxORB,TInstalledDrivers& _rDrivers)
+void DriversConfigImpl::Load(const uno::Reference< lang::XMultiServiceFactory >& _rxORB) const
 {
-    if ( !m_aInstalled.isValid() )
+    if ( m_aDrivers.empty() )
     {
-        static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess.Drivers/Installed")); ///Installed
-        m_aInstalled = ::utl::OConfigurationTreeRoot::createWithServiceFactory(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
-    }
-
-    if ( m_aInstalled.isValid() )
-    {
-        const uno::Sequence< ::rtl::OUString > aURLPatterns = m_aInstalled.getNodeNames();
-        const ::rtl::OUString* pPatternIter = aURLPatterns.getConstArray();
-        const ::rtl::OUString* pPatternEnd  = pPatternIter + aURLPatterns.getLength();
-        for (;pPatternIter != pPatternEnd ; ++pPatternIter)
+        if ( !m_aInstalled.isValid() )
         {
-            TInstalledDriver aInstalledDriver;
-            lcl_readURLPatternNode(m_aInstalled,*pPatternIter,aInstalledDriver);
-            if ( aInstalledDriver.sDriverFactory.getLength() )
-                _rDrivers.insert(TInstalledDrivers::value_type(*pPatternIter,aInstalledDriver));
+            static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess.Drivers/Installed")); ///Installed
+            m_aInstalled = ::utl::OConfigurationTreeRoot::createWithServiceFactory(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
         }
+
+        if ( m_aInstalled.isValid() )
+        {
+            const uno::Sequence< ::rtl::OUString > aURLPatterns = m_aInstalled.getNodeNames();
+            const ::rtl::OUString* pPatternIter = aURLPatterns.getConstArray();
+            const ::rtl::OUString* pPatternEnd  = pPatternIter + aURLPatterns.getLength();
+            for (;pPatternIter != pPatternEnd ; ++pPatternIter)
+            {
+                TInstalledDriver aInstalledDriver;
+                lcl_readURLPatternNode(m_aInstalled,*pPatternIter,aInstalledDriver);
+                if ( aInstalledDriver.sDriverFactory.getLength() )
+                    m_aDrivers.insert(TInstalledDrivers::value_type(*pPatternIter,aInstalledDriver));
+            }
+        } // if ( m_aInstalled.isValid() )
     }
 }
 // -----------------------------------------------------------------------------
 DriversConfig::DriversConfig(const uno::Reference< lang::XMultiServiceFactory >& _rxORB)
+:m_xORB(_rxORB)
 {
-    m_aNode->Load(_rxORB,m_aDrivers);
 }
 
 // -----------------------------------------------------------------------------
@@ -156,7 +159,6 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
 {

     if ( this != &_rhs )

     {

-        m_aDrivers = _rhs.m_aDrivers;

         m_aNode = _rhs.m_aNode;

     }

     return *this;

@@ -165,10 +167,11 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
 // -----------------------------------------------------------------------------
 ::rtl::OUString DriversConfig::getDriverFactoryName(const ::rtl::OUString& _sURL) const
 {
+    const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
     ::rtl::OUString sRet;
     ::rtl::OUString sOldPattern;
-    TInstalledDrivers::const_iterator aIter = m_aDrivers.begin();
-    TInstalledDrivers::const_iterator aEnd = m_aDrivers.end();
+    TInstalledDrivers::const_iterator aIter = rDrivers.begin();
+    TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter)
     {
         WildCard aWildCard(aIter->first);
@@ -184,10 +187,11 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
 // -----------------------------------------------------------------------------
 ::rtl::OUString DriversConfig::getDriverTypeDisplayName(const ::rtl::OUString& _sURL) const
 {
+    const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
     ::rtl::OUString sRet;
     ::rtl::OUString sOldPattern;
-    TInstalledDrivers::const_iterator aIter = m_aDrivers.begin();
-    TInstalledDrivers::const_iterator aEnd = m_aDrivers.end();
+    TInstalledDrivers::const_iterator aIter = rDrivers.begin();
+    TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter)
     {
         WildCard aWildCard(aIter->first);
@@ -218,10 +222,11 @@ const ::comphelper::NamedValueCollection& DriversConfig::getMetaData(const ::rtl
 // -----------------------------------------------------------------------------
 const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const
 {
+    const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
     const ::comphelper::NamedValueCollection* pRet = NULL;
     ::rtl::OUString sOldPattern;
-    TInstalledDrivers::const_iterator aIter = m_aDrivers.begin();
-    TInstalledDrivers::const_iterator aEnd = m_aDrivers.end();
+    TInstalledDrivers::const_iterator aIter = rDrivers.begin();
+    TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter)
     {
         WildCard aWildCard(aIter->first);
@@ -252,10 +257,11 @@ const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const ::rtl::O
 // -----------------------------------------------------------------------------
 uno::Sequence< ::rtl::OUString > DriversConfig::getURLs() const
 {
-    uno::Sequence< ::rtl::OUString > aRet(m_aDrivers.size());
+    const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
+    uno::Sequence< ::rtl::OUString > aRet(rDrivers.size());
     ::rtl::OUString* pIter = aRet.getArray();
-    TInstalledDrivers::const_iterator aIter = m_aDrivers.begin();
-    TInstalledDrivers::const_iterator aEnd = m_aDrivers.end();
+    TInstalledDrivers::const_iterator aIter = rDrivers.begin();
+    TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter,++pIter)
     {
         *pIter = aIter->first;
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index 541df8e6b2cc..15221ed0e260 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -40,7 +40,7 @@
 #include <typeinfo>
 #define BOOST_SPIRIT_DEBUG
 #endif
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/classic_core.hpp>
 #include "RowFunctionParser.hxx"
 #include <rtl/ustring.hxx>
 #include <tools/fract.hxx>
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 70220b1cd563..c5b65a9d113b 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -407,6 +407,22 @@ namespace dbtools
 #endif
         return doDisplay;
     }
+    //--------------------------------------------------------------------
+    bool DatabaseMetaData::supportsThreads() const
+    {
+        bool bSupported( true );
+        try
+        {
+            Reference< XDatabaseMetaData > xMeta( m_pImpl->xConnectionMetaData, UNO_SET_THROW );
+            ::rtl::OUString sConnectionURL( xMeta->getURL() );
+            bSupported = sConnectionURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "sdbc:mysql:mysqlc" ) ) != 0;
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return bSupported;
+    }
 
 //........................................................................
 } // namespace dbtools
diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk
index ee335705e651..cb5a4ad3f7aa 100644
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
@@ -49,6 +49,8 @@ ENVCFLAGS+=/FR$(SLO)$/
 NOOPTFILES= $(SLO)$/RowFunctionParser.obj
 .ENDIF
 
+ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
+
 # --- Files --------------------------------------------------------
 EXCEPTIONSFILES=\
         $(SLO)$/predicateinput.obj						\
diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index 09b2936e1c7d..5b3483ed57bb 100644
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -107,4 +107,4 @@ DEF1EXPORTFILE=	exports.dxp
 # --- Targets ----------------------------------
 
 
-.INCLUDE : $(PRJ)$/target.pmk
\ No newline at end of file
+.INCLUDE : $(PRJ)$/target.pmk
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 839c34513c62..1eeb59befc1f 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -49,6 +49,10 @@
     if(!x)                                                              \
         ADOS::ThrowException(*m_pConnection->getConnection(),*this);
 
+#ifdef max
+#   undef max
+#endif
+
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 using namespace connectivity::ado;
diff --git a/connectivity/source/drivers/jdbc/jdbc.xcu b/connectivity/source/drivers/jdbc/jdbc.xcu
index 73fe2e9adc55..ae1bbad227e7 100755
--- a/connectivity/source/drivers/jdbc/jdbc.xcu
+++ b/connectivity/source/drivers/jdbc/jdbc.xcu
@@ -174,7 +174,7 @@
       <node oor:name="Properties">
         <node oor:name="IgnoreCurrency" oor:op="replace">
           <prop oor:name="Value" oor:type="xs:boolean">
-            <value>false</value>
+            <value>true</value>
           </prop>
         </node>
         <node oor:name="TypeInfoSettings" oor:op="replace">
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
index bd4201ee3729..2a6f79f5acd7 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
@@ -53,16 +53,16 @@ void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &ns
 // -------------------------------------------------------------------------
 ::rtl::OUString MTypeConverter::nsACStringToOUString( const nsACString& _source )
 {
-    const char* buffer = _source.BeginReading();

-    const char* bufferEnd = _source.EndReading();

-    return ::rtl::OUString( buffer, bufferEnd - buffer, RTL_TEXTENCODING_ASCII_US );

+    const char* buffer = _source.BeginReading();
+    const char* bufferEnd = _source.EndReading();
+    return ::rtl::OUString( buffer, static_cast<sal_Int32>(bufferEnd - buffer), RTL_TEXTENCODING_ASCII_US );
 }
 // -------------------------------------------------------------------------
 ::rtl::OString MTypeConverter::nsACStringToOString( const nsACString& _source )
 {
-    const char* buffer = _source.BeginReading();

-    const char* bufferEnd = _source.EndReading();

-    return ::rtl::OString( buffer, bufferEnd - buffer );

+    const char* buffer = _source.BeginReading();
+    const char* bufferEnd = _source.EndReading();
+    return ::rtl::OString( buffer, static_cast<sal_Int32>(bufferEnd - buffer) );
 }
 // -------------------------------------------------------------------------
 void MTypeConverter::asciiOUStringToNsACString( const ::rtl::OUString& _asciiString, nsACString& _dest )
@@ -73,8 +73,8 @@ void MTypeConverter::asciiOUStringToNsACString( const ::rtl::OUString& _asciiStr
 // -------------------------------------------------------------------------
 void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest )
 {
-    _dest.Truncate();

-    _dest.AppendASCII( _asciiString );

+    _dest.Truncate();
+    _dest.AppendASCII( _asciiString );
 }
 // -------------------------------------------------------------------------
 void MTypeConverter::nsStringToOUString(nsString const &nss, ::rtl::OUString &ous)
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 0a86ed7b9f18..8a27940f44b0 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -108,7 +108,7 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int
     SQLRETURN nSQLRETURN = 0;
     SDB_ODBC_CHAR szConnStrOut[4096];
     SDB_ODBC_CHAR szConnStrIn[2048];
-    SWORD cbConnStrOut;
+    SQLSMALLINT cbConnStrOut;
     memset(szConnStrOut,'\0',4096);
     memset(szConnStrIn,'\0',2048);
     ::rtl::OString aConStr(::rtl::OUStringToOString(aConnectStr,getTextEncoding()));
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 655006d1f8e4..8d72c3271b82 100644
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -444,11 +444,11 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s
     checkParameterIndex(parameterIndex);
 
     sal_Int8* lenBuf = getLengthBuf (parameterIndex);
-    *(SDWORD*)lenBuf = SQL_NULL_DATA;
+    *(SQLLEN*)lenBuf = SQL_NULL_DATA;
 
 
-    SQLINTEGER  prec = 0;
-    SQLUINTEGER nColumnSize = 0;
+    SQLLEN prec = 0;
+    SQLULEN nColumnSize = 0;
     if (sqlType == SQL_CHAR || sqlType == SQL_VARCHAR || sqlType == SQL_LONGVARCHAR)
     {
         prec = 1;
@@ -474,7 +474,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s
                                             nDecimalDigits,
                                             NULL,
                                             prec,
-                                            (SDWORD*)lenBuf
+                                            (SQLLEN*)lenBuf
                                             );
     OTools::ThrowException(m_pConnection,nReturn,m_aStatementHandle,SQL_HANDLE_STMT,*this);
 }
@@ -865,7 +865,7 @@ void OPreparedStatement::setStream (
 
     // Bind the parameter with SQL_LEN_DATA_AT_EXEC
     SQLSMALLINT   Ctype = SQL_C_CHAR;
-    SDWORD  atExec = SQL_LEN_DATA_AT_EXEC (length);
+    SQLLEN  atExec = SQL_LEN_DATA_AT_EXEC (length);
     memcpy (dataBuf, &ParameterIndex, sizeof(ParameterIndex));
     memcpy (lenBuf, &atExec, sizeof (atExec));
 
@@ -876,14 +876,14 @@ void OPreparedStatement::setStream (
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     N3SQLBindParameter(m_aStatementHandle,
                         (SQLUSMALLINT)ParameterIndex,
-                        (SQLSMALLINT)SQL_PARAM_INPUT,
+                        (SQLUSMALLINT)SQL_PARAM_INPUT,
                         Ctype,
                         (SQLSMALLINT)SQLtype,
-                        (SQLUINTEGER)length,
+                        (SQLULEN)length,
                         0,
                         dataBuf,
                         sizeof(ParameterIndex),
-                        (SDWORD*)lenBuf);
+                        (SQLLEN*)lenBuf);
 
     // Save the input stream
     boundParams[ParameterIndex - 1].setInputStream (x, length);
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 1825b94051e7..8c885f0924ad 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -843,8 +843,8 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 
-    SQLSMALLINT nMaxLen = 20;
-    SQLINTEGER nRealLen = 0;
+    SQLLEN nMaxLen = 20;
+    SQLLEN nRealLen = 0;
     Sequence<sal_Int8> aBookmark(nMaxLen);
 
     SQLRETURN nRet = N3SQLBindCol(m_aStatementHandle,
@@ -925,7 +925,7 @@ void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
     sal_Bool bPositionByBookmark = ( NULL != getOdbcFunction( ODBC3SQLBulkOperations ) );
     if ( bPositionByBookmark )
     {
-        SQLINTEGER nRealLen = 0;
+        SQLLEN nRealLen = 0;
         nRet = N3SQLBindCol(m_aStatementHandle,
                             0,
                             SQL_C_VARBOOKMARK,
diff --git a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
index adf77eca238c..3397c5c515a9 100644
--- a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
@@ -86,13 +86,13 @@ OResultSetMetaData::~OResultSetMetaData()
     return  sValue;
 }
 // -------------------------------------------------------------------------
-SWORD OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
+SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
                                               ,sal_Int32 _ident) throw(SQLException, RuntimeException)
 {
-    SWORD nValue=0;
+    SQLLEN nValue=0;
     OTools::ThrowException(_pConnection,(*(T3SQLColAttribute)_pConnection->getOdbcFunction(ODBC3SQLColAttribute))(_aStatementHandle,
                                          (SQLUSMALLINT)_column,
                                          (SQLUSMALLINT)_ident,
@@ -117,22 +117,22 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
     return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE);
 }
 // -------------------------------------------------------------------------
-SWORD OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
+SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 column)
                                                throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
-    SWORD nType = 0;
+    SQLSMALLINT nType = 0;
     try
     {
-        nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE);
+        nType = (SQLSMALLINT)getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE);
         if(nType == SQL_UNKNOWN_TYPE)
-            nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column, SQL_DESC_TYPE);
+            nType = (SQLSMALLINT)getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column, SQL_DESC_TYPE);
     }
     catch(SQLException& ) // in this case we have an odbc 2.0 driver
     {
-        nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE );
+        nType = (SQLSMALLINT)getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE );
     }
 
     return nType;
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 3e0fdbd79c3f..79fbef9db50e 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -260,13 +260,13 @@ void OStatement_Base::clearMyResultSet () throw (SQLException)
     m_xResultSet = Reference< XResultSet >();
 }
 //--------------------------------------------------------------------
-sal_Int32 OStatement_Base::getRowCount () throw( SQLException)
+SQLLEN OStatement_Base::getRowCount () throw( SQLException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 
-    sal_Int32   numRows = 0;
+    SQLLEN numRows = 0;
 
     try {
         THROW_SQL(N3SQLRowCount(m_aStatementHandle,&numRows));
@@ -533,7 +533,9 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException,
         SQLRETURN nError = N3SQLMoreResults(m_aStatementHandle);
         if(nError == SQL_SUCCESS)
         {
-            N3SQLRowCount(m_aStatementHandle,&pArray[j]);
+            SQLLEN nRowCount=0;
+            N3SQLRowCount(m_aStatementHandle,&nRowCount);
+            pArray[j] = nRowCount;
         }
     }
     return aRet;
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index a7ac4ebf4d78..39c848f34eaf 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -56,16 +56,16 @@ void OTools::getValue(  OConnection* _pConnection,
                         sal_Bool &_bWasNull,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                         void* _pValue,
-                        SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+                        SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::getValue" );
-    SQLINTEGER pcbValue = SQL_NULL_DATA;
+    SQLLEN pcbValue = SQL_NULL_DATA;
     OTools::ThrowException(_pConnection,
                             (*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
                                         (SQLUSMALLINT)columnIndex,
                                         _nType,
                                         _pValue,
-                                        (SQLINTEGER)_rSize,
+                                        _nSize,
                                         &pcbValue),
                             _aStatementHandle,SQL_HANDLE_STMT,_xInterface,sal_False);
     _bWasNull = pcbValue == SQL_NULL_DATA;
@@ -86,12 +86,12 @@ void OTools::bindParameter( OConnection* _pConnection,
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindParameter" );
     SQLRETURN nRetcode;
-    SWORD   fSqlType;
-    SWORD   fCType;
-    SDWORD  nMaxLen = 0;
+    SQLSMALLINT fSqlType;
+    SQLSMALLINT fCType;
+    SQLLEN  nMaxLen = 0;
     //  void*&   pData   = pDataBuffer;
-    SQLINTEGER* pLen    = (SQLINTEGER*)pLenBuffer;
-    SQLUINTEGER nColumnSize=0;
+    SQLLEN* pLen    = (SQLLEN*)pLenBuffer;
+    SQLULEN nColumnSize=0;
     SQLSMALLINT nDecimalDigits=0;
 
     OTools::getBindTypes(_bUseWChar,_bUseOldTimeDate,_nODBCtype,fCType,fSqlType);
@@ -123,10 +123,10 @@ void OTools::bindParameter( OConnection* _pConnection,
 void OTools::bindData(  SQLSMALLINT _nOdbcType,
                         sal_Bool _bUseWChar,
                         sal_Int8 *&_pData,
-                        SQLINTEGER*& pLen,
+                        SQLLEN*& pLen,
                         const void* _pValue,
                         rtl_TextEncoding _nTextEncoding,
-                        SQLUINTEGER& _nColumnSize)
+                        SQLULEN& _nColumnSize)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindData" );
     _nColumnSize = 0;
@@ -222,7 +222,7 @@ void OTools::bindData(  SQLSMALLINT _nOdbcType,
             {
                 sal_Int32 nLen = 0;
                 nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
-                *pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+                *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
             }
             break;
         case SQL_LONGVARCHAR:
@@ -235,21 +235,21 @@ void OTools::bindData(  SQLSMALLINT _nOdbcType,
                 ::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding));
                 nLen = aString.getLength();
             }
-            *pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+            *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
         }   break;
         case SQL_DATE:
             *(DATE_STRUCT*)_pData = *(DATE_STRUCT*)_pValue;
-            *pLen = (SDWORD)sizeof(DATE_STRUCT);
+            *pLen = (SQLLEN)sizeof(DATE_STRUCT);
             _nColumnSize = 10;
             break;
         case SQL_TIME:
             *(TIME_STRUCT*)_pData = *(TIME_STRUCT*)_pValue;
-            *pLen = (SDWORD)sizeof(TIME_STRUCT);
+            *pLen = (SQLLEN)sizeof(TIME_STRUCT);
             _nColumnSize = 8;
             break;
         case SQL_TIMESTAMP:
             *(TIMESTAMP_STRUCT*)_pData = *(TIMESTAMP_STRUCT*)_pValue;
-            *pLen = (SDWORD)sizeof(TIMESTAMP_STRUCT);
+            *pLen = (SQLLEN)sizeof(TIMESTAMP_STRUCT);
             _nColumnSize = 19;
             break;
     }
@@ -262,7 +262,7 @@ void OTools::bindValue( OConnection* _pConnection,
                         SQLSMALLINT _nMaxLen,
                         const void* _pValue,
                         void* _pData,
-                        SQLINTEGER *pLen,
+                        SQLLEN *pLen,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                         rtl_TextEncoding _nTextEncoding,
                         sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
@@ -271,7 +271,7 @@ void OTools::bindValue( OConnection* _pConnection,
     SQLRETURN nRetcode;
     SQLSMALLINT   fSqlType;
     SQLSMALLINT   fCType;
-    SQLSMALLINT   nMaxLen = _nMaxLen;
+    SQLLEN nMaxLen = _nMaxLen;
 
     OTools::getBindTypes(   sal_False,
                             _bUseOldTimeDate,
@@ -375,7 +375,7 @@ void OTools::bindValue( OConnection* _pConnection,
                     _pData = (void*)(columnIndex);
                     sal_Int32 nLen = 0;
                     nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
-                    *pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+                    *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
                 }
                     break;
                 case SQL_LONGVARCHAR:
@@ -383,7 +383,7 @@ void OTools::bindValue( OConnection* _pConnection,
                     _pData = (void*)(columnIndex);
                     sal_Int32 nLen = 0;
                     nLen = ((::rtl::OUString*)_pValue)->getLength();
-                    *pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+                    *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
                 }   break;
                 case SQL_DATE:
                     *pLen = sizeof(DATE_STRUCT);
@@ -446,10 +446,10 @@ void OTools::ThrowException(OConnection* _pConnection,
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::ThrowException" );
 
     SDB_ODBC_CHAR szSqlState[5];
-    SDWORD pfNativeError;
+    SQLINTEGER pfNativeError;
     SDB_ODBC_CHAR szErrorMessage[SQL_MAX_MESSAGE_LENGTH];
     szErrorMessage[0] = '\0';
-    SWORD pcbErrorMsg = 0;
+    SQLSMALLINT pcbErrorMsg = 0;
 
     // Informationen zur letzten Operation:
     // wenn hstmt != SQL_NULL_HSTMT ist (Benutzung von SetStatus in SdbCursor, SdbTable, ...),
@@ -478,7 +478,7 @@ void OTools::ThrowException(OConnection* _pConnection,
 Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
                                          SQLHANDLE _aStatementHandle,
                                          sal_Int32 columnIndex,
-                                         SWORD  _fSqlType,
+                                         SQLSMALLINT _fSqlType,
                                          sal_Bool &_bWasNull,
                                          const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
 {
@@ -486,14 +486,14 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
     char aCharArray[2048];
     // Erstmal versuchen, die Daten mit dem kleinen Puffer
     // abzuholen:
-    SQLINTEGER nMaxLen = sizeof aCharArray - 1;
+    SQLLEN nMaxLen = sizeof aCharArray - 1;
     //  GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
-    SQLINTEGER pcbValue = 0;
+    SQLLEN pcbValue = 0;
     OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
                                         (SQLUSMALLINT)columnIndex,
                                         _fSqlType,
                                         (SQLPOINTER)aCharArray,
-                                        (SQLINTEGER)nMaxLen,
+                                        nMaxLen,
                                         &pcbValue),
                             _aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 
@@ -540,7 +540,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
 ::rtl::OUString OTools::getStringValue(OConnection* _pConnection,
                                        SQLHANDLE _aStatementHandle,
                                        sal_Int32 columnIndex,
-                                       SWORD  _fSqlType,
+                                       SQLSMALLINT _fSqlType,
                                        sal_Bool &_bWasNull,
                                        const Reference< XInterface >& _xInterface,
                                        rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException)
@@ -555,15 +555,15 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
         {
             sal_Unicode waCharArray[2048];
             // read the unicode data
-            sal_Int32 nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
+            SQLLEN nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
             //  GETDATA(SQL_C_WCHAR, waCharArray, nMaxLen + sizeof(sal_Unicode));
 
-            SQLINTEGER pcbValue=0;
+            SQLLEN pcbValue=0;
             OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
                                                 (SQLUSMALLINT)columnIndex,
                                                 SQL_C_WCHAR,
                                                 &waCharArray,
-                                                (SQLINTEGER)nMaxLen*sizeof(sal_Unicode),
+                                                (SQLLEN)nMaxLen*sizeof(sal_Unicode),
                                                 &pcbValue),
                                     _aStatementHandle,SQL_HANDLE_STMT,_xInterface);
             _bWasNull = pcbValue == SQL_NULL_DATA;
@@ -571,10 +571,10 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
                 return ::rtl::OUString();
             // Bei Fehler bricht der GETDATA-Makro mit return ab,
             // bei NULL mit break!
-            SQLINTEGER nRealSize = 0;
+            SQLLEN nRealSize = 0;
             if ( pcbValue > -1 )
                 nRealSize = pcbValue / sizeof(sal_Unicode);
-            SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(nRealSize, nMaxLen) : (nMaxLen-1);
+            SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(nRealSize, nMaxLen) : (nMaxLen-1);
             waCharArray[nLen] = 0;
             aData.append(waCharArray,nLen);
 
@@ -598,7 +598,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
                                                 (SQLUSMALLINT)columnIndex,
                                                 SQL_C_WCHAR,
                                                 &waCharArray,
-                                                (SQLINTEGER)nLen+1,
+                                                (SQLLEN)nLen+1,
                                                 &pcbValue),
                                     _aStatementHandle,SQL_HANDLE_STMT,_xInterface);
                 nRealSize = 0;
@@ -616,21 +616,21 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
             char aCharArray[2048];
             // Erstmal versuchen, die Daten mit dem kleinen Puffer
             // abzuholen:
-            SDWORD nMaxLen = sizeof aCharArray - 1;
+            SQLLEN nMaxLen = sizeof aCharArray - 1;
             //  GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
-            SQLINTEGER pcbValue = 0;
+            SQLLEN pcbValue = 0;
             OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
                                                 (SQLUSMALLINT)columnIndex,
                                                 SQL_C_CHAR,
                                                 &aCharArray,
-                                                (SQLINTEGER)nMaxLen,
+                                                nMaxLen,
                                                 &pcbValue),
                                     _aStatementHandle,SQL_HANDLE_STMT,_xInterface);
             _bWasNull = pcbValue == SQL_NULL_DATA;
             if(_bWasNull)
                 return ::rtl::OUString();
 
-            SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
+            SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
             aCharArray[nLen] = 0;
             if ( ((pcbValue == SQL_NO_TOTAL) || pcbValue > nMaxLen) && aCharArray[nLen-1] == 0 && nLen > 0 )
                 --nLen;
diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx
index 43ec65992281..5b184b735400 100644
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ b/connectivity/source/inc/odbc/OFunctions.hxx
@@ -187,7 +187,7 @@ namespace connectivity
                                                     SQLSMALLINT *       StringLengthPtr,
                                                     SQLSMALLINT *       TypePtr,
                                                     SQLSMALLINT *       SubTypePtr,
-                                                    SQLINTEGER *        LengthPtr,
+                                                    SQLLEN *            LengthPtr,
                                                     SQLSMALLINT *       PrecisionPtr,
                                                     SQLSMALLINT *       ScalePtr,
                                                     SQLSMALLINT *       NullablePtr);
@@ -203,8 +203,8 @@ namespace connectivity
                                                     SQLSMALLINT         Precision,
                                                     SQLSMALLINT         Scale,
                                                     SQLPOINTER          DataPtr,
-                                                    SQLINTEGER *        StringLengthPtr,
-                                                    SQLINTEGER *        IndicatorPtr);
+                                                    SQLLEN *            StringLengthPtr,
+                                                    SQLLEN *            IndicatorPtr);
 
     #define N3SQLSetDescRec(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSetDescRec)getOdbcFunction(ODBC3SQLSetDescRec))(a,b,c,d,e,f,g,h,i,j)
     */
@@ -221,11 +221,11 @@ namespace connectivity
                                                     SQLSMALLINT         InputOutputType,
                                                     SQLSMALLINT         ValueType,
                                                     SQLSMALLINT         ParameterType,
-                                                    SQLUINTEGER         ColumnSize,
+                                                    SQLULEN             ColumnSize,
                                                     SQLSMALLINT         DecimalDigits,
                                                     SQLPOINTER          ParameterValuePtr,
-                                                    SQLINTEGER          BufferLength,
-                                                    SQLINTEGER *        StrLen_or_IndPtr);
+                                                    SQLLEN              BufferLength,
+                                                    SQLLEN *            StrLen_or_IndPtr);
 
     #define N3SQLBindParameter(a,b,c,d,e,f,g,h,i,j) (*(T3SQLBindParameter)getOdbcFunction(ODBC3SQLBindParameter))(a,b,c,d,e,f,g,h,i,j)
 
@@ -266,7 +266,7 @@ namespace connectivity
     typedef SQLRETURN (SQL_API  *T3SQLDescribeParam) (SQLHSTMT          StatementHandle,
                                                     SQLUSMALLINT        ParameterNumber,
                                                     SQLSMALLINT *       DataTypePtr,
-                                                    SQLUINTEGER *       ParameterSizePtr,
+                                                    SQLULEN *           ParameterSizePtr,
                                                     SQLSMALLINT *       DecimalDigitsPtr,
                                                     SQLSMALLINT *       NullablePtr);
 
@@ -284,13 +284,13 @@ namespace connectivity
 
     typedef SQLRETURN  (SQL_API  *T3SQLPutData) (       SQLHSTMT            StatementHandle,
                                                     SQLPOINTER          DataPtr,
-                                                    SQLINTEGER          StrLen_or_Ind);
+                                                    SQLLEN              StrLen_or_Ind);
 
     #define N3SQLPutData(a,b,c) (*(T3SQLPutData)getOdbcFunction(ODBC3SQLPutData))(a,b,c)
 
     // Retrieving results and information about results
     typedef SQLRETURN  (SQL_API  *T3SQLRowCount) (  SQLHSTMT            StatementHandle,
-                                                    SQLINTEGER *        RowCountPtr);
+                                                    SQLLEN *            RowCountPtr);
 
     #define N3SQLRowCount(a,b) (*(T3SQLRowCount)getOdbcFunction(ODBC3SQLRowCount))(a,b)
 
@@ -300,12 +300,12 @@ namespace connectivity
     #define N3SQLNumResultCols(a,b) (*(T3SQLNumResultCols)getOdbcFunction(ODBC3SQLNumResultCols))(a,b)
 
     typedef SQLRETURN  (SQL_API  *T3SQLDescribeCol) (   SQLHSTMT            StatementHandle,
-                                                    SQLSMALLINT         ColumnNumber,
+                                                    SQLUSMALLINT        ColumnNumber,
                                                     SQLCHAR *           ColumnName,
                                                     SQLSMALLINT         BufferLength,
                                                     SQLSMALLINT *       NameLengthPtr,
                                                     SQLSMALLINT *       DataTypePtr,
-                                                    SQLUINTEGER *       ColumnSizePtr,
+                                                    SQLULEN *           ColumnSizePtr,
                                                     SQLSMALLINT *       DecimalDigitsPtr,
                                                     SQLSMALLINT *       NullablePtr);
 
@@ -317,7 +317,7 @@ namespace connectivity
                                                     SQLPOINTER          CharacterAttributePtr,
                                                     SQLSMALLINT         BufferLength,
                                                     SQLSMALLINT *       StringLengthPtr,
-                                                    SQLPOINTER          NumericAttributePtr);
+                                                    SQLLEN *            NumericAttributePtr);
 
     #define N3SQLColAttribute(a,b,c,d,e,f,g) (*(T3SQLColAttribute)getOdbcFunction(ODBC3SQLColAttribute))(a,b,c,d,e,f,g)
 
@@ -325,8 +325,8 @@ namespace connectivity
                                                     SQLUSMALLINT        ColumnNumber,
                                                     SQLSMALLINT         TargetType,
                                                     SQLPOINTER          TargetValuePtr,
-                                                    SQLINTEGER          BufferLength,
-                                                    SQLINTEGER *        StrLen_or_IndPtr);
+                                                    SQLLEN              BufferLength,
+                                                    SQLLEN *            StrLen_or_IndPtr);
 
     #define N3SQLBindCol(a,b,c,d,e,f) (*(T3SQLBindCol)getOdbcFunction(ODBC3SQLBindCol))(a,b,c,d,e,f)
 
@@ -336,7 +336,7 @@ namespace connectivity
 
     typedef SQLRETURN  (SQL_API  *T3SQLFetchScroll) (   SQLHSTMT            StatementHandle,
                                                     SQLSMALLINT         FetchOrientation,
-                                                    SQLINTEGER          FetchOffset);
+                                                    SQLLEN              FetchOffset);
 
     #define N3SQLFetchScroll(a,b,c) (*(T3SQLFetchScroll)getOdbcFunction(ODBC3SQLFetchScroll))(a,b,c)
 
@@ -344,20 +344,20 @@ namespace connectivity
                                                     SQLUSMALLINT        ColumnNumber,
                                                     SQLSMALLINT         TargetType,
                                                     SQLPOINTER          TargetValuePtr,
-                                                    SQLINTEGER          BufferLength,
-                                                    SQLINTEGER *        StrLen_or_IndPtr);
+                                                    SQLLEN              BufferLength,
+                                                    SQLLEN *            StrLen_or_IndPtr);
 
     #define N3SQLGetData(a,b,c,d,e,f) (*(T3SQLGetData)getOdbcFunction(ODBC3SQLGetData))(a,b,c,d,e,f)
 
     typedef SQLRETURN  (SQL_API  *T3SQLSetPos) (        SQLHSTMT            StatementHandle,
-                                                    SQLUSMALLINT        RowNumber,
+                                                    SQLSETPOSIROW       RowNumber,
                                                     SQLUSMALLINT        Operation,
                                                     SQLUSMALLINT        LockType);
 
     #define N3SQLSetPos(a,b,c,d) (*(T3SQLSetPos)getOdbcFunction(ODBC3SQLSetPos))(a,b,c,d)
 
     typedef SQLRETURN  (SQL_API  *T3SQLBulkOperations) (    SQLHSTMT        StatementHandle,
-                                                        SQLUSMALLINT    Operation);
+                                                        SQLSMALLINT Operation);
 
     #define N3SQLBulkOperations(a,b) (*(T3SQLBulkOperations)getOdbcFunction(ODBC3SQLBulkOperations))(a,b)
 
@@ -461,15 +461,15 @@ namespace connectivity
     #define N3SQLProcedures(a,b,c,d,e,f,g) (*(T3SQLProcedures)getOdbcFunction(ODBC3SQLProcedures))(a,b,c,d,e,f,g)
 
     typedef SQLRETURN  (SQL_API  *T3SQLSpecialColumns) (SQLHSTMT            StatementHandle,
-                                                    SQLSMALLINT         IdentifierType,
+                                                    SQLUSMALLINT        IdentifierType,
                                                     SQLCHAR *           CatalogName,
                                                     SQLSMALLINT         NameLength1,
                                                     SQLCHAR *           SchemaName,
                                                     SQLSMALLINT         NameLength2,
                                                     SQLCHAR *           TableName,
                                                     SQLSMALLINT         NameLength3,
-                                                    SQLSMALLINT         Scope,
-                                                    SQLSMALLINT         Nullable);
+                                                    SQLUSMALLINT        Scope,
+                                                    SQLUSMALLINT        Nullable);
 
     #define N3SQLSpecialColumns(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSpecialColumns)getOdbcFunction(ODBC3SQLSpecialColumns))(a,b,c,d,e,f,g,h,i,j)
 
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index cf9fdce56115..9925457e99f6 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -128,7 +128,7 @@ namespace connectivity
             typedef ::std::vector<ORowSetValue>         TDataRow;
 
             TVoidVector                                 m_aBindVector;
-            ::std::vector<sal_Int32>                    m_aLengthVector;
+            ::std::vector<SQLLEN>                       m_aLengthVector;
             ::std::map<sal_Int32,SWORD>                 m_aODBCColumnTypes;
             ::com::sun::star::uno::Sequence<sal_Int8>   m_aBookmark;
 
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 1d9564e5d762..99b7b6b54ccb 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -81,13 +81,13 @@ namespace connectivity
             virtual ~OResultSetMetaData();
 
 
-            static  SWORD getNumColAttrib(OConnection* _pConnection
+            static SQLLEN getNumColAttrib(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
                                               ,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
-            static SWORD getColumnODBCType(OConnection* _pConnection
+            static SQLSMALLINT getColumnODBCType(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 column)
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 5d3e71c5e42d..58702312231a 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -130,7 +130,7 @@ namespace connectivity
             */
             virtual OResultSet* createResulSet();
 
-            sal_Int32 getRowCount () throw( ::com::sun::star::sdbc::SQLException);
+            SQLLEN getRowCount () throw( ::com::sun::star::sdbc::SQLException);
 
 
             void disposeResultSet();
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index 0d73ea3530c7..0c12f9010cdc 100644
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
@@ -197,7 +197,7 @@ namespace connectivity
             static ::rtl::OUString getStringValue(  OConnection* _pConnection,
                                                     SQLHANDLE _aStatementHandle,
                                                     sal_Int32 columnIndex,
-                                                    SWORD  _fSqlType,
+                                                    SQLSMALLINT _fSqlType,
                                                     sal_Bool &_bWasNull,
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                                                     rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -205,7 +205,7 @@ namespace connectivity
             static  ::com::sun::star::uno::Sequence<sal_Int8> getBytesValue(OConnection* _pConnection,
                                                                             SQLHANDLE _aStatementHandle,
                                                                             sal_Int32 columnIndex,
-                                                                            SWORD  _fSqlType,
+                                                                            SQLSMALLINT _fSqlType,
                                                                             sal_Bool &_bWasNull,
                                                                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             static void getValue(   OConnection* _pConnection,
@@ -215,7 +215,7 @@ namespace connectivity
                                     sal_Bool &_bWasNull,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                                     void* _pValue,
-                                    SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+                                    SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
             /**
                 bindData copies the from pValue to pData
@@ -229,10 +229,10 @@ namespace connectivity
             static void bindData(   SQLSMALLINT _nOdbcType,
                                     sal_Bool _bUseWChar,
                                     sal_Int8 *&_pData,
-                                    SQLINTEGER*& pLen,
+                                    SQLLEN*& pLen,
                                     const void* _pValue,
                                     rtl_TextEncoding _nTextEncoding,
-                                    SQLUINTEGER& _nColumnSize);
+                                    SQLULEN& _nColumnSize);
 
             static void bindParameter(  OConnection* _pConnection,
                                         SQLHANDLE _hStmt,
@@ -254,7 +254,7 @@ namespace connectivity
                                     SQLSMALLINT _nMaxLen,
                                     const void* _pValue,
                                     void*       _pData,
-                                    SQLINTEGER *pLen,
+                                    SQLLEN *pLen,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                                     rtl_TextEncoding _nTextEncoding,
                                     sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 3aa56e273ff3..ce2ed07f57e4 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,4 +1,4 @@
-dt      desktop :    l10n sfx2 stoc uui BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp NULL
+dt      desktop :       l10n sfx2 stoc uui BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
 dt	desktop\inc								nmake	-	all	dt_inc NULL
 dt	desktop\prj								get		-	all	dt_prj NULL
@@ -38,3 +38,7 @@ dt	desktop\source\deployment\registry\executable		nmake	-	all	dt_dp_registry_exe
 dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
 dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w NULL
 dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL
+dt  desktop\registry\data\org\openoffice\Office                     nmake   -  all sn_regconfig NULL
+dt  desktop\source\registration\com\sun\star\servicetag\resources   get     -  all sn_svctagres NULL
+dt  desktop\source\registration\com\sun\star\servicetag             nmake   -  all sn_svctag NULL
+dt  desktop\source\registration\com\sun\star\registration           nmake   -  all sn_regjob sn_svctag NULL
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index eb0d93886e8a..fe688e2c4b44 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -134,3 +134,12 @@ mkdir: %COMMON_DEST%\pck%_EXT%\broffice_nologo
 ..\scripts\basis-link %_DEST%\bin%_EXT%\c08\basis-link
 ..\scripts\so-basis-link %_DEST%\bin%_EXT%\so\basis-link
 ..\scripts\odf-basis-link %_DEST%\bin%_EXT%\odf4ms\basis-link
+
+mkdir: %_DEST%\xml%_EXT%\registry\spool
+mkdir: %_DEST%\xml%_EXT%\registry\spool\org
+mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice
+mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office
+mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
+
+..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
+..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
diff --git a/desktop/registry/data/org/openoffice/Office/Jobs.xcu b/desktop/registry/data/org/openoffice/Office/Jobs.xcu
new file mode 100644
index 000000000000..628e3dcdf70a
--- /dev/null
+++ b/desktop/registry/data/org/openoffice/Office/Jobs.xcu
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: Jobs.xcu,v $
+ *
+ * $Revision: 1.5 $
+ *
+ * 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.
+ *
+ ************************************************************************ -->
+<oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <node oor:name="Jobs">
+    <node oor:name="ProductRegistration" oor:op="replace">
+      <prop oor:name="Service">
+        <value>com.sun.star.comp.framework.DoRegistrationJob</value>
+      </prop>
+      <node oor:name="Arguments">
+        <prop oor:name="ProductName" oor:op="replace" oor:type="xs:string">
+          <value>${SERVICETAG_PRODUCTNAME}</value>
+        </prop>
+        <prop oor:name="ProductVersion" oor:op="replace" oor:type="xs:string">
+          <value>${SERVICETAG_PRODUCTVERSION}</value>
+        </prop>
+        <prop oor:name="ProductURN" oor:op="replace" oor:type="xs:string">
+          <value>${SERVICETAG_URN}</value>
+        </prop>
+        <prop oor:name="ProductSource" oor:op="replace" oor:type="xs:string">
+          <value>${SERVICETAG_SOURCE}</value>
+        </prop>
+        <prop oor:name="ProductParent" oor:op="replace" oor:type="xs:string">
+          <value>${SERVICETAG_PARENTNAME}</value>
+        </prop>
+        <prop oor:name="Vendor" oor:op="replace" oor:type="xs:string">
+          <value>Sun Microsystems, Inc.</value>
+        </prop>
+        <prop oor:name="RegistrationData" oor:op="replace" oor:type="xs:string">
+          <value>$(user)/registration.xml</value>
+        </prop>
+        <prop oor:name="RegistrationURL" oor:op="replace" oor:type="xs:string">
+          <value>${REGISTRATION_HOST}/register/${registry_urn}?product=${REGISTRATION_PRODUCT}&amp;locale=${locale}&amp;cid=${REGISTRATION_CID}</value>
+        </prop>
+      </node>
+    </node>
+  </node>
+  <node oor:name="Events">
+    <node oor:name="onRegisterNow" oor:op="fuse">
+      <node oor:name="JobList">
+        <node oor:name="ProductRegistration" oor:op="replace"/>
+      </node>
+    </node>
+    <node oor:name="onRegisterLater" oor:op="fuse">
+      <node oor:name="JobList">
+        <node oor:name="ProductRegistration" oor:op="replace"/>
+      </node>
+    </node>
+  </node>
+</oor:component-data>
diff --git a/sj2/stardiv/app/makefile.mk b/desktop/registry/data/org/openoffice/Office/makefile.mk
index 4e4b5f36a344..651c731fa4a9 100644
--- a/sj2/stardiv/app/makefile.mk
+++ b/desktop/registry/data/org/openoffice/Office/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.4 $
+# $Revision: 1.5 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -29,41 +29,53 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+PRJ=..$/..$/..$/..$/..
+PRJNAME=setup_native
+TARGET=data_registration
+PACKAGE=org.openoffice.Office
 
-PRJNAME=sj2
-TARGET=app
+ABSXCSROOT=$(SOLARXMLDIR)
+XCSROOT=..
+DTDDIR=$(ABSXCSROOT)
+XSLDIR=$(ABSXCSROOT)$/processing
+PROCESSOUT=$(MISC)$/$(TARGET)
+PROCESSORDIR=$(SOLARBINDIR)
 
-PACKAGE=stardiv$/app
-JARFILES=sandbox.jar
+.INCLUDE :  settings.mk
+.IF "$(L10N_framework)"==""
 
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+# --- Files  -------------------------------------------------------
 
-.IF "$(JDK)" == "gcj"
-all:
-        @echo This dir cannot be build with gcj because of sun.net.ftp.FtpClient
-.ELSE
-# --- Files --------------------------------------------------------
+.IF "$(BUILD_SPECIAL)"!=""
 
-JAVAFILES=  \
-        AppletViewer.java				\
-        AppletViewerFactory.java		\
-        AppletProps.java				\
-        AppletMessageHandler.java		\
-        MsgAppletViewer.java
+XCUFILES= \
+    Jobs.xcu
 
-JAVACLASSFILES=	\
-        $(CLASSDIR)$/$(PACKAGE)$/AppletViewer.class	\
-        $(CLASSDIR)$/$(PACKAGE)$/AppletViewerFactory.class	\
-        $(CLASSDIR)$/$(PACKAGE)$/AppletProps.class	\
-        $(CLASSDIR)$/$(PACKAGE)$/AppletMessageHandler.class 	\
-        $(CLASSDIR)$/$(PACKAGE)$/MsgAppletViewer.class
+MODULEFILES=
 
+LOCALIZEDFILES=
+
+PACKAGEDIR=$(subst,.,$/ $(PACKAGE))
+SPOOLDIR=$(MISC)$/registry$/spool
+
+MYXCUFILES= \
+    $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-registration.xcu
+
+.ELSE # "$(BUILD_SPECIAL)"!=""
+
+dummy:
+    @echo "Nothing to build"
+
+.ENDIF # "$(BUILD_SPECIAL)"!=""
 
 # --- Targets ------------------------------------------------------
-.ENDIF
 
 .INCLUDE :  target.mk
 
-.INCLUDE :  $(PRJ)$/util$/target.pmk
+.ENDIF # L10N_framework
+ALLTAR : $(MYXCUFILES)
+
+$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-registration.xcu : $(PROCESSOUT)$/registry$/data$/$/$(PACKAGEDIR)$/Jobs.xcu
+    @-$(MKDIRHIER) $(@:d)
+    @$(COPY) $< $@
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 9002a7b32210..d4e0a91c1d17 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1257,6 +1257,7 @@ void Desktop::Main()
     std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
     std::auto_ptr<SvtPathOptions> pPathOptions;
 
+    Reference < css::document::XEventListener > xGlobalBroadcaster;
     try
     {
         RegisterServices( xSMgr );
@@ -1379,7 +1380,8 @@ void Desktop::Main()
         }
 
         // create service for loadin SFX (still needed in startup)
-        Reference < css::document::XEventListener > xGlobalBroadcaster( xSMgr->createInstance(
+        xGlobalBroadcaster = Reference < css::document::XEventListener >
+            ( xSMgr->createInstance(
             DEFINE_CONST_UNICODE( "com.sun.star.frame.GlobalEventBroadcaster" ) ), UNO_QUERY );
 
         // initialize test-tool library (if available)
@@ -1617,6 +1619,13 @@ void Desktop::Main()
         FatalError( MakeStartupErrorMessage(exAnyCfg.Message) );
     }
 
+    if (xGlobalBroadcaster.is())
+    {
+        css::document::EventObject aEvent;
+        aEvent.EventName = ::rtl::OUString::createFromAscii("OnCloseApp");
+        xGlobalBroadcaster->notifyEvent(aEvent);
+    }
+
     delete pResMgr;
 
     // Restore old value
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 0c6de1db2225..c1dd167ea39a 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -122,7 +122,7 @@ DispatchWatcher* DispatchWatcher::GetDispatchWatcher()
 
 
 DispatchWatcher::DispatchWatcher()
-    : m_nRequestCount(1)
+    : m_nRequestCount(0)
 {
 }
 
@@ -437,12 +437,13 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
     }
 
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
-    m_nRequestCount--;
+    bool bEmpty = (m_nRequestCount == 0);
+    aGuard.clear();
 
     // No more asynchronous requests?
     // The requests are removed from the request container after they called back to this
     // implementation via statusChanged!!
-    if ( !m_nRequestCount && ! bNoTerminate /*m_aRequestContainer.empty()*/ )
+    if ( bEmpty && !bNoTerminate /*m_aRequestContainer.empty()*/ )
     {
         // We have to check if we have an open task otherwise we have to shutdown the office.
         Reference< XFramesSupplier > xTasksSupplier( xDesktop, UNO_QUERY );
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 3c6d6124d178..e9a39207cb50 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -104,7 +104,7 @@ bool LanguageSelection::prepareLanguage()
         ::rtl::OUString sWin16SysLocale;
         aWin16SysLocale >>= sWin16SysLocale;
         if( sWin16SysLocale.getLength())
-            setDefaultLocale(sWin16SysLocale);
+            setDefaultLanguage(sWin16SysLocale);
     }
     catch(const Exception&)
     {
@@ -116,9 +116,8 @@ bool LanguageSelection::prepareLanguage()
         OUString usLocale;
         Reference< XPropertySet > xLocaleProp(getConfigAccess(
             "org.openoffice.System/L10N", sal_True), UNO_QUERY_THROW);
-           // "org.openoffice.Office.Linguistic/General", sal_True), UNO_QUERY_THROW);
         xLocaleProp->getPropertyValue(OUString::createFromAscii("Locale")) >>= usLocale;
-            setDefaultLocale(usLocale);
+            setDefaultLanguage(usLocale);
     }
     catch (Exception&)
     {
@@ -160,88 +159,32 @@ bool LanguageSelection::prepareLanguage()
 
     // #i32939# setting of default document locale
     // #i32939# this should not be based on the UI language
-    setDefaultLocale(aLocaleString);
-
-    // fallback: set en-US as default Western locale if no Western locale is set
-    OUString usWesternName = OUString::createFromAscii("DefaultLocale");
-    try
-    {
-        Reference< XPropertySet > xProp(getConfigAccess(
-            "org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
-        OUString usValue;
-        xProp->getPropertyValue(usWesternName) >>= usValue;
-        if (usValue.getLength() == 0)
-        {
-            // there is no western document language selected
-            // if the selected locale is a western locale, this
-            // will become the default western docuemnt language
-            // otherwise, fall back to en-US
-            OUString usDefault = OUString::createFromAscii("en-US");
-            try
-            {
-                xProp->setPropertyValue(usWesternName, makeAny(usDefault));
-                Reference< XChangesBatch >(xProp,UNO_QUERY_THROW)->commitChanges();
-            }
-            catch ( PropertyVetoException )
-            {
-                // we are not allowed to change this
-            }
-        }
-    }
-    catch ( Exception& )
-    {
-    }
+    setDefaultLanguage(aLocaleString);
 
     return bSuccess;
 }
 
-void LanguageSelection::setDefaultLocale(const OUString& usUILocale)
+void LanguageSelection::setDefaultLanguage(const OUString& sLocale)
 {
-    // #i32939# setting of default document locale
-    // org.openoffice.Office.Linguistic/General/DefaultLocale
-    // org.openoffice.Office.Linguistic/General/DefaultLocale_CJK
-    // org.openoffice.Office.Linguistic/General/DefaultLocale_CTL
+    // #i32939# setting of default document language
+    //
+    // See #i42730# for rules for determining source of settings
 
-    // determine script type of UI locale
-    LanguageType ltUILocale = MsLangId::convertIsoStringToLanguage(usUILocale);
-    sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(ltUILocale);
+    // determine script type of locale
+    LanguageType nLang = MsLangId::convertIsoStringToLanguage(sLocale);
+    sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(nLang);
 
-    try
-    {
-        Reference< XPropertySet > xProp(getConfigAccess(
-                                            "org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
-        OUString usName = OUString::createFromAscii("DefaultLocale");
-        switch (nScriptType)
-        {
-            case SCRIPTTYPE_ASIAN:
-                usName = OUString::createFromAscii("DefaultLocale_CJK");
-                break;
-            case SCRIPTTYPE_COMPLEX:
-                usName = OUString::createFromAscii("DefaultLocale_CTL");
-                break;
-        }
-        OUString usValue;
-        xProp->getPropertyValue(usName) >>= usValue;
-        if (usValue.getLength() == 0)
-        {
-            // there is no document language set, for the script type selected
-            // in the UI
-            // covert the LanguageType we've got from the LanguageTable back to
-            // an iso string and store it
-            OUString usDefault = MsLangId::convertLanguageToIsoString(ltUILocale);
-            try
-            {
-                xProp->setPropertyValue(usName, makeAny(usDefault));
-                Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
-            }
-            catch ( PropertyVetoException )
-            {
-                // we are not allowed to change this
-            }
-        }
-    }
-    catch ( Exception& )
+    switch (nScriptType)
     {
+        case SCRIPTTYPE_ASIAN:
+            MsLangId::setConfiguredAsianFallback( nLang );
+            break;
+        case SCRIPTTYPE_COMPLEX:
+            MsLangId::setConfiguredComplexFallback( nLang );
+            break;
+        default:
+            MsLangId::setConfiguredWesternFallback( nLang );
+            break;
     }
 }
 
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index 0a112545f38b..d0867529ab1b 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -60,7 +60,7 @@ private:
     static rtl::OUString getUserLanguage();
     static rtl::OUString getSystemLanguage();
     static void resetUserLanguage();
-    static void setDefaultLocale(const rtl::OUString&);
+    static void setDefaultLanguage(const rtl::OUString&);
 
 public:
     static com::sun::star::lang::Locale IsoStringToLocale(const rtl::OUString& str);
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index 36993bfdf355..238685649cf9 100644
--- a/desktop/source/app/makefile.mk
+++ b/desktop/source/app/makefile.mk
@@ -40,10 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-.IF "$(GUIBASE)"=="aqua"
-CFLAGS+=-x objective-c++
-.ENDIF
-
 .IF "$(ENABLE_GNOMEVFS)"=="TRUE"
 CFLAGS+=-DGNOME_VFS_ENABLED
 .ENDIF
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 05e514305415..d7177f90dc77 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -314,6 +314,18 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
             }
         }
 
+        //Workaround. See issue http://www.openoffice.org/issues/show_bug.cgi?id=99257
+        //This prevents the copying of the common.rdbf and native rdbs. It disables the
+        //feature to add shared extensions in a running office.
+        if (!that->m_readOnly && context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("shared") ))
+        {
+            OUString sNoRdb;
+            ::rtl::Bootstrap::get(OUSTR("NORDBCOPY"), sNoRdb);
+            if (sNoRdb.equalsIgnoreAsciiCase(OUSTR("true"))
+                && dp_misc::office_is_running())
+                that->m_readOnly = true;
+        }
+
         if (!that->m_readOnly && logFile.getLength() > 0)
         {
             const Any any_logFile(logFile);
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 573c1c639de1..dd9e009e90cc 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -40,7 +40,7 @@
 #include "comphelper/servicedecl.hxx"
 #include "svtools/inettype.hxx"
 
-#include <xmlhelp/compilehelp.hxx>
+#include <transex3/compilehelp.hxx>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 0122caba945e..80c5849ee4d9 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -100,9 +100,10 @@ WelcomePage::WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_B
     // we need to choose the welcome text that is diplayed
     // choices are the default text, default text+migradtion,
     // OEM and extended OEM
-    switch (checkOEM())
-    {
-    case OEM_NONE:
+    // No OEM is built, remove the check
+//     switch (checkOEM())
+//     {
+//     case OEM_NONE:
         // check for migration
         if (Migration::checkMigration())
         {
@@ -112,27 +113,11 @@ WelcomePage::WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_B
             m_ftBody.SetText( aText );
         }
         else
-        if (bIsEvalVersion && (! bNoEvalText))
-        {
-            String aText(WizardResId(STR_WELCOME_EVAL));
-            aText.SearchAndReplaceAll( UniString::CreateFromAscii("%EVALDAYS"), UniString::CreateFromAscii("90"));
-            m_ftBody.SetText( aText );
-        }
-        else
         if ( ! m_bLicenseNeedsAcceptance )
         {
             String aText(WizardResId(STR_WELCOME_WITHOUT_LICENSE));
             m_ftBody.SetText( aText );
         }
-        break;
-    case OEM_NORMAL:
-        m_ftBody.SetText(String(WizardResId(STR_WELCOME_OEM)));
-        break;
-    case OEM_EXTENDED:
-        m_ftBody.SetText(String(WizardResId(STR_WELCOME_OEM_EXT)));
-        break;
-    }
-
 }
 
 
diff --git a/desktop/source/migration/wizard.hrc b/desktop/source/migration/wizard.hrc
index 317465736f6e..cdd045164123 100644
--- a/desktop/source/migration/wizard.hrc
+++ b/desktop/source/migration/wizard.hrc
@@ -88,13 +88,13 @@
 #define STR_STATE_MIGRATION         RID_FIRSTSTSTART_START+102
 #define STR_STATE_REGISTRATION      RID_FIRSTSTSTART_START+103
 #define STR_WELCOME_MIGRATION       RID_FIRSTSTSTART_START+104
-#define STR_WELCOME_OEM             RID_FIRSTSTSTART_START+105
-#define STR_WELCOME_OEM_EXT         RID_FIRSTSTSTART_START+106
+// FREE                             RID_FIRSTSTSTART_START+105
+// FREE                             RID_FIRSTSTSTART_START+106
 #define STR_LICENSE_ACCEPT          RID_FIRSTSTSTART_START+107
 #define STR_LICENSE_DECLINE         RID_FIRSTSTSTART_START+108
 #define STR_FINISH                  RID_FIRSTSTSTART_START+109
 #define STR_STATE_USER              RID_FIRSTSTSTART_START+110
-#define STR_WELCOME_EVAL            RID_FIRSTSTSTART_START+111
+// FREE                             RID_FIRSTSTSTART_START+111
 #define STR_STATE_UPDATE_CHECK      RID_FIRSTSTSTART_START+112
 #define STR_WELCOME_WITHOUT_LICENSE RID_FIRSTSTSTART_START+113
 #define STR_REGISTRATION_OOO        RID_FIRSTSTSTART_START+114
diff --git a/desktop/source/migration/wizard.src b/desktop/source/migration/wizard.src
index 3b49e070fa6d..634c8fe12dcb 100644
--- a/desktop/source/migration/wizard.src
+++ b/desktop/source/migration/wizard.src
@@ -79,24 +79,6 @@ String STR_WELCOME_MIGRATION
     Text [ en-US ] = "This wizard will guide you through the license agreement, the transfer of user data from %OLD_VERSION and the registration of %PRODUCTNAME.\n\nClick 'Next' to continue.";
 
 };
-String STR_WELCOME_OEM
-{
-    Text [ en-US ] = "This wizard will guide you through the license agreement and the registration of %PRODUCTNAME.\n\nImportant information is contained in the readme file which is located in the %PRODUCTNAME product directory. Please read this file carefully.\n\nYou can also find detailed information on the Sun Internet pages at\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nClick 'Next' to continue.";
-};
-String STR_WELCOME_OEM_EXT
-{
-    Text [ en-US ] = "This wizard will guide you through the license agreement and the registration of %PRODUCTNAME.\n\n"
-    "Important information is contained in the readme files which are located in the %PRODUCTNAME product directory. "
-    "Please read these files carefully. You can also find detailed information on the Sun website \n\n"
-    "http://www.sun.com/%PRODUCTNAME.\n\nSupport:\n\nGet FREE software support valid for 60 days from "
-    "date of purchase. To take advantage of this offer, visit the website below.\n\n"
-    "http://www.sun.com/star/service\n\nClick 'Next' to continue.";
-};
-
-String STR_WELCOME_EVAL
-{
-    Text [ en-US ] = "This wizard will guide you through the license agreement and the registration of %PRODUCTNAME.\n\nThis version lets you evaluate the full functionality. However, since it is an evaluation version, you will be able to start it within %EVALDAYS days after installation. To find out more about the %PRODUCTNAME product, visit www.sun.com/%PRODUCTNAME\n\nClick 'Next' to continue.";
-};
 
 String STR_WELCOME_WITHOUT_LICENSE
 {
diff --git a/desktop/source/registration/com/sun/star/registration/Registration.java b/desktop/source/registration/com/sun/star/registration/Registration.java
new file mode 100644
index 000000000000..afcb1b99660e
--- /dev/null
+++ b/desktop/source/registration/com/sun/star/registration/Registration.java
@@ -0,0 +1,342 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+package com.sun.star.registration;
+
+import com.sun.star.beans.NamedValue;
+import com.sun.star.comp.loader.FactoryHelper;
+import com.sun.star.frame.DispatchResultEvent;
+import com.sun.star.frame.DispatchResultState;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.lang.XSingleServiceFactory;
+import com.sun.star.registry.*;
+import com.sun.star.servicetag.*;
+import com.sun.star.system.*;
+import com.sun.star.task.*;
+import com.sun.star.uno.*;
+import com.sun.star.uri.XExternalUriReferenceTranslator;
+import com.sun.star.util.XStringSubstitution;
+
+import java.io.*;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Set;
+import java.net.HttpURLConnection;
+
+public class Registration {
+
+    public static XSingleServiceFactory __getServiceFactory(String implName,
+        XMultiServiceFactory multiFactory, XRegistryKey regKey) {
+        XSingleServiceFactory xSingleServiceFactory = null;
+
+        if (implName.equals(Registration.class.getName())) {
+            xSingleServiceFactory = FactoryHelper.getServiceFactory(_Registration.class, _serviceName, multiFactory, regKey);
+        }
+
+        return xSingleServiceFactory;
+    }
+
+    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
+        return FactoryHelper.writeRegistryServiceInfo(Registration.class.getName(), _serviceName, regKey);
+    }
+
+    static final String _serviceName = "com.sun.star.comp.framework.DoRegistrationJob";
+
+    static public class _Registration implements XJob {
+        XComponentContext xComponentContext;
+
+        XStringSubstitution xPathSubstService = null;
+        XExternalUriReferenceTranslator xUriTranslator = null;
+
+        RegistrationData theRegistrationData = null;
+
+        public _Registration(XComponentContext xComponentContext) {
+            this.xComponentContext = xComponentContext;
+        }
+
+        private String resolvePath(String path) {
+            try {
+                if( xPathSubstService == null || xUriTranslator == null ) {
+                    XMultiComponentFactory theServiceManager = xComponentContext.getServiceManager();
+                    if( xPathSubstService == null ) {
+                        Object o = theServiceManager.createInstanceWithContext(
+                            "com.sun.star.util.PathSubstitution",
+                            xComponentContext );
+                        xPathSubstService = (XStringSubstitution)
+                            UnoRuntime.queryInterface(XStringSubstitution.class, o);
+                    }
+
+                    if( xUriTranslator == null ) {
+                        Object o = theServiceManager.createInstanceWithContext(
+                            "com.sun.star.uri.ExternalUriReferenceTranslator",
+                            xComponentContext );
+                        xUriTranslator =  (XExternalUriReferenceTranslator)
+                            UnoRuntime.queryInterface(XExternalUriReferenceTranslator.class, o);
+                    }
+                }
+
+                String s = xPathSubstService.substituteVariables(path, true);
+                return xUriTranslator.translateToExternal(s);
+            } catch (java.lang.Exception e) {
+                return path;
+            }
+        }
+
+        private void openBrowser(String url) {
+            try {
+                XMultiComponentFactory theServiceManager = xComponentContext.getServiceManager();
+
+                Object o = theServiceManager.createInstanceWithContext(
+                    "com.sun.star.system.SystemShellExecute",
+                    xComponentContext );
+
+                XSystemShellExecute xShellExecuteService = (XSystemShellExecute)
+                    UnoRuntime.queryInterface(XSystemShellExecute.class, o);
+
+                xShellExecuteService.execute( url, "", SystemShellExecuteFlags.DEFAULTS );
+            } catch (java.lang.Exception e) {
+            }
+       }
+
+        private ServiceTag getServiceTagFromRegistrationData(File xmlFile, String productURN) {
+            try {
+                RegistrationData storedRegData = RegistrationData.loadFromXML(new FileInputStream(xmlFile));
+                Set<ServiceTag> storedServiceTags = storedRegData.getServiceTags();
+
+                Iterator<ServiceTag> tagIterator = storedServiceTags.iterator();
+                while( tagIterator.hasNext() ) {
+                    ServiceTag tag = tagIterator.next();
+                    if( tag.getProductURN().equals(productURN) ) {
+                        theRegistrationData = storedRegData;
+                        return tag;
+                    }
+                }
+
+                // product URN has changed, remove registration data file
+                xmlFile.delete();
+            } catch (IOException e) {
+                // fall through intentionally
+            } catch (IllegalArgumentException e) {
+                // file is damaged (or a name clash appeared)
+                xmlFile.delete();
+            }
+            return null;
+        }
+
+        /*
+         * XJob
+         *
+         * NOTE: as this Job hets triggered by the the JobExecutor service from first start
+         * wizard and registration reminder code (because their frames do not implement
+         * XDispatchProvider), making this an XAsyncJob doesn't make sense as the
+         * JobExecutor waits for the jobFinished call on the listener passed.
+         */
+        public Object execute(NamedValue[] args)
+            throws com.sun.star.lang.IllegalArgumentException, com.sun.star.uno.Exception {
+
+            final NamedValue[] f_args = args;
+
+            new Thread(
+                new Runnable () {
+                    public void run() {
+                        try {
+                            executeImpl(f_args);
+                        } catch(com.sun.star.uno.Exception e) {
+                        }
+                    }
+                }
+            ).start();
+
+            NamedValue ret[] = new NamedValue[1];
+            ret[0] = new NamedValue( "Deactivate", new Boolean(false) );
+            return ret;
+        }
+
+        public synchronized void executeImpl(NamedValue[] args)
+            throws com.sun.star.lang.IllegalArgumentException, com.sun.star.uno.Exception {
+
+            // extract the interesting part of the argument list
+            NamedValue[] theJobConfig = null;
+            NamedValue[] theEnvironment = null;
+
+            int c = args.length;
+            for (int i=0; i<c; ++i) {
+                if (args[i].Name.equals("JobConfig"))
+                    theJobConfig = (NamedValue[]) AnyConverter.toArray(args[i].Value);
+                else if (args[i].Name.equals("Environment"))
+                    theEnvironment = (NamedValue[]) AnyConverter.toArray(args[i].Value);
+            }
+
+            if (theEnvironment==null)
+                throw new com.sun.star.lang.IllegalArgumentException("no environment");
+
+            boolean saveConfig = false;
+
+            String productName              = "";
+            String productVersion           = "";
+            String productURN               = "";
+            String productParent            = "";
+            String productParentURN         = "";
+            String productDefinedInstanceID = "";
+            String productSource            = "";
+            String vendor                   = "";
+
+            String urlRegData = null;
+            String registrationURL = null;
+
+            c = theJobConfig.length;
+            for (int i=0; i<c; ++i) {
+                if( theJobConfig[i].Name.equals("ProductName") ) {
+                    productName = AnyConverter.toString(theJobConfig[i].Value);
+                } else if( theJobConfig[i].Name.equals("ProductVersion") ) {
+                    productVersion = AnyConverter.toString(theJobConfig[i].Value);
+                } else if( theJobConfig[i].Name.equals("ProductURN") ) {
+                    productURN = AnyConverter.toString(theJobConfig[i].Value);
+                } else if( theJobConfig[i].Name.equals("ProductParent") ) {
+                    productParent = AnyConverter.toString(theJobConfig[i].Value);
+                } else if( theJobConfig[i].Name.equals("ProductParentURN") ) {
+                    productParentURN = AnyConverter.toString(theJobConfig[i].Value);
+                } else if( theJobConfig[i].Name.equals("ProductSource") ) {
+                    productSource = AnyConverter.toString(theJobConfig[i].Value);
+                } else if( theJobConfig[i].Name.equals("Vendor") ) {
+                    vendor = AnyConverter.toString(theJobConfig[i].Value);
+                } else if( theJobConfig[i].Name.equals("RegistrationData") ) {
+                    urlRegData = resolvePath(AnyConverter.toString(theJobConfig[i].Value));
+                } else if( theJobConfig[i].Name.equals("RegistrationURL") ) {
+                    registrationURL = AnyConverter.toString(theJobConfig[i].Value);
+                } else {
+                    System.err.println( theJobConfig[i].Name + " = " + AnyConverter.toString(theJobConfig[i].Value) );
+                }
+            }
+
+            if (registrationURL==null)
+                throw new com.sun.star.lang.IllegalArgumentException("no registration url");
+
+            boolean local_only = false;
+
+            c = theEnvironment.length;
+            for (int i=0; i<c; ++i) {
+                if( theEnvironment[i].Name.equals("EventName") ) {
+                    if( ! AnyConverter.toString(theEnvironment[i].Value).equals("onRegisterNow") ) {
+                        local_only = true;
+                    }
+                }
+            }
+
+            try {
+
+                /* ensure only one thread accesses/writes registration.xml at a time
+                 * regardless how many instances of this Job exist.
+                 */
+                synchronized( _serviceName ) {
+
+                    File xmlRegData = new File( new URI( urlRegData ) );
+
+                    ServiceTag tag = getServiceTagFromRegistrationData(xmlRegData, productURN);
+                    if( tag == null ) {
+                        tag = ServiceTag.newInstance(
+                            ServiceTag.generateInstanceURN(),
+                            productName,
+                            productVersion,
+                            productURN,
+                            productParent,
+                            productParentURN,
+                            productDefinedInstanceID,
+                            vendor,
+                            System.getProperty("os.arch"),
+                            Installer.getZoneName(),
+                            productSource);
+
+                        theRegistrationData = new RegistrationData();
+                        theRegistrationData.addServiceTag(tag);
+                        theRegistrationData.storeToXML( new FileOutputStream( xmlRegData ) );
+                    }
+
+                    // Store the service tag in local registry, which might have been installed later
+                    if( Registry.isSupported() ) {
+                        // ignore communication failures with local service tag client
+                        try {
+                            if( Registry.getSystemRegistry().getServiceTag(tag.getInstanceURN()) == null ) {
+                                Registry.getSystemRegistry().addServiceTag(tag);
+                            }
+                        } catch( java.io.IOException e) {
+                            e.printStackTrace();
+                        } catch (java.lang.RuntimeException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+
+                if( ! local_only ) {
+                    registrationURL = registrationURL.replaceAll("\\$\\{registry_urn\\}", theRegistrationData.getRegistrationURN());
+                    registrationURL = registrationURL.replaceAll("\\$\\{locale\\}", Locale.getDefault().getLanguage());
+
+                    HttpURLConnection con = (HttpURLConnection) new URL(registrationURL).openConnection();
+                    con.setDoInput(true);
+                    con.setDoOutput(true);
+                    con.setUseCaches(false);
+                    con.setAllowUserInteraction(false);
+                    con.setRequestMethod("POST");
+
+                    con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");
+                    try {
+                        con.connect();
+
+                        OutputStream out = con.getOutputStream();
+                        theRegistrationData.storeToXML(out);
+                        out.flush();
+                        out.close();
+
+                        int returnCode = con.getResponseCode();
+//                      if (returnCode == HttpURLConnection.HTTP_OK);
+                    } catch(java.lang.Exception e) {
+                        // IOException and UnknownHostException
+                    }
+                    openBrowser(registrationURL);
+                }
+            } catch (java.net.MalformedURLException e) {
+                e.printStackTrace();
+                throw new com.sun.star.lang.IllegalArgumentException( e.toString() );
+            } catch (java.net.URISyntaxException e) {
+                e.printStackTrace();
+                throw new com.sun.star.lang.IllegalArgumentException( e.toString() );
+            } catch (java.io.IOException e) {
+                e.printStackTrace();
+                throw new com.sun.star.uno.RuntimeException( e.toString() );
+            } catch (java.lang.RuntimeException e) {
+                e.printStackTrace();
+                throw new com.sun.star.uno.RuntimeException( e.toString() );
+            }
+        }
+    }
+}
diff --git a/sj2/source/jscpp/makefile.mk b/desktop/source/registration/com/sun/star/registration/makefile.mk
index 841b775c1176..f20eaf71adce 100644
--- a/sj2/source/jscpp/makefile.mk
+++ b/desktop/source/registration/com/sun/star/registration/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.9 $
+# $Revision: 1.2 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -29,29 +29,31 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+PRJNAME	= setup_native
+PRJ		= ..$/..$/..$/..$/..$/..
+TARGET	= productregistration
+PACKAGE	= com$/sun$/star$/registration
 
-PRJNAME=sj2
-TARGET=jscpp
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+.INCLUDE :  settings.mk
 
-# --- Files --------------------------------------------------------
+.IF "$(ENABLE_SVCTAGS)" == "YES"
 
-.IF "$(GUIBASE)"=="aqua"
-OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ENDIF  # "$(GUIBASE)"=="aqua"
+JARFILES = jurt.jar unoil.jar ridl.jar 
+JAVAFILES = \
+    Registration.java
 
-SLOFILES=	\
-    $(SLO)$/sjapplet.obj						\
-    $(SLO)$/sjapplet_impl.obj
+JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
+JARTARGET               = $(TARGET).jar
+JARCOMPRESS             = TRUE
+JARCLASSDIRS            = $(PACKAGE) com$/sun$/star$/servicetag
+CUSTOMMANIFESTFILE      = manifest
+.ENDIF			# "$(ENABLE_SVCTAGS)" == "YES"
 
 # --- Targets ------------------------------------------------------
 
-.INCLUDE :  target.mk
 
-.INCLUDE :  $(PRJ)$/util$/target.pmk
+.INCLUDE :  target.mk
 
diff --git a/desktop/source/registration/com/sun/star/registration/manifest b/desktop/source/registration/com/sun/star/registration/manifest
new file mode 100644
index 000000000000..952aaa804e96
--- /dev/null
+++ b/desktop/source/registration/com/sun/star/registration/manifest
@@ -0,0 +1,2 @@
+RegistrationClassName: com.sun.star.registration.Registration
+UNO-Type-Path: 
diff --git a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
new file mode 100644
index 000000000000..c97d5f2cd4f0
--- /dev/null
+++ b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
@@ -0,0 +1,205 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: BrowserSupport.java,v $
+ *
+ * $Revision: 1.2 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+package com.sun.star.servicetag;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * BrowserSupport class.
+ *
+ * The implementation of the com.sun.servicetag API needs to be
+ * compiled with JDK 5 as well since the consumer of this API
+ * may require to support JDK 5 (e.g. NetBeans).
+ *
+ * The Desktop.browse() method can be backported in this class
+ * if needed.  The current implementation only supports JDK 6.
+ */
+class BrowserSupport {
+    private static boolean isBrowseSupported = false;
+    private static Method browseMethod = null;
+    private static Object desktop = null;
+    private static volatile Boolean result = false;
+
+
+    private static void initX() {
+    if  (desktop != null) {
+            return;
+    }
+        boolean supported = false;
+        Method browseM = null;
+        Object desktopObj = null;
+        try {
+            // Determine if java.awt.Desktop is supported
+            Class desktopCls = Class.forName("java.awt.Desktop", true, null);
+            Method getDesktopM = desktopCls.getMethod("getDesktop");
+            browseM = desktopCls.getMethod("browse", URI.class);
+
+            Class actionCls = Class.forName("java.awt.Desktop$Action", true, null);
+            final Method isDesktopSupportedMethod = desktopCls.getMethod("isDesktopSupported");
+            Method isSupportedMethod = desktopCls.getMethod("isSupported", actionCls);
+            Field browseField = actionCls.getField("BROWSE");
+            // isDesktopSupported calls getDefaultToolkit which can block
+            // infinitely, see 6636099 for details, to workaround we call
+            // in a  thread and time it out, noting that the issue is specific
+        // to X11, it does not hurt for Windows.
+            Thread xthread = new Thread() {
+                public void run() {
+                    try {
+                        // support only if Desktop.isDesktopSupported() and
+                        // Desktop.isSupported(Desktop.Action.BROWSE) return true.
+                        result = (Boolean) isDesktopSupportedMethod.invoke(null);
+                    } catch (IllegalAccessException e) {
+                        // should never reach here
+                        InternalError x =
+                            new InternalError("Desktop.getDesktop() method not found");
+                        x.initCause(e);
+                    } catch (InvocationTargetException e) {
+                        // browser not supported
+                        if (Util.isVerbose()) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            };
+        // set it to daemon, so that the vm will exit.
+        xthread.setDaemon(true);
+            xthread.start();
+            try {
+                xthread.join(5 * 1000);
+            } catch (InterruptedException ie) {
+                // ignore the exception
+            }
+            if (result.booleanValue()) {
+                desktopObj = getDesktopM.invoke(null);
+                result = (Boolean) isSupportedMethod.invoke(desktopObj, browseField.get(null));
+                supported = result.booleanValue();
+            }
+        } catch (ClassNotFoundException e) {
+            // browser not supported
+            if (Util.isVerbose()) {
+                e.printStackTrace();
+            }
+        } catch (NoSuchMethodException e) {
+            // browser not supported
+            if (Util.isVerbose()) {
+                e.printStackTrace();
+            }
+        } catch (NoSuchFieldException e) {
+            // browser not supported
+            if (Util.isVerbose()) {
+                e.printStackTrace();
+            }
+        } catch (IllegalAccessException e) {
+            // should never reach here
+            InternalError x =
+                    new InternalError("Desktop.getDesktop() method not found");
+            x.initCause(e);
+            throw x;
+        } catch (InvocationTargetException e) {
+            // browser not supported
+            if (Util.isVerbose()) {
+                e.printStackTrace();
+            }
+        }
+        isBrowseSupported = supported;
+        browseMethod = browseM;
+        desktop = desktopObj;
+    }
+
+    static boolean isSupported() {
+    initX();
+        return isBrowseSupported;
+    }
+
+    /**
+     * Launches the default browser to display a {@code URI}.
+     * If the default browser is not able to handle the specified
+     * {@code URI}, the application registered for handling
+     * {@code URIs} of the specified type is invoked. The application
+     * is determined from the protocol and path of the {@code URI}, as
+     * defined by the {@code URI} class.
+     * <p>
+     * This method calls the Desktop.getDesktop().browse() method.
+     * <p>
+     * @param uri the URI to be displayed in the user default browser
+     *
+     * @throws NullPointerException if {@code uri} is {@code null}
+     * @throws UnsupportedOperationException if the current platform
+     * does not support the {@link Desktop.Action#BROWSE} action
+     * @throws IOException if the user default browser is not found,
+     * or it fails to be launched, or the default handler application
+     * failed to be launched
+     * @throws IllegalArgumentException if the necessary permissions
+     * are not available and the URI can not be converted to a {@code URL}
+     */
+    static void browse(URI uri) throws IOException {
+        if (uri == null) {
+            throw new NullPointerException("null uri");
+        }
+        if (!isSupported()) {
+            throw new UnsupportedOperationException("Browse operation is not supported");
+        }
+
+        // Call Desktop.browse() method
+        try {
+        if (Util.isVerbose()) {
+                System.out.println("desktop: " + desktop + ":browsing..." + uri);
+        }
+            browseMethod.invoke(desktop, uri);
+        } catch (IllegalAccessException e) {
+            // should never reach here
+            InternalError x =
+                new InternalError("Desktop.getDesktop() method not found");
+            x.initCause(e);
+                throw x;
+        } catch (InvocationTargetException e) {
+            Throwable x = e.getCause();
+            if (x != null) {
+                if (x instanceof UnsupportedOperationException) {
+                    throw (UnsupportedOperationException) x;
+                } else if (x instanceof IllegalArgumentException) {
+                    throw (IllegalArgumentException) x;
+                } else if (x instanceof IOException) {
+                    throw (IOException) x;
+                } else if (x instanceof SecurityException) {
+                    throw (SecurityException) x;
+                } else {
+                    // ignore
+                }
+            }
+        }
+    }
+}
diff --git a/desktop/source/registration/com/sun/star/servicetag/Installer.java b/desktop/source/registration/com/sun/star/servicetag/Installer.java
new file mode 100644
index 000000000000..02825dfec69d
--- /dev/null
+++ b/desktop/source/registration/com/sun/star/servicetag/Installer.java
@@ -0,0 +1,947 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: Installer.java,v $
+ *
+ * $Revision: 1.2 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+package com.sun.star.servicetag;
+
+import java.io.*;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Set;
+import java.util.List;
+import java.util.ArrayList;
+import static com.sun.star.servicetag.Util.*;
+
+/**
+ * Service Tag Installer for Java SE.
+ */
+public class Installer {
+    // System properties for testing
+    private static String SVCTAG_DIR_PATH =
+        "servicetag.dir.path";
+    private static String SVCTAG_ENABLE_REGISTRATION =
+        "servicetag.registration.enabled";
+    private final static String SUN_VENDOR = "Sun Microsystems";
+    private final static String REGISTRATION_XML = "registration.xml";
+    private final static String SERVICE_TAG_FILE = "servicetag";
+    private final static String REGISTRATION_HTML_NAME = "register";
+
+    private final static Locale[] knownSupportedLocales =
+        new Locale[] { Locale.ENGLISH,
+                       Locale.JAPANESE,
+                       Locale.SIMPLIFIED_CHINESE};
+
+    private final static String javaHome = System.getProperty("java.home");
+    private static File svcTagDir;
+    private static File serviceTagFile;
+    private static File regXmlFile;
+    private static RegistrationData registration;
+    private static boolean supportRegistration;
+    private static String registerHtmlParent;
+    private static Set<Locale> supportedLocales = new HashSet<Locale>();
+    private static Properties swordfishProps = null;
+    private static String[] jreArchs = null;
+    static {
+        String dir = System.getProperty(SVCTAG_DIR_PATH);
+        if (dir == null) {
+            svcTagDir = new File(getJrePath(), "lib" + File.separator + SERVICE_TAG_FILE);
+        } else {
+            svcTagDir = new File(dir);
+        }
+        serviceTagFile = new File(svcTagDir, SERVICE_TAG_FILE);
+        regXmlFile = new File(svcTagDir, REGISTRATION_XML);
+        if (System.getProperty(SVCTAG_ENABLE_REGISTRATION) == null) {
+            supportRegistration = isJdk();
+        } else {
+            supportRegistration = true;
+        }
+    }
+
+    private Installer() {
+    }
+
+    // Implementation of ServiceTag.getJavaServiceTag(String) method
+    static ServiceTag getJavaServiceTag(String source) throws IOException {
+        if (!System.getProperty("java.vendor").startsWith(SUN_VENDOR)) {
+            // Products bundling this implementation may run on
+            // Mac OS which is not a Sun JDK
+            return null;
+        }
+        boolean cleanup = false;
+        try {
+            // Check if we have the swordfish entries for this JRE version
+            if (loadSwordfishEntries() == null) {
+                return null;
+            }
+
+            ServiceTag st = getJavaServiceTag();
+            // Check if the service tag created by this bundle owner
+            if (st != null && st.getSource().equals(source)) {
+                // Install the system service tag if supported
+                // stclient may be installed after the service tag creation
+                if (Registry.isSupported()) {
+                    installSystemServiceTag();
+                }
+                return st;
+            }
+
+            // in case any exception thrown during the cleanup
+            cleanup = true;
+
+            // re-create a new one for this bundle owner
+            // first delete the registration data
+            deleteRegistrationData();
+            cleanup = false;
+
+            // create service tag and generate new register.html pages
+            return createServiceTag(source);
+        } finally {
+            if (cleanup) {
+                if (regXmlFile.exists()) {
+                    regXmlFile.delete();
+                }
+                if (serviceTagFile.exists()) {
+                    serviceTagFile.delete();
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns the Java SE registration data located in
+     * the <JRE>/lib/servicetag/registration.xml by default.
+     *
+     * @throws IllegalArgumentException if the registration data
+     *         is of invalid format.
+     */
+    private static synchronized RegistrationData getRegistrationData()
+            throws IOException {
+        if (registration != null) {
+            return registration;
+        }
+        if (regXmlFile.exists()) {
+            BufferedInputStream in = null;
+            try {
+                in = new BufferedInputStream(new FileInputStream(regXmlFile));
+                registration = RegistrationData.loadFromXML(in);
+            } catch (IllegalArgumentException ex) {
+                System.err.println("Error: Bad registration data \"" +
+                                    regXmlFile + "\":" + ex.getMessage());
+                throw ex;
+            } finally {
+                if (in != null) {
+                    in.close();
+                }
+            }
+        } else {
+            registration = new RegistrationData();
+        }
+        return registration;
+    }
+
+    /**
+     * Write the registration data to the registration.xml file.
+     *
+     * The offline registration page has to be regenerated with
+     * the new registration data.
+     *
+     * @throws java.io.IOException
+     */
+    private static synchronized void writeRegistrationXml()
+            throws IOException {
+        if (!svcTagDir.exists()) {
+            // This check is for NetBeans or other products that
+            // bundles this com.sun.servicetag implementation for
+            // pre-6u5 release.
+            if (!svcTagDir.mkdir()) {
+                throw new IOException("Failed to create directory: " + svcTagDir);
+            }
+        }
+
+        // regenerate the new offline registration page
+        deleteRegistrationHtmlPage();
+        getRegistrationHtmlPage();
+
+        BufferedOutputStream out = null;
+        try {
+            out = new BufferedOutputStream(new FileOutputStream(regXmlFile));
+            getRegistrationData().storeToXML(out);
+        } catch (IllegalArgumentException ex) {
+            System.err.println("Error: Bad registration data \"" +
+                                regXmlFile + "\":" + ex.getMessage());
+            throw ex;
+        } finally {
+            if (out != null) {
+                out.close();
+            }
+        }
+    }
+
+    /**
+     * Returns the instance urn(s) stored in the servicetag file
+     * or empty set if file not exists.
+     */
+    private static Set<String> getInstalledURNs() throws IOException {
+        Set<String> urnSet = new HashSet<String>();
+        if (serviceTagFile.exists()) {
+            BufferedReader in = null;
+            try {
+                in = new BufferedReader(new FileReader(serviceTagFile));
+                String urn;
+                while ((urn = in.readLine()) != null) {
+                    urn = urn.trim();
+                    if (urn.length() > 0) {
+                        urnSet.add(urn);
+                    }
+                }
+            } finally {
+                if (in != null) {
+                    in.close();
+                }
+            }
+        }
+        return urnSet;
+    }
+
+    /**
+     * Return the Java SE service tag(s) if it exists.
+     * Typically only one Java SE service tag but it could have two for
+     * Solaris 32-bit and 64-bit on the same install directory.
+     *
+     * @return the service tag(s) for Java SE
+     */
+    private static ServiceTag[] getJavaServiceTagArray() throws IOException {
+        RegistrationData regData = getRegistrationData();
+        Set<ServiceTag> svcTags = regData.getServiceTags();
+        Set<ServiceTag> result = new HashSet<ServiceTag>();
+
+        Properties props = loadSwordfishEntries();
+        String jdkUrn = props.getProperty("servicetag.jdk.urn");
+        String jreUrn = props.getProperty("servicetag.jre.urn");
+        for (ServiceTag st : svcTags) {
+            if (st.getProductURN().equals(jdkUrn) ||
+                st.getProductURN().equals(jreUrn)) {
+                result.add(st);
+            }
+        }
+        return result.toArray(new ServiceTag[0]);
+    }
+
+    /**
+     * Returns the Java SE service tag for this running platform;
+     * or null if not exist.
+     * This method will return the 64-bit service tag if the JDK
+     * supports both 32-bit and 64-bit if already created.
+     */
+    private static ServiceTag getJavaServiceTag() throws IOException {
+        String definedId = getProductDefinedId();
+        for (ServiceTag st : getJavaServiceTagArray()) {
+            if (st.getProductDefinedInstanceID().equals(definedId)) {
+                return st;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Create a service tag for Java SE and install in the system
+     * service tag registry if supported.
+     *
+     * A registration data <JRE>/lib/servicetag/registration.xml
+     * will be created to storeToXML the XML entry for Java SE service tag.
+     * If the system supports service tags, this method will install
+     * the Java SE service tag in the system service tag registry and
+     * its <tt>instance_urn</tt> will be stored to <JRE>/lib/servicetag/servicetag.
+     *
+     * If <JRE>/lib/servicetag/registration.xml exists but is not installed
+     * in the system service tag registry (i.e. servicetag doesn't exist),
+     * this method will install it as described above.
+     *
+     * If the system supports service tag, stclient will be used
+     * to create the Java SE service tag.
+     *
+     * A Solaris 32-bit and 64-bit JDK will be installed in the same
+     * directory but the registration.xml will have 2 service tags.
+     * The servicetag file will also contain 2 instance_urns for that case.
+     */
+    private static ServiceTag createServiceTag(String svcTagSource)
+            throws IOException {
+        // determine if a new service tag is needed to be created
+        ServiceTag newSvcTag = null;
+        if (getJavaServiceTag() == null) {
+            newSvcTag = newServiceTag(svcTagSource);
+        }
+
+        // Add the new service tag in the registration data
+        if (newSvcTag != null) {
+            RegistrationData regData = getRegistrationData();
+
+            // Add the service tag to the registration data in JDK/JRE
+            newSvcTag = regData.addServiceTag(newSvcTag);
+
+            // add if there is a service tag for the OS
+            ServiceTag osTag = SolarisServiceTag.getServiceTag();
+            if (osTag != null && regData.getServiceTag(osTag.getInstanceURN()) == null) {
+                regData.addServiceTag(osTag);
+            }
+            // write to the registration.xml
+            writeRegistrationXml();
+        }
+
+        // Install the system service tag if supported
+        if (Registry.isSupported()) {
+            installSystemServiceTag();
+        }
+        return newSvcTag;
+    }
+
+    private static void installSystemServiceTag() throws IOException {
+        // only install the service tag in the registry if
+        // it has permission to write the servicetag file.
+        if ((!serviceTagFile.exists() && !svcTagDir.canWrite()) ||
+                (serviceTagFile.exists() && !serviceTagFile.canWrite())) {
+            return;
+        }
+
+        Set<String> urns = getInstalledURNs();
+        ServiceTag[] javaSvcTags = getJavaServiceTagArray();
+        if (urns.size() < javaSvcTags.length) {
+            for (ServiceTag st : javaSvcTags) {
+                // Add the service tag in the system service tag registry
+                // if not installed
+                String instanceURN = st.getInstanceURN();
+                if (!urns.contains(instanceURN)) {
+                    Registry.getSystemRegistry().addServiceTag(st);
+                }
+            }
+        }
+        writeInstalledUrns();
+    }
+
+    private static ServiceTag newServiceTag(String svcTagSource) throws IOException {
+        // Load the swoRDFish information for the service tag creation
+        Properties props = loadSwordfishEntries();
+
+        // Determine the product URN and name
+        String productURN;
+        String productName;
+
+        if (isJdk()) {
+            // <HOME>/jre exists which implies it's a JDK
+            productURN = props.getProperty("servicetag.jdk.urn");
+            productName = props.getProperty("servicetag.jdk.name");
+        } else {
+            // Otherwise, it's a JRE
+            productURN = props.getProperty("servicetag.jre.urn");
+            productName = props.getProperty("servicetag.jre.name");
+        }
+
+        return ServiceTag.newInstance(ServiceTag.generateInstanceURN(),
+                                      productName,
+                                      System.getProperty("java.version"),
+                                      productURN,
+                                      props.getProperty("servicetag.parent.name"),
+                                      props.getProperty("servicetag.parent.urn"),
+                                      getProductDefinedId(),
+                                      SUN_VENDOR,
+                                      System.getProperty("os.arch"),
+                                      getZoneName(),
+                                      svcTagSource);
+    }
+
+    /**
+     * Delete the registration data, the offline registration pages and
+     * the service tags in the system service tag registry if installed.
+     *
+     * The registration.xml and servicetag file will be removed.
+     */
+    private static synchronized void deleteRegistrationData()
+            throws IOException {
+        try {
+            // delete the offline registration page
+            deleteRegistrationHtmlPage();
+
+            // Remove the service tag from the system ST registry if exists
+            Set<String> urns = getInstalledURNs();
+            if (urns.size() > 0 && Registry.isSupported()) {
+                for (String u : urns) {
+                    Registry.getSystemRegistry().removeServiceTag(u);
+                }
+            }
+            registration = null;
+        } finally {
+            // Delete the registration.xml and servicetag files if exists
+            if (regXmlFile.exists()) {
+                if (!regXmlFile.delete()) {
+                    throw new IOException("Failed to delete " + regXmlFile);
+                }
+            }
+            if (serviceTagFile.exists()) {
+                if (!serviceTagFile.delete()) {
+                    throw new IOException("Failed to delete " + serviceTagFile);
+                }
+            }
+        }
+    }
+
+    /**
+     * Updates the registration data to contain one single service tag
+     * for the running Java runtime.
+     */
+    private static synchronized void updateRegistrationData(String svcTagSource)
+            throws IOException {
+        RegistrationData regData = getRegistrationData();
+        ServiceTag curSvcTag = newServiceTag(svcTagSource);
+
+        ServiceTag[] javaSvcTags = getJavaServiceTagArray();
+        Set<String> urns = getInstalledURNs();
+        for (ServiceTag st : javaSvcTags) {
+            if (!st.getProductDefinedInstanceID().equals(curSvcTag.getProductDefinedInstanceID())) {
+                String instanceURN = st.getInstanceURN();
+                regData.removeServiceTag(instanceURN);
+
+                // remove it from the system service tag registry if exists
+                if (urns.contains(instanceURN) && Registry.isSupported()) {
+                    Registry.getSystemRegistry().removeServiceTag(instanceURN);
+                }
+            }
+        }
+        writeRegistrationXml();
+        writeInstalledUrns();
+    }
+
+    private static void writeInstalledUrns() throws IOException {
+        // if the Registry is not supported,
+        // remove the servicetag file
+        if (!Registry.isSupported() && serviceTagFile.exists()) {
+            serviceTagFile.delete();
+            return;
+        }
+
+        PrintWriter out = null;
+        try {
+            out = new PrintWriter(serviceTagFile);
+
+            ServiceTag[] javaSvcTags = getJavaServiceTagArray();
+            for (ServiceTag st : javaSvcTags) {
+                // Write the instance_run to the servicetag file
+                String instanceURN = st.getInstanceURN();
+                out.println(instanceURN);
+            }
+        } finally {
+            if (out != null) {
+                out.close();
+            }
+        }
+    }
+
+    /**
+     * Load the values associated with the swoRDFish metadata entries
+     * for Java SE. The swoRDFish metadata entries are different for
+     * different release.
+     *
+     * @param version Version of Java SE
+     */
+    private static synchronized Properties loadSwordfishEntries() throws IOException {
+        if (swordfishProps != null) {
+            return swordfishProps;
+        }
+
+        // The version string for Java SE 6 is 1.6.0
+        // We just need the minor number in the version string
+        int version = Util.getJdkVersion();
+
+        String filename = "/com/sun/servicetag/resources/javase_" +
+                version + "_swordfish.properties";
+        InputStream in = Installer.class.getClass().getResourceAsStream(filename);
+        if (in == null) {
+            return null;
+        }
+        swordfishProps = new Properties();
+        try {
+            swordfishProps.load(in);
+        } finally {
+            in.close();
+        }
+        return swordfishProps;
+    }
+
+    /**
+     * Returns the product defined instance ID for Java SE.
+     * It is a list of comma-separated name/value pairs:
+     *    "id=<full-version>  <arch> [<arch>]*"
+     *    "dir=<java.home system property value>"
+     *
+     * where <full-version> is the full version string of the JRE,
+     *       <arch> is the architecture that the runtime supports
+     *       (i.e. "sparc", "sparcv9", "i386", "amd64" (ISA list))
+     *
+     * For Solaris, it can be dual mode that can support both
+     * 32-bit and 64-bit. the "id" will be set to
+     *     "1.6.0_03-b02 sparc sparcv9"
+     *
+     * The "dir" property is included in the service tag to enable
+     * the Service Tag software to determine if a service tag for
+     * Java SE is invalid and perform appropriate service tag
+     * cleanup if necessary.  See RFE# 6574781 Service Tags Enhancement.
+     *
+     */
+    private static String getProductDefinedId() {
+        StringBuilder definedId = new StringBuilder();
+        definedId.append("id=");
+        definedId.append(System.getProperty("java.runtime.version"));
+
+        String[] archs = getJreArchs();
+        for (String name : archs) {
+            definedId.append(" " + name);
+        }
+
+        String location = ",dir=" + javaHome;
+        if ((definedId.length() + location.length()) < 256) {
+            definedId.append(",dir=");
+            definedId.append(javaHome);
+        } else {
+            // if it exceeds the limit, we will not include the location
+            if (isVerbose()) {
+                System.err.println("Warning: Product defined instance ID exceeds the field limit:");
+            }
+        }
+
+        return definedId.toString();
+    }
+
+    /**
+     * Returns the architectures that the runtime supports
+     *  (i.e. "sparc", "sparcv9", "i386", "amd64" (ISA list))
+     * The directory name where libjava.so is located.
+     *
+     * On Windows, returns the "os.arch" system property value.
+     */
+    private synchronized static String[] getJreArchs() {
+        if (jreArchs != null) {
+            return jreArchs;
+        }
+
+        Set<String> archs = new HashSet<String>();
+
+        String os = System.getProperty("os.name");
+        if (os.equals("SunOS") || os.equals("Linux")) {
+            // Traverse the directories under <JRE>/lib.
+            // If <JRE>/lib/<arch>/libjava.so exists, add <arch>
+            // to the product defined ID
+            File dir = new File(getJrePath() + File.separator + "lib");
+            if (dir.isDirectory()) {
+                String[] children = dir.list();
+                for (String name : children) {
+                    File f = new File(dir, name + File.separator + "libjava.so");
+                    if (f.exists()) {
+                        archs.add(name);
+                    }
+                }
+            }
+        } else {
+            // Windows - append the os.arch
+            archs.add(System.getProperty("os.arch"));
+        }
+        jreArchs = archs.toArray(new String[0]);
+        return jreArchs;
+    }
+
+    /**
+     * Return the zonename if zone is supported; otherwise, return
+     * "global".
+     */
+    public static String getZoneName() throws IOException {
+        String zonename = "global";
+
+        String command = "/usr/bin/zonename";
+        File f = new File(command);
+        // com.sun.servicetag package has to be compiled with JDK 5 as well
+        // JDK 5 doesn't support the File.canExecute() method.
+        // Risk not checking isExecute() for the zonename command is very low.
+        if (f.exists()) {
+            ProcessBuilder pb = new ProcessBuilder(command);
+            Process p = pb.start();
+            String output = commandOutput(p);
+            if (p.exitValue() == 0) {
+                zonename = output.trim();
+            }
+
+        }
+        return zonename;
+    }
+
+    private synchronized static String getRegisterHtmlParent() throws IOException {
+        if (registerHtmlParent == null) {
+            File htmlDir;    // register.html is put under the JDK directory
+            if (getJrePath().endsWith(File.separator + "jre")) {
+                htmlDir = new File(getJrePath(), "..");
+            } else {
+                // j2se non-image build
+                htmlDir = new File(getJrePath());
+            }
+
+            // initialize the supported locales
+            initSupportedLocales(htmlDir);
+
+            // Determine the location of the offline registration page
+            String path = System.getProperty(SVCTAG_DIR_PATH);
+            if (path == null) {
+                // Default is <JDK>/register.html
+                registerHtmlParent = htmlDir.getCanonicalPath();
+            } else {
+                File f = new File(path);
+                registerHtmlParent = f.getCanonicalPath();
+                if (!f.isDirectory()) {
+                    throw new InternalError("Path " + path + " set in \"" +
+                            SVCTAG_DIR_PATH + "\" property is not a directory");
+                }
+            }
+        }
+        return registerHtmlParent;
+    }
+
+    /**
+     * Returns the File object of the offline registration page localized
+     * for the default locale in the JDK directory.
+     */
+    static synchronized File getRegistrationHtmlPage() throws IOException {
+        if (!supportRegistration) {
+            // No register.html page generated if JRE
+            return null;
+        }
+
+        String parent = getRegisterHtmlParent();
+
+        // check if the offline registration page is already generated
+        File f = new File(parent, REGISTRATION_HTML_NAME + ".html");
+        if (!f.exists()) {
+            // Generate the localized version of the offline registration Page
+            generateRegisterHtml(parent);
+        }
+
+        String name = REGISTRATION_HTML_NAME;
+        List<Locale> candidateLocales = getCandidateLocales(Locale.getDefault());
+        for (Locale l : candidateLocales) {
+            if (supportedLocales.contains(l)) {
+                name = REGISTRATION_HTML_NAME + "_" + l.toString();
+                break;
+            }
+        }
+        File htmlFile = new File(parent, name + ".html");
+        if (isVerbose()) {
+            System.out.print("Offline registration page: " + htmlFile);
+            System.out.println((htmlFile.exists() ?
+                               "" : " not exist. Use register.html"));
+        }
+        if (htmlFile.exists()) {
+            return htmlFile;
+        } else {
+            return new File(parent,
+                            REGISTRATION_HTML_NAME + ".html");
+        }
+    }
+
+    private static List<Locale> getCandidateLocales(Locale locale) {
+        String language = locale.getLanguage();
+        String country = locale.getCountry();
+        String variant = locale.getVariant();
+
+        List<Locale> locales = new ArrayList<Locale>(3);
+        if (variant.length() > 0) {
+            locales.add(locale);
+        }
+        if (country.length() > 0) {
+            locales.add((locales.size() == 0) ?
+                        locale : new Locale(language, country, ""));
+        }
+        if (language.length() > 0) {
+            locales.add((locales.size() == 0) ?
+                        locale : new Locale(language, "", ""));
+        }
+        return locales;
+    }
+
+    // Remove the offline registration pages
+    private static void deleteRegistrationHtmlPage() throws IOException {
+        String parent = getRegisterHtmlParent();
+        if (parent == null) {
+            return;
+        }
+
+        for (Locale locale : supportedLocales) {
+            String name = REGISTRATION_HTML_NAME;
+            if (!locale.equals(Locale.ENGLISH)) {
+                name += "_" + locale.toString();
+            }
+            File f = new File(parent, name + ".html");
+            if (f.exists()) {
+                if (!f.delete()) {
+                    throw new IOException("Failed to delete " + f);
+                }
+            }
+        }
+    }
+
+    private static void initSupportedLocales(File jdkDir) {
+        if (supportedLocales.isEmpty()) {
+            // initialize with the known supported locales
+            for (Locale l : knownSupportedLocales) {
+                supportedLocales.add(l);
+            }
+        }
+
+        // Determine unknown supported locales if any
+        // by finding the localized version of README.html
+        // This prepares if a new locale in JDK is supported in
+        // e.g. in the OpenSource world
+        FilenameFilter ff = new FilenameFilter() {
+            public boolean accept(File dir, String name) {
+                String fname = name.toLowerCase();
+                if (fname.startsWith("readme") && fname.endsWith(".html")) {
+                    return true;
+                }
+                return false;
+            }
+        };
+
+        String[] readmes = jdkDir.list(ff);
+        for (String name : readmes) {
+            String basename = name.substring(0, name.length() - ".html".length());
+            String[] ss = basename.split("_");
+            switch (ss.length) {
+                case 1:
+                    // English version
+                    break;
+                case 2:
+                    supportedLocales.add(new Locale(ss[1]));
+                    break;
+                case 3:
+                    supportedLocales.add(new Locale(ss[1], ss[2]));
+                    break;
+                default:
+                    // ignore
+                    break;
+            }
+        }
+        if (isVerbose()) {
+            System.out.println("Supported locales: ");
+            for (Locale l : supportedLocales) {
+                System.out.println(l);
+            }
+        }
+    }
+
+    private static final String JDK_HEADER_PNG_KEY = "@@JDK_HEADER_PNG@@";
+    private static final String JDK_VERSION_KEY = "@@JDK_VERSION@@";
+    private static final String REGISTRATION_URL_KEY = "@@REGISTRATION_URL@@";
+    private static final String REGISTRATION_PAYLOAD_KEY = "@@REGISTRATION_PAYLOAD@@";
+
+    @SuppressWarnings("unchecked")
+    private static void generateRegisterHtml(String parent) throws IOException {
+        int version = Util.getJdkVersion();
+        int update = Util.getUpdateVersion();
+        String jdkVersion = "Version " + version;
+        if (update > 0) {
+            // product name is not translated
+            jdkVersion += " Update " + update;
+        }
+        RegistrationData regData = getRegistrationData();
+        String registerURL = SunConnection.getRegistrationURL(
+                                 regData.getRegistrationURN()).toString();
+        // Make sure it uses the canonical path before getting the URI.
+        File img = new File(svcTagDir.getCanonicalPath(), "jdk_header.png");
+        String headerImageSrc = img.toURI().toString();
+
+        // Format the registration data in one single line
+        StringBuilder payload = new StringBuilder();
+        String xml = regData.toString().replaceAll("\"", "%22");
+        BufferedReader reader = new BufferedReader(new StringReader(xml));
+        try {
+            String line = null;
+            while ((line = reader.readLine()) != null) {
+                payload.append(line.trim());
+            }
+        } finally {
+            reader.close();
+        }
+
+        String resourceFilename = "/com/sun/star/servicetag/resources/register";
+        for (Locale locale : supportedLocales) {
+            String name = REGISTRATION_HTML_NAME;
+            String resource = resourceFilename;
+            if (!locale.equals(Locale.ENGLISH)) {
+                name += "_" + locale.toString();
+                resource += "_" + locale.toString();
+            }
+            File f = new File(parent, name + ".html");
+            InputStream in = null;
+            BufferedReader br = null;
+            PrintWriter pw = null;
+            try {
+                in = Installer.class.getClass().getResourceAsStream(resource + ".html");
+                if (in == null) {
+                    // if the resource file is missing
+                    if (isVerbose()) {
+                        System.out.println("Missing resouce file: " + resource + ".html");
+                    }
+                    continue;
+                }
+                if (isVerbose()) {
+                    System.out.println("Generating " + f + " from " + resource + ".html");
+                }
+
+                br = new BufferedReader(new InputStreamReader(in, "UTF-8"));
+                pw = new PrintWriter(f, "UTF-8");
+                String line = null;
+                while ((line = br.readLine()) != null) {
+                    String output = line;
+                    if (line.contains(JDK_VERSION_KEY)) {
+                        output = line.replace(JDK_VERSION_KEY, jdkVersion);
+                    } else if (line.contains(JDK_HEADER_PNG_KEY)) {
+                        output = line.replace(JDK_HEADER_PNG_KEY, headerImageSrc);
+                    } else if (line.contains(REGISTRATION_URL_KEY)) {
+                        output = line.replace(REGISTRATION_URL_KEY, registerURL);
+                    } else if (line.contains(REGISTRATION_PAYLOAD_KEY)) {
+                        output = line.replace(REGISTRATION_PAYLOAD_KEY, payload.toString());
+                    }
+                    pw.println(output);
+                }
+                f.setReadOnly();
+                pw.flush();
+            } finally {
+                if (pw != null) {
+                    pw.close();
+                }
+                if (in != null) {
+                    in.close();
+                }
+                if (br!= null) {
+                    br.close();
+                }
+            }
+        }
+    }
+
+    /**
+     * A utility class to create a service tag for Java SE.
+     * <p>
+     * <b>Usage:</b><br>
+     * <blockquote><tt>
+     * &lt;JAVA_HOME&gt;/bin/java com.sun.servicetag.Installer
+     * </tt></blockquote>
+     * <p>
+     */
+    public static void main(String[] args) {
+        String source = "Manual";
+
+        // Parse the options (arguments starting with "-" )
+        boolean delete = false;
+        boolean update = false;
+        boolean register = false;
+        int count = 0;
+        while (count < args.length) {
+            String arg = args[count];
+            if (arg.trim().length() == 0) {
+                // skip empty arguments
+                count++;
+                continue;
+            }
+
+            if (arg.equals("-source")) {
+                source = args[++count];
+            } else if (arg.equals("-delete")) {
+                delete = true;
+            } else if (arg.equals("-register")) {
+                register = true;
+            } else {
+                usage();
+                return;
+            }
+            count++;
+        }
+        try {
+            if (delete) {
+                deleteRegistrationData();
+            } else {
+                ServiceTag[] javaSvcTags = getJavaServiceTagArray();
+                String[] archs = getJreArchs();
+                if (javaSvcTags.length > archs.length) {
+                    // 64-bit has been uninstalled
+                    // so remove the service tag
+                    updateRegistrationData(source);
+                } else {
+                    // create the service tag
+                    createServiceTag(source);
+                }
+            }
+
+            if (register) {
+                // Registration is only supported by JDK
+                // For testing purpose, override with a "servicetag.enable.registration" property
+
+                RegistrationData regData = getRegistrationData();
+                if (supportRegistration && !regData.getServiceTags().isEmpty()) {
+                    SunConnection.register(regData);
+                }
+            }
+        System.exit(0);
+        } catch (IOException e) {
+            System.err.println("I/O Error: " + e.getMessage());
+            if (isVerbose()) {
+                e.printStackTrace();
+            }
+        } catch (IllegalArgumentException ex) {
+            if (isVerbose()) {
+                ex.printStackTrace();
+            }
+        } catch (Exception e) {
+            System.err.println("Error: " + e.getMessage());
+            if (isVerbose()) {
+                e.printStackTrace();
+            }
+        }
+    System.exit(1);
+    }
+
+    private static void usage() {
+        System.out.println("Usage:");
+        System.out.print("    " + Installer.class.getName());
+        System.out.println(" [-delete|-source <source>|-register]");
+        System.out.println("       to create a service tag for the Java platform");
+        System.out.println("");
+        System.out.println("Internal Options:");
+        System.out.println("    -source: to specify the source of the service tag to be created");
+        System.out.println("    -delete: to delete the service tag ");
+        System.out.println("    -register: to register the JDK");
+        System.out.println("    -help:   to print this help message");
+    }
+}
diff --git a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
new file mode 100644
index 000000000000..90e38021c103
--- /dev/null
+++ b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
@@ -0,0 +1,194 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: LinuxSystemEnvironment.java,v $
+ *
+ * $Revision: 1.2 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+package com.sun.star.servicetag;
+
+// The Service Tags team maintains the latest version of the implementation
+// for system environment data collection.  JDK will include a copy of
+// the most recent released version for a JDK release.  We rename
+// the package to com.sun.servicetag so that the Sun Connection
+// product always uses the latest version from the com.sun.scn.servicetags
+// package. JDK and users of the com.sun.servicetag API
+// (e.g. NetBeans and SunStudio) will use the version in JDK.
+
+import java.io.*;
+
+/**
+ * Linux implementation of the SystemEnvironment class.
+ */
+class LinuxSystemEnvironment extends SystemEnvironment {
+    LinuxSystemEnvironment() {
+        setHostId(getLinuxHostId());
+        setSystemModel(getCommandOutput("/bin/uname", "-i"));
+        setSystemManufacturer(getLinuxSystemManufacturer());
+        setCpuManufacturer(getLinuxCpuManufacturer());
+        setSerialNumber(getLinuxSN());
+    }
+    private String dmiInfo = null;
+
+    private static final int SN  = 1;
+    private static final int SYS = 2;
+    private static final int CPU = 3;
+
+    private String getLinuxHostId() {
+        String output = getCommandOutput("/usr/bin/hostid");
+        // trim off the leading 0x
+        if (output.startsWith("0x")) {
+            output = output.substring(2);
+        }
+        return output;
+    }
+
+    /**
+     * Tries to obtain and return the cpu manufacturer.
+     * @return The cpu manufacturer (an empty string if not found or an error occurred)
+     */
+    private String getLinuxCpuManufacturer() {
+        String tmp = getLinuxPSNInfo(CPU);
+        if (tmp.length() > 0) {
+            return tmp;
+        }
+
+        String contents = getFileContent("/proc/cpuinfo");
+        for (String line : contents.split("\n")) {
+            if (line.contains("vendor_id")) {
+                String[] ss = line.split(":", 2);
+                if (ss.length > 1) {
+                    return ss[1].trim();
+                }
+            }
+        }
+
+        // returns an empty string if it can't be found or an error happened
+        return getLinuxDMIInfo("dmi type 4", "manufacturer");
+    }
+
+
+    /**
+     * Tries to obtain and return the system manufacturer.
+     * @return The system manufacturer (an empty string if not found or an error occurred)
+     */
+    private String getLinuxSystemManufacturer() {
+        String tmp = getLinuxPSNInfo(SYS);
+        if (tmp.length() > 0) {
+            return tmp;
+        }
+
+        // returns an empty string if it can't be found or an error happened
+        return getLinuxDMIInfo("dmi type 1", "manufacturer");
+    }
+
+    /**
+     * Tries to obtain and return the serial number of the system.
+     * @return The serial number (an empty string if not found or an error occurred)
+     */
+    private String getLinuxSN() {
+        String tmp = getLinuxPSNInfo(SN);
+        if (tmp.length() > 0) {
+            return tmp;
+        }
+
+        // returns an empty string if it can't be found or an error happened
+        return getLinuxDMIInfo("dmi type 1", "serial number");
+    }
+
+    private String getLinuxPSNInfo(int target) {
+        // try to read from the psn file if it exists
+        String contents = getFileContent("/var/run/psn");
+        String[] ss = contents.split("\n");
+        if (target <= ss.length) {
+            return ss[target-1];
+        }
+
+        // default case is to return ""
+        return "";
+    }
+
+    // reads from dmidecode with the given type and target
+    // returns an empty string if nothing was found or an error occurred
+    //
+    // Sample output segment:
+    // Handle 0x0001
+    //         DMI type 1, 25 bytes.
+    //         System Information
+    //                 Manufacturer: System manufacturer
+    //                 Product Name: System Product Name
+    //                 Version: System Version
+    //                 Serial Number: System Serial Number
+    //                 UUID: 3091D719-B25B-D911-959D-6D1B12C7686E
+    //                 Wake-up Type: Power Switch
+
+    private synchronized String getLinuxDMIInfo(String dmiType, String target) {
+        // only try to get dmidecode information once, after that, we can
+        // reuse the output
+        if (dmiInfo == null) {
+            Thread dmidecodeThread = new Thread() {
+                public void run() {
+                    dmiInfo = getCommandOutput("/usr/sbin/dmidecode");
+                }
+            };
+            dmidecodeThread.start();
+
+            try {
+                dmidecodeThread.join(2000);
+                if (dmidecodeThread.isAlive()) {
+                    dmidecodeThread.interrupt();
+                    dmiInfo = "";
+                }
+            } catch (InterruptedException ie) {
+                dmidecodeThread.interrupt();
+            }
+        }
+
+        if (dmiInfo.length() == 0) {
+            return "";
+        }
+        boolean dmiFlag = false;
+        for (String s : dmiInfo.split("\n")) {
+            String line = s.toLowerCase();
+            if (dmiFlag) {
+                if (line.contains(target)) {
+                    String key = target + ":";
+                    int indx = line.indexOf(key) + key.length();
+                    if (line.contains(key) && indx < line.length()) {
+                        return line.substring(indx).trim();
+                    }
+                    String[] ss = line.split(":");
+                    return ss[ss.length-1];
+                }
+            } else if (line.contains(dmiType)) {
+                dmiFlag = true;
+            }
+        }
+        return "";
+    }
+
+}
diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
new file mode 100644
index 000000000000..57be724a78a3
--- /dev/null
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
@@ -0,0 +1,473 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: RegistrationData.java,v $
+ *
+ * $Revision: 1.2 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+package com.sun.star.servicetag;
+
+import java.io.*;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import static com.sun.star.servicetag.RegistrationDocument.*;
+
+/**
+ * A {@code RegistrationData} object is a container of one or more
+ * {@link #getServiceTags service tags} that identify the
+ * components for product registration.
+ * Each {@code RegistrationData} object has a {@link #getRegistrationURN
+ * uniform resource name} (URN) as its identifier.
+ * <a name="EnvMap"></a>
+ * It also has an <i>environment map</i> with
+ * the following elements:
+ * <blockquote>
+ *       <table border=0>
+ *       <tr>
+ *          <td><tt>hostname</tt></td>
+ *          <td>Hostname of the system</td>
+ *          <td>e.g. woody</td>
+ *       </tr>
+ *       <tr>
+ *          <td><tt>hostId</tt></td>

path: root/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch

diff -ru UnpackedTarball/langtag.orig/liblangtag/lt-string.c UnpackedTarball/langtag/liblangtag/lt-string.c
--- UnpackedTarball/langtag.orig/liblangtag/lt-string.c	2013-04-22 10:35:07.000000000 +0200
+++ UnpackedTarball/langtag/liblangtag/lt-string.c	2013-04-30 18:34:14.422037274 +0200
@@ -308,8 +308,12 @@
 	lt_return_val_if_fail (string != NULL, NULL);
 	lt_return_val_if_fail (path != NULL, string);
 
+#ifdef _WIN32
+    /* This simply does not work on Windows with "D:\..." */
+#else
 	if (lt_string_length(string) == 0 && path[0] != LT_DIR_SEPARATOR)
 		lt_string_append(string, LT_DIR_SEPARATOR_S);
+#endif
 
 	va_start(ap, path);
 	p = path;