1 files changed, 1 insertions, 1 deletions
diff --git a/offapi/com/sun/star/text/TextTableRow.idl b/offapi/com/sun/star/text/TextTableRow.idl
index 1d5947a051a9..b1eca1467b89 100644
--- a/offapi/com/sun/star/text/TextTableRow.idl
+++ b/offapi/com/sun/star/text/TextTableRow.idl
@@ -111,7 +111,7 @@ published service TextTableRow
 
         /** If <TRUE/>, the row is allowed to be split at page or column breaks.
 
-                @since OOo 2.0.0
+                @since OOo 2.0
          */
         [optional, property, maybevoid] boolean IsSplitAllowed;
 
diff --git a/avmedia/source/quicktime/avmediaQuickTime.map b/avmedia/source/quicktime/avmediaQuickTime.map
deleted file mode 100644
index bf1fbe0696c8..000000000000
--- a/avmedia/source/quicktime/avmediaQuickTime.map
+++ /dev/null
@@ -1,8 +0,0 @@
-LEXPS_1_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
index 088f3b5d0ef3..f3c9f244f357 100644
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -73,7 +73,7 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1IMPLIB=i$(TARGET)
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Targets ------------------------------------------------------
 
diff --git a/basic/inc/basic/sberrors.hxx b/basic/inc/basic/sberrors.hxx
index c21b3b0237b8..c34176e0bde7 100644
--- a/basic/inc/basic/sberrors.hxx
+++ b/basic/inc/basic/sberrors.hxx
@@ -287,6 +287,8 @@ typedef ULONG SbError;
 #define ERRCODE_BASIC_LOOP_NOT_INIT         ((LAST_SBX_ERROR_ID+109UL) | ERRCODE_AREA_SBX | \
                                             ERRCODE_CLASS_COMPILER)             // For loop not initialized
 
+#define ERRCODE_BASIC_COMPAT                ((LAST_SBX_ERROR_ID+103UL)| ERRCODE_AREA_SBX | ERRCODE_CLASS_RUNTIME)
+
 // Map old codes to new codes
 #define SbERR_SYNTAX                        ERRCODE_BASIC_SYNTAX
 #define SbERR_NO_GOSUB                      ERRCODE_BASIC_NO_GOSUB
@@ -410,6 +412,7 @@ typedef ULONG SbError;
 #define SbERR_PROG_TOO_LARGE                ERRCODE_BASIC_PROG_TOO_LARGE
 #define SbERR_NO_STRINGS_ARRAYS             ERRCODE_BASIC_NO_STRINGS_ARRAYS
 #define SbERR_BASIC_EXCEPTION               ERRCODE_BASIC_EXCEPTION
+#define SbERR_BASIC_COMPAT                  ERRCODE_BASIC_COMPAT
 #define SbERR_BASIC_ARRAY_FIX               ERRCODE_BASIC_ARRAY_FIX
 #define SbERR_BASIC_STRING_OVERFLOW         ERRCODE_BASIC_STRING_OVERFLOW
 #define SbERR_BASIC_EXPR_TOO_COMPLEX        ERRCODE_BASIC_EXPR_TOO_COMPLEX
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index d73c9780b1bb..63ffef6cdd61 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -31,9 +31,7 @@
 #include <basic/sbdef.hxx>
 #include <basic/sbxobj.hxx>
 #include <basic/sbxdef.hxx>
-#ifndef _RTL_USTRING_HXX
 #include <rtl/ustring.hxx>
-#endif
 
 class SbMethod;
 class SbProperty;
@@ -63,6 +61,10 @@ protected:
     SbiImage*           pImage;        // the Image
     SbiBreakpoints*     pBreaks;       // Breakpoints
     SbClassData*        pClassData;
+    BOOL mbVBACompat;
+    INT32 mnType;
+    SbxObjectRef pDocObject; // an impl object ( used by Document Modules )
+    bool    bIsProxyModule;
 
     void            StartDefinitions();
     SbMethod*       GetMethod( const String&, SbxDataType );
@@ -87,7 +89,7 @@ protected:
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2);
     TYPEINFO();
-                    SbModule( const String& );
+                    SbModule( const String&, BOOL bCompat = FALSE );
     virtual void    SetParent( SbxObject* );
     virtual void    Clear();
 
@@ -123,6 +125,11 @@ public:
     BOOL LoadBinaryData( SvStream& );
     BOOL ExceedsLegacyModuleSize();
     void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
+        BOOL IsVBACompat();
+        void SetVBACompat( BOOL bCompat );
+        INT32 GetModuleType() { return mnType; }
+        void SetModuleType( INT32 nType ) { mnType = nType; }
+    bool GetIsProxyModule() { return bIsProxyModule; }
 };
 
 #ifndef __SB_SBMODULEREF_HXX
diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx
new file mode 100644
index 000000000000..ad804dcfab38
--- /dev/null
+++ b/basic/inc/basic/sbobjmod.hxx
@@ -0,0 +1,97 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: sbobjmod.hxx,v $
+ *
+ *  $Revision: 1.4 $
+ *
+ *  last change: $Author:  $ $Date: 2007/08/27 16:31:39 $
+ *
+ *  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 _SB_OBJMOD_HXX
+#define _SB_OBJMOD_HXX
+
+#include <basic/sbmod.hxx>
+#include <basic/sbstar.hxx>
+#include <com/sun/star/script/ModuleInfo.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/awt/XDialog.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+
+namespace css = ::com::sun::star;
+
+// Basic-Module for excel object.
+
+class SbObjModule : public SbModule
+{
+    SbObjModule( const SbObjModule& );
+    SbObjModule();
+public:
+    TYPEINFO();
+    SbObjModule( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
+    virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
+    using SbxValue::GetObject;
+    SbxVariable* GetObject();
+    void SetUnoObject( const com::sun::star::uno::Any& aObj )throw ( com::sun::star::uno::RuntimeException ) ;
+};
+
+class SbUserFormModule : public SbObjModule
+{
+    css::uno::Reference<css::lang::XEventListener> m_DialogListener;
+    css::uno::Reference<css::awt::XDialog> m_xDialog;
+    css::uno::Reference<css::frame::XModel> m_xModel;
+    String sFormName;
+    bool mbInit;
+    SbUserFormModule( const SbUserFormModule& );
+    SbUserFormModule();
+
+protected:
+    virtual void InitObject();
+public:
+    TYPEINFO();
+    SbUserFormModule( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
+    virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
+    void ResetApiObj();
+    void Unload();
+    void load();
+    void triggerMethod( const String& );
+    void triggerMethod( const String&, css::uno::Sequence< css::uno::Any >&  );
+    void triggerActivateEvent();
+    void triggerDeActivateEvent();
+    void triggerInitializeEvent();
+    void triggerTerminateEvent();
+};
+
+#ifndef __SB_SBOBJMODULEREF_HXX
+#define __SB_SBOBJMODULEREF_HXX
+
+SV_DECL_IMPL_REF(SbObjModule);
+
+#endif
+#endif
+
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index bdc4aa011cc9..a234dc206ec7 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -37,6 +37,7 @@
 
 #include <basic/sbdef.hxx>
 #include <basic/sberrors.hxx>
+#include <com/sun/star/script/ModuleInfo.hpp>
 
 class SbModule;                     // completed module
 class SbiInstance;                  // runtime instance
@@ -69,6 +70,7 @@ class StarBASIC : public SbxObject
     BOOL            bNoRtl;                 // if TRUE: do not search RTL
     BOOL            bBreak;                 // if TRUE: Break, otherwise Step
     BOOL            bDocBasic;
+    BOOL            bVBAEnabled;
     BasicLibInfo*   pLibInfo;           // Info block for basic manager
     SbLanguageMode  eLanguageMode;      // LanguageMode of the basic object
     BOOL            bQuit;
@@ -117,6 +119,7 @@ public:
     // Compiler-Interface
     SbModule*       MakeModule( const String& rName, const String& rSrc );
     SbModule*       MakeModule32( const String& rName, const ::rtl::OUString& rSrc );
+    SbModule*       MakeModule32( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, const ::rtl::OUString& rSrc );
     BOOL            Compile( SbModule* );
     BOOL            Disassemble( SbModule*, String& rText );
     static void     Stop();
@@ -189,6 +192,8 @@ public:
                     ( const String& rName, USHORT& rStatus );
     static SbMethod* GetActiveMethod( USHORT nLevel = 0 );
     static SbModule* GetActiveModule();
+    void SetVBAEnabled( BOOL bEnabled );
+    BOOL isVBAEnabled();
 
     // #60175 TRUE: SFX-Resource is not displayed on basic errors
     static void StaticSuppressSfxResource( BOOL bSuppress );
diff --git a/basic/inc/basic/sbuno.hxx b/basic/inc/basic/sbuno.hxx
index 68e2c6ab8778..d816d424313b 100644
--- a/basic/inc/basic/sbuno.hxx
+++ b/basic/inc/basic/sbuno.hxx
@@ -41,5 +41,7 @@ void createAllObjectProperties( SbxObject* pObj );
 
 ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
 
+void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue );
+
 #endif
 
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index cab46edc0185..e8f9e004ca6a 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -187,7 +187,7 @@
 #include "svtools/svmedit.hxx"
 #include "svl/svstdarr.hxx"
 #include "svtools/svtdata.hxx"
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #include "svtools/svtreebx.hxx"
 #include "unotools/syslocale.hxx"
 #include "svtools/taskbar.hxx"
diff --git a/basic/prj/build.lst b/basic/prj/build.lst
index 994901580c86..9453154edf46 100644..100755
--- a/basic/prj/build.lst
+++ b/basic/prj/build.lst
@@ -1,11 +1,11 @@
-sb	basic	:    l10n offuh svtools xmlscript framework NULL
+sb	basic	:    l10n offuh oovbaapi 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
 sb	basic\source\basmgr						nmake	-	all	sb_mgr sb_inc NULL
 sb	basic\source\classes					nmake	-	all	sb_class sb_inc NULL
 sb	basic\source\comp						nmake	-	all	sb_comp sb_inc NULL
-sb	basic\source\runtime					nmake	-	all	sb_rt sb_inc NULL
+sb	basic\source\runtime					nmake	-	all	sb_rt sb_inc sb_class NULL
 sb	basic\source\sample						nmake	-	all	sb_samp sb_inc NULL
 sb	basic\source\sbx						nmake	-	all	sb_sbx sb_inc NULL
 sb	basic\source\uno                        nmake	-	all	sb_uno sb_inc NULL
diff --git a/basic/source/app/basic.src b/basic/source/app/basic.src
index fe7bcff7f6b3..0713fd859f56 100644
--- a/basic/source/app/basic.src
+++ b/basic/source/app/basic.src
@@ -87,7 +87,7 @@ ModalDialog IDD_ABOUT_DIALOG {
     FixedText  {
             Pos = MAP_APPFONT( 40, 60 );
             Size = MAP_APPFONT( 110, 10 );
-            TEXT = "�1995 Sun Microsystems, Inc.";
+            TEXT = "�1995-2010 Oracle";
             CENTER = TRUE;
         };
     };
@@ -127,7 +127,7 @@ ModalDialog IDD_TT_ABOUT_DIALOG {
             Pos = MAP_APPFONT( 5, 40 );
             Size = MAP_APPFONT( 110, 10 );
             CENTER = TRUE;
-        TEXT[ en-US ] = "©1995-2005 Sun Microsystems, Inc.";
+        TEXT[ en-US ] = "©1995-2010 Oracle";
     };
     OKButton RID_OK {
             Pos = MAP_APPFONT( 40, 60 );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index da792f269fc9..c242165df825 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -41,6 +41,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <basic/sbmod.hxx>
+#include <basic/sbobjmod.hxx>
 
 #include <basic/sbuno.hxx>
 #include <basic/basmgr.hxx>
@@ -65,6 +66,9 @@
 #include <com/sun/star/script/XStarBasicDialogInfo.hpp>
 #include <com/sun/star/script/XStarBasicLibraryInfo.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
+#include <com/sun/star/script/ModuleInfo.hpp>
+#include <com/sun/star/script/XVBAModuleInfo.hpp>
+#include <com/sun/star/script/XVBACompat.hpp>
 
 #include <cppuhelper/implbase1.hxx>
 
@@ -97,20 +101,13 @@ typedef WeakImplHelper1< XStarBasicAccess > StarBasicAccessHelper;
 //  + BOOL      bReference
 
 static const char* szStdLibName = "Standard";
-static const char* szBasicStorage = "StarBASIC";
+static const char szBasicStorage[] = "StarBASIC";
 static const char* szOldManagerStream = "BasicManager";
-static const char* szManagerStream = "BasicManager2";
+static const char szManagerStream[] = "BasicManager2";
 static const char* szImbedded = "LIBIMBEDDED";
 static const char* szCryptingKey = "CryptedBasic";
 static const char* szScriptLanguage = "StarBasic";
 
-static const String BasicStreamName( String::CreateFromAscii(szBasicStorage) );
-static const String ManagerStreamName( String::CreateFromAscii(szManagerStream) );
-
-
-#define DEFINE_CONST_UNICODE(CONSTASCII)    UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
-
-
 TYPEINIT1( BasicManager, SfxBroadcaster );
 DBG_NAME( BasicManager );
 
@@ -243,7 +240,15 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr,
             Any aElement = xLibNameAccess->getByName( aModuleName );
             ::rtl::OUString aMod;
             aElement >>= aMod;
-            pLib->MakeModule32( aModuleName, aMod );
+            Reference< XVBAModuleInfo > xVBAModuleInfo( xLibNameAccess, UNO_QUERY );
+            if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( aModuleName ) )
+            {
+                ModuleInfo mInfo = xVBAModuleInfo->getModuleInfo( aModuleName );
+                OSL_TRACE("#addLibraryModulesImpl - aMod");
+                pLib->MakeModule32( aModuleName, mInfo, aMod );
+            }
+            else
+        pLib->MakeModule32( aModuleName, aMod );
         }
     }
 
@@ -277,11 +282,16 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const ContainerEvent
     {
         Reference< XLibraryContainer > xScriptCont( Event.Source, UNO_QUERY );
         insertLibraryImpl( xScriptCont, mpMgr, Event.Element, aName );
+        StarBASIC* pLib = mpMgr->GetLib( aName );
+        if ( pLib )
+        {
+            Reference<XVBACompat> xVBACompat( xScriptCont, UNO_QUERY );
+            if ( xVBACompat.is() )
+                pLib->SetVBAEnabled( xVBACompat->getVBACompatModeOn() );
+        }
     }
     else
     {
-        ::rtl::OUString aMod;
-        Event.Element >>= aMod;
 
         StarBASIC* pLib = mpMgr->GetLib( maLibName );
         DBG_ASSERT( pLib, "BasMgrContainerListenerImpl::elementInserted: Unknown lib!");
@@ -290,7 +300,16 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const ContainerEvent
             SbModule* pMod = pLib->FindModule( aName );
             if( !pMod )
             {
-                pLib->MakeModule32( aName, aMod );
+            ::rtl::OUString aMod;
+            Event.Element >>= aMod;
+                Reference< XVBAModuleInfo > xVBAModuleInfo( Event.Source, UNO_QUERY );
+                if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( aName ) )
+                {
+                    ModuleInfo mInfo = xVBAModuleInfo->getModuleInfo( aName );
+                    pLib->MakeModule32( aName, mInfo, aMod );
+                }
+                else
+                    pLib->MakeModule32( aName, aMod );
                 pLib->SetModified( FALSE );
             }
         }
@@ -319,10 +338,11 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const ContainerEvent
         SbModule* pMod = pLib->FindModule( aName );
         ::rtl::OUString aMod;
         Event.Element >>= aMod;
+
         if( pMod )
-            pMod->SetSource32( aMod );
+                pMod->SetSource32( aMod );
         else
-            pLib->MakeModule32( aName, aMod );
+                pLib->MakeModule32( aName, aMod );
 
         pLib->SetModified( FALSE );
     }
@@ -666,7 +686,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
     // DBG_ASSERT(aStorageName.Len() != 0, "Bad storage name");
 
     // If there is no Manager Stream, no further actions are necessary
-    if ( rStorage.IsStream( ManagerStreamName ) )
+    if ( rStorage.IsStream( String(RTL_CONSTASCII_USTRINGPARAM(szManagerStream)) ) )
     {
         LoadBasicManager( rStorage, rBaseURL );
         // StdLib contains Parent:
@@ -707,12 +727,12 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
         // #91626 Save all stream data to save it unmodified if basic isn't modified
         // in an 6.0+ office. So also the old basic dialogs can be saved.
         SotStorageStreamRef xManagerStream = rStorage.OpenSotStream
-            ( ManagerStreamName, eStreamReadMode );
+            ( String(RTL_CONSTASCII_USTRINGPARAM(szManagerStream)), eStreamReadMode );
         mpImpl->mpManagerStream = new SvMemoryStream();
         *static_cast<SvStream*>(&xManagerStream) >> *mpImpl->mpManagerStream;
 
         SotStorageRef xBasicStorage = rStorage.OpenSotStorage
-                                ( BasicStreamName, eStorageReadMode, FALSE );
+                                ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, FALSE );
         if( xBasicStorage.Is() && !xBasicStorage->GetError() )
         {
             USHORT nLibs = GetLibCount();
@@ -921,7 +941,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
 //  StreamMode eStreamMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE;
 
     SotStorageStreamRef xManagerStream = rStorage.OpenSotStream
-        ( ManagerStreamName, eStreamReadMode );
+        ( String(RTL_CONSTASCII_USTRINGPARAM(szManagerStream)), eStreamReadMode );
 
     String aStorName( rStorage.GetName() );
     // #i13114 removed, DBG_ASSERT( aStorName.Len(), "No Storage Name!" );
@@ -1169,7 +1189,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
         xStorage = new SotStorage( FALSE, aStorageName, eStorageReadMode );
 
     SotStorageRef xBasicStorage = xStorage->OpenSotStorage
-                            ( BasicStreamName, eStorageReadMode, FALSE );
+                            ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, FALSE );
 
     if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
     {
@@ -1422,10 +1442,10 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
         else
             xStorage = new SotStorage( FALSE, pLibInfo->GetStorageName() );
 
-        if ( xStorage->IsStorage( BasicStreamName ) )
+        if ( xStorage->IsStorage( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)) ) )
         {
             SotStorageRef xBasicStorage = xStorage->OpenSotStorage
-                            ( BasicStreamName, STREAM_STD_READWRITE, FALSE );
+                            ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), STREAM_STD_READWRITE, FALSE );
 
             if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
             {
@@ -1445,7 +1465,7 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
                 if ( !aInfoList.Count() )
                 {
                     xBasicStorage.Clear();
-                    xStorage->Remove( BasicStreamName );
+                    xStorage->Remove( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)) );
                     xStorage->Commit();
                     // If no further Streams or SubStorages available,
                     // delete the Storage, too.
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
new file mode 100644
index 000000000000..0ec0454e2bb5
--- /dev/null
+++ b/basic/source/classes/errobject.cxx
@@ -0,0 +1,225 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basic.hxx"
+#include "errobject.hxx"
+
+#include <cppuhelper/implbase2.hxx>
+#include <com/sun/star/script/XDefaultProperty.hpp>
+#include "sbintern.hxx"
+#include "runtime.hxx"
+
+using namespace ::com::sun::star;
+using namespace ::ooo;
+
+typedef ::cppu::WeakImplHelper2< vba::XErrObject, script::XDefaultProperty > ErrObjectImpl_BASE;
+
+class ErrObject : public ErrObjectImpl_BASE
+{
+    rtl::OUString m_sHelpFile;
+    rtl::OUString m_sSource;
+    rtl::OUString m_sDescription;
+    sal_Int32 m_nNumber;
+    sal_Int32 m_nHelpContext;
+
+public:
+    ErrObject();
+    ~ErrObject();
+    // Attributes
+    virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException);
+    virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException);
+    virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getHelpFile() throw (uno::RuntimeException);
+    virtual void SAL_CALL setHelpFile( const ::rtl::OUString& _helpfile ) throw (uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getDescription() throw (uno::RuntimeException);
+    virtual void SAL_CALL setDescription( const ::rtl::OUString& _description ) throw (uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getSource() throw (uno::RuntimeException);
+    virtual void SAL_CALL setSource( const ::rtl::OUString& _source ) throw (uno::RuntimeException);
+
+    // Methods
+    virtual void SAL_CALL Clear(  ) throw (uno::RuntimeException);
+    virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException);
+    // XDefaultProperty
+    virtual ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (uno::RuntimeException);
+
+    // Helper method
+    void setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description,
+        const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException);
+};
+
+
+ErrObject::~ErrObject()
+{
+}
+
+ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0)
+{
+}
+
+sal_Int32 SAL_CALL
+ErrObject::getNumber() throw (uno::RuntimeException)
+{
+    return m_nNumber;
+}
+
+void SAL_CALL
+ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException)
+{
+    pINST->setErrorVB( _number, String() );
+    ::rtl::OUString _description = pINST->GetErrorMsg();
+    setData( uno::makeAny( _number ), uno::Any(), uno::makeAny( _description ), uno::Any(), uno::Any() );
+}
+
+::sal_Int32 SAL_CALL
+ErrObject::getHelpContext() throw (uno::RuntimeException)
+{
+    return m_nHelpContext;
+}
+void SAL_CALL
+ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException)
+{
+    m_nHelpContext = _helpcontext;
+}
+
+::rtl::OUString SAL_CALL
+ErrObject::getHelpFile() throw (uno::RuntimeException)
+{
+    return m_sHelpFile;
+}
+
+void SAL_CALL
+ErrObject::setHelpFile( const ::rtl::OUString& _helpfile ) throw (uno::RuntimeException)
+{
+    m_sHelpFile = _helpfile;
+}
+
+::rtl::OUString SAL_CALL
+ErrObject::getDescription() throw (uno::RuntimeException)
+{
+    return m_sDescription;
+}
+
+void SAL_CALL
+ErrObject::setDescription( const ::rtl::OUString& _description ) throw (uno::RuntimeException)
+{
+    m_sDescription = _description;
+}
+
+::rtl::OUString SAL_CALL
+ErrObject::getSource() throw (uno::RuntimeException)
+{
+    return m_sSource;
+}
+
+void SAL_CALL
+ErrObject::setSource( const ::rtl::OUString& _source ) throw (uno::RuntimeException)
+{
+    m_sSource = _source;
+}
+
+// Methods
+void SAL_CALL
+ErrObject::Clear(  ) throw (uno::RuntimeException)
+{
+    m_sHelpFile = rtl::OUString();
+    m_sSource = m_sHelpFile;
+    m_sDescription = m_sSource;
+    m_nNumber = 0;
+    m_nHelpContext = 0;
+}
+
+void SAL_CALL
+ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException)
+{
+    setData( Number, Source, Description, HelpFile, HelpContext );
+    if ( m_nNumber )
+        pINST->ErrorVB( m_nNumber, m_sDescription );
+}
+
+// XDefaultProperty
+::rtl::OUString SAL_CALL
+ErrObject::getDefaultPropertyName(  ) throw (uno::RuntimeException)
+{
+    static rtl::OUString sDfltPropName( RTL_CONSTASCII_USTRINGPARAM("Number") );
+    return sDfltPropName;
+}
+
+void ErrObject::setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext )
+    throw (uno::RuntimeException)
+{
+    if ( !Number.hasValue() )
+        throw uno::RuntimeException( rtl::OUString::createFromAscii("Missing Required Paramater"), uno::Reference< uno::XInterface >() );
+    Number >>= m_nNumber;
+    Description >>= m_sDescription;
+    Source >>= m_sSource;
+    HelpFile >>= m_sHelpFile;
+    HelpContext >>= m_nHelpContext;
+}
+
+// SbxErrObject
+SbxErrObject::SbxErrObject( const String& rName, const Any& rUnoObj )
+    : SbUnoObject( rName, rUnoObj )
+    , m_pErrObject( NULL )
+{
+    OSL_TRACE("SbxErrObject::SbxErrObject ctor");
+    rUnoObj >>= m_xErr;
+    if ( m_xErr.is() )
+    {
+        SetDfltProperty( uno::Reference< script::XDefaultProperty >( m_xErr, uno::UNO_QUERY_THROW )->getDefaultPropertyName() ) ;
+        m_pErrObject = static_cast< ErrObject* >( m_xErr.get() );
+    }
+}
+
+SbxErrObject::~SbxErrObject()
+{
+    OSL_TRACE("SbxErrObject::~SbxErrObject dtor");
+}
+
+uno::Reference< vba::XErrObject >
+SbxErrObject::getUnoErrObject()
+{
+    SbxVariable* pVar = getErrObject();
+    SbxErrObject* pGlobErr = static_cast< SbxErrObject* >(  pVar );
+    return pGlobErr->m_xErr;
+}
+
+SbxVariableRef
+SbxErrObject::getErrObject()
+{
+    static SbxVariableRef pGlobErr = new SbxErrObject( String(  RTL_CONSTASCII_USTRINGPARAM("Err")), uno::makeAny( uno::Reference< vba::XErrObject >( new ErrObject() ) ) );
+    return pGlobErr;
+}
+
+void SbxErrObject::setNumberAndDescription( ::sal_Int32 _number, const ::rtl::OUString& _description )
+    throw (uno::RuntimeException)
+{
+    if( m_pErrObject != NULL )
+        m_pErrObject->setData( uno::makeAny( _number ), uno::Any(), uno::makeAny( _description ), uno::Any(), uno::Any() );
+}
+
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 5c57af5b6ce8..791e9fe5a8c1 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -55,13 +55,17 @@
 #include <com/sun/star/awt/XDialogProvider.hpp>
 
 #include <com/sun/star/frame/XModel.hpp>
-
+#include <com/sun/star/frame/XDesktop.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <basic/basicmanagerrepository.hxx>
+#include <basic/basmgr.hxx>
 //==================================================================================================
 
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <sbunoobj.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sbmeth.hxx>
+#include <basic/sbuno.hxx>
 #include <runtime.hxx>
 #include <sbintern.hxx>
 
@@ -85,11 +89,6 @@ using namespace ::osl;
 
 
 
-//===================================================================
-void unoToSbxValue( SbxVariable* pVar, const Any& aValue );
-Any sbxToUnoValue( SbxVariable* pVar );
-
-
 Reference< frame::XModel >  getModelFromBasic( SbxObject* pBasic )
 {
     OSL_PRECOND( pBasic != NULL, "getModelFromBasic: illegal call!" );
@@ -450,6 +449,43 @@ Any implFindDialogLibForDialog( const Any& rDlgAny, SbxObject* pBasic )
     return aRetDlgLibAny;
 }
 
+Any implFindDialogLibForDialogBasic( const Any& aAnyISP, SbxObject* pBasic, StarBASIC*& pFoundBasic )
+{
+    Any aDlgLibAny;
+    // Find dialog library for dialog, direct access is not possible here
+    StarBASIC* pStartedBasic = (StarBASIC*)pBasic;
+    SbxObject* pParentBasic = pStartedBasic ? pStartedBasic->GetParent() : NULL;
+    SbxObject* pParentParentBasic = pParentBasic ? pParentBasic->GetParent() : NULL;
+
+    SbxObject* pSearchBasic1 = NULL;
+    SbxObject* pSearchBasic2 = NULL;
+    if( pParentParentBasic )
+    {
+        pSearchBasic1 = pParentBasic;
+        pSearchBasic2 = pParentParentBasic;
+    }
+    else
+    {
+        pSearchBasic1 = pStartedBasic;
+        pSearchBasic2 = pParentBasic;
+    }
+    if( pSearchBasic1 )
+    {
+        aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic1 );
+
+        if ( aDlgLibAny.hasValue() )
+            pFoundBasic = (StarBASIC*)pSearchBasic1;
+
+        else if( pSearchBasic2 )
+        {
+            aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic2 );
+            if ( aDlgLibAny.hasValue() )
+                pFoundBasic = (StarBASIC*)pSearchBasic2;
+        }
+    }
+    return aDlgLibAny;
+}
+
 static ::rtl::OUString aDecorationPropName =
     ::rtl::OUString::createFromAscii( "Decoration" );
 static ::rtl::OUString aTitlePropName =
@@ -529,39 +565,54 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
         {}
     }
 
-    // Find dialog library for dialog, direct access is not possible here
-    StarBASIC* pStartedBasic = pINST->GetBasic();
-    SbxObject* pParentBasic = pStartedBasic ? pStartedBasic->GetParent() : NULL;
-    SbxObject* pParentParentBasic = pParentBasic ? pParentBasic->GetParent() : NULL;
-
-    SbxObject* pSearchBasic1 = NULL;
-    SbxObject* pSearchBasic2 = NULL;
-    if( pParentParentBasic )
+    Any aDlgLibAny;
+    bool bDocDialog = false;
+    StarBASIC* pFoundBasic = NULL;
+    OSL_TRACE("About to try get a hold of ThisComponent");
+    Reference< frame::XModel > xModel = getModelFromBasic( pINST->GetBasic() ) ;
+        aDlgLibAny = implFindDialogLibForDialogBasic( aAnyISP, pINST->GetBasic(), pFoundBasic );
+        // If we found the dialog then it belongs to the Search basic
+        if ( !pFoundBasic )
     {
-        pSearchBasic1 = pParentBasic;
-        pSearchBasic2 = pParentParentBasic;
-    }
-    else
+            Reference< frame::XDesktop > xDesktop( xMSF->createInstance
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ) ),
+            UNO_QUERY );
+            Reference< container::XEnumeration > xModels;
+            if ( xDesktop.is() )
     {
-        pSearchBasic1 = pStartedBasic;
-        pSearchBasic2 = pParentBasic;
-    }
-
-    Any aDlgLibAny;
-    if( pSearchBasic1 )
+                Reference< container::XEnumerationAccess > xComponents( xDesktop->getComponents(), UNO_QUERY );
+                if ( xComponents.is() )
+                    xModels.set( xComponents->createEnumeration(), UNO_QUERY );
+                if ( xModels.is() )
+                {
+                    while ( xModels->hasMoreElements() )
+                    {
+                        Reference< frame::XModel > xNextModel( xModels->nextElement(), UNO_QUERY );
+                        if ( xNextModel.is() )
+                        {
+                            BasicManager* pMgr = basic::BasicManagerRepository::getDocumentBasicManager( xNextModel );
+                            if ( pMgr )
+                                aDlgLibAny = implFindDialogLibForDialogBasic( aAnyISP, pMgr->GetLib(0), pFoundBasic );
+                            if ( aDlgLibAny.hasValue() )
     {
-        aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic1 );
-        if( pSearchBasic2 && aDlgLibAny.getValueType().getTypeClass() == TypeClass_VOID )
-            aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic2 );
+                                bDocDialog = true;
+                                xModel = xNextModel;
+                                break;
     }
-
-
-    OSL_TRACE("About to try get a hold of ThisComponent");
-    Reference< frame::XModel > xModel = getModelFromBasic( pStartedBasic ) ;
-    Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( pStartedBasic, xModel );
+                        }
+                    }
+                }
+            }
+        }
+    if ( pFoundBasic )
+        bDocDialog = pFoundBasic->IsDocBasic();
+       Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( pINST->GetBasic(), xModel );
 
     Sequence< Any > aArgs( 4 );
-    aArgs[ 0 ] <<= xModel;
+    if( bDocDialog )
+       aArgs[ 0 ] <<= xModel;
+    else
+       aArgs[ 0 ] <<= uno::Reference< uno::XInterface >();
     aArgs[ 1 ] <<= xInput;
     aArgs[ 2 ] = aDlgLibAny;
     aArgs[ 3 ] <<= xScriptListener;
diff --git a/basic/source/classes/makefile.mk b/basic/source/classes/makefile.mk
index eb5486f02abf..e00ed4674cc1 100644
--- a/basic/source/classes/makefile.mk
+++ b/basic/source/classes/makefile.mk
@@ -37,18 +37,28 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+ALLTAR .SEQUENTIAL : \
+        $(MISC)$/$(TARGET).don \
+        $(MISC)$/$(TARGET).slo
+
+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+        echo $@
+
+$(MISC)$/$(TARGET).slo : $(SLOTARGET)
+        echo $@
+
 # --- Allgemein -----------------------------------------------------------
 
-COMMON_SLOFILES=	\
+SLOFILES=	\
     $(SLO)$/sb.obj       \
     $(SLO)$/sbxmod.obj	\
     $(SLO)$/image.obj	\
     $(SLO)$/sbintern.obj	\
     $(SLO)$/sbunoobj.obj	\
     $(SLO)$/propacc.obj	\
-    $(SLO)$/disas.obj
-
-SLOFILES=	$(COMMON_SLOFILES)	\
+    $(SLO)$/disas.obj \
+    $(SLO)$/errobject.obj \
     $(SLO)$/eventatt.obj
 
 OBJFILES=	\
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index c5ac53c43092..4f2f90d5da1f 100644..100755
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -49,11 +49,18 @@
 #include "disas.hxx"
 #include "runtime.hxx"
 #include <basic/sbuno.hxx>
+#include <basic/sbobjmod.hxx>
 #include "stdobj.hxx"
 #include "filefmt.hxx"
 #include "sb.hrc"
 #include <basrid.hxx>
 #include <vos/mutex.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include "errobject.hxx"
+
+#include <com/sun/star/script/ModuleType.hpp>
+#include <com/sun/star/script/ModuleInfo.hpp>
+using namespace ::com::sun::star::script;
 
 // #pragma SW_SEGMENT_CLASS( SBASIC, SBASIC_CODE )
 
@@ -63,6 +70,10 @@ TYPEINIT1(StarBASIC,SbxObject)
 
 #define RTLNAME "@SBRTL"
 //  i#i68894#
+using com::sun::star::uno::Reference;
+using com::sun::star::uno::Any;
+using com::sun::star::uno::UNO_QUERY;
+using com::sun::star::lang::XMultiServiceFactory;
 
 const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") );
 const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
@@ -70,7 +81,25 @@ const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
 SbxObject* StarBASIC::getVBAGlobals( )
 {
     if ( !pVBAGlobals )
+    {
+        Any aThisDoc;
+        if ( GetUNOConstant("ThisComponent", aThisDoc) )
+        {
+            Reference< XMultiServiceFactory > xDocFac( aThisDoc, UNO_QUERY );
+                        if ( xDocFac.is() )
+            {
+                try
+                {
+                    xDocFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) );
+                }
+                catch( Exception& )
+                {
+                    // Ignore
+                }
+            }
+        }
         pVBAGlobals = (SbUnoObject*)Find( aVBAHook , SbxCLASS_DONTCARE );
+    }
     return pVBAGlobals;
 }
 
@@ -215,6 +244,7 @@ const SFX_VB_ErrorItem __FAR_DATA SFX_VB_ErrorTab[] =
     { 1004, SbERR_METHOD_FAILED },
     { 1005, SbERR_SETPROP_FAILED },
     { 1006, SbERR_GETPROP_FAILED },
+    { 1007, SbERR_BASIC_COMPAT },
     { 0xFFFF, 0xFFFFFFFFL }     // End mark
 };
 
@@ -485,6 +515,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
             }
         }
     }
+    SetModuleType( ModuleType::CLASS );
 }
 
 SbClassModuleObject::~SbClassModuleObject()
@@ -682,6 +713,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic  )
     SetParent( p );
     pLibInfo = NULL;
     bNoRtl = bBreak = FALSE;
+    bVBAEnabled = FALSE;
     pModules = new SbxArray;
 
     if( !GetSbData()->nInst++ )
@@ -782,7 +814,34 @@ SbModule* StarBASIC::MakeModule( const String& rName, const String& rSrc )
 
 SbModule* StarBASIC::MakeModule32( const String& rName, const ::rtl::OUString& rSrc )
 {
-    SbModule* p = new SbModule( rName );
+    ModuleInfo mInfo;
+    mInfo.ModuleType = ModuleType::NORMAL;
+    return MakeModule32(  rName, mInfo, rSrc );
+}
+SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo, const rtl::OUString& rSrc )
+{
+
+    OSL_TRACE("create module %s type mInfo %d", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType );
+    SbModule* p = NULL;
+    switch ( mInfo.ModuleType )
+    {
+        case ModuleType::DOCUMENT:
+            // In theory we should be able to create Object modules
+            // in ordinary basic ( in vba mode thought these are create
+            // by the application/basic and not by the user )
+            p = new SbObjModule( rName, mInfo, isVBAEnabled() );
+            break;
+        case ModuleType::CLASS:
+            p = new SbModule( rName, isVBAEnabled() );
+            p->SetModuleType( ModuleType::CLASS );
+        break;
+        case ModuleType::FORM:
+            p = new SbUserFormModule( rName, mInfo, isVBAEnabled() );
+        break;
+        default:
+            p = new SbModule( rName, isVBAEnabled() );
+
+    }
     p->SetSource32( rSrc );
     p->SetParent( this );
     pModules->Insert( p, pModules->Count() );
@@ -958,6 +1017,12 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
                 }
                 pNamed = p;
             }
+            // Only variables qualified by the Module Name e.g. Sheet1.foo
+            // should work for Documant && Class type Modules
+            INT32 nType = p->GetModuleType();
+            if ( nType == ModuleType::DOCUMENT || nType == ModuleType::FORM )
+                continue;
+
             // otherwise check if the element is available
             // unset GBLSEARCH-Flag (due to Rekursion)
             USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
@@ -1329,6 +1394,7 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
     }
     else
         GetSbData()->aErrMsg = String::EmptyString();
+
 }
 
 BOOL StarBASIC::CError
@@ -1385,7 +1451,22 @@ BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1,
 
     // Umsetzung des Codes fuer String-Transport in SFX-Error
     if( rMsg.Len() )
-        code = (ULONG)*new StringErrorInfo( code, String(rMsg) );
+    {
+        // very confusing, even though MakeErrorText sets up the error text
+        // seems that this is not used ( if rMsg already has content )
+        // In the case of VBA MakeErrorText also formats the error to be alittle more
+        // like vba ( adds an error number etc )
+        if ( SbiRuntime::isVBAEnabled() && ( code == SbERR_BASIC_COMPAT ) )
+        {
+            String aTmp = '\'';
+            aTmp += String::CreateFromInt32( SbxErrObject::getUnoErrObject()->getNumber() );
+            aTmp += String( RTL_CONSTASCII_USTRINGPARAM("\'\n") );
+            aTmp +=  GetSbData()->aErrMsg.Len() ? GetSbData()->aErrMsg : rMsg;
+            code = (ULONG)*new StringErrorInfo( code, aTmp );
+        }
+        else
+            code = (ULONG)*new StringErrorInfo( code, String(rMsg) );
+    }
 
     SetErrorData( code, l, c1, c2 );
     if( GetSbData()->aErrHdl.IsSet() )
diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src
index 926da0359d7e..73cc1c3a0b2c 100644
--- a/basic/source/classes/sb.src
+++ b/basic/source/classes/sb.src
@@ -588,6 +588,10 @@ Resource RID_BASIC_START
     {
         Text [ en-US ] = "For loop not initialized." ;
     };
+    String ERRCODE_BASIC_COMPAT & ERRCODE_RES_MASK
+    {
+        Text [ en-US ] = "$(ARG1)" ;
+    };
 };
  // Hinweis: IDS_SBERR_TERMINATED = IDS_SBERR_START+2000.
 String IDS_SBERR_TERMINATED
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 1e278bf583a7..849fd839bfd1 100755
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -112,9 +112,9 @@ typedef WeakImplHelper1< XAllListener > BasicAllListenerHelper;
 
 
 // Identifier fuer die dbg_-Properies als Strings anlegen
-static String ID_DBG_SUPPORTEDINTERFACES( RTL_CONSTASCII_USTRINGPARAM("Dbg_SupportedInterfaces") );
-static String ID_DBG_PROPERTIES( RTL_CONSTASCII_USTRINGPARAM("Dbg_Properties") );
-static String ID_DBG_METHODS( RTL_CONSTASCII_USTRINGPARAM("Dbg_Methods") );
+static char const ID_DBG_SUPPORTEDINTERFACES[] = "Dbg_SupportedInterfaces";
+static char const ID_DBG_PROPERTIES[] = "Dbg_Properties";
+static char const ID_DBG_METHODS[] = "Dbg_Methods";
 
 static ::rtl::OUString aSeqLevelStr( RTL_CONSTASCII_USTRINGPARAM("[]") );
 static ::rtl::OUString defaultNameSpace( RTL_CONSTASCII_USTRINGPARAM("ooo.vba") );
@@ -139,16 +139,19 @@ bool SbUnoObject::getDefaultPropName( SbUnoObject* pUnoObj, String& sDfltProp )
 SbxVariable* getDefaultProp( SbxVariable* pRef )
 {
     SbxVariable* pDefaultProp = NULL;
-    SbxObject* pObj = PTR_CAST(SbxObject,(SbxVariable*) pRef);
-    if ( !pObj )
+    if ( pRef->GetType() == SbxOBJECT )
     {
-        SbxBase* pObjVarObj = pRef->GetObject();
-        pObj = PTR_CAST(SbxObject,pObjVarObj);
-    }
-    if ( pObj && pObj->ISA(SbUnoObject) )
-    {
-        SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj);
-        pDefaultProp = pUnoObj->GetDfltProperty();
+          SbxObject* pObj = PTR_CAST(SbxObject,(SbxVariable*) pRef);
+        if ( !pObj )
+        {
+            SbxBase* pObjVarObj = pRef->GetObject();
+            pObj = PTR_CAST(SbxObject,pObjVarObj);
+        }
+        if ( pObj && pObj->ISA(SbUnoObject) )
+        {
+            SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj);
+            pDefaultProp = pUnoObj->GetDfltProperty();
+        }
     }
     return pDefaultProp;
 }
@@ -564,7 +567,7 @@ SbxDataType unoToSbxType( const Reference< XIdlClass >& xIdlClass )
     }
     return eRetType;
 }
-void unoToSbxValue( SbxVariable* pVar, const Any& aValue );
+
 static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int32 >& indices, Sequence< sal_Int32 >& sizes, const Any& aValue, sal_Int32& dimension, sal_Bool bIsZeroIndex, Type* pType = NULL )
 {
     Type aType = aValue.getValueType();
@@ -1601,6 +1604,23 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj,
                 break;
             }
             ::rtl::OUString sClassName = xClass->getName();
+            if ( sClassName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.oleautomation.XAutomationObject" ) ) ) )
+            {
+                // there is a hack in the extensions/source/ole/oleobj.cxx  to return the typename of the automation object, lets check if it
+                // matches
+                Reference< XInvocation > xInv( aToInspectObj, UNO_QUERY );
+                if ( xInv.is() )
+                {
+                    rtl::OUString sTypeName;
+                    xInv->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$GetTypeName") ) ) >>= sTypeName;
+                    if ( sTypeName.getLength() == 0 || sTypeName.equals(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") ) ) )
+                        // can't check type, leave it pass
+                        result = true;
+                    else
+                        result = sTypeName.equals( aClass );
+                }
+                break; // finished checking automation object
+            }
             OSL_TRACE("Checking if object implements %s",
                 OUStringToOString( defaultNameSpace + aClass,
                     RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -1630,7 +1650,7 @@ String Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj )
     String aRet;
     if( eType != TypeClass_INTERFACE )
     {
-        aRet += ID_DBG_SUPPORTEDINTERFACES;
+        aRet.AppendAscii( RTL_CONSTASCII_STRINGPARAM(ID_DBG_SUPPORTEDINTERFACES) );
         aRet.AppendAscii( " not available.\n(TypeClass is not TypeClass_INTERFACE)\n" );
     }
     else
@@ -2653,15 +2673,15 @@ void SbUnoObject::implCreateDbgProperties( void )
     Property aProp;
 
     // Id == -1: Implementierte Interfaces gemaess ClassProvider anzeigen
-    SbxVariableRef xVarRef = new SbUnoProperty( ID_DBG_SUPPORTEDINTERFACES, SbxSTRING, aProp, -1, false );
+    SbxVariableRef xVarRef = new SbUnoProperty( String(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_SUPPORTEDINTERFACES)), SbxSTRING, aProp, -1, false );
     QuickInsert( (SbxVariable*)xVarRef );
 
     // Id == -2: Properties ausgeben
-    xVarRef = new SbUnoProperty( ID_DBG_PROPERTIES, SbxSTRING, aProp, -2, false );
+    xVarRef = new SbUnoProperty( String(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_PROPERTIES)), SbxSTRING, aProp, -2, false );
     QuickInsert( (SbxVariable*)xVarRef );
 
     // Id == -3: Methoden ausgeben
-    xVarRef = new SbUnoProperty( ID_DBG_METHODS, SbxSTRING, aProp, -3, false );
+    xVarRef = new SbUnoProperty( String(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_METHODS)), SbxSTRING, aProp, -3, false );
     QuickInsert( (SbxVariable*)xVarRef );
 }
 
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 092ef458041e..4b58942d77aa 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -52,7 +52,13 @@
 
 #include <basic/basrdll.hxx>
 #include <vos/mutex.hxx>
+#include <basic/sbobjmod.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/script/ModuleType.hpp>
+#include <com/sun/star/script/XVBACompat.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
+using namespace com::sun::star;
 
 // for the bsearch
 #ifdef WNT
@@ -72,6 +78,13 @@
 #include <vcl/svapp.hxx>
  using namespace ::com::sun::star;
 
+#include <com/sun/star/script/XLibraryContainer.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/awt/XDialogProvider.hpp>
+#include <com/sun/star/awt/XTopWindow.hpp>
+#include <com/sun/star/awt/XControl.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <comphelper/anytostring.hxx>
 
 TYPEINIT1(SbModule,SbxObject)
 TYPEINIT1(SbMethod,SbxMethod)
@@ -79,6 +92,8 @@ TYPEINIT1(SbProperty,SbxProperty)
 TYPEINIT1(SbProcedureProperty,SbxProperty)
 TYPEINIT1(SbJScriptModule,SbModule)
 TYPEINIT1(SbJScriptMethod,SbMethod)
+TYPEINIT1(SbObjModule,SbModule)
+TYPEINIT1(SbUserFormModule,SbObjModule)
 
 SV_DECL_VARARR(SbiBreakpoints,USHORT,4,4)
 SV_IMPL_VARARR(SbiBreakpoints,USHORT)
@@ -86,6 +101,26 @@ SV_IMPL_VARARR(SbiBreakpoints,USHORT)
 
 SV_IMPL_VARARR(HighlightPortions, HighlightPortion)
 
+bool getDefaultVBAMode( StarBASIC* pb )
+{
+    bool bResult = false;
+    if ( pb && pb->IsDocBasic() )
+    {
+        uno::Any aDoc;
+    if ( pb->GetUNOConstant( "ThisComponent", aDoc ) )
+        {
+            uno::Reference< beans::XPropertySet > xProp( aDoc, uno::UNO_QUERY );
+            if ( xProp.is() )
+            {
+                uno::Reference< script::XVBACompat > xVBAMode( xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY );
+                if ( xVBAMode.is() )
+                    bResult = ( xVBAMode->getVBACompatModeOn() == sal_True );
+            }
+        }
+    }
+    return bResult;
+}
+
 class AsyncQuitHandler
 {
     AsyncQuitHandler() {}
@@ -148,12 +183,13 @@ bool UnlockControllerHack( StarBASIC* pBasic )
 // Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen
 // Elemente von anderen Modulen aus gefunden werden koennen.
 
-SbModule::SbModule( const String& rName )
+SbModule::SbModule( const String& rName,  BOOL bVBACompat )
          : SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASICModule") ) ),
-           pImage( NULL ), pBreaks( NULL ), pClassData( NULL )
+           pImage( NULL ), pBreaks( NULL ), pClassData( NULL ), mbVBACompat( bVBACompat ),  pDocObject( NULL ), bIsProxyModule( false )
 {
     SetName( rName );
     SetFlag( SBX_EXTSEARCH | SBX_GBLSEARCH );
+    SetModuleType( script::ModuleType::NORMAL );
 }
 
 SbModule::~SbModule()
@@ -328,7 +364,10 @@ void SbModule::Clear()
 
 SbxVariable* SbModule::Find( const XubString& rName, SbxClassType t )
 {
+    // make sure a search in an uninstatiated class module will fail
     SbxVariable* pRes = SbxObject::Find( rName, t );
+    if ( bIsProxyModule )
+        return NULL;
     if( !pRes && pImage )
     {
         SbiInstance* pInst = pINST;
@@ -427,6 +466,8 @@ void SbModule::SetSource( const String& r )
 
 void SbModule::SetSource32( const ::rtl::OUString& r )
 {
+    // Default basic mode to library container mode, but.. allow Option VBASupport 0/1 override
+        SetVBACompat( getDefaultVBAMode( static_cast< StarBASIC*>( GetParent() ) ) );
     aOUSource = r;
     StartDefinitions();
     SbiTokenizer aTok( r );
@@ -457,9 +498,14 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
                 if( eCurTok == OPTION )
                 {
                     eCurTok = aTok.Next();
-                    if( eCurTok == COMPATIBLE
-                    || ( ( eCurTok == VBASUPPORT ) && ( aTok.Next() == NUMBER ) && ( aTok.GetDbl()== 1 ) ) )
+                    if( eCurTok == COMPATIBLE )
                         aTok.SetCompatible( true );
+                    else if ( ( eCurTok == VBASUPPORT ) && ( aTok.Next() == NUMBER ) )
+                    {
+                            BOOL bIsVBA = ( aTok.GetDbl()== 1 );
+                            SetVBACompat( bIsVBA );
+                        aTok.SetCompatible( bIsVBA );
+                    }
                 }
             }
             eLastTok = eCurTok;
@@ -600,7 +646,15 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
     if( ((StarBASIC*)p) != pBasic )
         ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p );
 }
+BOOL SbModule::IsVBACompat()
+{
+    return mbVBACompat;
+}
 
+void SbModule::SetVBACompat( BOOL bCompat )
+{
+    mbVBACompat = bCompat;
+}
 // Ausfuehren eines BASIC-Unterprogramms
 USHORT SbModule::Run( SbMethod* pMeth )
 {
@@ -695,10 +749,9 @@ USHORT SbModule::Run( SbMethod* pMeth )
             if( pRt->pNext )
                 pRt->pNext->block();
             pINST->pRun = pRt;
-            if ( SbiRuntime ::isVBAEnabled() )
+            if ( mbVBACompat )
                         {
                 pINST->EnableCompatibility( TRUE );
-                pRt->SetVBAEnabled( true );
                         }
             while( pRt->Step() ) {}
             if( pRt->pNext )
@@ -1483,6 +1536,389 @@ SbJScriptMethod::~SbJScriptMethod()
 
 
 /////////////////////////////////////////////////////////////////////////
+SbObjModule::SbObjModule( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible )
+    : SbModule( rName, bIsVbaCompatible )
+{
+    SetModuleType( mInfo.ModuleType );
+    if ( mInfo.ModuleType == script::ModuleType::FORM )
+    {
+        SetClassName( rtl::OUString::createFromAscii( "Form" ) );
+    }
+    else if ( mInfo.ModuleObject.is() )
+        SetUnoObject( uno::makeAny( mInfo.ModuleObject ) );
+}
+void
+SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException )
+{
+    SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxVariable*)pDocObject);
+    if ( pUnoObj && pUnoObj->getUnoAny() == aObj ) // object is equal, nothing to do
+        return;
+    pDocObject = new SbUnoObject( GetName(), uno::makeAny( aObj ) );
+
+    com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > xServiceInfo( aObj, com::sun::star::uno::UNO_QUERY_THROW );
+    if( xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Worksheet" ) ) )
+    {
+        SetClassName( rtl::OUString::createFromAscii( "Worksheet" ) );
+    }
+    else if( xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Workbook" ) ) )
+    {
+        SetClassName( rtl::OUString::createFromAscii( "Workbook" ) );
+    }
+}
+
+SbxVariable*
+SbObjModule::GetObject()
+{
+    return pDocObject;
+}
+SbxVariable*
+SbObjModule::Find( const XubString& rName, SbxClassType t )
+{
+    //OSL_TRACE("SbObjectModule find for %s", rtl::OUStringToOString(  rName, RTL_TEXTENCODING_UTF8 ).getStr() );
+    SbxVariable* pVar = NULL;
+    if ( pDocObject)
+        pVar = pDocObject->Find( rName, t );
+    if ( !pVar )
+        pVar = SbModule::Find( rName, t );
+    return pVar;
+}
+
+typedef ::cppu::WeakImplHelper1< awt::XTopWindowListener > EventListener_BASE;
+
+class FormObjEventListenerImpl : public EventListener_BASE
+{
+    SbUserFormModule* mpUserForm;
+    uno::Reference< lang::XComponent > mxComponent;
+    bool mbDisposed;
+    sal_Bool mbOpened;
+    sal_Bool mbActivated;
+    sal_Bool mbShowing;
+    FormObjEventListenerImpl(); // not defined
+    FormObjEventListenerImpl(const FormObjEventListenerImpl&); // not defined
+public:
+    FormObjEventListenerImpl( SbUserFormModule* pUserForm, const uno::Reference< lang::XComponent >& xComponent ) : mpUserForm( pUserForm ), mxComponent( xComponent) , mbDisposed( false ), mbOpened( sal_False ), mbActivated( sal_False ), mbShowing( sal_False )
+    {
+        if ( mxComponent.is() )
+        {
+        uno::Reference< awt::XTopWindow > xList( mxComponent, uno::UNO_QUERY_THROW );;
+            OSL_TRACE("*********** Registering the listener");
+            xList->addTopWindowListener( this );
+        }
+    }
+
+    ~FormObjEventListenerImpl()
+    {
+        removeListener();
+    }
+    sal_Bool isShowing() { return mbShowing; }
+    void removeListener()
+    {
+        try
+        {
+            if ( mxComponent.is() && !mbDisposed )
+            {
+                uno::Reference< awt::XTopWindow > xList( mxComponent, uno::UNO_QUERY_THROW );;
+                OSL_TRACE("*********** Removing the listener");
+                xList->removeTopWindowListener( this );
+                mxComponent = NULL;
+            }
+        }
+        catch( uno::Exception& ) {}
+    }
+    virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    {
+        if ( mpUserForm  )
+        {
+            mbOpened = sal_True;
+            mbShowing = sal_True;
+            if ( mbActivated )
+            {
+                mbOpened = mbActivated = sal_False;
+                mpUserForm->triggerActivateEvent();
+            }
+        }
+    }
+
+    //liuchen 2009-7-21, support Excel VBA Form_QueryClose event
+    virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    {
+#if IN_THE_FUTURE
+        uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY );
+        if ( xDialog.is() )
+        {
+            uno::Reference< awt::XControl > xControl( xDialog, uno::UNO_QUERY );
+            if ( xControl->getPeer().is() )
+            {
+                uno::Reference< document::XVbaMethodParameter > xVbaMethodParameter( xControl->getPeer(), uno::UNO_QUERY );
+                if ( xVbaMethodParameter.is() )
+                {
+                    sal_Int8 nCancel = 0;
+                    sal_Int8 nCloseMode = 0;
+
+                    Sequence< Any > aParams;
+                    aParams.realloc(2);
+                    aParams[0] <<= nCancel;
+                    aParams[1] <<= nCloseMode;
+
+                    mpUserForm->triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ),
+                                                aParams);
+                    xVbaMethodParameter->setVbaMethodParameter( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Cancel")), aParams[0]);
+                    return;
+
+                }
+            }
+        }
+
+        mpUserForm->triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ) );
+#endif
+    }
+    //liuchen 2009-7-21
+
+    virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) { mbOpened = sal_False; mbShowing = sal_False; }
+    virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) {}
+    virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException){}
+    virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    {
+        if ( mpUserForm  )
+        {
+            mbActivated = sal_True;
+            if ( mbOpened )
+            {
+                mbOpened = mbActivated = sal_False;
+                mpUserForm->triggerActivateEvent();
+            }
+        }
+    }
+
+    virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    {
+        if ( mpUserForm  )
+            mpUserForm->triggerDeActivateEvent();
+    }
+
+
+    virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException)
+    {
+        OSL_TRACE("** Userform/Dialog disposing");
+        mbDisposed = true;
+        uno::Any aSource;
+        aSource <<= Source;
+        mxComponent = NULL;
+        if ( mpUserForm )
+            mpUserForm->ResetApiObj();
+    }
+};
+
+SbUserFormModule::SbUserFormModule( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsCompat )
+    :SbObjModule( rName, mInfo, bIsCompat ), mbInit( false )
+{
+        m_xModel.set( mInfo.ModuleObject, uno::UNO_QUERY_THROW );
+}
+
+void SbUserFormModule::ResetApiObj()
+{
+        if (  m_xDialog.is() ) // probably someone close the dialog window
+    {
+            triggerTerminateEvent();
+        }
+        pDocObject = NULL;
+    m_xDialog = NULL;
+}
+
+void SbUserFormModule::triggerMethod( const String& aMethodToRun )
+{
+    Sequence< Any > aArguments;
+    triggerMethod( aMethodToRun, aArguments );
+}
+void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any >& /*aArguments*/)
+{
+    OSL_TRACE("*** trigger %s ***", rtl::OUStringToOString( aMethodToRun, RTL_TEXTENCODING_UTF8 ).getStr() );
+    // Search method
+    SbxVariable* pMeth = SbObjModule::Find( aMethodToRun, SbxCLASS_METHOD );
+    if( pMeth )
+    {
+#if IN_THE_FUTURE
+                 //liuchen 2009-7-21, support Excel VBA UserForm_QueryClose event with parameters
+        if ( aArguments.getLength() > 0 )   // Setup parameters
+        {
+            SbxArrayRef xArray = new SbxArray;
+            xArray->Put( pMeth, 0 );    // Method as parameter 0
+
+            for ( sal_Int32 i = 0; i < aArguments.getLength(); ++i )
+            {
+                SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
+                unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), aArguments[i] );
+                xArray->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+
+                // Enable passing by ref
+                if ( xSbxVar->GetType() != SbxVARIANT )
+                    xSbxVar->SetFlag( SBX_FIXED );
+            }
+            pMeth->SetParameters( xArray );
+
+            SbxValues aVals;
+            pMeth->Get( aVals );
+
+            for ( sal_Int32 i = 0; i < aArguments.getLength(); ++i )
+            {
+                aArguments[i] = sbxToUnoValue( xArray->Get( static_cast< USHORT >(i) + 1) );
+            }
+            pMeth->SetParameters( NULL );
+        }
+        else
+//liuchen 2009-7-21
+#endif
+        {
+            SbxValues aVals;
+            pMeth->Get( aVals );
+        }
+    }
+}
+
+void SbUserFormModule::triggerActivateEvent( void )
+{
+        OSL_TRACE("**** entering SbUserFormModule::triggerActivate");
+    triggerMethod( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserForm_activate") ) );
+        OSL_TRACE("**** leaving SbUserFormModule::triggerActivate");
+}
+
+void SbUserFormModule::triggerDeActivateEvent( void )
+{
+        OSL_TRACE("**** SbUserFormModule::triggerDeActivate");
+    triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_DeActivate") ) );
+}
+
+void SbUserFormModule::triggerInitializeEvent( void )
+
+{
+    if ( mbInit )
+        return;
+        OSL_TRACE("**** SbUserFormModule::triggerInitializeEvent");
+    static String aInitMethodName( RTL_CONSTASCII_USTRINGPARAM("Userform_Initialize") );
+    triggerMethod( aInitMethodName );
+    mbInit = true;
+}
+
+void SbUserFormModule::triggerTerminateEvent( void )
+{
+       OSL_TRACE("**** SbUserFormModule::triggerTerminateEvent");
+    static String aTermMethodName( RTL_CONSTASCII_USTRINGPARAM("Userform_Terminate") );
+    triggerMethod( aTermMethodName );
+    mbInit=false;
+}
+
+void SbUserFormModule::load()
+{
+    OSL_TRACE("** load() ");
+    // forces a load
+    if ( !pDocObject )
+        InitObject();
+}
+
+//liuchen 2009-7-21 change to accmordate VBA's beheavior
+void SbUserFormModule::Unload()
+{
+    OSL_TRACE("** Unload() ");
+
+    sal_Int8 nCancel = 0;
+    sal_Int8 nCloseMode = 1;
+
+    Sequence< Any > aParams;
+    aParams.realloc(2);
+    aParams[0] <<= nCancel;
+    aParams[1] <<= nCloseMode;
+
+    triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ), aParams);
+
+    aParams[0] >>= nCancel;
+    if (nCancel == 1)
+    {
+        return;
+    }
+
+    if ( m_xDialog.is() )
+    {
+        triggerTerminateEvent();
+    }
+    // Search method
+    SbxVariable* pMeth = SbObjModule::Find( String( RTL_CONSTASCII_USTRINGPARAM( "UnloadObject" ) ), SbxCLASS_METHOD );
+    if( pMeth )
+    {
+        OSL_TRACE("Attempting too run the UnloadObjectMethod");
+                m_xDialog = NULL; //release ref to the uno object
+        SbxValues aVals;
+               FormObjEventListenerImpl* pFormListener = dynamic_cast< FormObjEventListenerImpl* >( m_DialogListener.get() );
+        bool bWaitForDispose = true; // assume dialog is showing
+                if ( pFormListener )
+        {
+            bWaitForDispose = pFormListener->isShowing();
+            OSL_TRACE("Showing %d", bWaitForDispose );
+        }
+        pMeth->Get( aVals);
+                if ( !bWaitForDispose )
+                {
+                    // we've either already got a dispose or we'er never going to get one
+            ResetApiObj();
+                } // else wait for dispose
+        OSL_TRACE("UnloadObject completed ( we hope )");
+    }
+}
+//liuchen
+
+void SbUserFormModule::InitObject()
+{
+    try
+    {
+
+        String aHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
+        SbUnoObject* pGlobs = (SbUnoObject*)GetParent()->Find( aHook, SbxCLASS_DONTCARE );
+        if ( m_xModel.is() && pGlobs )
+        {
+
+            uno::Reference< lang::XMultiServiceFactory > xVBAFactory( pGlobs->getUnoAny(), uno::UNO_QUERY_THROW );
+            uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
+            uno::Sequence< uno::Any > aArgs(1);
+            aArgs[ 0 ] <<= m_xModel;
+            rtl::OUString sDialogUrl( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:" ) );
+            rtl::OUString sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
+            if ( this->GetParent()->GetName().Len() )
+                sProjectName = this->GetParent()->GetName();
+            sDialogUrl = sDialogUrl.concat( sProjectName ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) );
+
+            uno::Reference< awt::XDialogProvider > xProvider( xFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.DialogProvider")), aArgs  ), uno::UNO_QUERY_THROW );
+            m_xDialog = xProvider->createDialog( sDialogUrl );
+
+            // create vba api object
+            aArgs.realloc( 4 );
+            aArgs[ 0 ] = uno::Any();
+            aArgs[ 1 ] <<= m_xDialog;
+            aArgs[ 2 ] <<= m_xModel;
+            aArgs[ 3 ] <<= rtl::OUString( GetParent()->GetName() );
+            pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.UserForm")), aArgs  ) ) );
+            uno::Reference< lang::XComponent > xComponent( aArgs[ 1 ], uno::UNO_QUERY_THROW );
+            // remove old listener if it exists
+            FormObjEventListenerImpl* pFormListener = dynamic_cast< FormObjEventListenerImpl* >( m_DialogListener.get() );
+            if ( pFormListener )
+                pFormListener->removeListener();
+            m_DialogListener = new FormObjEventListenerImpl( this, xComponent );
+
+            triggerInitializeEvent();
+        }
+    }
+    catch( uno::Exception& )
+    {
+    }
+
+}
+
+SbxVariable*
+SbUserFormModule::Find( const XubString& rName, SbxClassType t )
+{
+    if ( !pDocObject && !GetSbData()->bRunInit && pINST )
+        InitObject();
+    return SbObjModule::Find( rName, t );
+}
+/////////////////////////////////////////////////////////////////////////
 
 SbProperty::SbProperty( const String& r, SbxDataType t, SbModule* p )
         : SbxProperty( r, t ), pMod( p )
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index c7a63b6d7fbb..46f829b382e8 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -32,6 +32,7 @@
 #include "sbcomp.hxx"
 #include "image.hxx"
 #include <limits>
+#include <com/sun/star/script/ModuleType.hpp>
 
 // nInc ist die Inkrementgroesse der Puffer
 
@@ -127,12 +128,12 @@ void SbiCodeGen::Save()
     // OPTION EXPLICIT-Flag uebernehmen
     if( pParser->bExplicit )
         p->SetFlag( SBIMG_EXPLICIT );
-    if( pParser->IsVBASupportOn() )
-        p->SetFlag( SBIMG_VBASUPPORT );
 
     int nIfaceCount = 0;
-    if( pParser->bClassModule )
+    if( rMod.mnType == com::sun::star::script::ModuleType::CLASS )
     {
+                OSL_TRACE("COdeGen::save() classmodule processing");
+        rMod.bIsProxyModule = true;
         p->SetFlag( SBIMG_CLASSMODULE );
         pCLASSFAC->AddClassModule( &rMod );
 
@@ -155,6 +156,10 @@ void SbiCodeGen::Save()
     else
     {
         pCLASSFAC->RemoveClassModule( &rMod );
+        // Only a ClassModule can revert to Normal
+                if ( rMod.mnType == com::sun::star::script::ModuleType::CLASS )
+            rMod.mnType = com::sun::star::script::ModuleType::NORMAL;
+        rMod.bIsProxyModule = false;
     }
     if( pParser->bText )
         p->SetFlag( SBIMG_COMPARETEXT );
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 400e77a94b16..8770dc8539f0 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -29,6 +29,7 @@
 #include "precompiled_basic.hxx"
 #include <basic/sbx.hxx>
 #include "sbcomp.hxx"
+#include <com/sun/star/script/ModuleType.hpp>
 
 struct SbiParseStack {              // "Stack" fuer Statement-Blocks
     SbiParseStack* pNext;           // Chain
@@ -140,7 +141,8 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
     bNewGblDefs =
     bSingleLineIf =
     bExplicit = FALSE;
-    bClassModule = FALSE;
+    bClassModule = ( pm->GetModuleType() == com::sun::star::script::ModuleType::CLASS );
+    OSL_TRACE("Parser - %s, bClassModule %d", rtl::OUStringToOString( pm->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), bClassModule );
     pPool    = &aPublics;
     for( short i = 0; i < 26; i++ )
         eDefTypes[ i ] = SbxVARIANT;    // Kein expliziter Defaulttyp
@@ -153,6 +155,10 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
 
     rTypeArray = new SbxArray; // Array fuer Benutzerdefinierte Typen
     rEnumArray = new SbxArray; // Array for Enum types
+    bVBASupportOn = pm->IsVBACompat();
+    if ( bVBASupportOn )
+        EnableCompatibility();
+
 }
 
 
@@ -751,6 +757,7 @@ void SbiParser::Option()
 
         case CLASSMODULE:
             bClassModule = TRUE;
+            aGen.GetModule().SetModuleType( com::sun::star::script::ModuleType::CLASS );
             break;
         case VBASUPPORT:
             if( Next() == NUMBER )
@@ -760,6 +767,10 @@ void SbiParser::Option()
                     bVBASupportOn = ( nVal == 1 );
                     if ( bVBASupportOn )
                         EnableCompatibility();
+                    // if the module setting is different
+                    // reset it to what the Option tells us
+                    if ( bVBASupportOn != aGen.GetModule().IsVBACompat() )
+                        aGen.GetModule().SetVBACompat( bVBASupportOn );
                     break;
                 }
             }
diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx
index d0a613eabebc..3d90d16bdcbe 100644
--- a/basic/source/inc/codegen.hxx
+++ b/basic/source/inc/codegen.hxx
@@ -53,6 +53,7 @@ public:
     void GenStmnt();            // evtl. Statement-Opcode erzeugen
     UINT32 GetPC();
     UINT32 GetOffset()              { return GetPC() + 1; }
+    SbModule& GetModule() { return rMod; }
     void Save();
 
     // #29955 for-Schleifen-Ebene pflegen
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
new file mode 100644
index 000000000000..39e6e319caae
--- /dev/null
+++ b/basic/source/inc/errobject.hxx
@@ -0,0 +1,52 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#ifndef ERROBJECT_HXX
+#define ERROBJECT_HXX
+#include "sbunoobj.hxx"
+#include <ooo/vba/XErrObject.hpp>
+
+
+class SbxErrObject : public SbUnoObject
+{
+    class ErrObject* m_pErrObject;
+    com::sun::star::uno::Reference< ooo::vba::XErrObject > m_xErr;
+
+    SbxErrObject( const String& aName_, const com::sun::star::uno::Any& aUnoObj_ );
+    ~SbxErrObject();
+
+    class ErrObject* getImplErrObject( void )
+        { return m_pErrObject; }
+
+public:
+    static SbxVariableRef getErrObject();
+    static com::sun::star::uno::Reference< ooo::vba::XErrObject > getUnoErrObject();
+
+    void setNumberAndDescription( ::sal_Int32 _number, const ::rtl::OUString& _description )
+        throw (com::sun::star::uno::RuntimeException);
+};
+#endif
diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index 7347efe288f3..d674b91faf71 100644
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/image.hxx
@@ -106,6 +106,5 @@ public:
 #define SBIMG_COMPARETEXT   0x0002  // OPTION COMPARE TEXT ist aktiv
 #define SBIMG_INITCODE      0x0004  // Init-Code vorhanden
 #define SBIMG_CLASSMODULE   0x0008  // OPTION ClassModule is active
-#define SBIMG_VBASUPPORT    0x0020  // OPTION VBASupport is 1
 
 #endif
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 1f7e77170d44..1f4084db1d0d 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -58,19 +58,22 @@
 
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase7.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
+#include <com/sun/star/script/XVBACompat.hpp>
 
 class BasicManager;
 
 namespace basic
 {
 
-typedef ::cppu::WeakComponentImplHelper6<
+typedef ::cppu::WeakComponentImplHelper7<
     ::com::sun::star::lang::XInitialization,
     ::com::sun::star::script::XStorageBasedLibraryContainer,
     ::com::sun::star::script::XLibraryContainerPassword,
     ::com::sun::star::script::XLibraryContainerExport,
     ::com::sun::star::container::XContainer,
+    ::com::sun::star::script::XVBACompat,
     ::com::sun::star::lang::XServiceInfo > LibraryContainerHelper;
 
 typedef ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameContainer,
@@ -216,6 +219,7 @@ public:
 class SfxLibraryContainer   :public LibraryContainerHelper
                             ,public ::utl::OEventListenerAdapter
 {
+    sal_Bool mbVBACompat;
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >   mxMSF;
     ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >       mxSFI;
@@ -493,6 +497,9 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
         throw (::com::sun::star::uno::RuntimeException) = 0;
+    // Methods XVBACompat
+    virtual ::sal_Bool SAL_CALL getVBACompatModeOn() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setVBACompatModeOn( ::sal_Bool _vbacompatmodeon ) throw (::com::sun::star::uno::RuntimeException);
 };
 
 class LibraryContainerMethodGuard
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 4a3f38c51027..c9a41110ad46 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -219,6 +219,8 @@ public:
 
     void Error( SbError );                      // trappable Error
     void Error( SbError, const String& rMsg );  // trappable Error mit Message
+    void ErrorVB( sal_Int32 nVBNumber, const String& rMsg );
+    void setErrorVB( sal_Int32 nVBNumber, const String& rMsg );
     void FatalError( SbError );                 // non-trappable Error
     void FatalError( SbError, const String& );  // non-trappable Error
     void Abort();                               // Abbruch mit aktuellem Fehlercode
@@ -433,7 +435,7 @@ class SbiRuntime
     void StepFIND_CM( UINT32, UINT32 );
     void StepFIND_STATIC( UINT32, UINT32 );
 public:
-    void          SetVBAEnabled( bool bEnabled ) { bVBAEnabled = bEnabled; };
+    void          SetVBAEnabled( bool bEnabled );
     USHORT      GetImageFlag( USHORT n ) const;
     USHORT      GetBase();
     xub_StrLen  nLine,nCol1,nCol2;  // aktuelle Zeile, Spaltenbereich
@@ -441,10 +443,11 @@ public:
 
     SbiRuntime( SbModule*, SbMethod*, UINT32 );
    ~SbiRuntime();
-    void Error( SbError );                      // Fehler setzen, falls != 0
+    void Error( SbError, bool bVBATranslationAlreadyDone = false );     // Fehler setzen, falls != 0
     void Error( SbError, const String& );       // Fehler setzen, falls != 0
     void FatalError( SbError );                 // Fehlerbehandlung=Standard, Fehler setzen
     void FatalError( SbError, const String& );  // Fehlerbehandlung=Standard, Fehler setzen
+    static sal_Int32 translateErrorToVba( SbError nError, String& rMsg );
     void DumpPCode();
     BOOL Step();                    // Einzelschritt (ein Opcode)
     void Stop()            { bRun = FALSE;   }
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 19b0698d22a9..31025c48c4a4 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -30,6 +30,8 @@
 
 #include "namecont.hxx"
 #include <basic/basmgr.hxx>
+#include <com/sun/star/script/XVBAModuleInfo.hpp>
+#include <comphelper/uno3.hxx>
 
 class BasicManager;
 
@@ -134,13 +136,19 @@ public:
 };
 
 //============================================================================
+typedef std::hash_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInfoMap;
+
+typedef ::cppu::ImplHelper1 <   ::com::sun::star::script::XVBAModuleInfo
+                            >   SfxScriptLibrary_BASE;
 
 class SfxScriptLibrary : public SfxLibrary
+                       , public SfxScriptLibrary_BASE
 {
     friend class SfxScriptLibraryContainer;
 
     sal_Bool mbLoadedSource;
     sal_Bool mbLoadedBinary;
+    ModuleInfoMap mModuleInfos;
 
     // Provide modify state including resources
     virtual sal_Bool isModified( void );
@@ -167,6 +175,15 @@ public:
         const ::rtl::OUString& aLibInfoFileURL, const ::rtl::OUString& aStorageURL, sal_Bool ReadOnly
     );
 
+    DECLARE_XINTERFACE()
+    DECLARE_XTYPEPROVIDER()
+
+    // XVBAModuleInfo
+    virtual ::com::sun::star::script::ModuleInfo SAL_CALL getModuleInfo( const ::rtl::OUString& ModuleName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasModuleInfo( const ::rtl::OUString& ModuleName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL insertModuleInfo( const ::rtl::OUString& ModuleName, const ::com::sun::star::script::ModuleInfo& ModuleInfo ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeModuleInfo( const ::rtl::OUString& ModuleName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+
     static bool containsValidModule( const ::com::sun::star::uno::Any& _rElement );
 
 protected:
diff --git a/basic/source/runtime/makefile.mk b/basic/source/runtime/makefile.mk
index c0b4bd3bdc10..9bd197975ee6 100644
--- a/basic/source/runtime/makefile.mk
+++ b/basic/source/runtime/makefile.mk
@@ -82,8 +82,5 @@ EXCEPTIONSFILES=$(SLO)$/step0.obj	\
 
 $(SLO)$/%.obj: %.s
 #kendy: Cut'n'paste from bridges/source/cpp_uno/mingw_intel/makefile.mk
-#cmc: Ideally --noexecstack would be in operations, but with #i51385# pyuno
-#remote bridgeing breaks
-#    $(CC) -Wa,--noexecstack -c -o $(SLO)$/$(@:b).o $<
     $(CC) -c -o $(SLO)$/$(@:b).obj $<
     touch $@
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 9a21e488d4aa..36fbda5c9097 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -61,6 +61,7 @@
 #else
 #include <osl/file.hxx>
 #endif
+#include "errobject.hxx"
 
 #ifdef _USE_UNO
 #include <comphelper/processfactory.hxx>
@@ -120,6 +121,8 @@ using namespace com::sun::star::io;
 #include <io.h>
 #endif
 
+#include <basic/sbobjmod.hxx>
+
 static void FilterWhiteSpace( String& rStr )
 {
     rStr.EraseAllChars( ' ' );
@@ -205,15 +208,15 @@ String implGetCurDir( void )
 }
 
 // TODO: -> SbiGlobals
-static Reference< XSimpleFileAccess3 > getFileAccess( void )
+static com::sun::star::uno::Reference< XSimpleFileAccess3 > getFileAccess( void )
 {
-    static Reference< XSimpleFileAccess3 > xSFI;
+    static com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI;
     if( !xSFI.is() )
     {
-        Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
+        com::sun::star::uno::Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
         if( xSMgr.is() )
         {
-            xSFI = Reference< XSimpleFileAccess3 >( xSMgr->createInstance
+            xSFI = com::sun::star::uno::Reference< XSimpleFileAccess3 >( xSMgr->createInstance
                 ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
         }
     }
@@ -256,6 +259,7 @@ RTLFUNC(Error)
     {
         String aErrorMsg;
         SbError nErr = 0L;
+        INT32 nCode = 0;
         if( rPar.Count() == 1 )
         {
             nErr = StarBASIC::GetErrBasic();
@@ -263,14 +267,34 @@ RTLFUNC(Error)
         }
         else
         {
-            INT32 nCode = rPar.Get( 1 )->GetLong();
+            nCode = rPar.Get( 1 )->GetLong();
             if( nCode > 65535L )
                 StarBASIC::Error( SbERR_CONVERSION );
             else
                 nErr = StarBASIC::GetSfxFromVBError( (USHORT)nCode );
         }
-        pBasic->MakeErrorText( nErr, aErrorMsg );
-        rPar.Get( 0 )->PutString( pBasic->GetErrorText() );
+
+        bool bVBA = SbiRuntime::isVBAEnabled();
+        String tmpErrMsg;
+        if( bVBA && aErrorMsg.Len() > 0 )
+        {
+            tmpErrMsg = aErrorMsg;
+        }
+        else
+        {
+            pBasic->MakeErrorText( nErr, aErrorMsg );
+            tmpErrMsg = pBasic->GetErrorText();
+        }
+        // If this rtlfunc 'Error'  passed a errcode the same as the active Err Objects's
+        // current err then  return the description for the error message if it is set
+        // ( complicated isn't it ? )
+        if ( bVBA && rPar.Count() > 1 )
+        {
+            com::sun::star::uno::Reference< ooo::vba::XErrObject > xErrObj( SbxErrObject::getUnoErrObject() );
+            if ( xErrObj.is() && xErrObj->getNumber() == nCode && xErrObj->getDescription().getLength() )
+                tmpErrMsg = xErrObj->getDescription();
+        }
+        rPar.Get( 0 )->PutString( tmpErrMsg );
     }
 }
 
@@ -531,7 +555,7 @@ RTLFUNC(ChDrive) // JSM
 // Implementation of StepRENAME with UCB
 void implStepRenameUCB( const String& aSource, const String& aDest )
 {
-    Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
+    com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
     if( xSFI.is() )
     {
         try
@@ -579,7 +603,7 @@ RTLFUNC(FileCopy) // JSM
         // <-- UCB
         if( hasUno() )
         {
-            Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
+            com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
             if( xSFI.is() )
             {
                 try
@@ -630,7 +654,7 @@ RTLFUNC(Kill) // JSM
         // <-- UCB
         if( hasUno() )
         {
-            Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
+            com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
             if( xSFI.is() )
             {
                 String aFullPath = getFullPath( aFileSpec );
@@ -677,7 +701,7 @@ RTLFUNC(MkDir) // JSM
         // <-- UCB
         if( hasUno() )
         {
-            Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
+            com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
             if( xSFI.is() )
             {
                 try
@@ -778,7 +802,7 @@ RTLFUNC(RmDir) // JSM
         // <-- UCB
         if( hasUno() )
         {
-            Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
+            com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
             if( xSFI.is() )
             {
                 try
@@ -865,7 +889,7 @@ RTLFUNC(FileLen)
         // <-- UCB
         if( hasUno() )
         {
-            Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
+            com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
             if( xSFI.is() )
             {
                 try
@@ -1613,7 +1637,7 @@ RTLFUNC(StrComp)
         ::utl::TransliterationWrapper* pTransliterationWrapper = GetSbData()->pTransliterationWrapper;
         if( !pTransliterationWrapper )
         {
-            Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
+            com::sun::star::uno::Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
             pTransliterationWrapper = GetSbData()->pTransliterationWrapper =
                 new ::utl::TransliterationWrapper( xSMgr,
                     ::com::sun::star::i18n::TransliterationModules_IGNORE_CASE |
@@ -2608,7 +2632,7 @@ RTLFUNC(Dir)
         // <-- UCB
         if( hasUno() )
         {
-            Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
+            com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
             if( xSFI.is() )
             {
                 if ( nParCount >= 2 )
@@ -2971,7 +2995,7 @@ RTLFUNC(GetAttr)
         // <-- UCB
         if( hasUno() )
         {
-            Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
+            com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
             if( xSFI.is() )
             {
                 try
@@ -3041,7 +3065,7 @@ RTLFUNC(FileDateTime)
         Date aDate;
         if( hasUno() )
         {
-            Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
+            com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
             if( xSFI.is() )
             {
                 try
@@ -4006,7 +4030,7 @@ RTLFUNC(StrConv)
     String aNewStr( aOldStr );
     if( nType != 0 )
     {
-        Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
+        com::sun::star::uno::Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
         ::utl::TransliterationWrapper aTransliterationWrapper( xSMgr,nType );
         com::sun::star::uno::Sequence<sal_Int32> aOffsets;
         aTransliterationWrapper.loadModuleIfNeeded( nLanguage );
@@ -4106,12 +4130,20 @@ RTLFUNC(Load)
 
     // Diesen Call einfach an das Object weiterreichen
     SbxBase* pObj = (SbxObject*)rPar.Get(1)->GetObject();
-    if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
+    if ( pObj )
     {
-        SbxVariable* pVar = ((SbxObject*)pObj)->
-            Find( String( RTL_CONSTASCII_USTRINGPARAM("Load") ), SbxCLASS_METHOD );
-        if( pVar )
-            pVar->GetInteger();
+        if( pObj->IsA( TYPE( SbUserFormModule ) ) )
+        {
+            SbUserFormModule* pFormModule = ( SbUserFormModule* )pObj;
+            pFormModule->load();
+        }
+        else if( pObj->IsA( TYPE( SbxObject ) ) )
+        {
+            SbxVariable* pVar = ((SbxObject*)pObj)->
+                Find( String( RTL_CONSTASCII_USTRINGPARAM("Load") ), SbxCLASS_METHOD );
+            if( pVar )
+                pVar->GetInteger();
+        }
     }
 }
 
@@ -4129,12 +4161,20 @@ RTLFUNC(Unload)
 
     // Diesen Call einfach an das Object weitereichen
     SbxBase* pObj = (SbxObject*)rPar.Get(1)->GetObject();
-    if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
+    if ( pObj )
     {
-        SbxVariable* pVar = ((SbxObject*)pObj)->
-            Find( String( RTL_CONSTASCII_USTRINGPARAM("Unload") ), SbxCLASS_METHOD );
-        if( pVar )
-            pVar->GetInteger();
+        if( pObj->IsA( TYPE( SbUserFormModule ) ) )
+        {
+            SbUserFormModule* pFormModule = ( SbUserFormModule* )pObj;
+            pFormModule->Unload();
+        }
+        else if( pObj->IsA( TYPE( SbxObject ) ) )
+        {
+            SbxVariable* pVar = ((SbxObject*)pObj)->
+                Find( String( RTL_CONSTASCII_USTRINGPARAM("Unload") ), SbxCLASS_METHOD );
+            if( pVar )
+                pVar->GetInteger();
+        }
     }
 }
 
@@ -4318,7 +4358,7 @@ RTLFUNC(SetAttr) // JSM
         // <-- UCB
         if( hasUno() )
         {
-            Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
+            com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
             if( xSFI.is() )
             {
                 try
@@ -4432,7 +4472,7 @@ RTLFUNC(FileExists)
         // <-- UCB
         if( hasUno() )
         {
-            Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
+            com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
             if( xSFI.is() )
             {
                 try
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index e0501e5c0d94..b25c213a493d 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -61,6 +61,7 @@
 #endif
 
 #include <vcl/jobset.hxx>
+#include <basic/sbobjmod.hxx>
 
 #include "sbintern.hxx"
 #include "runtime.hxx"
@@ -2594,14 +2595,16 @@ RTLFUNC(Me)
 
     SbModule* pActiveModule = pINST->GetActiveModule();
     SbClassModuleObject* pClassModuleObject = PTR_CAST(SbClassModuleObject,pActiveModule);
+    SbxVariableRef refVar = rPar.Get(0);
     if( pClassModuleObject == NULL )
     {
-        StarBASIC::Error( SbERR_INVALID_USAGE_OBJECT );
+        SbObjModule* pMod = PTR_CAST(SbObjModule,pActiveModule);
+        if ( pMod )
+            refVar->PutObject( pMod );
+        else
+            StarBASIC::Error( SbERR_INVALID_USAGE_OBJECT );
     }
     else
-    {
-        SbxVariableRef refVar = rPar.Get(0);
         refVar->PutObject( pClassModuleObject );
-    }
 }
 
diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx
index 9b4b35f551e2..cec74444e7a2 100644
--- a/basic/source/runtime/props.cxx
+++ b/basic/source/runtime/props.cxx
@@ -31,6 +31,7 @@
 #include "runtime.hxx"
 #include "stdobj.hxx"
 #include "rtlproto.hxx"
+#include "errobject.hxx"
 
 
 // Properties und Methoden legen beim Get (bWrite = FALSE) den Returnwert
@@ -50,14 +51,21 @@ RTLFUNC(Err)
     (void)pBasic;
     (void)bWrite;
 
-    if( bWrite )
+    if( SbiRuntime::isVBAEnabled() )
     {
-        INT32 nVal = rPar.Get( 0 )->GetLong();
-        if( nVal <= 65535L )
-            StarBASIC::Error( StarBASIC::GetSfxFromVBError( (USHORT) nVal ) );
+        rPar.Get( 0 )->PutObject( SbxErrObject::getErrObject() );
     }
     else
-        rPar.Get( 0 )->PutLong( StarBASIC::GetVBErrorCode( StarBASIC::GetErrBasic() ) );
+    {
+        if( bWrite )
+        {
+            INT32 nVal = rPar.Get( 0 )->GetLong();
+            if( nVal <= 65535L )
+                StarBASIC::Error( StarBASIC::GetSfxFromVBError( (USHORT) nVal ) );
+        }
+        else
+            rPar.Get( 0 )->PutLong( StarBASIC::GetVBErrorCode( StarBASIC::GetErrBasic() ) );
+    }
 }
 
 RTLFUNC(False)
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 52aa76e2f2df..29e49b0ffde8 100644..100755
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -43,13 +43,16 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include "sbunoobj.hxx"
+#include "errobject.hxx"
+
+using namespace ::com::sun::star;
 
 bool SbiRuntime::isVBAEnabled()
 {
     bool result = false;
     SbiInstance* pInst = pINST;
     if ( pInst && pINST->pRun )
-        result = pInst->pRun->GetImageFlag( SBIMG_VBASUPPORT );
+        result = pInst->pRun->bVBAEnabled;
     return result;
 }
 
@@ -60,6 +63,24 @@ void StarBASIC::StaticEnableReschedule( BOOL bReschedule )
 {
     bStaticGlobalEnableReschedule = bReschedule;
 }
+void StarBASIC::SetVBAEnabled( BOOL bEnabled )
+{
+    if ( bDocBasic )
+    {
+        bVBAEnabled = bEnabled;
+    }
+}
+
+BOOL StarBASIC::isVBAEnabled()
+{
+    if ( bDocBasic )
+    {
+        if( SbiRuntime::isVBAEnabled() )
+            return TRUE;
+        return bVBAEnabled;
+    }
+    return FALSE;
+}
 
 
 struct SbiArgvStack {                   // Argv stack:
@@ -422,6 +443,35 @@ void SbiInstance::Error( SbError n, const String& rMsg )
     }
 }
 
+void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const String& rMsg )
+{
+    if( !bWatchMode )
+    {
+        SbError n = StarBASIC::GetSfxFromVBError( static_cast< USHORT >( nVBNumber ) );
+        if ( !n )
+            n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
+
+        aErrorMsg = rMsg;
+        SbiRuntime::translateErrorToVba( n, aErrorMsg );
+
+        bool bVBATranslationAlreadyDone = true;
+        pRun->Error( SbERR_BASIC_COMPAT, bVBATranslationAlreadyDone );
+    }
+}
+
+void SbiInstance::setErrorVB( sal_Int32 nVBNumber, const String& rMsg )
+{
+    SbError n = StarBASIC::GetSfxFromVBError( static_cast< USHORT >( nVBNumber ) );
+    if( !n )
+        n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
+
+    aErrorMsg = rMsg;
+    SbiRuntime::translateErrorToVba( n, aErrorMsg );
+
+    nErr = n;
+}
+
+
 void SbiInstance::FatalError( SbError n )
 {
     pRun->FatalError( n );
@@ -520,6 +570,7 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
     nForLvl   = 0;
     nOps      = 0;
     refExprStk = new SbxArray;
+    SetVBAEnabled( pMod->IsVBACompat() );
 #if defined GCC
     SetParameters( pe ? pe->GetParameters() : (class SbxArray *)NULL );
 #else
@@ -527,7 +578,6 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
 #endif
     pRefSaveList = NULL;
     pItemStoreList = NULL;
-    bVBAEnabled = isVBAEnabled();
 }
 
 SbiRuntime::~SbiRuntime()
@@ -546,6 +596,11 @@ SbiRuntime::~SbiRuntime()
     }
 }
 
+void SbiRuntime::SetVBAEnabled(bool bEnabled )
+{
+    bVBAEnabled = bEnabled;
+}
+
 // Aufbau der Parameterliste. Alle ByRef-Parameter werden direkt
 // uebernommen; von ByVal-Parametern werden Kopien angelegt. Falls
 // ein bestimmter Datentyp verlangt wird, wird konvertiert.
@@ -791,10 +846,24 @@ BOOL SbiRuntime::Step()
     return bRun;
 }
 
-void SbiRuntime::Error( SbError n )
+void SbiRuntime::Error( SbError n, bool bVBATranslationAlreadyDone )
 {
     if( n )
+    {
         nError = n;
+        if( isVBAEnabled() && !bVBATranslationAlreadyDone )
+        {
+            String aMsg = pInst->GetErrorMsg();
+            sal_Int32 nVBAErrorNumber = translateErrorToVba( nError, aMsg );
+            SbxVariable* pSbxErrObjVar = SbxErrObject::getErrObject();
+            SbxErrObject* pGlobErr = static_cast< SbxErrObject* >( pSbxErrObjVar );
+            if( pGlobErr != NULL )
+                pGlobErr->setNumberAndDescription( nVBAErrorNumber, aMsg );
+
+            pInst->aErrorMsg = aMsg;
+            nError = SbERR_BASIC_COMPAT;
+        }
+    }
 }
 
 void SbiRuntime::Error( SbError _errCode, const String& _details )
@@ -826,6 +895,32 @@ void SbiRuntime::FatalError( SbError _errCode, const String& _details )
     Error( _errCode, _details );
 }
 
+sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, String& rMsg )
+{
+    // If a message is defined use that ( in preference to
+    // the defined one for the error ) NB #TODO
+    // if there is an error defined it more than likely
+    // is not the one you want ( some are the same though )
+    // we really need a new vba compatible error list
+    if ( !rMsg.Len() )
+    {
+        // TEST, has to be vb here always
+#ifdef DBG_UTIL
+        SbError nTmp = StarBASIC::GetSfxFromVBError( nError );
+        DBG_ASSERT( nTmp, "No VB error!" );
+#endif
+
+        StarBASIC::MakeErrorText( nError, rMsg );
+        rMsg = StarBASIC::GetErrorText();
+        if ( !rMsg.Len() ) // no message for err no, need localized resource here
+            rMsg = String( RTL_CONSTASCII_USTRINGPARAM("Internal Object Error:") );
+    }
+    // no num? most likely then it *is* really a vba err
+    USHORT nVBErrorCode = StarBASIC::GetVBErrorCode( nError );
+    sal_Int32 nVBAErrorNumber = ( nVBErrorCode == 0 ) ? nError : nVBErrorCode;
+    return nVBAErrorNumber;
+}
+
 //////////////////////////////////////////////////////////////////////////
 //
 //  Parameter, Locals, Caller
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index c0b4ffa3cd59..13bc8810144a 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -230,7 +230,7 @@ static Methods aMethods[] = {
 { "EOF",            SbxBOOL,      1 | _FUNCTION, RTLNAME(EOF),0             },
   { "Channel",      SbxINTEGER, 0,NULL,0 },
 { "Erl",            SbxLONG,          _ROPROP,   RTLNAME( Erl ),0           },
-{ "Err",            SbxLONG,          _RWPROP,   RTLNAME( Err ),0           },
+{ "Err",            SbxVARIANT,       _RWPROP,   RTLNAME( Err ),0           },
 { "Error",          SbxSTRING,    1 | _FUNCTION, RTLNAME( Error ),0         },
   { "code",         SbxLONG, 0,NULL,0 },
 { "Exp",            SbxDOUBLE,    1 | _FUNCTION, RTLNAME(Exp),0             },
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 33df854a4499..39af5ea4adc3 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -30,6 +30,7 @@
 #include <vcl/msgbox.hxx>
 #include <tools/fsys.hxx>
 
+#include "errobject.hxx"
 #include "runtime.hxx"
 #include "sbintern.hxx"
 #include "iosys.hxx"
@@ -1116,6 +1117,7 @@ void SbiRuntime::StepSTDERROR()
     pInst->nErr = 0L;
     pInst->nErl = 0;
     nError = 0L;
+    SbxErrObject::getUnoErrObject()->Clear();
 }
 
 void SbiRuntime::StepNOERROR()
@@ -1124,6 +1126,7 @@ void SbiRuntime::StepNOERROR()
     pInst->nErr = 0L;
     pInst->nErl = 0;
     nError = 0L;
+    SbxErrObject::getUnoErrObject()->Clear();
     bError = FALSE;
 }
 
@@ -1132,6 +1135,9 @@ void SbiRuntime::StepNOERROR()
 void SbiRuntime::StepLEAVE()
 {
     bRun = FALSE;
+        // If VBA and we are leaving an ErrorHandler then clear the error ( it's been processed )
+    if ( bInError && pError )
+        SbxErrObject::getUnoErrObject()->Clear();
 }
 
 void SbiRuntime::StepCHANNEL()      // TOS = Kanalnummer
@@ -1265,6 +1271,9 @@ void SbiRuntime::StepERROR()
     SbxVariableRef refCode = PopVar();
     USHORT n = refCode->GetUShort();
     SbError error = StarBASIC::GetSfxFromVBError( n );
-    Error( error );
+    if ( bVBAEnabled )
+        pInst->Error( error );
+    else
+        Error( error );
 }
 
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index 399257cf6ad3..c6f090048bf2 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -30,11 +30,13 @@
 
 #include <stdlib.h>
 #include <rtl/math.hxx>
+#include <basic/sbuno.hxx>
 #include "runtime.hxx"
 #include "sbintern.hxx"
 #include "iosys.hxx"
 #include "image.hxx"
 #include "sbunoobj.hxx"
+#include "errobject.hxx"
 
 bool checkUnoObjectType( SbUnoObject* refVal,
     const String& aClass );
@@ -230,8 +232,6 @@ void SbiRuntime::StepRETURN( UINT32 nOp1 )
 
 // FOR-Variable testen (+Endlabel)
 
-void unoToSbxValue( SbxVariable* pVar, const Any& aValue );
-
 void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
 {
     if( !pForStk )
@@ -360,6 +360,7 @@ void SbiRuntime::StepERRHDL( UINT32 nOp1 )
     pInst->nErr = 0;
     pInst->nErl = 0;
     nError = 0;
+    SbxErrObject::getUnoErrObject()->Clear();
 }
 
 // Resume nach Fehlern (+0=statement, 1=next or Label)
@@ -380,6 +381,8 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
     }
     else
         pCode = pErrStmnt;
+    if ( pError ) // current in error handler ( and got a Resume Next statment )
+        SbxErrObject::getUnoErrObject()->Clear();
 
     if( nOp1 > 1 )
         StepJUMP( nOp1 );
diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src
index 8ebe6e93c4bb..7e576134fad5 100644
--- a/basic/source/sbx/format.src
+++ b/basic/source/sbx/format.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 
 String STR_BASICKEY_FORMAT_ON
 {
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 6d5d24fcb951..3d45818e6401 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -47,7 +47,7 @@
 #include "sbxres.hxx"
 #include <basic/sbxbase.hxx>
 #include <basic/sbxform.hxx>
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 
 #include "basrid.hxx"
 #include "runtime.hxx"
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 14c84420dad6..90e7cb4cb4d5 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -73,7 +73,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <basic/sbmod.hxx>
 
-
 namespace basic
 {
 
@@ -327,6 +326,7 @@ DBG_NAME( SfxLibraryContainer )
 // Ctor
 SfxLibraryContainer::SfxLibraryContainer( void )
     : LibraryContainerHelper( maMutex )
+    , mbVBACompat( sal_False )
     , maModifiable( *this, maMutex )
     , maNameContainer( getCppuType( (Reference< XNameAccess >*) NULL ) )
     , mbOldInfoFormat( sal_False )
@@ -2785,6 +2785,28 @@ OUString SfxLibraryContainer::expand_url( const OUString& url )
     }
 }
 
+::sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatModeOn() throw (RuntimeException)
+{
+    return mbVBACompat;
+}
+
+void SAL_CALL SfxLibraryContainer::setVBACompatModeOn( ::sal_Bool _vbacompatmodeon ) throw (RuntimeException)
+{
+    BasicManager* pBasMgr = getBasicManager();
+    if( pBasMgr )
+    {
+        // get the standard library
+        String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
+                if ( pBasMgr->GetName().Len() )
+                    aLibName = pBasMgr->GetName();
+
+        StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
+        if( pBasic )
+            pBasic->SetVBAEnabled( _vbacompatmodeon );
+    }
+        mbVBACompat = _vbacompatmodeon;
+}
+
 // Methods XServiceInfo
 ::sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const ::rtl::OUString& _rServiceName )
     throw (RuntimeException)
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 096d497a4c50..4185b6f9579c 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -942,7 +942,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                 try {
                     xElementRootStorage = ::comphelper::OStorageHelper::GetStorageFromURL(
                                                                     aElementPath,
-                                                                    embed::ElementModes::READWRITE );
+                                                                    embed::ElementModes::READ );
                 } catch( uno::Exception& )
                 {
                     // TODO: error handling
@@ -1166,6 +1166,45 @@ bool SAL_CALL SfxScriptLibrary::isLibraryElementValid( ::com::sun::star::uno::An
     return SfxScriptLibrary::containsValidModule( aElement );
 }
 
+IMPLEMENT_FORWARD_XINTERFACE2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BASE );
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BASE );
+
+script::ModuleInfo SAL_CALL
+SfxScriptLibrary::getModuleInfo( const ::rtl::OUString& ModuleName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
+{
+    if ( !hasModuleInfo( ModuleName ) )
+        throw NoSuchElementException();
+    return mModuleInfos[ ModuleName ];
+}
+
+sal_Bool SAL_CALL
+SfxScriptLibrary::hasModuleInfo( const ::rtl::OUString& ModuleName ) throw (RuntimeException)
+{
+    sal_Bool bRes = sal_False;
+    ModuleInfoMap::iterator it = mModuleInfos.find( ModuleName );
+
+    if ( it != mModuleInfos.end() )
+        bRes = sal_True;
+
+    return bRes;
+}
+
+void SAL_CALL SfxScriptLibrary::insertModuleInfo( const ::rtl::OUString& ModuleName, const script::ModuleInfo& ModuleInfo ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
+{
+    if ( hasModuleInfo( ModuleName ) )
+        throw ElementExistException();
+    mModuleInfos[ ModuleName ] = ModuleInfo;
+}
+
+void SAL_CALL SfxScriptLibrary::removeModuleInfo( const ::rtl::OUString& ModuleName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
+{
+        // #FIXME add NoSuchElementException to the spec
+    if ( !hasModuleInfo( ModuleName ) )
+        throw NoSuchElementException();
+    mModuleInfos.erase( mModuleInfos.find( ModuleName ) );
+}
+
+
 //============================================================================
 
 }   // namespace basic
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst
index 2fd4e03fa442..9fcccbc73b4c 100644
--- a/configmgr/prj/build.lst
+++ b/configmgr/prj/build.lst
@@ -1,3 +1,4 @@
 cg configmgr : BOOST:boost comphelper cppu cppuhelper offuh sal salhelper stlport NULL
 cg configmgr\inc nmake - all cg_inc NULL
 cg configmgr\source nmake - all cg_source cg_inc NULL
+cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL
diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst
index a9d91980b213..17ccdbe86a08 100644
--- a/configmgr/prj/d.lst
+++ b/configmgr/prj/d.lst
@@ -1,8 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\configmgr
-mkdir: %_DEST%\inc%_EXT%\configmgr\detail
-..\%__SRC%\bin\configmgr.dll %_DEST%\bin%_EXT%\configmgr.dll
-..\%__SRC%\lib\iconfigmgr.lib %_DEST%\lib%_EXT%\iconfigmgr.lib
-..\%__SRC%\lib\libconfigmgr.dylib %_DEST%\lib%_EXT%\libconfigmgr.dylib
-..\%__SRC%\lib\libconfigmgr.so %_DEST%\lib%_EXT%\libconfigmgr.so
-..\inc\configmgr\detail\configmgrdllapi.hxx %_DEST%\inc%_EXT%\configmgr\detail\configmgrdllapi.hxx
-..\inc\configmgr\update.hxx %_DEST%\inc%_EXT%\configmgr\update.hxx
+..\%__SRC%\bin\configmgr.uno.dll %_DEST%\bin%_EXT%\configmgr.uno.dll
+..\%__SRC%\lib\configmgr.uno.dylib %_DEST%\lib%_EXT%\configmgr.uno.dylib
+..\%__SRC%\lib\configmgr.uno.so %_DEST%\lib%_EXT%\configmgr.uno.so
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index 916c40ffedf5..25035d7e9dda 100644
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -33,6 +33,8 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
 SLOFILES = $(SLO)/test.obj
 
 SHL1OBJS = $(SLOFILES)
diff --git a/configmgr/qa/unoapi/Test.java b/configmgr/qa/unoapi/Test.java
new file mode 100644
index 000000000000..4d1f5a3c4be7
--- /dev/null
+++ b/configmgr/qa/unoapi/Test.java
@@ -0,0 +1,50 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+package org.openoffice.configmgr.qa.unoapi;
+
+import org.openoffice.Runner;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+public final class Test {
+    @org.junit.Before public void setUp() throws Exception {
+        connection.setUp();
+    }
+
+    @org.junit.After public void tearDown()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        connection.tearDown();
+    }
+
+    @org.junit.Test public void test() {
+        assertTrue(
+            Runner.run(
+                "-sce", "module.sce", "-cs", connection.getDescription()));
+    }
+
+    private final OfficeConnection connection = new OfficeConnection();
+}
diff --git a/configmgr/qa/unoapi/makefile.mk b/configmgr/qa/unoapi/makefile.mk
index 5af6b0729660..252e4a0d9af4 100644
--- a/configmgr/qa/unoapi/makefile.mk
+++ b/configmgr/qa/unoapi/makefile.mk
@@ -25,14 +25,26 @@
 #
 #***********************************************************************/
 
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
 PRJ = ../..
 PRJNAME = configmgr
-TARGET = unoapi
+TARGET = qa_unoapi
+
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = org/openoffice/configmgr/qa/unoapi
+JAVATESTFILES = Test.java
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
 .INCLUDE: settings.mk
 .INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-ALLTAR: TEST
+ALLTAR : javatest
 
-TEST .PHONY:
-    $(SOLARENV)/bin/checkapi -sce module.sce
+.END
diff --git a/configmgr/source/README b/configmgr/source/README
index 6d19a3b78610..b731043d34ed 100644
--- a/configmgr/source/README
+++ b/configmgr/source/README
@@ -76,6 +76,7 @@ update.cxx
 data.cxx
 lock.cxx
 nodemap.cxx
+partial.cxx
 path.hxx
 type.cxx
  Utilities.
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 7af9c1f8d9c0..190db364cdfe 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -1229,7 +1229,19 @@ rtl::OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) {
     OSL_ASSERT(thisIs(IS_ANY));
     osl::MutexGuard g(lock);
     checkLocalizedPropertyAccess();
-    return getRelativePathRepresentation();
+    // For backwards compatibility, return an absolute path representation where
+    // available:
+    rtl::OUStringBuffer path;
+    rtl::Reference< RootAccess > root(getRootAccess());
+    if (root.is()) {
+        path.append(root->getAbsolutePathRepresentation());
+    }
+    rtl::OUString rel(getRelativePathRepresentation());
+    if (path.getLength() != 0 && rel.getLength() != 0) {
+        path.append(sal_Unicode('/'));
+    }
+    path.append(rel);
+    return path.makeStringAndClear();
 }
 
 rtl::OUString Access::composeHierarchicalName(
@@ -1917,7 +1929,7 @@ css::uno::Reference< css::uno::XInterface > Access::createInstance()
              tmplName),
             static_cast< cppu::OWeakObject * >(this));
     }
-    rtl::Reference< Node > node(tmpl->clone());
+    rtl::Reference< Node > node(tmpl->clone(true));
     node->setLayer(Data::NO_LAYER);
     return static_cast< cppu::OWeakObject * >(
         new ChildAccess(components_, getRootAccess(), node));
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 51a1a6547d9b..5b30e9491eb4 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -46,6 +46,7 @@
 #include "osl/diagnose.h"
 #include "osl/file.hxx"
 #include "rtl/bootstrap.hxx"
+#include "rtl/logfile.h"
 #include "rtl/ref.hxx"
 #include "rtl/string.h"
 #include "rtl/textenc.h"
@@ -58,6 +59,7 @@
 #include "modifications.hxx"
 #include "node.hxx"
 #include "parsemanager.hxx"
+#include "partial.hxx"
 #include "rootaccess.hxx"
 #include "writemodfile.hxx"
 #include "xcdparser.hxx"
@@ -82,26 +84,29 @@ struct UnresolvedListItem {
 
 typedef std::list< UnresolvedListItem > UnresolvedList;
 
-void parseXcsFile(rtl::OUString const & url, int layer, Data * data,
+void parseXcsFile(
+    rtl::OUString const & url, int layer, Data & data, Partial const * partial,
     Modifications * modifications)
     SAL_THROW((
         css::container::NoSuchElementException, css::uno::RuntimeException))
 {
-    OSL_ASSERT(modifications == 0); (void) modifications;
+    OSL_ASSERT(partial == 0 && modifications == 0);
+    (void) partial; (void) modifications;
     OSL_VERIFY(
         rtl::Reference< ParseManager >(
             new ParseManager(url, new XcsParser(layer, data)))->parse());
 }
 
 void parseXcuFile(
-    rtl::OUString const & url, int layer, Data * data,
+    rtl::OUString const & url, int layer, Data & data, Partial const * partial,
     Modifications * modifications)
     SAL_THROW((
         css::container::NoSuchElementException, css::uno::RuntimeException))
 {
     OSL_VERIFY(
         rtl::Reference< ParseManager >(
-            new ParseManager(url, new XcuParser(layer, data, modifications)))->
+            new ParseManager(
+                url, new XcuParser(layer, data, partial, modifications)))->
         parse());
 }
 
@@ -112,7 +117,7 @@ rtl::OUString expand(rtl::OUString const & str) {
 }
 
 static bool singletonCreated = false;
-static Components * singleton; // leaks
+static Components * singleton = 0;
 
 }
 
@@ -122,7 +127,8 @@ void Components::initSingleton(
     OSL_ASSERT(context.is());
     if (!singletonCreated) {
         singletonCreated = true;
-        singleton = new Components(context);
+        static Components theSingleton(context);
+        singleton = &theSingleton;
     }
 }
 
@@ -143,11 +149,12 @@ bool Components::allLocales(rtl::OUString const & locale) {
 }
 
 rtl::Reference< Node > Components::resolvePathRepresentation(
-    rtl::OUString const & pathRepresentation, Path * path,
-    int * finalizedLayer) const
+    rtl::OUString const & pathRepresentation,
+    rtl::OUString * canonicRepresentation, Path * path, int * finalizedLayer)
+    const
 {
     return data_.resolvePathRepresentation(
-        pathRepresentation, path, finalizedLayer);
+        pathRepresentation, canonicRepresentation, path, finalizedLayer);
 }
 
 rtl::Reference< Node > Components::getTemplate(
@@ -211,7 +218,7 @@ void Components::insertExtensionXcsFile(
     bool shared, rtl::OUString const & fileUri)
 {
     try {
-        parseXcsFile(fileUri, shared ? 9 : 13, &data_, 0);
+        parseXcsFile(fileUri, shared ? 9 : 13, data_, 0, 0);
     } catch (css::container::NoSuchElementException & e) {
         throw css::uno::RuntimeException(
             (rtl::OUString(
@@ -227,7 +234,7 @@ void Components::insertExtensionXcuFile(
 {
     OSL_ASSERT(modifications != 0);
     try {
-        parseXcuFile(fileUri, shared ? 10 : 14, &data_, modifications);
+        parseXcuFile(fileUri, shared ? 10 : 14, data_, 0, modifications);
     } catch (css::container::NoSuchElementException & e) {
         throw css::uno::RuntimeException(
             (rtl::OUString(
@@ -238,6 +245,24 @@ void Components::insertExtensionXcuFile(
     }
 }
 
+void Components::insertModificationXcuFile(
+    rtl::OUString const & fileUri,
+    std::set< rtl::OUString > const & includedPaths,
+    std::set< rtl::OUString > const & excludedPaths,
+    Modifications * modifications)
+{
+    OSL_ASSERT(modifications != 0);
+    try {
+        Partial part(includedPaths, excludedPaths);
+        parseXcuFile(fileUri, Data::NO_LAYER, data_, &part, modifications);
+    } catch (css::uno::Exception & e) { //TODO: more specific exception catching
+        OSL_TRACE(
+            "configmgr error inserting %s: %s",
+            rtl::OUStringToOString(fileUri, RTL_TEXTENCODING_UTF8).getStr(),
+            rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+    }
+}
+
 css::beans::Optional< css::uno::Any > Components::getExternalValue(
     rtl::OUString const & descriptor)
 {
@@ -315,7 +340,7 @@ Components::Components(
     context_(context)
 {
     OSL_ASSERT(context.is());
-/*SB*/try{
+    RTL_LOGFILE_TRACE_AUTHOR("configmgr", "sb", "begin parsing");
     parseXcsXcuLayer(
         0,
         expand(
@@ -380,24 +405,22 @@ Components::Components(
                     ":UNO_USER_PACKAGES_CACHE}/registry/"
                     "com.sun.star.comp.deployment.configuration."
                     "PackageRegistryBackend/configmgr.ini"))));
-/*SB*/}catch(css::uno::Exception&e){fprintf(stderr,"caught <%s>\n",rtl::OUStringToOString(e.Message,RTL_TEXTENCODING_UTF8).getStr());throw;}
     try {
         parseModificationLayer();
     } catch (css::uno::Exception & e) { //TODO: more specific exception catching
-        // Silently ignore unreadable parts of a corrupted
-        // registrymodifications.xcu file, instead of completely preventing OOo
-        // from starting:
+        // Silently ignore unreadable parts of a corrupted user modification
+        // layer, instead of completely preventing OOo from starting:
         OSL_TRACE(
             "configmgr error reading user modification layer: %s",
             rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
     }
+    RTL_LOGFILE_TRACE_AUTHOR("configmgr", "sb", "end parsing");
 }
 
 Components::~Components() {}
 
 void Components::parseFiles(
-    int layer, rtl::OUString const & extension,
-    void (* parseFile)(rtl::OUString const &, int, Data *, Modifications *),
+    int layer, rtl::OUString const & extension, FileParser * parseFile,
     rtl::OUString const & url, bool recursive)
 {
     osl::Directory dir(url);
@@ -447,7 +470,7 @@ void Components::parseFiles(
                 file.match(extension, file.getLength() - extension.getLength()))
             {
                 try {
-                    (*parseFile)(stat.getFileURL(), layer, &data_, 0);
+                    (*parseFile)(stat.getFileURL(), layer, data_, 0, 0);
                 } catch (css::container::NoSuchElementException & e) {
                     throw css::uno::RuntimeException(
                         (rtl::OUString(
@@ -462,23 +485,20 @@ void Components::parseFiles(
 }
 
 void Components::parseFileList(
-    int layer,
-    void (* parseFile)(rtl::OUString const &, int, Data *, Modifications *),
-    rtl::OUString const & urls, rtl::Bootstrap const & ini)
+    int layer, FileParser * parseFile, rtl::OUString const & urls,
+    rtl::Bootstrap const & ini)
 {
     for (sal_Int32 i = 0;;) {
         rtl::OUString url(urls.getToken(0, ' ', i));
         if (url.getLength() != 0) {
             ini.expandMacrosFrom(url); //TODO: detect failure
             try {
-                (*parseFile)(url, layer, &data_, 0);
+                (*parseFile)(url, layer, data_, 0, 0);
             } catch (css::container::NoSuchElementException & e) {
-                throw css::uno::RuntimeException(
-                    (rtl::OUString(
-                        RTL_CONSTASCII_USTRINGPARAM(
-                            "stat'ed file does not exist: ")) +
-                     e.Message),
-                    css::uno::Reference< css::uno::XInterface >());
+                OSL_TRACE(
+                    "configmgr file does not exist: %s",
+                    rtl::OUStringToOString(
+                        e.Message, RTL_TEXTENCODING_UTF8).getStr());
             }
         }
         if (i == -1) {
@@ -539,7 +559,7 @@ void Components::parseXcdFiles(int layer, rtl::OUString const & url) {
                 rtl::Reference< ParseManager > manager;
                 try {
                     manager = new ParseManager(
-                        stat.getFileURL(), new XcdParser(layer, deps, &data_));
+                        stat.getFileURL(), new XcdParser(layer, deps, data_));
                 } catch (css::container::NoSuchElementException & e) {
                     throw css::uno::RuntimeException(
                         (rtl::OUString(
@@ -630,7 +650,7 @@ rtl::OUString Components::getModificationFileUrl() const {
 
 void Components::parseModificationLayer() {
     try {
-        parseXcuFile(getModificationFileUrl(), Data::NO_LAYER, &data_, 0);
+        parseXcuFile(getModificationFileUrl(), Data::NO_LAYER, data_, 0, 0);
     } catch (css::container::NoSuchElementException &) {
         OSL_TRACE(
             "configmgr user registrymodifications.xcu does not (yet) exist");
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 8523b02cbbaf..2e635680c1ce 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -58,6 +58,7 @@ namespace configmgr {
 class Broadcaster;
 class Modifications;
 class Node;
+class Partial;
 class RootAccess;
 
 class Components: private boost::noncopyable {
@@ -71,8 +72,9 @@ public:
     static bool allLocales(rtl::OUString const & locale);
 
     rtl::Reference< Node > resolvePathRepresentation(
-        rtl::OUString const & pathRepresentation, Path * path,
-        int * finalizedLayer) const;
+        rtl::OUString const & pathRepresentation,
+        rtl::OUString * canonicRepresenation, Path * path, int * finalizedLayer)
+        const;
 
     rtl::Reference< Node > getTemplate(
         int layer, rtl::OUString const & fullName) const;
@@ -96,10 +98,19 @@ public:
         bool shared, rtl::OUString const & fileUri,
         Modifications * modifications);
 
+    void insertModificationXcuFile(
+        rtl::OUString const & fileUri,
+        std::set< rtl::OUString > const & includedPaths,
+        std::set< rtl::OUString > const & excludedPaths,
+        Modifications * modifications);
+
     com::sun::star::beans::Optional< com::sun::star::uno::Any >
     getExternalValue(rtl::OUString const & descriptor);
 
 private:
+    typedef void FileParser(
+        rtl::OUString const &, int, Data &, Partial const *, Modifications *);
+
     Components(
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
             const & context);
@@ -107,14 +118,12 @@ private:
     ~Components();
 
     void parseFiles(
-        int layer, rtl::OUString const & extension,
-        void (* parseFile)(rtl::OUString const &, int, Data *, Modifications *),
+        int layer, rtl::OUString const & extension, FileParser * parseFile,
         rtl::OUString const & url, bool recursive);
 
     void parseFileList(
-        int layer,
-        void (* parseFile)(rtl::OUString const &, int, Data *, Modifications *),
-        rtl::OUString const & urls, rtl::Bootstrap const & ini);
+        int layer, FileParser * parseFile, rtl::OUString const & urls,
+        rtl::Bootstrap const & ini);
 
     void parseXcdFiles(int layer, rtl::OUString const & url);
 
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index 5540a40fd5f4..e12f9596940b 100644
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
@@ -205,7 +205,8 @@ rtl::Reference< Node > Data::findNode(
 }
 
 rtl::Reference< Node > Data::resolvePathRepresentation(
-    rtl::OUString const & pathRepresentation, Path * path, int * finalizedLayer)
+    rtl::OUString const & pathRepresentation,
+    rtl::OUString * canonicRepresentation, Path * path, int * finalizedLayer)
     const
 {
     if (pathRepresentation.getLength() == 0 || pathRepresentation[0] != '/') {
@@ -216,6 +217,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
     }
     rtl::OUString seg;
     bool setElement;
+    rtl::OUString templateName;
     sal_Int32 n = parseSegment(pathRepresentation, 1, &seg, &setElement, 0);
     if (n == -1 || setElement)
     {
@@ -225,6 +227,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
             css::uno::Reference< css::uno::XInterface >());
     }
     NodeMap::const_iterator i(components.find(seg));
+    rtl::OUStringBuffer canonic;
     if (path != 0) {
         path->clear();
     }
@@ -234,6 +237,10 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
         if (!p.is()) {
             return p;
         }
+        if (canonicRepresentation != 0) {
+            canonic.append(sal_Unicode('/'));
+            canonic.append(createSegment(templateName, seg));
+        }
         if (path != 0) {
             path->push_back(seg);
         }
@@ -248,13 +255,16 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
         }
         // for backwards compatibility, ignore a final slash
         if (n == pathRepresentation.getLength()) {
+            if (canonicRepresentation != 0) {
+                *canonicRepresentation = canonic.makeStringAndClear();
+            }
             if (finalizedLayer != 0) {
                 *finalizedLayer = finalized;
             }
             return p;
         }
         parent = p;
-        rtl::OUString templateName;
+        templateName = rtl::OUString();
         n = parseSegment(
             pathRepresentation, n, &seg, &setElement, &templateName);
         if (n == -1) {
diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx
index 495ca1233878..52353d066b67 100644
--- a/configmgr/source/data.hxx
+++ b/configmgr/source/data.hxx
@@ -74,8 +74,9 @@ struct Data: private boost::noncopyable {
         int layer, NodeMap const & map, rtl::OUString const & name);
 
     rtl::Reference< Node > resolvePathRepresentation(
-        rtl::OUString const & pathRepresentation, Path * path,
-        int * finalizedLayer) const;
+        rtl::OUString const & pathRepresentation,
+        rtl::OUString * canonicRepresenation, Path * path, int * finalizedLayer)
+        const;
 
     rtl::Reference< Node > getTemplate(
         int layer, rtl::OUString const & fullName) const;
diff --git a/configmgr/source/groupnode.cxx b/configmgr/source/groupnode.cxx
index 60d825451d69..59c0f89df5d1 100644
--- a/configmgr/source/groupnode.cxx
+++ b/configmgr/source/groupnode.cxx
@@ -44,8 +44,8 @@ GroupNode::GroupNode(
     mandatory_(Data::NO_LAYER)
 {}
 
-rtl::Reference< Node > GroupNode::clone() const {
-    return new GroupNode(*this);
+rtl::Reference< Node > GroupNode::clone(bool keepTemplateName) const {
+    return new GroupNode(*this, keepTemplateName);
 }
 
 NodeMap & GroupNode::getMembers() {
@@ -68,11 +68,13 @@ bool GroupNode::isExtensible() const {
     return extensible_;
 }
 
-GroupNode::GroupNode(GroupNode const & other):
-    Node(other), extensible_(other.extensible_),
-    templateName_(other.templateName_), mandatory_(other.mandatory_)
+GroupNode::GroupNode(GroupNode const & other, bool keepTemplateName):
+    Node(other), extensible_(other.extensible_), mandatory_(other.mandatory_)
 {
     cloneNodeMap(other.members_, &members_);
+    if (keepTemplateName) {
+        templateName_ = other.templateName_;
+    }
 }
 
 GroupNode::~GroupNode() {}
diff --git a/configmgr/source/groupnode.hxx b/configmgr/source/groupnode.hxx
index be4907b86ce3..9d7bbbafa5b3 100644
--- a/configmgr/source/groupnode.hxx
+++ b/configmgr/source/groupnode.hxx
@@ -42,7 +42,7 @@ class GroupNode: public Node {
 public:
     GroupNode(int layer, bool extensible, rtl::OUString const & templateName);
 
-    virtual rtl::Reference< Node > clone() const;
+    virtual rtl::Reference< Node > clone(bool keepTemplateName) const;
 
     virtual NodeMap & getMembers();
 
@@ -55,7 +55,7 @@ public:
     bool isExtensible() const;
 
 private:
-    GroupNode(GroupNode const & other);
+    GroupNode(GroupNode const & other, bool keepTemplateName);
 
     virtual ~GroupNode();
 
diff --git a/configmgr/source/localizedpropertynode.cxx b/configmgr/source/localizedpropertynode.cxx
index 9c5fa3328a58..54560d7aded4 100644
--- a/configmgr/source/localizedpropertynode.cxx
+++ b/configmgr/source/localizedpropertynode.cxx
@@ -51,7 +51,7 @@ LocalizedPropertyNode::LocalizedPropertyNode(
     Node(layer), staticType_(staticType), nillable_(nillable)
 {}
 
-rtl::Reference< Node > LocalizedPropertyNode::clone() const {
+rtl::Reference< Node > LocalizedPropertyNode::clone(bool) const {
     return new LocalizedPropertyNode(*this);
 }
 
diff --git a/configmgr/source/localizedpropertynode.hxx b/configmgr/source/localizedpropertynode.hxx
index d5a16af0e54d..4ebcf8e243da 100644
--- a/configmgr/source/localizedpropertynode.hxx
+++ b/configmgr/source/localizedpropertynode.hxx
@@ -47,7 +47,7 @@ class LocalizedPropertyNode: public Node {
 public:
     LocalizedPropertyNode(int layer, Type staticType, bool nillable);
 
-    virtual rtl::Reference< Node > clone() const;
+    virtual rtl::Reference< Node > clone(bool keepTemplateName) const;
 
     virtual NodeMap & getMembers();
 
diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx
index f6246106c8fe..c0e3bc333187 100644
--- a/configmgr/source/localizedvaluenode.cxx
+++ b/configmgr/source/localizedvaluenode.cxx
@@ -48,7 +48,7 @@ LocalizedValueNode::LocalizedValueNode(int layer, css::uno::Any const & value):
     Node(layer), value_(value)
 {}
 
-rtl::Reference< Node > LocalizedValueNode::clone() const {
+rtl::Reference< Node > LocalizedValueNode::clone(bool) const {
     return new LocalizedValueNode(*this);
 }
 
diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx
index 7f8a5dd987ce..bfcbdea1de51 100644
--- a/configmgr/source/localizedvaluenode.hxx
+++ b/configmgr/source/localizedvaluenode.hxx
@@ -43,7 +43,7 @@ class LocalizedValueNode: public Node {
 public:
     LocalizedValueNode(int layer, com::sun::star::uno::Any const & value);
 
-    virtual rtl::Reference< Node > clone() const;
+    virtual rtl::Reference< Node > clone(bool keepTemplateName) const;
 
     virtual rtl::OUString getTemplateName() const;
 
diff --git a/configmgr/source/makefile.mk b/configmgr/source/makefile.mk
index d6972e12b9d8..777fed3323d8 100644
--- a/configmgr/source/makefile.mk
+++ b/configmgr/source/makefile.mk
@@ -34,7 +34,7 @@ VISIBILITY_HIDDEN = TRUE
 
 .INCLUDE: settings.mk
 
-CDEFS += -DOOO_DLLIMPLEMENTATION_CONFIGMGR
+DLLPRE =
 
 SLOFILES = \
     $(SLO)/access.obj \
@@ -54,6 +54,7 @@ SLOFILES = \
     $(SLO)/nodemap.obj \
     $(SLO)/pad.obj \
     $(SLO)/parsemanager.obj \
+    $(SLO)/partial.obj \
     $(SLO)/propertynode.obj \
     $(SLO)/rootaccess.obj \
     $(SLO)/services.obj \
@@ -76,7 +77,7 @@ SHL1STDLIBS = \
     $(CPPULIB) \
     $(SALHELPERLIB) \
     $(SALLIB)
-SHL1TARGET = configmgr
+SHL1TARGET = configmgr.uno
 SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 
diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx
index 10f168520595..7c9417e68ea9 100644
--- a/configmgr/source/node.hxx
+++ b/configmgr/source/node.hxx
@@ -46,7 +46,7 @@ public:
 
     virtual Kind kind() const = 0;
 
-    virtual rtl::Reference< Node > clone() const = 0;
+    virtual rtl::Reference< Node > clone(bool keepTemplateName) const = 0;
 
     virtual NodeMap & getMembers();
 
diff --git a/configmgr/source/nodemap.cxx b/configmgr/source/nodemap.cxx
index 6b22863b5672..8e4d06030bdf 100644
--- a/configmgr/source/nodemap.cxx
+++ b/configmgr/source/nodemap.cxx
@@ -42,7 +42,7 @@ void cloneNodeMap(NodeMap const & source, NodeMap * target) {
     OSL_ASSERT(target != 0 && target->empty());
     NodeMap clone(source);
     for (NodeMap::iterator i(clone.begin()); i != clone.end(); ++i) {
-        i->second = i->second->clone();
+        i->second = i->second->clone(true);
     }
     std::swap(clone, *target);
 }
diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
new file mode 100644
index 000000000000..4c9189ed05c4
--- /dev/null
+++ b/configmgr/source/partial.cxx
@@ -0,0 +1,137 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#include "precompiled_configmgr.hxx"
+#include "sal/config.h"
+
+#include <map>
+#include <set>
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "osl/diagnose.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "data.hxx"
+#include "partial.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+bool parseSegment(
+    rtl::OUString const & path, sal_Int32 * index, rtl::OUString * segment)
+{
+    OSL_ASSERT(
+        index != 0 && *index >= 0 && *index <= path.getLength() &&
+        segment != 0);
+    if (path[(*index)++] == '/') {
+        rtl::OUString name;
+        bool setElement;
+        rtl::OUString templateName;
+        *index = Data::parseSegment(
+            path, *index, &name, &setElement, &templateName);
+        if (*index != -1) {
+            *segment = Data::createSegment(templateName, name);
+            return *index == path.getLength();
+        }
+    }
+    throw css::uno::RuntimeException(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) + path,
+        css::uno::Reference< css::uno::XInterface >());
+}
+
+}
+
+Partial::Partial(
+    std::set< rtl::OUString > const & includedPaths,
+    std::set< rtl::OUString > const & excludedPaths)
+{
+    for (std::set< rtl::OUString >::const_iterator i(includedPaths.begin());
+         i != includedPaths.end(); ++i)
+    {
+        sal_Int32 n = 0;
+        for (Node * p = &root_;;) {
+            rtl::OUString seg;
+            bool end = parseSegment(*i, &n, &seg);
+            p = &p->children[seg];
+            if (p->startInclude) {
+                break;
+            }
+            if (end) {
+                p->children.clear();
+                p->startInclude = true;
+                break;
+            }
+        }
+    }
+    for (std::set< rtl::OUString >::const_iterator i(excludedPaths.begin());
+         i != excludedPaths.end(); ++i)
+    {
+        sal_Int32 n = 0;
+        for (Node * p = &root_;;) {
+            rtl::OUString seg;
+            bool end = parseSegment(*i, &n, &seg);
+            if (end) {
+                p->children[seg] = Node();
+                break;
+            }
+            Node::Children::iterator j(p->children.find(seg));
+            if (j == p->children.end()) {
+                break;
+            }
+            p = &j->second;
+        }
+    }
+}
+
+Partial::~Partial() {}
+
+Partial::Containment Partial::contains(Path const & path) const {
+    //TODO: For set elements, the segment names recorded in the node tree need
+    // not match the corresponding path segments, so this function can fail.
+    Node const * p = &root_;
+    bool includes = false;
+    for (Path::const_iterator i(path.begin()); i != path.end(); ++i) {
+        Node::Children::const_iterator j(p->children.find(*i));
+        if (j == p->children.end()) {
+            break;
+        }
+        p = &j->second;
+        includes |= p->startInclude;
+    }
+    return p->children.empty() && !p->startInclude
+        ? CONTAINS_NOT
+        : includes ? CONTAINS_NODE : CONTAINS_SUBNODES;
+}
+
+}
diff --git a/configmgr/source/partial.hxx b/configmgr/source/partial.hxx
new file mode 100644
index 000000000000..39931448c66d
--- /dev/null
+++ b/configmgr/source/partial.hxx
@@ -0,0 +1,71 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#ifndef INCLUDED_CONFIGMGR_SOURCE_PARTIAL_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_PARTIAL_HXX
+
+#include "sal/config.h"
+
+#include <map>
+#include <set>
+
+#include "boost/noncopyable.hpp"
+
+#include "path.hxx"
+
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+class Partial: private boost::noncopyable {
+public:
+    enum Containment { CONTAINS_NOT, CONTAINS_SUBNODES, CONTAINS_NODE };
+
+    Partial(
+        std::set< rtl::OUString > const & includedPaths,
+        std::set< rtl::OUString > const & excludedPaths);
+
+    ~Partial();
+
+    Containment contains(Path const & path) const;
+
+private:
+    struct Node {
+        typedef std::map< rtl::OUString, Node > Children;
+
+        Node(): startInclude(false) {}
+
+        Children children;
+        bool startInclude;
+    };
+
+    Node root_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
index 070b56d9be9a..f3e459998e7e 100644
--- a/configmgr/source/propertynode.cxx
+++ b/configmgr/source/propertynode.cxx
@@ -55,7 +55,7 @@ PropertyNode::PropertyNode(
     extension_(extension)
 {}
 
-rtl::Reference< Node > PropertyNode::clone() const {
+rtl::Reference< Node > PropertyNode::clone(bool) const {
     return new PropertyNode(*this);
 }
 
diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx
index 1566cbf72dbe..506526ffcc1e 100644
--- a/configmgr/source/propertynode.hxx
+++ b/configmgr/source/propertynode.hxx
@@ -48,7 +48,7 @@ public:
         int layer, Type staticType, bool nillable,
         com::sun::star::uno::Any const & value, bool extension);
 
-    virtual rtl::Reference< Node > clone() const;
+    virtual rtl::Reference< Node > clone(bool keepTemplateName) const;
 
     Type getStaticType() const;
 
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index f8ccc6a31546..95a346d720c2 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -113,6 +113,11 @@ void RootAccess::release() throw () {
     Access::release();
 }
 
+rtl::OUString RootAccess::getAbsolutePathRepresentation() {
+    getNode(); // turn pathRepresentation_ into canonic form
+    return pathRepresentation_;
+}
+
 rtl::OUString RootAccess::getLocale() const {
     return locale_;
 }
@@ -136,9 +141,10 @@ rtl::OUString RootAccess::getRelativePathRepresentation() {
 
 rtl::Reference< Node > RootAccess::getNode() {
     if (!node_.is()) {
+        rtl::OUString canonic;
         int finalizedLayer;
         node_ = getComponents().resolvePathRepresentation(
-            pathRepresentation_, &path_, &finalizedLayer);
+            pathRepresentation_, &canonic, &path_, &finalizedLayer);
         if (!node_.is()) {
             throw css::uno::RuntimeException(
                 (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot find ")) +
@@ -150,6 +156,7 @@ rtl::Reference< Node > RootAccess::getNode() {
                 // queryInterface on it would cause trouble; therefore,
                 // RuntimeException.Context is left null here
         }
+        pathRepresentation_ = canonic;
         OSL_ASSERT(!path_.empty());
         name_ = path_.back();
         finalized_ = finalizedLayer != Data::NO_LAYER;
@@ -285,7 +292,7 @@ void RootAccess::commitChanges()
         Modifications globalMods;
         commitChildChanges(
             ((getComponents().resolvePathRepresentation(
-                  pathRepresentation_, 0, &finalizedLayer)
+                  pathRepresentation_, 0, 0, &finalizedLayer)
               == node_) &&
              finalizedLayer == Data::NO_LAYER),
             &globalMods);
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index 45d4193d70de..77d945cdbbed 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -78,6 +78,8 @@ public:
 
     virtual void SAL_CALL release() throw ();
 
+    rtl::OUString getAbsolutePathRepresentation();
+
     rtl::OUString getLocale() const;
 
     bool isUpdate() const;
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index 3a009b3cee15..f8c3289664ef 100644
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -44,6 +44,7 @@
 #include "configurationprovider.hxx"
 #include "configurationregistry.hxx"
 #include "defaultprovider.hxx"
+#include "update.hxx"
 
 namespace {
 
@@ -67,6 +68,9 @@ static cppu::ImplementationEntry const services[] = {
     { &dummy, &configmgr::configuration_registry::getImplementationName,
       &configmgr::configuration_registry::getSupportedServiceNames,
       &configmgr::configuration_registry::createFactory, 0, 0 },
+    { &dummy, &configmgr::update::getImplementationName,
+      &configmgr::update::getSupportedServiceNames,
+      &configmgr::update::createFactory, 0, 0 },
     { 0, 0, 0, 0, 0, 0 }
 };
 
@@ -107,6 +111,19 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
                 rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM(
                         "com.sun.star.configuration.DefaultProvider")));
+        css::uno::Reference< css::registry::XRegistryKey >(
+            (css::uno::Reference< css::registry::XRegistryKey >(
+                static_cast< css::registry::XRegistryKey * >(pRegistryKey))->
+             createKey(
+                 rtl::OUString(
+                     RTL_CONSTASCII_USTRINGPARAM(
+                         "/com.sun.star.comp.configuration.Update/UNO/"
+                         "SINGLETONS/com.sun.star.configuration.Update")))),
+            css::uno::UNO_SET_THROW)->
+            setStringValue(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.configuration.Update_Service")));
     } catch (css::uno::Exception & e) {
         (void) e;
         OSL_TRACE(
diff --git a/configmgr/source/setnode.cxx b/configmgr/source/setnode.cxx
index f19c36c0bba5..465345a5f856 100644
--- a/configmgr/source/setnode.cxx
+++ b/configmgr/source/setnode.cxx
@@ -69,8 +69,8 @@ SetNode::SetNode(
     templateName_(templateName), mandatory_(Data::NO_LAYER)
 {}
 
-rtl::Reference< Node > SetNode::clone() const {
-    return new SetNode(*this);
+rtl::Reference< Node > SetNode::clone(bool keepTemplateName) const {
+    return new SetNode(*this, keepTemplateName);
 }
 
 NodeMap & SetNode::getMembers() {
@@ -105,12 +105,15 @@ bool SetNode::isValidTemplate(rtl::OUString const & templateName) const {
          additionalTemplateNames_.end());
 }
 
-SetNode::SetNode(SetNode const & other):
+SetNode::SetNode(SetNode const & other, bool keepTemplateName):
     Node(other), defaultTemplateName_(other.defaultTemplateName_),
     additionalTemplateNames_(other.additionalTemplateNames_),
-    templateName_(other.templateName_), mandatory_(other.mandatory_)
+    mandatory_(other.mandatory_)
 {
     cloneNodeMap(other.members_, &members_);
+    if (keepTemplateName) {
+        templateName_ = other.templateName_;
+    }
 }
 
 SetNode::~SetNode() {}
diff --git a/configmgr/source/setnode.hxx b/configmgr/source/setnode.hxx
index 7bf1ab0a199e..94ce537adda1 100644
--- a/configmgr/source/setnode.hxx
+++ b/configmgr/source/setnode.hxx
@@ -46,7 +46,7 @@ public:
         int layer, rtl::OUString const & defaultTemplateName,
         rtl::OUString const & templateName);
 
-    virtual rtl::Reference< Node > clone() const;
+    virtual rtl::Reference< Node > clone(bool keepTemplateName) const;
 
     virtual NodeMap & getMembers();
 
@@ -63,7 +63,7 @@ public:
     bool isValidTemplate(rtl::OUString const & templateName) const;
 
 private:
-    SetNode(SetNode const & other);
+    SetNode(SetNode const & other, bool keepTemplateName);
 
     virtual ~SetNode();
 
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index ab711c3bec10..4c1d59d5d054 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -28,27 +28,86 @@
 #include "precompiled_configmgr.hxx"
 #include "sal/config.h"
 
-#include "configmgr/update.hxx"
+#include <set>
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/configuration/XUpdate.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/weak.hxx"
 #include "osl/mutex.hxx"
 #include "rtl/ref.hxx"
+#include "rtl/unload.h"
+#include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
+#include "sal/types.h"
 
 #include "broadcaster.hxx"
 #include "components.hxx"
 #include "lock.hxx"
 #include "modifications.hxx"
 #include "rootaccess.hxx"
+#include "update.hxx"
+
+namespace configmgr { namespace update {
+
+namespace {
+
+namespace css = com::sun::star;
+
+std::set< rtl::OUString > seqToSet(
+    css::uno::Sequence< rtl::OUString > const & sequence)
+{
+    return std::set< rtl::OUString >(
+        sequence.getConstArray(),
+        sequence.getConstArray() + sequence.getLength());
+}
+
+class Service:
+    public cppu::WeakImplHelper1< css::configuration::XUpdate >,
+    private boost::noncopyable
+{
+public:
+    Service() {}
+
+private:
+    virtual ~Service() {}
+
+    virtual void SAL_CALL insertExtensionXcsFile(
+        sal_Bool shared, rtl::OUString const & fileUri)
+        throw (css::uno::RuntimeException);
 
-namespace configmgr {
+    virtual void SAL_CALL insertExtensionXcuFile(
+        sal_Bool shared, rtl::OUString const & fileUri)
+        throw (css::uno::RuntimeException);
 
-namespace update {
+    virtual void SAL_CALL insertModificationXcuFile(
+        rtl::OUString const & fileUri,
+        css::uno::Sequence< rtl::OUString > const & includedPaths,
+        css::uno::Sequence< rtl::OUString > const & excludedPaths)
+        throw (css::uno::RuntimeException);
+};
 
-void insertExtensionXcsFile(bool shared, rtl::OUString const & fileUri) {
+void Service::insertExtensionXcsFile(
+    sal_Bool shared, rtl::OUString const & fileUri)
+    throw (css::uno::RuntimeException)
+{
     osl::MutexGuard g(lock);
     Components::getSingleton().insertExtensionXcsFile(shared, fileUri);
 }
 
-void insertExtensionXcuFile(bool shared, rtl::OUString const & fileUri) {
+void Service::insertExtensionXcuFile(
+    sal_Bool shared, rtl::OUString const & fileUri)
+    throw (css::uno::RuntimeException)
+{
     Broadcaster bc;
     {
         osl::MutexGuard g(lock);
@@ -61,6 +120,91 @@ void insertExtensionXcuFile(bool shared, rtl::OUString const & fileUri) {
     bc.send();
 }
 
+void Service::insertModificationXcuFile(
+    rtl::OUString const & fileUri,
+    css::uno::Sequence< rtl::OUString > const & includedPaths,
+    css::uno::Sequence< rtl::OUString > const & excludedPaths)
+    throw (css::uno::RuntimeException)
+{
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        Modifications mods;
+        Components::getSingleton().insertModificationXcuFile(
+            fileUri, seqToSet(includedPaths), seqToSet(excludedPaths), &mods);
+        Components::getSingleton().initGlobalBroadcaster(
+            mods, rtl::Reference< RootAccess >(), &bc);
+    }
+    bc.send();
 }
 
+class Factory:
+    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
+    private boost::noncopyable
+{
+public:
+    Factory() {}
+
+private:
+    virtual ~Factory() {}
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithContext(
+        css::uno::Reference< css::uno::XComponentContext > const & Context)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithArgumentsAndContext(
+        css::uno::Sequence< css::uno::Any > const & Arguments,
+        css::uno::Reference< css::uno::XComponentContext > const & Context)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+};
+
+css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
+    css::uno::Reference< css::uno::XComponentContext > const & Context)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    return createInstanceWithArgumentsAndContext(
+        css::uno::Sequence< css::uno::Any >(), Context);
+}
+
+css::uno::Reference< css::uno::XInterface >
+Factory::createInstanceWithArgumentsAndContext(
+    css::uno::Sequence< css::uno::Any > const & Arguments,
+    css::uno::Reference< css::uno::XComponentContext > const &)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    if (Arguments.getLength() != 0) {
+        throw css::uno::Exception(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.comp.configuration.Update must be"
+                    " instantiated without arguments")),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+    return static_cast< cppu::OWeakObject * >(new Service);
+}
+
+}
+
+rtl::OUString getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.Update"));
+}
+
+css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.configuration.Update_Service"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+css::uno::Reference< css::lang::XSingleComponentFactory > createFactory(
+    cppu::ComponentFactoryFunc, rtl::OUString const &,
+    css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
+    SAL_THROW(())
+{
+    return new Factory;
 }
+
+} }
diff --git a/configmgr/source/update.hxx b/configmgr/source/update.hxx
new file mode 100644
index 000000000000..faa5c86b15fa
--- /dev/null
+++ b/configmgr/source/update.hxx
@@ -0,0 +1,59 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#ifndef INCLUDED_CONFIGMGR_SOURCE_UPDATE_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_UPDATE_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppuhelper/factory.hxx"
+#include "rtl/unload.h"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star { namespace lang {
+    class XSingleComponentFactory;
+} } } }
+namespace rtl { class OUString; }
+
+namespace configmgr { namespace update {
+
+rtl::OUString SAL_CALL getImplementationName();
+
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+getSupportedServiceNames();
+
+com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
+SAL_CALL createFactory(
+    cppu::ComponentFactoryFunc, rtl::OUString const &,
+    com::sun::star::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
+    SAL_THROW(());
+
+} }
+
+#endif
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index f951aac5ca01..4adf452c409b 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -270,6 +270,10 @@ XmlReader::Text ValueParser::getTextMode() const {
     if (node_.is()) {
         switch (state_) {
         case STATE_TEXT:
+            if (!items_.empty()) {
+                break;
+            }
+            // fall through
         case STATE_IT:
             return
                 (type_ == TYPE_STRING || type_ == TYPE_STRING_LIST ||
@@ -294,7 +298,9 @@ bool ValueParser::startElement(
             name.equals(RTL_CONSTASCII_STRINGPARAM("it")) &&
             isListType(type_) && separator_.getLength() == 0)
         {
-            checkEmptyPad(reader);
+            pad_.clear();
+                // before first <it>, characters are not ignored; assume they
+                // are only whitespace
             state_ = STATE_IT;
             return true;
         }
@@ -351,7 +357,7 @@ bool ValueParser::startElement(
         css::uno::Reference< css::uno::XInterface >());
 }
 
-bool ValueParser::endElement(XmlReader const & reader) {
+bool ValueParser::endElement() {
     if (!node_.is()) {
         return false;
     }
@@ -363,7 +369,6 @@ bool ValueParser::endElement(XmlReader const & reader) {
                 value = parseValue(separator_, pad_.get(), type_);
                 pad_.clear();
             } else {
-                checkEmptyPad(reader);
                 switch (type_) {
                 case TYPE_BOOLEAN_LIST:
                     value = convertItems< sal_Bool >();
@@ -454,17 +459,6 @@ int ValueParser::getLayer() const {
     return layer_;
 }
 
-void ValueParser::checkEmptyPad(XmlReader const & reader) const {
-    if (pad_.is()) {
-        throw css::uno::RuntimeException(
-            (rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "mixed text and <it> elements in ")) +
-             reader.getUrl()),
-            css::uno::Reference< css::uno::XInterface >());
-    }
-}
-
 template< typename T > css::uno::Any ValueParser::convertItems() {
     css::uno::Sequence< T > seq(items_.size());
     for (sal_Int32 i = 0; i < seq.getLength(); ++i) {
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index c328fe7eddce..4e899f4632dd 100644
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -61,7 +61,7 @@ public:
     bool startElement(
         XmlReader & reader, XmlReader::Namespace ns, Span const & name);
 
-    bool endElement(XmlReader const & reader);
+    bool endElement();
 
     void characters(Span const & text);
 
@@ -75,8 +75,6 @@ public:
     rtl::OString separator_;
 
 private:
-    void checkEmptyPad(XmlReader const & reader) const;
-
     template< typename T > com::sun::star::uno::Any convertItems();
 
     enum State { STATE_TEXT, STATE_TEXT_UNICODE, STATE_IT, STATE_IT_UNICODE };
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index a8e0f77cbd2e..c2573ab67439 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -451,9 +451,9 @@ void writeNode(
 
 void writeModifications(
     Components & components, oslFileHandle handle,
-    rtl::OUString const & grandparentPathRepresentation,
-    rtl::OUString const & parentName, rtl::Reference< Node > const & parent,
-    rtl::OUString const & nodeName, rtl::Reference< Node > const & node,
+    rtl::OUString const & parentPathRepresentation,
+    rtl::Reference< Node > const & parent, rtl::OUString const & nodeName,
+    rtl::Reference< Node > const & node,
     Modifications::Node const & modifications)
 {
     // It is never necessary to write oor:finalized or oor:mandatory attributes,
@@ -461,27 +461,15 @@ void writeModifications(
     if (modifications.children.empty()) {
         OSL_ASSERT(parent.is());
             // components themselves have no parent but must have children
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("<item oor:path=\""));
+        writeAttributeValue(handle, parentPathRepresentation);
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("\">"));
         if (node.is()) {
-            writeData(handle, RTL_CONSTASCII_STRINGPARAM("<item oor:path=\""));
-            writeAttributeValue(
-                handle,
-                (grandparentPathRepresentation +
-                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
-                 Data::createSegment(parent->getTemplateName(), parentName)));
-            writeData(handle, RTL_CONSTASCII_STRINGPARAM("\">"));
             writeNode(components, handle, parent, nodeName, node);
-            writeData(handle, RTL_CONSTASCII_STRINGPARAM("</item>"));
         } else {
-            writeData(handle, RTL_CONSTASCII_STRINGPARAM("<item oor:path=\""));
             switch (parent->kind()) {
             case Node::KIND_LOCALIZED_PROPERTY:
-                writeAttributeValue(handle, grandparentPathRepresentation);
-                writeData(
-                    handle, RTL_CONSTASCII_STRINGPARAM("\"><prop oor:name=\""));
-                writeAttributeValue(handle, parentName);
-                writeData(
-                    handle,
-                    RTL_CONSTASCII_STRINGPARAM("\" oor:op=\"fuse\"><value"));
+                writeData(handle, RTL_CONSTASCII_STRINGPARAM("<value"));
                 if (nodeName.getLength() != 0) {
                     writeData(
                         handle, RTL_CONSTASCII_STRINGPARAM(" xml:lang=\""));
@@ -489,61 +477,44 @@ void writeModifications(
                     writeData(handle, RTL_CONSTASCII_STRINGPARAM("\""));
                 }
                 writeData(
-                    handle,
-                    RTL_CONSTASCII_STRINGPARAM(
-                        " oor:op=\"remove\"/></prop></item>"));
+                    handle, RTL_CONSTASCII_STRINGPARAM(" oor:op=\"remove\"/>"));
                 break;
             case Node::KIND_GROUP:
                 OSL_ASSERT(
                     dynamic_cast< GroupNode * >(parent.get())->isExtensible());
-                writeAttributeValue(
-                    handle,
-                    (grandparentPathRepresentation +
-                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
-                     Data::createSegment(
-                         parent->getTemplateName(), parentName)));
                 writeData(
-                    handle, RTL_CONSTASCII_STRINGPARAM("\"><prop oor:name=\""));
+                    handle, RTL_CONSTASCII_STRINGPARAM("<prop oor:name=\""));
                 writeAttributeValue(handle, nodeName);
                 writeData(
                     handle,
-                    RTL_CONSTASCII_STRINGPARAM(
-                        "\" oor:op=\"remove\"/></item>"));
+                    RTL_CONSTASCII_STRINGPARAM("\" oor:op=\"remove\"/>"));
                 break;
             case Node::KIND_SET:
-                writeAttributeValue(
-                    handle,
-                    (grandparentPathRepresentation +
-                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
-                     Data::createSegment(
-                         parent->getTemplateName(), parentName)));
                 writeData(
-                    handle, RTL_CONSTASCII_STRINGPARAM("\"><node oor:name=\""));
+                    handle, RTL_CONSTASCII_STRINGPARAM("<node oor:name=\""));
                 writeAttributeValue(handle, nodeName);
                 writeData(
                     handle,
-                    RTL_CONSTASCII_STRINGPARAM(
-                        "\" oor:op=\"remove\"/></item>"));
+                    RTL_CONSTASCII_STRINGPARAM("\" oor:op=\"remove\"/>"));
                 break;
             default:
                 OSL_ASSERT(false); // this cannot happen
                 break;
             }
         }
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("</item>"));
     } else {
-        rtl::OUString parentPathRep;
-        if (parent.is()) { // components themselves have no parent
-            parentPathRep = grandparentPathRepresentation +
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
-                Data::createSegment(parent->getTemplateName(), parentName);
-        }
         OSL_ASSERT(node.is());
+        rtl::OUString pathRep(
+            parentPathRepresentation +
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
+            Data::createSegment(node->getTemplateName(), nodeName));
         for (Modifications::Node::Children::const_iterator i(
                  modifications.children.begin());
              i != modifications.children.end(); ++i)
         {
             writeModifications(
-                components, handle, parentPathRep, nodeName, node, i->first,
+                components, handle, pathRep, node, i->first,
                 node->getMember(i->first), i->second);
         }
     }
@@ -605,9 +576,8 @@ void writeModFile(
          j != data.modifications.getRoot().children.end(); ++j)
     {
         writeModifications(
-            components, tmp.handle, rtl::OUString(), rtl::OUString(),
-            rtl::Reference< Node >(), j->first,
-            Data::findNode(Data::NO_LAYER, data.components, j->first),
+            components, tmp.handle, rtl::OUString(), rtl::Reference< Node >(),
+            j->first, Data::findNode(Data::NO_LAYER, data.components, j->first),
             j->second);
     }
     writeData(tmp.handle, RTL_CONSTASCII_STRINGPARAM("</oor:items>"));
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index 8306c692c30f..498254b35644 100644
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -53,7 +53,7 @@ namespace css = com::sun::star;
 
 }
 
-XcdParser::XcdParser(int layer, Dependencies const & dependencies, Data * data):
+XcdParser::XcdParser(int layer, Dependencies const & dependencies, Data & data):
     layer_(layer), dependencies_(dependencies), data_(data), state_(STATE_START)
 {}
 
@@ -137,7 +137,7 @@ bool XcdParser::startElement(
         if (ns == XmlReader::NAMESPACE_OOR &&
             name.equals(RTL_CONSTASCII_STRINGPARAM("component-data")))
         {
-            nestedParser_ = new XcuParser(layer_ + 1, data_, 0);
+            nestedParser_ = new XcuParser(layer_ + 1, data_, 0, 0);
             nesting_ = 1;
             return nestedParser_->startElement(reader, ns, name);
         }
diff --git a/configmgr/source/xcdparser.hxx b/configmgr/source/xcdparser.hxx
index 2e35b3686e60..2ad8ecea7f93 100644
--- a/configmgr/source/xcdparser.hxx
+++ b/configmgr/source/xcdparser.hxx
@@ -47,7 +47,7 @@ class XcdParser: public Parser {
 public:
     typedef std::set< rtl::OUString > Dependencies;
 
-    XcdParser(int layer, Dependencies const & dependencies, Data * data);
+    XcdParser(int layer, Dependencies const & dependencies, Data & data);
 
 private:
     virtual ~XcdParser();
@@ -66,7 +66,7 @@ private:
 
     int layer_;
     Dependencies const & dependencies_;
-    Data * data_;
+    Data & data_;
     State state_;
     rtl::OUString dependency_;
     rtl::Reference< Parser > nestedParser_;
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index 15141844a276..79e122759fc8 100644
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -60,9 +60,66 @@ namespace {
 
 namespace css = com::sun::star;
 
+// Conservatively merge a template or component (and its recursive parts) into
+// an existing instance:
+void merge(
+    rtl::Reference< Node > const & original,
+    rtl::Reference< Node > const & update)
+{
+    OSL_ASSERT(
+        original.is() && update.is() && original->kind() == update->kind() &&
+        update->getFinalized() == Data::NO_LAYER);
+    if (update->getLayer() >= original->getLayer() &&
+        update->getLayer() <= original->getFinalized())
+    {
+        switch (original->kind()) {
+        case Node::KIND_PROPERTY:
+        case Node::KIND_LOCALIZED_PROPERTY:
+        case Node::KIND_LOCALIZED_VALUE:
+            break; //TODO: merge certain parts?
+        case Node::KIND_GROUP:
+            for (NodeMap::iterator i2(update->getMembers().begin());
+                 i2 != update->getMembers().end(); ++i2)
+            {
+                NodeMap::iterator i1(original->getMembers().find(i2->first));
+                if (i1 == original->getMembers().end()) {
+                    if (i2->second->kind() == Node::KIND_PROPERTY &&
+                        dynamic_cast< GroupNode * >(
+                            original.get())->isExtensible())
+                    {
+                        original->getMembers().insert(*i2);
+                    }
+                } else if (i2->second->kind() == i1->second->kind()) {
+                    merge(i1->second, i2->second);
+                }
+            }
+            break;
+        case Node::KIND_SET:
+            for (NodeMap::iterator i2(update->getMembers().begin());
+                 i2 != update->getMembers().end(); ++i2)
+            {
+                NodeMap::iterator i1(original->getMembers().find(i2->first));
+                if (i1 == original->getMembers().end()) {
+                    if (dynamic_cast< SetNode * >(original.get())->
+                        isValidTemplate(i2->second->getTemplateName()))
+                    {
+                        original->getMembers().insert(*i2);
+                    }
+                } else if (i2->second->kind() == i1->second->kind() &&
+                           (i2->second->getTemplateName() ==
+                            i1->second->getTemplateName()))
+                {
+                    merge(i1->second, i2->second);
+                }
+            }
+            break;
+        }
+    }
 }
 
-XcsParser::XcsParser(int layer, Data * data):
+}
+
+XcsParser::XcsParser(int layer, Data & data):
     valueParser_(layer), data_(data), state_(STATE_START)
 {}
 
@@ -209,7 +266,7 @@ bool XcsParser::startElement(
 }
 
 void XcsParser::endElement(XmlReader const & reader) {
-    if (valueParser_.endElement(reader)) {
+    if (valueParser_.endElement()) {
         return;
     }
     if (ignoring_ > 0) {
@@ -218,15 +275,30 @@ void XcsParser::endElement(XmlReader const & reader) {
         Element top(elements_.top());
         elements_.pop();
         if (top.node.is()) {
-            NodeMap * map;
             if (elements_.empty()) {
                 switch (state_) {
                 case STATE_TEMPLATES:
-                    map = &data_->templates;
+                    {
+                        NodeMap::iterator i(data_.templates.find(top.name));
+                        if (i == data_.templates.end()) {
+                            data_.templates.insert(
+                                NodeMap::value_type(top.name, top.node));
+                        } else {
+                            merge(i->second, top.node);
+                        }
+                    }
                     break;
                 case STATE_COMPONENT:
-                    map = &data_->components;
-                    state_ = STATE_COMPONENT_DONE;
+                    {
+                        NodeMap::iterator i(data_.components.find(top.name));
+                        if (i == data_.components.end()) {
+                            data_.components.insert(
+                                NodeMap::value_type(top.name, top.node));
+                        } else {
+                            merge(i->second, top.node);
+                        }
+                        state_ = STATE_COMPONENT_DONE;
+                    }
                     break;
                 default:
                     OSL_ASSERT(false);
@@ -235,10 +307,9 @@ void XcsParser::endElement(XmlReader const & reader) {
                             RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
                         css::uno::Reference< css::uno::XInterface >());
                 }
-            } else {
-                map = &elements_.top().node->getMembers();
-            }
-            if (!map->insert(NodeMap::value_type(top.name, top.node)).second) {
+            } else if (!elements_.top().node->getMembers().insert(
+                           NodeMap::value_type(top.name, top.node)).second)
+            {
                 throw css::uno::RuntimeException(
                     (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("duplicate ")) +
                      top.name +
@@ -372,7 +443,7 @@ void XcsParser::handleNodeRef(XmlReader & reader) {
             css::uno::Reference< css::uno::XInterface >());
     }
     rtl::Reference< Node > tmpl(
-        data_->getTemplate(
+        data_.getTemplate(
             valueParser_.getLayer(),
             xmldata::parseTemplateReference(
                 component, hasNodeType, nodeType, 0)));
@@ -385,7 +456,7 @@ void XcsParser::handleNodeRef(XmlReader & reader) {
              reader.getUrl()),
             css::uno::Reference< css::uno::XInterface >());
     }
-    rtl::Reference< Node > node(tmpl->clone());
+    rtl::Reference< Node > node(tmpl->clone(false));
     node->setLayer(valueParser_.getLayer());
     elements_.push(Element(node, name));
 }
diff --git a/configmgr/source/xcsparser.hxx b/configmgr/source/xcsparser.hxx
index 21a124945a2e..196add9a826a 100644
--- a/configmgr/source/xcsparser.hxx
+++ b/configmgr/source/xcsparser.hxx
@@ -48,7 +48,7 @@ struct Span;
 
 class XcsParser: public Parser {
 public:
-    XcsParser(int layer, Data * data);
+    XcsParser(int layer, Data & data);
 
 private:
     virtual ~XcsParser();
@@ -94,7 +94,7 @@ private:
     typedef std::stack< Element > ElementStack;
 
     ValueParser valueParser_;
-    Data * data_;
+    Data & data_;
     rtl::OUString componentName_;
     State state_;
     long ignoring_;
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 220168c62725..eda478b18b70 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -49,6 +49,7 @@
 #include "modifications.hxx"
 #include "node.hxx"
 #include "nodemap.hxx"
+#include "partial.hxx"
 #include "path.hxx"
 #include "propertynode.hxx"
 #include "setnode.hxx"
@@ -65,14 +66,15 @@ namespace css = com::sun::star;
 
 }
 
-XcuParser::XcuParser(int layer, Data * data, Modifications * modifications):
-    valueParser_(layer), data_(data), modifications_(modifications)
-{
-    if (layer == Data::NO_LAYER) {
-        OSL_ASSERT(modifications_ == 0);
-        modifications_ = &data_->modifications;
-    }
-}
+XcuParser::XcuParser(
+    int layer, Data & data, Partial const * partial,
+    Modifications * broadcastModifications):
+    valueParser_(layer), data_(data),
+    partial_(partial), broadcastModifications_(broadcastModifications),
+    recordModifications_(layer == Data::NO_LAYER),
+    trackPath_(
+        partial_ != 0 || broadcastModifications_ != 0 || recordModifications_)
+{}
 
 XcuParser::~XcuParser() {}
 
@@ -105,7 +107,7 @@ bool XcuParser::startElement(
                 css::uno::Reference< css::uno::XInterface >());
         }
     } else if (state_.top().ignore) {
-        state_.push(state_.top());
+        state_.push(State(false));
     } else if (!state_.top().node.is()) {
         if (ns == XmlReader::NAMESPACE_NONE &&
             name.equals(RTL_CONSTASCII_STRINGPARAM("item")))
@@ -209,12 +211,12 @@ bool XcuParser::startElement(
     return true;
 }
 
-void XcuParser::endElement(XmlReader const & reader) {
-    if (valueParser_.endElement(reader)) {
+void XcuParser::endElement(XmlReader const &) {
+    if (valueParser_.endElement()) {
         return;
     }
     OSL_ASSERT(!state_.empty());
-    bool ignore = state_.top().ignore;
+    bool pop = state_.top().pop;
     rtl::Reference< Node > insert;
     rtl::OUString name;
     if (state_.top().insert) {
@@ -227,10 +229,10 @@ void XcuParser::endElement(XmlReader const & reader) {
         OSL_ASSERT(!state_.empty() && state_.top().node.is());
         state_.top().node->getMembers()[name] = insert;
     }
-    if (!ignore && !modificationPath_.empty()) {
-        modificationPath_.pop_back();
+    if (pop && !path_.empty()) {
+        path_.pop_back();
             // </item> will pop less than <item> pushed, but that is harmless,
-            // as the next <item> will reset modificationPath_
+            // as the next <item> will reset path_
     }
 }
 
@@ -328,16 +330,27 @@ void XcuParser::handleComponentData(XmlReader & reader) {
     }
     componentName_ = xmldata::convertFromUtf8(
         Span(buf.getStr(), buf.getLength()));
+    if (trackPath_) {
+        OSL_ASSERT(path_.empty());
+        path_.push_back(componentName_);
+        if (partial_ != 0 && partial_->contains(path_) == Partial::CONTAINS_NOT)
+        {
+            state_.push(State(true)); // ignored
+            return;
+        }
+    }
     rtl::Reference< Node > node(
         Data::findNode(
-            valueParser_.getLayer(), data_->components, componentName_));
+            valueParser_.getLayer(), data_.components, componentName_));
     if (!node.is()) {
-        throw css::uno::RuntimeException(
-            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unknown component ")) +
-             componentName_ +
-             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
-             reader.getUrl()),
-            css::uno::Reference< css::uno::XInterface >());
+        OSL_TRACE(
+            "configmgr unknown component %s in %s",
+            rtl::OUStringToOString(
+                componentName_, RTL_TEXTENCODING_UTF8).getStr(),
+            rtl::OUStringToOString(
+                reader.getUrl(), RTL_TEXTENCODING_UTF8).getStr());
+        state_.push(State(true)); // ignored
+        return;
     }
     switch (op) {
     case OPERATION_MODIFY:
@@ -356,10 +369,6 @@ void XcuParser::handleComponentData(XmlReader & reader) {
         node->getFinalized());
     node->setFinalized(finalizedLayer);
     state_.push(State(node, finalizedLayer < valueParser_.getLayer()));
-    if (modifications_ != 0) {
-        OSL_ASSERT(modificationPath_.empty());
-        modificationPath_.push_back(componentName_);
-    }
 }
 
 void XcuParser::handleItem(XmlReader & reader) {
@@ -386,27 +395,44 @@ void XcuParser::handleItem(XmlReader & reader) {
     rtl::OUString path(xmldata::convertFromUtf8(attrPath));
     int finalizedLayer;
     rtl::Reference< Node > node(
-        data_->resolvePathRepresentation(
-            path, &modificationPath_, &finalizedLayer));
+        data_.resolvePathRepresentation(
+            path, 0, &path_, &finalizedLayer));
     if (!node.is()) {
-        //TODO: Within Components::parseModificationLayer (but only there) it
-        // can rightly happen that data is read that does not match a schema
-        // (that no schema exists, or that the schema specifies a different
-        // type), namely if the schema was brought along by an extension that
-        // has been removed or replaced; instead of taking care of that at all
-        // the relevant places, as a hack, only "top-level" <item>s (that only
-        // appear in modification layer data) with unknown path are filtered out
-        // here.
         OSL_TRACE(
-            "configmgr unknown <item path=\"%s\">",
-            rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8).getStr());
-        state_.push(State()); // ignored
+            "configmgr unknown item %s in %s",
+            rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8).getStr(),
+            rtl::OUStringToOString(
+                reader.getUrl(), RTL_TEXTENCODING_UTF8).getStr());
+        state_.push(State(true)); // ignored
         return;
     }
-    OSL_ASSERT(!modificationPath_.empty());
-    componentName_ = modificationPath_.front();
-    if (modifications_ == 0) {
-        modificationPath_.clear();
+    OSL_ASSERT(!path_.empty());
+    componentName_ = path_.front();
+    if (trackPath_) {
+        if (partial_ != 0 && partial_->contains(path_) == Partial::CONTAINS_NOT)
+        {
+            state_.push(State(true)); // ignored
+            return;
+        }
+    } else {
+        path_.clear();
+    }
+    switch (node->kind()) {
+    case Node::KIND_PROPERTY:
+    case Node::KIND_LOCALIZED_VALUE:
+        OSL_TRACE(
+            "configmgr item of bad type %s in %s",
+            rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8).getStr(),
+            rtl::OUStringToOString(
+                reader.getUrl(), RTL_TEXTENCODING_UTF8).getStr());
+        state_.push(State(true)); // ignored
+        return;
+    case Node::KIND_LOCALIZED_PROPERTY:
+        valueParser_.type_ = dynamic_cast< LocalizedPropertyNode * >(
+            node.get())->getStaticType();
+        break;
+    default:
+        break;
     }
     state_.push(State(node, finalizedLayer < valueParser_.getLayer()));
 }
@@ -483,13 +509,13 @@ void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) {
                 css::uno::Reference< css::uno::XInterface >());
         }
         prop->setValue(valueParser_.getLayer(), css::uno::Any());
-        state_.push(State());
+        state_.push(State(false));
     } else if (external.getLength() == 0) {
         valueParser_.separator_ = separator;
         valueParser_.start(prop);
     } else {
         prop->setExternal(valueParser_.getLayer(), external);
-        state_.push(State());
+        state_.push(State(false));
     }
 }
 
@@ -546,11 +572,20 @@ void XcuParser::handleLocpropValue(
             op = parseOperation(reader.getAttributeValue(true));
         }
     }
+    if (trackPath_) {
+        path_.push_back(name);
+        if (partial_ != 0 &&
+            partial_->contains(path_) != Partial::CONTAINS_NODE)
+        {
+            state_.push(State(true)); // ignored
+            return;
+        }
+    }
     NodeMap::iterator i(locprop->getMembers().find(name));
     if (i != locprop->getMembers().end() &&
         i->second->getLayer() > valueParser_.getLayer())
     {
-        state_.push(State()); // ignored
+        state_.push(State(true)); // ignored
         return;
     }
     if (nil && !locprop->isNillable()) {
@@ -563,23 +598,29 @@ void XcuParser::handleLocpropValue(
     }
     switch (op) {
     case OPERATION_FUSE:
-        if (nil) {
-            if (i == locprop->getMembers().end()) {
-                locprop->getMembers()[name] = new LocalizedValueNode(
-                    valueParser_.getLayer(), css::uno::Any());
+        {
+            bool pop = false;
+            if (nil) {
+                if (i == locprop->getMembers().end()) {
+                    locprop->getMembers()[name] = new LocalizedValueNode(
+                        valueParser_.getLayer(), css::uno::Any());
+                } else {
+                    dynamic_cast< LocalizedValueNode * >(
+                        i->second.get())->setValue(
+                            valueParser_.getLayer(), css::uno::Any());
+                }
+                state_.push(State(true));
             } else {
-                dynamic_cast< LocalizedValueNode * >(i->second.get())->setValue(
-                    valueParser_.getLayer(), css::uno::Any());
+                valueParser_.separator_ = separator;
+                valueParser_.start(locprop, name);
+                pop = true;
+            }
+            if (trackPath_) {
+                recordModification();
+                if (pop) {
+                    path_.pop_back();
+                }
             }
-            state_.push(State());
-        } else {
-            valueParser_.separator_ = separator;
-            valueParser_.start(locprop, name);
-        }
-        if (modifications_ != 0) {
-            modificationPath_.push_back(name);
-            modifications_->add(modificationPath_);
-            modificationPath_.pop_back();
         }
         break;
     case OPERATION_REMOVE:
@@ -588,12 +629,8 @@ void XcuParser::handleLocpropValue(
         if (i != locprop->getMembers().end()) {
             locprop->getMembers().erase(i);
         }
-        state_.push(State());
-        if (modifications_ != 0) {
-            modificationPath_.push_back(name);
-            modifications_->add(modificationPath_);
-            modificationPath_.pop_back();
-        }
+        state_.push(State(true));
+        recordModification();
         break;
     default:
         throw css::uno::RuntimeException(
@@ -643,6 +680,17 @@ void XcuParser::handleGroupProp(XmlReader & reader, GroupNode * group) {
              reader.getUrl()),
             css::uno::Reference< css::uno::XInterface >());
     }
+    if (trackPath_) {
+        path_.push_back(name);
+        //TODO: This ignores locprop values for which specific include paths
+        // exist (i.e., for which contains(locprop path) = CONTAINS_SUBNODES):
+        if (partial_ != 0 &&
+            partial_->contains(path_) != Partial::CONTAINS_NODE)
+        {
+            state_.push(State(true)); // ignored
+            return;
+        }
+    }
     NodeMap::iterator i(group->getMembers().find(name));
     if (i == group->getMembers().end()) {
         handleUnknownGroupProp(reader, group, name, type, op, finalized);
@@ -672,17 +720,10 @@ void XcuParser::handleUnknownGroupProp(
     XmlReader const & reader, GroupNode * group, rtl::OUString const & name,
     Type type, Operation operation, bool finalized)
 {
-    if (!group->isExtensible()) {
-        throw css::uno::RuntimeException(
-            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unknown prop ")) +
-             name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
-             reader.getUrl()),
-            css::uno::Reference< css::uno::XInterface >());
-    }
     switch (operation) {
     case OPERATION_REPLACE:
     case OPERATION_FUSE:
-        {
+        if (group->isExtensible()) {
             if (type == TYPE_ERROR) {
                 throw css::uno::RuntimeException(
                     (rtl::OUString(
@@ -701,17 +742,17 @@ void XcuParser::handleUnknownGroupProp(
                 prop->setFinalized(valueParser_.getLayer());
             }
             state_.push(State(prop, name, state_.top().locked));
-            if (modifications_ != 0) {
-                modificationPath_.push_back(name);
-                modifications_->add(modificationPath_);
-            }
+            recordModification();
+            break;
         }
-        break;
+        // fall through
     default:
         OSL_TRACE(
-            "ignoring modify or remove of unknown (presumably extension)"
-            " property");
-        state_.push(State());
+            "configmgr unknown property %s in %s",
+            rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr(),
+            rtl::OUStringToOString(
+                reader.getUrl(), RTL_TEXTENCODING_UTF8).getStr());
+        state_.push(State(true)); // ignored
         break;
     }
 }
@@ -724,7 +765,7 @@ void XcuParser::handlePlainGroupProp(
     PropertyNode * property = dynamic_cast< PropertyNode * >(
         propertyIndex->second.get());
     if (property->getLayer() > valueParser_.getLayer()) {
-        state_.push(State()); // ignored
+        state_.push(State(true)); // ignored
         return;
     }
     int finalizedLayer = std::min(
@@ -751,10 +792,7 @@ void XcuParser::handlePlainGroupProp(
                 property,
                 (state_.top().locked ||
                  finalizedLayer < valueParser_.getLayer())));
-        if (modifications_ != 0) {
-            modificationPath_.push_back(name);
-            modifications_->add(modificationPath_);
-        }
+        recordModification();
         break;
     case OPERATION_REMOVE:
         if (!property->isExtension()) {
@@ -767,12 +805,8 @@ void XcuParser::handlePlainGroupProp(
                 css::uno::Reference< css::uno::XInterface >());
         }
         group->getMembers().erase(propertyIndex);
-        state_.push(State()); // ignore children
-        if (modifications_ != 0) {
-            modificationPath_.push_back(name);
-            modifications_->add(modificationPath_);
-            modificationPath_.pop_back();
-        }
+        state_.push(State(true)); // ignore children
+        recordModification();
         break;
     }
 }
@@ -782,7 +816,7 @@ void XcuParser::handleLocalizedGroupProp(
     rtl::OUString const & name, Type type, Operation operation, bool finalized)
 {
     if (property->getLayer() > valueParser_.getLayer()) {
-        state_.push(State()); // ignored
+        state_.push(State(true)); // ignored
         return;
     }
     int finalizedLayer = std::min(
@@ -808,9 +842,6 @@ void XcuParser::handleLocalizedGroupProp(
                 property,
                 (state_.top().locked ||
                  finalizedLayer < valueParser_.getLayer())));
-        if (modifications_ != 0) {
-            modificationPath_.push_back(name);
-        }
         break;
     case OPERATION_REPLACE:
         {
@@ -824,10 +855,7 @@ void XcuParser::handleLocalizedGroupProp(
                     replacement, name,
                     (state_.top().locked ||
                      finalizedLayer < valueParser_.getLayer())));
-            if (modifications_ != 0) {
-                modificationPath_.push_back(name);
-                modifications_->add(modificationPath_);
-            }
+            recordModification();
         }
         break;
     case OPERATION_REMOVE:
@@ -876,14 +904,24 @@ void XcuParser::handleGroupNode(
              reader.getUrl()),
             css::uno::Reference< css::uno::XInterface >());
     }
+    if (trackPath_) {
+        path_.push_back(name);
+        if (partial_ != 0 && partial_->contains(path_) == Partial::CONTAINS_NOT)
+        {
+            state_.push(State(true)); // ignored
+            return;
+        }
+    }
     rtl::Reference< Node > child(
         Data::findNode(valueParser_.getLayer(), group->getMembers(), name));
     if (!child.is()) {
-        throw css::uno::RuntimeException(
-            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unknown node ")) +
-             name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
-             reader.getUrl()),
-            css::uno::Reference< css::uno::XInterface >());
+        OSL_TRACE(
+            "configmgr unknown node %s in %s",
+            rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr(),
+            rtl::OUStringToOString(
+                reader.getUrl(), RTL_TEXTENCODING_UTF8).getStr());
+        state_.push(State(true)); // ignored
+        return;
     }
     if (op != OPERATION_MODIFY && op != OPERATION_FUSE) {
         throw css::uno::RuntimeException(
@@ -901,9 +939,6 @@ void XcuParser::handleGroupNode(
         State(
             child,
             state_.top().locked || finalizedLayer < valueParser_.getLayer()));
-    if (modifications_ != 0) {
-        modificationPath_.push_back(name);
-    }
 }
 
 void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
@@ -958,6 +993,14 @@ void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
              reader.getUrl()),
             css::uno::Reference< css::uno::XInterface >());
     }
+    if (trackPath_) {
+        path_.push_back(name);
+        if (partial_ != 0 && partial_->contains(path_) == Partial::CONTAINS_NOT)
+        {
+            state_.push(State(true)); // ignored
+            return;
+        }
+    }
     rtl::OUString templateName(
         xmldata::parseTemplateReference(
             component, hasNodeType, nodeType, &set->getDefaultTemplateName()));
@@ -972,7 +1015,7 @@ void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
             css::uno::Reference< css::uno::XInterface >());
     }
     rtl::Reference< Node > tmpl(
-        data_->getTemplate(valueParser_.getLayer(), templateName));
+        data_.getTemplate(valueParser_.getLayer(), templateName));
     if (!tmpl.is()) {
         throw css::uno::RuntimeException(
             (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("set member node ")) +
@@ -993,7 +1036,7 @@ void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
         mandatoryLayer = std::min(mandatoryLayer, i->second->getMandatory());
         i->second->setMandatory(mandatoryLayer);
         if (i->second->getLayer() > valueParser_.getLayer()) {
-            state_.push(State()); // ignored
+            state_.push(State(true)); // ignored
             return;
         }
     }
@@ -1001,48 +1044,39 @@ void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
     case OPERATION_MODIFY:
         if (i == set->getMembers().end()) {
             OSL_TRACE("ignoring modify of unknown set member node");
-            state_.push(State());
+            state_.push(State(true)); // ignored
         } else {
             state_.push(
                 State(
                     i->second,
                     (state_.top().locked ||
                      finalizedLayer < valueParser_.getLayer())));
-            if (modifications_ != 0) {
-                modificationPath_.push_back(name);
-            }
         }
         break;
     case OPERATION_REPLACE:
         if (state_.top().locked || finalizedLayer < valueParser_.getLayer()) {
-            state_.push(State()); // ignored
+            state_.push(State(true)); // ignored
         } else {
-            rtl::Reference< Node > member(tmpl->clone());
+            rtl::Reference< Node > member(tmpl->clone(true));
             member->setLayer(valueParser_.getLayer());
             member->setFinalized(finalizedLayer);
             member->setMandatory(mandatoryLayer);
             state_.push(State(member, name, false));
-            if (modifications_ != 0) {
-                modificationPath_.push_back(name);
-                modifications_->add(modificationPath_);
-            }
+            recordModification();
         }
         break;
     case OPERATION_FUSE:
         if (i == set->getMembers().end()) {
             if (state_.top().locked || finalizedLayer < valueParser_.getLayer())
             {
-                state_.push(State()); // ignored
+                state_.push(State(true)); // ignored
             } else {
-                rtl::Reference< Node > member(tmpl->clone());
+                rtl::Reference< Node > member(tmpl->clone(true));
                 member->setLayer(valueParser_.getLayer());
                 member->setFinalized(finalizedLayer);
                 member->setMandatory(mandatoryLayer);
                 state_.push(State(member, name, false));
-                if (modifications_ != 0) {
-                    modificationPath_.push_back(name);
-                    modifications_->add(modificationPath_);
-                }
+                recordModification();
             }
         } else {
             state_.push(
@@ -1050,9 +1084,6 @@ void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
                     i->second,
                     (state_.top().locked ||
                      finalizedLayer < valueParser_.getLayer())));
-            if (modifications_ != 0) {
-                modificationPath_.push_back(name);
-            }
         }
         break;
     case OPERATION_REMOVE:
@@ -1064,14 +1095,19 @@ void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
         {
             set->getMembers().erase(i);
         }
-        state_.push(State());
-        if (modifications_ != 0) {
-            modificationPath_.push_back(name);
-            modifications_->add(modificationPath_);
-            modificationPath_.pop_back();
-        }
+        state_.push(State(true));
+        recordModification();
         break;
     }
 }
 
+void XcuParser::recordModification() {
+    if (broadcastModifications_ != 0) {
+        broadcastModifications_->add(path_);
+    }
+    if (recordModifications_) {
+        data_.modifications.add(path_);
+    }
+}
+
 }
diff --git a/configmgr/source/xcuparser.hxx b/configmgr/source/xcuparser.hxx
index 21806edebe9c..64108451b4ef 100644
--- a/configmgr/source/xcuparser.hxx
+++ b/configmgr/source/xcuparser.hxx
@@ -49,6 +49,7 @@ namespace configmgr {
 class GroupNode;
 class LocalizedPropertyNode;
 class Modifications;
+class Partial;
 class PropertyNode;
 class SetNode;
 struct Data;
@@ -56,7 +57,9 @@ struct Span;
 
 class XcuParser: public Parser {
 public:
-    XcuParser(int layer, Data * data, Modifications * modifications);
+    XcuParser(
+        int layer, Data & data, Partial const * partial,
+        Modifications * broadcastModifications);
 
 private:
     virtual ~XcuParser();
@@ -105,36 +108,44 @@ private:
 
     void handleSetNode(XmlReader & reader, SetNode * set);
 
+    void recordModification();
+
     struct State {
         rtl::Reference< Node > node; // empty iff ignore or <items>
         rtl::OUString name; // empty and ignored if !insert
         bool ignore;
         bool insert;
         bool locked;
+        bool pop;
 
-        inline State(): ignore(true), insert(false), locked(false) {}
+        inline State(bool thePop):
+            ignore(true), insert(false), locked(false), pop(thePop)
+        {}
 
         inline State(rtl::Reference< Node > const & theNode, bool theLocked):
-            node(theNode), ignore(false), insert(false), locked(theLocked)
+            node(theNode), ignore(false), insert(false), locked(theLocked),
+            pop(true)
         {}
 
         inline State(
             rtl::Reference< Node > const & theNode,
             rtl::OUString const & theName, bool theLocked):
             node(theNode), name(theName), ignore(false), insert(true),
-            locked(theLocked)
+            locked(theLocked), pop(true)
         {}
     };
 
     typedef std::stack< State > StateStack;
 
     ValueParser valueParser_;
-    Data * data_;
-    Modifications * modifications_;
+    Data & data_;
+    Partial const * partial_;
+    Modifications * broadcastModifications_;
+    bool recordModifications_;
+    bool trackPath_;
     rtl::OUString componentName_;
     StateStack state_;
-    Path modificationPath_;
-    rtl::OUString path_;
+    Path path_;
 };
 
 }
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
index 4976a7d607ca..ce9581b93458 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
@@ -38,10 +38,9 @@ SECONDARY_PACKAGE = org$/hsqldb$/lib
 
 
 .IF "$(SYSTEM_HSQLDB)" == "YES"
-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
-JARFILES+= $(HSQLDB_JAR)
+EXTRAJARFILES = $(HSQLDB_JAR)
 .ELSE
-JARFILES+= hsqldb.jar
+JARFILES = hsqldb.jar
 .ENDIF
 
 JAVAFILES =\
@@ -60,7 +59,7 @@ JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class
 JARCOMPRESS	= TRUE
 JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE)
 JARTARGET	= $(TARGET).jar
-JARCLASSPATH = $(JARFILES) ..
+JARCLASSPATH = $(JARFILES) $(EXTRAJARFILES) ..
 
 # --- Targets ------------------------------------------------------  
 .INCLUDE :  target.mk 
diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx
index 8f22de0be964..547cc8fb9970 100644
--- a/connectivity/inc/connectivity/PColumn.hxx
+++ b/connectivity/inc/connectivity/PColumn.hxx
@@ -33,6 +33,7 @@
 #include <vos/ref.hxx>
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
 #include <comphelper/proparrhlp.hxx>
 
 namespace connectivity
@@ -49,6 +50,7 @@ namespace connectivity
         {
             ::rtl::OUString m_aRealName;
             ::rtl::OUString m_aTableName;
+            ::rtl::OUString m_sLabel;
             sal_Bool        m_bFunction;
             sal_Bool        m_bDbasePrecisionChanged;
             sal_Bool        m_bAggregateFunction;
@@ -64,6 +66,7 @@ namespace connectivity
             OParseColumn(const ::rtl::OUString& _Name,
                     const ::rtl::OUString& _TypeName,
                     const ::rtl::OUString& _DefaultValue,
+                    const ::rtl::OUString& _Description,
                     sal_Int32       _IsNullable,
                     sal_Int32       _Precision,
                     sal_Int32       _Scale,
@@ -75,15 +78,17 @@ namespace connectivity
             virtual void construct();
 
             void setRealName(const ::rtl::OUString& _rName)  { m_aRealName  = _rName; }
+            void setLabel(const ::rtl::OUString& i_sLabel)   { m_sLabel  = i_sLabel; }
             void setTableName(const ::rtl::OUString& _rName) { m_aTableName = _rName; }
             void setFunction(sal_Bool _bFunction)            { m_bFunction  = _bFunction; }
             void setAggregateFunction(sal_Bool _bFunction)   { m_bAggregateFunction = _bFunction; }
             void setIsSearchable( sal_Bool _bIsSearchable )  { m_bIsSearchable = _bIsSearchable; }
             void setDbasePrecisionChanged(sal_Bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; }
 
-            ::rtl::OUString getRealName() const { return  m_aRealName; }
-            ::rtl::OUString getTableName() const { return  m_aTableName; }
-            sal_Bool        getFunction() const { return  m_bFunction; }
+            ::rtl::OUString getRealName()   const { return  m_aRealName; }
+            ::rtl::OUString getLabel()      const { return  m_sLabel; }
+            ::rtl::OUString getTableName()  const { return  m_aTableName; }
+            sal_Bool        getFunction()   const { return  m_bFunction; }
             sal_Bool        getDbasePrecisionChanged()  const { return  m_bDbasePrecisionChanged; }
 
         public:
@@ -92,16 +97,20 @@ namespace connectivity
             static ::vos::ORef< OSQLColumns >
                 createColumnsForResultSet(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >& _rxResMetaData,
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMetaData
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMetaData,
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns
                 );
 
-            /** creates a single OParseColumn, as described by a result set meta data instance
+            DECLARE_STL_USTRINGACCESS_MAP(int,StringMap);
+            /** creates a single OParseColumn, as described by a result set meta data instance.
+                The column names are unique.
             */
             static OParseColumn*
                 createColumnForResultSet(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >& _rxResMetaData,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMetaData,
-                    sal_Int32 _nColumnPos
+                    sal_Int32 _nColumnPos,
+                    StringMap& _rColumns
                 );
 
         private:
@@ -125,17 +134,6 @@ namespace connectivity
             virtual ~OOrderColumn();
         public:
             OOrderColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,sal_Bool _bCase,sal_Bool _bAscending);
-            OOrderColumn(const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _TypeName,
-                    const ::rtl::OUString& _DefaultValue,
-                    sal_Int32       _IsNullable,
-                    sal_Int32       _Precision,
-                    sal_Int32       _Scale,
-                    sal_Int32       _Type,
-                    sal_Bool        _IsAutoIncrement,
-                    sal_Bool        _IsCurrency,
-                    sal_Bool        _bCase
-                    ,sal_Bool _bAscending);
 
             virtual void construct();
 
diff --git a/connectivity/inc/connectivity/SQLStatementHelper.hxx b/connectivity/inc/connectivity/SQLStatementHelper.hxx
new file mode 100644
index 000000000000..0d1bb97c7b7f
--- /dev/null
+++ b/connectivity/inc/connectivity/SQLStatementHelper.hxx
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * 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: dbtools.hxx,v $
+ * $Revision: 1.37 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _CONNECTIVITY_SQLSTATEMENTHELPER_HXX_
+#define _CONNECTIVITY_SQLSTATEMENTHELPER_HXX_
+
+#include "connectivity/dbtoolsdllapi.hxx"
+#include <com/sun/star/beans/XPropertySet.hpp>
+namespace rtl
+{
+    class OUStringBuffer;
+}
+//.........................................................................
+namespace dbtools
+{
+    class OOO_DLLPUBLIC_DBTOOLS ISQLStatementHelper
+    {
+    public:
+        virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,::rtl::OUStringBuffer& _rOut) = 0;
+    };
+
+//.........................................................................
+}   // namespace dbtools
+//.........................................................................
+
+#endif // _CONNECTIVITY_SQLSTATEMENTHELPER_HXX_
+
diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx
index 9f0a644e0b6d..f99a106bce37 100644
--- a/connectivity/inc/connectivity/TTableHelper.hxx
+++ b/connectivity/inc/connectivity/TTableHelper.hxx
@@ -45,6 +45,7 @@ namespace connectivity
     {
         ::rtl::OUString sName;
         ::rtl::OUString aField6;
+        ::rtl::OUString sField12; // REMARKS
         ::rtl::OUString sField13;
         sal_Int32       nField5
                     ,   nField7
@@ -60,10 +61,12 @@ namespace connectivity
             , sal_Int32     _nField7
             , sal_Int32     _nField9
             , sal_Int32     _nField11
+            , const ::rtl::OUString& _sField12
             , const ::rtl::OUString& _sField13
             ,OrdinalPosition _nPosition )
             :sName( _rName )
             ,aField6(_aField6)
+            ,sField12(_sField12)
             ,sField13(_sField13)
             ,nField5(_nField5)
             ,nField7(_nField7)
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index 1503291ef9b7..9b93830aeefe 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -87,6 +87,7 @@ namespace rtl
 //.........................................................................
 namespace dbtools
 {
+    class ISQLStatementHelper;
     typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection;
 
     enum EComposeRule
@@ -225,6 +226,15 @@ namespace dbtools
         const ::rtl::OUString& _rName
     );
 
+    /** returns the primary key columns of the table
+    */
+    OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getPrimaryKeyColumns_throw(
+        const ::com::sun::star::uno::Any& i_aTable
+    );
+    OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getPrimaryKeyColumns_throw(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& i_xTable
+    );
+
     /** get fields for a result set given by a "command descriptor"
 
         <p>A command descriptor here means:
@@ -661,6 +671,7 @@ namespace dbtools
     OOO_DLLPUBLIC_DBTOOLS
     ::rtl::OUString createStandardCreateStatement(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
+                                                    ISQLStatementHelper* _pHelper,
                                                     const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
 
     /** creates the standard sql statement for the key part of a create table statement.
@@ -674,32 +685,39 @@ namespace dbtools
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection);
 
     /** creates the standard sql statement for the column part of a create table statement.
+        @param  _pHelper
+            Allow to add special SQL constructs.
         @param  descriptor
             The descriptor of the column.
         @param  _xConnection
             The connection.
-        @param  _bAddScale
-            The scale will also be added when the value is 0.
+        @param  _pHelper
+            Allow to add special SQL constructs.
     */
     OOO_DLLPUBLIC_DBTOOLS
-    ::rtl::OUString createStandardColumnPart(   const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,
-                                                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
-                                                const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
+    ::rtl::OUString createStandardColumnPart(   const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor
+                                                ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection
+                                                ,ISQLStatementHelper* _pHelper = NULL
+                                                ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
 
     /** creates a SQL CREATE TABLE statement
+
         @param  descriptor
             The descriptor of the new table.
         @param  _xConnection
             The connection.
-        @param  _bAddScale
-            The scale will also be added when the value is 0.
+        @param  _pHelper
+            Allow to add special SQL constructs.
+        @param  _sCreatePattern
+
         @return
             The CREATE TABLE statement.
     */
     OOO_DLLPUBLIC_DBTOOLS
-    ::rtl::OUString createSqlCreateTableStatement(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,
-                                                    const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
-                                                    const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
+    ::rtl::OUString createSqlCreateTableStatement(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor
+                                                    ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection
+                                                    ,ISQLStatementHelper* _pHelper = NULL
+                                                    ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
 
     /** creates a SDBC column with the help of getColumns.
         @param  _xTable
diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
index 2c9fa31a2d7e..0a8c5498cf60 100644
--- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
@@ -84,6 +84,7 @@ namespace connectivity
             OColumn(    const ::rtl::OUString& _Name,
                                 const ::rtl::OUString& _TypeName,
                                 const ::rtl::OUString& _DefaultValue,
+                                const ::rtl::OUString& _Description,
                                 sal_Int32       _IsNullable,
                                 sal_Int32       _Precision,
                                 sal_Int32       _Scale,
diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx
index 3b7db6968671..5152b7221f85 100644
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/connectivity/inc/connectivity/sqliterator.hxx
@@ -40,6 +40,7 @@
 
 #include <map>
 #include <memory>
+#include <vector>
 
 namespace connectivity
 {
@@ -47,6 +48,8 @@ namespace connectivity
     class OSQLParseNode;
     class OSQLParser;
 
+    typedef ::std::pair<const OSQLParseNode*,const OSQLParseNode* > TNodePair;
+
     enum OSQLStatementType {
         SQL_STATEMENT_UNKNOWN,
         SQL_STATEMENT_SELECT,
@@ -279,6 +282,10 @@ namespace connectivity
 
         // tries to find the correct type of the function
         sal_Int32 getFunctionReturnType(const OSQLParseNode* _pNode );
+
+        // returns a lis of all joined columns
+        ::std::vector< TNodePair >& getJoinConditions() const;
+
     private:
         /** traverses the list of table names, and filles _rTables
         */
@@ -351,6 +358,7 @@ namespace connectivity
         {
             m_aErrors = ::com::sun::star::sdbc::SQLException();
         }
+        void impl_fillJoinConditions(const OSQLParseNode* i_pJoinCondition);
     };
 }
 
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index 5f1d7137e678..fa283cb5cf04 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -226,6 +226,11 @@ namespace connectivity
             concatenation,
             char_factor,
             bit_value_fct,
+            comparison_predicate_part_2,
+            parenthesized_boolean_value_expression,
+            character_string_type,
+            other_like_predicate_part_2,
+            between_predicate_part_2,
             rule_count,             // letzter_wert
             UNKNOWN_RULE            // ID indicating that a node is no rule with a matching Rule-enum value (see getKnownRuleID)
         };
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index dd386c7c7161..0b15c06acf15 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn  connectivity    :    shell  l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL
+cn  connectivity    :    shell  l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss NULL
 cn  connectivity                                    usr1    -   all cn_mkout NULL
 cn  connectivity\inc                                nmake   -   all cn_inc NULL
 cn  connectivity\com\sun\star\sdbcx\comp\hsqldb     nmake   -   all cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java
index c35faac75ff7..a1b457884948 100644
--- a/connectivity/qa/connectivity/tools/CRMDatabase.java
+++ b/connectivity/qa/connectivity/tools/CRMDatabase.java
@@ -285,7 +285,7 @@ public class CRMDatabase
         m_database.getDataSource().createQuery( "parseable", "SELECT * FROM \"customers\"" );
         m_database.getDataSource().createQuery( "parseable native", "SELECT * FROM INFORMATION_SCHEMA.SYSTEM_VIEWS", false );
         m_database.getDataSource().createQuery( "unparseable",
-            "SELECT CAST( \"ID\" AS VARCHAR(3) ) AS \"ID_VARCHAR\" FROM \"products\"", false );
+            "SELECT {fn DAYOFMONTH ('2001-01-01')} AS \"ID_VARCHAR\" FROM \"products\"", false );
 
         validateUnparseable();
     }
diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk
index 0f3c9c84b92e..07490532a1b1 100644
--- a/connectivity/qa/connectivity/tools/makefile.mk
+++ b/connectivity/qa/connectivity/tools/makefile.mk
@@ -38,7 +38,6 @@ all:
     @echo "Java not available. Build skipped"
 .ELSE
 
-.IF "$(BUILD_QADEVOOO)" == "YES"
 #----- compile .java files -----------------------------------------
 
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar
@@ -61,8 +60,6 @@ ALL :   ALLTAR
 ALL: 	ALLDEP
 .ENDIF
 
-.ENDIF
-
 .ENDIF # "$(SOLAR_JAVA)" == ""
 
 .INCLUDE :  target.mk
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index a09260782fd6..9f5be37f208f 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -126,9 +126,27 @@ using namespace ::com::sun::star::beans;
                 case DataType::TIMESTAMP:
                 {
                     DateTime aDateTime;
+                    bool bOk = false;
+                    if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_DOUBLE)
+                    {
+                        double nValue = 0.0;
+                       _rVal >>= nValue;
+                       aDateTime = DBTypeConversion::toDateTime(nValue);
+                       bOk = true;
+                    }
+                    else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING)
+                    {
+                        ::rtl::OUString sValue;
+                       _rVal >>= sValue;
+                       aDateTime = DBTypeConversion::toDateTime(sValue);
+                       bOk = true;
+                    }
+                    else
+                        bOk = _rVal >>= aDateTime;
 
+                    OSL_VERIFY_RES( bOk, "DBTypeConversion::toSQLString: _rVal is not datetime!");
                     // check if this is really a timestamp or only a date
-                    if ( _rVal >>= aDateTime )
+                    if ( bOk )
                     {
                         if (bQuote)
                             aRet.appendAscii("{TS '");
@@ -142,7 +160,24 @@ using namespace ::com::sun::star::beans;
                 case DataType::DATE:
                 {
                     Date aDate;
-                    OSL_VERIFY_RES( _rVal >>= aDate, "DBTypeConversion::toSQLString: _rVal is not date!");
+                    bool bOk = false;
+                    if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_DOUBLE)
+                    {
+                        double nValue = 0.0;
+                       _rVal >>= nValue;
+                       aDate = DBTypeConversion::toDate(nValue);
+                       bOk = true;
+                    }
+                    else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING)
+                    {
+                        ::rtl::OUString sValue;
+                       _rVal >>= sValue;
+                       aDate = DBTypeConversion::toDate(sValue);
+                       bOk = true;
+                    }
+                    else
+                        bOk = _rVal >>= aDate;
+                    OSL_VERIFY_RES( bOk, "DBTypeConversion::toSQLString: _rVal is not date!");
                     if (bQuote)
                         aRet.appendAscii("{D '");
                     aRet.append(DBTypeConversion::toDateString(aDate));
@@ -152,7 +187,24 @@ using namespace ::com::sun::star::beans;
                 case DataType::TIME:
                 {
                     Time aTime;
-                    OSL_VERIFY_RES( _rVal >>= aTime,"DBTypeConversion::toSQLString: _rVal is not time!");
+                    bool bOk = false;
+                    if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_DOUBLE)
+                    {
+                        double nValue = 0.0;
+                       _rVal >>= nValue;
+                       aTime = DBTypeConversion::toTime(nValue);
+                       bOk = true;
+                    }
+                    else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING)
+                    {
+                        ::rtl::OUString sValue;
+                       _rVal >>= sValue;
+                       aTime = DBTypeConversion::toTime(sValue);
+                       bOk = true;
+                    }
+                    else
+                        bOk = _rVal >>= aTime;
+                    OSL_VERIFY_RES( bOk,"DBTypeConversion::toSQLString: _rVal is not time!");
                     if (bQuote)
                         aRet.appendAscii("{T '");
                     aRet.append(DBTypeConversion::toTimeString(aTime));
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index f99c637fa396..48c2736cd05a 100755
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -136,26 +136,26 @@ DriversConfig::DriversConfig(const uno::Reference< lang::XMultiServiceFactory >&
 }
 
 // -----------------------------------------------------------------------------
-DriversConfig::~DriversConfig()
-{
-}
-
+DriversConfig::~DriversConfig()
+{
+}
+
 // -----------------------------------------------------------------------------
-DriversConfig::DriversConfig( const DriversConfig& _rhs )
-{
-    *this = _rhs;
-}
-
+DriversConfig::DriversConfig( const DriversConfig& _rhs )
+{
+    *this = _rhs;
+}
+
 // -----------------------------------------------------------------------------
-DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
-{
-    if ( this != &_rhs )
-    {
-        m_aNode = _rhs.m_aNode;
-    }
-    return *this;
-}
-
+DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
+{
+    if ( this != &_rhs )
+    {
+        m_aNode = _rhs.m_aNode;
+    }
+    return *this;
+}
+
 // -----------------------------------------------------------------------------
 ::rtl::OUString DriversConfig::getDriverFactoryName(const ::rtl::OUString& _sURL) const
 {
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index d6b26dffbe92..325fcfbd0f42 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -121,29 +121,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName)
     if ( pColDesc )
     {
         Reference<XPropertySet> xPr = m_pTable;
-        Reference<XKeysSupplier> xKeysSup(xPr,UNO_QUERY);
-        Reference<XNameAccess> xPrimaryKeyColumns;
-        if ( xKeysSup.is() )
-        {
-            const Reference<XIndexAccess> xKeys = xKeysSup->getKeys();
-            if ( xKeys.is() )
-            {
-                ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
-                const sal_Int32 nKeyCount = xKeys->getCount();
-                for(sal_Int32 nKeyIter = 0; nKeyIter < nKeyCount;++nKeyIter)
-                {
-                    const Reference<XPropertySet> xKey(xKeys->getByIndex(nKeyIter),UNO_QUERY_THROW);
-                    sal_Int32 nType = 0;
-                    xKey->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))   >>= nType;
-                    if ( nType == KeyType::PRIMARY )
-                    {
-                        const Reference<XColumnsSupplier> xColS(xKey,UNO_QUERY_THROW);
-                        xPrimaryKeyColumns = xColS->getColumns();
-                        break;
-                    }
-                } // for(sal_Int32 nKeyIter = 0; nKeyIter < nKeyCount;++)
-            }
-        }
+        const Reference<XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(xPr);
         sal_Int32 nField11 = pColDesc->nField11;
         if ( nField11 != ColumnValue::NO_NULLS && xPrimaryKeyColumns.is() && xPrimaryKeyColumns->hasByName(_rName) )
         {
@@ -152,6 +130,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName)
         connectivity::sdbcx::OColumn* pRet = new connectivity::sdbcx::OColumn(_rName,
                                                 pColDesc->aField6,
                                                 pColDesc->sField13,
+                                                pColDesc->sField12,
                                                 nField11,
                                                 pColDesc->nField7,
                                                 pColDesc->nField9,
@@ -207,7 +186,7 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName
 
     aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
     aSql += ::rtl::OUString::createFromAscii(" ADD ");
-    aSql += ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),m_pTable->getTypeCreatePattern());
+    aSql += ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern());
 
     Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement(  );
     if ( xStmt.is() )
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index f44b08fa15b7..7d020e9fc4a6 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -210,9 +210,10 @@ namespace
             sal_Int32       nField7 = xRow->getInt(7)
                         ,   nField9 = xRow->getInt(9)
                         ,   nField11= xRow->getInt(11);
-            ::rtl::OUString sField13 = xRow->getString(13);
+            ::rtl::OUString  sField12 = xRow->getString(12)
+                            ,sField13 = xRow->getString(13);
             nOrdinalPosition = xRow->getInt( 17 );  // ORDINAL_POSITION
-            _out_rColumns.push_back( ColumnDesc( sName,nField5,aField6,nField7,nField9,nField11,sField13, nOrdinalPosition ) );
+            _out_rColumns.push_back( ColumnDesc( sName,nField5,aField6,nField7,nField9,nField11,sField12,sField13, nOrdinalPosition ) );
         }
     }
 
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 0b7cb5b5df58..05bcf997268f 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -60,8 +60,10 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
+#include <com/sun/star/sdbcx/KeyType.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
@@ -528,6 +530,46 @@ Reference< XNameAccess> getTableFields(const Reference< XConnection>& _rxConn,co
     Reference< XComponent > xDummy;
     return getFieldsByCommandDescriptor( _rxConn, CommandType::TABLE, _rName, xDummy );
 }
+//------------------------------------------------------------------------------
+Reference< XNameAccess> getPrimaryKeyColumns_throw(const Any& i_aTable)
+{
+    const Reference< XPropertySet > xTable(i_aTable,UNO_QUERY_THROW);
+    return getPrimaryKeyColumns_throw(xTable);
+}
+//------------------------------------------------------------------------------
+Reference< XNameAccess> getPrimaryKeyColumns_throw(const Reference< XPropertySet >& i_xTable)
+{
+    Reference<XNameAccess> xKeyColumns;
+    const Reference<XKeysSupplier> xKeySup(i_xTable,UNO_QUERY);
+    if ( xKeySup.is() )
+    {
+        const Reference<XIndexAccess> xKeys = xKeySup->getKeys();
+        if ( xKeys.is() )
+        {
+            ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
+            const ::rtl::OUString sPropName = rPropMap.getNameByIndex(PROPERTY_ID_TYPE);
+            Reference<XPropertySet> xProp;
+            const sal_Int32 nCount = xKeys->getCount();
+            for(sal_Int32 i = 0;i< nCount;++i)
+            {
+                xProp.set(xKeys->getByIndex(i),UNO_QUERY_THROW);
+                if ( xProp.is() )
+                {
+                    sal_Int32 nKeyType = 0;
+                    xProp->getPropertyValue(sPropName) >>= nKeyType;
+                    if(KeyType::PRIMARY == nKeyType)
+                    {
+                        const Reference<XColumnsSupplier> xKeyColsSup(xProp,UNO_QUERY_THROW);
+                        xKeyColumns = xKeyColsSup->getColumns();
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    return xKeyColumns;
+}
 
 //------------------------------------------------------------------------------
 namespace
@@ -2051,7 +2093,7 @@ namespace connectivity
 
 void release(oslInterlockedCount& _refCount,
              ::cppu::OBroadcastHelper& rBHelper,
-             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
+             Reference< XInterface >& _xInterface,
              ::com::sun::star::lang::XComponent* _pObject)
 {
     if (osl_decrementInterlockedCount( &_refCount ) == 0)
@@ -2061,7 +2103,7 @@ void release(oslInterlockedCount& _refCount,
         if (!rBHelper.bDisposed && !rBHelper.bInDispose)
         {
             // remember the parent
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xParent;
+            Reference< XInterface > xParent;
             {
                 ::osl::MutexGuard aGuard( rBHelper.rMutex );
                 xParent = _xInterface;
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 7cf12345ae67..c9a878fe1840 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -30,11 +30,10 @@
 #include "connectivity/dbtools.hxx"
 #include "connectivity/dbconversion.hxx"
 #include "connectivity/dbcharset.hxx"
+#include "connectivity/SQLStatementHelper.hxx"
 #include <unotools/confignode.hxx>
 #include "resource/sharedresources.hxx"
-#ifndef CONNECTIVITY_RESOURCE_COMMON_HRC
 #include "resource/common_res.hrc"
-#endif
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
@@ -71,7 +70,7 @@ namespace dbtools
     using namespace connectivity;
     using namespace comphelper;
 
-::rtl::OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,const Reference< XConnection>& _xConnection,const ::rtl::OUString& _sCreatePattern)
+::rtl::OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern)
 {
 
     Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData();
@@ -186,11 +185,14 @@ namespace dbtools
         aSql.append(sAutoIncrementValue);
     }
 
+    if ( _pHelper )
+        _pHelper->addComment(xColProp,aSql);
+
     return aSql.makeStringAndClear();
 }
 // -----------------------------------------------------------------------------
 
-::rtl::OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,const ::rtl::OUString& _sCreatePattern)
+::rtl::OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern)
 {
     ::rtl::OUStringBuffer aSql  = ::rtl::OUString::createFromAscii("CREATE TABLE ");
     ::rtl::OUString sCatalog,sSchema,sTable,sComposedName;
@@ -223,7 +225,7 @@ namespace dbtools
     {
         if ( (xColumns->getByIndex(i) >>= xColProp) && xColProp.is() )
         {
-            aSql.append(createStandardColumnPart(xColProp,_xConnection,_sCreatePattern));
+            aSql.append(createStandardColumnPart(xColProp,_xConnection,_pHelper,_sCreatePattern));
             aSql.appendAscii(",");
         }
     }
@@ -364,9 +366,10 @@ namespace
 // -----------------------------------------------------------------------------
 ::rtl::OUString createSqlCreateTableStatement(  const Reference< XPropertySet >& descriptor,
                                                 const Reference< XConnection>& _xConnection,
+                                                ISQLStatementHelper* _pHelper,
                                                 const ::rtl::OUString& _sCreatePattern)
 {
-    ::rtl::OUString aSql = ::dbtools::createStandardCreateStatement(descriptor,_xConnection,_sCreatePattern);
+    ::rtl::OUString aSql = ::dbtools::createStandardCreateStatement(descriptor,_xConnection,_pHelper,_sCreatePattern);
     const ::rtl::OUString sKeyStmt = ::dbtools::createStandardKeyStatement(descriptor,_xConnection);
     if ( sKeyStmt.getLength() )
         aSql += sKeyStmt;
@@ -411,7 +414,8 @@ namespace
                     sal_Int32       nField7 = xRow->getInt(7)
                                 ,   nField9 = xRow->getInt(9)
                                 ,   nField11= xRow->getInt(11);
-                    ::rtl::OUString sField13 = xRow->getString(13);
+                    ::rtl::OUString sField12 = xRow->getString(12),
+                                    sField13 = xRow->getString(13);
                     ::comphelper::disposeComponent(xRow);
 
                     sal_Bool bAutoIncrement = _bIsAutoIncrement
@@ -471,6 +475,7 @@ namespace
                     connectivity::sdbcx::OColumn* pRet = new connectivity::sdbcx::OColumn(_rName,
                                                 aField6,
                                                 sField13,
+                                                sField12,
                                                 nField11,
                                                 nField7,
                                                 nField9,
@@ -526,28 +531,7 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable
     _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME))  >>= aSchema;
     _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))        >>= aTable;
 
-    Reference<XKeysSupplier> xKeysSup(_xTable,UNO_QUERY);
-    Reference<XNameAccess> xPrimaryKeyColumns;
-    if ( xKeysSup.is() )
-    {
-        const Reference<XIndexAccess> xKeys = xKeysSup->getKeys();
-        if ( xKeys.is() )
-        {
-            const sal_Int32 nKeyCount = xKeys->getCount();
-            for(sal_Int32 nKeyIter = 0; nKeyIter < nKeyCount;++nKeyIter)
-            {
-                const Reference<XPropertySet> xKey(xKeys->getByIndex(nKeyIter),UNO_QUERY_THROW);
-                sal_Int32 nType = 0;
-                xKey->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))   >>= nType;
-                if ( nType == KeyType::PRIMARY )
-                {
-                    const Reference<XColumnsSupplier> xColS(xKey,UNO_QUERY_THROW);
-                    xPrimaryKeyColumns = xColS->getColumns();
-                    break;
-                }
-            } // for(sal_Int32 nKeyIter = 0; nKeyIter < nKeyCount;++)
-        }
-    }
+    Reference<XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(_xTable);
 
     xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, _rName,_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
     if ( !xProp.is() )
@@ -555,7 +539,7 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable
         xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
         if ( !xProp.is() )
             xProp = new connectivity::sdbcx::OColumn(_rName,
-                                                ::rtl::OUString(),::rtl::OUString(),
+                                                ::rtl::OUString(),::rtl::OUString(),::rtl::OUString(),
                                                 ColumnValue::NULLABLE_UNKNOWN,
                                                 0,
                                                 0,
@@ -665,19 +649,9 @@ Reference< XTablesSupplier> getDataDefinitionByURLAndConnection(
         Reference< XDataDefinitionSupplier > xSupp( xManager->getDriverByURL( _rsUrl ), UNO_QUERY );
 
         if ( xSupp.is() )
+        {
             xTablesSup = xSupp->getDataDefinitionByConnection( _xConnection );
-
-        // if we don't get the catalog from the original driver we have to try them all.
-        if ( !xTablesSup.is() )
-        { // !TODO: Why?
-            Reference< XEnumerationAccess> xEnumAccess( xManager, UNO_QUERY_THROW );
-            Reference< XEnumeration > xEnum( xEnumAccess->createEnumeration(), UNO_QUERY_THROW );
-            while ( xEnum.is() && xEnum->hasMoreElements() && !xTablesSup.is() )
-            {
-                xEnum->nextElement() >>= xSupp;
-                if ( xSupp.is() )
-                    xTablesSup = xSupp->getDataDefinitionByConnection( _xConnection );
-            }
+            OSL_ENSURE(xTablesSup.is(),"No table supplier!");
         }
     }
     catch( const Exception& )
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index f1e31a2c7f0e..b6bae373a7db 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -93,6 +93,7 @@ namespace dbtools
         const sal_Char* getPROPERTY_ID_FIELDTYPE()          { return    "FieldType"; }
         const sal_Char* getPROPERTY_ID_VALUE()              { return    "Value"; }
         const sal_Char* getPROPERTY_ID_ACTIVE_CONNECTION()  { return    "ActiveConnection"; }
+        const sal_Char* getPROPERTY_ID_LABEL()              { return    "Label"; }
 
     //============================================================
     //= error messages
@@ -180,6 +181,7 @@ namespace dbtools
                 case PROPERTY_ID_HAVINGCLAUSE:              { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_HAVINGCLAUSE()      ); break; }
                 case PROPERTY_ID_ISSIGNED:                  { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSIGNED()          ); break; }
                 case PROPERTY_ID_ISSEARCHABLE:              { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSEARCHABLE()      ); break; }
+                case PROPERTY_ID_LABEL:                     { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_LABEL()             ); break; }
                 case PROPERTY_ID_APPLYFILTER:               { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_APPLYFILTER()       ); break; }
                 case PROPERTY_ID_FILTER:                    { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FILTER()            ); break; }
                 case PROPERTY_ID_MASTERFIELDS:              { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_MASTERFIELDS()      ); break; }
diff --git a/connectivity/source/cpool/dbpool.map b/connectivity/source/cpool/dbpool.map
deleted file mode 100644
index 7202c9d71b93..000000000000
--- a/connectivity/source/cpool/dbpool.map
+++ /dev/null
@@ -1,8 +0,0 @@
-DBPOOL_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk
index 124e7b574d6c..1f6e49c6cbd7 100644
--- a/connectivity/source/cpool/makefile.mk
+++ b/connectivity/source/cpool/makefile.mk
@@ -55,7 +55,7 @@ SLOFILES=\
 
 SHL1TARGET=	$(DBPOOL_TARGET)$(DBPOOL_MAJOR)
 
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1OBJS=$(SLOFILES)
 SHL1STDLIBS=\
diff --git a/connectivity/source/dbtools/dbt.map b/connectivity/source/dbtools/dbt.map
deleted file mode 100644
index c3eaaa5a253f..000000000000
--- a/connectivity/source/dbtools/dbt.map
+++ /dev/null
@@ -1,8 +0,0 @@
-DBTOOLS_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx
index 8fc009917fb2..bb0363792c12 100644
--- a/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/connectivity/source/drivers/adabas/BColumns.cxx
@@ -96,6 +96,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
                 xRet = new OColumn(_rName,
                                             sTypeName,
                                             xRow->getString(13),
+                                            xRow->getString(12),
                                             xRow->getInt(11),
                                             nPrec,
                                             xRow->getInt(9),
diff --git a/connectivity/source/drivers/adabas/adabas.map b/connectivity/source/drivers/adabas/adabas.map
deleted file mode 100644
index 7ce4c703e6b3..000000000000
--- a/connectivity/source/drivers/adabas/adabas.map
+++ /dev/null
@@ -1,8 +0,0 @@
-ADABAS_2_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/adabas/adabas.xcu b/connectivity/source/drivers/adabas/adabas.xcu
index 20c811bd2d5a..b92067235e15 100755
--- a/connectivity/source/drivers/adabas/adabas.xcu
+++ b/connectivity/source/drivers/adabas/adabas.xcu
@@ -65,6 +65,11 @@
             <value></value>
           </prop>
         </node>
+        <node oor:name="AddIndexAppendix" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="Features">
         <node oor:name="UseSQL92NamingConstraints" oor:op="replace">
diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index e3e9d76ac2f2..9268f02a3b42 100644
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -71,7 +71,7 @@ SLOFILES=\
         $(SLO)$/BResultSetMetaData.obj			\
         $(SLO)$/BResultSet.obj
 
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Library -----------------------------------
 
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index bb4b985e3bfc..aa287c185b26 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -65,7 +65,7 @@ void WpADOColumn::Create()
 }
 // -------------------------------------------------------------------------
 OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection,_ADOColumn* _pColumn)
-    : connectivity::sdbcx::OColumn(::rtl::OUString(),::rtl::OUString(),::rtl::OUString(),0,0,0,0,sal_False,sal_False,sal_False,_bCase)
+    : connectivity::sdbcx::OColumn(::rtl::OUString(),::rtl::OUString(),::rtl::OUString(),::rtl::OUString(),0,0,0,0,sal_False,sal_False,sal_False,_bCase)
     ,m_pConnection(_pConnection)
 {
     construct();
@@ -183,12 +183,13 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r
                 OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString::createFromAscii( "Autoincrement" ), getBOOL( rValue ) );
                 break;
 
+            case PROPERTY_ID_IM001:
             case PROPERTY_ID_DESCRIPTION:
-                pAdoPropertyName = "Default";
+                pAdoPropertyName = "Description";
                 break;
 
             case PROPERTY_ID_DEFAULTVALUE:
-                pAdoPropertyName = "Description";
+                pAdoPropertyName = "Default";
                 break;
         }
 
diff --git a/connectivity/source/drivers/ado/ado.xcu b/connectivity/source/drivers/ado/ado.xcu
index 5859d5eecf3e..50c29cf7ba2e 100755
--- a/connectivity/source/drivers/ado/ado.xcu
+++ b/connectivity/source/drivers/ado/ado.xcu
@@ -134,6 +134,11 @@
             <value>UserPassword</value>
           </prop>
         </node>
+        <node oor:name="SupportsColumnDescription" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
       </node>
     </node>
     <node oor:name="sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=*" oor:op="replace">
@@ -228,6 +233,11 @@
             <value>mdb</value>
           </prop>
         </node>
+        <node oor:name="SupportsColumnDescription" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
       </node>
     </node>
     <node oor:name="sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=*" oor:op="replace">
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 1d19c05a46c0..a4e5f35825f5 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -347,14 +347,15 @@ void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet,
         switch (nType)
         {
             case DataType::VARCHAR:
-                if ( eCellType == CellContentType_TEXT )
+                if ( eCellType == CellContentType_EMPTY )
+                    rValue.setNull();
+                else
                 {
+                    // #i25840# still let Calc convert numbers to text
                     const Reference<XText> xText( xCell, UNO_QUERY );
                     if ( xText.is() )
                         rValue = xText->getString();
-                } // if ( eCellType == CellContentType_TEXT )
-                else
-                    rValue.setNull();
+                }
                 break;
             case DataType::DECIMAL:
                 if ( eCellType == CellContentType_VALUE )
@@ -525,7 +526,7 @@ void OCalcTable::fillColumns()
             aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
         }
 
-        sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, ::rtl::OUString(),
+        sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, ::rtl::OUString(),::rtl::OUString(),
                                                 ColumnValue::NULLABLE, nPrecision, nDecimals,
                                                 eType, sal_False, sal_False, bCurrency,
                                                 bStoresMixedCaseQuotedIdentifiers);
diff --git a/connectivity/source/drivers/calc/calc.map b/connectivity/source/drivers/calc/calc.map
deleted file mode 100644
index bcab8e6c9101..000000000000
--- a/connectivity/source/drivers/calc/calc.map
+++ /dev/null
@@ -1,8 +0,0 @@
-CALC_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index 452e9a92b320..8e193524aa45 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -57,7 +57,7 @@ SLOFILES=\
     $(SLO)$/Cservices.obj			\
     $(SLO)$/CDriver.obj
 
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Library -----------------------------------
 
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index d19f419f17ae..8544e4affda7 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -449,6 +449,7 @@ OSL_TRACE("column type: %c",aDBFColumn.db_typ);
         Reference< XPropertySet> xCol = new sdbcx::OColumn(aColumnName,
                                                     aTypeName,
                                                     ::rtl::OUString(),
+                                                    ::rtl::OUString(),
                                                     ColumnValue::NULLABLE,
                                                     nPrecision,
                                                     aDBFColumn.db_dez,
@@ -1527,6 +1528,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
     // Buffer mit Leerzeichen fuellen
     AllocBuffer();
     memset(m_pBuffer, 0, m_aHeader.db_slng);
+    m_pBuffer[0] = ' ';
 
     // Gesamte neue Row uebernehmen:
     // ... und am Ende als neuen Record hinzufuegen:
diff --git a/connectivity/source/drivers/dbase/dbase.map b/connectivity/source/drivers/dbase/dbase.map
deleted file mode 100644
index 2c620b4f3620..000000000000
--- a/connectivity/source/drivers/dbase/dbase.map
+++ /dev/null
@@ -1,10 +0,0 @@
-DBASE_2_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
-
-
diff --git a/connectivity/source/drivers/dbase/dbase.xcu b/connectivity/source/drivers/dbase/dbase.xcu
index 5e6e7596c3fe..f5de1d53ab0e 100755
--- a/connectivity/source/drivers/dbase/dbase.xcu
+++ b/connectivity/source/drivers/dbase/dbase.xcu
@@ -50,6 +50,11 @@
             <value>false</value>
           </prop>
         </node>
+        <node oor:name="AddIndexAppendix" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>false</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="Features">
         <node oor:name="UseSQL92NamingConstraints" oor:op="replace">
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index dded9086bcb1..f855cf1f4554 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -89,7 +89,7 @@ EXCEPTIONSFILES +=\
 .ENDIF
 
 
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Library -----------------------------------
 
diff --git a/connectivity/source/drivers/evoab/evoab.map b/connectivity/source/drivers/evoab/evoab.map
deleted file mode 100644
index 00cf7191f143..000000000000
--- a/connectivity/source/drivers/evoab/evoab.map
+++ /dev/null
@@ -1,8 +0,0 @@
-EVOAB_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
index 31d654fd26a2..c1dbc21cdf1e 100644
--- a/connectivity/source/drivers/evoab/makefile.mk
+++ b/connectivity/source/drivers/evoab/makefile.mk
@@ -65,7 +65,7 @@ SLOFILES=\
     $(SLO)$/LDebug.obj
 
 
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 
 # --- Library -----------------------------------
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx
index ddad36e52262..d1854e62181d 100644
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -66,6 +66,7 @@ sdbcx::ObjectType OEvoabColumns::createObject(const ::rtl::OUString& _rName)
                         _rName,
                         xRow->getString(6),
                         xRow->getString(13),
+                        xRow->getString(12),
                         xRow->getInt(11),
                         xRow->getInt(7),
                         xRow->getInt(9),
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 77598f97380c..feca8f55aeff 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -381,15 +381,16 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
     // SQL like
     else if( SQL_ISRULE( parseTree, like_predicate ) )
     {
-        ENSURE_OR_THROW( parseTree->count() >= 4, "unexpected like_predicate structure" );
+        ENSURE_OR_THROW( parseTree->count() == 2, "unexpected like_predicate structure" );
+        const OSQLParseNode* pPart2 = parseTree->getChild(1);
 
         if( ! SQL_ISRULE( parseTree->getChild( 0 ), column_ref) )
             m_pConnection->throwGenericSQLException(STR_QUERY_INVALID_LIKE_COLUMN,*this);
 
         ::rtl::OUString aColumnName( impl_getColumnRefColumnName_throw( *parseTree->getChild( 0 ) ) );
 
-        OSQLParseNode *pAtom      = parseTree->getChild( parseTree->count() - 2 );     // Match String
-        bool bNotLike             = parseTree->count() == 5;
+        OSQLParseNode *pAtom      = pPart2->getChild( pPart2->count() - 2 );     // Match String
+        bool bNotLike             = pPart2->getChild(0)->isToken();
 
         if( !( pAtom->getNodeType() == SQL_NODE_STRING ||
                pAtom->getNodeType() == SQL_NODE_NAME ||
diff --git a/connectivity/source/drivers/evoab2/evoab2.map b/connectivity/source/drivers/evoab2/evoab2.map
deleted file mode 100644
index 00cf7191f143..000000000000
--- a/connectivity/source/drivers/evoab2/evoab2.map
+++ /dev/null
@@ -1,8 +0,0 @@
-EVOAB_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index 43600a379fbc..e8a1cf96cddf 100644
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -65,7 +65,7 @@ SLOFILES=\
     $(SLO)$/EApi.obj \
     $(SLO)$/NDebug.obj
 
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 
 # --- Library -----------------------------------
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index 7c70d4c4372d..3c3929a80c50 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -64,6 +64,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
                 sdbcx::OColumn* pRet = new sdbcx::OColumn(_rName,
                                             xRow->getString(6),
                                             xRow->getString(13),
+                                            xRow->getString(12),
                                             xRow->getInt(11),
                                             xRow->getInt(7),
                                             xRow->getInt(9),
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 080b2a592aef..68e23360331b 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -511,6 +511,7 @@ UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
     Reference<XPropertySet> xParaColumn = new connectivity::parse::OParseColumn(sParameterName
                                                     ,::rtl::OUString()
                                                     ,::rtl::OUString()
+                                                    ,::rtl::OUString()
                                                     ,nNullable
                                                     ,nPrecision
                                                     ,nScale
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 9cf9874dbf10..eeaec1ff40f1 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -288,17 +288,14 @@ OOperand* OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode)  th
 //------------------------------------------------------------------
 OOperand* OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException)
 {
-    DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Fehler im Parse Tree");
+    DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
+    const OSQLParseNode* pPart2 = pPredicateNode->getChild(1);
 
-    sal_Int32 ePredicateType;
     sal_Unicode cEscape = L'\0';
-    if (pPredicateNode->count() == 5)
-        ePredicateType = SQLFilterOperator::NOT_LIKE;
-    else
-        ePredicateType = SQLFilterOperator::LIKE;
+    const bool bNotLike = pPart2->getChild(0)->isToken();
 
-    OSQLParseNode* pAtom        = pPredicateNode->getChild(pPredicateNode->count()-2);
-    OSQLParseNode* pOptEscape   = pPredicateNode->getChild(pPredicateNode->count()-1);
+    OSQLParseNode* pAtom        = pPart2->getChild(pPart2->count()-2);
+    OSQLParseNode* pOptEscape   = pPart2->getChild(pPart2->count()-1);
 
     if (!(pAtom->getNodeType() == SQL_NODE_STRING || SQL_ISRULE(pAtom,parameter)))
     {
@@ -322,9 +319,9 @@ OOperand* OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(
     execute(pPredicateNode->getChild(0));
     execute(pAtom);
 
-    OBoolOperator* pOperator = (ePredicateType == SQLFilterOperator::LIKE)
-                                                    ? new OOp_LIKE(cEscape)
-                                                    : new OOp_NOTLIKE(cEscape);
+    OBoolOperator* pOperator = bNotLike
+                                    ? new OOp_NOTLIKE(cEscape)
+                                    : new OOp_LIKE(cEscape);
     m_aCodeList.push_back(pOperator);
 
     return NULL;
@@ -332,11 +329,12 @@ OOperand* OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(
 //------------------------------------------------------------------
 OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException)
 {
-    DBG_ASSERT(pPredicateNode->count() == 6,"OFILECursor: Fehler im Parse Tree");
+    DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
 
     OSQLParseNode* pColumn = pPredicateNode->getChild(0);
-    OSQLParseNode* p1stValue = pPredicateNode->getChild(3);
-    OSQLParseNode* p2ndtValue = pPredicateNode->getChild(5);
+    const OSQLParseNode* pPart2 = pPredicateNode->getChild(1);
+    OSQLParseNode* p1stValue = pPart2->getChild(2);
+    OSQLParseNode* p2ndtValue = pPart2->getChild(4);
 
     if (
             !(p1stValue->getNodeType() == SQL_NODE_STRING || SQL_ISRULE(p1stValue,parameter))
@@ -346,7 +344,7 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr
         m_pAnalyzer->getConnection()->throwGenericSQLException(STR_QUERY_INVALID_BETWEEN,NULL);
     }
 
-    sal_Bool bNot = SQL_ISTOKEN(pPredicateNode->getChild(1),NOT);
+    sal_Bool bNot = SQL_ISTOKEN(pPart2->getChild(0),NOT);
 
     OOperand* pColumnOp = execute(pColumn);
     OOperand* pOb1 = execute(p1stValue);
@@ -411,11 +409,12 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr
 //------------------------------------------------------------------
 OOperand* OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException)
 {
-    DBG_ASSERT(pPredicateNode->count() >= 3,"OFILECursor: Fehler im Parse Tree");
-    DBG_ASSERT(SQL_ISTOKEN(pPredicateNode->getChild(1),IS),"OFILECursor: Fehler im Parse Tree");
+    DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
+    const OSQLParseNode* pPart2 = pPredicateNode->getChild(1);
+    DBG_ASSERT(SQL_ISTOKEN(pPart2->getChild(0),IS),"OFILECursor: Fehler im Parse Tree");
 
     sal_Int32 ePredicateType;
-    if (SQL_ISTOKEN(pPredicateNode->getChild(2),NOT))
+    if (SQL_ISTOKEN(pPart2->getChild(1),NOT))
         ePredicateType = SQLFilterOperator::NOT_SQLNULL;
     else
         ePredicateType = SQLFilterOperator::SQLNULL;
@@ -635,7 +634,6 @@ OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)
     switch ( nTokenId )
     {
         case SQL_TOKEN_CHAR_LENGTH:
-        case SQL_TOKEN_CHARACTER_LENGTH:
         case SQL_TOKEN_LENGTH:
         case SQL_TOKEN_OCTET_LENGTH:
         case SQL_TOKEN_ASCII:
@@ -677,7 +675,6 @@ OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)
             switch( nTokenId )
             {
                 case SQL_TOKEN_CHAR_LENGTH:
-                case SQL_TOKEN_CHARACTER_LENGTH:
                 case SQL_TOKEN_LENGTH:
                 case SQL_TOKEN_OCTET_LENGTH:
                     pOperator = new OOp_CharLength();
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 2d46c3be5bf3..eff2464ce533 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -304,7 +304,7 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
             aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
         }
 
-        sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,aTypeName,::rtl::OUString(),
+        sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,aTypeName,::rtl::OUString(),::rtl::OUString(),
                                                 ColumnValue::NULLABLE,
                                                 nPrecision,
                                                 nScale,
diff --git a/connectivity/source/drivers/flat/flat.map b/connectivity/source/drivers/flat/flat.map
deleted file mode 100644
index bf26bd0fa0fa..000000000000
--- a/connectivity/source/drivers/flat/flat.map
+++ /dev/null
@@ -1,8 +0,0 @@
-FLAT_2_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index 312e6d6c9426..2d1f99f759c7 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -70,7 +70,7 @@ EXCEPTIONSFILES=\
     $(SLO)$/EDriver.obj
 
 
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Library -----------------------------------
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.xcu b/connectivity/source/drivers/hsqldb/hsqldb.xcu
index e5ab3cc4ba14..f97b5e357179 100755
--- a/connectivity/source/drivers/hsqldb/hsqldb.xcu
+++ b/connectivity/source/drivers/hsqldb/hsqldb.xcu
@@ -50,6 +50,11 @@
             <value>true</value>
           </prop>
         </node>
+        <node oor:name="AddIndexAppendix" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>false</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="MetaData">
         <node oor:name="SupportsTableCreation" oor:op="replace">
diff --git a/connectivity/source/drivers/jdbc/jdbc.map b/connectivity/source/drivers/jdbc/jdbc.map
deleted file mode 100644
index 23369ec76466..000000000000
--- a/connectivity/source/drivers/jdbc/jdbc.map
+++ /dev/null
@@ -1,8 +0,0 @@
-JDBC_2_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/jdbc/jdbc.xcu b/connectivity/source/drivers/jdbc/jdbc.xcu
index 59fb95460aa2..f4f599a701d9 100755
--- a/connectivity/source/drivers/jdbc/jdbc.xcu
+++ b/connectivity/source/drivers/jdbc/jdbc.xcu
@@ -189,6 +189,11 @@
             <value>oracle.jdbc.driver.OracleDriver</value>
           </prop>
         </node>
+        <node oor:name="AddIndexAppendix" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>false</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="Features">
         <node oor:name="IgnoreCurrency" oor:op="replace">
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index 2de63f2c0366..46619952163b 100644
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -78,7 +78,7 @@ SLOFILES=\
         $(SLO)$/tools.obj                           \
         $(SLO)$/ContextClassLoader.obj
 
-SHL1VERSIONMAP=$(JDBC_TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Library -----------------------------------
 
diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx
index d75e782aed7b..4adcbe304c82 100644
--- a/connectivity/source/drivers/kab/KColumns.cxx
+++ b/connectivity/source/drivers/kab/KColumns.cxx
@@ -66,6 +66,7 @@ sdbcx::ObjectType KabColumns::createObject(const ::rtl::OUString& _rName)
                         _rName,
                         xRow->getString(6),
                         xRow->getString(13),
+                        xRow->getString(12),
                         xRow->getInt(11),
                         xRow->getInt(7),
                         xRow->getInt(9),
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index 4164ffe0ee52..f0069fc6875e 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -185,12 +185,13 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse
             }
         }
     }
-    else if (pParseNode->count() == 4)
+    else if (SQL_ISRULE(pParseNode, test_for_null) || SQL_ISRULE(pParseNode, like_predicate))
     {
-        const OSQLParseNode *pLeft = pParseNode->getChild(0),
-                            *pMiddleLeft = pParseNode->getChild(1),
-                            *pMiddleRight = pParseNode->getChild(2),
-                            *pRight = pParseNode->getChild(3);
+        const OSQLParseNode *pLeft = pParseNode->getChild(0);
+        const OSQLParseNode* pPart2 = pParseNode->getChild(1);
+        const OSQLParseNode *pMiddleLeft = pPart2->getChild(0),
+                            *pMiddleRight = pPart2->getChild(1),
+                            *pRight = pPart2->getChild(2);
 
         if (SQL_ISRULE(pParseNode, test_for_null))
         {
diff --git a/connectivity/source/drivers/kab/kab.map b/connectivity/source/drivers/kab/kab.map
deleted file mode 100644
index 6b7216de8c11..000000000000
--- a/connectivity/source/drivers/kab/kab.map
+++ /dev/null
@@ -1,8 +0,0 @@
-KAB_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/kab/kabdrv.map b/connectivity/source/drivers/kab/kabdrv.map
index c32084ddd4ab..5de866f2e52f 100644
--- a/connectivity/source/drivers/kab/kabdrv.map
+++ b/connectivity/source/drivers/kab/kabdrv.map
@@ -1,4 +1,4 @@
-KAB_1_0 {
+UDK_3_0_0 {
     global:
         createKabConnection;
         initKApplication;
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 98148a29e98d..2a0dc5cd8999 100644
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -61,7 +61,7 @@ DEPOBJFILES= \
 
 # --- Library -----------------------------------
 
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1TARGET= $(TARGET)$(KAB_MAJOR)
 SHL1OBJS=$(SLOFILES)
diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx
index 9eccf1a11b73..c1ba3f1fe6d0 100755
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -66,6 +66,7 @@ sdbcx::ObjectType MacabColumns::createObject(const ::rtl::OUString& _rName)
                         _rName,
                         xRow->getString(6),
                         xRow->getString(13),
+                        xRow->getString(12),
                         xRow->getInt(11),
                         xRow->getInt(7),
                         xRow->getInt(9),
diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx
index 58cf82f272fc..31b2bbfd6b1e 100755
--- a/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/connectivity/source/drivers/macab/MacabConnection.cxx
@@ -314,10 +314,11 @@ MacabAddressBook* MacabConnection::getAddressBook() const
     return m_pAddressBook;
 }
 // -----------------------------------------------------------------------------
-extern "C" void*  SAL_CALL createMacabConnection( void* _pDriver )
+extern "C" SAL_DLLPUBLIC_EXPORT void*  SAL_CALL createMacabConnection( void* _pDriver )
 {
     MacabConnection* pConnection = new MacabConnection( static_cast< MacabDriver* >( _pDriver ) );
     // by definition, the pointer crossing library boundaries as void ptr is acquired once
     pConnection->acquire();
     return pConnection;
 }
+
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index 6f48fb0a7e57..b3c303324302 100755
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -114,7 +114,7 @@ struct ProviderRequest
 
 //---------------------------------------------------------------------------------------
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
                 const sal_Char  **ppEnvTypeName,
                 uno_Environment **
             )
@@ -123,7 +123,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL component_writeInfo(
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
                 void*,
                 void* pRegistryKey
             )
@@ -148,7 +148,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void*)
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 8ee24921667a..9960ea7a4d97 100755
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -188,12 +188,13 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP
             }
         }
     }
-    else if (pParseNode->count() == 4)
+    else if (SQL_ISRULE(pParseNode, test_for_null) || SQL_ISRULE(pParseNode, like_predicate))
     {
-        const OSQLParseNode *pLeft = pParseNode->getChild(0),
-                            *pMiddleLeft = pParseNode->getChild(1),
-                            *pMiddleRight = pParseNode->getChild(2),
-                            *pRight = pParseNode->getChild(3);
+        const OSQLParseNode *pLeft = pParseNode->getChild(0);
+        const OSQLParseNode* pPart2 = pParseNode->getChild(1);
+        const OSQLParseNode *pMiddleLeft = pPart2->getChild(0),
+                            *pMiddleRight = pPart2->getChild(1),
+                            *pRight = pPart2->getChild(2);
 
         if (SQL_ISRULE(pParseNode, test_for_null))
         {
diff --git a/connectivity/source/drivers/macab/macab.map b/connectivity/source/drivers/macab/macab.map
deleted file mode 100755
index fe2d1ac90534..000000000000
--- a/connectivity/source/drivers/macab/macab.map
+++ /dev/null
@@ -1,8 +0,0 @@
-MACAB_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/macab/macab.xcu b/connectivity/source/drivers/macab/macab.xcu
index 7d4fa6df7d70..0845bc9a2ce2 100755
--- a/connectivity/source/drivers/macab/macab.xcu
+++ b/connectivity/source/drivers/macab/macab.xcu
@@ -27,7 +27,7 @@
  ************************************************************************ -->
 <oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <node oor:name="Installed">
-    <node oor:name="sdbc:address:macab:*" oor:op="replace">
+    <node oor:name="sdbc:address:macab" oor:op="replace">
       <prop oor:name="Driver">
         <value>com.sun.star.comp.sdbc.macab.Driver</value>
       </prop>
diff --git a/connectivity/source/drivers/macab/macabdrv.map b/connectivity/source/drivers/macab/macabdrv.map
deleted file mode 100755
index d953690f6ba3..000000000000
--- a/connectivity/source/drivers/macab/macabdrv.map
+++ /dev/null
@@ -1,6 +0,0 @@
-MACAB_1_0 {
-    global:
-        createMacabConnection;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk
index 811f1fabb143..35532b15ec2d 100755
--- a/connectivity/source/drivers/macab/makefile.mk
+++ b/connectivity/source/drivers/macab/makefile.mk
@@ -54,8 +54,6 @@ DEPOBJFILES= \
 
 # --- Library -----------------------------------
 
-SHL1VERSIONMAP=$(TARGET).map
-
 SHL1TARGET= $(TARGET)$(MACAB_MAJOR)
 SHL1OBJS=$(SLOFILES)
 SHL1STDLIBS=\
@@ -98,8 +96,6 @@ MACAB_LIB=-framework Carbon -framework AddressBook
 
 # --- Library -----------------------------------
 
-SHL2VERSIONMAP=$(TARGET2).map
-
 SHL2TARGET= $(TARGET2)$(MACAB_MAJOR)
 SHL2OBJS=$(SLO2FILES)
 SHL2STDLIBS=\
diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx
index 17b418899f45..42a33bbc2a98 100644
--- a/connectivity/source/drivers/mozab/MColumns.cxx
+++ b/connectivity/source/drivers/mozab/MColumns.cxx
@@ -74,6 +74,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
                 OColumn* pRet = new OColumn(_rName,
                                             sTypeName,
                                             xRow->getString(13),
+                                            xRow->getString(12),
                                             xRow->getInt(11),
                                             nPrec,
                                             xRow->getInt(9),
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index 38caad53b551..5aad943b151a 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -450,6 +450,7 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re
     Reference<XPropertySet> xParaColumn = new connectivity::sdbcx::OColumn(sParameterName
                                                     ,::rtl::OUString()
                                                     ,::rtl::OUString()
+                                                    ,::rtl::OUString()
                                                     ,nNullable
                                                     ,nPrecision
                                                     ,nScale
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index 9602a35a8b29..c7c85770419e 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -882,7 +882,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
     }
     else if (SQL_ISRULE(parseTree,like_predicate))
     {
-        OSL_ENSURE(parseTree->count() >= 4, "Error parsing LIKE predicate");
+        OSL_ENSURE(parseTree->count() == 2, "Error parsing LIKE predicate");
 
         OSL_TRACE("analyseSQL : Got LIKE rule\n");
 
@@ -895,9 +895,11 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
         OSQLParseNode *pColumn;
         OSQLParseNode *pAtom;
         OSQLParseNode *pOptEscape;
+        const OSQLParseNode* pPart2 = parseTree->getChild(1);
         pColumn     = parseTree->getChild(0);                        // Match Item
-        pAtom       = parseTree->getChild(parseTree->count()-2);     // Match String
-        pOptEscape  = parseTree->getChild(parseTree->count()-1);     // Opt Escape Rule
+        pAtom       = pPart2->getChild(parseTree->count()-2);     // Match String
+        pOptEscape  = pPart2->getChild(parseTree->count()-1);     // Opt Escape Rule
+        const bool bNot = SQL_ISTOKEN(pPart2->getChild(0), NOT);
 
         if (!(pAtom->getNodeType() == SQL_NODE_STRING ||
               pAtom->getNodeType() == SQL_NODE_NAME ||
@@ -945,7 +947,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
              matchString.indexOf ( MATCHCHAR ) == -1 )
         {
             // Simple string , eg. "to match"
-            if ( parseTree->count() == 5 )
+            if ( bNot )
                 op = MQueryOp::DoesNotContain;
             else
                 op = MQueryOp::Contains;
@@ -961,12 +963,12 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
             matchString = matchString.replaceAt( 0, 1, rtl::OUString() );
             matchString = matchString.replaceAt( matchString.getLength() -1 , 1, rtl::OUString() );
 
-            if ( parseTree->count() == 5 )
+            if (bNot)
                 op = MQueryOp::DoesNotContain;
             else
                 op = MQueryOp::Contains;
         }
-        else if ( parseTree->count() == 5 )
+        else if ( bNot )
         {
             // We currently can't handle a 'NOT LIKE' when there are '%' or
             // '_' dispersed throughout
@@ -1020,15 +1022,16 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
     }
     else if (SQL_ISRULE(parseTree,test_for_null))
     {
-        OSL_ENSURE(parseTree->count() >= 3,"Error in ParseTree");
-        OSL_ENSURE(SQL_ISTOKEN(parseTree->getChild(1),IS),"Error in ParseTree");
+        OSL_ENSURE(parseTree->count() == 2,"Error in ParseTree");
+        const OSQLParseNode* pPart2 = parseTree->getChild(1);
+        OSL_ENSURE(SQL_ISTOKEN(pPart2->getChild(0),IS),"Error in ParseTree");
 
         if (!SQL_ISRULE(parseTree->getChild(0),column_ref))
         {
             m_pStatement->getOwnConnection()->throwSQLException( STR_QUERY_INVALID_IS_NULL_COLUMN, *this );
         }
 
-        if (SQL_ISTOKEN(parseTree->getChild(2),NOT))
+        if (SQL_ISTOKEN(pPart2->getChild(1),NOT))
         {
             op = MQueryOp::Exists;
         }
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index 78c1e39578c0..6a4172da205d 100644
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -67,7 +67,7 @@ SLOFILES += \
 CDEFS+=-DMINIMAL_PROFILEDISCOVER
 
 SHL1TARGET=$(TARGET)
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1OBJS=$(SLOFILES)
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map
deleted file mode 100644
index 750db5d4af09..000000000000
--- a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map
+++ /dev/null
@@ -1,8 +0,0 @@
-MOZBOOTSTRAP_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index ffcc41af7536..b1e12fde6f8a 100644
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -85,7 +85,7 @@ SLOFILES=\
             
 # --- MOZAB BASE Library -----------------------------------
 
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
 SHL1OBJS=$(SLOFILES)
 SHL1STDLIBS=\
diff --git a/connectivity/source/drivers/mozab/mozab.map b/connectivity/source/drivers/mozab/mozab.map
deleted file mode 100644
index 9f3a1f27d0f5..000000000000
--- a/connectivity/source/drivers/mozab/mozab.map
+++ /dev/null
@@ -1,8 +0,0 @@
-MOZAB_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/mozab/mozabdrv.map b/connectivity/source/drivers/mozab/mozabdrv.map
index 918cb530e1f1..a431a0737754 100644
--- a/connectivity/source/drivers/mozab/mozabdrv.map
+++ b/connectivity/source/drivers/mozab/mozabdrv.map
@@ -1,4 +1,4 @@
-MOZABDRV_1_0 {
+UDK_3_0_0 {
     global:
         OMozabConnection_CreateInstance;
         OMozillaBootstrap_CreateInstance;
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index 72383be76c58..06be64f83313 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -220,12 +220,16 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co
         xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))      >>= bOldAutoIncrement;
         descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement;
         bool bColumnNameChanged = false;
+        ::rtl::OUString sOldDesc,sNewDesc;
+        xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DESCRIPTION))      >>= sOldDesc;
+        descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sNewDesc;
 
         if (    nOldType != nNewType
             ||  nOldPrec != nNewPrec
             ||  nOldScale != nNewScale
             ||  nNewNullable != nOldNullable
-            ||  bOldAutoIncrement != bAutoIncrement )
+            ||  bOldAutoIncrement != bAutoIncrement
+            || sOldDesc != sNewDesc )
         {
             // special handling because they change dthe type names to distinguish
             // if a column should be an auto_incmrement one
@@ -281,7 +285,7 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co
             const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
             sSql += ::dbtools::quoteName(sQuote,colName);
             sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
-            sSql += OTables::adjustSQL(::dbtools::createStandardColumnPart(descriptor,getConnection(),getTypeCreatePattern()));
+            sSql += OTables::adjustSQL(::dbtools::createStandardColumnPart(descriptor,getConnection(),static_cast<OTables*>(m_pTables),getTypeCreatePattern()));
             executeStatement(sSql);
         }
         m_pColumns->refresh();
@@ -310,7 +314,7 @@ void OMySQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rCo
     ::comphelper::copyProperties(_xDescriptor,xProp);
     xProp->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),makeAny(nNewType));
 
-    sSql += OTables::adjustSQL(::dbtools::createStandardColumnPart(xProp,getConnection(),getTypeCreatePattern()));
+    sSql += OTables::adjustSQL(::dbtools::createStandardColumnPart(xProp,getConnection(),static_cast<OTables*>(m_pTables),getTypeCreatePattern()));
     executeStatement(sSql);
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index b337ddc92390..80bb2baf58c0 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -204,7 +204,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
 {
     const Reference< XConnection > xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection();
     static const ::rtl::OUString s_sCreatePattern(RTL_CONSTASCII_USTRINGPARAM("(M,D)"));
-    const ::rtl::OUString aSql = adjustSQL(::dbtools::createSqlCreateTableStatement(descriptor,xConnection,s_sCreatePattern));
+    const ::rtl::OUString aSql = adjustSQL(::dbtools::createSqlCreateTableStatement(descriptor,xConnection,this,s_sCreatePattern));
     Reference< XStatement > xStmt = xConnection->createStatement(  );
     if ( xStmt.is() )
     {
@@ -230,4 +230,14 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
     return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false );
 }
 // -----------------------------------------------------------------------------
-
+void OTables::addComment(const Reference< XPropertySet >& descriptor,::rtl::OUStringBuffer& _rOut)
+{
+    ::rtl::OUString sDesc;
+    descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))     >>= sDesc;
+    if ( sDesc.getLength() )
+    {
+        _rOut.appendAscii(" COMMENT '");
+        _rOut.append(sDesc);
+        _rOut.appendAscii("'");
+    }
+}
diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk
index af486c293806..fbb68321cb01 100644
--- a/connectivity/source/drivers/mysql/makefile.mk
+++ b/connectivity/source/drivers/mysql/makefile.mk
@@ -55,7 +55,7 @@ SLOFILES=\
         $(SLO)$/YUsers.obj				\
         $(SLO)$/Yservices.obj
 
-SHL1VERSIONMAP=$(MYSQL_TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Library -----------------------------------
 
diff --git a/connectivity/source/drivers/mysql/mysql.map b/connectivity/source/drivers/mysql/mysql.map
deleted file mode 100644
index 834658431ada..000000000000
--- a/connectivity/source/drivers/mysql/mysql.map
+++ /dev/null
@@ -1,8 +0,0 @@
-MYSQL_2_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/mysql/mysql.xcu b/connectivity/source/drivers/mysql/mysql.xcu
index 2fc59be5bdc3..afc5c0d07f5d 100755
--- a/connectivity/source/drivers/mysql/mysql.xcu
+++ b/connectivity/source/drivers/mysql/mysql.xcu
@@ -45,6 +45,11 @@
             <value>com.mysql.jdbc.Driver</value>
           </prop>
         </node>
+        <node oor:name="AddIndexAppendix" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="Features">
         <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace">
@@ -94,6 +99,11 @@
             <value>UserPassword</value>
           </prop>
         </node>
+        <node oor:name="SupportsColumnDescription" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
       </node>
     </node>
     <node oor:name="sdbc:mysql:odbc:*" oor:op="replace">
@@ -109,6 +119,11 @@
             <value></value>
           </prop>
         </node>
+        <node oor:name="AddIndexAppendix" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="Features">
         <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace">
@@ -183,6 +198,11 @@
             <value></value>
           </prop>
         </node>
+        <node oor:name="AddIndexAppendix" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="Features">
         <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace">
@@ -227,6 +247,11 @@
             <value>UserPassword</value>
           </prop>
         </node>
+        <node oor:name="SupportsColumnDescription" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
       </node>
     </node>
   </node>
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index 09052f9d77a3..508cbfb6df63 100644
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -71,7 +71,7 @@ SHL1IMPLIB=	i$(ODBC_TARGET)
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=	$(SHL1TARGET)
-SHL1VERSIONMAP=odbc.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Targets ----------------------------------
 
diff --git a/connectivity/source/drivers/odbc/odbc.map b/connectivity/source/drivers/odbc/odbc.map
deleted file mode 100644
index 14e4b7110c89..000000000000
--- a/connectivity/source/drivers/odbc/odbc.map
+++ /dev/null
@@ -1,8 +0,0 @@
-ODBC_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 80aacacef576..751ab7cf2988 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -97,7 +97,7 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet()
         osl_incrementInterlockedCount( &m_refCount );
         dispose();
     }
-    delete m_pRowStatusArray;
+    delete [] m_pRowStatusArray;
 }
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSet::disposing(void)
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index da29bcf08c17..7055bd273370 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -162,7 +162,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :
 // -------------------------------------------------------------------------
 OResultSet::~OResultSet()
 {
-    delete m_pRowStatusArray;
+    delete [] m_pRowStatusArray;
     delete m_pSkipDeletedSet;
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index b892e6336b19..43de55e3505c 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -391,6 +391,7 @@ void OTools::bindValue( OConnection* _pConnection,
                 case SQL_TIMESTAMP:
                     *pLen = sizeof(TIMESTAMP_STRUCT);
                     *((TIMESTAMP_STRUCT*)_pData) = *(TIMESTAMP_STRUCT*)_pValue;
+                    break;
             }
         }
         catch ( ... )
diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index 421012e3678e..ec19ac83140b 100644
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
@@ -28,12 +28,14 @@
 #define CONNECTIVITY_MYSQL_TABLES_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
+#include "connectivity/SQLStatementHelper.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 namespace connectivity
 {
     namespace mysql
     {
-        class OTables : public sdbcx::OCollection
+        class OTables : public sdbcx::OCollection,
+            public ::dbtools::ISQLStatementHelper
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >       m_xMetaData;
 
@@ -76,6 +78,9 @@ namespace connectivity
                 @param  _sSql in/out
             */
             static ::rtl::OUString adjustSQL(const ::rtl::OUString& _sSql);
+
+            // ISQLStatementHelper
+            virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,::rtl::OUStringBuffer& _rOut);
         };
     }
 }
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index 1f7252158918..b28278b0477d 100644
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
@@ -133,7 +133,7 @@ pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaCon
 
 #define PROPERTY_ID_INVALID_INDEX                   41
 #define PROPERTY_ID_HY010                           43
-    // FREE
+#define PROPERTY_ID_LABEL                           44
 #define PROPERTY_ID_DELIMITER                       45
 #define PROPERTY_ID_FORMATKEY                       46
 #define PROPERTY_ID_LOCALE                          47
diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk
index e72dfc78bcdf..52ec191ec836 100644
--- a/connectivity/source/manager/makefile.mk
+++ b/connectivity/source/manager/makefile.mk
@@ -52,7 +52,7 @@ SLOFILES=\
 
 SHL1TARGET=	$(SDBC_TARGET)$(SDBC_MAJOR)
 
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1OBJS=$(SLOFILES)
 SHL1STDLIBS=\
diff --git a/connectivity/source/manager/sdbc.map b/connectivity/source/manager/sdbc.map
deleted file mode 100644
index 2d8534b22e21..000000000000
--- a/connectivity/source/manager/sdbc.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SDBC_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 21e78ec61fea..43e38f5a1674 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -42,12 +42,14 @@ using namespace connectivity::parse;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
 
 // -------------------------------------------------------------------------
 OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn,sal_Bool     _bCase)
     : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))
                                 ,   getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
                                 ,   getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)))
+                                ,   getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)))
                                 ,   getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))
                                 ,   getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))
                                 ,   getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
@@ -69,6 +71,7 @@ OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn,sal_Bool
 OParseColumn::OParseColumn( const ::rtl::OUString& _Name,
                     const ::rtl::OUString& _TypeName,
                     const ::rtl::OUString& _DefaultValue,
+                    const ::rtl::OUString& _Description,
                     sal_Int32       _IsNullable,
                     sal_Int32       _Precision,
                     sal_Int32       _Scale,
@@ -79,6 +82,7 @@ OParseColumn::OParseColumn( const ::rtl::OUString& _Name,
                 ) : connectivity::sdbcx::OColumn(_Name,
                                   _TypeName,
                                   _DefaultValue,
+                                  _Description,
                                   _IsNullable,
                                   _Precision,
                                   _Scale,
@@ -97,25 +101,52 @@ OParseColumn::OParseColumn( const ::rtl::OUString& _Name,
 
 // -------------------------------------------------------------------------
 ::vos::ORef< OSQLColumns > OParseColumn::createColumnsForResultSet( const Reference< XResultSetMetaData >& _rxResMetaData,
-    const Reference< XDatabaseMetaData >& _rxDBMetaData )
+    const Reference< XDatabaseMetaData >& _rxDBMetaData,const Reference< XNameAccess>& i_xQueryColumns )
 {
     sal_Int32 nColumnCount = _rxResMetaData->getColumnCount();
     ::vos::ORef< OSQLColumns > aReturn( new OSQLColumns ); aReturn->get().reserve( nColumnCount );
 
+    StringMap aColumnMap;
     for ( sal_Int32 i = 1; i <= nColumnCount; ++i )
-        aReturn->get().push_back( createColumnForResultSet( _rxResMetaData, _rxDBMetaData, i ) );
+    {
+        OParseColumn* pColumn = createColumnForResultSet( _rxResMetaData, _rxDBMetaData, i,aColumnMap );
+        aReturn->get().push_back( pColumn );
+        if ( i_xQueryColumns.is() && i_xQueryColumns->hasByName(pColumn->getRealName()) )
+        {
+            Reference<XPropertySet> xColumn(i_xQueryColumns->getByName(pColumn->getRealName()),UNO_QUERY_THROW);
+            ::rtl::OUString sLabel;
+            xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL)) >>= sLabel;
+            if ( sLabel.getLength() )
+                pColumn->setLabel(sLabel);
+        }
+    }
 
     return aReturn;
 }
 
 // -------------------------------------------------------------------------
 OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSetMetaData >& _rxResMetaData,
-    const Reference< XDatabaseMetaData >& _rxDBMetaData, sal_Int32 _nColumnPos )
+    const Reference< XDatabaseMetaData >& _rxDBMetaData, sal_Int32 _nColumnPos,StringMap& _rColumns )
 {
+    ::rtl::OUString sLabel = _rxResMetaData->getColumnLabel( _nColumnPos );
+    // retrieve the name of the column
+    // check for duplicate entries
+    if(_rColumns.find(sLabel) != _rColumns.end())
+    {
+        ::rtl::OUString sAlias(sLabel);
+        sal_Int32 searchIndex=1;
+        while(_rColumns.find(sAlias) != _rColumns.end())
+        {
+            (sAlias = sLabel) += ::rtl::OUString::valueOf(searchIndex++);
+        }
+        sLabel = sAlias;
+    }
+    _rColumns.insert(StringMap::value_type(sLabel,0));
     OParseColumn* pColumn = new OParseColumn(
-        _rxResMetaData->getColumnLabel( _nColumnPos ),
+        sLabel,
         _rxResMetaData->getColumnTypeName( _nColumnPos ),
         ::rtl::OUString(),
+        ::rtl::OUString(),
         _rxResMetaData->isNullable( _nColumnPos ),
         _rxResMetaData->getPrecision( _nColumnPos ),
         _rxResMetaData->getScale( _nColumnPos ),
@@ -133,6 +164,7 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe
     ) );
     pColumn->setIsSearchable( _rxResMetaData->isSearchable( _nColumnPos ) );
     pColumn->setRealName(_rxResMetaData->getColumnName( _nColumnPos ));
+    pColumn->setLabel(sLabel);
     return pColumn;
 }
 
@@ -149,7 +181,7 @@ void OParseColumn::construct()
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME),                PROPERTY_ID_REALNAME,               0,  &m_aRealName,               ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED),   PROPERTY_ID_DBASEPRECISIONCHANGED,  0,  &m_bDbasePrecisionChanged,  ::getCppuType(reinterpret_cast<sal_Bool*>(NULL)));
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE),            PROPERTY_ID_ISSEARCHABLE,           0,  &m_bIsSearchable,           ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
-
+    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL),                   PROPERTY_ID_LABEL,                  0,  &m_sLabel,                  ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
 }
 // -----------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper* OParseColumn::createArrayHelper() const
@@ -169,6 +201,7 @@ OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn
     : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))
                                 ,   getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
                                 ,   getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)))
+                                ,   getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)))
                                 ,   getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))
                                 ,   getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))
                                 ,   getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
@@ -183,33 +216,6 @@ OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn
     construct();
 }
 // -------------------------------------------------------------------------
-OOrderColumn::OOrderColumn( const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _TypeName,
-                    const ::rtl::OUString& _DefaultValue,
-                    sal_Int32       _IsNullable,
-                    sal_Int32       _Precision,
-                    sal_Int32       _Scale,
-                    sal_Int32       _Type,
-                    sal_Bool        _IsAutoIncrement,
-                    sal_Bool        _IsCurrency,
-                    sal_Bool        _bCase
-                    ,sal_Bool _bAscending
-                ) : connectivity::sdbcx::OColumn(_Name,
-                                  _TypeName,
-                                  _DefaultValue,
-                                  _IsNullable,
-                                  _Precision,
-                                  _Scale,
-                                  _Type,
-                                  _IsAutoIncrement,
-                                  sal_False,
-                                  _IsCurrency,
-                                  _bCase)
-    , m_bAscending(_bAscending)
-{
-    construct();
-}
-// -------------------------------------------------------------------------
 OOrderColumn::~OOrderColumn()
 {
 }
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 4151314d36eb..84e9aa2532ff 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -145,7 +145,7 @@ using namespace connectivity;
 %union {
 	connectivity::OSQLParseNode * pParseNode;
 }
-%type <pParseNode> '(' ')' ',' ':' ';' '?' '[' ']' '{' '}' '.'
+%type <pParseNode> '(' ')' ',' ':' ';' '?' '[' ']' '{' '}' '.' 'K' 'M' 'G' 'T' 'P'
 
 %token <pParseNode> SQL_TOKEN_STRING SQL_TOKEN_ACCESS_DATE SQL_TOKEN_INT SQL_TOKEN_REAL_NUM
 %token <pParseNode> SQL_TOKEN_INTNUM SQL_TOKEN_APPROXNUM SQL_TOKEN_NOT SQL_TOKEN_NAME
@@ -188,7 +188,7 @@ using namespace connectivity;
 /* ODBC KEYWORDS */
 %token <pParseNode> SQL_TOKEN_CALL SQL_TOKEN_D SQL_TOKEN_FN SQL_TOKEN_T SQL_TOKEN_TS SQL_TOKEN_OJ
 /* string functions */
-%token <pParseNode> SQL_TOKEN_ASCII SQL_TOKEN_BIT_LENGTH  SQL_TOKEN_CHAR  SQL_TOKEN_CHAR_LENGTH  SQL_TOKEN_CHARACTER_LENGTH
+%token <pParseNode> SQL_TOKEN_ASCII SQL_TOKEN_BIT_LENGTH  SQL_TOKEN_CHAR  SQL_TOKEN_CHAR_LENGTH  SQL_TOKEN_SQL_TOKEN_INTNUM
 %token <pParseNode> SQL_TOKEN_CONCAT          
 %token <pParseNode> SQL_TOKEN_DIFFERENCE  SQL_TOKEN_INSERT SQL_TOKEN_LCASE  SQL_TOKEN_LEFT SQL_TOKEN_LENGTH  SQL_TOKEN_LOCATE          
 %token <pParseNode> SQL_TOKEN_LOCATE_2 SQL_TOKEN_LTRIM SQL_TOKEN_POSITION SQL_TOKEN_REPEAT SQL_TOKEN_REPLACE         
@@ -210,6 +210,13 @@ using namespace connectivity;
 %token <pParseNode> SQL_TOKEN_EVERY SQL_TOKEN_INTERSECTION SQL_TOKEN_FUSION SQL_TOKEN_COLLECT SQL_TOKEN_VAR_POP SQL_TOKEN_VAR_SAMP 
 %token <pParseNode> SQL_TOKEN_STDDEV_SAMP SQL_TOKEN_STDDEV_POP
 
+%token <pParseNode> SQL_TOKEN_RANK SQL_TOKEN_DENSE_RANK	SQL_TOKEN_PERCENT_RANK	SQL_TOKEN_CUME_DIST SQL_TOKEN_PERCENTILE_CONT SQL_TOKEN_PERCENTILE_DISC SQL_TOKEN_WITHIN SQL_TOKEN_ARRAY_AGG
+%token <pParseNode> SQL_TOKEN_CASE SQL_TOKEN_THEN SQL_TOKEN_END SQL_TOKEN_NULLIF SQL_TOKEN_COALESCE SQL_TOKEN_WHEN SQL_TOKEN_ELSE
+%token <pParseNode> SQL_TOKEN_BEFORE SQL_TOKEN_AFTER SQL_TOKEN_INSTEAD SQL_TOKEN_EACH SQL_TOKEN_REFERENCING SQL_TOKEN_BEGIN SQL_TOKEN_ATOMIC SQL_TOKEN_TRIGGER SQL_TOKEN_ROW SQL_TOKEN_STATEMENT
+%token <pParseNode> SQL_TOKEN_NEW SQL_TOKEN_OLD
+%token <pParseNode> SQL_TOKEN_VALUE SQL_TOKEN_CURRENT_CATALOG SQL_TOKEN_CURRENT_DEFAULT_TRANSFORM_GROUP SQL_TOKEN_CURRENT_PATH SQL_TOKEN_CURRENT_ROLE SQL_TOKEN_CURRENT_SCHEMA SQL_TOKEN_CURRENT_USER
+%token <pParseNode> SQL_TOKEN_SESSION_USER SQL_TOKEN_SYSTEM_USER SQL_TOKEN_VARCHAR SQL_TOKEN_VARBINARY SQL_TOKEN_VARYING SQL_TOKEN_OBJECT SQL_TOKEN_NCLOB SQL_TOKEN_NATIONAL
+%token <pParseNode> SQL_TOKEN_LARGE SQL_TOKEN_CLOB SQL_TOKEN_BLOB SQL_TOKEN_BIGINT SQL_TOKEN_BINARY SQL_TOKEN_WITHOUT SQL_TOKEN_BOOLEAN SQL_TOKEN_INTERVAL
 	/* operators */
 %left SQL_TOKEN_NAME
 %left <pParseNode> SQL_TOKEN_OR
@@ -242,10 +249,10 @@ using namespace connectivity;
 %type <pParseNode> update_statement_searched target_commalist target opt_where_clause
 %type <pParseNode> select_statement selection table_exp from_clause table_ref_commalist table_ref
 %type <pParseNode> where_clause opt_group_by_clause column_ref_commalist opt_having_clause
-%type <pParseNode> search_condition predicate comparison_predicate between_predicate
-%type <pParseNode> like_predicate opt_escape test_for_null in_predicate
-%type <pParseNode> all_or_any_predicate any_all_some existence_test subquery
-%type <pParseNode> scalar_exp_commalist parameter_ref literal
+%type <pParseNode> search_condition predicate comparison_predicate comparison_predicate_part_2 between_predicate between_predicate_part_2
+%type <pParseNode> like_predicate opt_escape test_for_null null_predicate_part_2 in_predicate in_predicate_part_2 character_like_predicate_part_2 other_like_predicate_part_2
+%type <pParseNode> all_or_any_predicate any_all_some existence_test subquery quantified_comparison_predicate_part_2 
+%type <pParseNode> scalar_exp_commalist parameter_ref literal parenthesized_boolean_value_expression 
 %type <pParseNode> column_ref data_type column cursor parameter range_variable user /*like_check*/
 /* neue Regeln bei OJ */
 %type <pParseNode> derived_column as_clause table_name num_primary term num_value_exp
@@ -257,8 +264,8 @@ using namespace connectivity;
 %type <pParseNode> qualified_join value_exp query_term join_type outer_join_type join_condition boolean_term
 %type <pParseNode> boolean_factor truth_value boolean_test boolean_primary named_columns_join join_spec
 %type <pParseNode> cast_operand cast_target factor datetime_value_exp /*interval_value_exp*/ datetime_term datetime_factor
-%type <pParseNode> datetime_primary datetime_value_fct time_zone time_zone_specifier /*interval_term*/ /*interval_qualifier*/
-%type <pParseNode> /*start_field*/ non_second_datetime_field /*end_field*/ /*single_datetime_field*/ extract_field datetime_field time_zone_field
+%type <pParseNode> datetime_primary datetime_value_fct time_zone time_zone_specifier /*interval_term*/ interval_qualifier
+%type <pParseNode> start_field non_second_datetime_field end_field single_datetime_field extract_field datetime_field time_zone_field
 %type <pParseNode> extract_source char_length_exp octet_length_exp bit_length_exp select_sublist string_value_exp
 %type <pParseNode> char_value_exp concatenation char_factor char_primary string_value_fct char_substring_fct fold
 %type <pParseNode> form_conversion char_translation trim_fct trim_operands trim_spec bit_value_fct bit_substring_fct op_column_commalist
@@ -270,6 +277,15 @@ using namespace connectivity;
 %type <pParseNode> column_def odbc_fct_spec	odbc_call_spec odbc_fct_type op_parameter union_statement
 %type <pParseNode> op_odbc_call_parameter odbc_parameter_commalist odbc_parameter function_args_commalist function_arg
 %type <pParseNode> catalog_name schema_name table_node numeric_function string_function function_name date_function table_primary_as_range_column opt_as
+%type <pParseNode> ordered_set_function inverse_distribution_function hypothetical_set_function hypothetical_set_function_value_expression_list rank_function_type within_group_specification inverse_distribution_function_type array_aggregate_function inverse_distribution_function_argument
+%type <pParseNode> case_expression else_clause result_expression result case_abbreviation case_specification searched_when_clause simple_when_clause searched_case simple_case
+%type <pParseNode> when_operand_list when_operand case_operand
+%type <pParseNode> trigger_definition trigger_name trigger_action_time trigger_event transition_table_or_variable_list triggered_action trigger_column_list triggered_when_clause triggered_SQL_statement SQL_procedure_statement old_transition_variable_name new_transition_variable_name 
+%type <pParseNode> op_referencing op_trigger_columnlist op_triggered_action_for opt_row trigger_for SQL_procedure_statement_list transition_table_or_variable old_transition_table_name new_transition_table_name transition_table_name
+%type <pParseNode> searched_when_clause_list simple_when_clause_list predefined_type opt_char_set_spec opt_collate_clause character_string_type national_character_string_type
+%type <pParseNode> binary_string_type numeric_type boolean_type datetime_type interval_type opt_paren_precision paren_char_length opt_paren_char_large_length paren_character_large_object_length
+%type <pParseNode> large_object_length opt_multiplier character_large_object_type national_character_large_object_type binary_large_object_string_type opt_with_or_without_time_zone
+%type <pParseNode> approximate_numeric_type exact_numeric_type opt_paren_precision_scale
 %%
 
 /* Parse Tree an OSQLParser zurueckliefern
@@ -282,25 +298,20 @@ sql_single_statement:
 	|	sql ';'
 		{ xxx_pGLOBAL_SQLPARSER->setParseTree( $1 ); }
 	;
-/*
-sql_list:
-		sql_ ';'
-			{$$ = SQL_NEW_LISTRULE;
-			$$->append($1);
-			pSqlParseTreeRoot = $1; -- obsolete - Ergebnis in yyval! rdm }
-	|	sql_list sql ';'
-			{$1->append($2);
-			$$ = $1;}
-	;
-*/
-
 
 	/* schema definition language */
 	/* Note: other ``sql:sal_Unicode() rules appear later in the grammar */
-/***
+	
 sql:
-	schema
+		manipulative_statement
+	|	schema_element
+           {
+                $$ = SQL_NEW_RULE;
+		$$->append($1);
+	   }
 	;
+	
+/***
 
 op_authorization:
 		{$$ = SQL_NEW_RULE;}
@@ -336,7 +347,7 @@ schema:
 	;
 
 opt_schema_element_list:
-		/* empty * /     {$$ = SQL_NEW_RULE;}
+			{$$ = SQL_NEW_RULE;}
 	|       schema_glement_list
 	;
 
@@ -349,17 +360,12 @@ schema_element_list:
 			$$ = $1;}
 	;
 */
-sql:
-		schema_element
-		{$$ = SQL_NEW_RULE;
-			$$->append($1);
-			}
-	;
 
 schema_element:
 			base_table_def
 	|       view_def
 	|       privilege_def
+	|		trigger_definition
 	;
 
 base_table_def:
@@ -676,9 +682,6 @@ sql_not:
 
 /* manipulative statements */
 
-sql:    manipulative_statement
-	;
-
 manipulative_statement:
 			commit_statement
 /*	|       delete_statement_positioned*/
@@ -953,6 +956,10 @@ opt_as:
 		/* empty */ {$$ = SQL_NEW_RULE;}
 	|	SQL_TOKEN_AS
 	;
+opt_row:
+		/* empty */ {$$ = SQL_NEW_RULE;}
+	|	SQL_TOKEN_ROW
+	;
 table_primary_as_range_column:
         {$$ = SQL_NEW_RULE;}
 	|   opt_as SQL_TOKEN_NAME op_column_commalist
@@ -1073,7 +1080,15 @@ boolean_primary:
 				YYERROR;
 		}
 	;
-
+parenthesized_boolean_value_expression:
+   '(' search_condition ')'
+	{ // boolean_primary: rule 2
+		$$ = SQL_NEW_RULE;
+		$$->append($1 = newNode("(", SQL_NODE_PUNCTUATION));
+		$$->append($2);
+		$$->append($3 = newNode(")", SQL_NODE_PUNCTUATION));
+	}
+	;
 boolean_test:
 		boolean_primary
 	|	boolean_primary SQL_TOKEN_IS sql_not truth_value
@@ -1124,7 +1139,13 @@ predicate:
 	|       in_predicate
 	|       like_predicate
 	;
-
+comparison_predicate_part_2:	
+		comparison row_value_constructor
+		{
+			$$ = SQL_NEW_RULE; // comparison_predicate: rule 1
+			$$->append($1);
+			$$->append($2);
+		}
 comparison_predicate:
 		row_value_constructor comparison row_value_constructor
 		{
@@ -1165,17 +1186,8 @@ comparison:
 	  | SQL_LESSEQ
 	  | SQL_GREATEQ
 	;
-between_predicate:
-		row_value_constructor sql_not SQL_TOKEN_BETWEEN row_value_constructor SQL_TOKEN_AND row_value_constructor
-		{$$ = SQL_NEW_RULE; // between_predicate: rule 1
-			$$->append($1);
-			$$->append($2);
-			$$->append($3);
-			$$->append($4);
-			$$->append($5);
-			$$->append($6);
-		}
-	|	sql_not SQL_TOKEN_BETWEEN row_value_constructor SQL_TOKEN_AND row_value_constructor
+between_predicate_part_2:
+	sql_not SQL_TOKEN_BETWEEN row_value_constructor SQL_TOKEN_AND row_value_constructor
 		{
 			if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) // between_predicate: rule 2 
 			{
@@ -1186,7 +1198,13 @@ between_predicate:
 				{
 					OSQLParseNode* pTemp = $$;
 					$$ = pTemp->removeAt((sal_uInt32)0);
-					$$->insert(1,$1);
+					OSQLParseNode* pColumnRef = $$->removeAt((sal_uInt32)0);
+					$$->insert(0,$1);
+					OSQLParseNode* pBetween_predicate = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::between_predicate));
+					pBetween_predicate->append(pColumnRef);
+					pBetween_predicate->append($$);
+					$$ = pBetween_predicate;
+					
 					delete pTemp;
 					delete $4;
 				}
@@ -1197,46 +1215,58 @@ between_predicate:
 				}
 			}
 			else
-				YYERROR;
+			{
+				$$ = SQL_NEW_RULE; // between_predicate: rule 1
+				$$->append($1);
+				$$->append($2);
+				$$->append($3);
+				$$->append($4);
+				$$->append($5);
+			}
+		}
+between_predicate:
+		row_value_constructor between_predicate_part_2
+		{	
+			$$ = SQL_NEW_RULE; // between_predicate: rule 1
+			$$->append($1);
+			$$->append($2);
 		}
+	|	between_predicate_part_2
 	;
-
-like_predicate:
-		row_value_constructor SQL_TOKEN_NOT SQL_TOKEN_LIKE string_value_exp opt_escape
+character_like_predicate_part_2:
+	sql_not SQL_TOKEN_LIKE string_value_exp opt_escape
 		{
 			$$ = SQL_NEW_RULE; // like_predicate: rule 1
 			$$->append($1);
 			$$->append($2);
 			$$->append($3);
 			$$->append($4);
-			$$->append($5);
 		}
-	|	row_value_constructor SQL_TOKEN_LIKE string_value_exp opt_escape
+	;
+other_like_predicate_part_2:
+	sql_not SQL_TOKEN_LIKE value_exp_primary opt_escape
 		{
-			$$ = SQL_NEW_RULE; // like_predicate: rule 2
+			$$ = SQL_NEW_RULE; // like_predicate: rule 1
 			$$->append($1);
 			$$->append($2);
 			$$->append($3);
 			$$->append($4);
 		}
-	|	row_value_constructor SQL_TOKEN_NOT SQL_TOKEN_LIKE value_exp_primary opt_escape
+	;
+like_predicate:
+		row_value_constructor character_like_predicate_part_2
 		{
-			$$ = SQL_NEW_RULE;  // like_predicate: rule 3
+			$$ = SQL_NEW_RULE; // like_predicate: rule 1
 			$$->append($1);
 			$$->append($2);
-			$$->append($3);
-			$$->append($4);
-			$$->append($5);
 		}
-	|	row_value_constructor SQL_TOKEN_LIKE value_exp_primary opt_escape
+	|	row_value_constructor other_like_predicate_part_2
 		{
-			$$ = SQL_NEW_RULE;  // like_predicate: rule 4
+			$$ = SQL_NEW_RULE;  // like_predicate: rule 3
 			$$->append($1);
 			$$->append($2);
-			$$->append($3);
-			$$->append($4);
 		}
-	|	sql_not SQL_TOKEN_LIKE string_value_exp opt_escape
+	|	character_like_predicate_part_2
 		{
 			if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck())  // like_predicate: rule 5
 			{
@@ -1246,19 +1276,19 @@ like_predicate:
 				$$ = SQL_NEW_RULE;
 				$$->append(pColumnRef);
 				$$->append($1);
-				$$->append($2);
-				if (xxx_pGLOBAL_SQLPARSER->buildLikeRule($$,$3,$4))
-					$$->append($4);
-				else
+				OSQLParseNode* p2nd = $1->removeAt(2);
+				OSQLParseNode* p3rd = $1->removeAt(2);
+				if ( !xxx_pGLOBAL_SQLPARSER->buildLikeRule($1,p2nd,p3rd) )
 				{
 					delete $$;
 					YYABORT;
 				}
+				$1->append(p3rd);
 			}
 			else
 				YYERROR;
 		}
-	|	sql_not SQL_TOKEN_LIKE value_exp_primary opt_escape
+	|	other_like_predicate_part_2
 		{
 			if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) // like_predicate: rule 6
 			{
@@ -1268,14 +1298,14 @@ like_predicate:
 				$$ = SQL_NEW_RULE;
 				$$->append(pColumnRef);
 				$$->append($1);
-				$$->append($2);
-				if (xxx_pGLOBAL_SQLPARSER->buildLikeRule($$,$3,$4))
-					$$->append($4);
-				else
+				OSQLParseNode* p2nd = $1->removeAt(2);
+				OSQLParseNode* p3rd = $1->removeAt(2);
+				if ( !xxx_pGLOBAL_SQLPARSER->buildLikeRule($1,p2nd,p3rd) )
 				{
 					delete $$;
 					YYABORT;
 				}
+				$1->append(p3rd);
 			}
 			else
 				YYERROR;
@@ -1298,16 +1328,23 @@ opt_escape:
 		}
 	;
 
+null_predicate_part_2:
+	SQL_TOKEN_IS sql_not SQL_TOKEN_NULL
+	{
+		$$ = SQL_NEW_RULE; // test_for_null: rule 1
+		$$->append($1);
+		$$->append($2);
+		$$->append($3);
+	}
+	;
 test_for_null:
-		row_value_constructor SQL_TOKEN_IS sql_not truth_value
+		row_value_constructor null_predicate_part_2
 		{
 			$$ = SQL_NEW_RULE; // test_for_null: rule 1
 			$$->append($1);
 			$$->append($2);
-			$$->append($3);
-			$$->append($4);
 		}
-	|	SQL_TOKEN_IS sql_not truth_value
+	|	null_predicate_part_2
 		{
 			if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck())// test_for_null: rule 2
 			{
@@ -1317,8 +1354,6 @@ test_for_null:
 				$$ = SQL_NEW_RULE;
 				$$->append(pColumnRef);
 				$$->append($1);
-				$$->append($2);
-				$$->append($3);
 			}
 			else
 				YYERROR;
@@ -1336,16 +1371,23 @@ in_predicate_value:
 			$$->append($3 = newNode(")", SQL_NODE_PUNCTUATION));
 		}
 	;
+in_predicate_part_2:
+	sql_not SQL_TOKEN_IN in_predicate_value
+	{
+		$$ = SQL_NEW_RULE;// in_predicate: rule 1
+		$$->append($1);
+		$$->append($2);
+		$$->append($3);
+	}
+	;
 in_predicate:
-		row_value_constructor sql_not SQL_TOKEN_IN in_predicate_value
+		row_value_constructor in_predicate_part_2
 		{
 			$$ = SQL_NEW_RULE;// in_predicate: rule 1
 			$$->append($1);
 			$$->append($2);
-			$$->append($3);
-			$$->append($4);
 		}
-	|	sql_not SQL_TOKEN_IN in_predicate_value
+	|	in_predicate_part_2
 		{
 			if ( xxx_pGLOBAL_SQLPARSER->inPredicateCheck() )// in_predicate: rule 2
 			{
@@ -1355,24 +1397,28 @@ in_predicate:
 				$$ = SQL_NEW_RULE;
 				$$->append(pColumnRef);
 				$$->append($1);
-				$$->append($2);
-				$$->append($3);
-				// hello
 			}
 			else
 				YYERROR;
 		}
 	;
+quantified_comparison_predicate_part_2:
+	comparison any_all_some subquery
+	{
+		$$ = SQL_NEW_RULE;
+		$$->append($1);
+		$$->append($2);
+		$$->append($3);
+	}
+	;
 all_or_any_predicate:
-		row_value_constructor comparison any_all_some subquery
+		row_value_constructor quantified_comparison_predicate_part_2
 		{
 			$$ = SQL_NEW_RULE;
 			$$->append($1);
 			$$->append($2);
-			$$->append($3);
-			$$->append($4);
 		}
-	|	comparison any_all_some subquery
+	|	quantified_comparison_predicate_part_2
 		{
 			if(xxx_pGLOBAL_SQLPARSER->inPredicateCheck())
 			{
@@ -1382,8 +1428,6 @@ all_or_any_predicate:
 				$$ = SQL_NEW_RULE;
 				$$->append(pColumnRef);
 				$$->append($1);
-				$$->append($2);
-				$$->append($3);
 			}
 			else
 				YYERROR;
@@ -1576,7 +1620,7 @@ char_length_exp:
 			$$->append($3);
 			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
 		}
-	|	SQL_TOKEN_CHARACTER_LENGTH '(' value_exp ')'
+	|	SQL_TOKEN_SQL_TOKEN_INTNUM '(' value_exp ')'
 		{
 			$$ = SQL_NEW_RULE;
 			$$->append($1);
@@ -1682,10 +1726,19 @@ unsigned_value_spec:
 	;
 general_value_spec:
 		parameter
-	  | SQL_TOKEN_USER
-	  | SQL_TOKEN_NULL
-	  | SQL_TOKEN_FALSE
-	  | SQL_TOKEN_TRUE
+	| SQL_TOKEN_USER
+	/*	  | SQL_TOKEN_NULL*/
+	| SQL_TOKEN_FALSE
+	| SQL_TOKEN_TRUE
+	| SQL_TOKEN_VALUE
+	| SQL_TOKEN_CURRENT_CATALOG
+	| SQL_TOKEN_CURRENT_DEFAULT_TRANSFORM_GROUP
+	| SQL_TOKEN_CURRENT_PATH
+	| SQL_TOKEN_CURRENT_ROLE
+	| SQL_TOKEN_CURRENT_SCHEMA
+	| SQL_TOKEN_CURRENT_USER
+	| SQL_TOKEN_SESSION_USER
+	| SQL_TOKEN_SYSTEM_USER
 	;
 set_fct_spec:
 		general_set_fct
@@ -1962,7 +2015,7 @@ odbc_fct_type:
 	;
 
 general_set_fct:
-		set_fct_type '(' opt_all_distinct value_exp ')'
+		set_fct_type '(' opt_all_distinct function_arg ')'
 		{
 			$$ = SQL_NEW_RULE;
 			$$->append($1);
@@ -1979,7 +2032,7 @@ general_set_fct:
 			$$->append($3 = newNode("*", SQL_NODE_PUNCTUATION));
 			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
 		}
-	|	SQL_TOKEN_COUNT '(' opt_all_distinct value_exp ')'
+	|	SQL_TOKEN_COUNT '(' opt_all_distinct function_arg ')'
 		{
 			$$ = SQL_NEW_RULE;
 			$$->append($1);
@@ -1988,6 +2041,8 @@ general_set_fct:
 			$$->append($4);
 			$$->append($5 = newNode(")", SQL_NODE_PUNCTUATION));
 		}
+	|	ordered_set_function
+	|	array_aggregate_function
 	;
 set_fct_type:
 		SQL_TOKEN_AVG
@@ -2006,6 +2061,87 @@ set_fct_type:
 	|   SQL_TOKEN_INTERSECTION
 	;
 
+ordered_set_function:	
+		hypothetical_set_function
+	|	inverse_distribution_function
+	;
+hypothetical_set_function:
+		rank_function_type '('	hypothetical_set_function_value_expression_list ')'	within_group_specification
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+			$$->append($3);
+			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
+			$$->append($5);
+		}
+	|	rank_function_type '('	hypothetical_set_function_value_expression_list SQL_TOKEN_BY value_exp_commalist ')'	within_group_specification
+	{
+		$$ = SQL_NEW_RULE;
+		$$->append($1);
+		$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+		$$->append($3);
+		$$->append($4);
+		$$->append($5);
+		$$->append($6 = newNode(")", SQL_NODE_PUNCTUATION));
+		$$->append($7);
+	}
+	;
+
+within_group_specification:
+	{
+		$$ = SQL_NEW_RULE;
+	}
+	|	SQL_TOKEN_WITHIN SQL_TOKEN_GROUP '(' opt_order_by_clause ')'
+	{
+		$$ = SQL_NEW_RULE;
+		$$->append($1);
+		$$->append($2);
+		$$->append($3 = newNode("(", SQL_NODE_PUNCTUATION));
+		$$->append($4);
+		$$->append($5 = newNode(")", SQL_NODE_PUNCTUATION));
+	}
+	;
+hypothetical_set_function_value_expression_list:
+	value_exp_commalist
+	; 
+	
+inverse_distribution_function:
+	inverse_distribution_function_type '('inverse_distribution_function_argument ')' within_group_specification
+	{
+		$$ = SQL_NEW_RULE;
+		$$->append($1);
+		$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+		$$->append($3);
+		$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
+	}
+	;
+inverse_distribution_function_argument:
+		num_value_exp
+	;
+inverse_distribution_function_type:
+		SQL_TOKEN_PERCENTILE_CONT
+	|	SQL_TOKEN_PERCENTILE_DISC
+	;
+	
+array_aggregate_function:
+	SQL_TOKEN_ARRAY_AGG '(' value_exp opt_order_by_clause ')'
+	{
+		$$ = SQL_NEW_RULE;
+		$$->append($1);
+		$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+		$$->append($3);
+		$$->append($4);
+		$$->append($5 = newNode(")", SQL_NODE_PUNCTUATION));
+	}
+	;
+	
+rank_function_type:
+		SQL_TOKEN_RANK
+	|	SQL_TOKEN_DENSE_RANK
+	|	SQL_TOKEN_PERCENT_RANK
+	|	SQL_TOKEN_CUME_DIST
+	;
 outer_join_type:
 		SQL_TOKEN_LEFT %prec SQL_TOKEN_LEFT
 		{
@@ -2051,7 +2187,7 @@ join_type:
 		}
 	;
 cross_union:
-		table_ref /*[SQL_TOKEN_CROSS]*/ SQL_TOKEN_CROSS SQL_TOKEN_JOIN table_ref
+		table_ref SQL_TOKEN_CROSS SQL_TOKEN_JOIN table_ref
 		{
 			$$ = SQL_NEW_RULE;
 			$$->append($1);
@@ -2063,7 +2199,7 @@ cross_union:
 
 qualified_join:
 		/* wenn SQL_TOKEN_NATURAL, dann keine join_spec */
-		table_ref /*[SQL_TOKEN_NATURAL]*/ SQL_TOKEN_NATURAL join_type SQL_TOKEN_JOIN table_ref
+		table_ref SQL_TOKEN_NATURAL join_type SQL_TOKEN_JOIN table_ref
 		{
 			$$ = SQL_NEW_RULE;
 			$$->append($1);
@@ -2178,6 +2314,7 @@ value_exp_primary:
 	  | column_ref
 	  | set_fct_spec
 	  | scalar_subquery
+	  | case_expression
 	  | '(' value_exp ')'
 		{
 			$$ = SQL_NEW_RULE;
@@ -2401,83 +2538,39 @@ non_second_datetime_field:
 	|	SQL_TOKEN_HOUR
 	|	SQL_TOKEN_MINUTE
 	;
-/*start_field:
-		non_second_datetime_field
+start_field:
+		non_second_datetime_field opt_paren_precision
 		{
 			$$ = SQL_NEW_RULE;
 			$$->append($1);
-		}
-	|	non_second_datetime_field '(' SQL_TOKEN_INTNUM ')'
-		{
-			$$ = SQL_NEW_RULE;
-			$$->append($1);
-			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
-			$$->append($3);
-			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
+			$$->append($2);
 		}
 	;
 end_field:
 		non_second_datetime_field
+	|	SQL_TOKEN_SECOND opt_paren_precision
 		{
 			$$ = SQL_NEW_RULE;
 			$$->append($1);
-		}
-	  | SQL_TOKEN_SECOND
-		{
-			$$ = SQL_NEW_RULE;
-			$$->append($1);
-		}
-	  | SQL_TOKEN_SECOND '(' SQL_TOKEN_INTNUM ')'
-		{
-			$$ = SQL_NEW_RULE;
-			$$->append($1);
-			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
-			$$->append($3);
-			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
+			$$->append($2);
 		}
 	;
-*/
-/*
+
 single_datetime_field:
-		non_second_datetime_field
+		non_second_datetime_field opt_paren_precision
 		{
 			$$ = SQL_NEW_RULE;
 			$$->append($1);
+			$$->append($2);
 		}
-	|	non_second_datetime_field '(' SQL_TOKEN_INTNUM ')'
-		{
-			$$ = SQL_NEW_RULE;
-			$$->append($1);
-			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
-			$$->append($3);
-			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
-		}
-	|	SQL_TOKEN_SECOND
-		{
-			$$ = SQL_NEW_RULE;
-			$$->append($1);
-		}
-	|	SQL_TOKEN_SECOND '(' SQL_TOKEN_INTNUM ')'
-		{
-			$$ = SQL_NEW_RULE;
-			$$->append($1);
-			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
-			$$->append($3);
-			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
-		}
-	|	SQL_TOKEN_SECOND '(' SQL_TOKEN_INTNUM ',' SQL_TOKEN_INTNUM ')'
+	|	SQL_TOKEN_SECOND opt_paren_precision_scale
 		{
 			$$ = SQL_NEW_RULE;
 			$$->append($1);
-			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
-			$$->append($3);
-			$$->append($4 = newNode(",", SQL_NODE_PUNCTUATION));
-			$$->append($5);
-			$$->append($6 = newNode(")", SQL_NODE_PUNCTUATION));
+			$$->append($2);
 		}
 	;
-*/
-/*
+
 interval_qualifier:
 		start_field SQL_TOKEN_TO end_field
 		{
@@ -2486,13 +2579,9 @@ interval_qualifier:
 			$$->append($2);
 			$$->append($3);
 		}
-	  | single_datetime_field
-		{
-			$$ = SQL_NEW_RULE;
-			$$->append($1);
-		}
+	|	single_datetime_field
 	;
-*/
+
 function_arg_commalist2:
 	    function_arg ',' function_arg
 			{$$ = SQL_NEW_COMMALISTRULE;
@@ -2546,6 +2635,21 @@ function_arg:
 			$$->append($2);
 			$$->append($3);
 		}
+	|	value_exp SQL_TOKEN_USING value_exp comparison value_exp
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+			$$->append($4);
+		}
+	|	value_exp SQL_TOKEN_BY value_exp_commalist
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+		}
 	;
 function_args_commalist:
 		function_arg
@@ -2952,59 +3056,384 @@ column_val:
 		}
 	;
 data_type:
-			SQL_TOKEN_CHARACTER
-	|       SQL_TOKEN_CHARACTER '(' SQL_TOKEN_INTNUM ')'
-			{$$ = SQL_NEW_RULE;
+	predefined_type
+	;
+opt_char_set_spec:	
+	{$$ = SQL_NEW_RULE;}
+	|	SQL_TOKEN_CHARACTER SQL_TOKEN_SET SQL_TOKEN_NAME
+		{
+			$$ = SQL_NEW_RULE;
 			$$->append($1);
-			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+			$$->append($2);
 			$$->append($3);
-			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));}
-	|       SQL_TOKEN_NUMERIC
-	|       SQL_TOKEN_NUMERIC '(' SQL_TOKEN_INTNUM ')'
-			{$$ = SQL_NEW_RULE;
+		}	
+	;
+opt_collate_clause:
+	{$$ = SQL_NEW_RULE;}
+	| collate_clause
+	;
+predefined_type:
+		character_string_type opt_char_set_spec	opt_collate_clause
+		{
+			$$ = SQL_NEW_RULE;
 			$$->append($1);
-			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+			$$->append($2);
 			$$->append($3);
-			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));}
-	|       SQL_TOKEN_NUMERIC '(' SQL_TOKEN_INTNUM ',' SQL_TOKEN_INTNUM ')'
-			{$$ = SQL_NEW_RULE;
+		}
+	|	national_character_string_type opt_collate_clause
+		{
+			$$ = SQL_NEW_RULE;
 			$$->append($1);
-			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+			$$->append($2);
+		}
+	|	binary_string_type
+	|	numeric_type
+	|	boolean_type
+	|	datetime_type
+	|	interval_type
+	;
+character_string_type:
+		SQL_TOKEN_CHARACTER opt_paren_precision
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	|	SQL_TOKEN_CHAR opt_paren_precision
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	|	SQL_TOKEN_CHARACTER SQL_TOKEN_VARYING paren_char_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
 			$$->append($3);
-			$$->append($4 = newNode(",", SQL_NODE_PUNCTUATION));
-			$$->append($5);
-			$$->append($6 = newNode(")", SQL_NODE_PUNCTUATION));}
-	|       SQL_TOKEN_DECIMAL
-	|       SQL_TOKEN_DECIMAL '(' SQL_TOKEN_INTNUM ')'
-			{$$ = SQL_NEW_RULE;
+		}
+	|	SQL_TOKEN_CHAR SQL_TOKEN_VARYING paren_char_length
+		{
+			$$ = SQL_NEW_RULE;
 			$$->append($1);
-			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+			$$->append($2);
 			$$->append($3);
-			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));}
-	|       SQL_TOKEN_DECIMAL '(' SQL_TOKEN_INTNUM ',' SQL_TOKEN_INTNUM ')'
-			{$$ = SQL_NEW_RULE;
+		}
+	|	SQL_TOKEN_VARCHAR paren_char_length
+		{
+			$$ = SQL_NEW_RULE;
 			$$->append($1);
-			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+			$$->append($2);
+		}
+	| character_large_object_type
+	;
+opt_paren_precision:
+		{$$ = SQL_NEW_RULE;}
+	|	paren_char_length
+	;
+paren_char_length:
+	'(' SQL_TOKEN_INTNUM ')'
+	{
+		$$ = SQL_NEW_RULE;
+		$$->append($1 = newNode("(", SQL_NODE_PUNCTUATION));
+		$$->append($2);
+		$$->append($3 = newNode(")", SQL_NODE_PUNCTUATION));
+	}
+	;
+opt_paren_char_large_length:
+		{$$ = SQL_NEW_RULE;}
+	|	paren_character_large_object_length
+	;
+paren_character_large_object_length:	
+	'(' large_object_length ')'
+	{
+		$$ = SQL_NEW_RULE;
+		$$->append($1 = newNode("(", SQL_NODE_PUNCTUATION));
+		$$->append($2);
+		$$->append($3 = newNode(")", SQL_NODE_PUNCTUATION));
+	}
+	;
+	
+large_object_length:
+	SQL_TOKEN_INTNUM opt_multiplier
+	{
+		$$ = SQL_NEW_RULE;
+		$$->append($1);
+		$$->append($2);
+	}
+	;
+opt_multiplier:
+	{$$ = SQL_NEW_RULE;}
+	|	'K'
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1 = newNode("K", SQL_NODE_PUNCTUATION));
+		}
+	|	'M'
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1 = newNode("M", SQL_NODE_PUNCTUATION));
+		}
+	|	'G'
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1 = newNode("G", SQL_NODE_PUNCTUATION));
+		}
+	|	'T'
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1 = newNode("T", SQL_NODE_PUNCTUATION));
+		}
+	|	'P'
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1 = newNode("P", SQL_NODE_PUNCTUATION));
+		}
+	;
+character_large_object_type:
+		SQL_TOKEN_CHARACTER SQL_TOKEN_LARGE SQL_TOKEN_OBJECT opt_paren_char_large_length
+	{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
 			$$->append($3);
-			$$->append($4 = newNode(",", SQL_NODE_PUNCTUATION));
+			$$->append($4);
+		}
+	|	SQL_TOKEN_CHAR SQL_TOKEN_LARGE SQL_TOKEN_OBJECT opt_paren_char_large_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+			$$->append($4);
+		}
+	|	SQL_TOKEN_CLOB opt_paren_char_large_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	;
+national_character_string_type:
+		SQL_TOKEN_NATIONAL SQL_TOKEN_CHARACTER opt_paren_precision
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+		}
+	|	SQL_TOKEN_NATIONAL SQL_TOKEN_CHAR opt_paren_precision
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+		}
+	|	SQL_TOKEN_NCHAR opt_paren_precision
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	|	SQL_TOKEN_NATIONAL SQL_TOKEN_CHARACTER SQL_TOKEN_VARYING paren_char_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+			$$->append($4);
+		}
+	|	SQL_TOKEN_NATIONAL SQL_TOKEN_CHAR SQL_TOKEN_VARYING paren_char_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+			$$->append($4);
+		}
+	|	SQL_TOKEN_NCHAR SQL_TOKEN_VARYING paren_char_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+		}
+	|	national_character_large_object_type
+	;
+national_character_large_object_type:
+		SQL_TOKEN_NATIONAL SQL_TOKEN_CHARACTER SQL_TOKEN_LARGE SQL_TOKEN_OBJECT opt_paren_char_large_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+			$$->append($4);
 			$$->append($5);
-			$$->append($6 = newNode(")", SQL_NODE_PUNCTUATION));}
-	|       SQL_TOKEN_INTEGER
-	|       SQL_TOKEN_SMALLINT
-	|       SQL_TOKEN_FLOAT
-	|       SQL_TOKEN_FLOAT '(' SQL_TOKEN_INTNUM ')'
-			{$$ = SQL_NEW_RULE;
+		}
+	|	SQL_TOKEN_NCHAR SQL_TOKEN_LARGE SQL_TOKEN_OBJECT opt_paren_char_large_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+			$$->append($4);
+		}
+	|	SQL_TOKEN_NCLOB opt_paren_char_large_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	;
+binary_string_type:
+		SQL_TOKEN_BINARY opt_paren_precision
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	|	SQL_TOKEN_BINARY SQL_TOKEN_VARYING paren_char_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+		}
+	|	SQL_TOKEN_VARBINARY paren_char_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	|	binary_large_object_string_type
+	;
+binary_large_object_string_type:
+		SQL_TOKEN_BINARY SQL_TOKEN_LARGE SQL_TOKEN_OBJECT opt_paren_char_large_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+			$$->append($4);
+		}
+	|	SQL_TOKEN_BLOB opt_paren_char_large_length
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	;
+numeric_type:
+		exact_numeric_type
+	|	approximate_numeric_type
+	;
+opt_paren_precision_scale:
+	{$$ = SQL_NEW_RULE;}
+	|	'(' SQL_TOKEN_INTNUM ')'
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1 = newNode("(", SQL_NODE_PUNCTUATION));
+			$$->append($2);
+			$$->append($3 = newNode(")", SQL_NODE_PUNCTUATION));
+		}
+	|	'(' SQL_TOKEN_INTNUM ',' SQL_TOKEN_INTNUM ')'
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1 = newNode("(", SQL_NODE_PUNCTUATION));
+			$$->append($2);
+			$$->append($3 = newNode(",", SQL_NODE_PUNCTUATION));
+			$$->append($4);
+			$$->append($5 = newNode(")", SQL_NODE_PUNCTUATION));
+		}
+	;
+exact_numeric_type:
+		SQL_TOKEN_NUMERIC opt_paren_precision_scale
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	|	SQL_TOKEN_DECIMAL opt_paren_precision_scale
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	|	SQL_TOKEN_DEC opt_paren_precision_scale
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	|	SQL_TOKEN_SMALLINT
+	|	SQL_TOKEN_INTEGER
+	|	SQL_TOKEN_INT
+	|	SQL_TOKEN_BIGINT
+	;
+approximate_numeric_type:
+		SQL_TOKEN_FLOAT '(' SQL_TOKEN_INTNUM ')'
+		{
+			$$ = SQL_NEW_RULE;
 			$$->append($1);
 			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
 			$$->append($3);
-			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));}
-	|       SQL_TOKEN_REAL
-	|       SQL_TOKEN_DOUBLE SQL_TOKEN_PRECISION
-			{$$ = SQL_NEW_RULE;
+			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
+		}
+	|	SQL_TOKEN_FLOAT
+	|	SQL_TOKEN_REAL
+	|	SQL_TOKEN_DOUBLE
+	|	SQL_TOKEN_DOUBLE SQL_TOKEN_PRECISION
+		{
+			$$ = SQL_NEW_RULE;
 			$$->append($1);
-			$$->append($2);}
+			$$->append($2);
+		}
+	;
+boolean_type:
+	SQL_TOKEN_BOOLEAN
+;
+datetime_type:
+		SQL_TOKEN_DATE
+	|	SQL_TOKEN_TIME opt_paren_precision opt_with_or_without_time_zone
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+		}
+	|	SQL_TOKEN_TIMESTAMP opt_paren_precision opt_with_or_without_time_zone
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+		}
+	;
+opt_with_or_without_time_zone:
+		{$$ = SQL_NEW_RULE;}
+	|	SQL_TOKEN_WITH SQL_TOKEN_TIME SQL_TOKEN_ZONE
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+		}
+	|	SQL_TOKEN_WITHOUT SQL_TOKEN_TIME SQL_TOKEN_ZONE
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+		}
+	;
+interval_type:
+	SQL_TOKEN_INTERVAL interval_qualifier
+	{
+		$$ = SQL_NEW_RULE;
+		$$->append($1);
+		$$->append($2);
+	}
 	;
-
 	/* the various things you can name */
 
 column:
@@ -3028,7 +3457,141 @@ column:
 			$$ = newNode(xxx_pGLOBAL_SQLPARSER->TokenIDToStr(nNod), SQL_NODE_NAME);
 		}
 	;
-
+case_expression:
+		case_abbreviation
+	|	case_specification
+	;
+case_abbreviation:
+		SQL_TOKEN_NULLIF '(' value_exp_commalist ')'
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+			$$->append($3);
+			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
+		}
+	|	SQL_TOKEN_COALESCE '(' value_exp ')'
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+			$$->append($3);
+			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
+		}
+	|	SQL_TOKEN_COALESCE '(' value_exp_commalist ')'
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2 = newNode("(", SQL_NODE_PUNCTUATION));
+			$$->append($3);
+			$$->append($4 = newNode(")", SQL_NODE_PUNCTUATION));
+		}
+	;
+case_specification:
+		simple_case
+	|	searched_case
+	;
+simple_case:
+	SQL_TOKEN_CASE case_operand simple_when_clause_list else_clause SQL_TOKEN_END
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+			$$->append($4);
+			$$->append($5);
+		}
+	;
+searched_case:
+	SQL_TOKEN_CASE searched_when_clause_list else_clause SQL_TOKEN_END
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+			$$->append($4);
+		}
+	;
+simple_when_clause_list:
+		simple_when_clause
+		{
+			$$ = SQL_NEW_LISTRULE;
+			$$->append($1);
+		}
+	|   searched_when_clause_list simple_when_clause
+		{
+			$1->append($2);
+			$$ = $1;
+		}
+	;
+simple_when_clause:
+	SQL_TOKEN_WHEN when_operand_list SQL_TOKEN_THEN result
+	{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+			$$->append($4);
+		}
+	;
+when_operand_list:
+		when_operand
+		{$$ = SQL_NEW_COMMALISTRULE;
+		$$->append($1);}
+	|   when_operand_list ',' when_operand
+		{$1->append($3);
+		$$ = $1;}
+	;
+when_operand:
+		row_value_constructor_elem
+	|	comparison_predicate_part_2
+	|	between_predicate_part_2
+	|	in_predicate_part_2
+	|	character_like_predicate_part_2
+	|	null_predicate_part_2
+;
+searched_when_clause_list:
+		searched_when_clause
+		{
+			$$ = SQL_NEW_LISTRULE;
+			$$->append($1);
+		}
+	|   searched_when_clause_list searched_when_clause
+		{
+			$1->append($2);
+			$$ = $1;
+		}
+	;
+searched_when_clause:
+	SQL_TOKEN_WHEN search_condition SQL_TOKEN_THEN result
+	{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+			$$->append($3);
+			$$->append($4);
+		}
+	;
+else_clause:
+		{$$ = SQL_NEW_RULE;}
+	|	SQL_TOKEN_ELSE result
+		{
+			$$ = SQL_NEW_RULE;
+			$$->append($1);
+			$$->append($2);
+		}
+	;
+result:
+		result_expression
+	|	SQL_TOKEN_NULL
+	;
+result_expression:
+	value_exp
+	;
+case_operand:
+	row_value_constructor_elem
+	;
+	
 cursor:	SQL_TOKEN_NAME
 			{$$ = SQL_NEW_RULE;
 			$$->append($1);}
@@ -3093,6 +3656,195 @@ sql:
 		}
 	|   '(' sql ')' /* checking predicats */
     ;
+trigger_definition:
+	SQL_TOKEN_CREATE SQL_TOKEN_TRIGGER trigger_name trigger_action_time trigger_event SQL_TOKEN_ON table_name op_referencing triggered_action
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+        $$->append($3);
+        $$->append($4);
+        $$->append($5);
+        $$->append($6);
+        $$->append($7);
+        $$->append($8);
+        $$->append($9);
+    }
+	;
+op_referencing:
+	{
+		$$ = SQL_NEW_RULE;
+	}
+	|	SQL_TOKEN_REFERENCING transition_table_or_variable_list
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+    }
+	;
+trigger_action_time:
+		SQL_TOKEN_BEFORE
+	|	SQL_TOKEN_AFTER
+	|	SQL_TOKEN_INSTEAD SQL_TOKEN_OF
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+    }
+;
+trigger_event:
+		SQL_TOKEN_INSERT
+	|	SQL_TOKEN_DELETE
+	|	SQL_TOKEN_UPDATE op_trigger_columnlist
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+    }
+	;
+op_trigger_columnlist:
+	{
+		$$ = SQL_NEW_RULE;
+	}
+	|	SQL_TOKEN_OF trigger_column_list
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+    }
+	;
+trigger_column_list:
+	column_commalist
+	;
+triggered_action:
+	op_triggered_action_for triggered_when_clause triggered_SQL_statement
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+        $$->append($3);
+    }
+	;
+op_triggered_action_for:
+		{
+		$$ = SQL_NEW_RULE;
+		}
+	|	SQL_TOKEN_FOR SQL_TOKEN_EACH trigger_for
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+        $$->append($3);
+    }
+	;
+trigger_for:
+		SQL_TOKEN_ROW 
+	|	SQL_TOKEN_STATEMENT
+	;
+triggered_when_clause:
+	{
+		$$ = SQL_NEW_RULE;
+	}
+	|	SQL_TOKEN_WHEN parenthesized_boolean_value_expression
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+    }
+	;
+triggered_SQL_statement:
+		SQL_procedure_statement
+	|	SQL_TOKEN_BEGIN SQL_TOKEN_ATOMIC SQL_procedure_statement_list ';' SQL_TOKEN_END
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+        $$->append($3);
+        $$->append($4 = newNode(";", SQL_NODE_PUNCTUATION));
+        $$->append($5);
+    }
+	;
+SQL_procedure_statement_list:
+		SQL_procedure_statement 
+		{
+			$$ = SQL_NEW_LISTRULE;
+			$$->append($1);
+		}
+	|	SQL_procedure_statement_list ';' SQL_procedure_statement 
+		{
+			$1->append($3);
+			$$ = $1;
+		}
+	;
+SQL_procedure_statement:
+	sql
+	;
+	
+transition_table_or_variable_list:
+		transition_table_or_variable
+		{
+			$$ = SQL_NEW_LISTRULE;
+			$$->append($1);
+		}
+	|   transition_table_or_variable_list transition_table_or_variable
+		{
+			$1->append($2);
+			$$ = $1;
+		}
+	;
+
+transition_table_or_variable:
+		SQL_TOKEN_OLD opt_row opt_as old_transition_variable_name
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+        $$->append($3);
+        $$->append($4);
+    }
+	|	SQL_TOKEN_NEW opt_row opt_as new_transition_variable_name
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+        $$->append($3);
+        $$->append($4);
+    }
+	|	SQL_TOKEN_OLD SQL_TOKEN_TABLE opt_as old_transition_table_name
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+        $$->append($3);
+        $$->append($4);
+    }
+	|	SQL_TOKEN_NEW SQL_TOKEN_TABLE opt_as new_transition_table_name
+	{
+		$$ = SQL_NEW_RULE;
+        $$->append($1);
+        $$->append($2);
+        $$->append($3);
+        $$->append($4);
+    }
+;
+old_transition_table_name:
+	transition_table_name
+;
+new_transition_table_name:
+	transition_table_name
+;
+transition_table_name:
+	SQL_TOKEN_NAME
+;
+old_transition_variable_name:
+	SQL_TOKEN_NAME
+;
+new_transition_variable_name:
+	SQL_TOKEN_NAME
+;
+trigger_name:
+	SQL_TOKEN_NAME
+;
 %%
 
 
@@ -3507,7 +4259,7 @@ sal_Int16 OSQLParser::buildNode(OSQLParseNode*& pAppend,OSQLParseNode* pCompare,
 	pColumnRef->append(new OSQLInternalNode(m_sFieldName,SQL_NODE_NAME));
 	OSQLParseNode* pComp = NULL;
 	if ( SQL_ISTOKEN( pCompare, BETWEEN) && pLiteral2 )
-		pComp = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::between_predicate));
+		pComp = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::between_predicate_part_2));
 	else
 		pComp = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::comparison_predicate));
 	
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 275bd5b34619..c6723dfd6869 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -86,15 +86,11 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL;
 		SQLyylval.pParseNode = new OSQLInternalNode(text, token);	    
 
 #define SQL_NEW_KEYWORD(token)						\
-		SQLyylval.pParseNode = new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, (token));		
+		SQLyylval.pParseNode = new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, (token));		return token;
 
-#define SQL_NEW_NAME 		SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_NAME)
-#define SQL_NEW_INTNUM 		SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_INTNUM)
-#define SQL_NEW_APPROXNUM 	SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_APPROXNUM)
-#define SQL_NEW_STRING 		SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_STRING)
-#define SQL_NEW_COMPARISON 	SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_COMPARISON)
-#define SQL_NEW_AMMSC 		SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_AMMSC)
-#define SQL_NEW_DATE 		SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_ACCESS_DATE)
+#define SQL_NEW_INTNUM 		SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_INTNUM); return SQL_TOKEN_INTNUM;
+#define SQL_NEW_APPROXNUM 	SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_APPROXNUM); return SQL_TOKEN_APPROXNUM;
+#define SQL_NEW_DATE 		SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_ACCESS_DATE); return SQL_TOKEN_ACCESS_DATE;
 
 #define YY_INPUT(buf,result,max_size) 				\
 {													\
@@ -122,231 +118,280 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL;
 %option never-interactive
 %%
 
-[Aa][Bb][Ss]									{SQL_NEW_KEYWORD(SQL_TOKEN_ABS); return SQL_TOKEN_ABS; }
-[Aa][Cc][Oo][Ss]								{SQL_NEW_KEYWORD(SQL_TOKEN_ACOS); return SQL_TOKEN_ACOS; }
-[Aa][Ll][Ll]									{SQL_NEW_KEYWORD(SQL_TOKEN_ALL); return SQL_TOKEN_ALL; }
-[Aa][Ll][Tt][Ee][Rr]							{SQL_NEW_KEYWORD(SQL_TOKEN_ALTER); return SQL_TOKEN_ALTER; }
-[Aa][Nn][Dd]									{SQL_NEW_KEYWORD(SQL_TOKEN_AND); return SQL_TOKEN_AND; }
-[Aa][Nn][Yy]									{SQL_NEW_KEYWORD(SQL_TOKEN_ANY); return SQL_TOKEN_ANY; }
-[Aa][Ss]										{SQL_NEW_KEYWORD(SQL_TOKEN_AS); return SQL_TOKEN_AS; }
-[Aa][Ss][Cc]									{SQL_NEW_KEYWORD(SQL_TOKEN_ASC); return SQL_TOKEN_ASC; }
-[Aa][Ss][Cc][Ii][Ii]							{SQL_NEW_KEYWORD(SQL_TOKEN_ASCII); return SQL_TOKEN_ASCII; }
-[Aa][Ss][Ii][Nn]								{SQL_NEW_KEYWORD(SQL_TOKEN_ASIN); return SQL_TOKEN_ASIN; }
-[Aa][Tt]										{SQL_NEW_KEYWORD(SQL_TOKEN_AT); return SQL_TOKEN_AT; }
-[Aa][Tt][Aa][Nn]								{SQL_NEW_KEYWORD(SQL_TOKEN_ATAN); return SQL_TOKEN_ATAN; }
-[Aa][Tt][Aa][Nn]2								{SQL_NEW_KEYWORD(SQL_TOKEN_ATAN2); return SQL_TOKEN_ATAN2; }
-[Aa][Uu][Tt][Hh][Oo][Rr][Ii][Zz][Aa][Tt][Ii][Oo][Nn]   		{SQL_NEW_KEYWORD(SQL_TOKEN_AUTHORIZATION); return SQL_TOKEN_AUTHORIZATION; }
-[Aa][Vv][Gg]									{SQL_NEW_KEYWORD(SQL_TOKEN_AVG); return SQL_TOKEN_AVG; }
-
-[Bb][Ee][Tt][Ww][Ee][Ee][Nn]					{SQL_NEW_KEYWORD(SQL_TOKEN_BETWEEN); return SQL_TOKEN_BETWEEN; }
-[Bb][Ii][Tt]									{SQL_NEW_KEYWORD(SQL_TOKEN_BIT); return SQL_TOKEN_BIT; }
-[Bb][Ii][Tt]_[Ll][Ee][Nn][Gg][Tt][Hh]           {SQL_NEW_KEYWORD(SQL_TOKEN_BIT_LENGTH); return SQL_TOKEN_BIT_LENGTH; }
-[Bb][Oo][Tt][Hh]								{SQL_NEW_KEYWORD(SQL_TOKEN_BOTH); return SQL_TOKEN_BOTH; }
-[Bb][Yy]										{SQL_NEW_KEYWORD(SQL_TOKEN_BY); return SQL_TOKEN_BY; }
-
-[Cc][Aa][Ll][Ll]								{SQL_NEW_KEYWORD(SQL_TOKEN_CALL); return SQL_TOKEN_CALL; }
-[Cc][Aa][Ss][Tt]								{SQL_NEW_KEYWORD(SQL_TOKEN_CAST); return SQL_TOKEN_CAST; }
-[Cc][Hh][Aa][Rr]								{SQL_NEW_KEYWORD(SQL_TOKEN_CHAR); return SQL_TOKEN_CHAR; }
-[Cc][Hh][Aa][Rr][Aa][Cc][Tt][Ee][Rr]			{SQL_NEW_KEYWORD(SQL_TOKEN_CHARACTER); return SQL_TOKEN_CHARACTER; }
-[Cc][Hh][Aa][Rr]([Aa][Cc][Tt][Ee][Rr])?_[Ll][Ee][Nn][Gg][Tt][Hh]  		{SQL_NEW_KEYWORD(SQL_TOKEN_CHAR_LENGTH); return SQL_TOKEN_CHAR_LENGTH; }
-[Cc][Hh][Ee][Cc][Kk]							{SQL_NEW_KEYWORD(SQL_TOKEN_CHECK); return SQL_TOKEN_CHECK; }
-[Cc][Ee][Ii][Ll][Ii][Nn][Gg]					{SQL_NEW_KEYWORD(SQL_TOKEN_CEILING); return SQL_TOKEN_CEILING; }
-[Cc][Oo][Ll][Ll][Aa][Tt][Ee]					{SQL_NEW_KEYWORD(SQL_TOKEN_COLLATE); return SQL_TOKEN_COLLATE; }
-COLLECT                                         {SQL_NEW_KEYWORD(SQL_TOKEN_COLLECT); return SQL_TOKEN_COLLECT; }
-[Cc][Oo][Mm][Mm][Ii][Tt]						{SQL_NEW_KEYWORD(SQL_TOKEN_COMMIT); return SQL_TOKEN_COMMIT; }
-[Cc][Oo][Nn][Cc][Aa][Tt]						{SQL_NEW_KEYWORD(SQL_TOKEN_CONCAT); return SQL_TOKEN_CONCAT; }
-[Cc][Oo][Nn][Tt][Ii][Nn][Uu][Ee]				{SQL_NEW_KEYWORD(SQL_TOKEN_CONTINUE); return SQL_TOKEN_CONTINUE; }
-[Cc][Oo][Nn][Vv][Ee][Rr][Tt]					{SQL_NEW_KEYWORD(SQL_TOKEN_CONVERT); return SQL_TOKEN_CONVERT; }
-[Cc][Oo][Ss]									{SQL_NEW_KEYWORD(SQL_TOKEN_COS); return SQL_TOKEN_COS; }
-[Cc][Oo][Tt]									{SQL_NEW_KEYWORD(SQL_TOKEN_COT); return SQL_TOKEN_COT; }
-[Cc][Oo][Uu][Nn][Tt]							{SQL_NEW_KEYWORD(SQL_TOKEN_COUNT); return SQL_TOKEN_COUNT; }
-[Cc][Rr][Ee][Aa][Tt][Ee]						{SQL_NEW_KEYWORD(SQL_TOKEN_CREATE); return SQL_TOKEN_CREATE; }
-[Cc][Rr][Oo][Ss][Ss]							{SQL_NEW_KEYWORD(SQL_TOKEN_CROSS); return SQL_TOKEN_CROSS; }
-[Cc][Uu][Rr][Rr][Ee][Nn][Tt]					{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT); return SQL_TOKEN_CURRENT; }
-[Cc][Uu][Rr][Rr][Ee][Nn][Tt]_[Dd][Aa][Tt][Ee]	{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_DATE); return SQL_TOKEN_CURRENT_DATE; }
-[Cc][Uu][Rr][Dd][Aa][Tt][Ee]					{SQL_NEW_KEYWORD(SQL_TOKEN_CURDATE); return SQL_TOKEN_CURDATE; }
-[Cc][Uu][Rr][Rr][Ee][Nn][Tt]_[Tt][Ii][Mm][Ee]	{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_TIME); return SQL_TOKEN_CURRENT_TIME; }
-[Cc][Uu][Rr][Tt][Ii][Mm][Ee]					{SQL_NEW_KEYWORD(SQL_TOKEN_CURTIME); return SQL_TOKEN_CURTIME; }
-[Cc][Uu][Rr][Rr][Ee][Nn][Tt]_[Tt][Ii][Mm][Ee][Ss][Tt][Aa][Mm][Pp]	{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_TIMESTAMP); return SQL_TOKEN_CURRENT_TIMESTAMP; }
-[Cc][Uu][Rr][Ss][Oo][Rr]						{SQL_NEW_KEYWORD(SQL_TOKEN_CURSOR); return SQL_TOKEN_CURSOR; }
-
-[Dd]											{SQL_NEW_KEYWORD(SQL_TOKEN_D); return SQL_TOKEN_D; }
-[Dd][Aa][Tt][Ee]								{SQL_NEW_KEYWORD(SQL_TOKEN_DATE); return SQL_TOKEN_DATE; }
-[Dd][Aa][Tt][Ee][Dd][Ii][Ff][Ff]				{SQL_NEW_KEYWORD(SQL_TOKEN_DATEDIFF); return SQL_TOKEN_DATEDIFF; }
-[Dd][Aa][Tt][Ee][Vv][Aa][Ll][Uu][Ee]			{SQL_NEW_KEYWORD(SQL_TOKEN_DATEVALUE); return SQL_TOKEN_DATEVALUE; }
-[Dd][Aa][Yy]									{SQL_NEW_KEYWORD(SQL_TOKEN_DAY); return SQL_TOKEN_DAY; }
-[Dd][Aa][Yy][Nn][Aa][Mm][Ee]					{SQL_NEW_KEYWORD(SQL_TOKEN_DAYNAME); return SQL_TOKEN_DAYNAME; }
-[Dd][Aa][Yy][Oo][Ff][Mm][Oo][Nn][Tt][Hh]		{SQL_NEW_KEYWORD(SQL_TOKEN_DAYOFMONTH); return SQL_TOKEN_DAYOFMONTH; }
-[Dd][Aa][Yy][Oo][Ff][Ww][Ee][Ee][Kk]			{SQL_NEW_KEYWORD(SQL_TOKEN_DAYOFWEEK); return SQL_TOKEN_DAYOFWEEK; }
-[Dd][Aa][Yy][Oo][Ff][Yy][Ee][Aa][Rr]			{SQL_NEW_KEYWORD(SQL_TOKEN_DAYOFYEAR); return SQL_TOKEN_DAYOFYEAR; }
-[Dd][Ee][Cc]									{SQL_NEW_KEYWORD(SQL_TOKEN_DEC); return SQL_TOKEN_DEC; }
-[Dd][Ee][Cc][Ii][Mm][Aa][Ll]					{SQL_NEW_KEYWORD(SQL_TOKEN_DECIMAL); return SQL_TOKEN_DECIMAL; }
-[Dd][Ee][Cc][Ll][Aa][Rr][Ee]					{SQL_NEW_KEYWORD(SQL_TOKEN_DECLARE); return SQL_TOKEN_DECLARE; }
-[Dd][Ee][Ff][Aa][Uu][Ll][Tt]					{SQL_NEW_KEYWORD(SQL_TOKEN_DEFAULT); return SQL_TOKEN_DEFAULT; }
-[Dd][Ee][Gg][Rr][Ee][Ee][Ss]					{SQL_NEW_KEYWORD(SQL_TOKEN_DEGREES); return SQL_TOKEN_DEGREES; }
-[Dd][Ee][Ll][Ee][Tt][Ee]						{SQL_NEW_KEYWORD(SQL_TOKEN_DELETE); return SQL_TOKEN_DELETE; }
-[Dd][Ee][Ss][Cc]								{SQL_NEW_KEYWORD(SQL_TOKEN_DESC); return SQL_TOKEN_DESC; }
-[Dd][Ii][Ff][Ff][Ee][Rr][Ee][Nn][Cc][Ee]		{SQL_NEW_KEYWORD(SQL_TOKEN_DIFFERENCE); return SQL_TOKEN_DIFFERENCE; }
-[Dd][Ii][Ss][Tt][Ii][Nn][Cc][Tt]				{SQL_NEW_KEYWORD(SQL_TOKEN_DISTINCT); return SQL_TOKEN_DISTINCT; }
-[Dd][Oo][Uu][Bb][Ll][Ee]						{SQL_NEW_KEYWORD(SQL_TOKEN_DOUBLE); return SQL_TOKEN_DOUBLE; }
-[Dd][Rr][Oo][Pp]								{SQL_NEW_KEYWORD(SQL_TOKEN_DROP); return SQL_TOKEN_DROP; }
-
-EVERY                                           {SQL_NEW_KEYWORD(SQL_TOKEN_EVERY); return SQL_TOKEN_EVERY; }
-[Ee][Ss][Cc][Aa][Pp][Ee]						{SQL_NEW_KEYWORD(SQL_TOKEN_ESCAPE); return SQL_TOKEN_ESCAPE; }
-[Ee][Xx][Cc][Ee][Pp][Tt]						{SQL_NEW_KEYWORD(SQL_TOKEN_EXCEPT); return SQL_TOKEN_EXCEPT; }
-[Ee][Xx][Ii][Ss][Tt][Ss]						{SQL_NEW_KEYWORD(SQL_TOKEN_EXISTS); return SQL_TOKEN_EXISTS; }
-[Ee][Xx][Pp]									{SQL_NEW_KEYWORD(SQL_TOKEN_EXP); return SQL_TOKEN_EXP; }
-[Ee][Xx][Tt][Rr][Aa][Cc][Tt]					{SQL_NEW_KEYWORD(SQL_TOKEN_EXTRACT); return SQL_TOKEN_EXTRACT; }
-
-[Ff][Aa][Ll][Ss][Ee]							{SQL_NEW_KEYWORD(SQL_TOKEN_FALSE); return SQL_TOKEN_FALSE; }
-[Ff][Ee][Tt][Cc][Hh]							{SQL_NEW_KEYWORD(SQL_TOKEN_FETCH); return SQL_TOKEN_FETCH; }
-[Ff][Ll][Oo][Aa][Tt]							{SQL_NEW_KEYWORD(SQL_TOKEN_FLOAT); return SQL_TOKEN_FLOAT; }
-[Ff][Ll][Oo][Oo][Rr]							{SQL_NEW_KEYWORD(SQL_TOKEN_FLOOR); return SQL_TOKEN_FLOOR; }
-[Ff][Nn]										{SQL_NEW_KEYWORD(SQL_TOKEN_FN); return SQL_TOKEN_FN; }
-[Ff][Oo][Rr]									{SQL_NEW_KEYWORD(SQL_TOKEN_FOR); return SQL_TOKEN_FOR; }
-[Ff][Oo][Rr][Ee][Ii][Gg][Nn]					{SQL_NEW_KEYWORD(SQL_TOKEN_FOREIGN); return SQL_TOKEN_FOREIGN; }
-[Ff][Oo][Uu][Nn][Dd]							{SQL_NEW_KEYWORD(SQL_TOKEN_FOUND); return SQL_TOKEN_FOUND; }
-[Ff][Rr][Oo][Mm]								{SQL_NEW_KEYWORD(SQL_TOKEN_FROM); return SQL_TOKEN_FROM; }
-[Ff][Uu][Ll][Ll]								{SQL_NEW_KEYWORD(SQL_TOKEN_FULL); return SQL_TOKEN_FULL; }
-FUSION                                          {SQL_NEW_KEYWORD(SQL_TOKEN_FUSION); return SQL_TOKEN_FUSION; }
-
-[Gg][Rr][Aa][Nn][Tt]							{SQL_NEW_KEYWORD(SQL_TOKEN_GRANT); return SQL_TOKEN_GRANT; }
-[Gg][Rr][Oo][Uu][Pp]							{SQL_NEW_KEYWORD(SQL_TOKEN_GROUP); return SQL_TOKEN_GROUP; }
-
-[Hh][Aa][Vv][Ii][Nn][Gg]						{SQL_NEW_KEYWORD(SQL_TOKEN_HAVING); return SQL_TOKEN_HAVING; }
-[Hh][Oo][Uu][Rr]								{SQL_NEW_KEYWORD(SQL_TOKEN_HOUR); return SQL_TOKEN_HOUR; }
-
-[Ii][Nn]										{SQL_NEW_KEYWORD(SQL_TOKEN_IN); return SQL_TOKEN_IN; }
-[Ii][Nn][Nn][Ee][Rr]							{SQL_NEW_KEYWORD(SQL_TOKEN_INNER); return SQL_TOKEN_INNER; }
-[Ii][Nn][Ss][Ee][Rr][Tt]						{SQL_NEW_KEYWORD(SQL_TOKEN_INSERT); return SQL_TOKEN_INSERT; }
-[Ii][Nn][Tt]([Ee][Gg][Ee][Rr])?					{SQL_NEW_KEYWORD(SQL_TOKEN_INTEGER); return SQL_TOKEN_INTEGER; }
-[Ii][Nn][Tt][Ee][Rr][Ss][Ee][Cc][Tt]			{SQL_NEW_KEYWORD(SQL_TOKEN_INTERSECT); return SQL_TOKEN_INTERSECT; }
-INTERSECTION			                        {SQL_NEW_KEYWORD(SQL_TOKEN_INTERSECTION); return SQL_TOKEN_INTERSECTION; }
-[Ii][Nn][Tt][Oo]								{SQL_NEW_KEYWORD(SQL_TOKEN_INTO); return SQL_TOKEN_INTO; }
-[Ii][Ss]										{SQL_NEW_KEYWORD(SQL_TOKEN_IS); return SQL_TOKEN_IS; }
-
-[Jj][Oo][Ii][Nn]								{SQL_NEW_KEYWORD(SQL_TOKEN_JOIN); return SQL_TOKEN_JOIN; }
-
-[Kk][Ee][Yy]									{SQL_NEW_KEYWORD(SQL_TOKEN_KEY); return SQL_TOKEN_KEY; }
-
-[Ll][Cc][Aa][Ss][Ee]							{SQL_NEW_KEYWORD(SQL_TOKEN_LCASE); return SQL_TOKEN_LCASE; }
-[Ll][Ee][Aa][Dd][Ii][Nn][Gg]					{SQL_NEW_KEYWORD(SQL_TOKEN_LEADING); return SQL_TOKEN_LEADING; }
-[Ll][Ee][Ff][Tt]								{SQL_NEW_KEYWORD(SQL_TOKEN_LEFT); return SQL_TOKEN_LEFT; }
-[Ll][Ee][Nn][Gg][Tt][Hh]						{SQL_NEW_KEYWORD(SQL_TOKEN_LENGTH); return SQL_TOKEN_LENGTH; }
-[Ll][Ii][Kk][Ee]								{SQL_NEW_KEYWORD(SQL_TOKEN_LIKE); return SQL_TOKEN_LIKE; }
-[Ll][Nn]										{SQL_NEW_KEYWORD(SQL_TOKEN_LN); return SQL_TOKEN_LN; }
-[Ll][Oo][Cc][Aa][Ll]							{SQL_NEW_KEYWORD(SQL_TOKEN_LOCAL); return SQL_TOKEN_LOCAL; }
-[Ll][Oo][Cc][Aa][Tt][Ee]						{SQL_NEW_KEYWORD(SQL_TOKEN_LOCATE); return SQL_TOKEN_LOCATE; }
-[Ll][Oo][Gg]									{SQL_NEW_KEYWORD(SQL_TOKEN_LOG); return SQL_TOKEN_LOG; }
-[Ll][Oo][Gg][Ff]								{SQL_NEW_KEYWORD(SQL_TOKEN_LOGF); return SQL_TOKEN_LOGF; }
-[Ll][Oo][Gg]10									{SQL_NEW_KEYWORD(SQL_TOKEN_LOG10); return SQL_TOKEN_LOG10; }
-[Ll][Oo][Ww][Ee][Rr]							{SQL_NEW_KEYWORD(SQL_TOKEN_LOWER); return SQL_TOKEN_LOWER; }
-[Ll][Tt][Rr][Ii][Mm]							{SQL_NEW_KEYWORD(SQL_TOKEN_LTRIM); return SQL_TOKEN_LTRIM; }
-
-[Mm][Aa][Xx]									{SQL_NEW_KEYWORD(SQL_TOKEN_MAX); return SQL_TOKEN_MAX; }
-[Mm][Ii][Nn]									{SQL_NEW_KEYWORD(SQL_TOKEN_MIN); return SQL_TOKEN_MIN; }
-[Mm][Ii][Nn][Uu][Tt][Ee]						{SQL_NEW_KEYWORD(SQL_TOKEN_MINUTE); return SQL_TOKEN_MINUTE; }
-[Mm][Oo][Dd]									{SQL_NEW_KEYWORD(SQL_TOKEN_MOD); return SQL_TOKEN_MOD; }
-[Mm][Oo][Nn][Tt][Hh]							{SQL_NEW_KEYWORD(SQL_TOKEN_MONTH); return SQL_TOKEN_MONTH; }
-[Mm][Oo][Nn][Tt][Hh][Nn][Aa][Mm][Ee]			{SQL_NEW_KEYWORD(SQL_TOKEN_MONTHNAME); return SQL_TOKEN_MONTHNAME; }
-
-[Nn][Aa][Tt][Uu][Rr][Aa][LL]					{SQL_NEW_KEYWORD(SQL_TOKEN_NATURAL); return SQL_TOKEN_NATURAL; }
-[Nn][Cc][Hh][Aa][Rr]							{SQL_NEW_KEYWORD(SQL_TOKEN_NCHAR); return SQL_TOKEN_NCHAR; }
-[Nn][Oo][Tt]									{SQL_NEW_KEYWORD(SQL_TOKEN_NOT); return SQL_TOKEN_NOT; }
-[Nn][Oo][Ww]									{SQL_NEW_KEYWORD(SQL_TOKEN_NOW); return SQL_TOKEN_NOW; }
-[Nn][Uu][Ll][Ll]								{SQL_NEW_KEYWORD(SQL_TOKEN_NULL); return SQL_TOKEN_NULL; }
-[Nn][Uu][Mm][Ee][Rr][Ii][Cc]					{SQL_NEW_KEYWORD(SQL_TOKEN_NUMERIC); return SQL_TOKEN_NUMERIC; }
-
-[Oo][Cc][Tt][Ee][Tt]_[Ll][Ee][Nn][Gg][Tt][Hh]	{SQL_NEW_KEYWORD(SQL_TOKEN_OCTET_LENGTH); return SQL_TOKEN_OCTET_LENGTH; }
-[Oo][Ff]										{SQL_NEW_KEYWORD(SQL_TOKEN_OF); return SQL_TOKEN_OF; }
-[Oo][Jj]										{SQL_NEW_KEYWORD(SQL_TOKEN_OJ); return SQL_TOKEN_OJ; }
-[Oo][Nn]										{SQL_NEW_KEYWORD(SQL_TOKEN_ON); return SQL_TOKEN_ON; }
-[Oo][Pp][Tt][Ii][Oo][Nn]						{SQL_NEW_KEYWORD(SQL_TOKEN_OPTION); return SQL_TOKEN_OPTION; }
-[Oo][Rr]										{SQL_NEW_KEYWORD(SQL_TOKEN_OR); return SQL_TOKEN_OR; }
-[Oo][Rr][Dd][Ee][Rr]							{SQL_NEW_KEYWORD(SQL_TOKEN_ORDER); return SQL_TOKEN_ORDER; }
-[Oo][Uu][Tt][Ee][Rr]							{SQL_NEW_KEYWORD(SQL_TOKEN_OUTER); return SQL_TOKEN_OUTER; }
-
-[Pp][Ii]										{SQL_NEW_KEYWORD(SQL_TOKEN_PI); return SQL_TOKEN_PI; }
-[Pp][Oo][Ss][Ii][Tt][Ii][Oo][Nn]	            {SQL_NEW_KEYWORD(SQL_TOKEN_POSITION); return SQL_TOKEN_POSITION; }
-[Pp][Oo][Ww][Ee][Rr]				            {SQL_NEW_KEYWORD(SQL_TOKEN_POWER); return SQL_TOKEN_POWER; }
-[Pp][Rr][Ee][Cc][Ii][Ss][Ii][Oo][Nn]            {SQL_NEW_KEYWORD(SQL_TOKEN_PRECISION); return SQL_TOKEN_PRECISION; }
-[Pp][Rr][Ii][Mm][Aa][Rr][Yy]					{SQL_NEW_KEYWORD(SQL_TOKEN_PRIMARY); return SQL_TOKEN_PRIMARY; }
-[Pp][Rr][Ii][Vv][Ii][Ll][Ee][Gg][Ee][Ss]        {SQL_NEW_KEYWORD(SQL_TOKEN_PRIVILEGES); return SQL_TOKEN_PRIVILEGES; }
-[Pp][Rr][Oo][Cc][Ee][Dd][Uu][Rr][Ee]            {SQL_NEW_KEYWORD(SQL_TOKEN_PROCEDURE); return SQL_TOKEN_PROCEDURE; }
-[Pp][Uu][Bb][Ll][Ii][Cc]						{SQL_NEW_KEYWORD(SQL_TOKEN_PUBLIC); return SQL_TOKEN_PUBLIC; }
-
-[Qq][Uu][Aa][Rr][Tt][Ee][Rr]					{SQL_NEW_KEYWORD(SQL_TOKEN_QUARTER); return SQL_TOKEN_QUARTER; }
-
-[Rr][Aa][Dd][Ii][Aa][Nn][Ss]					{SQL_NEW_KEYWORD(SQL_TOKEN_RADIANS); return SQL_TOKEN_RADIANS; }
-[Rr][Aa][Nn][Dd]								{SQL_NEW_KEYWORD(SQL_TOKEN_RAND); return SQL_TOKEN_RAND; }
-[Rr][Ee][Aa][Ll]								{SQL_NEW_KEYWORD(SQL_TOKEN_REAL); return SQL_TOKEN_REAL; }
-[Rr][Ee][Ff][Ee][Rr][Ee][Nn][Cc][Ee][Ss]        {SQL_NEW_KEYWORD(SQL_TOKEN_REFERENCES); return SQL_TOKEN_REFERENCES; }
-[Rr][Ee][Pp][Ee][Aa][Tt]				        {SQL_NEW_KEYWORD(SQL_TOKEN_REPEAT); return SQL_TOKEN_REPEAT; }
-[Rr][Ee][Pp][Ll][Aa][Cc][Ee]				    {SQL_NEW_KEYWORD(SQL_TOKEN_REPLACE); return SQL_TOKEN_REPLACE; }
-[Rr][Oo][Ll][Ll][Bb][Aa][Cc][Kk]                {SQL_NEW_KEYWORD(SQL_TOKEN_ROLLBACK); return SQL_TOKEN_ROLLBACK; }
-[Rr][Oo][Uu][Nn][Dd]			                {SQL_NEW_KEYWORD(SQL_TOKEN_ROUND); return SQL_TOKEN_ROUND; }
-[Rr][Oo][Uu][Nn][Dd][Mm][Aa][Gg][Ii][Cc]        {SQL_NEW_KEYWORD(SQL_TOKEN_ROUNDMAGIC); return SQL_TOKEN_ROUNDMAGIC; }
-[Rr][Ii][Gg][Hh][Tt]							{SQL_NEW_KEYWORD(SQL_TOKEN_RIGHT); return SQL_TOKEN_RIGHT; }
-[Rr][Tt][Rr][Ii][Mm]							{SQL_NEW_KEYWORD(SQL_TOKEN_RTRIM); return SQL_TOKEN_RTRIM; }
-
-[Ss][Cc][Hh][Ee][Mm][Aa]						{SQL_NEW_KEYWORD(SQL_TOKEN_SCHEMA); return SQL_TOKEN_SCHEMA; }
-[Ss][Ee][Cc][Oo][Nn][Dd]						{SQL_NEW_KEYWORD(SQL_TOKEN_SECOND); return SQL_TOKEN_SECOND; }
-[Ss][Ee][Ll][Ee][Cc][Tt]						{SQL_NEW_KEYWORD(SQL_TOKEN_SELECT); return SQL_TOKEN_SELECT; }
-[Ss][Ee][Tt]									{SQL_NEW_KEYWORD(SQL_TOKEN_SET); return SQL_TOKEN_SET; }
-[Ss][Ii][Zz][Ee]								{SQL_NEW_KEYWORD(SQL_TOKEN_SIZE); return SQL_TOKEN_SIZE; }
-[Ss][Ii][Gg][Nn]								{SQL_NEW_KEYWORD(SQL_TOKEN_SIGN); return SQL_TOKEN_SIGN; }
-[Ss][Ii][Nn]									{SQL_NEW_KEYWORD(SQL_TOKEN_SIN); return SQL_TOKEN_SIN; }
-[Ss][Mm][Aa][Ll][Ll][Ii][Nn][Tt]                {SQL_NEW_KEYWORD(SQL_TOKEN_SMALLINT); return SQL_TOKEN_SMALLINT; }
-[Ss][Oo][Mm][Ee]								{SQL_NEW_KEYWORD(SQL_TOKEN_SOME); return SQL_TOKEN_SOME; }
-[Ss][Oo][Uu][Nn][Dd][Ee][Xx]					{SQL_NEW_KEYWORD(SQL_TOKEN_SOUNDEX); return SQL_TOKEN_SOUNDEX; }
-[Ss][Pp][Aa][Cc][Ee]							{SQL_NEW_KEYWORD(SQL_TOKEN_SPACE); return SQL_TOKEN_SPACE; }
-[Ss][Qq][Rr][Tt]								{SQL_NEW_KEYWORD(SQL_TOKEN_SQRT); return SQL_TOKEN_SQRT; }
-STDDEV_POP                                      {SQL_NEW_KEYWORD(SQL_TOKEN_STDDEV_POP); return SQL_TOKEN_STDDEV_POP; }
-STDDEV_SAMP                                     {SQL_NEW_KEYWORD(SQL_TOKEN_STDDEV_SAMP); return SQL_TOKEN_STDDEV_SAMP; }
-[Ss][Uu][Bb][Ss][Tt][Rr][Ii][Nn][Gg]			{SQL_NEW_KEYWORD(SQL_TOKEN_SUBSTRING); return SQL_TOKEN_SUBSTRING; }
-[Ss][Uu][Mm]									{SQL_NEW_KEYWORD(SQL_TOKEN_SUM); return SQL_TOKEN_SUM; }
-
-[Tt][Aa][Bb][Ll][Ee]							{SQL_NEW_KEYWORD(SQL_TOKEN_TABLE); return SQL_TOKEN_TABLE; }
-[Tt][Aa][Nn]									{SQL_NEW_KEYWORD(SQL_TOKEN_TAN); return SQL_TOKEN_TAN; }
-[Tt][Ii][Mm][Ee]								{SQL_NEW_KEYWORD(SQL_TOKEN_TIME); return SQL_TOKEN_TIME; }
-[Tt][Ii][Mm][Ee][Ss][Tt][Aa][Mm][Pp]			{SQL_NEW_KEYWORD(SQL_TOKEN_TIMESTAMP); return SQL_TOKEN_TIMESTAMP; }
-[Tt][Ii][Mm][Ee][Ss][Tt][Aa][Mm][Pp][Aa][Dd][Dd]			{SQL_NEW_KEYWORD(SQL_TOKEN_TIMESTAMPADD); return SQL_TOKEN_TIMESTAMPADD; }
-[Tt][Ii][Mm][Ee][Ss][Tt][Aa][Mm][Pp][Dd][Ii][Ff][Ff]		{SQL_NEW_KEYWORD(SQL_TOKEN_TIMESTAMPDIFF); return SQL_TOKEN_TIMESTAMPDIFF; }
-[Tt][Ii][Mm][Ee][Vv][Aa][Ll][Uu][Ee]		{SQL_NEW_KEYWORD(SQL_TOKEN_TIMEVALUE); return SQL_TOKEN_TIMEVALUE; }
-[Tt][Ii][Mm][Ee][Zz][Oo][Nn][Ee]_[Hh][Oo][Uu][Rr]			{SQL_NEW_KEYWORD(SQL_TOKEN_TIMEZONE_HOUR); return SQL_TOKEN_TIMEZONE_HOUR; }
-[Tt][Ii][Mm][Ee][Zz][Oo][Nn][Ee]_[Mm][Ii][Nn][Uu][Tt][Ee]	{SQL_NEW_KEYWORD(SQL_TOKEN_TIMEZONE_MINUTE); return SQL_TOKEN_TIMEZONE_MINUTE; }
-[Tt][Oo]										{SQL_NEW_KEYWORD(SQL_TOKEN_TO); return SQL_TOKEN_TO; }
-[Tt][Rr][Aa][Ii][Ll][Ii][Nn][Gg]				{SQL_NEW_KEYWORD(SQL_TOKEN_TRAILING); return SQL_TOKEN_TRAILING; }
-[Tt][Rr][Aa][Nn][Ss][Ll][Aa][Tt][Ee]			{SQL_NEW_KEYWORD(SQL_TOKEN_TRANSLATE); return SQL_TOKEN_TRANSLATE; }
-[Tt][Rr][Ii][Mm]								{SQL_NEW_KEYWORD(SQL_TOKEN_TRIM); return SQL_TOKEN_TRIM; }
-[Tt][Rr][Uu][Ee]								{SQL_NEW_KEYWORD(SQL_TOKEN_TRUE); return SQL_TOKEN_TRUE; }
-[Tt][Rr][Uu][Nn][Cc][Aa][Tt][Ee]				{SQL_NEW_KEYWORD(SQL_TOKEN_TRUNCATE); return SQL_TOKEN_TRUNCATE; }
-[Tt][Ss]										{SQL_NEW_KEYWORD(SQL_TOKEN_TS); return SQL_TOKEN_TS; }
-[Tt]											{SQL_NEW_KEYWORD(SQL_TOKEN_T); return SQL_TOKEN_T; }
-
-[Uu][Cc][Aa][Ss][Ee]							{SQL_NEW_KEYWORD(SQL_TOKEN_UCASE); return SQL_TOKEN_UCASE; }
-[Uu][Nn][Ii][Oo][Nn]							{SQL_NEW_KEYWORD(SQL_TOKEN_UNION); return SQL_TOKEN_UNION; }
-[Uu][Nn][Ii][Qq][Uu][Ee]						{SQL_NEW_KEYWORD(SQL_TOKEN_UNIQUE); return SQL_TOKEN_UNIQUE; }
-[Uu][Nn][Kk][Nn][Oo][Ww][Nn]					{SQL_NEW_KEYWORD(SQL_TOKEN_UNKNOWN); return SQL_TOKEN_UNKNOWN; }
-[Uu][Pp][Dd][Aa][Tt][Ee]						{SQL_NEW_KEYWORD(SQL_TOKEN_UPDATE); return SQL_TOKEN_UPDATE; }
-[Uu][Pp][Pp][Ee][Rr]							{SQL_NEW_KEYWORD(SQL_TOKEN_UPPER); return SQL_TOKEN_UPPER; }
-[Uu][Ss][Aa][Gg][Ee]							{SQL_NEW_KEYWORD(SQL_TOKEN_USAGE); return SQL_TOKEN_USAGE; }
-[Uu][Ss][Ee][Rr]								{SQL_NEW_KEYWORD(SQL_TOKEN_USER); return SQL_TOKEN_USER; }
-[Uu][Ss][Ii][Nn][Gg]							{SQL_NEW_KEYWORD(SQL_TOKEN_USING); return SQL_TOKEN_USING; }
-
-VAR_POP                                         {SQL_NEW_KEYWORD(SQL_TOKEN_VAR_POP); return SQL_TOKEN_VAR_POP; }
-VAR_SAMP                                        {SQL_NEW_KEYWORD(SQL_TOKEN_VAR_SAMP); return SQL_TOKEN_VAR_SAMP; }
-[Vv][Aa][Ll][Uu][Ee][Ss]						{SQL_NEW_KEYWORD(SQL_TOKEN_VALUES); return SQL_TOKEN_VALUES; }
-[Vv][Ii][Ee][Ww]								{SQL_NEW_KEYWORD(SQL_TOKEN_VIEW); return SQL_TOKEN_VIEW; }
-
-[Ww][Ee][Ee][Kk]								{SQL_NEW_KEYWORD(SQL_TOKEN_WEEK); return SQL_TOKEN_WEEK; }
-[Ww][Hh][Ee][Rr][Ee]							{SQL_NEW_KEYWORD(SQL_TOKEN_WHERE); return SQL_TOKEN_WHERE; }
-[Ww][Ii][Tt][Hh]								{SQL_NEW_KEYWORD(SQL_TOKEN_WITH); return SQL_TOKEN_WITH; }
-[Ww][Oo][Rr][Kk]								{SQL_NEW_KEYWORD(SQL_TOKEN_WORK); return SQL_TOKEN_WORK; }
-
-[Yy][Ee][Aa][Rr]								{SQL_NEW_KEYWORD(SQL_TOKEN_YEAR); return SQL_TOKEN_YEAR; }
-
-[Zz][Oo][Nn][Ee]								{SQL_NEW_KEYWORD(SQL_TOKEN_ZONE); return SQL_TOKEN_ZONE; }
+ABS					{SQL_NEW_KEYWORD(SQL_TOKEN_ABS);  }
+ACOS				{SQL_NEW_KEYWORD(SQL_TOKEN_ACOS);  }
+AFTER				{SQL_NEW_KEYWORD(SQL_TOKEN_AFTER);  }
+ALL					{SQL_NEW_KEYWORD(SQL_TOKEN_ALL);  }
+ALTER				{SQL_NEW_KEYWORD(SQL_TOKEN_ALTER);  }
+AND					{SQL_NEW_KEYWORD(SQL_TOKEN_AND);  }
+ANY					{SQL_NEW_KEYWORD(SQL_TOKEN_ANY);  }
+ARRAY_AGG			{SQL_NEW_KEYWORD(SQL_TOKEN_ARRAY_AGG);  }
+AS					{SQL_NEW_KEYWORD(SQL_TOKEN_AS);  }
+ASC					{SQL_NEW_KEYWORD(SQL_TOKEN_ASC);  }
+ASCII				{SQL_NEW_KEYWORD(SQL_TOKEN_ASCII);  }
+ASIN				{SQL_NEW_KEYWORD(SQL_TOKEN_ASIN);  }
+AT					{SQL_NEW_KEYWORD(SQL_TOKEN_AT);  }
+ATAN				{SQL_NEW_KEYWORD(SQL_TOKEN_ATAN);  }
+ATAN2				{SQL_NEW_KEYWORD(SQL_TOKEN_ATAN2);  }
+ATOMIC				{SQL_NEW_KEYWORD(SQL_TOKEN_ATOMIC);  }
+AUTHORIZATION   	{SQL_NEW_KEYWORD(SQL_TOKEN_AUTHORIZATION);  }
+AVG					{SQL_NEW_KEYWORD(SQL_TOKEN_AVG);  }
+
+BEFORE				{SQL_NEW_KEYWORD(SQL_TOKEN_BEFORE);  }
+BEGIN				{SQL_NEW_KEYWORD(SQL_TOKEN_BEGIN);  }
+BETWEEN				{SQL_NEW_KEYWORD(SQL_TOKEN_BETWEEN);  }
+BIGINT				{SQL_NEW_KEYWORD(SQL_TOKEN_BIGINT);  }
+BINARY				{SQL_NEW_KEYWORD(SQL_TOKEN_BINARY);  }
+BIT					{SQL_NEW_KEYWORD(SQL_TOKEN_BIT);  }
+BIT_LENGTH          {SQL_NEW_KEYWORD(SQL_TOKEN_BIT_LENGTH);  }
+BLOB				{SQL_NEW_KEYWORD(SQL_TOKEN_BLOB);  }
+BOTH				{SQL_NEW_KEYWORD(SQL_TOKEN_BOTH);  }
+BY					{SQL_NEW_KEYWORD(SQL_TOKEN_BY);  }
+
+CALL				{SQL_NEW_KEYWORD(SQL_TOKEN_CALL);  }
+CASE				{SQL_NEW_KEYWORD(SQL_TOKEN_CASE);  }
+CAST				{SQL_NEW_KEYWORD(SQL_TOKEN_CAST);  }
+CEILING				{SQL_NEW_KEYWORD(SQL_TOKEN_CEILING);  }
+CHAR				{SQL_NEW_KEYWORD(SQL_TOKEN_CHAR);  }
+CHARACTER			{SQL_NEW_KEYWORD(SQL_TOKEN_CHARACTER);  }
+CHAR(ACTER)?_LENGTH {SQL_NEW_KEYWORD(SQL_TOKEN_CHAR_LENGTH);  }
+CHECK				{SQL_NEW_KEYWORD(SQL_TOKEN_CHECK);  }
+CLOB				{SQL_NEW_KEYWORD(SQL_TOKEN_CLOB);  }
+COALESCE			{SQL_NEW_KEYWORD(SQL_TOKEN_COALESCE);  }
+COLLATE				{SQL_NEW_KEYWORD(SQL_TOKEN_COLLATE);  }
+COLLECT             {SQL_NEW_KEYWORD(SQL_TOKEN_COLLECT);  }
+COMMIT				{SQL_NEW_KEYWORD(SQL_TOKEN_COMMIT);  }
+CONCAT				{SQL_NEW_KEYWORD(SQL_TOKEN_CONCAT);  }
+CONTINUE			{SQL_NEW_KEYWORD(SQL_TOKEN_CONTINUE);  }
+CONVERT				{SQL_NEW_KEYWORD(SQL_TOKEN_CONVERT);  }
+COS					{SQL_NEW_KEYWORD(SQL_TOKEN_COS);  }
+COT					{SQL_NEW_KEYWORD(SQL_TOKEN_COT);  }
+COUNT				{SQL_NEW_KEYWORD(SQL_TOKEN_COUNT);  }
+CREATE				{SQL_NEW_KEYWORD(SQL_TOKEN_CREATE);  }
+CROSS				{SQL_NEW_KEYWORD(SQL_TOKEN_CROSS);  }
+CUME_RANK			{SQL_NEW_KEYWORD(SQL_TOKEN_CUME_DIST);  }
+CURRENT				{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT);  }
+CURRENT_DATE		{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_DATE);  }
+CURRENT_CATALOG					{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_CATALOG);  }
+CURRENT_DEFAULT_TRANSFORM_GROUP	{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_DEFAULT_TRANSFORM_GROUP);  }
+CURRENT_PATH					{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_PATH);  }
+CURRENT_ROLE					{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_ROLE);  }
+CURRENT_SCHEMA					{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_SCHEMA);  }
+CURRENT_USER					{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_USER);  }
+CURDATE				{SQL_NEW_KEYWORD(SQL_TOKEN_CURDATE);  }
+CURRENT_TIME		{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_TIME);  }
+CURTIME				{SQL_NEW_KEYWORD(SQL_TOKEN_CURTIME);  }
+CURRENT_TIMESTAMP	{SQL_NEW_KEYWORD(SQL_TOKEN_CURRENT_TIMESTAMP);  }
+CURSOR				{SQL_NEW_KEYWORD(SQL_TOKEN_CURSOR);  }
+
+D					{SQL_NEW_KEYWORD(SQL_TOKEN_D);  }
+DATE				{SQL_NEW_KEYWORD(SQL_TOKEN_DATE);  }
+DATEDIFF			{SQL_NEW_KEYWORD(SQL_TOKEN_DATEDIFF);  }
+DATEVALUE			{SQL_NEW_KEYWORD(SQL_TOKEN_DATEVALUE);  }
+DAY					{SQL_NEW_KEYWORD(SQL_TOKEN_DAY);  }
+DAYNAME				{SQL_NEW_KEYWORD(SQL_TOKEN_DAYNAME);  }
+DAYOFMONTH			{SQL_NEW_KEYWORD(SQL_TOKEN_DAYOFMONTH);  }
+DAYOFWEEK			{SQL_NEW_KEYWORD(SQL_TOKEN_DAYOFWEEK);  }
+DAYOFYEAR			{SQL_NEW_KEYWORD(SQL_TOKEN_DAYOFYEAR);  }
+DEC					{SQL_NEW_KEYWORD(SQL_TOKEN_DEC);  }
+DECIMAL				{SQL_NEW_KEYWORD(SQL_TOKEN_DECIMAL);  }
+DECLARE				{SQL_NEW_KEYWORD(SQL_TOKEN_DECLARE);  }
+DEFAULT				{SQL_NEW_KEYWORD(SQL_TOKEN_DEFAULT);  }
+DEGREES				{SQL_NEW_KEYWORD(SQL_TOKEN_DEGREES);  }
+DELETE				{SQL_NEW_KEYWORD(SQL_TOKEN_DELETE);  }
+DENSE_RANK			{SQL_NEW_KEYWORD(SQL_TOKEN_DENSE_RANK);  }
+DESC				{SQL_NEW_KEYWORD(SQL_TOKEN_DESC);  }
+DIFFERENCE			{SQL_NEW_KEYWORD(SQL_TOKEN_DIFFERENCE);  }
+DISTINCT			{SQL_NEW_KEYWORD(SQL_TOKEN_DISTINCT);  }
+DOUBLE				{SQL_NEW_KEYWORD(SQL_TOKEN_DOUBLE);  }
+DROP				{SQL_NEW_KEYWORD(SQL_TOKEN_DROP);  }
+
+EACH				{SQL_NEW_KEYWORD(SQL_TOKEN_EACH);  }
+ELSE				{SQL_NEW_KEYWORD(SQL_TOKEN_ELSE);  }
+END					{SQL_NEW_KEYWORD(SQL_TOKEN_END);  }
+EVERY               {SQL_NEW_KEYWORD(SQL_TOKEN_EVERY);  }
+ESCAPE				{SQL_NEW_KEYWORD(SQL_TOKEN_ESCAPE);  }
+EXCEPT				{SQL_NEW_KEYWORD(SQL_TOKEN_EXCEPT);  }
+EXISTS				{SQL_NEW_KEYWORD(SQL_TOKEN_EXISTS);  }
+EXP					{SQL_NEW_KEYWORD(SQL_TOKEN_EXP);  }
+EXTRACT				{SQL_NEW_KEYWORD(SQL_TOKEN_EXTRACT);  }
+
+FALSE				{SQL_NEW_KEYWORD(SQL_TOKEN_FALSE);  }
+FETCH				{SQL_NEW_KEYWORD(SQL_TOKEN_FETCH);  }
+FLOAT				{SQL_NEW_KEYWORD(SQL_TOKEN_FLOAT);  }
+FLOOR				{SQL_NEW_KEYWORD(SQL_TOKEN_FLOOR);  }
+FN					{SQL_NEW_KEYWORD(SQL_TOKEN_FN);  }
+FOR					{SQL_NEW_KEYWORD(SQL_TOKEN_FOR);  }
+FOREIGN				{SQL_NEW_KEYWORD(SQL_TOKEN_FOREIGN);  }
+FOUND				{SQL_NEW_KEYWORD(SQL_TOKEN_FOUND);  }
+FROM				{SQL_NEW_KEYWORD(SQL_TOKEN_FROM);  }
+FULL				{SQL_NEW_KEYWORD(SQL_TOKEN_FULL);  }
+FUSION              {SQL_NEW_KEYWORD(SQL_TOKEN_FUSION);  }
+
+GRANT				{SQL_NEW_KEYWORD(SQL_TOKEN_GRANT);  }
+GROUP				{SQL_NEW_KEYWORD(SQL_TOKEN_GROUP);  }
+
+HAVING				{SQL_NEW_KEYWORD(SQL_TOKEN_HAVING);  }
+HOUR				{SQL_NEW_KEYWORD(SQL_TOKEN_HOUR);  }
+
+IN					{SQL_NEW_KEYWORD(SQL_TOKEN_IN);  }
+INNER				{SQL_NEW_KEYWORD(SQL_TOKEN_INNER);  }
+INSERT				{SQL_NEW_KEYWORD(SQL_TOKEN_INSERT);  }
+INSTEAD				{SQL_NEW_KEYWORD(SQL_TOKEN_INSTEAD);  }
+INT(EGER)?			{SQL_NEW_KEYWORD(SQL_TOKEN_INTEGER);  }
+INTERSECT			{SQL_NEW_KEYWORD(SQL_TOKEN_INTERSECT);  }
+INTERVAL			{SQL_NEW_KEYWORD(SQL_TOKEN_INTERVAL);  }
+INTERSECTION		{SQL_NEW_KEYWORD(SQL_TOKEN_INTERSECTION);  }
+INTO				{SQL_NEW_KEYWORD(SQL_TOKEN_INTO);  }
+IS					{SQL_NEW_KEYWORD(SQL_TOKEN_IS);  }
+
+JOIN				{SQL_NEW_KEYWORD(SQL_TOKEN_JOIN);  }
+
+KEY					{SQL_NEW_KEYWORD(SQL_TOKEN_KEY);  }
+
+LARGE				{SQL_NEW_KEYWORD(SQL_TOKEN_LARGE);  }
+LCASE				{SQL_NEW_KEYWORD(SQL_TOKEN_LCASE);  }
+LEADING				{SQL_NEW_KEYWORD(SQL_TOKEN_LEADING);  }
+LEFT				{SQL_NEW_KEYWORD(SQL_TOKEN_LEFT);  }
+LENGTH				{SQL_NEW_KEYWORD(SQL_TOKEN_LENGTH);  }
+LIKE				{SQL_NEW_KEYWORD(SQL_TOKEN_LIKE);  }
+LN					{SQL_NEW_KEYWORD(SQL_TOKEN_LN);  }
+LOCAL				{SQL_NEW_KEYWORD(SQL_TOKEN_LOCAL);  }
+LOCATE				{SQL_NEW_KEYWORD(SQL_TOKEN_LOCATE);  }
+LOG					{SQL_NEW_KEYWORD(SQL_TOKEN_LOG);  }
+LOGF				{SQL_NEW_KEYWORD(SQL_TOKEN_LOGF);  }
+LOG10				{SQL_NEW_KEYWORD(SQL_TOKEN_LOG10);  }
+LOWER				{SQL_NEW_KEYWORD(SQL_TOKEN_LOWER);  }
+LTRIM				{SQL_NEW_KEYWORD(SQL_TOKEN_LTRIM);  }
+
+MAX					{SQL_NEW_KEYWORD(SQL_TOKEN_MAX);  }
+MIN					{SQL_NEW_KEYWORD(SQL_TOKEN_MIN);  }
+MINUTE				{SQL_NEW_KEYWORD(SQL_TOKEN_MINUTE);  }
+MOD					{SQL_NEW_KEYWORD(SQL_TOKEN_MOD);  }
+MONTH				{SQL_NEW_KEYWORD(SQL_TOKEN_MONTH);  }
+MONTHNAME			{SQL_NEW_KEYWORD(SQL_TOKEN_MONTHNAME);  }
+
+NATIONAL			{SQL_NEW_KEYWORD(SQL_TOKEN_NATIONAL);  }
+NATURAL				{SQL_NEW_KEYWORD(SQL_TOKEN_NATURAL);  }
+NCHAR				{SQL_NEW_KEYWORD(SQL_TOKEN_NCHAR);  }
+NCLOB				{SQL_NEW_KEYWORD(SQL_TOKEN_NCLOB);  }
+NEW					{SQL_NEW_KEYWORD(SQL_TOKEN_NEW);  }
+NOT					{SQL_NEW_KEYWORD(SQL_TOKEN_NOT);  }
+NOW					{SQL_NEW_KEYWORD(SQL_TOKEN_NOW);  }
+NULL				{SQL_NEW_KEYWORD(SQL_TOKEN_NULL);  }
+NULLIF				{SQL_NEW_KEYWORD(SQL_TOKEN_NULLIF);  }
+NUMERIC				{SQL_NEW_KEYWORD(SQL_TOKEN_NUMERIC);  }
+
+OBJECT				{SQL_NEW_KEYWORD(SQL_TOKEN_OBJECT);  }
+OCTET_LENGTH		{SQL_NEW_KEYWORD(SQL_TOKEN_OCTET_LENGTH);  }
+OF					{SQL_NEW_KEYWORD(SQL_TOKEN_OF);  }
+OJ					{SQL_NEW_KEYWORD(SQL_TOKEN_OJ);  }
+OLD					{SQL_NEW_KEYWORD(SQL_TOKEN_OLD);  }
+ON					{SQL_NEW_KEYWORD(SQL_TOKEN_ON);  }
+OPTION				{SQL_NEW_KEYWORD(SQL_TOKEN_OPTION);  }
+OR					{SQL_NEW_KEYWORD(SQL_TOKEN_OR);  }
+ORDER				{SQL_NEW_KEYWORD(SQL_TOKEN_ORDER);  }
+OUTER				{SQL_NEW_KEYWORD(SQL_TOKEN_OUTER);  }
+
+PERCENT_RANK		{SQL_NEW_KEYWORD(SQL_TOKEN_PERCENT_RANK);  }
+PERCENTILE_CONT		{SQL_NEW_KEYWORD(SQL_TOKEN_PERCENTILE_CONT);  }
+PERCENTILE_DISC		{SQL_NEW_KEYWORD(SQL_TOKEN_PERCENTILE_DISC);  }
+PI					{SQL_NEW_KEYWORD(SQL_TOKEN_PI);  }
+POSITION	        {SQL_NEW_KEYWORD(SQL_TOKEN_POSITION);  }
+POWER				{SQL_NEW_KEYWORD(SQL_TOKEN_POWER);  }
+PRECISION           {SQL_NEW_KEYWORD(SQL_TOKEN_PRECISION);  }
+PRIMARY				{SQL_NEW_KEYWORD(SQL_TOKEN_PRIMARY);  }
+PRIVILEGES			{SQL_NEW_KEYWORD(SQL_TOKEN_PRIVILEGES);  }
+PROCEDURE           {SQL_NEW_KEYWORD(SQL_TOKEN_PROCEDURE);  }
+PUBLIC				{SQL_NEW_KEYWORD(SQL_TOKEN_PUBLIC);  }
+
+QUARTER				{SQL_NEW_KEYWORD(SQL_TOKEN_QUARTER);  }
+
+RADIANS				{SQL_NEW_KEYWORD(SQL_TOKEN_RADIANS);  }
+RAND				{SQL_NEW_KEYWORD(SQL_TOKEN_RAND);  }
+RANK				{SQL_NEW_KEYWORD(SQL_TOKEN_RANK);  }
+REAL				{SQL_NEW_KEYWORD(SQL_TOKEN_REAL);  }
+REFERENCES			{SQL_NEW_KEYWORD(SQL_TOKEN_REFERENCES);  }
+REFERENCING			{SQL_NEW_KEYWORD(SQL_TOKEN_REFERENCING);  }
+REPEAT				{SQL_NEW_KEYWORD(SQL_TOKEN_REPEAT);  }
+REPLACE				{SQL_NEW_KEYWORD(SQL_TOKEN_REPLACE);  }
+ROLLBACK            {SQL_NEW_KEYWORD(SQL_TOKEN_ROLLBACK);  }
+ROUND			    {SQL_NEW_KEYWORD(SQL_TOKEN_ROUND);  }
+ROUNDMAGIC			{SQL_NEW_KEYWORD(SQL_TOKEN_ROUNDMAGIC);  }
+ROW					{SQL_NEW_KEYWORD(SQL_TOKEN_ROW);  }
+RIGHT				{SQL_NEW_KEYWORD(SQL_TOKEN_RIGHT);  }
+RTRIM				{SQL_NEW_KEYWORD(SQL_TOKEN_RTRIM);  }
+
+SCHEMA				{SQL_NEW_KEYWORD(SQL_TOKEN_SCHEMA);  }
+SECOND				{SQL_NEW_KEYWORD(SQL_TOKEN_SECOND);  }
+SELECT				{SQL_NEW_KEYWORD(SQL_TOKEN_SELECT);  }
+SET					{SQL_NEW_KEYWORD(SQL_TOKEN_SET);  }
+SIZE				{SQL_NEW_KEYWORD(SQL_TOKEN_SIZE);  }
+SIGN				{SQL_NEW_KEYWORD(SQL_TOKEN_SIGN);  }
+SIN					{SQL_NEW_KEYWORD(SQL_TOKEN_SIN);  }
+SMALLINT            {SQL_NEW_KEYWORD(SQL_TOKEN_SMALLINT);  }
+SOME				{SQL_NEW_KEYWORD(SQL_TOKEN_SOME);  }
+SOUNDEX				{SQL_NEW_KEYWORD(SQL_TOKEN_SOUNDEX);  }
+SPACE				{SQL_NEW_KEYWORD(SQL_TOKEN_SPACE);  }
+SQRT				{SQL_NEW_KEYWORD(SQL_TOKEN_SQRT);  }
+STDDEV_POP          {SQL_NEW_KEYWORD(SQL_TOKEN_STDDEV_POP);  }
+STDDEV_SAMP         {SQL_NEW_KEYWORD(SQL_TOKEN_STDDEV_SAMP); } 
+STATEMENT			{SQL_NEW_KEYWORD(SQL_TOKEN_STATEMENT);  }
+SUBSTRING			{SQL_NEW_KEYWORD(SQL_TOKEN_SUBSTRING);  }
+SUM					{SQL_NEW_KEYWORD(SQL_TOKEN_SUM);  }
+SESSION_USER		{SQL_NEW_KEYWORD(SQL_TOKEN_SESSION_USER);  }
+SYSTEM_USER			{SQL_NEW_KEYWORD(SQL_TOKEN_SYSTEM_USER);  }
+
+TABLE				{SQL_NEW_KEYWORD(SQL_TOKEN_TABLE);  }
+TAN					{SQL_NEW_KEYWORD(SQL_TOKEN_TAN);  }
+THEN				{SQL_NEW_KEYWORD(SQL_TOKEN_THEN);  }
+TIME				{SQL_NEW_KEYWORD(SQL_TOKEN_TIME);  }
+TIMESTAMP			{SQL_NEW_KEYWORD(SQL_TOKEN_TIMESTAMP);  }
+TIMESTAMPADD		{SQL_NEW_KEYWORD(SQL_TOKEN_TIMESTAMPADD);  }
+TIMESTAMPDIFF		{SQL_NEW_KEYWORD(SQL_TOKEN_TIMESTAMPDIFF);  }
+TIMEVALUE			{SQL_NEW_KEYWORD(SQL_TOKEN_TIMEVALUE);  }
+TIMEZONE_HOUR		{SQL_NEW_KEYWORD(SQL_TOKEN_TIMEZONE_HOUR);  }
+TIMEZONE_MINUTE		{SQL_NEW_KEYWORD(SQL_TOKEN_TIMEZONE_MINUTE);  }
+TO					{SQL_NEW_KEYWORD(SQL_TOKEN_TO);  }
+TRAILING			{SQL_NEW_KEYWORD(SQL_TOKEN_TRAILING);  }
+TRANSLATE			{SQL_NEW_KEYWORD(SQL_TOKEN_TRANSLATE);  }
+TRIGGER				{SQL_NEW_KEYWORD(SQL_TOKEN_TRIGGER);  }
+TRIM				{SQL_NEW_KEYWORD(SQL_TOKEN_TRIM);  }
+TRUE				{SQL_NEW_KEYWORD(SQL_TOKEN_TRUE);  }
+TRUNCATE			{SQL_NEW_KEYWORD(SQL_TOKEN_TRUNCATE);  }
+TS					{SQL_NEW_KEYWORD(SQL_TOKEN_TS);  }
+T					{SQL_NEW_KEYWORD(SQL_TOKEN_T);  }
+
+UCASE				{SQL_NEW_KEYWORD(SQL_TOKEN_UCASE);  }
+UNION				{SQL_NEW_KEYWORD(SQL_TOKEN_UNION);  }
+UNIQUE				{SQL_NEW_KEYWORD(SQL_TOKEN_UNIQUE);  }
+UNKNOWN				{SQL_NEW_KEYWORD(SQL_TOKEN_UNKNOWN);  }
+UPDATE				{SQL_NEW_KEYWORD(SQL_TOKEN_UPDATE);  }
+UPPER				{SQL_NEW_KEYWORD(SQL_TOKEN_UPPER);  }
+USAGE				{SQL_NEW_KEYWORD(SQL_TOKEN_USAGE);  }
+USER				{SQL_NEW_KEYWORD(SQL_TOKEN_USER);  }
+USING				{SQL_NEW_KEYWORD(SQL_TOKEN_USING);  }
+
+VARBINARY			{SQL_NEW_KEYWORD(SQL_TOKEN_VARBINARY);  }
+VARCHAR             {SQL_NEW_KEYWORD(SQL_TOKEN_VARCHAR);  }
+VARYING             {SQL_NEW_KEYWORD(SQL_TOKEN_VARYING);  }
+VAR_POP             {SQL_NEW_KEYWORD(SQL_TOKEN_VAR_POP);  }
+VAR_SAMP            {SQL_NEW_KEYWORD(SQL_TOKEN_VAR_SAMP);  }
+VALUE				{SQL_NEW_KEYWORD(SQL_TOKEN_VALUE);  }
+VALUES				{SQL_NEW_KEYWORD(SQL_TOKEN_VALUES);  }
+VIEW				{SQL_NEW_KEYWORD(SQL_TOKEN_VIEW);  }
+
+WEEK				{SQL_NEW_KEYWORD(SQL_TOKEN_WEEK);  }
+WHEN				{SQL_NEW_KEYWORD(SQL_TOKEN_WHEN);  }
+WHERE				{SQL_NEW_KEYWORD(SQL_TOKEN_WHERE);  }
+WITH				{SQL_NEW_KEYWORD(SQL_TOKEN_WITH);  }
+WITHIN				{SQL_NEW_KEYWORD(SQL_TOKEN_WITHIN);  }
+WITHOUT				{SQL_NEW_KEYWORD(SQL_TOKEN_WITHOUT);  }
+WORK				{SQL_NEW_KEYWORD(SQL_TOKEN_WORK);  }
+
+YEAR				{SQL_NEW_KEYWORD(SQL_TOKEN_YEAR);  }
+
+ZONE				{SQL_NEW_KEYWORD(SQL_TOKEN_ZONE);  }
 
 "<"					{ SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_LESS);return SQL_LESS;}
 ">"					{ SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_GREAT);return SQL_GREAT;}
@@ -365,31 +410,31 @@ VAR_SAMP                                        {SQL_NEW_KEYWORD(SQL_TOKEN_VAR_S
 
 <SQL>([0-9]+) | 
 <SQL>([0-9]+"."[0-9]*) | 
-<SQL>("."[0-9]*)					{SQL_NEW_INTNUM; return SQL_TOKEN_INTNUM;}
+<SQL>("."[0-9]*)					{SQL_NEW_INTNUM; }
 
 <SQL>[0-9]+[eE][+-]?[0-9]+   |
 <SQL>[0-9]+"."[0-9]*[eE][+-]?[0-9]+ |
-<SQL>"."[0-9]*[eE][+-]?[0-9]+		{SQL_NEW_APPROXNUM; return SQL_TOKEN_APPROXNUM; }
+<SQL>"."[0-9]*[eE][+-]?[0-9]+		{SQL_NEW_APPROXNUM;  }
 
 <PREDICATE_GER,PREDICATE_ENG,DATE>[A-Za-z\200-\277\300-\337\340-\357\360-\367\370-\373\374-\375][A-Za-z0-9_%.,*?\200-\277\300-\337\340-\357\360-\367\370-\373\374-\375]* {return gatherNamePre(SQLyytext);}
 
-<PREDICATE_GER,PREDICATE_ENG>([0-9]+)		{SQL_NEW_INTNUM; return SQL_TOKEN_INTNUM;}
-<PREDICATE_ENG>([0-9]{1,3}(","[0-9]{3})+) 	{SQL_NEW_INTNUM; return SQL_TOKEN_INTNUM;}
-<PREDICATE_GER>([0-9]{1,3}("."[0-9]{3})+)	{SQL_NEW_INTNUM; return SQL_TOKEN_INTNUM;}
+<PREDICATE_GER,PREDICATE_ENG>([0-9]+)		{SQL_NEW_INTNUM; }
+<PREDICATE_ENG>([0-9]{1,3}(","[0-9]{3})+) 	{SQL_NEW_INTNUM; }
+<PREDICATE_GER>([0-9]{1,3}("."[0-9]{3})+)	{SQL_NEW_INTNUM; }
 
 <PREDICATE_ENG>([0-9]+"."[0-9]+) |
 <PREDICATE_ENG>([0-9]{1,3}(","[0-9]{3})+"."[0-9]+) | 
-<PREDICATE_ENG>("."[0-9]+)					{SQL_NEW_APPROXNUM; return SQL_TOKEN_APPROXNUM; }
+<PREDICATE_ENG>("."[0-9]+)					{SQL_NEW_APPROXNUM;  }
 <PREDICATE_ENG>[0-9]+[eE][+-]?[0-9]+   |
 <PREDICATE_ENG>[0-9]+"."[0-9]*[eE][+-]?[0-9]+ |
-<PREDICATE_ENG>"."[0-9]*[eE][+-]?[0-9]+		{SQL_NEW_APPROXNUM; return SQL_TOKEN_APPROXNUM; }
+<PREDICATE_ENG>"."[0-9]*[eE][+-]?[0-9]+		{SQL_NEW_APPROXNUM;  }
 
 <PREDICATE_GER>([0-9]+","[0-9]+) |
 <PREDICATE_GER>([0-9]{1,3}("."[0-9]{3})+","[0-9]+) | 
-<PREDICATE_GER>(","[0-9]+)					{SQL_NEW_APPROXNUM; return SQL_TOKEN_APPROXNUM; }
+<PREDICATE_GER>(","[0-9]+)					{SQL_NEW_APPROXNUM;  }
 <PREDICATE_GER>[0-9]+[eE][+-]?[0-9]+   |
 <PREDICATE_GER>[0-9]+","[0-9]*[eE][+-]?[0-9]+ |
-<PREDICATE_GER>","[0-9]*[eE][+-]?[0-9]+		{SQL_NEW_APPROXNUM; return SQL_TOKEN_APPROXNUM; }
+<PREDICATE_GER>","[0-9]*[eE][+-]?[0-9]+		{SQL_NEW_APPROXNUM;  }
 
 <PREDICATE_GER,PREDICATE_ENG>[0-9.,][A-Za-z0-9_.,%]* {return gatherNamePre(SQLyytext);}
 
@@ -403,7 +448,7 @@ VAR_SAMP                                        {SQL_NEW_KEYWORD(SQL_TOKEN_VAR_S
 <PREDICATE_GER,PREDICATE_ENG,DATE>#	{ return gatherString('#' ,2); }	
 
 <DATE>[0-9]{1,4}[^ ]*[0-9] |
-<DATE>[0-9]{1,4}[^ ]*[0-9][ ][0-9]{1,4}[^ ]*[0-9]		{ SQL_NEW_DATE; return SQL_TOKEN_ACCESS_DATE;}
+<DATE>[0-9]{1,4}[^ ]*[0-9][ ][0-9]{1,4}[^ ]*[0-9]		{ SQL_NEW_DATE; }
 
 <STRING>["-""+""*""/"":""("")"",""."";""?""{""}"]		{ return SQLyytext[0]; } /*  */
 <STRING>"["					{ return gatherString(']' ,0); }
@@ -464,7 +509,7 @@ sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp)
 				{
 					case 0:
 						SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQL_NODE_NAME);
-						return SQL_TOKEN_NAME;											
+						return SQL_TOKEN_NAME;
 					case 1:
 						SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQL_NODE_STRING);
 						return SQL_TOKEN_STRING;
@@ -487,7 +532,7 @@ sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp)
 		}
 	}
 	YY_FATAL_ERROR("Unterminated name string"); 
-	return SQL_TOKEN_INVALIDSYMBOL;		
+	return SQL_TOKEN_INVALIDSYMBOL;
 }
 
 sal_Int32 mapEnumToToken(IParseContext::InternationalKeyCode _eKeyCode )
@@ -562,10 +607,10 @@ sal_Int32 gatherName(const sal_Char* text)
         case IParseContext::KEY_INTERSECTION:    
 			nToken = mapEnumToToken(eKeyCode);
 			SQL_NEW_KEYWORD(nToken); 
-			return nToken;
+			break;
 		default:
 			SQL_NEW_NODE(::rtl::OUString(text,strlen(text),RTL_TEXTENCODING_UTF8), SQL_NODE_NAME); 
-			return SQL_TOKEN_NAME; 
+			return SQL_TOKEN_NAME;
 	}
 }
 /**
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index feecc26a4052..e1d805e9a1e5 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -50,6 +50,10 @@
 #include "diagnose_ex.h"
 #include <rtl/logfile.hxx>
 
+#define SQL_ISRULEOR2(pParseNode, e1,e2)    ((pParseNode)->isRule() && (\
+                                            (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e1) || \
+                                            (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e2)))
+
 using namespace ::comphelper;
 using namespace ::connectivity;
 using namespace ::connectivity::sdbcx;
@@ -67,6 +71,7 @@ namespace connectivity
 {
     struct OSQLParseTreeIteratorImpl
     {
+        ::std::vector< TNodePair >      m_aJoinConditions;
         Reference< XConnection >        m_xConnection;
         Reference< XDatabaseMetaData >  m_xDatabaseMetaData;
         Reference< XNameAccess >        m_xTableContainer;
@@ -476,7 +481,42 @@ void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQ
     if ( aTable.is() )
         _rTables[ aTableRange ] = aTable;
 }
-
+//-----------------------------------------------------------------------------
+void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode* i_pJoinCondition)
+{
+    if (i_pJoinCondition->count() == 3 &&   // Ausdruck is geklammert
+        SQL_ISPUNCTUATION(i_pJoinCondition->getChild(0),"(") &&
+        SQL_ISPUNCTUATION(i_pJoinCondition->getChild(2),")"))
+    {
+        impl_fillJoinConditions(i_pJoinCondition->getChild(1));
+    }
+    else if (SQL_ISRULEOR2(i_pJoinCondition,search_condition,boolean_term)  &&          // AND/OR-Verknuepfung:
+             i_pJoinCondition->count() == 3)
+    {
+        // nur AND Verkn�pfung zulassen
+        if ( SQL_ISTOKEN(i_pJoinCondition->getChild(1),AND) )
+        {
+            impl_fillJoinConditions(i_pJoinCondition->getChild(0));
+            impl_fillJoinConditions(i_pJoinCondition->getChild(1));
+        }
+    }
+    else if (SQL_ISRULE(i_pJoinCondition,comparison_predicate))
+    {
+        // only the comparison of columns is allowed
+        OSL_ENSURE(i_pJoinCondition->count() == 3,"OQueryDesignView::InsertJoinConnection: Fehler im Parse Tree");
+        if (SQL_ISRULE(i_pJoinCondition->getChild(0),column_ref) &&
+              SQL_ISRULE(i_pJoinCondition->getChild(2),column_ref) &&
+               i_pJoinCondition->getChild(1)->getNodeType() == SQL_NODE_EQUAL)
+        {
+            m_pImpl->m_aJoinConditions.push_back( TNodePair(i_pJoinCondition->getChild(0),i_pJoinCondition->getChild(2)) );
+        }
+    }
+}
+//-----------------------------------------------------------------------------
+::std::vector< TNodePair >& OSQLParseTreeIterator::getJoinConditions() const
+{
+    return m_pImpl->m_aJoinConditions;
+}
 //-----------------------------------------------------------------------------
 void OSQLParseTreeIterator::getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, ::rtl::OUString& aTableRange )
 {
@@ -491,8 +531,30 @@ void OSQLParseTreeIterator::getQualified_join( OSQLTables& _rTables, const OSQLP
         traverseOneTableName( _rTables, pNode, aTableRange );
 
     sal_uInt32 nPos = 4;
-    if(SQL_ISRULE(pTableRef,cross_union) || pTableRef->getChild(1)->getTokenID() != SQL_TOKEN_NATURAL)
+    if( SQL_ISRULE(pTableRef,cross_union) || pTableRef->getChild(1)->getTokenID() != SQL_TOKEN_NATURAL)
+    {
         nPos = 3;
+        // join_condition,named_columns_join
+        if ( SQL_ISRULE( pTableRef, qualified_join ) )
+        {
+            const OSQLParseNode* pJoin_spec = pTableRef->getChild(4);
+            if ( SQL_ISRULE( pJoin_spec, join_condition ) )
+            {
+                impl_fillJoinConditions(pJoin_spec->getChild(1));
+            }
+            else
+            {
+                const OSQLParseNode* pColumnCommalist = pJoin_spec->getChild(2);
+                // Alle Columns in der column_commalist ...
+                for (sal_uInt32 i = 0; i < pColumnCommalist->count(); i++)
+                {
+                    const OSQLParseNode * pCol = pColumnCommalist->getChild(i);
+                    // add twice because the column must exists in both tables
+                    m_pImpl->m_aJoinConditions.push_back( TNodePair(pCol,pCol) );
+                }
+            }
+        }
+    }
 
     pNode = getTableNode(_rTables,pTableRef->getChild(nPos),aTableRange);
     if ( isTableNode( pNode ) )
@@ -826,17 +888,17 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo
             aColumnName = pColumnRef->getChild(0)->getTokenValue();
 
             OSQLParseNode *pDatatype = pColumnRef->getChild(1);
-            if (pDatatype && SQL_ISRULE(pDatatype,data_type))
+            if (pDatatype && SQL_ISRULE(pDatatype,character_string_type))
             {
-                //data type
-                //  0 | 1| 2  |3
-                //char  (  20  )
-                aTypeName = pDatatype->getChild(0)->getTokenValue();
-                if (pDatatype->count() == 4
-                    && SQL_ISPUNCTUATION(pDatatype->getChild(1), "(")
-                    && SQL_ISPUNCTUATION(pDatatype->getChild(3) , ")") )
+                const OSQLParseNode *pType = pDatatype->getChild(0);
+                aTypeName = pType->getTokenValue();
+                if (pDatatype->count() == 2 && (pType->getTokenID() == SQL_TOKEN_CHAR || pType->getTokenID() == SQL_TOKEN_CHARACTER ))
+                    nType = DataType::CHAR;
+
+                const OSQLParseNode *pParams = pDatatype->getChild(pDatatype->count()-1);
+                if ( pParams->count() )
                 {
-                    nLen = pDatatype->getChild(2)->getTokenValue().toInt32();
+                    nLen = pParams->getChild(1)->getTokenValue().toInt32();
                 }
             }
             else if(pDatatype && pDatatype->getNodeType() == SQL_NODE_KEYWORD)
@@ -846,8 +908,8 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo
 
             if (aTypeName.getLength())
             {
-                //TO DO:Create a new class for create statement to handle field length
-                OParseColumn* pColumn = new OParseColumn(aColumnName,aTypeName,::rtl::OUString(),
+                //TODO:Create a new class for create statement to handle field length
+                OParseColumn* pColumn = new OParseColumn(aColumnName,aTypeName,::rtl::OUString(),::rtl::OUString(),
                     ColumnValue::NULLABLE_UNKNOWN,0,0,nType,sal_False,sal_False,isCaseSensitive());
                 pColumn->setFunction(sal_False);
                 pColumn->setRealName(aColumnName);
@@ -1115,17 +1177,17 @@ void OSQLParseTreeIterator::traverseParameters(const OSQLParseNode* _pNode)
             else
                 pOther->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
         } // if ( SQL_ISRULE(pParent,comparison_predicate) ) // x = X
-        else if ( SQL_ISRULE(pParent,like_predicate) )
+        else if ( SQL_ISRULE(pParent,other_like_predicate_part_2) )
         {
-            const OSQLParseNode* pOther = pParent->getChild(0);
+            const OSQLParseNode* pOther = pParent->getParent()->getChild(0);
             if ( SQL_ISRULE( pOther, column_ref ) )
                 getColumnRange( pOther, sColumnName, sTableRange, aColumnAlias);
             else
                 pOther->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
         }
-        else if ( SQL_ISRULE(pParent,between_predicate) )
+        else if ( SQL_ISRULE(pParent,between_predicate_part_2) )
         {
-            const OSQLParseNode* pOther = pParent->getChild(0);
+            const OSQLParseNode* pOther = pParent->getParent()->getChild(0);
             if ( SQL_ISRULE( pOther, column_ref ) )
                 getColumnRange( pOther, sColumnName, sTableRange, aColumnAlias);
             else
@@ -1304,17 +1366,19 @@ void OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition
         ::rtl::OUString aValue;
         pSearchCondition->getChild(2)->parseNodeToStr( aValue, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
         traverseOnePredicate(pSearchCondition->getChild(0),aValue,pSearchCondition->getChild(2));
+        impl_fillJoinConditions(pSearchCondition);
 //      if (! aIteratorStatus.IsSuccessful())
 //          return;
     }
     else if (SQL_ISRULE(pSearchCondition,like_predicate) /*&& SQL_ISRULE(pSearchCondition->getChild(0),column_ref)*/)
     {
-        OSL_ENSURE(pSearchCondition->count() >= 4,"OSQLParseTreeIterator: error in parse tree!");
+        OSL_ENSURE(pSearchCondition->count() == 2,"OSQLParseTreeIterator: error in parse tree!");
+        const OSQLParseNode* pPart2 = pSearchCondition->getChild(1);
 
-        sal_Int32 nCurentPos = pSearchCondition->count()-2;
+        sal_Int32 nCurentPos = pPart2->count()-2;
 
-        OSQLParseNode * pNum_value_exp  = pSearchCondition->getChild(nCurentPos);
-        OSQLParseNode * pOptEscape      = pSearchCondition->getChild(nCurentPos+1);
+        OSQLParseNode * pNum_value_exp  = pPart2->getChild(nCurentPos);
+        OSQLParseNode * pOptEscape      = pPart2->getChild(nCurentPos+1);
 
         OSL_ENSURE(pNum_value_exp != NULL,"OSQLParseTreeIterator: error in parse tree!");
         OSL_ENSURE(pOptEscape != NULL,"OSQLParseTreeIterator: error in parse tree!");
@@ -1344,12 +1408,13 @@ void OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition
     }
     else if (SQL_ISRULE(pSearchCondition,in_predicate))
     {
-        OSL_ENSURE(pSearchCondition->count() == 4,"OSQLParseTreeIterator: error in parse tree!");
+        OSL_ENSURE(pSearchCondition->count() == 2,"OSQLParseTreeIterator: error in parse tree!");
+        const OSQLParseNode* pPart2 = pSearchCondition->getChild(1);
 
         traverseORCriteria(pSearchCondition->getChild(0));
         //  if (! aIteratorStatus.IsSuccessful()) return;
 
-        OSQLParseNode* pChild = pSearchCondition->getChild(3);
+        OSQLParseNode* pChild = pPart2->getChild(2);
         if ( SQL_ISRULE(pChild->getChild(0),subquery) )
         {
             traverseTableNames( *m_pImpl->m_pSubTables );
@@ -1367,8 +1432,10 @@ void OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition
     }
     else if (SQL_ISRULE(pSearchCondition,test_for_null) /*&& SQL_ISRULE(pSearchCondition->getChild(0),column_ref)*/)
     {
-        OSL_ENSURE(pSearchCondition->count() >= 3,"OSQLParseTreeIterator: error in parse tree!");
-        OSL_ENSURE(SQL_ISTOKEN(pSearchCondition->getChild(1),IS),"OSQLParseTreeIterator: error in parse tree!");
+        OSL_ENSURE(pSearchCondition->count() == 2,"OSQLParseTreeIterator: error in parse tree!");
+        const OSQLParseNode* pPart2 = pSearchCondition->getChild(1);
+        (void)pPart2;
+        OSL_ENSURE(SQL_ISTOKEN(pPart2->getChild(0),IS),"OSQLParseTreeIterator: error in parse tree!");
 
         ::rtl::OUString aString;
         traverseOnePredicate(pSearchCondition->getChild(0),aString,NULL);
@@ -1427,11 +1494,19 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
     {// found a function as column_ref
         ::rtl::OUString sFunctionName;
         _pColumnRef->getChild(0)->parseNodeToStr( sFunctionName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
-        sal_Int32 nType = ::connectivity::OSQLParser::getFunctionReturnType( sFunctionName, &m_rParser.getContext() );
+        const sal_uInt32 nCount = _pColumnRef->count();
+        sal_uInt32 i = 0;
+        for(; i < nCount;++i)
+        {
+            if ( _pColumnRef->getChild(i) == _pParseNode )
+                break;
+        }
+        sal_Int32 nType = ::connectivity::OSQLParser::getFunctionParameterType( _pColumnRef->getParent()->getChild(0)->getTokenID(), i+1);
 
         OParseColumn* pColumn = new OParseColumn(   sParameterName,
                                                     ::rtl::OUString(),
                                                     ::rtl::OUString(),
+                                                    ::rtl::OUString(),
                                                     ColumnValue::NULLABLE_UNKNOWN,
                                                     0,
                                                     0,
@@ -1495,6 +1570,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
             OParseColumn* pColumn = new OParseColumn(aNewColName,
                                                     ::rtl::OUString(),
                                                     ::rtl::OUString(),
+                                                    ::rtl::OUString(),
                                                     ColumnValue::NULLABLE_UNKNOWN,
                                                     0,
                                                     0,
@@ -1637,6 +1713,7 @@ void OSQLParseTreeIterator::appendColumns(::vos::ORef<OSQLColumns>& _rColumns,co
             OParseColumn* pColumn = new OParseColumn(aName
                                                 ,   getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
                                                 ,   getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)))
+                                                ,   getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)))
                                                 ,   getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))
                                                 ,   getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))
                                                 ,   getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
@@ -1714,6 +1791,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu
                         // TODO: does this match with _nType?
                         // Or should be fill this from the getTypeInfo of the connection?
                     ::rtl::OUString(),
+                    ::rtl::OUString(),
                     ColumnValue::NULLABLE_UNKNOWN,
                     0,
                     0,
@@ -1733,7 +1811,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu
         {
             ::rtl::OUString aNewColName(getUniqueColumnName(rColumnAlias));
 
-            OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(),
+            OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(),::rtl::OUString(),
                 ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,sal_False,sal_False,isCaseSensitive());
             pColumn->setFunction(sal_True);
             pColumn->setAggregateFunction(bAggFkt);
@@ -1754,7 +1832,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu
             {
                 ::rtl::OUString aNewColName(getUniqueColumnName(rColumnAlias));
 
-                OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(),
+                OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(),::rtl::OUString(),
                     ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,sal_False,sal_False,isCaseSensitive());
                 pColumn->setFunction(sal_True);
                 pColumn->setAggregateFunction(bAggFkt);
@@ -1791,7 +1869,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu
         {
             ::rtl::OUString aNewColName(getUniqueColumnName(rColumnAlias));
 
-            OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(),
+            OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(),::rtl::OUString(),
                 ColumnValue::NULLABLE_UNKNOWN,0,0,DataType::VARCHAR,sal_False,sal_False,isCaseSensitive());
             pColumn->setFunction(sal_True);
             pColumn->setAggregateFunction(bAggFkt);
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 20b35b21a493..b8bcd5334787 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -677,7 +677,7 @@ void OSQLParseNode::impl_parseTableRangeNodeToString_throw(::rtl::OUStringBuffer
 void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::impl_parseLikeNodeToString_throw" );
-    OSL_ENSURE(count() >= 4,"count != 5: Prepare for GPF");
+    OSL_ENSURE(count() == 2,"count != 2: Prepare for GPF");
 
     const OSQLParseNode* pEscNode = NULL;
     const OSQLParseNode* pParaNode = NULL;
@@ -714,13 +714,11 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rSt
     if (bAddName)
         m_aChildren[0]->impl_parseNodeToString_throw( rString, aNewParam );
 
-    m_aChildren[1]->impl_parseNodeToString_throw( rString, aNewParam );
-    if(count() == 5)
-        m_aChildren[2]->impl_parseNodeToString_throw( rString, aNewParam );
-
-    sal_Int32 nCurentPos = m_aChildren.size()-2;
-    pParaNode = m_aChildren[nCurentPos];
-    pEscNode = m_aChildren[nCurentPos+1];
+    const OSQLParseNode* pPart2 = m_aChildren[1];
+    pPart2->getChild(0)->impl_parseNodeToString_throw( rString, aNewParam );
+    pPart2->getChild(1)->impl_parseNodeToString_throw( rString, aNewParam );
+    pParaNode = pPart2->getChild(2);
+    pEscNode  = pPart2->getChild(3);
 
     if (pParaNode->isToken())
     {
@@ -1422,7 +1420,12 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star:
             { OSQLParseNode::datetime_primary, "datetime_primary" },
             { OSQLParseNode::concatenation, "concatenation" },
             { OSQLParseNode::char_factor, "char_factor" },
-            { OSQLParseNode::bit_value_fct, "bit_value_fct" }
+            { OSQLParseNode::bit_value_fct, "bit_value_fct" },
+            { OSQLParseNode::comparison_predicate_part_2, "comparison_predicate_part_2" },
+            { OSQLParseNode::parenthesized_boolean_value_expression, "parenthesized_boolean_value_expression" },
+            { OSQLParseNode::character_string_type, "character_string_type" },
+            { OSQLParseNode::other_like_predicate_part_2, "other_like_predicate_part_2" },
+            { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" }
         };
         size_t nRuleMapCount = sizeof( aRuleDescriptions ) / sizeof( aRuleDescriptions[0] );
         OSL_ENSURE( nRuleMapCount == size_t( OSQLParseNode::rule_count ), "OSQLParser::OSQLParser: added a new rule? Adjust this map!" );
@@ -1984,39 +1987,34 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
     else if(bNegate && (SQL_ISRULE(pSearchCondition,test_for_null) || SQL_ISRULE(pSearchCondition,in_predicate) ||
                         SQL_ISRULE(pSearchCondition,between_predicate) || SQL_ISRULE(pSearchCondition,boolean_test) ))
     {
+        OSQLParseNode* pPart2 = pSearchCondition;
+        if ( !SQL_ISRULE(pSearchCondition,boolean_test) )
+            pPart2 = pSearchCondition->getChild(1);
         sal_uInt32 nNotPos = 0;
-        // row_value_constructor not SQL_TOKEN_IN in_predicate_value
-        // row_value_constructor not SQL_TOKEN_BETWEEN row_value_constructor SQL_TOKEN_AND row_value_constructor
-        if  (   SQL_ISRULE( pSearchCondition, in_predicate )
-            ||  SQL_ISRULE( pSearchCondition, between_predicate )
-            )
+        if  ( SQL_ISRULE( pSearchCondition, test_for_null ) )
             nNotPos = 1;
-        // row_value_constructor SQL_TOKEN_IS not SQL_TOKEN_NULL
-        // boolean_primary SQL_TOKEN_IS not truth_value
-        else if (   SQL_ISRULE( pSearchCondition, test_for_null )
-                ||  SQL_ISRULE( pSearchCondition, boolean_test )
-                )
+        else if ( SQL_ISRULE( pSearchCondition, boolean_test ) )
             nNotPos = 2;
 
-        OSQLParseNode* pNot = pSearchCondition->getChild(nNotPos);
+        OSQLParseNode* pNot = pPart2->getChild(nNotPos);
         OSQLParseNode* pNotNot = NULL;
         if(pNot->isRule())
             pNotNot = new OSQLParseNode(::rtl::OUString::createFromAscii("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT);
         else
             pNotNot = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not));
-        pSearchCondition->replace(pNot, pNotNot);
+        pPart2->replace(pNot, pNotNot);
         delete pNot;
     }
     else if(bNegate && (SQL_ISRULE(pSearchCondition,like_predicate)))
     {
-        OSQLParseNode* pCheckForNOT = pSearchCondition->getChild( 1 );
-        if ( SQL_ISTOKEN(pCheckForNOT,NOT) )
-            delete pSearchCondition->removeAt( 1 );
+        OSQLParseNode* pNot = pSearchCondition->getChild( 1 )->getChild( 0 );
+        OSQLParseNode* pNotNot = NULL;
+        if(pNot->isRule())
+            pNotNot = new OSQLParseNode(::rtl::OUString::createFromAscii("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT);
         else
-        {
-            OSQLParseNode* pNot = new OSQLParseNode( ::rtl::OUString::createFromAscii( "NOT" ), SQL_NODE_KEYWORD, SQL_TOKEN_NOT );
-            pSearchCondition->insert( 1, pNot );
-        }
+            pNotNot = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not));
+        pSearchCondition->getChild( 1 )->replace(pNot, pNotNot);
+        delete pNot;
     }
 }
 //-----------------------------------------------------------------------------
@@ -2554,7 +2552,6 @@ sal_Int32 OSQLParser::getFunctionReturnType(const ::rtl::OUString& _sFunctionNam
     else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_BIT_LENGTH,pContext)))           nType = DataType::INTEGER;
     else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_CHAR,pContext)))                 nType = DataType::VARCHAR;
     else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_CHAR_LENGTH,pContext)))          nType = DataType::INTEGER;
-    else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_CHARACTER_LENGTH,pContext)))     nType = DataType::INTEGER;
     else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_CONCAT,pContext)))               nType = DataType::VARCHAR;
     else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_DIFFERENCE,pContext)))           nType = DataType::VARCHAR;
     else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_INSERT,pContext)))               nType = DataType::VARCHAR;
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index e4535c713ec7..65bc1b368b1e 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -89,6 +89,7 @@ OColumn::OColumn(sal_Bool _bCase)
 OColumn::OColumn(   const ::rtl::OUString& _Name,
                     const ::rtl::OUString& _TypeName,
                     const ::rtl::OUString& _DefaultValue,
+                    const ::rtl::OUString& _Description,
                     sal_Int32       _IsNullable,
                     sal_Int32       _Precision,
                     sal_Int32       _Scale,
@@ -100,6 +101,7 @@ OColumn::OColumn(   const ::rtl::OUString& _Name,
     :OColumnDescriptor_BASE(m_aMutex)
     ,ODescriptor(OColumnDescriptor_BASE::rBHelper,_bCase)
     ,m_TypeName(_TypeName)
+    ,m_Description(_Description)
     ,m_DefaultValue(_DefaultValue)
     ,m_IsNullable(_IsNullable)
     ,m_Precision(_Precision)
@@ -195,6 +197,7 @@ Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor(  ) throw(Runti
     OColumn* pNewColumn = new OColumn(  m_Name,
                                         m_TypeName,
                                         m_DefaultValue,
+                                        m_Description,
                                         m_IsNullable,
                                         m_Precision,
                                         m_Scale,
@@ -203,7 +206,6 @@ Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor(  ) throw(Runti
                                         m_IsRowVersion,
                                         m_IsCurrency,
                                         isCaseSensitive());
-    pNewColumn->m_Description = m_Description;
     pNewColumn->setNew(sal_True);
     return pNewColumn;
 }
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 31aaaa3d17ab..ca1649b06384 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -85,6 +85,7 @@ OIndexColumn::OIndexColumn( sal_Bool _IsAscending,
                         ) : OColumn(_Name,
                             _TypeName,
                             _DefaultValue,
+                            ::rtl::OUString(),
                             _IsNullable,
                             _Precision,
                             _Scale,
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index bbcec5cc0501..97e83f5c633a 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -85,6 +85,7 @@ OKeyColumn::OKeyColumn( const ::rtl::OUString&  _ReferencedColumn,
                         ) : OColumn(_Name,
                             _TypeName,
                             _DefaultValue,
+                            ::rtl::OUString(),
                             _IsNullable,
                             _Precision,
                             _Scale,
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 9253b4e82bc7..6f611926a0df 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,4 +1,4 @@
-dt      desktop :    l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg configmgr NULL
+dt      desktop :    l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
 dt	desktop\inc								nmake	-	all	dt_inc NULL
 dt	desktop\prj								get		-	all	dt_prj NULL
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index 556df1a623c4..15faef0dc46e 100644
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -34,6 +34,7 @@ ENABLE_EXCEPTIONS := TRUE
 .INCLUDE: settings.mk
 .INCLUDE: $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
 
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 73653092f59c..ebbdeb9eabdb 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -114,10 +114,6 @@ if [ -f /etc/adabasrc ]; then
   . /etc/adabasrc
 fi
 
-# Set PATH so that crash_report is found:
-PATH=$sd_prog${PATH+:$PATH}
-export PATH
-
 # execute soffice binary
 "$sd_prog/$sd_binary" "$@" &
 trap 'kill -9 $!' TERM
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 9e74f34d0e57..0fe319735c06 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -70,10 +70,6 @@ unset XENVIRONMENT
 # uncomment line below if you encounter problems starting soffice on your system
 # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
 
-# Set PATH so that crash_report is found:
-PATH=$sd_prog${PATH+:$PATH}
-export PATH
-
 # execute binary
 exec "$sd_prog/unopkg.bin" "$@" \
     "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 53778534c750..efba60ca75b9 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1149,16 +1149,6 @@ USHORT Desktop::Exception(USHORT nError)
 
     switch( nError & EXC_MAJORTYPE )
     {
-/*
-        case EXC_USER:
-            if( nError == EXC_OUTOFMEMORY )
-            {
-                // not possible without a special NewHandler!
-                String aMemExceptionString;
-                Application::Abort( aMemExceptionString );
-            }
-            break;
-*/
         case EXC_RSCNOTLOADED:
         {
             String aResExceptionString;
@@ -1175,23 +1165,14 @@ USHORT Desktop::Exception(USHORT nError)
 
         default:
         {
-            if ( pArgs->IsNoRestore() ) {
-                if (m_pLockfile != NULL) {
-                    m_pLockfile->clean();
-                }
-                _exit( ExitHelper::E_LOCKFILE );
+            if (m_pLockfile != NULL) {
+                m_pLockfile->clean();
             }
-
             if( bRestart )
             {
                 OfficeIPCThread::DisableOfficeIPCThread();
                 if( pSignalHandler )
                     DELETEZ( pSignalHandler );
-
-                if (m_pLockfile != NULL) {
-                    m_pLockfile->clean();
-                }
-
 #ifdef MACOSX
                 DoRestart();
 #endif
@@ -1199,17 +1180,15 @@ USHORT Desktop::Exception(USHORT nError)
             }
             else
             {
-                bInException = sal_False;
-                _exit( ExitHelper::E_CRASH );
+                Application::Abort( String() );
             }
 
             break;
         }
     }
 
+    OSL_ASSERT(false); // unreachable
     return 0;
-
-    // ConfigManager is disposed, so no way to continue
 }
 
 void Desktop::AppEvent( const ApplicationEvent& rAppEvent )
@@ -1579,7 +1558,8 @@ void Desktop::Main()
 
 //    SetSplashScreenProgress(80);
 
-    if ( !bTerminateRequested && !pCmdLineArgs->IsInvisible() )
+    if ( !bTerminateRequested && !pCmdLineArgs->IsInvisible() &&
+         !pCmdLineArgs->IsNoQuickstart() )
         InitializeQuickstartMode( xSMgr );
 
     RTL_LOGFILE_CONTEXT( aLog2, "desktop (cd100003) createInstance com.sun.star.frame.Desktop" );
@@ -1666,7 +1646,11 @@ void Desktop::Main()
     // remove temp directory
     RemoveTemporaryDirectory();
 
+    // The acceptors in the AcceptorMap must be released (in DeregisterServices)
+    // with the solar mutex unlocked, to avoid deadlock:
+    nAcquireCount = Application::ReleaseSolarMutex();
     DeregisterServices();
+    Application::AcquireSolarMutex(nAcquireCount);
 
     tools::DeInitTestToolLib();
 
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index c48805fcfeb7..2f0d4ab9e538 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -108,6 +108,9 @@ OUString Desktop::GetLicensePath()
 /* Check if we need to accept license. */
 sal_Bool Desktop::LicenseNeedsAcceptance()
 {
+    // Don't show a license
+    return sal_False;
+/*
     sal_Bool bShowLicense = sal_True;
     sal_Int32 nOpenSourceContext = 0;
     try
@@ -122,6 +125,7 @@ sal_Bool Desktop::LicenseNeedsAcceptance()
         bShowLicense = sal_False;
 
     return bShowLicense;
+*/
 }
 
 /* Local function - was the wizard completed already? */
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index a8f9580fa2f6..97eb3f555f60 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -311,7 +311,6 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr )
 namespace
 {
     struct acceptorMap : public rtl::Static< AcceptorMap, acceptorMap > {};
-    struct mtxAccMap : public rtl::Static< osl::Mutex, mtxAccMap > {};
     struct CurrentTempURL : public rtl::Static< String, CurrentTempURL > {};
 }
 
@@ -319,8 +318,6 @@ static sal_Bool bAccept = sal_False;
 
 void Desktop::createAcceptor(const OUString& aAcceptString)
 {
-    // make sure nobody adds an acceptor whle we create one...
-    osl::MutexGuard aGuard(mtxAccMap::get());
     // check whether the requested acceptor already exists
     AcceptorMap &rMap = acceptorMap::get();
     AcceptorMap::const_iterator pIter = rMap.find(aAcceptString);
@@ -367,7 +364,6 @@ class enable
 void Desktop::enableAcceptors()
 {
     RTL_LOGFILE_CONTEXT(aLog, "desktop (lo119109) Desktop::enableAcceptors");
-    osl::MutexGuard aGuard(mtxAccMap::get());
     if (!bAccept)
     {
         // from now on, all new acceptors are enabled
@@ -381,7 +377,6 @@ void Desktop::enableAcceptors()
 
 void Desktop::destroyAcceptor(const OUString& aAcceptString)
 {
-    osl::MutexGuard aGuard(mtxAccMap::get());
     // special case stop all acceptors
     AcceptorMap &rMap = acceptorMap::get();
     if (aAcceptString.compareToAscii("all") == 0) {
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index ac0381c3a96d..0625191ee2ea 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -399,6 +399,13 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
 #if defined(WNT) || defined(OS2) || defined(QUARTZ)
         SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_True );
 #endif
+        SetBoolParam_Impl( CMD_BOOLPARAM_NOQUICKSTART, sal_False );
+        return sal_True;
+    }
+    else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-quickstart=no" )))
+    {
+        SetBoolParam_Impl( CMD_BOOLPARAM_NOQUICKSTART, sal_True );
+        SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_False );
         return sal_True;
     }
     else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-terminate_after_init" )) == sal_True )
@@ -662,6 +669,12 @@ sal_Bool CommandLineArgs::IsQuickstart() const
     return m_aBoolParams[ CMD_BOOLPARAM_QUICKSTART ];
 }
 
+sal_Bool CommandLineArgs::IsNoQuickstart() const
+{
+    osl::MutexGuard aMutexGuard( m_aMutex );
+    return m_aBoolParams[ CMD_BOOLPARAM_NOQUICKSTART ];
+}
+
 sal_Bool CommandLineArgs::IsTerminateAfterInit() const
 {
     osl::MutexGuard  aMutexGuard( m_aMutex );
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index 1ec1ac3ad760..615577098c2d 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -48,6 +48,7 @@ class CommandLineArgs
             CMD_BOOLPARAM_SERVER,
             CMD_BOOLPARAM_HEADLESS,
             CMD_BOOLPARAM_QUICKSTART,
+            CMD_BOOLPARAM_NOQUICKSTART,
             CMD_BOOLPARAM_TERMINATEAFTERINIT,
             CMD_BOOLPARAM_NOFIRSTSTARTWIZARD,
             CMD_BOOLPARAM_NOLOGO,
@@ -132,6 +133,7 @@ class CommandLineArgs
         sal_Bool                IsServer() const;
         sal_Bool                IsHeadless() const;
         sal_Bool                IsQuickstart() const;
+        sal_Bool                IsNoQuickstart() const;
         sal_Bool                IsTerminateAfterInit() const;
         sal_Bool                IsNoFirstStartWizard() const;
         sal_Bool                IsNoLogo() const;
diff --git a/desktop/source/app/copyright_ascii_ooo.c b/desktop/source/app/copyright_ascii_ooo.c
index 7b58f1a60f7e..7439547f62b4 100644
--- a/desktop/source/app/copyright_ascii_ooo.c
+++ b/desktop/source/app/copyright_ascii_ooo.c
@@ -5,12 +5,6 @@
   */
 
 extern const char copyright_text_1[];
-extern const char copyright_text_2[];
-extern const char copyright_text_21[];
-extern const char copyright_text_22[];
 
-const char copyright_text_1[] = "Copyright � 2010 Sun Microsystems, Inc., All rights reserved.";
-const char copyright_text_2[] = "Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and in other countries.";
-const char copyright_text_21[] = "Copyright � 2010 Sun Microsystems, Tous droits r�serv�s.";
-const char copyright_text_22[] = "Sun Microsystems, Inc. a les droits de propri�t� intellectuels relatants � la technologie incorpor�e dans ce produit. En particulier, et sans la limitation, ces droits de propri�t� intellectuels peuvent inclure un ou plus des brevets am�ricains �num�r�s � http://www.sun.com/patents et un ou les brevets plus suppl�mentaires ou les applications de brevet en attente dans les �tats - Unis et les autres pays.";
+const char copyright_text_1[] = "Copyright � 2000, 2010 Oracle and/or its affiliates, All rights reserved.";
 
diff --git a/desktop/source/app/copyright_ascii_sun.c b/desktop/source/app/copyright_ascii_sun.c
index 6284744db94f..c7de54e98fba 100644
--- a/desktop/source/app/copyright_ascii_sun.c
+++ b/desktop/source/app/copyright_ascii_sun.c
@@ -4,17 +4,5 @@
   *
   */
 
-const char copyright_text_1[] = "Copyright � 2010 Sun Microsystems, Inc., All rights reserved.";
-const char copyright_text_2[] = "Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and in other countries.";
-const char copyright_text_3[] = "U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its supplements.  Use is subject to license terms.";
-const char copyright_text_4[] = "This distribution may include materials developed by third parties.Sun, Sun Microsystems, the Sun logo, Java, Solaris and StarOffice are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries.";
-const char copyright_text_5[] = "UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd.";
-const char copyright_text_21[] = "Copyright � 2010 Sun Microsystems, Tous droits r�serv�s.";
-const char copyright_text_22[] = "Sun Microsystems, Inc. a les droits de propri�t� intellectuels relatants � la technologie incorpor�e dans ce produit. En particulier, et sans la limitation, ces droits de propri�t� intellectuels peuvent inclure un ou plus des brevets am�ricains �num�r�s � http://www.sun.com/patents et un ou les brevets plus suppl�mentaires ou les applications de brevet en attente dans les �tats - Unis et les autres pays.";
-const char copyright_text_23[] = "Ce produit ou document est prot�g� par un copyright et distribu� avec des licences qui en restreignent l'utilisation, la copie, la distribution, et la d�compilation. Aucune partie de ce produit ou document ne peut �tre reproduite sous aucune forme, par quelque moyen que ce soit, sans l'autorisation pr�alable et �crite de Sun et de ses bailleurs de licence, s'il y ena.";
-const char copyright_text_24[] = "L'utilisation est soumise aux termes du contrat de licence.";
-const char copyright_text_25[] = "Cette distribution peut comprendre des composants développés par des tierces parties.";
-const char copyright_text_26[] = "Sun, Sun Microsystems, le logo Sun, Java, Solaris et StarOffice sont des marques de fabrique ou des marques déposées de Sun Microsystems, Inc. aux Etats-Unis et dans d'autres pay";
-const char copyright_text_27[] = "Toutes les marques SPARC sont utilisées sous licence et sont des marques de fabrique ou des marques déposées de SPARC International, Inc. aux Etats-Unis et dans d'autres pay";
-const char copyright_text_28[] = "UNIX est une marque déposée aux Etats-Unis et dans d'autres pays et licenciée exlusivement par X/Open Company, Ltd.";
+const char copyright_text_1[] = "Copyright � 2000, 2010 Oracle and/or its affiliates, All rights reserved.";
 
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index d7ab4a27764e..2f6897adf80e 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -209,7 +209,7 @@ InfoBox INFOBOX_EXPIRED
 {
     Buttons = WB_OK ;
     DefButton = WB_DEF_OK ;
-    Message [ en-US ] = "This Evaluation Version has expired. To find out more about %PRODUCTNAME,\nvisit www.sun.com/%PRODUCTNAME.";
+    Message [ en-US ] = "This Evaluation Version has expired. To find out more about %PRODUCTNAME,\nvisit http://www.oracle.com/us/products/applications/open-office.";
 };
 
 String STR_TITLE_EXPIRED
diff --git a/desktop/source/app/version.map b/desktop/source/app/version.map
index 657ee2a95433..0ffffcd58635 100644
--- a/desktop/source/app/version.map
+++ b/desktop/source/app/version.map
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-soffice.3 {
+UDK_3_0_0 {
     global:
         soffice_main;
 
diff --git a/desktop/source/deployment/deployment.map b/desktop/source/deployment/deployment.map
deleted file mode 100644
index 563b3d86a5d0..000000000000
--- a/desktop/source/deployment/deployment.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 2d0733dfbae3..21ec1ce46ff5 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -30,7 +30,7 @@
 
 #include "dp_gui.hrc"
 #include "svtools/controldims.hrc"
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 
 #include "dp_gui.h"
 #include "dp_gui_dialog2.hxx"
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
index 10a08434d4ee..52092a077a4b 100644
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -60,7 +60,7 @@ SLOFILES = \
         $(SLO)$/descedit.obj
 
 SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno
-SHL1VERSIONMAP = ..$/deployment.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 
 SHL1STDLIBS = \
         $(SALLIB) \
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index f11f87ad56cd..173ff35bec1d 100644
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -49,7 +49,7 @@ INCPRE += inc
 DLLPRE =
 
 SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno
-SHL1VERSIONMAP = deployment.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 
 SHL1LIBS = \
     $(SLB)$/deployment_manager.lib \
@@ -80,8 +80,7 @@ SHL1STDLIBS = \
         $(SVLLIB) \
         $(UNOTOOLSLIB) \
         $(DEPLOYMENTMISCLIB) \
-    $(HELPLINKERLIB) \
-    $(CONFIGMGRLIB)
+    $(HELPLINKERLIB)
 
 SHL1DEPN =
 SHL1IMPLIB = i$(TARGET)
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 165efbaeca5a..3f13cb021aae 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -542,11 +542,19 @@ OUString PackageManagerImpl::insertToActivationLayer(
     {
         // inflate content:
         ::rtl::OUStringBuffer buf;
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
-        buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
-                                        rtl_UriCharClassRegName,
-                                        rtl_UriEncodeIgnoreEscapes,
-                                        RTL_TEXTENCODING_UTF8 ) );
+        if (!sourceContent.isFolder())
+        {
+            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
+            buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
+                                            rtl_UriCharClassRegName,
+                                            rtl_UriEncodeIgnoreEscapes,
+                                            RTL_TEXTENCODING_UTF8 ) );
+        }
+        else
+        {
+            //Folder. No need to unzip, just copy
+            buf.append(sourceContent.getURL());
+        }
         buf.append( static_cast<sal_Unicode>('/') );
         sourceContent = ::ucbhelper::Content(
             buf.makeStringAndClear(), xCmdEnv );
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 63badbb0c211..9534f166f2f0 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -56,17 +56,13 @@ namespace css = ::com::sun::star;
 static char const xmlNamespace[] =
     "http://openoffice.org/extensions/description/2006";
 
-::dp_misc::Order compareWithVersion(::rtl::OUString const & version) {
+bool satisfiesMinimalVersion(::rtl::OUString const & version) {
     ::rtl::OUString v(
         RTL_CONSTASCII_USTRINGPARAM(
             "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version")
             ":Version:OOOPackageVersion}"));
     ::rtl::Bootstrap::expandMacros(v);
-    return ::dp_misc::compareVersions(v, version);
-}
-
-bool satisfiesMinimalVersion(::rtl::OUString const & version) {
-    return compareWithVersion(version) != ::dp_misc::LESS;
+    return ::dp_misc::compareVersions(v, version) != ::dp_misc::LESS;
 }
 
 }
@@ -102,8 +98,14 @@ check(::dp_misc::DescriptionInfoset const & infoset) {
                        RTL_CONSTASCII_STRINGPARAM(
                            "OpenOffice.org-maximal-version")))
         {
+            ::rtl::OUString v(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version")
+                    ":Version:OOOBaseVersion}"));
+            ::rtl::Bootstrap::expandMacros(v);
             sat =
-                compareWithVersion(
+                ::dp_misc::compareVersions(
+                    v,
                     e->getAttribute(
                         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))))
                 != ::dp_misc::GREATER;
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index bb93f78689b6..4a144f3fdf20 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -47,8 +47,11 @@
 #define PLATFORM_LINUX_MIPS_EL      "linux_mips_el"
 #define PLATFORM_LINUX_MIPS_EB      "linux_mips_eb"
 #define PLATFORM_LINUX_IA64         "linux_ia64"
+#define PLATFORM_LINUX_M68K         "linux_m68k"
 #define PLATFORM_LINUX_S390         "linux_s390"
 #define PLATFORM_LINUX_S390x        "linux_s390x"
+#define PLATFORM_LINUX_HPPA         "linux_hppa"
+#define PLATFORM_LINUX_ALPHA        "linux_alpha"
 
 
 
@@ -142,10 +145,16 @@ namespace
             ret = checkOSandCPU(OUSTR("Linux"), OUSTR("MIPS_EB"));
         else if (token.equals(OUSTR(PLATFORM_LINUX_IA64)))
             ret = checkOSandCPU(OUSTR("Linux"), OUSTR("IA64"));
+        else if (token.equals(OUSTR(PLATFORM_LINUX_M68K)))
+            ret = checkOSandCPU(OUSTR("Linux"), OUSTR("M68K"));
         else if (token.equals(OUSTR(PLATFORM_LINUX_S390)))
             ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390"));
         else if (token.equals(OUSTR(PLATFORM_LINUX_S390x)))
             ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390x"));
+        else if (token.equals(OUSTR(PLATFORM_LINUX_HPPA)))
+            ret = checkOSandCPU(OUSTR("Linux"), OUSTR("HPPA"));
+        else if (token.equals(OUSTR(PLATFORM_LINUX_ALPHA)))
+            ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ALPHA"));
         else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC)))
             ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC"));
         else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC64)))
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 460ba5e9fed0..6cf6d4ff7818 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -45,9 +45,9 @@
 #include "ucbhelper/content.hxx"
 #include "comphelper/anytostring.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "configmgr/update.hxx"
 #include "xmlscript/xml_helper.hxx"
 #include "svl/inettype.hxx"
+#include "com/sun/star/configuration/Update.hpp"
 #include "com/sun/star/ucb/NameClash.hpp"
 #include "com/sun/star/io/XActiveDataSink.hpp"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
@@ -645,14 +645,16 @@ void BackendImpl::PackageImpl::processPackage_(
     {
         if (m_isSchema)
         {
-            configmgr::update::insertExtensionXcsFile(
-                that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
+            com::sun::star::configuration::Update::get(
+                that->m_xComponentContext)->insertExtensionXcsFile(
+                    that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
         }
         else
         {
             url = replaceOrigin(url, xCmdEnv);
-            configmgr::update::insertExtensionXcuFile(
-                that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
+            com::sun::star::configuration::Update::get(
+                that->m_xComponentContext)->insertExtensionXcuFile(
+                    that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
         }
 
         that->addToConfigmgrIni( m_isSchema, url, xCmdEnv );
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index c6572364aac0..c56131a1015c 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -181,6 +181,7 @@ OUString normalizeMediaType( OUString const & mediaType )
 }
 
 //______________________________________________________________________________
+
 void PackageRegistryImpl::insertBackend(
     Reference<deployment::XPackageRegistry> const & xBackend )
 {
@@ -201,7 +202,8 @@ void PackageRegistryImpl::insertBackend(
         ::std::pair<t_string2registry::iterator, bool> mb_insertion(
             m_mediaType2backend.insert( t_string2registry::value_type(
                                             mediaType, xBackend ) ) );
-        if (mb_insertion.second) {
+        if (mb_insertion.second)
+        {
             // add parameterless media-type, too:
             sal_Int32 semi = mediaType.indexOf( ';' );
             if (semi >= 0) {
@@ -210,9 +212,13 @@ void PackageRegistryImpl::insertBackend(
                         mediaType.copy( 0, semi ), xBackend ) );
             }
             const OUString fileFilter( xPackageType->getFileFilter() );
+            //The package backend shall also be called to determine the mediatype
+            //(XPackageRegistry.bindPackage) when the URL points to a directory.
+            const bool bExtension = mediaType.equals(OUSTR("application/vnd.sun.star.package-bundle"));
             if (fileFilter.getLength() == 0 ||
                 fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*.*") ) ||
-                fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*") ))
+                fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*") ) ||
+                bExtension)
             {
                 m_ambiguousBackends.insert( xBackend );
             }
@@ -351,7 +357,10 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create(
         }
     }
 
-    // insert bundle be:
+    // Insert bundle back-end.
+    // Always register as last, because we want to add extensions also as folders
+    // and as a default we accept every folder, which was not recognized by the other
+    // backends.
     that->insertBackend(
         ::dp_registry::backend::bundle::create(
             that, context, cachePath, readOnly, xComponentContext ) );
@@ -445,7 +454,8 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage(
     {
         ::ucbhelper::Content ucbContent;
         if (create_ucb_content(
-                &ucbContent, url, xCmdEnv, false /* no throw */ ))
+                &ucbContent, url, xCmdEnv, false /* no throw */ )
+                && !ucbContent.isFolder())
         {
             OUString title( ucbContent.getPropertyValue(
                                 StrTitle::get() ).get<OUString>() );
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index e45f7fb7ef73..b0b4a918c7a3 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -287,7 +287,7 @@ BackendImpl::BackendImpl(
                                    m_xBundleTypeInfo->getShortDescription(),
                                    RID_IMG_DEF_PACKAGE_BUNDLE,
                                    RID_IMG_DEF_PACKAGE_BUNDLE_HC ) ),
-      m_typeInfos( 2 )
+    m_typeInfos(2)
 {
     m_typeInfos[ 0 ] = m_xBundleTypeInfo;
     m_typeInfos[ 1 ] = m_xLegacyBundleTypeInfo;
@@ -342,17 +342,32 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         ::ucbhelper::Content ucbContent;
         if (create_ucb_content( &ucbContent, url, xCmdEnv ))
         {
-            const OUString title( ucbContent.getPropertyValue(
-                                      StrTitle::get() ).get<OUString>() );
-            if (title.endsWithIgnoreAsciiCaseAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM(".oxt") ) ||
-                title.endsWithIgnoreAsciiCaseAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM(".uno.pkg") ))
-                mediaType = OUSTR("application/vnd.sun.star.package-bundle");
-            else if (title.endsWithIgnoreAsciiCaseAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM(".zip") ))
-                mediaType =
-                    OUSTR("application/vnd.sun.star.legacy-package-bundle");
+            if (ucbContent.isFolder())
+            {
+                //Every .oxt, uno.pkg file must contain a META-INF folder
+                ::ucbhelper::Content metaInfContent;
+                if (create_ucb_content(
+                    &metaInfContent, makeURL( url, OUSTR("META-INF/manifest.xml") ),
+                    xCmdEnv, false /* no throw */ ))
+                {
+                     mediaType = OUSTR("application/vnd.sun.star.package-bundle");
+                }
+                //No support of legacy bundles, because every folder could be one.
+            }
+            else
+            {
+                const OUString title( ucbContent.getPropertyValue(
+                                          StrTitle::get() ).get<OUString>() );
+                if (title.endsWithIgnoreAsciiCaseAsciiL(
+                        RTL_CONSTASCII_STRINGPARAM(".oxt") ) ||
+                    title.endsWithIgnoreAsciiCaseAsciiL(
+                        RTL_CONSTASCII_STRINGPARAM(".uno.pkg") ))
+                    mediaType = OUSTR("application/vnd.sun.star.package-bundle");
+                else if (title.endsWithIgnoreAsciiCaseAsciiL(
+                             RTL_CONSTASCII_STRINGPARAM(".zip") ))
+                    mediaType =
+                        OUSTR("application/vnd.sun.star.legacy-package-bundle");
+            }
         }
         if (mediaType.getLength() == 0)
             throw lang::IllegalArgumentException(
@@ -1303,7 +1318,7 @@ void BackendImpl::PackageImpl::scanBundle(
     {
         OSL_ENSURE( 0, "### missing META-INF/manifest.xml file!" );
         return;
-}
+    }
 
 
     const lang::Locale officeLocale = getOfficeLocale();
diff --git a/desktop/source/inc/exithelper.hxx b/desktop/source/inc/exithelper.hxx
index 958b549adfa0..2e6d7e774d98 100644
--- a/desktop/source/inc/exithelper.hxx
+++ b/desktop/source/inc/exithelper.hxx
@@ -56,12 +56,8 @@ class ExitHelper
             E_SECOND_OFFICE = 1,
             /// an uno exception was catched during startup
             E_FATAL_ERROR = 333,    // Only the low 8 bits are significant 333 % 256 = 77
-            /// crash during runtime
-            E_CRASH = 78,
             /// user force automatic restart after crash
             E_CRASH_WITH_RESTART = 79,
-            /// ???
-            E_LOCKFILE = 80
         };
 };
 
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 2181daab7454..3789171ce254 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -28,6 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_desktop.hxx"
 
+#include <map>
+#include <new>
+#include <set>
+
 #include "migration.hxx"
 #include "migration_impl.hxx"
 #include "cfgfilter.hxx"
@@ -37,6 +41,7 @@
 #include <comphelper/sequence.hxx>
 #include <unotools/bootstrap.hxx>
 #include <rtl/bootstrap.hxx>
+#include <rtl/uri.hxx>
 #include <tools/config.hxx>
 #include <i18npool/lang.h>
 #include <tools/urlobj.hxx>
@@ -46,12 +51,11 @@
 #include <osl/security.hxx>
 #include <unotools/configmgr.hxx>
 
+#include <com/sun/star/configuration/Update.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/XSingleLayerStratum.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/util/XStringSubstitution.hpp>
@@ -64,8 +68,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::util;
 using namespace com::sun::star::container;
-using namespace com::sun::star::configuration;
-using namespace com::sun::star::configuration::backend;
 using com::sun::star::uno::Exception;
 using namespace com::sun::star;
 
@@ -154,18 +156,15 @@ MigrationImpl::~MigrationImpl()
 
 sal_Bool MigrationImpl::doMigration()
 {
-    // compile file and service list for migration
-    m_vrFileList    = compileFileList();
-    m_vrServiceList = compileServiceList();
+    // compile file list for migration
+    m_vrFileList = compileFileList();
 
     sal_Bool result = sal_False;
     try{
         copyFiles();
 
         // execute the migration items from Setup.xcu
-        // and refresh the cache
         copyConfig();
-        refresh();
 
         // execute custom migration services from Setup.xcu
         // and refresh the cache
@@ -232,6 +231,7 @@ static void insertSorted(migrations_available& rAvailableMigrations, supported_m
         {
             rAvailableMigrations.insert(pIter, aSupportedMigration );
             bInserted = true;
+            break;
         }
         ++pIter;
     }
@@ -332,13 +332,6 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio
                 tmpStep.excludeExtensions.push_back(tmpSeq[j]);
         }
 
-        // config components
-        if (tmpAccess->getByName(OUString::createFromAscii("ServiceConfigComponents")) >>= tmpSeq)
-        {
-            for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
-                tmpStep.configComponents.push_back(tmpSeq[j]);
-        }
-
         // generic service
         tmpAccess->getByName(OUString::createFromAscii("MigrationService")) >>= tmpStep.service;
 
@@ -525,77 +518,104 @@ strings_vr MigrationImpl::compileFileList()
     return vrResult;
 }
 
+namespace {
 
-void MigrationImpl::copyConfig()
-{
-    try {
-        // 1. get a list of all components from hierachy browser
-        uno::Reference< XJob > xBrowser(m_xFactory->createInstance(
-            OUString::createFromAscii("com.sun.star.configuration.backend.LocalHierarchyBrowser")), uno::UNO_QUERY_THROW);
-
-        uno::Sequence< NamedValue > seqArgs(2);
-        seqArgs[0] = NamedValue(
-            OUString::createFromAscii("LayerDataUrl"),
-            uno::makeAny(m_aInfo.userdata + OUString::createFromAscii("/user/registry")));
-        seqArgs[1] = NamedValue(
-            OUString::createFromAscii("FetchComponentNames"),
-            uno::makeAny(sal_True));
-
-        // execute the search
-        uno::Any aResult = xBrowser->execute(seqArgs);
-        uno::Sequence< OUString > seqComponents;
-        aResult >>= seqComponents;
-        OSL_ENSURE(seqComponents.getLength()>0, "MigrationImpl::copyConfig(): no config components available");
-
-        // 2. create an importer
-        uno::Reference< XJob > xImporter(m_xFactory->createInstance(
-            OUString::createFromAscii("com.sun.star.configuration.backend.LocalDataImporter")), uno::UNO_QUERY_THROW);
-
-        // 3. for each migration step...
-        uno::Sequence< NamedValue > importerArgs(3);
-        importerArgs[0] = NamedValue(
-            OUString::createFromAscii("LayerDataUrl"),
-            uno::makeAny(m_aInfo.userdata + OUString::createFromAscii("/user/registry")));
-        importerArgs[1] = NamedValue(
-            OUString::createFromAscii("LayerFilter"),
-            uno::Any());
-        importerArgs[2] = NamedValue(
-            OUString::createFromAscii("Component"),
-            uno::Any());
-
-        migrations_v::const_iterator i_mig = m_vrMigrations->begin();
-        while (i_mig != m_vrMigrations->end())
-        {
-            //   a. create config filter for step
-            uno::Reference< XInitialization > xFilter(
-                new CConfigFilter(&(i_mig->includeConfig), &(i_mig->excludeConfig)));
-            importerArgs[1].Value = uno::makeAny(xFilter);
+struct componentParts {
+    std::set< rtl::OUString > includedPaths;
+    std::set< rtl::OUString > excludedPaths;
+};
 
-            //   b. run each importer with config filter
-            for (sal_Int32 i=0; i<seqComponents.getLength(); i++)
-            {
-                OUString component = seqComponents[i];
-                importerArgs[2].Value = uno::makeAny(seqComponents[i]);
-                try {
-                    aResult = xImporter->execute(importerArgs);
-                    Exception myException;
-                    if (aResult >>= myException) throw myException;
-                } catch(Exception& aException) {
-                    OString aMsg("Exception in config layer import.\ncomponent: ");
-                    aMsg += OUStringToOString(seqComponents[i], RTL_TEXTENCODING_ASCII_US);
-                    aMsg += "\nmessage: ";
-                    aMsg += OUStringToOString(aException.Message, RTL_TEXTENCODING_ASCII_US);
-                    OSL_ENSURE(sal_False, aMsg.getStr());
-                }
+typedef std::map< rtl::OUString, componentParts > Components;
+
+bool getComponent(rtl::OUString const & path, rtl::OUString * component) {
+    OSL_ASSERT(component != 0);
+    if (path.getLength() == 0 || path[0] != '/') {
+        OSL_TRACE(
+            ("configuration migration in/exclude path %s ignored (does not"
+             " start with slash)"),
+            rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8).getStr());
+        return false;
+    }
+    sal_Int32 i = path.indexOf('/', 1);
+    *component = i < 0 ? path.copy(1) : path.copy(1, i - 1);
+    return true;
+}
+
+uno::Sequence< rtl::OUString > setToSeq(std::set< rtl::OUString > const & set) {
+    std::set< rtl::OUString >::size_type n = set.size();
+    if (n > SAL_MAX_INT32) {
+        throw std::bad_alloc();
+    }
+    uno::Sequence< rtl::OUString > seq(static_cast< sal_Int32 >(n));
+    sal_Int32 i = 0;
+    for (std::set< rtl::OUString >::const_iterator j(set.begin());
+         j != set.end(); ++j)
+    {
+        seq[i++] = *j;
+    }
+    return seq;
+}
+
+}
+
+void MigrationImpl::copyConfig() {
+    Components comps;
+    for (migrations_v::const_iterator i(m_vrMigrations->begin());
+         i != m_vrMigrations->end(); ++i)
+    {
+        for (strings_v::const_iterator j(i->includeConfig.begin());
+             j != i->includeConfig.end(); ++j)
+        {
+            rtl::OUString comp;
+            if (getComponent(*j, &comp)) {
+                comps[comp].includedPaths.insert(*j);
+            }
+        }
+        for (strings_v::const_iterator j(i->excludeConfig.begin());
+             j != i->excludeConfig.end(); ++j)
+        {
+            rtl::OUString comp;
+            if (getComponent(*j, &comp)) {
+                comps[comp].excludedPaths.insert(*j);
             }
-            i_mig++;
         }
     }
-    catch (Exception& e)
-    {
-        OString aMsg("Exception in config layer import.\nmessage: ");
-        aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
-        OSL_ENSURE(sal_False, aMsg.getStr());
+    for (Components::const_iterator i(comps.begin()); i != comps.end(); ++i) {
+        if (!i->second.includedPaths.empty()) {
+            rtl::OUStringBuffer buf(m_aInfo.userdata);
+            buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("/user/registry/data"));
+            sal_Int32 n = 0;
+            do {
+                rtl::OUString seg(i->first.getToken(0, '.', n));
+                rtl::OUString enc(
+                    rtl::Uri::encode(
+                        seg, rtl_UriCharClassPchar, rtl_UriEncodeStrict,
+                        RTL_TEXTENCODING_UTF8));
+                if (enc.getLength() == 0 && seg.getLength() != 0) {
+                    OSL_TRACE(
+                        ("configuration migration component %s ignored (cannot"
+                         " be encoded as file path)"),
+                        rtl::OUStringToOString(
+                            i->first, RTL_TEXTENCODING_UTF8).getStr());
+                    goto next;
+                }
+                buf.append(sal_Unicode('/'));
+                buf.append(enc);
+            } while (n >= 0);
+            buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(".xcu"));
+            configuration::Update::get(
+                comphelper::getProcessComponentContext())->
+                insertModificationXcuFile(
+                    buf.makeStringAndClear(), setToSeq(i->second.includedPaths),
+                    setToSeq(i->second.excludedPaths));
+        } else {
+            OSL_TRACE(
+                ("configuration migration component %s ignored (only excludes,"
+                 " no includes)"),
+                rtl::OUStringToOString(
+                    i->first, RTL_TEXTENCODING_UTF8).getStr());
+        }
+    next:;
     }
 }
 
@@ -704,17 +724,8 @@ void MigrationImpl::copyFiles()
 
 void MigrationImpl::runServices()
 {
-    //create stratum for old user layer
-    OUString aOldLayerURL = m_aInfo.userdata;
-    aOldLayerURL += OUString::createFromAscii("/user/registry");
-    OUString aStratumSvc = OUString::createFromAscii("com.sun.star.configuration.backend.LocalSingleStratum");
-    uno::Sequence< uno::Any > stratumArgs(1);
-    stratumArgs[0] = uno::makeAny(aOldLayerURL);
-    uno::Reference< XSingleLayerStratum> xStartum( m_xFactory->createInstanceWithArguments(
-        aStratumSvc, stratumArgs), uno::UNO_QUERY);
-
     // Build argument array
-    uno::Sequence< uno::Any > seqArguments(4);
+    uno::Sequence< uno::Any > seqArguments(3);
     seqArguments[0] = uno::makeAny(NamedValue(
         OUString::createFromAscii("Productname"),
         uno::makeAny(m_aInfo.productname)));
@@ -735,34 +746,13 @@ void MigrationImpl::runServices()
 
             try
             {
-                // create access to old configuration components in the user layer
-                // that were requested by the migration service
-                uno::Sequence< NamedValue > seqComponents(i_mig->configComponents.size());
-                strings_v::const_iterator i_comp = i_mig->configComponents.begin();
-                sal_Int32 i = 0;
-                while (i_comp != i_mig->configComponents.end() && xStartum.is())
-                {
-                    // create Layer for i_comp
-                    seqComponents[i] =  NamedValue(
-                        *i_comp, uno::makeAny(xStartum->getLayer(*i_comp, OUString())));
-
-                    // next component
-                    i_comp++;
-                    i++;
-                }
-
-                // set old config argument
-                seqArguments[2] = uno::makeAny(NamedValue(
-                    OUString::createFromAscii("OldConfiguration"),
-                    uno::makeAny(seqComponents)));
-
                 // set black list for extension migration
                 uno::Sequence< rtl::OUString > seqExtBlackList;
                 sal_uInt32 nSize = i_mig->excludeExtensions.size();
                 if ( nSize > 0 )
                     seqExtBlackList = comphelper::arrayToSequence< ::rtl::OUString >(
                         &i_mig->excludeExtensions[0], nSize );
-                seqArguments[3] = uno::makeAny(NamedValue(
+                seqArguments[2] = uno::makeAny(NamedValue(
                     OUString::createFromAscii("ExtensionBlackList"),
                     uno::makeAny( seqExtBlackList )));
 
@@ -791,17 +781,4 @@ void MigrationImpl::runServices()
     }
 }
 
-
-strings_vr MigrationImpl::compileServiceList()
-{
-    strings_vr vrResult(new strings_v);
-    migrations_v::const_iterator i_migr = m_vrMigrations->begin();
-    while (i_migr != m_vrMigrations->end())
-    {
-        vrResult->push_back(i_migr->service);
-        i_migr++;
-    }
-    return vrResult;
-}
-
 } // namespace desktop
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index b40de510261d..8cad1cce4b16 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -64,7 +64,6 @@ struct migration_step
     strings_v excludeFiles;
     strings_v includeConfig;
     strings_v excludeConfig;
-    strings_v configComponents;
     strings_v includeExtensions;
     strings_v excludeExtensions;
     rtl::OUString service;
@@ -92,8 +91,6 @@ private:
     migrations_vr        m_vrMigrations;         // list of all migration specs from config
     install_info         m_aInfo;                // info about the version being migrated
     strings_vr           m_vrFileList;           // final list of files to be copied
-    strings_vr           m_vrConfigList;         // final list of nodes to be copied
-    strings_vr           m_vrServiceList;        // final list of services to be called
 
     // functions to control the migration process
     bool          readAvailableMigrations(migrations_available&);
@@ -101,8 +98,6 @@ private:
     sal_Int32     findPreferedMigrationProcess(const migrations_available&);
     install_info  findInstallation(const strings_v& rVersions);
     strings_vr    compileFileList();
-    strings_vr    compileConfigList();
-    strings_vr    compileServiceList();
 
     // helpers
     void substract(strings_v& va, const strings_v& vb_c) const;
diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk
index 64adfe70b7b2..55ecff6bc06f 100644
--- a/desktop/source/migration/services/makefile.mk
+++ b/desktop/source/migration/services/makefile.mk
@@ -65,7 +65,7 @@ SHL1OBJS= \
         $(SLO)$/autocorrmigration.obj
 
 SHL1TARGET=$(TARGET)
-SHL1VERSIONMAP = migrationoo2.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 
 SHL1STDLIBS= \
     $(DEPLOYMENTMISCLIB) \
diff --git a/desktop/source/migration/services/migrationoo2.map b/desktop/source/migration/services/migrationoo2.map
deleted file mode 100644
index ac2c3750bfe0..000000000000
--- a/desktop/source/migration/services/migrationoo2.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/desktop/source/offacc/exports.map b/desktop/source/offacc/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/desktop/source/offacc/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/desktop/source/offacc/makefile.mk b/desktop/source/offacc/makefile.mk
index fb5cb9ab936c..c2d53930b580 100644
--- a/desktop/source/offacc/makefile.mk
+++ b/desktop/source/offacc/makefile.mk
@@ -47,7 +47,7 @@ SHL1OBJS=	$(SLOFILES)
 SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB=	i$(TARGET)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/desktop/source/pkgchk/unopkg/version.map b/desktop/source/pkgchk/unopkg/version.map
index 66b81247e826..6d34cb662d2c 100644
--- a/desktop/source/pkgchk/unopkg/version.map
+++ b/desktop/source/pkgchk/unopkg/version.map
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-unopkg.3 {
+UDK_3_0_0 {
     global:
         unopkg_main;
 
diff --git a/desktop/source/so_comp/exports.map b/desktop/source/so_comp/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/desktop/source/so_comp/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/desktop/source/so_comp/makefile.mk b/desktop/source/so_comp/makefile.mk
index b16ae7a009bf..590f99518c68 100644
--- a/desktop/source/so_comp/makefile.mk
+++ b/desktop/source/so_comp/makefile.mk
@@ -55,7 +55,7 @@ SHL1OBJS=	$(SLOFILES)
 SHL1TARGET=	$(TARGET)
 SHL1IMPLIB= i$(TARGET)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/desktop/source/splash/exports.map b/desktop/source/splash/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/desktop/source/splash/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
index 518ccc11ad0c..89609687438c 100644
--- a/desktop/source/splash/makefile.mk
+++ b/desktop/source/splash/makefile.mk
@@ -54,7 +54,7 @@ SHL1OBJS=   $(SLOFILES) \
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB=i$(TARGET)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/desktop/test/deployment/boxt/Addons.xcu b/desktop/test/deployment/boxt/Addons.xcu
new file mode 100644
index 000000000000..3df7e2de274c
--- /dev/null
+++ b/desktop/test/deployment/boxt/Addons.xcu
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<o:component-data xmlns:o="http://openoffice.org/2001/registry"
+    o:package="org.openoffice.Office" o:name="Addons">
+  <node o:name="AddonUI">
+    <node o:name="OfficeMenuBar">
+      <node o:name="org.openoffice.test.desktop.deployment.boxt" o:op="replace">
+        <prop o:name="Title" xml:lang="en-US">
+          <value>boxt</value>
+        </prop>
+        <node o:name="Submenu">
+          <node o:name="1" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.boxt:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>boxt</value>
+            </prop>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</o:component-data>
diff --git a/configmgr/inc/configmgr/detail/configmgrdllapi.hxx b/desktop/test/deployment/boxt/ProtocolHandler.xcu
index 6eb2ea7bc9d9..fe448aedbe17 100644
--- a/configmgr/inc/configmgr/detail/configmgrdllapi.hxx
+++ b/desktop/test/deployment/boxt/ProtocolHandler.xcu
@@ -1,4 +1,5 @@
-/*************************************************************************
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
@@ -23,19 +24,15 @@
 * <http://www.openoffice.org/license.html>
 * for a copy of the LGPLv3 License.
 *
-************************************************************************/
+**********************************************************************-->
 
-#ifndef INCLUDED_CONFIGMGR_DETAIL_CONFIGMGRDLLAPI_HXX
-#define INCLUDED_CONFIGMGR_DETAIL_CONFIGMGRDLLAPI_HXX
-
-#include "sal/config.h"
-
-#include "sal/types.h"
-
-#if defined OOO_DLLIMPLEMENTATION_CONFIGMGR
-#define OOO_DLLPUBLIC_CONFIGMGR SAL_DLLPUBLIC_EXPORT
-#else
-#define OOO_DLLPUBLIC_CONFIGMGR SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif
+<o:component-data xmlns:o="http://openoffice.org/2001/registry"
+    o:package="org.openoffice.Office" o:name="ProtocolHandler">
+  <node o:name="HandlerSet">
+    <node o:name="com.sun.star.test.deployment.boxt" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.boxt:*</value>
+      </prop>
+    </node>
+  </node>
+</o:component-data>
diff --git a/desktop/test/deployment/boxt/boxt.cxx b/desktop/test/deployment/boxt/boxt.cxx
new file mode 100644
index 000000000000..dc82c0c004d6
--- /dev/null
+++ b/desktop/test/deployment/boxt/boxt.cxx
@@ -0,0 +1,235 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#include "precompiled_desktop.hxx"
+#include "sal/config.h"
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/frame/DispatchDescriptor.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XStatusListener.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/weak.hxx"
+#include "filter/msfilter/countryid.hxx"
+#include "osl/diagnose.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "uno/lbnames.h"
+#include "vcl/svapp.hxx"
+
+namespace {
+
+namespace css = com::sun::star;
+
+namespace service {
+
+rtl::OUString getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.test.deployment.boxt"));
+}
+
+css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.deployment.boxt"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+}
+
+class Service:
+    public cppu::WeakImplHelper3<
+        css::lang::XServiceInfo, css::frame::XDispatchProvider,
+        css::frame::XDispatch >,
+    private boost::noncopyable
+{
+public:
+    Service() {}
+
+private:
+    virtual ~Service() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return service::getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return service::getSupportedServiceNames(); }
+
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
+        css::util::URL const &, rtl::OUString const &, sal_Int32)
+        throw (css::uno::RuntimeException)
+    { return this; }
+
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
+    SAL_CALL queryDispatches(
+        css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL dispatch(
+        css::util::URL const &,
+        css::uno::Sequence< css::beans::PropertyValue > const &)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL addStatusListener(
+        css::uno::Reference< css::frame::XStatusListener > const &,
+        css::util::URL const &)
+        throw (css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removeStatusListener(
+        css::uno::Reference< css::frame::XStatusListener > const &,
+        css::util::URL const &)
+        throw (css::uno::RuntimeException)
+    {}
+};
+
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
+Service::queryDispatches(
+    css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
+        Requests.getLength());
+    for (sal_Int32 i = 0; i < s.getLength(); ++i) {
+        s[i] = queryDispatch(
+            Requests[i].FeatureURL, Requests[i].FrameName,
+            Requests[i].SearchFlags);
+    }
+    return s;
+}
+
+void Service::dispatch(
+    css::util::URL const &,
+    css::uno::Sequence< css::beans::PropertyValue > const &)
+    throw (css::uno::RuntimeException)
+{
+    msfilter::ConvertCountryToLanguage(msfilter::COUNTRY_DONTKNOW);
+        // link against some obscure library that is unlikely already loaded
+    Application::ShowNativeErrorBox(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("boxt")),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")));
+}
+
+class Factory:
+    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
+    private boost::noncopyable
+{
+public:
+    Factory() {}
+
+private:
+    virtual ~Factory() {}
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithContext(
+        css::uno::Reference< css::uno::XComponentContext > const &)
+        throw (css::uno::Exception, css::uno::RuntimeException)
+    { return static_cast< cppu::OWeakObject * >(new Service); }
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithArgumentsAndContext(
+        css::uno::Sequence< css::uno::Any > const &,
+        css::uno::Reference< css::uno::XComponentContext > const & Context)
+        throw (css::uno::Exception, css::uno::RuntimeException)
+    { return createInstanceWithContext(Context); }
+};
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL dummy(
+    css::uno::Reference< css::uno::XComponentContext > const &)
+    SAL_THROW((css::uno::Exception))
+{
+    OSL_ASSERT(false);
+    return css::uno::Reference< css::uno::XInterface >();
+}
+
+rtl::OUString SAL_CALL getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.test.deployment.boxt"));
+}
+
+css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.deployment.boxt"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+css::uno::Reference< css::lang::XSingleComponentFactory > SAL_CALL
+createFactory(
+    cppu::ComponentFactoryFunc, rtl::OUString const &,
+    css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
+    SAL_THROW(())
+{
+    return new Factory;
+}
+
+static cppu::ImplementationEntry const services[] = {
+    { &dummy, &service::getImplementationName,
+      &service::getSupportedServiceNames, &createFactory, 0, 0 },
+    { 0, 0, 0, 0, 0, 0 }
+};
+
+}
+
+extern "C" void * SAL_CALL component_getFactory(
+    char const * pImplName, void * pServiceManager, void * pRegistryKey)
+{
+    return cppu::component_getFactoryHelper(
+        pImplName, pServiceManager, pRegistryKey, services);
+}
+
+extern "C" void SAL_CALL component_getImplementationEnvironment(
+    char const ** ppEnvTypeName, uno_Environment **)
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+extern "C" sal_Bool SAL_CALL component_writeInfo(
+    void * pServiceManager, void * pRegistryKey)
+{
+    return component_writeInfoHelper(pServiceManager, pRegistryKey, services);
+}
diff --git a/desktop/test/deployment/boxt/description.xml b/desktop/test/deployment/boxt/description.xml
new file mode 100644
index 000000000000..5a67bf3e949f
--- /dev/null
+++ b/desktop/test/deployment/boxt/description.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<d:description xmlns:d="http://openoffice.org/extensions/description/2006">
+  <d:identifier value="org.openoffice/framework/desktop/test/deployment/boxt"/>
+  <d:version value="@VERSION@"/>
+  <d:platform value="@PLATFORM@"/>
+  <d:dependencies>
+    <d:OpenOffice.org-minimal-version d:name="OpenOffice.org @VERSION@"
+        value="@VERSION@"/>
+    <d:OpenOffice.org-maximal-version d:name="OpenOffice.org @VERSION@ or older"
+        d:OpenOffice.org-minimal-version="2.3" value="@VERSION@"/>
+  </d:dependencies>
+</d:description>
diff --git a/desktop/test/deployment/boxt/makefile.mk b/desktop/test/deployment/boxt/makefile.mk
new file mode 100644
index 000000000000..63f123fcc608
--- /dev/null
+++ b/desktop/test/deployment/boxt/makefile.mk
@@ -0,0 +1,70 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#***********************************************************************/
+
+PRJ = ../../..
+PRJNAME = desktop
+TARGET = test_deployment_boxt
+
+ENABLE_EXCEPTIONS = TRUE
+
+.INCLUDE: settings.mk
+.INCLUDE: rtlbootstrap.mk
+
+#TODO: The underlying OOo base version needed here is currently only available
+# as instsetoo_native/util/openoffice.lst OOOBASEVERSION, so hard-coding it here
+# for now (see issue 110653):
+my_version = 3.3
+
+DLLPRE =
+
+SLOFILES = $(SHL1OBJS)
+
+SHL1TARGET = boxt.uno
+SHL1OBJS = $(SLO)/boxt.obj
+SHL1RPATH = BOXT
+SHL1STDLIBS = \
+    $(CPPUHELPERLIB) $(CPPULIB) $(MSFILTERLIB) $(SALLIB) $(TOOLSLIB) $(VCLLIB)
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
+DEF1NAME = $(SHL1TARGET)
+
+.INCLUDE: target.mk
+
+ALLTAR : $(MISC)/boxt.oxt
+
+$(MISC)/boxt.oxt .ERRREMOVE : manifest.xml description.xml Addons.xcu \
+        ProtocolHandler.xcu $(SHL1TARGETN)
+    $(RM) -r $@ $(MISC)/$(TARGET).zip
+    $(MKDIR) $(MISC)/$(TARGET).zip
+    $(MKDIR) $(MISC)/$(TARGET).zip/META-INF
+    $(SED) -e 's|@PATH@|$(SHL1TARGETN:f)|g' < manifest.xml \
+        > $(MISC)/$(TARGET).zip/META-INF/manifest.xml
+    $(SED) -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' \
+        -e 's|@VERSION@|$(my_version)|g' < description.xml \
+        > $(MISC)/$(TARGET).zip/description.xml
+    $(COPY) Addons.xcu ProtocolHandler.xcu $(SHL1TARGETN) $(MISC)/$(TARGET).zip
+    cd $(MISC)/$(TARGET).zip && zip ../boxt.oxt META-INF/manifest.xml \
+        description.xml Addons.xcu ProtocolHandler.xcu $(SHL1TARGETN:f)
diff --git a/configmgr/inc/configmgr/update.hxx b/desktop/test/deployment/boxt/manifest.xml
index b27a32487400..73ebfc306e30 100644
--- a/configmgr/inc/configmgr/update.hxx
+++ b/desktop/test/deployment/boxt/manifest.xml
@@ -1,4 +1,5 @@
-/*************************************************************************
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
@@ -23,29 +24,14 @@
 * <http://www.openoffice.org/license.html>
 * for a copy of the LGPLv3 License.
 *
-************************************************************************/
-
-#ifndef INCLUDED_CONFIGMGR_UPDATE_HXX
-#define INCLUDED_CONFIGMGR_UPDATE_HXX
-
-#include "sal/config.h"
-
-#include "configmgr/detail/configmgrdllapi.hxx"
-
-namespace rtl { class OUString; }
-
-namespace configmgr {
-
-namespace update {
-
-OOO_DLLPUBLIC_CONFIGMGR void insertExtensionXcsFile(
-    bool shared, rtl::OUString const & fileUri);
-
-OOO_DLLPUBLIC_CONFIGMGR void insertExtensionXcuFile(
-    bool shared, rtl::OUString const & fileUri);
-
-}
-
-}
-
-#endif
+**********************************************************************-->
+
+<m:manifest xmlns:m="http://openoffice.org/2001/manifest">
+  <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
+      m:full-path="Addons.xcu"/>
+  <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
+      m:full-path="ProtocolHandler.xcu"/>
+  <m:file-entry
+      m:media-type="application/vnd.sun.star.uno-component;type=native"
+      m:full-path="@PATH@"/>
+</m:manifest>
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index c669206bb3f3..47885dfd6b73 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -81,41 +81,7 @@ APP1TARGET=so$/$(TARGET)
 APP1NOSAL=TRUE
 APP1RPATH=BRAND
 APP1OBJS=$(OBJ)$/copyright_ascii_sun.obj $(OBJ)$/main.obj
-APP1STDLIBS =  \
-    $(SALLIB) \
-    $(SOFFICELIB) \
-    $(COMPHELPERLIB)  \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(I18NISOLANGLIB) \
-    $(SALLIB) \
-    $(SFXLIB) \
-    $(SVLLIB) \
-    $(SVTOOLLIB) \
-    $(TKLIB) \
-    $(TOOLSLIB) \
-    $(UCBHELPERLIB) \
-    $(UNOTOOLSLIB) \
-    $(VCLLIB) \
-    $(FWELIB) \
-    $(BASICLIB) \
-    $(XMLSCRIPTLIB) \
-    $(SALHELPERLIB) \
-    $(SOTLIB) \
-    $(SAXLIB) \
-    $(FWILIB) \
-    $(ICUUCLIB) \
-    $(I18NUTILLIB) \
-    $(ICULIB) \
-    $(JVMFWKLIB) \
-    $(BASEGFXLIB) \
-    $(ICUDATALIB) \
-    $(ICULELIB) \
-    $(JVMACCESSLIB) \
-    $(SALHELPERLIB) \
-    $(VOSLIB)
-
-
+APP1STDLIBS = $(SALLIB) $(SOFFICELIB)
 APP1DEPN= $(APP1RES) verinfo.rc
 
 .IF "$(GUI)" == "WNT"
@@ -140,40 +106,7 @@ APP5TARGET=soffice
 APP5NOSAL=TRUE
 APP5RPATH=BRAND
 APP5OBJS=$(OBJ)$/copyright_ascii_ooo.obj $(OBJ)$/main.obj
-APP5STDLIBS = \
-    $(SALLIB) \
-    $(SOFFICELIB) \
-    $(COMPHELPERLIB)  \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(I18NISOLANGLIB) \
-    $(SALLIB) \
-    $(SFXLIB) \
-    $(SVLLIB) \
-    $(SVTOOLLIB) \
-    $(TKLIB) \
-    $(TOOLSLIB) \
-    $(UCBHELPERLIB) \
-    $(UNOTOOLSLIB) \
-    $(VCLLIB) \
-    $(FWELIB) \
-    $(BASICLIB) \
-    $(XMLSCRIPTLIB) \
-    $(SALHELPERLIB) \
-    $(SOTLIB) \
-    $(SAXLIB) \
-    $(FWILIB) \
-    $(ICUUCLIB) \
-    $(I18NUTILLIB) \
-    $(ICULIB) \
-    $(JVMFWKLIB) \
-    $(BASEGFXLIB) \
-    $(ICUDATALIB) \
-    $(ICULELIB) \
-    $(JVMACCESSLIB) \
-    $(SALHELPERLIB) \
-    $(VOSLIB)
-
+APP5STDLIBS = $(SALLIB) $(SOFFICELIB)
 .IF "$(OS)" == "LINUX"
 APP5STDLIBS+= -lXext
 #APP5STDLIBS+= -lXext -lSM -lICE
diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc
index 28b1e0d4a811..6d92e2a99500 100644
--- a/desktop/util/ooverinfo.rc
+++ b/desktop/util/ooverinfo.rc
@@ -110,10 +110,10 @@ VS_VERSION_INFO versioninfo
 13 ICON "icons\\oasis-empty-document.ico"
 14 ICON "icons\\oasis-database.ico"
 15 ICON "icons\\oasis-formula.ico"
-16 ICON "icons\\empty-template.ico"
+16 ICON "icons\\oasis-web-template.ico"
 17 ICON "icons\\empty-document.ico"
 18 ICON "icons\\ooo-configuration.ico"
-19 ICON "icons\\ooo-open.ico"
+19 ICON "icons\\ooo3_open.ico"
 20 ICON "icons\\empty-document.ico"
 21 ICON "icons\\ooo3_writer_app.ico"
 22 ICON "icons\\ooo3_calc_app.ico"
diff --git a/desktop/util/ooverinfo2.rc b/desktop/util/ooverinfo2.rc
index d19603d54855..f149ec6474e7 100644
--- a/desktop/util/ooverinfo2.rc
+++ b/desktop/util/ooverinfo2.rc
@@ -62,7 +62,7 @@ ICON 10 "icons/oasis-presentation-template.ico"
 ICON 13 "icons/oasis-empty-document.ico"
 ICON 14 "icons/oasis-database.ico"
 ICON 15 "icons/oasis-formula.ico"
-ICON 16 "icons/empty-template.ico"
+ICON 16 "icons/oasis-web-template.ico"
 ICON 17 "icons/empty-document.ico"
 ICON 18 "icons/ooo-configuration.ico"
 ICON 19 "icons/ooo-open.ico"
diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
index d61493568490..038953f2aa79 100644
--- a/desktop/util/verinfo.rc
+++ b/desktop/util/verinfo.rc
@@ -115,10 +115,10 @@ VS_VERSION_INFO versioninfo
 13 ICON "icons\\oasis-empty-document.ico"
 14 ICON "icons\\oasis-database.ico"
 15 ICON "icons\\oasis-formula.ico"
-16 ICON "icons\\empty-template.ico"
+16 ICON "icons\\oasis-web-template.ico"
 17 ICON "icons\\empty-document.ico"
 18 ICON "icons\\so8-configuration.ico"
-19 ICON "icons\\so8-open.ico"
+19 ICON "icons\\so9_open.ico"
 20 ICON "icons\\empty-document.ico"
 21 ICON "icons\\so9_writer_app.ico"
 22 ICON "icons\\so9_calc_app.ico"
diff --git a/desktop/win32/source/applauncher/makefile.mk b/desktop/win32/source/applauncher/makefile.mk
index 4285476475ca..f0f5743f38a1 100644
--- a/desktop/win32/source/applauncher/makefile.mk
+++ b/desktop/win32/source/applauncher/makefile.mk
@@ -129,7 +129,7 @@ APP6PRODUCTDEF+=-DRES_APP_NAME=smath
 APP7TARGET=so$/sweb
 APP7NOSAL=TRUE
 APP7LINKRES=$(MISC)$/$(TARGET)7.res
-APP7ICON=$(SOLARRESDIR)$/icons/so9_html_doc.ico
+APP7ICON=$(SOLARRESDIR)$/icons/so9_writer_app.ico
 APP7OBJS = \
         $(OBJ)$/launcher.obj\
         $(OBJ)$/sweb.obj
diff --git a/desktop/win32/source/applauncher/ooo/makefile.mk b/desktop/win32/source/applauncher/ooo/makefile.mk
index 9c60ad1b48e4..02f240cce9e0 100644
--- a/desktop/win32/source/applauncher/ooo/makefile.mk
+++ b/desktop/win32/source/applauncher/ooo/makefile.mk
@@ -116,7 +116,7 @@ APP7DEPN=verinfo.rc
 APP7VERINFO=verinfo.rc
 APP7NOSAL=TRUE
 APP7LINKRES=$(MISC)$/$(TARGET)7.res
-APP7ICON=$(SOLARRESDIR)$/icons/ooo3_html_doc.ico
+APP7ICON=$(SOLARRESDIR)$/icons/ooo3_writer_app.ico
 APP7OBJS = \
         $(OBJ)$/launcher.obj\
        $(OBJ)$/sweb.obj
diff --git a/drawinglayer/prj/d.lst b/drawinglayer/prj/d.lst
index 7ae13f8ebe33..e863e47a3b18 100644
--- a/drawinglayer/prj/d.lst
+++ b/drawinglayer/prj/d.lst
@@ -55,7 +55,6 @@ mkdir: %_DEST%\inc%_EXT%\drawinglayer\primitive3d
 ..\inc\drawinglayer\primitive3d\baseprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\baseprimitive3d.hxx
 ..\inc\drawinglayer\primitive3d\groupprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\groupprimitive3d.hxx
 ..\inc\drawinglayer\primitive3d\hatchtextureprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\hatchtextureprimitive3d.hxx
-..\inc\drawinglayer\primitive2d\hiddengeometryprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\hiddengeometryprimitive3d.hxx
 ..\inc\drawinglayer\primitive3d\modifiedcolorprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\modifiedcolorprimitive3d.hxx
 ..\inc\drawinglayer\primitive3d\polygonprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\polygonprimitive3d.hxx
 ..\inc\drawinglayer\primitive3d\polygontubeprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\polygontubeprimitive3d.hxx
@@ -95,7 +94,6 @@ mkdir: %_DEST%\inc%_EXT%\drawinglayer\processor3d
 ..\inc\drawinglayer\processor3d\cutfindprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\cutfindprocessor3d.hxx
 ..\inc\drawinglayer\processor3d\defaultprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\defaultprocessor3d.hxx
 ..\inc\drawinglayer\processor3d\zbufferprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\zbufferprocessor3d.hxx
-..\inc\drawinglayer\processor3d\tbufferprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\tbufferprocessor3d.hxx
 
 mkdir: %_DEST%\inc%_EXT%\drawinglayer\attribute
 ..\inc\drawinglayer\attribute\fillgradientattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\fillgradientattribute.hxx
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index c2d097d74a3b..8659eb356405 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -78,14 +78,14 @@ namespace drawinglayer
             {
                 case attribute::GRADIENTSTYLE_LINEAR:
                 {
-                    texture::GeoTexSvxGradientLinear aGradient(getObjectRange(), aStart, aEnd, nSteps, getFillGradient().getBorder(), -getFillGradient().getAngle());
+                    texture::GeoTexSvxGradientLinear aGradient(getObjectRange(), aStart, aEnd, nSteps, getFillGradient().getBorder(), getFillGradient().getAngle());
                     aGradient.appendTransformations(rMatrices);
                     aGradient.appendColors(rColors);
                     break;
                 }
                 case attribute::GRADIENTSTYLE_AXIAL:
                 {
-                    texture::GeoTexSvxGradientAxial aGradient(getObjectRange(), aStart, aEnd, nSteps, getFillGradient().getBorder(), -getFillGradient().getAngle());
+                    texture::GeoTexSvxGradientAxial aGradient(getObjectRange(), aStart, aEnd, nSteps, getFillGradient().getBorder(), getFillGradient().getAngle());
                     aGradient.appendTransformations(rMatrices);
                     aGradient.appendColors(rColors);
                     break;
@@ -99,21 +99,21 @@ namespace drawinglayer
                 }
                 case attribute::GRADIENTSTYLE_ELLIPTICAL:
                 {
-                    texture::GeoTexSvxGradientElliptical aGradient(getObjectRange(), aStart, aEnd, nSteps, getFillGradient().getBorder(), getFillGradient().getOffsetX(), getFillGradient().getOffsetY(), -getFillGradient().getAngle());
+                    texture::GeoTexSvxGradientElliptical aGradient(getObjectRange(), aStart, aEnd, nSteps, getFillGradient().getBorder(), getFillGradient().getOffsetX(), getFillGradient().getOffsetY(), getFillGradient().getAngle());
                     aGradient.appendTransformations(rMatrices);
                     aGradient.appendColors(rColors);
                     break;
                 }
                 case attribute::GRADIENTSTYLE_SQUARE:
                 {
-                    texture::GeoTexSvxGradientSquare aGradient(getObjectRange(), aStart, aEnd, nSteps, getFillGradient().getBorder(), getFillGradient().getOffsetX(), getFillGradient().getOffsetY(), -getFillGradient().getAngle());
+                    texture::GeoTexSvxGradientSquare aGradient(getObjectRange(), aStart, aEnd, nSteps, getFillGradient().getBorder(), getFillGradient().getOffsetX(), getFillGradient().getOffsetY(), getFillGradient().getAngle());
                     aGradient.appendTransformations(rMatrices);
                     aGradient.appendColors(rColors);
                     break;
                 }
                 case attribute::GRADIENTSTYLE_RECT:
                 {
-                    texture::GeoTexSvxGradientRect aGradient(getObjectRange(), aStart, aEnd, nSteps, getFillGradient().getBorder(), getFillGradient().getOffsetX(), getFillGradient().getOffsetY(), -getFillGradient().getAngle());
+                    texture::GeoTexSvxGradientRect aGradient(getObjectRange(), aStart, aEnd, nSteps, getFillGradient().getBorder(), getFillGradient().getOffsetX(), getFillGradient().getOffsetY(), getFillGradient().getAngle());
                     aGradient.appendTransformations(rMatrices);
                     aGradient.appendColors(rColors);
                     break;
@@ -213,12 +213,16 @@ namespace drawinglayer
             if(attribute::GRADIENTSTYLE_RADIAL == getFillGradient().getStyle()
                 || attribute::GRADIENTSTYLE_ELLIPTICAL == getFillGradient().getStyle())
             {
-                const basegfx::B2DPoint aCircleCenter(0.5, 0.5);
-                aUnitPolygon = basegfx::tools::createPolygonFromEllipse(aCircleCenter, 0.5, 0.5);
+                aUnitPolygon = basegfx::tools::createPolygonFromCircle(
+                    basegfx::B2DPoint(0,0), 1);
+            }
+            else if(attribute::GRADIENTSTYLE_LINEAR == maFillGradient.getStyle())
+            {
+                aUnitPolygon = basegfx::tools::createPolygonFromRect(basegfx::B2DRange(0, 0, 1, 1));
             }
             else
             {
-                aUnitPolygon = basegfx::tools::createUnitPolygon();
+                aUnitPolygon = basegfx::tools::createPolygonFromRect(basegfx::B2DRange(-1, -1, 1, 1));
             }
 
             // get the transform matrices and colors (where colors
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index b606f4a286fc..4466081cae32 100644
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
@@ -50,12 +50,11 @@ namespace drawinglayer
         Primitive2DSequence FillHatchPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
         {
             Primitive2DSequence aRetval;
-
             if(!getFillHatch().isDefault())
             {
                 // create hatch
                 const basegfx::BColor aHatchColor(getFillHatch().getColor());
-                const double fAngle(-getFillHatch().getAngle());
+                const double fAngle(getFillHatch().getAngle());
                 ::std::vector< basegfx::B2DHomMatrix > aMatrices;
 
                 // get hatch transformations
@@ -64,7 +63,7 @@ namespace drawinglayer
                     case attribute::HATCHSTYLE_TRIPLE:
                     {
                         // rotated 45 degrees
-                        texture::GeoTexSvxHatch aHatch(getObjectRange(), getFillHatch().getDistance(), fAngle + F_PI4);
+                        texture::GeoTexSvxHatch aHatch(getObjectRange(), getFillHatch().getDistance(), fAngle - F_PI4);
                         aHatch.appendTransformations(aMatrices);
 
                         // fall-through by purpose
@@ -72,7 +71,7 @@ namespace drawinglayer
                     case attribute::HATCHSTYLE_DOUBLE:
                     {
                         // rotated 90 degrees
-                        texture::GeoTexSvxHatch aHatch(getObjectRange(), getFillHatch().getDistance(), fAngle + F_PI2);
+                        texture::GeoTexSvxHatch aHatch(getObjectRange(), getFillHatch().getDistance(), fAngle - F_PI2);
                         aHatch.appendTransformations(aMatrices);
 
                         // fall-through by purpose
diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
index 5dbdce756a5a..d94fbb5f893c 100644
--- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
@@ -147,7 +147,7 @@ namespace drawinglayer
                                             // get 2d range of texture coordinates
                                             const basegfx::B2DRange aOutlineRange(basegfx::tools::getRange(aTexPolyPolygon));
                                             const basegfx::BColor aHatchColor(getHatch().getColor());
-                                            const double fAngle(-getHatch().getAngle());
+                                            const double fAngle(getHatch().getAngle());
                                             ::std::vector< basegfx::B2DHomMatrix > aMatrices;
 
                                             // get hatch transformations
@@ -156,13 +156,13 @@ namespace drawinglayer
                                                 case attribute::HATCHSTYLE_TRIPLE:
                                                 {
                                                     // rotated 45 degrees
-                                                    texture::GeoTexSvxHatch aHatch(aOutlineRange, getHatch().getDistance(), fAngle + F_PI4);
+                                                    texture::GeoTexSvxHatch aHatch(aOutlineRange, getHatch().getDistance(), fAngle - F_PI4);
                                                     aHatch.appendTransformations(aMatrices);
                                                 }
                                                 case attribute::HATCHSTYLE_DOUBLE:
                                                 {
                                                     // rotated 90 degrees
-                                                    texture::GeoTexSvxHatch aHatch(aOutlineRange, getHatch().getDistance(), fAngle + F_PI2);
+                                                    texture::GeoTexSvxHatch aHatch(aOutlineRange, getHatch().getDistance(), fAngle - F_PI2);
                                                     aHatch.appendTransformations(aMatrices);
                                                 }
                                                 case attribute::HATCHSTYLE_SINGLE:
diff --git a/drawinglayer/source/processor2d/vclhelpergradient.cxx b/drawinglayer/source/processor2d/vclhelpergradient.cxx
index b9fa91a89750..6c318dbcedc9 100644
--- a/drawinglayer/source/processor2d/vclhelpergradient.cxx
+++ b/drawinglayer/source/processor2d/vclhelpergradient.cxx
@@ -210,16 +210,6 @@ namespace drawinglayer
         ::std::vector< basegfx::BColor > aColors;
         basegfx::B2DPolygon aUnitPolygon;
 
-        if(attribute::GRADIENTSTYLE_RADIAL == eGradientStyle || attribute::GRADIENTSTYLE_ELLIPTICAL == eGradientStyle)
-        {
-            const basegfx::B2DPoint aCircleCenter(0.5, 0.5);
-            aUnitPolygon = basegfx::tools::createPolygonFromEllipse(aCircleCenter, 0.5, 0.5);
-        }
-        else
-        {
-            aUnitPolygon = basegfx::tools::createUnitPolygon();
-        }
-
         // make sure steps is not too high/low
         nSteps = impCalcGradientSteps(rOutDev, nSteps, aOutlineRange, sal_uInt32((rStart.getMaximumDistance(rEnd) * 127.5) + 0.5));
 
@@ -231,6 +221,7 @@ namespace drawinglayer
                 texture::GeoTexSvxGradientLinear aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fAngle);
                 aGradient.appendTransformations(aMatrices);
                 aGradient.appendColors(aColors);
+                aUnitPolygon = basegfx::tools::createUnitPolygon();
                 break;
             }
             case attribute::GRADIENTSTYLE_AXIAL:
@@ -238,6 +229,7 @@ namespace drawinglayer
                 texture::GeoTexSvxGradientAxial aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fAngle);
                 aGradient.appendTransformations(aMatrices);
                 aGradient.appendColors(aColors);
+                aUnitPolygon = basegfx::tools::createPolygonFromRect(basegfx::B2DRange(-1, -1, 1, 1));
                 break;
             }
             case attribute::GRADIENTSTYLE_RADIAL:
@@ -245,6 +237,7 @@ namespace drawinglayer
                 texture::GeoTexSvxGradientRadial aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fOffsetX, fOffsetY);
                 aGradient.appendTransformations(aMatrices);
                 aGradient.appendColors(aColors);
+                aUnitPolygon = basegfx::tools::createPolygonFromCircle(basegfx::B2DPoint(0,0), 1);
                 break;
             }
             case attribute::GRADIENTSTYLE_ELLIPTICAL:
@@ -252,6 +245,7 @@ namespace drawinglayer
                 texture::GeoTexSvxGradientElliptical aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fOffsetX, fOffsetX, fAngle);
                 aGradient.appendTransformations(aMatrices);
                 aGradient.appendColors(aColors);
+                aUnitPolygon = basegfx::tools::createPolygonFromCircle(basegfx::B2DPoint(0,0), 1);
                 break;
             }
             case attribute::GRADIENTSTYLE_SQUARE:
@@ -259,6 +253,7 @@ namespace drawinglayer
                 texture::GeoTexSvxGradientSquare aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fOffsetX, fOffsetX, fAngle);
                 aGradient.appendTransformations(aMatrices);
                 aGradient.appendColors(aColors);
+                aUnitPolygon = basegfx::tools::createPolygonFromRect(basegfx::B2DRange(-1, -1, 1, 1));
                 break;
             }
             case attribute::GRADIENTSTYLE_RECT:
@@ -266,6 +261,7 @@ namespace drawinglayer
                 texture::GeoTexSvxGradientRect aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fOffsetX, fOffsetX, fAngle);
                 aGradient.appendTransformations(aMatrices);
                 aGradient.appendColors(aColors);
+                aUnitPolygon = basegfx::tools::createPolygonFromRect(basegfx::B2DRange(-1, -1, 1, 1));
                 break;
             }
         }
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index fe0c6ff1ea4f..e49e54fb751c 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -581,7 +581,7 @@ namespace drawinglayer
                     impDrawGradientToOutDev(
                         *mpOutputDevice, aLocalPolyPolygon, rGradient.getStyle(), rGradient.getSteps(),
                         aStartColor, aEndColor, rGradient.getBorder(),
-                        -rGradient.getAngle(), rGradient.getOffsetX(), rGradient.getOffsetY(), false);
+                        rGradient.getAngle(), rGradient.getOffsetX(), rGradient.getOffsetY(), false);
                 }
             }
         }
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
index b6f5cd60f271..13d50a63878b 100644
--- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
@@ -100,12 +100,12 @@ namespace drawinglayer
                     {
                         case attribute::GRADIENTSTYLE_LINEAR:
                         {
-                            pNewTex.reset(new texture::GeoTexSvxGradientLinear(aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), -rFillGradient.getAngle()));
+                            pNewTex.reset(new texture::GeoTexSvxGradientLinear(aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), rFillGradient.getAngle()));
                             break;
                         }
                         case attribute::GRADIENTSTYLE_AXIAL:
                         {
-                            pNewTex.reset(new texture::GeoTexSvxGradientAxial(aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), -rFillGradient.getAngle()));
+                            pNewTex.reset(new texture::GeoTexSvxGradientAxial(aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), rFillGradient.getAngle()));
                             break;
                         }
                         case attribute::GRADIENTSTYLE_RADIAL:
@@ -115,17 +115,17 @@ namespace drawinglayer
                         }
                         case attribute::GRADIENTSTYLE_ELLIPTICAL:
                         {
-                            pNewTex.reset(new texture::GeoTexSvxGradientElliptical(aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), rFillGradient.getOffsetX(), rFillGradient.getOffsetY(), -rFillGradient.getAngle()));
+                            pNewTex.reset(new texture::GeoTexSvxGradientElliptical(aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), rFillGradient.getOffsetX(), rFillGradient.getOffsetY(), rFillGradient.getAngle()));
                             break;
                         }
                         case attribute::GRADIENTSTYLE_SQUARE:
                         {
-                            pNewTex.reset(new texture::GeoTexSvxGradientSquare(aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), rFillGradient.getOffsetX(), rFillGradient.getOffsetY(), -rFillGradient.getAngle()));
+                            pNewTex.reset(new texture::GeoTexSvxGradientSquare(aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), rFillGradient.getOffsetX(), rFillGradient.getOffsetY(), rFillGradient.getAngle()));
                             break;
                         }
                         case attribute::GRADIENTSTYLE_RECT:
                         {
-                            pNewTex.reset(new texture::GeoTexSvxGradientRect(aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), rFillGradient.getOffsetX(), rFillGradient.getOffsetY(), -rFillGradient.getAngle()));
+                            pNewTex.reset(new texture::GeoTexSvxGradientRect(aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), rFillGradient.getOffsetX(), rFillGradient.getOffsetY(), rFillGradient.getAngle()));
                             break;
                         }
                     }
diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx
index 770e3035692d..107072b712dd 100644
--- a/drawinglayer/source/texture/texture.cxx
+++ b/drawinglayer/source/texture/texture.cxx
@@ -158,15 +158,10 @@ namespace drawinglayer
         {
             if(maGradientInfo.mnSteps)
             {
-                const double fTop(mfBorder);
-                const double fStripeWidth((1.0 - fTop) / maGradientInfo.mnSteps);
-
+                const double fStripeWidth(1.0 / maGradientInfo.mnSteps);
                 for(sal_uInt32 a(1L); a < maGradientInfo.mnSteps; a++)
                 {
-                    const double fOffsetUpper(fStripeWidth * (double)a);
-
-                    // create matrix
-                    const basegfx::B2DRange aRect(0.0, fTop + fOffsetUpper, 1.0, 1.0);
+                    const basegfx::B2DRange aRect(0.0, fStripeWidth * a, 1.0, 1.0);
                     impAppendMatrix(rMatrices, aRect);
                 }
             }
@@ -218,17 +213,10 @@ namespace drawinglayer
         {
             if(maGradientInfo.mnSteps)
             {
-                const double fHalfBorder(mfBorder * 0.5);
-                double fTop(fHalfBorder);
-                double fBottom(1.0 - fHalfBorder);
-                const double fStripeWidth((fBottom - fTop) / ((maGradientInfo.mnSteps * 2L) - 1L));
-
-                for(sal_uInt32 a(1L); a < maGradientInfo.mnSteps; a++)
+                const double fStripeWidth=1.0 / (maGradientInfo.mnSteps - 1L);
+                for(sal_uInt32 a(maGradientInfo.mnSteps-1L); a != 0; a--)
                 {
-                    const double fOffset(fStripeWidth * (double)a);
-
-                    // create matrix
-                    const basegfx::B2DRange aRect(0.0, fTop + fOffset, 1.0, fBottom - fOffset);
+                    const basegfx::B2DRange aRect(0, 0, 1.0, fStripeWidth * a);
                     impAppendMatrix(rMatrices, aRect);
                 }
             }
@@ -280,34 +268,10 @@ namespace drawinglayer
         {
             if(maGradientInfo.mnSteps)
             {
-                const double fHalfBorder((1.0 - mfBorder) * 0.5);
-                double fLeft(0.5 - fHalfBorder);
-                double fTop(0.5 - fHalfBorder);
-                double fRight(0.5 + fHalfBorder);
-                double fBottom(0.5 + fHalfBorder);
-                double fIncrementX, fIncrementY;
-
-                if(maGradientInfo.mfAspectRatio > 1.0)
-                {
-                    fIncrementY = (fBottom - fTop) / (double)(maGradientInfo.mnSteps * 2L);
-                    fIncrementX = fIncrementY / maGradientInfo.mfAspectRatio;
-                }
-                else
-                {
-                    fIncrementX = (fRight - fLeft) / (double)(maGradientInfo.mnSteps * 2L);
-                    fIncrementY = fIncrementX * maGradientInfo.mfAspectRatio;
-                }
-
-                for(sal_uInt32 a(1L); a < maGradientInfo.mnSteps; a++)
+                const double fStepSize=1.0 / maGradientInfo.mnSteps;
+                for(sal_uInt32 a(maGradientInfo.mnSteps-1L); a > 0; a--)
                 {
-                    // next step
-                    fLeft += fIncrementX;
-                    fRight -= fIncrementX;
-                    fTop += fIncrementY;
-                    fBottom -= fIncrementY;
-
-                    // create matrix
-                    const basegfx::B2DRange aRect(fLeft, fTop, fRight, fBottom);
+                    const basegfx::B2DRange aRect(0, 0, fStepSize*a, fStepSize*a);
                     impAppendMatrix(rMatrices, aRect);
                 }
             }
@@ -352,34 +316,29 @@ namespace drawinglayer
         {
             if(maGradientInfo.mnSteps)
             {
-                const double fHalfBorder((1.0 - mfBorder) * 0.5);
-                double fLeft(0.5 - fHalfBorder);
-                double fTop(0.5 - fHalfBorder);
-                double fRight(0.5 + fHalfBorder);
-                double fBottom(0.5 + fHalfBorder);
+                double fWidth(1);
+                double fHeight(1);
                 double fIncrementX, fIncrementY;
 
                 if(maGradientInfo.mfAspectRatio > 1.0)
                 {
-                    fIncrementY = (fBottom - fTop) / (double)(maGradientInfo.mnSteps * 2L);
+                    fIncrementY = fHeight / maGradientInfo.mnSteps;
                     fIncrementX = fIncrementY / maGradientInfo.mfAspectRatio;
                 }
                 else
                 {
-                    fIncrementX = (fRight - fLeft) / (double)(maGradientInfo.mnSteps * 2L);
+                    fIncrementX = fWidth / maGradientInfo.mnSteps;
                     fIncrementY = fIncrementX * maGradientInfo.mfAspectRatio;
                 }
 
                 for(sal_uInt32 a(1L); a < maGradientInfo.mnSteps; a++)
                 {
                     // next step
-                    fLeft += fIncrementX;
-                    fRight -= fIncrementX;
-                    fTop += fIncrementY;
-                    fBottom -= fIncrementY;
+                    fWidth  -= fIncrementX;
+                    fHeight -= fIncrementY;
 
                     // create matrix
-                    const basegfx::B2DRange aRect(fLeft, fTop, fRight, fBottom);
+                    const basegfx::B2DRange aRect(0, 0, fWidth, fHeight);
                     impAppendMatrix(rMatrices, aRect);
                 }
             }
@@ -424,42 +383,10 @@ namespace drawinglayer
         {
             if(maGradientInfo.mnSteps)
             {
-                const double fHalfBorder((1.0 - mfBorder) * 0.5);
-                double fLeft(0.5 - fHalfBorder);
-                double fTop(0.5 - fHalfBorder);
-                double fRight(0.5 + fHalfBorder);
-                double fBottom(0.5 + fHalfBorder);
-                double fIncrementX, fIncrementY;
-
-                if(maGradientInfo.mfAspectRatio > 1.0)
-                {
-                    const double fWidth(fRight - fLeft);
-                    const double fHalfAspectExpansion(((maGradientInfo.mfAspectRatio - 1.0) * 0.5) * fWidth);
-                    fTop -= fHalfAspectExpansion;
-                    fBottom += fHalfAspectExpansion;
-                    fIncrementX = fWidth / (double)(maGradientInfo.mnSteps * 2L);
-                    fIncrementY = fIncrementX * maGradientInfo.mfAspectRatio;
-                }
-                else
+                const double fStepSize=1.0 / maGradientInfo.mnSteps;
+                for(sal_uInt32 a(maGradientInfo.mnSteps-1L); a > 0; a--)
                 {
-                    const double fHeight(fBottom - fTop);
-                    const double fHalfAspectExpansion((((1.0 / maGradientInfo.mfAspectRatio) - 1.0) * 0.5) * fHeight);
-                    fLeft -= fHalfAspectExpansion;
-                    fRight += fHalfAspectExpansion;
-                    fIncrementY = fHeight / (double)(maGradientInfo.mnSteps * 2L);
-                    fIncrementX = fIncrementY / maGradientInfo.mfAspectRatio;
-                }
-
-                for(sal_uInt32 a(1L); a < maGradientInfo.mnSteps; a++)
-                {
-                    // next step
-                    fLeft += fIncrementX;
-                    fRight -= fIncrementX;
-                    fTop += fIncrementY;
-                    fBottom -= fIncrementY;
-
-                    // create matrix
-                    const basegfx::B2DRange aRect(fLeft, fTop, fRight, fBottom);
+                    const basegfx::B2DRange aRect(0, 0, fStepSize*a, fStepSize*a);
                     impAppendMatrix(rMatrices, aRect);
                 }
             }
@@ -504,34 +431,29 @@ namespace drawinglayer
         {
             if(maGradientInfo.mnSteps)
             {
-                const double fHalfBorder((1.0 - mfBorder) * 0.5);
-                double fLeft(0.5 - fHalfBorder);
-                double fTop(0.5 - fHalfBorder);
-                double fRight(0.5 + fHalfBorder);
-                double fBottom(0.5 + fHalfBorder);
+                double fWidth(1);
+                double fHeight(1);
                 double fIncrementX, fIncrementY;
 
                 if(maGradientInfo.mfAspectRatio > 1.0)
                 {
-                    fIncrementY = (fBottom - fTop) / (double)(maGradientInfo.mnSteps * 2L);
+                    fIncrementY = fHeight / maGradientInfo.mnSteps;
                     fIncrementX = fIncrementY / maGradientInfo.mfAspectRatio;
                 }
                 else
                 {
-                    fIncrementX = (fRight - fLeft) / (double)(maGradientInfo.mnSteps * 2L);
+                    fIncrementX = fWidth / maGradientInfo.mnSteps;
                     fIncrementY = fIncrementX * maGradientInfo.mfAspectRatio;
                 }
 
                 for(sal_uInt32 a(1L); a < maGradientInfo.mnSteps; a++)
                 {
                     // next step
-                    fLeft += fIncrementX;
-                    fRight -= fIncrementX;
-                    fTop += fIncrementY;
-                    fBottom -= fIncrementY;
+                    fWidth  -= fIncrementX;
+                    fHeight -= fIncrementY;
 
                     // create matrix
-                    const basegfx::B2DRange aRect(fLeft, fTop, fRight, fBottom);
+                    const basegfx::B2DRange aRect(0, 0, fWidth, fHeight);
                     impAppendMatrix(rMatrices, aRect);
                 }
             }
@@ -567,6 +489,8 @@ namespace drawinglayer
             double fTargetOffsetX(rTargetRange.getMinX());
             double fTargetOffsetY(rTargetRange.getMinY());
 
+            fAngle = -fAngle;
+
             // add object expansion
             if(0.0 != fAngle)
             {
diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index d83998df9efd..cf85b53bad43 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -189,7 +189,7 @@ namespace drawinglayer
         {
             const attribute::FillHatchAttribute& rHatch(rPrimitive.getHatch());
             const basegfx::B2DRange aOutlineRange(0.0, 0.0, rPrimitive.getTextureSize().getX(), rPrimitive.getTextureSize().getY());
-            const double fAngleA(-rHatch.getAngle());
+            const double fAngleA(rHatch.getAngle());
             maColor = rHatch.getColor();
             mbFillBackground = rHatch.isFillBackground();
             mp0 = new GeoTexSvxHatch(aOutlineRange, rHatch.getDistance(), fAngleA);
diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index c900228cc053..1ef6bad09d9b 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -209,6 +209,8 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
     SvxAutoCorrLastFileAskTable_Impl* pLastFileTable;
     CharClass* pCharClass;
 
+    bool bRunNext;
+
     LanguageType eCharClassLang;
 
     long nFlags;
@@ -374,6 +376,8 @@ public:
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang  = LANGUAGE_SYSTEM);
 
+    bool                HasRunNext() { return bRunNext; }
+
     static long         GetDefaultFlags();
 
 // returns TRUE for charcters where the function
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 94981dc32e73..b5a43ae8a948 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1129,6 +1129,26 @@ namespace accessibility
 
                 return aPoint;
             }
+            // --> OD 2009-12-16 #i88070#
+            // fallback to parent's <XAccessibleContext> instance
+            else
+            {
+                uno::Reference< XAccessibleContext > xParentContext = xParent->getAccessibleContext();
+                if ( xParentContext.is() )
+                {
+                    uno::Reference< XAccessibleComponent > xParentContextComponent( xParentContext, uno::UNO_QUERY );
+                    if( xParentContextComponent.is() )
+                    {
+                        awt::Point aRefPoint = xParentContextComponent->getLocationOnScreen();
+                        awt::Point aPoint = getLocation();
+                        aPoint.X += aRefPoint.X;
+                        aPoint.Y += aRefPoint.Y;
+
+                        return aPoint;
+                    }
+                }
+            }
+            // <--
         }
 
         throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot access parent")),
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 01a387249f24..a21c6ed345c6 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -458,7 +458,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
     fprintf( fp, "\n\n================================================================================" );
     fprintf( fp, "\n==================   EditEngine & Views   ======================================" );
     fprintf( fp, "\n================================================================================" );
-    fprintf( fp, "\nControl: %lx", pEE->GetControlWord() );
+    fprintf( fp, "\nControl: %"SAL_PRIxUINT32, pEE->GetControlWord() );
     fprintf( fp, "\nRefMapMode: %i", pEE->pImpEditEngine->pRefDev->GetMapMode().GetMapUnit() );
     fprintf( fp, "\nPaperSize: %li x %li", pEE->GetPaperSize().Width(), pEE->GetPaperSize().Height() );
     fprintf( fp, "\nMaxAutoPaperSize: %li x %li", pEE->GetMaxAutoPaperSize().Width(), pEE->GetMaxAutoPaperSize().Height() );
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 212fb8ff9446..8621f173c250 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -49,6 +49,7 @@
 #include <eerdll2.hxx>
 #include <editeng/eerdll.hxx>
 #include <editeng.hrc>
+#include <editeng/acorrcfg.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/txtrange.hxx>
 #include <vcl/graph.hxx>
@@ -1144,8 +1145,10 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                     xub_Unicode nCharCode = rKeyEvent.GetCharCode();
                     pEditView->pImpEditView->DrawSelection();
                     // Autokorrektur ?
+                    SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
                     if ( ( pImpEditEngine->GetStatus().DoAutoCorrect() ) &&
-                        SvxAutoCorrect::IsAutoCorrectChar( nCharCode ) )
+                        ( SvxAutoCorrect::IsAutoCorrectChar( nCharCode ) ||
+                          pAutoCorrect->HasRunNext() ) )
                     {
                         aCurSel = pImpEditEngine->AutoCorrect( aCurSel, nCharCode, !pEditView->IsInsertMode() );
                     }
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index ddb82a06661d..569b80639b6b 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -60,6 +60,7 @@ EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValu
     bWasInPara = FALSE;
     nInTable = 0;
     nInCell = 0;
+    bInTitle = FALSE;
     nDefListLevel = 0;
     nBulletLevel = 0;
     nNumberingLevel = 0;
@@ -179,11 +180,14 @@ void EditHTMLParser::NextToken( int nToken )
     break;
     case HTML_TEXTTOKEN:
     {
-        if ( !bInPara )
-            StartPara( FALSE );
-
-//        if ( bInPara || pCurAnchor )
+        // #i110937# for <title> content, call aImportHdl (no SkipGroup), but don't insert the text into the EditEngine
+        if (!bInTitle)
         {
+            if ( !bInPara )
+                StartPara( FALSE );
+
+            // if ( bInPara || pCurAnchor )
+
             String aText = aToken;
             if ( aText.Len() && ( aText.GetChar( 0 ) == ' ' )
                     && ThrowAwayBlank() && !IsReadPRE() )
@@ -342,6 +346,13 @@ void EditHTMLParser::NextToken( int nToken )
 
     // #58335# kein SkipGroup on/off auf inline markup etc.
 
+    case HTML_TITLE_ON:
+        bInTitle = TRUE;
+        break;
+    case HTML_TITLE_OFF:
+        bInTitle = FALSE;
+        break;
+
     // globals
     case HTML_HTML_ON:
     case HTML_HTML_OFF:
@@ -355,8 +366,6 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_THEAD_OFF:
     case HTML_TBODY_ON:
     case HTML_TBODY_OFF:
-    case HTML_TITLE_ON:
-    case HTML_TITLE_OFF:
     // inline elements, structural markup
     // HTML 3.0
     case HTML_BANNER_ON:
diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index a9b20bcd652f..8d11e743755a 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -57,6 +57,7 @@ private:
     BOOL                    bFieldsInserted;
     BYTE                    nInTable;
     BYTE                    nInCell;
+    BOOL                    bInTitle;
 
     BYTE                    nDefListLevel;
     BYTE                    nBulletLevel;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 2631c71a6b17..64343517c69f 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -363,7 +363,7 @@ SvxAutoCorrect::SvxAutoCorrect( const String& rShareAutocorrFile,
     sUserAutoCorrFile( rUserAutocorrFile ),
     pLangTable( new SvxAutoCorrLanguageTable_Impl ),
     pLastFileTable( new SvxAutoCorrLastFileAskTable_Impl ),
-    pCharClass( 0 ),
+    pCharClass( 0 ), bRunNext( false ),
     cStartDQuote( 0 ), cEndDQuote( 0 ), cStartSQuote( 0 ), cEndSQuote( 0 )
 {
     nFlags = SvxAutoCorrect::GetDefaultFlags();
@@ -380,7 +380,7 @@ SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect& rCpy )
 
     pLangTable( new SvxAutoCorrLanguageTable_Impl ),
     pLastFileTable( new SvxAutoCorrLastFileAskTable_Impl ),
-    pCharClass( 0 ),
+    pCharClass( 0 ), bRunNext( false ),
 
     nFlags( rCpy.nFlags & ~(ChgWordLstLoad|CplSttLstLoad|WrdSttLstLoad)),
     cStartDQuote( rCpy.cStartDQuote ), cEndDQuote( rCpy.cEndDQuote ),
@@ -669,7 +669,7 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
 
             // Check the presence of "://" in the word
             xub_StrLen nStrPos = rTxt.Search( String::CreateFromAscii( "://" ), nSttWdPos + 1 );
-            if ( STRING_NOTFOUND == nStrPos )
+            if ( STRING_NOTFOUND == nStrPos && nEndPos > 0 )
             {
                 // Check the previous char
                 sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 );
@@ -693,9 +693,12 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
                         // Add the non-breaking space at the end pos
                         if ( bHasSpace )
                             rDoc.Insert( nPos, CHAR_HARDBLANK );
+                        bRunNext = true;
                         bRet = true;
                     }
                 }
+                else if ( chars.indexOf( sal_Unicode( cPrevChar ) ) != -1 )
+                    bRunNext = true;
             }
         }
         else if ( cChar == '/' )
@@ -1189,6 +1192,9 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                     BOOL bInsert )
 {
     ULONG nRet = 0;
+    bool bIsNextRun = bRunNext;
+    bRunNext = false;  // if it was set, then it has to be turned off
+
     do{                                 // only for middle check loop !!
         if( cChar )
         {
@@ -1227,10 +1233,39 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                 rDoc.Replace( nInsPos, cChar );
 
             // Hardspaces autocorrection
-            if ( NeedsHardspaceAutocorr( cChar ) && IsAutoCorrFlag( AddNonBrkSpace ) &&
-                FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos, FALSE ) ) )
+            if ( IsAutoCorrFlag( AddNonBrkSpace ) )
             {
-                nRet = AddNonBrkSpace;
+                if ( NeedsHardspaceAutocorr( cChar ) &&
+                    FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos, FALSE ) ) )
+                {
+                    nRet = AddNonBrkSpace;
+                }
+                else if ( bIsNextRun && !IsAutoCorrectChar( cChar ) )
+                {
+                    // Remove the NBSP if it wasn't an autocorrection
+                    if ( NeedsHardspaceAutocorr( rTxt.GetChar( nInsPos - 1 ) ) &&
+                            cChar != ' ' && cChar != '\t' && cChar != CHAR_HARDBLANK )
+                    {
+                        // Look for the last HARD_SPACE
+                        xub_StrLen nPos = nInsPos - 1;
+                        bool bFound = false;
+                        while ( nPos != STRING_NOTFOUND  && !bFound )
+                        {
+                            sal_Unicode cTmpChar = rTxt.GetChar( nPos );
+                            if ( cTmpChar == CHAR_HARDBLANK )
+                                bFound = true;
+                            else if ( !NeedsHardspaceAutocorr( cTmpChar ) )
+                                nPos = STRING_NOTFOUND;
+                            nPos--;
+                        }
+
+                        if ( bFound && nPos != STRING_NOTFOUND )
+                        {
+                            rDoc.Delete( nPos + 1, nPos + 2 );
+                            nRet = AddNonBrkSpace;
+                        }
+                    }
+                }
             }
         }
 
diff --git a/eventattacher/source/exports.map b/eventattacher/source/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/eventattacher/source/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/eventattacher/source/makefile.mk b/eventattacher/source/makefile.mk
index ddab6f7ea30f..632a1fa41ad5 100644
--- a/eventattacher/source/makefile.mk
+++ b/eventattacher/source/makefile.mk
@@ -44,7 +44,7 @@ SLOFILES= \
 SHL1TARGET=	$(TARGET)
 SHL1IMPLIB=	i$(TARGET)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/fileaccess/source/exports.map b/fileaccess/source/exports.map
deleted file mode 100644
index 2dd01358d43f..000000000000
--- a/fileaccess/source/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-OOO_1.1 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk
index 7bd6266f7df0..2b7826534618 100644
--- a/fileaccess/source/makefile.mk
+++ b/fileaccess/source/makefile.mk
@@ -46,7 +46,7 @@ SLOFILES= \
 SHL1TARGET= $(TARGET)
 SHL1IMPLIB=	i$(TARGET)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc
index e8243482a776..e4dc05aca4e9 100644
--- a/formula/inc/formula/compiler.hrc
+++ b/formula/inc/formula/compiler.hrc
@@ -393,12 +393,8 @@
 #define SC_OPCODE_LAST_OPCODE_ID    394      /* last OpCode */
 
 /*** Interna ***/
-#define SC_OPCODE_INTERNAL_BEGIN   9995
-#define SC_OPCODE_GAME             9995
-#define SC_OPCODE_SPEW             9996
-#define SC_OPCODE_TTT              9997
-#define SC_OPCODE_TEAM             9998
-#define SC_OPCODE_ANSWER           9999
+#define SC_OPCODE_INTERNAL_BEGIN   9999
+#define SC_OPCODE_TTT              9999
 #define SC_OPCODE_INTERNAL_END     9999
 
 /*** from here on ExtraData contained ***/
diff --git a/formula/inc/formula/errorcodes.hxx b/formula/inc/formula/errorcodes.hxx
index 2d8d9d18b71b..f9b04e012fab 100644
--- a/formula/inc/formula/errorcodes.hxx
+++ b/formula/inc/formula/errorcodes.hxx
@@ -83,9 +83,13 @@ const USHORT NOTAVAILABLE            = 0x7fff;
     represent an interpreter error code. */
 inline double CreateDoubleError( USHORT nErr )
 {
-    double fVal;
+    union
+    {
+        double fVal;
+        sal_math_Double smVal;
+    };
     ::rtl::math::setNan( &fVal );
-    reinterpret_cast< sal_math_Double * >(&fVal)->nan_parts.fraction_lo = nErr;
+    smVal.nan_parts.fraction_lo = nErr;
     return fVal;
 }
 
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index 2ec322d29bf7..390ab21048d3 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -386,11 +386,7 @@ enum OpCodeEnum
         ocNumberValue       = SC_OPCODE_NUMBERVALUE,
     // internal stuff
         ocInternalBegin     = SC_OPCODE_INTERNAL_BEGIN,
-        ocGame              = SC_OPCODE_GAME,
-        ocSpew              = SC_OPCODE_SPEW,
         ocTTT               = SC_OPCODE_TTT,
-        ocTeam              = SC_OPCODE_TEAM,
-        ocAnswer            = SC_OPCODE_ANSWER,
         ocInternalEnd       = SC_OPCODE_INTERNAL_END,
     // from here on ExtraData
         ocDataToken1        = SC_OPCODE_DATA_TOKEN_1,
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 4cc5306fec9f..533ec85358c5 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -46,7 +46,7 @@ namespace formula
 // =============================================================================
     using namespace ::com::sun::star;
 
-    static const sal_Char* pInternal[ 5 ] = { "GAME", "SPEW", "TTT", "STARCALCTEAM", "ANTWORT" };
+    static const sal_Char* pInternal[ 1 ] = { "TTT" };
 
 // =============================================================================
 namespace
diff --git a/formula/util/for.map b/formula/util/for.map
deleted file mode 100644
index b34eff63c44f..000000000000
--- a/formula/util/for.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/formula/util/forui.map b/formula/util/forui.map
deleted file mode 100644
index b34eff63c44f..000000000000
--- a/formula/util/forui.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk
index 3e8f2301b283..7ae30b007d00 100644
--- a/formula/util/makefile.mk
+++ b/formula/util/makefile.mk
@@ -120,7 +120,6 @@ DEFLIB2NAME=$(TARGET2)
 .ENDIF
 
 SHL2USE_EXPORTS=name
-# SHL2VERSIONMAP=$(TARGET2).map
 
 # --- .res file ----------------------------------------------------------
 
diff --git a/fpicker/source/aqua/exports.map b/fpicker/source/aqua/exports.map
deleted file mode 100644
index f4ed78b9e970..000000000000
--- a/fpicker/source/aqua/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk
index f79d2a018952..10990e22d5e1 100644
--- a/fpicker/source/aqua/makefile.mk
+++ b/fpicker/source/aqua/makefile.mk
@@ -74,7 +74,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx
index 5d958d8e2888..51985208c7ed 100644
--- a/fpicker/source/aqua/resourceprovider.cxx
+++ b/fpicker/source/aqua/resourceprovider.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
 #ifndef _SVTOOLS_SVTOOLS_HRC_
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #endif
 
 #ifndef _SVTOOLS_FILEDLG2_HRC_
diff --git a/fpicker/source/generic/exports.map b/fpicker/source/generic/exports.map
deleted file mode 100644
index f4ed78b9e970..000000000000
--- a/fpicker/source/generic/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/fpicker/source/generic/makefile.mk b/fpicker/source/generic/makefile.mk
index f5d624f8e4d6..bfbfb65f3da6 100644
--- a/fpicker/source/generic/makefile.mk
+++ b/fpicker/source/generic/makefile.mk
@@ -53,7 +53,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src
index 77de1dc3918b..8fbbc35a40e5 100644
--- a/fpicker/source/office/OfficeFilePicker.src
+++ b/fpicker/source/office/OfficeFilePicker.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 
 String STR_SVT_FILEPICKER_AUTO_EXTENSION
 {
diff --git a/fpicker/source/office/exports.map b/fpicker/source/office/exports.map
deleted file mode 100644
index f4ed78b9e970..000000000000
--- a/fpicker/source/office/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index c7a18050c3ff..b9d7fac3aa3b 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -57,7 +57,7 @@
 #include <unotools/localfilehelper.hxx>
 
 #ifndef _SVTOOLS_HRC
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #endif
 #ifndef _SVT_HELPID_HRC
 #include "svtools/helpid.hrc"
@@ -1587,6 +1587,9 @@ void SvtFileDialog::UpdateControls( const String& rURL )
                 sText = sURL;
         }
 
+        if ( !sText.Len() && rURL.Len() )
+            // happens, for instance, for URLs which the INetURLObject does not know to belong to a hierarchical scheme
+            sText = rURL;
         _pImp->_pFtCurrentPath->SetText( sText );
     }
 
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 9f5997a4089c..15f5121b0965 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -29,7 +29,7 @@
 #define _SVTOOLS_IODLGIMPL_HRC
 
 #ifndef _SVTOOLS_HRC
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #endif
 
 // ModalDialog DLG_SVT_EXPLORERFILE
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index b1712e6b1820..0b3c27b68071 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 
  // includes ******************************************************************
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #include "svtools/helpid.hrc"
 #include "iodlg.hrc"
 
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 4a7c615a35b3..5e57075a6bb7 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -46,15 +46,12 @@
 #include "svtools/fileview.hxx"
 #include "svtools/inettbc.hxx"
 #include "iodlg.hxx"
-#ifndef _SVTOOLS_IODLGIMPL_HRC
 #include "iodlg.hrc"
-#endif
 #include "svtools/imagemgr.hxx"
 #include <unotools/localfilehelper.hxx>
 #include "unotools/useroptions.hxx"
-#ifndef _RTL_INSTANCE_HXX_
 #include "rtl/instance.hxx"
-#endif
+#include <svl/svl.hrc>
 
 #define _SVSTDARR_STRINGSSORTDTOR
 #define _SVSTDARR_STRINGSDTOR
diff --git a/fpicker/source/office/makefile.mk b/fpicker/source/office/makefile.mk
index c687d8cb333e..adc3c30f9a3d 100644
--- a/fpicker/source/office/makefile.mk
+++ b/fpicker/source/office/makefile.mk
@@ -69,7 +69,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
diff --git a/fpicker/source/unx/gnome/exports.map b/fpicker/source/unx/gnome/exports.map
deleted file mode 100644
index f4ed78b9e970..000000000000
--- a/fpicker/source/unx/gnome/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/fpicker/source/unx/gnome/makefile.mk b/fpicker/source/unx/gnome/makefile.mk
index aa1fbc54b7f5..04c6e650ff6f 100644
--- a/fpicker/source/unx/gnome/makefile.mk
+++ b/fpicker/source/unx/gnome/makefile.mk
@@ -87,7 +87,7 @@ SHL1STDLIBS=\
 LINKFLAGSDEFS=
 .ENDIF # "$(OS)"=="SOLARIS"
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 DEF1NAME=$(SHL1TARGET)
 
 .ENDIF # GTK_TWO_FOUR
diff --git a/fpicker/source/unx/gnome/resourceprovider.cxx b/fpicker/source/unx/gnome/resourceprovider.cxx
index dba51c5a606a..393ea7585d5a 100644
--- a/fpicker/source/unx/gnome/resourceprovider.cxx
+++ b/fpicker/source/unx/gnome/resourceprovider.cxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #include <svtools/filedlg2.hrc>
 
 //------------------------------------------------------------
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 046147ff4b77..a7fa01a5ece6 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 
 #include <vos/mutex.hxx>
 
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index f22e1c3abdaf..e93c3bec18ba 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -67,14 +67,14 @@ static Reference< XInterface > SAL_CALL createInstance(
 
     if (bVistaOrNewer)
     {
-        fprintf(stdout, "use special (vista) system file picker ...\n");
+        OSL_TRACE("use special (vista) system file picker ...");
         xDlg.set(
             static_cast< XFilePicker2* >(
                 new ::fpicker::win32::vista::VistaFilePicker( rServiceManager ) ) );
     }
     else
     {
-        fprintf(stdout, "use normal system file picker ...\n");
+        OSL_TRACE("use normal system file picker ...");
         xDlg.set(
             static_cast< XFilePicker2* >(
                 new CFilePicker( rServiceManager ) ) );
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 3f51aa9c765d..2fadaa6bfdff 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -125,14 +125,14 @@ STDMETHODIMP VistaFilePickerEventHandler::OnFileOk(IFileDialog* /*pDialog*/)
 }
 
 //-----------------------------------------------------------------------------------------
-STDMETHODIMP VistaFilePickerEventHandler::OnFolderChanging(IFileDialog* pDialog,
-                                                           IShellItem*  pFolder)
+STDMETHODIMP VistaFilePickerEventHandler::OnFolderChanging(IFileDialog* /*pDialog*/,
+                                                           IShellItem*  /*pFolder*/)
 {
     return E_NOTIMPL;
 }
 
 //-----------------------------------------------------------------------------------------
-STDMETHODIMP VistaFilePickerEventHandler::OnFolderChange(IFileDialog* pDialog)
+STDMETHODIMP VistaFilePickerEventHandler::OnFolderChange(IFileDialog* /*pDialog*/)
 {
     impl_sendEvent(E_DIRECTORY_CHANGED, 0);
     return S_OK;
@@ -250,7 +250,7 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog)
 }
 
 //-----------------------------------------------------------------------------------------
-STDMETHODIMP VistaFilePickerEventHandler::OnSelectionChange(IFileDialog* pDialog)
+STDMETHODIMP VistaFilePickerEventHandler::OnSelectionChange(IFileDialog* /*pDialog*/)
 {
     impl_sendEvent(E_FILE_SELECTION_CHANGED, 0);
     //lcl_updateVersionListDirectly(pDialog);
@@ -258,16 +258,18 @@ STDMETHODIMP VistaFilePickerEventHandler::OnSelectionChange(IFileDialog* pDialog
 }
 
 //-----------------------------------------------------------------------------------------
-STDMETHODIMP VistaFilePickerEventHandler::OnShareViolation(IFileDialog*                 pDialog  ,
-                                                           IShellItem*                  pItem    ,
-                                                           FDE_SHAREVIOLATION_RESPONSE* pResponse)
+STDMETHODIMP VistaFilePickerEventHandler::OnShareViolation(IFileDialog*                 /*pDialog*/  ,
+
+                                                           IShellItem*                  /*pItem*/    ,
+
+                                                           FDE_SHAREVIOLATION_RESPONSE* /*pResponse*/)
 {
     impl_sendEvent(E_CONTROL_STATE_CHANGED, css::ui::dialogs::CommonFilePickerElementIds::LISTBOX_FILTER);
     return S_OK;
 }
 
 //-----------------------------------------------------------------------------------------
-STDMETHODIMP VistaFilePickerEventHandler::OnTypeChange(IFileDialog* pDialog)
+STDMETHODIMP VistaFilePickerEventHandler::OnTypeChange(IFileDialog* /*pDialog*/)
 {
     /*
     IFileDialogCustomize               *iCustomize;
@@ -299,32 +301,36 @@ STDMETHODIMP VistaFilePickerEventHandler::OnTypeChange(IFileDialog* pDialog)
 }
 
 //-----------------------------------------------------------------------------------------
-STDMETHODIMP VistaFilePickerEventHandler::OnOverwrite(IFileDialog*            pDialog  ,
-                                                      IShellItem*             pItem    ,
-                                                      FDE_OVERWRITE_RESPONSE* pResponse)
+STDMETHODIMP VistaFilePickerEventHandler::OnOverwrite(IFileDialog*            /*pDialog*/  ,
+                                                      IShellItem*             /*pItem*/    ,
+                                                      FDE_OVERWRITE_RESPONSE* /*pResponse*/)
 {
     return E_NOTIMPL;
 }
 
 //-----------------------------------------------------------------------------------------
-STDMETHODIMP VistaFilePickerEventHandler::OnItemSelected(IFileDialogCustomize* pCustomize,
-                                                         DWORD                 nIDCtl    ,
-                                                         DWORD                 nIDItem   )
+STDMETHODIMP VistaFilePickerEventHandler::OnItemSelected(IFileDialogCustomize* /*pCustomize*/,
+
+                                                         DWORD                   nIDCtl      ,
+
+                                                         DWORD                 /*nIDItem*/   )
 {
-    impl_sendEvent(E_CONTROL_STATE_CHANGED, nIDCtl);
+
+    impl_sendEvent(E_CONTROL_STATE_CHANGED, static_cast<sal_Int16>( nIDCtl ));
     return S_OK;
 }
 
 //-----------------------------------------------------------------------------------------
-STDMETHODIMP VistaFilePickerEventHandler::OnButtonClicked(IFileDialogCustomize* pCustomize,
+STDMETHODIMP VistaFilePickerEventHandler::OnButtonClicked(IFileDialogCustomize* /*pCustomize*/,
                                                           DWORD                 nIDCtl    )
 {
-    impl_sendEvent(E_CONTROL_STATE_CHANGED, nIDCtl);
+
+    impl_sendEvent(E_CONTROL_STATE_CHANGED, static_cast<sal_Int16>( nIDCtl));
     return S_OK;
 }
 
 //-----------------------------------------------------------------------------------------
-STDMETHODIMP VistaFilePickerEventHandler::OnCheckButtonToggled(IFileDialogCustomize* pCustomize,
+STDMETHODIMP VistaFilePickerEventHandler::OnCheckButtonToggled(IFileDialogCustomize* /*pCustomize*/,
                                                                DWORD                 nIDCtl    ,
                                                                BOOL                  bChecked  )
 {
@@ -353,15 +359,17 @@ STDMETHODIMP VistaFilePickerEventHandler::OnCheckButtonToggled(IFileDialogCustom
     if (nIDCtl == css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION)
         m_pInternalNotify->onAutoExtensionChanged(bChecked);
 
-    impl_sendEvent(E_CONTROL_STATE_CHANGED, nIDCtl);
+
+    impl_sendEvent(E_CONTROL_STATE_CHANGED, static_cast<sal_Int16>( nIDCtl));
+
     return S_OK;
 }
 
 //-----------------------------------------------------------------------------------------
-STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomize* pCustomize,
+STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomize* /*pCustomize*/,
                                                               DWORD                 nIDCtl    )
 {
-    impl_sendEvent(E_CONTROL_STATE_CHANGED, nIDCtl);
+    impl_sendEvent(E_CONTROL_STATE_CHANGED, static_cast<sal_Int16>( nIDCtl));
     return S_OK;
 }
 
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 805f24c315d7..b5448a93008c 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 
 //------------------------------------------------------------
 // namespace directives
diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/classes/sfxhelperfunctions.hxx
index ab20e9f0f25f..ac3fa472f249 100644
--- a/framework/inc/classes/sfxhelperfunctions.hxx
+++ b/framework/inc/classes/sfxhelperfunctions.hxx
@@ -40,6 +40,7 @@ typedef svt::StatusbarController* ( *pfunc_setStatusBarControllerCreator)( const
 typedef void ( *pfunc_getRefreshToolbars)( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
 typedef void ( *pfunc_createDockingWindow)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
 typedef bool ( *pfunc_isDockingWindowVisible)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+typedef void ( *pfunc_activateToolPanel)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
 
 namespace framework
 {
@@ -63,6 +64,10 @@ void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com
 pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible );
 
 bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+
+pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
+
+void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
 }
 
 #endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
diff --git a/framework/inc/classes/xmlnamespaces.hxx b/framework/inc/classes/xmlnamespaces.hxx
deleted file mode 100644
index 60a3de4b68ba..000000000000
--- a/framework/inc/classes/xmlnamespaces.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_CLASSES_XMLNAMESPACES_HXX_
-#define __FRAMEWORK_CLASSES_XMLNAMESPACES_HXX_
-
-#include <com/sun/star/xml/sax/SAXException.hpp>
-
-#include <map>
-
-namespace framework
-{
-
-class XMLNamespaces
-{
-    public:
-        XMLNamespaces();
-        XMLNamespaces( const XMLNamespaces& );
-        virtual ~XMLNamespaces();
-
-        void addNamespace( const ::rtl::OUString& aName, const ::rtl::OUString& aValue )
-            throw(  ::com::sun::star::xml::sax::SAXException );
-
-        ::rtl::OUString applyNSToAttributeName( const ::rtl::OUString& ) const
-            throw(  ::com::sun::star::xml::sax::SAXException );
-        ::rtl::OUString applyNSToElementName( const ::rtl::OUString& ) const
-            throw(  ::com::sun::star::xml::sax::SAXException );
-
-    private:
-        typedef ::std::map< ::rtl::OUString, ::rtl::OUString > NamespaceMap;
-
-        ::rtl::OUString getNamespaceValue( const ::rtl::OUString& aNamespace ) const
-            throw( ::com::sun::star::xml::sax::SAXException );
-
-        ::rtl::OUString m_aDefaultNamespace;
-        NamespaceMap    m_aNamespaceMap;
-};
-
-}
-
-#endif // __FRAMEWORK_XMLNAMESPACES_HXX_
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index e49192aa7c33..eea91edeaa07 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -51,19 +51,10 @@
 #define STR_BACKING_CREATE                  3
 #define STR_BACKING_TEMPLATE                4
 #define STR_BACKING_FILE                    5
-#define BMP_BACKING_WRITER                  6
-#define BMP_BACKING_CALC                    7
-#define BMP_BACKING_IMPRESS                 8
-#define BMP_BACKING_DRAW                    9
-#define BMP_BACKING_DATABASE                10
-#define BMP_BACKING_FORMULA                 11
-#define BMP_BACKING_OPENFILE                12
-#define BMP_BACKING_OPENTEMPLATE            13
-#define STR_BACKING_EXTHELP                 15
-#define STR_BACKING_REGHELP                 17
-#define STR_BACKING_INFOHELP                19
-#define STR_BACKING_TPLREP                  21
-#define BMP_BACKING_FOLDER                  22
+#define STR_BACKING_EXTHELP                 6
+#define STR_BACKING_REGHELP                 7
+#define STR_BACKING_INFOHELP                8
+#define STR_BACKING_TPLREP                  9
 
 #define RES_BACKING_IMAGES                  (DLG_BACKING+1)
 #define RES_BACKING_IMAGES_HC               (DLG_BACKING+2)
@@ -77,6 +68,14 @@
 #define BMP_BACKING_REG                     7
 #define BMP_BACKING_INFO                    8
 #define BMP_BACKING_TPLREP                  9
+#define BMP_BACKING_WRITER                  10
+#define BMP_BACKING_CALC                    11
+#define BMP_BACKING_IMPRESS                 12
+#define BMP_BACKING_DRAW                    13
+#define BMP_BACKING_DATABASE                14
+#define BMP_BACKING_FORMULA                 15
+#define BMP_BACKING_OPENFILE                16
+#define BMP_BACKING_OPENTEMPLATE            17
 
 // Ids of TabWindow
 #define WIN_TABWINDOW                       (RID_FWK_DIALOG_START+101)
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx
index 6d8885a5fa96..dff0ccfd1049 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/helper/imageproducer.hxx
@@ -39,11 +39,11 @@
 namespace framework
 {
 
-typedef Image ( *pfunc_getImage)( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
 
 pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
 
-Image SAL_CALL GetImageFromURL( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
 
 }
 
diff --git a/framework/inc/helper/popupmenucontrollerbase.hxx b/framework/inc/helper/popupmenucontrollerbase.hxx
deleted file mode 100644
index e723b36aec3b..000000000000
--- a/framework/inc/helper/popupmenucontrollerbase.hxx
+++ /dev/null
@@ -1,145 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_HELPER_POPUPMENUCONTROLLERBASE_HXX_
-#define __FRAMEWORK_HELPER_POPUPMENUCONTROLLERBASE_HXX_
-
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/generic.hxx>
-#include <macros/xinterface.hxx>
-#include <macros/xtypeprovider.hxx>
-#include <macros/xserviceinfo.hxx>
-#include <stdtypes.h>
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
-#include <com/sun/star/uri/XUriReferenceFactory.hpp>
-#include <com/sun/star/uri/XUriReference.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-//_________________________________________________________________________________________________________________
-//  includes of other projects
-//_________________________________________________________________________________________________________________
-#include <toolkit/awt/vclxmenu.hxx>
-#include <cppuhelper/weak.hxx>
-#include <rtl/ustring.hxx>
-
-namespace framework
-{
-    class PopupMenuControllerBase :  public com::sun::star::lang::XTypeProvider           ,
-                                     public com::sun::star::lang::XServiceInfo            ,
-                                     public ::com::sun::star::frame::XPopupMenuController ,
-                                     public com::sun::star::lang::XInitialization         ,
-                                     public com::sun::star::frame::XStatusListener        ,
-                                     public com::sun::star::awt::XMenuListener            ,
-                                     public com::sun::star::frame::XDispatchProvider      ,
-                                     public com::sun::star::frame::XDispatch              ,
-                                     public com::sun::star::lang::XComponent              ,
-                                     protected ThreadHelpBase                             , // Struct for right initalization of mutex member! Must be first of baseclasses.
-                                     public ::cppu::OBroadcastHelper                      ,
-                                     public ::cppu::OWeakObject
-    {
-        public:
-            PopupMenuControllerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-            virtual ~PopupMenuControllerBase();
-
-            //  XInterface, XTypeProvider, XServiceInfo
-            FWK_DECLARE_XINTERFACE
-            FWK_DECLARE_XTYPEPROVIDER
-
-            // XServiceInfo
-            virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
-            virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) = 0;
-            virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
-
-            // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
-
-            // XInitialization
-            virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
-            // XStatusListener
-            virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) = 0;
-
-            // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-
-            // XDispatchProvider
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException );
-            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException );
-
-            // XDispatch
-            virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException );
-            virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException );
-            virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException );
-
-            // XEventListener
-            virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
-
-            // XComponent
-            virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
-
-        protected:
-            virtual void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
-            virtual void impl_setPopupMenu();
-            virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
-            ::rtl::OUString determineBaseURL( const ::rtl::OUString& aURL );
-
-
-            bool                                                                             m_bInitialized;
-            bool                                                                             m_bDisposed;
-            rtl::OUString                                                                    m_aCommandURL;
-            rtl::OUString                                                                    m_aBaseURL;
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >           m_xDispatch;
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >              m_xFrame;
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-            ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >      m_xURLTransformer;
-            ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >            m_xPopupMenu;
-            ::cppu::OMultiTypeInterfaceContainerHelper                                       m_aListenerContainer; // container for ALL Listener
-    };
-}
-
-#endif // __FRAMEWORK_HELPER_POPUPMENUCONTROLLERBASE_HXX_
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index c3ec5075cc07..05ab216d6f06 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -101,6 +101,9 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
         virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
 
         // XUIElement
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
 
         // XUpdatable
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index e5df1a142826..bc83765b09fe 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -92,6 +92,9 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
         virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
 
         // XUIElement
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
 
     //-------------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index f0358ef6f1a0..5a32a42a28cc 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -217,6 +217,14 @@ namespace framework{
 #define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST  "private:resource/image/commandrotateimagelist"
 #define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST  "private:resource/image/commandmirrorimagelist"
 
+#define UICOMMANDDESCRIPTION_PROPNAME_PROPERTIES                "Properties"
+#define UICOMMANDDESCRIPTION_PROPNAME_POPUP                     "Popup"
+
+#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE                   1
+#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE_MIRRORED          2
+#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE_ROTATED           4
+#define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON            8
+
 //_______________________________________________
 /** properties for "AutoRecovery" class */
 
diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx
index af9617a9ba47..0f984c8d03f9 100644
--- a/framework/inc/threadhelp/fairrwlock.hxx
+++ b/framework/inc/threadhelp/fairrwlock.hxx
@@ -40,7 +40,6 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  other includes
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index a1be2ee47b3b..6e0c9deb03c0 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -52,6 +52,7 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
@@ -59,8 +60,10 @@
 class PopupMenu;
 namespace framework
 {
-    class ControlMenuController :  public PopupMenuControllerBase
+    class ControlMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             ControlMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~ControlMenuController();
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index f14680a49030..79905658839b 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -50,14 +50,17 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-    class FontMenuController :  public PopupMenuControllerBase
+    class FontMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~FontMenuController();
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index d0afe40154fe..4e5623084908 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -51,14 +51,17 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-    class FontSizeMenuController :  public PopupMenuControllerBase
+    class FontSizeMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~FontSizeMenuController();
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index 8ec012e80319..0deeb878156d 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -52,14 +52,17 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-    class HeaderMenuController :  public PopupMenuControllerBase
+    class HeaderMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool _bFooter = sal_False );
             virtual ~HeaderMenuController();
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 65f6d6cd5e99..257638ecd77f 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -51,6 +51,7 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
@@ -59,8 +60,10 @@
 
 namespace framework
 {
-    class LanguageSelectionMenuController :  public PopupMenuControllerBase
+    class LanguageSelectionMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~LanguageSelectionMenuController();
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index 6070a44d3564..1e8b9024eaca 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -28,7 +28,7 @@
 #ifndef __FRAMEWORK_UIELEMENT_MACROSMENUCONTROLLER_HXX_
 #define __FRAMEWORK_UIELEMENT_MACROSMENUCONTROLLER_HXX_
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -40,6 +40,7 @@
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/frame/XPopupMenuController.hpp>
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <vcl/menu.hxx>
@@ -47,8 +48,10 @@
 
 namespace framework
 {
-    class MacrosMenuController :  public PopupMenuControllerBase
+    class MacrosMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         struct ExecuteInfo
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >     xDispatch;
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index e937623b44b9..5e14b70f0044 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -53,6 +53,7 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
@@ -71,8 +72,10 @@ namespace framework
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >      xDispatch;
     };
 
-    class NewMenuController :  public PopupMenuControllerBase
+    class NewMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~NewMenuController();
diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx
index 94c1d849e197..7a03dfd1458e 100644
--- a/framework/inc/uielement/objectmenucontroller.hxx
+++ b/framework/inc/uielement/objectmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -51,14 +51,17 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-    class ObjectMenuController :  public PopupMenuControllerBase
+    class ObjectMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             ObjectMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~ObjectMenuController();
diff --git a/framework/inc/uielement/popupmenucontroller.hxx b/framework/inc/uielement/popupmenucontroller.hxx
new file mode 100644
index 000000000000..ef44a4703ca2
--- /dev/null
+++ b/framework/inc/uielement/popupmenucontroller.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_POPUPMENUCONTROLLER_HXX_
+#define __FRAMEWORK_POPUPMENUCONTROLLER_HXX_
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/frame/XPopupMenuController.hpp>
+
+#include "svtools/toolboxcontroller.hxx"
+#include "boost/scoped_ptr.hpp"
+
+#include <macros/xserviceinfo.hxx>
+
+class Window;
+
+namespace framework
+{
+class PopupMenuControllerImpl;
+
+class PopupMenuController : public svt::ToolboxController, public ::com::sun::star::lang::XServiceInfo
+{
+public:
+    PopupMenuController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+    ~PopupMenuController();
+
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // XServiceInfo
+    DECLARE_XSERVICEINFO
+
+    // XComponent
+    virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
+
+    // XStatusListener
+    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XToolbarController
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException);
+
+    bool CreatePopupMenuController() throw (::com::sun::star::uno::Exception);
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XPopupMenuController > mxPopupMenuController;
+    ::com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu > mxPopupMenu;
+};
+
+} // namespace framework
+
+#endif // __FRAMEWORK_POPUPMENUCONTROLLER_HXX_
diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx
index 40c3a55737c1..26a8e38dd49c 100644
--- a/framework/inc/uielement/recentfilesmenucontroller.hxx
+++ b/framework/inc/uielement/recentfilesmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -52,6 +52,7 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
@@ -65,8 +66,10 @@ namespace framework
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >      xDispatch;
     };
 
-    class RecentFilesMenuController :  public PopupMenuControllerBase
+    class RecentFilesMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             RecentFilesMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~RecentFilesMenuController();
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 98894b623aea..e7d670e9559b 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -58,6 +58,7 @@
 #include <com/sun/star/frame/XToolbarController.hpp>
 #include <com/sun/star/ui/ItemStyle.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
 
 //_________________________________________________________________________________________________________________
 //  other includes
@@ -67,6 +68,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 
 #include <vcl/toolbox.hxx>
+#include <vcl/accel.hxx>
 
 namespace com
 {
@@ -179,6 +181,8 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
 
         void RemoveControllers();
         rtl::OUString RetrieveLabelFromCommand( const rtl::OUString& aCmdURL );
+        sal_Int32 RetrievePropertiesFromCommand( const rtl::OUString& aCmdURL );
+        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropsForCommand( const ::rtl::OUString& rCmdURL );
         void CreateControllers();
         void UpdateControllers();
         void AddFrameActionListener();
@@ -194,6 +198,9 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter);
         void impl_elementChanged(bool _bRemove,const ::com::sun::star::ui::ConfigurationEvent& Event );
 
+        static bool impl_RetrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, const rtl::OUString& rCommand, rtl::OUString& rShortCut );
+        bool RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OUString& rShortCut );
+
     protected:
         typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap;
         typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector;
@@ -233,6 +240,10 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         Timer                                                                                  m_aAsyncUpdateControllersTimer;
         sal_Int16                                                                              m_nSymbolsStyle;
         MenuDescriptionMap m_aMenuMap;
+        sal_Bool                                                                               m_bAcceleratorCfg;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >    m_xDocAcceleratorManager;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >    m_xModuleAcceleratorManager;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >    m_xGlobalAcceleratorManager;
 };
 
 }
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index dcb0b57182df..35f517d33e80 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -54,6 +54,7 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
@@ -63,8 +64,10 @@
 
 namespace framework
 {
-    class ToolbarsMenuController :  public PopupMenuControllerBase
+    class ToolbarsMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             ToolbarsMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~ToolbarsMenuController();
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index d9f8e461c5b5..dd95981bba90 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -109,7 +109,7 @@ public:
         ModuleToCommandFileMap                                                              m_aModuleToCommandFileMap;
         UICommandsHashMap                                                                   m_aUICommandsHashMap;
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >        m_xGenericUICommands;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > m_xModuleManager;
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager >         m_xModuleManager;
 };
 
 } // namespace framework
diff --git a/framework/inc/uielement/uielementtypenames.hxx b/framework/inc/uielement/uielementtypenames.hxx
index fcd14c2f8bff..ca7815f90af7 100644
--- a/framework/inc/uielement/uielementtypenames.hxx
+++ b/framework/inc/uielement/uielementtypenames.hxx
@@ -7,5 +7,6 @@
 #define UIELEMENTTYPE_STATUSBAR_NAME        "statusbar"
 #define UIELEMENTTYPE_FLOATINGWINDOW_NAME   "floater"
 #define UIELEMENTTYPE_PROGRESSBAR_NAME      "progressbar"
+#define UIELEMENTTYPE_TOOLPANEL_NAME        "toolpanel"
 
 #endif // __FRAMEWORK_UIELEMENT_UIELEMENTTYPENAMES_HXX_
diff --git a/framework/inc/xml/toolboxlayoutdocumenthandler.hxx b/framework/inc/xml/toolboxlayoutdocumenthandler.hxx
deleted file mode 100644
index 71a7843a0a9e..000000000000
--- a/framework/inc/xml/toolboxlayoutdocumenthandler.hxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_XML_TOOLBOXLAYOUTDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_XML_TOOLBOXLAYOUTDOCUMENTHANDLER_HXX_
-
-#include <xml/toolboxconfiguration.hxx>
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
-#include <threadhelp/threadhelpbase.hxx>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
-
-#include <hash_map>
-#include <stdtypes.h>
-
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-} // namespace framework
-
-#endif
diff --git a/framework/prj/build.lst b/framework/prj/build.lst
index b9814037e729..5c745e09077d 100644
--- a/framework/prj/build.lst
+++ b/framework/prj/build.lst
@@ -20,4 +20,4 @@ fr  framework\source\uiconfiguration        nmake   -   all fr_uiconfiguration f
 fr  framework\source\accelerators           nmake   -   all fr_accelerators fr_threadhelp fr_inc NULL
 fr  framework\source\tabwin					nmake   -   all fr_tabwin fr_threadhelp fr_inc NULL
 fr  framework\util                          nmake   -   all fr_util fr_constant fr_threadhelp fr_classes fr_loadenv fr_jobs fr_interaction fr_helper fr_dispatch fr_services fr_register fr_recording fr_layoutmanager fr_uielement fr_uifactory fr_xml fr_uiconfiguration fr_accelerators fr_tabwin NULL
-
+fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL
diff --git a/framework/prj/d.lst b/framework/prj/d.lst
index a8640138ba25..7f260f07cf65 100644
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -5,8 +5,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator\en-US
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
 
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
@@ -47,7 +45,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
 
 ..\uiconfig\startmodule\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar\*.xml
 ..\uiconfig\startmodule\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar\*.xml
-..\uiconfig\startmodule\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator\en-US\*.xml
 ..\uiconfig\startmodule\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar\*.xml
 
 ..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml
diff --git a/framework/qa/unoapi/Test.java b/framework/qa/unoapi/Test.java
new file mode 100644
index 000000000000..da9bb3bd5020
--- /dev/null
+++ b/framework/qa/unoapi/Test.java
@@ -0,0 +1,51 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+package org.openoffice.framework.qa.unoapi;
+
+import org.openoffice.Runner;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+public final class Test {
+    @org.junit.Before public void setUp() throws Exception {
+        connection.setUp();
+    }
+
+    @org.junit.After public void tearDown()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        connection.tearDown();
+    }
+
+    @org.junit.Test public void test() {
+        assertTrue(
+            Runner.run(
+                "-sce", "framework.sce", "-xcl", "knownissues.xcl", "-tdoc",
+                "testdocuments", "-cs", connection.getDescription()));
+    }
+
+    private final OfficeConnection connection = new OfficeConnection();
+}
diff --git a/framework/qa/unoapi/knownissues.xcl b/framework/qa/unoapi/knownissues.xcl
index f939efcca412..40f1965de639 100755
--- a/framework/qa/unoapi/knownissues.xcl
+++ b/framework/qa/unoapi/knownissues.xcl
@@ -54,3 +54,6 @@ fwk.Frame
 
 ### i90345 ###
 fwk.URLTransformer::com::sun::star::util::XURLTransformer
+
+### i111180 ###
+fwk.Desktop::com::sun::star::frame::XComponentLoader
diff --git a/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk
index 0be0e52a17c2..38a6cf7cced8 100755
--- a/framework/qa/unoapi/makefile.mk
+++ b/framework/qa/unoapi/makefile.mk
@@ -1,7 +1,6 @@
 #*************************************************************************
-#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -22,22 +21,28 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+#***********************************************************************/
 
-PRJ=..$/..
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-PRJNAME=framework
-TARGET=qa_unoapi
+PRJ = ../..
+PRJNAME = framework
+TARGET = qa_unoapi
 
-.INCLUDE: settings.mk
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = org/openoffice/framework/qa/unoapi
+JAVATESTFILES = Test.java
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
+.INCLUDE: settings.mk
 .INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-ALLTAR : UNOAPI_TEST
+ALLTAR : javatest
 
-UNOAPI_TEST:
-    +$(SOLARENV)$/bin$/checkapi -sce framework.sce -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments -THRCNT 1 -AutoRestart true
-    @echo =======================================================================
-    @echo In case you noticed a failures of fwk.JobExecutor or fwk.JobHandler make sure that you registered $(SOLARSRC)$/qadevOOo$/testdocs$/qadevlibs$/JobExecutor.jar
-    @echo =======================================================================
+.END
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 99d2b22ecf76..2f8e1bdf2f16 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -124,7 +124,7 @@ String STR_TOOLBAR_TITLE_ADDON
 
 String STR_STATUSBAR_LOGOTEXT
 {
-    Text [ en-US ] = "A %PRODUCTNAME product by Sun Microsystems, Inc.";
+    Text [ en-US ] = "A %PRODUCTNAME product by Oracle";
 };
 
 // ***********************************************************************
diff --git a/framework/source/classes/sfxhelperfunctions.cxx b/framework/source/classes/sfxhelperfunctions.cxx
index 655d96cdb681..c6953b1ea2b9 100644
--- a/framework/source/classes/sfxhelperfunctions.cxx
+++ b/framework/source/classes/sfxhelperfunctions.cxx
@@ -32,11 +32,14 @@
 #include <classes/sfxhelperfunctions.hxx>
 #endif
 
+#include <tools/diagnose_ex.h>
+
 static pfunc_setToolBoxControllerCreator   pToolBoxControllerCreator   = NULL;
 static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = NULL;
 static pfunc_getRefreshToolbars            pRefreshToolbars            = NULL;
 static pfunc_createDockingWindow           pCreateDockingWindow        = NULL;
 static pfunc_isDockingWindowVisible        pIsDockingWindowVisible     = NULL;
+static pfunc_activateToolPanel             pActivateToolPanel          = NULL;
 
 
 
@@ -155,4 +158,24 @@ bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::
         return false;
 }
 
+pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator )
+{
+    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+    pfunc_activateToolPanel pOldFunc = pActivateToolPanel;
+    pActivateToolPanel = i_pActivator;
+    return pOldFunc;
+}
+
+void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL )
+{
+    pfunc_activateToolPanel pActivator = NULL;
+    {
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+        pActivator = pActivateToolPanel;
+    }
+
+    ENSURE_OR_RETURN_VOID( pActivator, "framework::ActivateToolPanel: no activator function!" );
+    (*pActivator)( i_rFrame, i_rPanelURL );
+}
+
 }
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx
index 7870697f42a1..c4cf5921ee11 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/helper/imageproducer.cxx
@@ -44,7 +44,7 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc )
 }
 
 
-Image SAL_CALL GetImageFromURL( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
+Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
 {
     if ( _pGetImageFunc )
         return _pGetImageFunc( rFrame, aURL, bBig, bHiContrast );
diff --git a/framework/source/helper/makefile.mk b/framework/source/helper/makefile.mk
index 556a9829d27c..ed54c381160c 100644
--- a/framework/source/helper/makefile.mk
+++ b/framework/source/helper/makefile.mk
@@ -53,7 +53,6 @@ SLOFILES= 			$(SLO)$/ocomponentaccess.obj					\
                     $(SLO)$/networkdomain.obj						\
                     $(SLO)$/acceleratorinfo.obj                     \
                     $(SLO)$/uielementwrapperbase.obj                \
-                    $(SLO)$/popupmenucontrollerbase.obj             \
                     $(SLO)$/dockingareadefaultacceptor.obj          \
                     $(SLO)$/uiconfigelementwrapperbase.obj          \
                     $(SLO)$/shareablemutex.obj                      \
diff --git a/framework/source/helper/popupmenucontrollerbase.cxx b/framework/source/helper/popupmenucontrollerbase.cxx
deleted file mode 100644
index cc5d388de9a8..000000000000
--- a/framework/source/helper/popupmenucontrollerbase.cxx
+++ /dev/null
@@ -1,429 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-#include <helper/popupmenucontrollerbase.hxx>
-
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-#include <threadhelp/resetableguard.hxx>
-#include "services.h"
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/awt/XDevice.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-
-//_________________________________________________________________________________________________________________
-//  includes of other projects
-//_________________________________________________________________________________________________________________
-
-#ifndef _VCL_MENU_HXX_
-#include <vcl/menu.hxx>
-#endif
-#include <vcl/svapp.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/logfile.hxx>
-//_________________________________________________________________________________________________________________
-//  Defines
-//_________________________________________________________________________________________________________________
-//
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::frame;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::util;
-
-namespace framework
-{
-
-//*****************************************************************************************************************
-//  XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_11                    (   PopupMenuControllerBase                                                     ,
-                                            OWeakObject                                                                 ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                  ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                   ),
-                                            DIRECT_INTERFACE( ::com::sun::star::frame::XPopupMenuController       ),
-                                            DIRECT_INTERFACE( css::lang::XInitialization                                ),
-                                            DIRECT_INTERFACE( css::frame::XStatusListener                               ),
-                                            DIRECT_INTERFACE( css::awt::XMenuListener                                   ),
-                                            DIRECT_INTERFACE( css::frame::XDispatchProvider                             ),
-                                            DIRECT_INTERFACE( css::frame::XDispatch                                     ),
-                                            DIRECT_INTERFACE( css::lang::XComponent                                     ),
-                                            DERIVED_INTERFACE( css::lang::XEventListener, css::frame::XStatusListener   ),
-                                            DERIVED_INTERFACE( css::lang::XEventListener, css::awt::XMenuListener       )
-                                        )
-
-DEFINE_XTYPEPROVIDER_10                 (   PopupMenuControllerBase                             ,
-                                            css::lang::XTypeProvider                            ,
-                                            css::lang::XServiceInfo                             ,
-                                            ::com::sun::star::frame::XPopupMenuController ,
-                                            css::lang::XInitialization                          ,
-                                            css::frame::XStatusListener                         ,
-                                            css::awt::XMenuListener                             ,
-                                            css::lang::XEventListener                           ,
-                                            css::frame::XDispatchProvider                       ,
-                                            css::frame::XDispatch                               ,
-                                            css::lang::XComponent
-                                        )
-
-PopupMenuControllerBase::PopupMenuControllerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    ThreadHelpBase(),
-    ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ),
-    m_bInitialized( false ),
-    m_bDisposed( false ),
-    m_xServiceManager( xServiceManager ),
-    m_aListenerContainer( m_aLock.getShareableOslMutex() )
-{
-    if ( m_xServiceManager.is() )
-        m_xURLTransformer.set( m_xServiceManager->createInstance(
-                                                                SERVICENAME_URLTRANSFORMER),
-                                                             UNO_QUERY );
-}
-
-PopupMenuControllerBase::~PopupMenuControllerBase()
-{
-}
-
-// protected function
-void PopupMenuControllerBase::resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu )
-{
-    VCLXPopupMenu* pPopupMenu = 0;
-    if ( rPopupMenu.is() && rPopupMenu->getItemCount() > 0 )
-    {
-         pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
-         if ( pPopupMenu )
-         {
-            vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-            PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-            pVCLPopupMenu->Clear();
-         }
-    }
-}
-
-void SAL_CALL PopupMenuControllerBase::dispose()
-throw (::com::sun::star::uno::RuntimeException)
-{
-    css::uno::Reference< css::lang::XComponent > xThis( static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY );
-
-    // Send message to all listener and forget their references.
-    css::lang::EventObject aEvent( xThis );
-    m_aListenerContainer.disposeAndClear( aEvent );
-
-    // Reset our members and set disposed flag
-    ResetableGuard aLock( m_aLock );
-    m_xFrame.clear();
-    m_xDispatch.clear();
-    m_xPopupMenu.clear();
-    m_xServiceManager.clear();
-    m_bDisposed = true;
-}
-
-void SAL_CALL PopupMenuControllerBase::addEventListener(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    m_aListenerContainer.addInterface( ::getCppuType( (const css::uno::Reference< css::lang::XEventListener >*)NULL ), xListener );
-}
-
-void SAL_CALL PopupMenuControllerBase::removeEventListener(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    m_aListenerContainer.removeInterface( ::getCppuType( (const css::uno::Reference< css::lang::XEventListener >*)NULL ), xListener );
-}
-
-// XEventListener
-void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) throw ( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-    m_xFrame.clear();
-    m_xDispatch.clear();
-    m_xPopupMenu.clear();
-}
-
-// XMenuListener
-void SAL_CALL PopupMenuControllerBase::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void PopupMenuControllerBase::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL)
-{
-    Sequence<PropertyValue>      aArgs;
-    OSL_ENSURE(_xDispatch.is(),"PopupMenuControllerBase::impl_select: No dispatch");
-    if ( _xDispatch.is() )
-        _xDispatch->dispatch( aURL, aArgs );
-}
-
-void SAL_CALL PopupMenuControllerBase::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
-{
-    Reference< css::awt::XPopupMenu >   xPopupMenu;
-    Reference< XDispatch >              xDispatch;
-    Reference< XMultiServiceFactory >   xServiceManager;
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    ResetableGuard aLock( m_aLock );
-    xPopupMenu      = m_xPopupMenu;
-    xDispatch       = m_xDispatch;
-    xServiceManager = m_xServiceManager;
-    aLock.unlock();
-
-    if ( xPopupMenu.is() )
-    {
-        VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
-        if ( pPopupMenu )
-        {
-            css::util::URL               aTargetURL;
-            {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-                PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-                aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId );
-            }
-
-            m_xURLTransformer->parseStrict( aTargetURL );
-            impl_select(xDispatch,aTargetURL);
-        }
-    }
-}
-
-void SAL_CALL PopupMenuControllerBase::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL PopupMenuControllerBase::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    Reference< XDispatch > xDispatch( m_xDispatch );
-    com::sun::star::util::URL aTargetURL;
-    aTargetURL.Complete = m_aCommandURL;
-    m_xURLTransformer->parseStrict( aTargetURL );
-    aLock.unlock();
-
-    // Add/remove status listener to get a status update once
-    if ( xDispatch.is() )
-    {
-        xDispatch->addStatusListener( xStatusListener, aTargetURL );
-        xDispatch->removeStatusListener( xStatusListener, aTargetURL );
-    }
-}
-
-// XDispatchProvider
-Reference< XDispatch > SAL_CALL
-PopupMenuControllerBase::queryDispatch(
-    const URL& /*aURL*/,
-    const rtl::OUString& /*sTarget*/,
-    sal_Int32 /*nFlags*/ )
-throw( RuntimeException )
-{
-    // must be implemented by subclass
-    ResetableGuard aLock( m_aLock );
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    return Reference< XDispatch >();
-}
-
-Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispatches( const Sequence< DispatchDescriptor >& lDescriptor ) throw( RuntimeException )
-{
-    // Create return list - which must have same size then the given descriptor
-    // It's not allowed to pack it!
-    ResetableGuard aLock( m_aLock );
-    if ( m_bDisposed )
-        throw DisposedException();
-    aLock.unlock();
-
-    sal_Int32                                                          nCount = lDescriptor.getLength();
-    css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
-
-    // Step over all descriptors and try to get any dispatcher for it.
-    for( sal_Int32 i=0; i<nCount; ++i )
-    {
-        lDispatcher[i] = queryDispatch( lDescriptor[i].FeatureURL  ,
-                                        lDescriptor[i].FrameName   ,
-                                        lDescriptor[i].SearchFlags );
-    }
-
-    return lDispatcher;
-}
-
-// XDispatch
-void SAL_CALL
-PopupMenuControllerBase::dispatch(
-    const URL& /*aURL*/,
-    const Sequence< PropertyValue >& /*seqProperties*/ )
-throw( ::com::sun::star::uno::RuntimeException )
-{
-    // must be implemented by subclass
-    ResetableGuard aLock( m_aLock );
-    if ( m_bDisposed )
-        throw DisposedException();
-}
-
-void SAL_CALL
-PopupMenuControllerBase::addStatusListener(
-    const Reference< XStatusListener >& xControl,
-    const URL& aURL )
-throw( ::com::sun::star::uno::RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-    if ( m_bDisposed )
-        throw DisposedException();
-    aLock.unlock();
-
-    bool bStatusUpdate( false );
-    m_aListenerContainer.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XStatusListener >*)NULL ), xControl );
-
-    aLock.lock();
-    if ( aURL.Complete.indexOf( m_aBaseURL ) == 0 )
-        bStatusUpdate = true;
-    aLock.unlock();
-
-    if ( bStatusUpdate )
-    {
-        // Dummy update for popup menu controllers
-        FeatureStateEvent aEvent;
-        aEvent.FeatureURL = aURL;
-        aEvent.IsEnabled  = sal_True;
-        aEvent.Requery    = sal_False;
-        aEvent.State      = Any();
-        xControl->statusChanged( aEvent );
-    }
-}
-
-void SAL_CALL PopupMenuControllerBase::removeStatusListener(
-    const Reference< XStatusListener >& xControl,
-    const URL& /*aURL*/ )
-throw( ::com::sun::star::uno::RuntimeException )
-{
-    m_aListenerContainer.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XStatusListener >*)NULL ), xControl );
-}
-
-::rtl::OUString PopupMenuControllerBase::determineBaseURL( const ::rtl::OUString& aURL )
-{
-    // Just use the main part of the URL for popup menu controllers
-    sal_Int32     nQueryPart( 0 );
-    sal_Int32     nSchemePart( 0 );
-    rtl::OUString aMainURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:" ));
-
-    nSchemePart = aURL.indexOf( ':' );
-    if (( nSchemePart > 0 ) &&
-        ( aURL.getLength() > ( nSchemePart+1 )))
-    {
-        nQueryPart  = aURL.indexOf( '?', nSchemePart );
-        if ( nQueryPart > 0 )
-            aMainURL += aURL.copy( nSchemePart, nQueryPart-nSchemePart );
-        else if ( nQueryPart == -1 )
-            aMainURL += aURL.copy( nSchemePart+1 );
-    }
-
-    return aMainURL;
-}
-
-// XInitialization
-void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    sal_Bool bInitalized( m_bInitialized );
-    if ( !bInitalized )
-    {
-        PropertyValue       aPropValue;
-        rtl::OUString       aCommandURL;
-        Reference< XFrame > xFrame;
-
-        for ( int i = 0; i < aArguments.getLength(); i++ )
-        {
-            if ( aArguments[i] >>= aPropValue )
-            {
-                if ( aPropValue.Name.equalsAscii( "Frame" ))
-                    aPropValue.Value >>= xFrame;
-                else if ( aPropValue.Name.equalsAscii( "CommandURL" ))
-                    aPropValue.Value >>= aCommandURL;
-            }
-        }
-
-        if ( xFrame.is() && aCommandURL.getLength() )
-        {
-            m_xFrame        = xFrame;
-            m_aCommandURL   = aCommandURL;
-            m_aBaseURL      = determineBaseURL( aCommandURL );
-            m_bInitialized  = true;
-        }
-    }
-}
-// XPopupMenuController
-void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
-    {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-
-        com::sun::star::util::URL aTargetURL;
-        aTargetURL.Complete = m_aCommandURL;
-        m_xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        impl_setPopupMenu();
-
-        updatePopupMenu();
-    }
-}
-void PopupMenuControllerBase::impl_setPopupMenu()
-{
-}
-}
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 1ddda0eb0f4d..030ec5bf8cf6 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -45,7 +45,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/ui/XUIConfiguration.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
@@ -550,4 +549,23 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_
     return m_xConfigData;
 }
 
+Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+    Reference< XFrame > xFrame( m_xWeakFrame );
+    return xFrame;
+}
+
+::rtl::OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+    return m_aResourceURL;
+}
+
+::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType() throw (RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+    return m_nType;
+}
+
 }
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 85bb1cdb1e60..6329f94b3063 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -151,6 +151,23 @@ throw ( Exception, RuntimeException )
     }
 }
 
+// XUIElement
+::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (::com::sun::star::uno::RuntimeException)
+{
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( m_xWeakFrame );
+    return xFrame;
+}
+
+::rtl::OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_aResourceURL;
+}
+
+::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_nType;
+}
+
 // XUpdatable
 void SAL_CALL UIElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException)
 {
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index f00bee4ed432..d5d11ebc2097 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -44,7 +44,9 @@
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionApprove.hpp>
 #include <com/sun/star/document/XInteractionFilterSelect.hpp>
+#include <com/sun/star/document/XInteractionFilterOptions.hpp>
 #include <com/sun/star/document/AmbigousFilterRequest.hpp>
+#include <com/sun/star/document/FilterOptionsRequest.hpp>
 #include <com/sun/star/task/ErrorCodeRequest.hpp>
 
 #ifndef _COM_SUN_STAR_DOCUMENT_LOCKEDDOCUMENTREQUEST_HPP_
@@ -111,6 +113,7 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI
     css::uno::Reference< css::task::XInteractionAbort >                              xAbort     ;
     css::uno::Reference< css::task::XInteractionApprove >                            xApprove   ;
     css::uno::Reference< css::document::XInteractionFilterSelect >                   xFilter    ;
+    css::uno::Reference< css::document::XInteractionFilterOptions >                  xFOptions  ;
 
     sal_Int32 nCount=lContinuations.getLength();
     for (sal_Int32 i=0; i<nCount; ++i)
@@ -123,6 +126,9 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI
 
         if ( ! xFilter.is() )
             xFilter = css::uno::Reference< css::document::XInteractionFilterSelect >( lContinuations[i], css::uno::UNO_QUERY );
+
+        if ( ! xFOptions.is() )
+            xFOptions = css::uno::Reference< css::document::XInteractionFilterOptions >( lContinuations[i], css::uno::UNO_QUERY );
     }
 
     // differ between abortable interactions (error, unknown filter ...)
@@ -130,6 +136,7 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI
     css::task::ErrorCodeRequest          aErrorCodeRequest     ;
     css::document::AmbigousFilterRequest aAmbigousFilterRequest;
     css::document::LockedDocumentRequest aLockedDocumentRequest;
+    css::document::FilterOptionsRequest  aFilterOptionsRequest;
 
     if (aRequest>>=aAmbigousFilterRequest)
     {
@@ -163,6 +170,15 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI
             xAbort->select();
     }
     else
+    if (aRequest>>=aFilterOptionsRequest)
+    {
+        if (xFOptions.is())
+        {
+            // let the default filter options be used
+            xFOptions->select();
+        }
+    }
+    else
     if (xAbort.is())
         xAbort->select();
 }
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 458368bd6581..f72759891acb 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -4707,6 +4707,14 @@ throw (RuntimeException)
 
             impl_setDockingWindowVisibility( xSMGR, xFrame, aElementName, true );
         }
+        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolpanel" ))
+        {
+            ReadGuard aReadGuard( m_aLock );
+            css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame );
+            aReadGuard.unlock();
+
+            ActivateToolPanel( m_xFrame, aName );
+        }
     }
 
     if ( bNotify )
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index dc5682c7d398..7382380ef525 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -78,6 +78,7 @@
 #include <uielement/macrosmenucontroller.hxx>
 #include <uielement/newmenucontroller.hxx>
 #include <uielement/toolbarsmenucontroller.hxx>
+#include <uielement/popupmenucontroller.hxx>
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
@@ -103,6 +104,7 @@ COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::MediaTypeDetectionHelper
                         COMPONENTINFO( ::framework::DispatchRecorderSupplier                )
                         COMPONENTINFO( ::framework::Oxt_Handler                             )
                         COMPONENTINFO( ::framework::License                                 )
+                        COMPONENTINFO( ::framework::PopupMenuController                     )
                     )
 
 COMPONENTGETFACTORY (   IFFACTORY( ::framework::MediaTypeDetectionHelper        )
@@ -126,5 +128,6 @@ COMPONENTGETFACTORY (   IFFACTORY( ::framework::MediaTypeDetectionHelper
                         IFFACTORY( ::framework::FooterMenuController                    )   else
                         IFFACTORY( ::framework::HeaderMenuController                    )   else
                         IFFACTORY( ::framework::LanguageSelectionMenuController         )   else
-                        IFFACTORY( ::framework::Oxt_Handler                             )
+                        IFFACTORY( ::framework::Oxt_Handler                             )   else
+                        IFFACTORY( ::framework::PopupMenuController                     )
                     )
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index bbbefdbdbda1..fb3d6a18eb79 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -42,7 +42,7 @@
 
 #include "unotools/dynamicmenuoptions.hxx"
 #include "svtools/imagemgr.hxx"
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 
 #include "comphelper/processfactory.hxx"
 #include "comphelper/sequenceashashmap.hxx"
@@ -116,21 +116,13 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     Window( i_pParent, FwkResId( DLG_BACKING ) ),
     maWelcome( this, WB_LEFT ),
     maProduct( this, WB_LEFT ),
-    maWriterText( this, WB_WORDBREAK | WB_VCENTER ),
     maWriterButton( this, STC_BUTTON_STYLE ),
-    maCalcText( this, WB_WORDBREAK | WB_VCENTER ),
     maCalcButton( this, STC_BUTTON_STYLE ),
-    maImpressText( this, WB_WORDBREAK | WB_VCENTER ),
     maImpressButton( this, STC_BUTTON_STYLE ),
-    maOpenText( this, WB_WORDBREAK | WB_VCENTER ),
     maOpenButton( this, STC_BUTTON_STYLE ),
-    maDrawText( this, WB_WORDBREAK | WB_VCENTER ),
     maDrawButton( this, STC_BUTTON_STYLE ),
-    maDBText( this, WB_WORDBREAK | WB_VCENTER ),
     maDBButton( this, STC_BUTTON_STYLE ),
-    maMathText( this, WB_WORDBREAK | WB_VCENTER ),
     maMathButton( this, STC_BUTTON_STYLE ),
-    maTemplateText( this, WB_WORDBREAK | WB_VCENTER ),
     maTemplateButton( this, STC_BUTTON_STYLE ),
     maToolbox( this, WB_DIALOGCONTROL ),
     maWelcomeString( FwkResId( STR_BACKING_WELCOME ) ),
@@ -141,7 +133,8 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     mbInitControls( false ),
     mnLayoutStyle( 0 ),
     mpAccExec( NULL ),
-    mnBtnPos( 120 )
+    mnBtnPos( 120 ),
+    mnBtnTop( 150 )
 {
     mnColumnWidth[0] = mnColumnWidth[1] = 0;
     mnTextColumnWidth[0] = mnTextColumnWidth[1] = 0;
@@ -171,16 +164,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     {
     }
 
-    // get icon images from vcl resource and set them on the appropriate buttons
-    loadImage( FwkResId( BMP_BACKING_WRITER ), maWriterButton );
-    loadImage( FwkResId( BMP_BACKING_CALC ), maCalcButton );
-    loadImage( FwkResId( BMP_BACKING_IMPRESS ), maImpressButton );
-    loadImage( FwkResId( BMP_BACKING_DRAW ), maDrawButton );
-    loadImage( FwkResId( BMP_BACKING_DATABASE ), maDBButton );
-    loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton );
-    loadImage( FwkResId( BMP_BACKING_FOLDER ), maOpenButton );
-    loadImage( FwkResId( BMP_BACKING_FOLDER ), maTemplateButton );
-
     String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
     String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
     String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
@@ -195,10 +178,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 
     SetStyle( GetStyle() | WB_DIALOGCONTROL );
 
-    // add some breathing space for the images
-    maButtonImageSize.Width() += 12;
-    maButtonImageSize.Height() += 12;
-
     // force tab cycling in toolbox
     maToolbox.SetStyle( maToolbox.GetStyle() | WB_FORCETABCYCLE );
 
@@ -244,6 +223,11 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 
     // init background
     initBackground();
+
+    // add some breathing space for the images
+    maButtonImageSize.Width() += 12;
+    maButtonImageSize.Height() += 12;
+
 }
 
 
@@ -324,22 +308,6 @@ void BackingWindow::initBackground()
     maWelcome.SetBackground();
     maProduct.SetControlForeground( maWelcomeTextColor );
     maProduct.SetBackground();
-    maWriterText.SetControlForeground( maLabelTextColor );
-    maWriterText.SetControlBackground( aTextBGColor );
-    maCalcText.SetControlForeground( maLabelTextColor );
-    maCalcText.SetControlBackground( aTextBGColor );
-    maImpressText.SetControlForeground( maLabelTextColor );
-    maImpressText.SetControlBackground( aTextBGColor );
-    maDrawText.SetControlForeground( maLabelTextColor );
-    maDrawText.SetControlBackground( aTextBGColor );
-    maDBText.SetControlForeground( maLabelTextColor );
-    maDBText.SetControlBackground( aTextBGColor );
-    maMathText.SetControlForeground( maLabelTextColor );
-    maMathText.SetControlBackground( aTextBGColor );
-    maTemplateText.SetControlForeground( maLabelTextColor );
-    maTemplateText.SetControlBackground( aTextBGColor );
-    maOpenText.SetControlForeground( maLabelTextColor );
-    maOpenText.SetControlBackground( aTextBGColor );
 
     if( mnLayoutStyle == 1 )
     {
@@ -348,6 +316,17 @@ void BackingWindow::initBackground()
         else
             mnBtnPos = maBackgroundLeft.GetSizePixel().Width() + 40;
     }
+
+    // get icon images from fwk resource and set them on the appropriate buttons
+    loadImage( FwkResId( BMP_BACKING_WRITER ), maWriterButton );
+    loadImage( FwkResId( BMP_BACKING_CALC ), maCalcButton );
+    loadImage( FwkResId( BMP_BACKING_IMPRESS ), maImpressButton );
+    loadImage( FwkResId( BMP_BACKING_DRAW ), maDrawButton );
+    loadImage( FwkResId( BMP_BACKING_DATABASE ), maDBButton );
+    loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton );
+    loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton );
+    loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton );
+
 }
 
 void BackingWindow::initControls()
@@ -456,35 +435,35 @@ void BackingWindow::initControls()
     }
 
     // layout the buttons
-    layoutButtonAndText( WRITER_URL, 0, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SWRITER,
-                         maWriterButton, maWriterText, aMnemns );
-    layoutButtonAndText( DRAW_URL, 1, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SDRAW,
-                         maDrawButton, maDrawText, aMnemns );
+    layoutButton( WRITER_URL, 0, aFileNewAppsAvailable,
+                  aModuleOptions, SvtModuleOptions::E_SWRITER,
+                  maWriterButton, aMnemns );
+    layoutButton( DRAW_URL, 1, aFileNewAppsAvailable,
+                  aModuleOptions, SvtModuleOptions::E_SDRAW,
+                  maDrawButton, aMnemns );
     nYPos += maButtonImageSize.Height() + 10;
-    layoutButtonAndText( CALC_URL, 0, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SCALC,
-                         maCalcButton, maCalcText, aMnemns );
-    layoutButtonAndText( BASE_URL, 1, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SDATABASE,
-                         maDBButton, maDBText, aMnemns );
+    layoutButton( CALC_URL, 0, aFileNewAppsAvailable,
+                  aModuleOptions, SvtModuleOptions::E_SCALC,
+                  maCalcButton, aMnemns );
+    layoutButton( BASE_URL, 1, aFileNewAppsAvailable,
+                  aModuleOptions, SvtModuleOptions::E_SDATABASE,
+                  maDBButton, aMnemns );
     nYPos += maButtonImageSize.Height() + 10;
-    layoutButtonAndText( IMPRESS_WIZARD_URL, 0, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SIMPRESS,
-                         maImpressButton, maImpressText, aMnemns );
-    layoutButtonAndText( MATH_URL, 1, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SMATH,
-                         maMathButton, maMathText, aMnemns );
+    layoutButton( IMPRESS_WIZARD_URL, 0, aFileNewAppsAvailable,
+                  aModuleOptions, SvtModuleOptions::E_SIMPRESS,
+                  maImpressButton, aMnemns );
+    layoutButton( MATH_URL, 1, aFileNewAppsAvailable,
+                  aModuleOptions, SvtModuleOptions::E_SMATH,
+                  maMathButton, aMnemns );
 
     nYPos += 3*maButtonImageSize.Height() / 2;
 
-    layoutButtonAndText( NULL, 0, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SWRITER,
-                         maOpenButton, maOpenText, aMnemns, maOpenString );
-    layoutButtonAndText( NULL, 1, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SWRITER,
-                         maTemplateButton, maTemplateText, aMnemns, maTemplateString );
+    layoutButton( NULL, 0, aFileNewAppsAvailable,
+                  aModuleOptions, SvtModuleOptions::E_SWRITER,
+                  maOpenButton, aMnemns, maOpenString );
+    layoutButton( NULL, 1, aFileNewAppsAvailable,
+                  aModuleOptions, SvtModuleOptions::E_SWRITER,
+                  maTemplateButton, aMnemns, maTemplateString );
     nYPos += 10;
 
     DBG_ASSERT( nYPos < maControlRect.GetHeight(), "misformatting !" );
@@ -532,6 +511,8 @@ void BackingWindow::initControls()
         maBackgroundMiddle = BitmapEx();
 
     Resize();
+
+    maWriterButton.GrabFocus();
 }
 
 void BackingWindow::loadImage( const ResId& i_rId, ImageButton& i_rButton )
@@ -545,11 +526,11 @@ void BackingWindow::loadImage( const ResId& i_rId, ImageButton& i_rButton )
     i_rButton.SetModeImage( aBmp );
 }
 
-void BackingWindow::layoutButtonAndText(
+void BackingWindow::layoutButton(
                           const char* i_pURL, int nColumn,
                           const std::set<rtl::OUString>& i_rURLS,
                           SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule i_eMod,
-                          ImageButton& i_rBtn, FixedText& i_rText,
+                          ImageButton& i_rBtn,
                           MnemonicGenerator& i_rMnemns,
                           const String& i_rStr
                           )
@@ -572,7 +553,7 @@ void BackingWindow::layoutButtonAndText(
 
     long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() );
 
-    nTextWidth += maButtonImageSize.Width();
+    nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the safe side
     if( nColumn >= 0 && nColumn < static_cast<int>(sizeof(mnColumnWidth)/sizeof(mnColumnWidth[0])) )
     {
         if( nTextWidth > mnColumnWidth[nColumn] )
@@ -582,12 +563,6 @@ void BackingWindow::layoutButtonAndText(
     i_rBtn.SetImageAlign( IMAGEALIGN_LEFT );
     // show the controls
     i_rBtn.Show();
-    i_rText.Show( FALSE );
-
-
-    // FIXME: the only reason the FixedTexts are left are not to trigger
-    // a translation change due to changed src files. For the next minor
-    // the FixedTexts should be removed completely
 }
 
 void BackingWindow::Paint( const Rectangle& )
@@ -635,8 +610,73 @@ long BackingWindow::Notify( NotifyEvent& rNEvt )
         }
 
         const KeyEvent* pEvt = rNEvt.GetKeyEvent();
-        if( pEvt && mpAccExec->execute(pEvt->GetKeyCode()) )
+        const KeyCode& rKeyCode(pEvt->GetKeyCode());
+        if( pEvt && mpAccExec->execute(rKeyCode) )
             return 1;
+        // #i110344# extrawurst: specialized arrow key control
+        if( rKeyCode.GetModifier() == 0 )
+        {
+            if( rKeyCode.GetCode() == KEY_RIGHT )
+            {
+                if( maWriterButton.HasFocus() )
+                    maDrawButton.GrabFocus();
+                else if( maCalcButton.HasFocus() )
+                    maDBButton.GrabFocus();
+                else if( maImpressButton.HasFocus() )
+                    maMathButton.GrabFocus();
+                else if( maOpenButton.HasFocus() )
+                    maTemplateButton.GrabFocus();
+                return 1;
+            }
+            else if( rKeyCode.GetCode() == KEY_LEFT )
+            {
+                if( maDrawButton.HasFocus() )
+                    maWriterButton.GrabFocus();
+                else if( maDBButton.HasFocus() )
+                    maCalcButton.GrabFocus();
+                else if( maMathButton.HasFocus() )
+                    maImpressButton.GrabFocus();
+                else if( maTemplateButton.HasFocus() )
+                    maOpenButton.GrabFocus();
+                return 1;
+            }
+            else if( rKeyCode.GetCode() == KEY_UP )
+            {
+                // first column
+                if( maOpenButton.HasFocus() )
+                    maImpressButton.GrabFocus();
+                else if( maImpressButton.HasFocus() )
+                    maCalcButton.GrabFocus();
+                else if( maCalcButton.HasFocus() )
+                    maWriterButton.GrabFocus();
+                // second column
+                else if( maTemplateButton.HasFocus() )
+                    maMathButton.GrabFocus();
+                else if( maMathButton.HasFocus() )
+                    maDBButton.GrabFocus();
+                else if( maDBButton.HasFocus() )
+                    maDrawButton.GrabFocus();
+                return 1;
+            }
+            else if( rKeyCode.GetCode() == KEY_DOWN )
+            {
+                // first column
+                if( maWriterButton.HasFocus() )
+                    maCalcButton.GrabFocus();
+                else if( maCalcButton.HasFocus() )
+                    maImpressButton.GrabFocus();
+                else if( maImpressButton.HasFocus() )
+                    maOpenButton.GrabFocus();
+                // second column
+                else if( maDrawButton.HasFocus() )
+                    maDBButton.GrabFocus();
+                else if( maDBButton.HasFocus() )
+                    maMathButton.GrabFocus();
+                else if( maMathButton.HasFocus() )
+                    maTemplateButton.GrabFocus();
+                return 1;
+            }
+        }
     }
     return Window::Notify( rNEvt );
 }
@@ -696,6 +736,9 @@ void BackingWindow::Resize()
 
     nYPos += nWDelta/2 - nDiff;
 
+    if( mnLayoutStyle != 1 )
+        nYPos = maControlRect.Top() + mnBtnTop;
+
     maWriterButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
     maDrawButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
     nYPos += nBDelta - nDiff;
@@ -865,54 +908,6 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
     return 0;
 }
 
-Window* BackingWindow::GetParentLabelFor( const Window* pLabel ) const
-{
-    const Window* pRet = NULL;
-
-    if( pLabel == &maWriterText )
-        pRet = &maWriterButton;
-    else if( pLabel == &maCalcText )
-        pRet = &maCalcButton;
-    else if( pLabel == &maImpressText )
-        pRet = &maImpressButton;
-    else if( pLabel == &maDrawText )
-        pRet = &maDrawButton;
-    else if( pLabel == &maDBText )
-        pRet = &maDBButton;
-    else if( pLabel == &maMathText )
-        pRet = &maMathButton;
-    else if( pLabel == &maTemplateText )
-        pRet = &maTemplateButton;
-    else if( pLabel == &maOpenText )
-        pRet = &maOpenButton;
-
-    return const_cast<Window*>(pRet);
-}
-
-Window* BackingWindow::GetParentLabeledBy( const Window* pLabeled ) const
-{
-    const Window *pRet = NULL;
-
-    if( pLabeled == &maWriterButton )
-        pRet = &maWriterText;
-    else if( pLabeled == &maCalcButton )
-        pRet = &maCalcText;
-    else if( pLabeled == &maImpressButton )
-        pRet = &maImpressText;
-    else if( pLabeled == &maDrawButton )
-        pRet = &maDrawText;
-    else if( pLabeled == &maDBButton )
-        pRet = &maDBText;
-    else if( pLabeled == &maMathButton )
-        pRet = &maMathText;
-    else if( pLabeled == &maTemplateButton )
-        pRet = &maTemplateText;
-    else if( pLabeled == &maOpenButton )
-        pRet = &maOpenText;
-
-    return const_cast<Window*>(pRet);
-}
-
 struct ImplDelayedDispatch
 {
     Reference< XDispatch >      xDispatch;
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index 7b7dfa34b110..c4d4c9b0b76b 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -86,21 +86,13 @@ namespace framework
         Size                            maWelcomeSize;
         FixedText                       maProduct;
         Size                            maProductSize;
-        FixedText                       maWriterText;
         ImageButton                     maWriterButton;
-        FixedText                       maCalcText;
         ImageButton                     maCalcButton;
-        FixedText                       maImpressText;
         ImageButton                     maImpressButton;
-        FixedText                       maOpenText;
         ImageButton                     maOpenButton;
-        FixedText                       maDrawText;
         ImageButton                     maDrawButton;
-        FixedText                       maDBText;
         ImageButton                     maDBButton;
-        FixedText                       maMathText;
         ImageButton                     maMathButton;
-        FixedText                       maTemplateText;
         ImageButton                     maTemplateButton;
 
         DecoToolBox                     maToolbox;
@@ -129,6 +121,7 @@ namespace framework
         sal_Int32                       mnLayoutStyle;
         svt::AcceleratorExecute*        mpAccExec;
         long                            mnBtnPos;
+        long                            mnBtnTop;
 
         static const int nItemId_Extensions = 1;
         static const int nItemId_Reg = 2;
@@ -141,12 +134,12 @@ namespace framework
 
         void loadImage( const ResId& i_rId, ImageButton& i_rButton );
 
-        void layoutButtonAndText( const char* i_pURL, int nColumn, const std::set<rtl::OUString>& i_rURLS,
-                                  SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule i_eMod,
-                                  ImageButton& i_rBtn, FixedText& i_rText,
-                                  MnemonicGenerator& i_rMnemonicGen,
-                                  const String& i_rStr = String()
-                                  );
+        void layoutButton( const char* i_pURL, int nColumn, const std::set<rtl::OUString>& i_rURLS,
+                           SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule i_eMod,
+                           ImageButton& i_rBtn,
+                           MnemonicGenerator& i_rMnemonicGen,
+                           const String& i_rStr = String()
+                           );
 
         void dispatchURL( const rtl::OUString& i_rURL,
                           const rtl::OUString& i_rTarget = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ),
@@ -167,8 +160,6 @@ namespace framework
         virtual void        Resize();
         virtual long        Notify( NotifyEvent& rNEvt );
         virtual void        DataChanged( const DataChangedEvent& rDCEvt );
-        virtual Window*     GetParentLabelFor( const Window* pLabel ) const;
-        virtual Window*     GetParentLabeledBy( const Window* pLabeled ) const;
     virtual void        GetFocus();
 
         void setOwningFrame( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame );
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index 7e2ee3253e71..7ad8b4c3cede 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -53,34 +53,6 @@ Window DLG_BACKING
     {
         Text [ en-US ] = "~Open a document...";
     };
-    Bitmap BMP_BACKING_WRITER
-    {
-        File = "odt_32.png";
-    };
-    Bitmap BMP_BACKING_CALC
-    {
-        File = "ods_32.png";
-    };
-    Bitmap BMP_BACKING_IMPRESS
-    {
-        File = "odp_32.png";
-    };
-    Bitmap BMP_BACKING_DRAW
-    {
-        File = "odg_32.png";
-    };
-    Bitmap BMP_BACKING_DATABASE
-    {
-        File = "odb_32.png";
-    };
-    Bitmap BMP_BACKING_FORMULA
-    {
-        File = "odf_32.png";
-    };
-    Bitmap BMP_BACKING_FOLDER
-    {
-        File = "folder_32.png";
-    };
     String STR_BACKING_EXTHELP
     {
         Text [ en-US ] = "Add new features to %PRODUCTNAME";
@@ -137,6 +109,38 @@ Resource RES_BACKING_IMAGES
     {
         File = "addtemplate_32.png";
     };
+    Bitmap BMP_BACKING_WRITER
+    {
+        File = "odt_32.png";
+    };
+    Bitmap BMP_BACKING_CALC
+    {
+        File = "ods_32.png";
+    };
+    Bitmap BMP_BACKING_IMPRESS
+    {
+        File = "odp_32.png";
+    };
+    Bitmap BMP_BACKING_DRAW
+    {
+        File = "odg_32.png";
+    };
+    Bitmap BMP_BACKING_DATABASE
+    {
+        File = "odb_32.png";
+    };
+    Bitmap BMP_BACKING_FORMULA
+    {
+        File = "odf_32.png";
+    };
+    Bitmap BMP_BACKING_OPENFILE
+    {
+        File = "folder_32.png";
+    };
+    Bitmap BMP_BACKING_OPENTEMPLATE
+    {
+        File = "templates_32.png";
+    };
 };
 
 Resource RES_BACKING_IMAGES_HC
@@ -177,6 +181,38 @@ Resource RES_BACKING_IMAGES_HC
     {
         File = "template_hc.png";
     };
+    Bitmap BMP_BACKING_WRITER
+    {
+        File = "odt_32_hc.png";
+    };
+    Bitmap BMP_BACKING_CALC
+    {
+        File = "ods_32_hc.png";
+    };
+    Bitmap BMP_BACKING_IMPRESS
+    {
+        File = "odp_32_hc.png";
+    };
+    Bitmap BMP_BACKING_DRAW
+    {
+        File = "odg_32_hc.png";
+    };
+    Bitmap BMP_BACKING_DATABASE
+    {
+        File = "odb_32_hc.png";
+    };
+    Bitmap BMP_BACKING_FORMULA
+    {
+        File = "odf_32_hc.png";
+    };
+    Bitmap BMP_BACKING_OPENFILE
+    {
+        File = "folder_32_hc.png";
+    };
+    Bitmap BMP_BACKING_OPENTEMPLATE
+    {
+        File = "templates_32_hc.png";
+    };
 };
 
 Window WIN_TABWINDOW
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 8840aee6a634..4bdc626ee91d 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -120,7 +120,8 @@ static const char* UIELEMENTTYPENAMES[] =
     UIELEMENTTYPE_TOOLBAR_NAME,
     UIELEMENTTYPE_STATUSBAR_NAME,
     UIELEMENTTYPE_FLOATINGWINDOW_NAME,
-    UIELEMENTTYPE_PROGRESSBAR_NAME
+    UIELEMENTTYPE_PROGRESSBAR_NAME,
+    UIELEMENTTYPE_TOOLPANEL_NAME
 };
 
 static const char       RESOURCEURL_PREFIX[] = "private:resource/";
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 4adebdd36c47..e704fe680ae9 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -118,7 +118,8 @@ static const char* UIELEMENTTYPENAMES[] =
     UIELEMENTTYPE_TOOLBAR_NAME,
     UIELEMENTTYPE_STATUSBAR_NAME,
     UIELEMENTTYPE_FLOATINGWINDOW_NAME,
-    UIELEMENTTYPE_PROGRESSBAR_NAME
+    UIELEMENTTYPE_PROGRESSBAR_NAME,
+    UIELEMENTTYPE_TOOLPANEL_NAME
 };
 
 static const char       RESOURCEURL_PREFIX[] = "private:resource/";
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 3921625cc76f..058005ffdc40 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 0672ac69d351..49501194a014 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -61,6 +61,7 @@
 #include <vcl/image.hxx>
 #include <svtools/menuoptions.hxx>
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 // Copied from svx
 // Function-Id's
@@ -213,7 +214,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   ControlMenuController
 DEFINE_INIT_SERVICE                     (   ControlMenuController, {} )
 
 ControlMenuController::ControlMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_pResPopupMenu( 0 )
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
@@ -272,7 +273,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::ResettableMutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xServiceManager.clear();
@@ -286,7 +287,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
 // XStatusListener
 void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ResettableMutexGuard aLock( m_aMutex );
 
     USHORT nMenuId = 0;
     for (sal_uInt32 i=0; i < sizeof(aCommands)/sizeof(aCommands[0]); ++i)
@@ -351,7 +352,7 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat
 
 void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ResettableMutexGuard aLock( m_aMutex );
 
     if ( m_xPopupMenu.is() )
     {
@@ -404,10 +405,9 @@ void ControlMenuController::impl_setPopupMenu()
 
 void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ResettableMutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     if ( m_xFrame.is() && m_xPopupMenu.is() )
     {
@@ -435,8 +435,8 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::
 // XInitialization
 void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
-    PopupMenuControllerBase::initialize(aArguments);
+    osl::ResettableMutexGuard aLock( m_aMutex );
+    svt::PopupMenuControllerBase::initialize(aArguments);
     m_aBaseURL = ::rtl::OUString();
 }
 
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 43b50eb2a49a..0800103c743e 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 3ad4b11fd1e9..387213d7c3eb 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 7110ea5aa519..c2625a951efb 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -59,6 +59,7 @@
 #include <vcl/mnemonic.hxx>
 #endif
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -91,7 +92,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   FontMenuController
 DEFINE_INIT_SERVICE                     (   FontMenuController, {} )
 
 FontMenuController::FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager )
+    svt::PopupMenuControllerBase( xServiceManager )
 {
 }
 
@@ -145,7 +146,7 @@ void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( Runtim
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xFontListDispatch.clear();
@@ -164,12 +165,12 @@ void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event
 
     if ( Event.State >>= aFontDescriptor )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         m_aFontFamilyName = aFontDescriptor.Name;
     }
     else if ( Event.State >>= aFontNameSeq )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         if ( m_xPopupMenu.is() )
             fillPopupMenu( aFontNameSeq, m_xPopupMenu );
     }
@@ -192,7 +193,7 @@ void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,co
 
 void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
     if ( m_xPopupMenu.is() )
     {
@@ -241,14 +242,14 @@ void FontMenuController::impl_setPopupMenu()
 
 void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
 {
-    PopupMenuControllerBase::updatePopupMenu();
+    svt::PopupMenuControllerBase::updatePopupMenu();
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     Reference< XDispatch > xDispatch( m_xFontListDispatch );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontNameList" ));
     m_xURLTransformer->parseStrict( aTargetURL );
-    aLock.unlock();
+    aLock.clear();
 
     if ( xDispatch.is() )
     {
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 8dbd608a28e0..58cf3a3b02be 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -64,6 +64,7 @@
 #include <svtools/ctrltool.hxx>
 #endif
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -90,7 +91,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   FontSizeMenuController
 DEFINE_INIT_SERVICE                     (   FontSizeMenuController, {} )
 
 FontSizeMenuController::FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_pHeightArray( 0 ),
     m_bRebuildMenu( sal_True )
 {
@@ -280,7 +281,7 @@ void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( Ru
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xCurrentFontDispatch.clear();
@@ -297,7 +298,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev
 
     if ( Event.State >>= aFontDescriptor )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         m_aFontDescriptor = aFontDescriptor;
 
         if ( m_xPopupMenu.is() )
@@ -306,7 +307,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev
     }
     else if ( Event.State >>= aFontHeight )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         m_aFontHeight = aFontHeight;
 
         if ( m_xPopupMenu.is() )
@@ -341,16 +342,15 @@ void FontSizeMenuController::impl_setPopupMenu()
 
 void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     Reference< XDispatch > xDispatch( m_xCurrentFontDispatch );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" ));
     m_xURLTransformer->parseStrict( aTargetURL );
-    aLock.unlock();
+    aLock.clear();
 
     if ( xDispatch.is() )
     {
@@ -358,6 +358,6 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star
         xDispatch->removeStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL );
     }
 
-    PopupMenuControllerBase::updatePopupMenu();
+    svt::PopupMenuControllerBase::updatePopupMenu();
 }
 }
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 50b2ed65e2d2..c0d7b48a401b 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -50,7 +50,6 @@
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
@@ -65,6 +64,7 @@
 #include <rtl/ustrbuf.hxx>
 //#include <tools/solar.hrc>
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -97,7 +97,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   HeaderMenuController
 DEFINE_INIT_SERVICE                     (   HeaderMenuController, {} )
 
 HeaderMenuController::HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool _bFooter ) :
-    PopupMenuControllerBase( xServiceManager )
+    svt::PopupMenuControllerBase( xServiceManager )
     ,m_bFooter(_bFooter)
 {
 }
@@ -221,7 +221,7 @@ void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( Runt
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xServiceManager.clear();
@@ -238,7 +238,7 @@ void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Even
 
     if ( Event.State >>= xModel )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         m_xModel = xModel;
         if ( m_xPopupMenu.is() )
             fillPopupMenu( xModel, m_xPopupMenu );
@@ -258,18 +258,17 @@ void HeaderMenuController::impl_select(const Reference< XDispatch >& _xDispatch,
 
 void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ResettableMutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     Reference< com::sun::star::frame::XModel > xModel( m_xModel );
-    aLock.unlock();
+    aLock.clear();
 
     if ( !xModel.is() )
-        PopupMenuControllerBase::updatePopupMenu();
+        svt::PopupMenuControllerBase::updatePopupMenu();
 
-    aLock.lock();
+    aLock.reset();
     if ( m_xPopupMenu.is() && m_xModel.is() )
         fillPopupMenu( m_xModel, m_xPopupMenu );
 }
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index d9af2fb4f9f9..5126ffdd253a 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/XControlNotificationListener.hpp>
 #include "com/sun/star/util/XMacroExpander.hpp"
 #include "com/sun/star/uno/XComponentContext.hpp"
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 2f0f49655d10..651c9bbfdc86 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -77,6 +77,7 @@
 #include <dispatch/uieventloghelper.hxx>
 
 #include "helper/mischelper.hxx"
+#include <vos/mutex.hxx>
 
 #include <map>
 #include <set>
@@ -106,9 +107,9 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   LanguageSelectionMenuController
 DEFINE_INIT_SERVICE                     (   LanguageSelectionMenuController, {} )
 
 LanguageSelectionMenuController::LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_bShowMenu( sal_True ),
-    m_aLangGuessHelper(xServiceManager)
+    m_aLangGuessHelper( xServiceManager )
 {
 }
 
@@ -121,7 +122,7 @@ void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) t
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xLanguageDispatch.clear();
@@ -137,7 +138,7 @@ void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureState
 {
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
 
-    if ( m_bDisposed )
+    if (rBHelper.bDisposed || rBHelper.bInDispose)
         return;
 
     m_bShowMenu = sal_True;
@@ -321,15 +322,15 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
 
 void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
 {
-    PopupMenuControllerBase::updatePopupMenu();
+    svt::PopupMenuControllerBase::updatePopupMenu();
 
     // Force status update to get information about the current languages
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     Reference< XDispatch > xDispatch( m_xLanguageDispatch );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = m_aLangStatusCommandURL;
     m_xURLTransformer->parseStrict( aTargetURL );
-    aLock.unlock();
+    aLock.clear();
 
     if ( xDispatch.is() )
     {
@@ -356,12 +357,12 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::
 // XInitialization
 void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
     sal_Bool bInitalized( m_bInitialized );
     if ( !bInitalized )
     {
-        PopupMenuControllerBase::initialize(aArguments);
+        svt::PopupMenuControllerBase::initialize(aArguments);
 
         if ( m_bInitialized )
         {
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index a75a1061eaf4..e84ca9e4f09d 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -227,6 +227,7 @@ throw (::com::sun::star::uno::RuntimeException)
             {
                 //make a sign for the current language
                 xPopupMenu->checkItem( nItemId, TRUE );
+                bNothingSelected = false;
             }
             aLangMap[ nItemId ] = rStr;
             ++nItemId;
@@ -244,8 +245,8 @@ throw (::com::sun::star::uno::RuntimeException)
     {
         const OUString & rStr( *it );
         if( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&&
-            rStr != OUString::createFromAscii( "*" ) &&
-            rStr != OUString::createFromAscii( ""  ))
+            rStr != sAsterix &&
+            rStr != sEmpty)
         {
             DBG_ASSERT( MID_LANG_PARA_1 <= nItemId && nItemId <= MID_LANG_PARA_9,
                     "nItemId outside of expected range!" );
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index f0f5d52a47d6..2905d0c0bd05 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -48,6 +48,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <dispatch/uieventloghelper.hxx>
 #include "helper/mischelper.hxx"
+#include <vos/mutex.hxx>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -70,7 +71,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   MacrosMenuController
 DEFINE_INIT_SERVICE                     (   MacrosMenuController, {} )
 
 MacrosMenuController::MacrosMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_xServiceManager( xServiceManager)
 {
 }
@@ -109,7 +110,7 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     OSL_TRACE("disposing");
     m_xFrame.clear();
     m_xDispatch.clear();
@@ -126,7 +127,7 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt
 // XStatusListener
 void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     if ( m_xPopupMenu.is() )
     {
         fillPopupMenu( m_xPopupMenu );
diff --git a/framework/source/uielement/makefile.mk b/framework/source/uielement/makefile.mk
index da4ab3d34c74..b74adb1e176f 100644
--- a/framework/source/uielement/makefile.mk
+++ b/framework/source/uielement/makefile.mk
@@ -79,6 +79,7 @@ SLOFILES=           \
                     $(SLO)$/toolbarmerger.obj                   \
                     $(SLO)$/toolbarsmenucontroller.obj          \
                     $(SLO)$/toolbarwrapper.obj                  \
+                    $(SLO)$/popupmenucontroller.obj				\
                     $(SLO)$/uicommanddescription.obj            \
 
 # --- Targets ------------------------------------------------------
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 9fbdf87336cc..9d8aa9205c90 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -548,11 +548,14 @@ throw ( RuntimeException )
 
                 if ( Event.State >>= bCheckmark )
                 {
-                    // Checkmark
+                    // Checkmark or RadioButton
                     m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, TRUE );
                     m_pVCLMenu->CheckItem( pMenuItemHandler->nItemId, bCheckmark );
-                    m_pVCLMenu->SetItemBits( pMenuItemHandler->nItemId,
-                                             m_pVCLMenu->GetItemBits( pMenuItemHandler->nItemId ) | MIB_CHECKABLE );
+
+                    MenuItemBits nBits = m_pVCLMenu->GetItemBits( pMenuItemHandler->nItemId );
+                    //If not already designated RadioButton set as CheckMark
+                    if (!(nBits & MIB_RADIOCHECK))
+                        m_pVCLMenu->SetItemBits( pMenuItemHandler->nItemId, nBits | MIB_CHECKABLE );
                 }
                 else if ( Event.State >>= aItemText )
                 {
@@ -1805,6 +1808,8 @@ void MenuBarManager::FillMenu(
                            nBits |= MIB_ICON;
                         if ( nStyle & ::com::sun::star::ui::ItemStyle::TEXT )
                            nBits |= MIB_TEXT;
+                        if ( nStyle & ::com::sun::star::ui::ItemStyle::RADIO_CHECK )
+                           nBits |= MIB_RADIOCHECK;
                         pMenu->SetItemBits( nId, nBits );
                     }
                     if ( xIndexContainer.is() )
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 3ac78726d799..786795ff1d14 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -67,6 +67,7 @@
 #include <svtools/acceleratorexecute.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -326,7 +327,7 @@ void NewMenuController::retrieveShortcutsFromConfiguration(
 }
 
 NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_bShowImages( sal_True ),
     m_bHiContrast( sal_False ),
     m_bNewMenu( sal_False ),
@@ -399,7 +400,7 @@ void SAL_CALL NewMenuController::disposing( const EventObject& ) throw ( Runtime
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xServiceManager.clear();
@@ -423,12 +424,12 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr
     Reference< XMultiServiceFactory > xServiceManager;
     Reference< XURLTransformer >      xURLTransformer;
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     xPopupMenu          = m_xPopupMenu;
     xDispatchProvider   = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY );
     xServiceManager     = m_xServiceManager;
     xURLTransformer     = m_xURLTransformer;
-    aLock.unlock();
+    aLock.clear();
 
     css::util::URL aTargetURL;
     Sequence< PropertyValue > aArgsList( 1 );
@@ -548,12 +549,12 @@ void NewMenuController::impl_setPopupMenu()
 // XInitialization
 void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
     sal_Bool bInitalized( m_bInitialized );
     if ( !bInitalized )
     {
-        PopupMenuControllerBase::initialize( aArguments );
+        svt::PopupMenuControllerBase::initialize( aArguments );
 
         if ( m_bInitialized )
         {
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index f4d6aea0d82b..80dccb76db05 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -59,6 +59,7 @@
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -83,7 +84,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   ObjectMenuController
 DEFINE_INIT_SERVICE                     (   ObjectMenuController, {} )
 
 ObjectMenuController::ObjectMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager )
+    svt::PopupMenuControllerBase( xServiceManager )
 {
 }
 
@@ -128,7 +129,7 @@ void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( Runt
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xObjectUpdateDispatch.clear();
@@ -145,7 +146,7 @@ void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Even
     Sequence < com::sun::star::embed::VerbDescriptor > aVerbCommandSeq;
     if ( Event.State >>= aVerbCommandSeq )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         if ( m_xPopupMenu.is() )
             fillPopupMenu( aVerbCommandSeq, m_xPopupMenu );
     }
diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx
new file mode 100644
index 000000000000..328777db2b79
--- /dev/null
+++ b/framework/source/uielement/popupmenucontroller.cxx
@@ -0,0 +1,248 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+#include <com/sun/star/awt/XPopupMenu.hpp>
+#include <com/sun/star/frame/XPopupMenuController.hpp>
+
+#include <toolkit/helper/vclunohelper.hxx>
+//#include <toolkit/unohlp.hxx>
+
+#include <rtl/ref.hxx>
+
+#include <vcl/toolbox.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/svapp.hxx>
+#include <vos/mutex.hxx>
+
+#include "uielement/popupmenucontroller.hxx"
+#include "services.h"
+
+using rtl::OUString;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::beans;
+
+// --------------------------------------------------------------------
+
+
+namespace framework
+{
+
+DEFINE_XSERVICEINFO_MULTISERVICE        (   PopupMenuController                         ,
+                                            OWeakObject                      ,
+                                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) )            ,
+                                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PopupMenuController" ) )
+                                        )
+
+DEFINE_INIT_SERVICE                     (   PopupMenuController, {} )
+
+class PopupMenuControllerImpl
+{
+};
+
+//========================================================================
+// class PopupMenuController
+//========================================================================
+
+PopupMenuController::PopupMenuController( const Reference< lang::XMultiServiceFactory >& rServiceManager )
+: svt::ToolboxController( rServiceManager, Reference< frame::XFrame >(), OUString() )
+{
+}
+
+// --------------------------------------------------------------------
+
+PopupMenuController::~PopupMenuController()
+{
+}
+
+// --------------------------------------------------------------------
+// XInterface
+// --------------------------------------------------------------------
+
+Any SAL_CALL PopupMenuController::queryInterface( const Type& aType )  throw (RuntimeException)
+{
+    Any a( ToolboxController::queryInterface( aType ) );
+    if ( a.hasValue() )
+        return a;
+
+    return ::cppu::queryInterface( aType, static_cast< lang::XServiceInfo* >( this ));
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::acquire() throw ()
+{
+    ToolboxController::acquire();
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::release() throw ()
+{
+    ToolboxController::release();
+}
+
+// --------------------------------------------------------------------
+// XComponent
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::dispose() throw (RuntimeException)
+{
+    if( mxPopupMenuController.is() )
+    {
+        Reference< XComponent > xComponent( mxPopupMenuController, UNO_QUERY );
+        if( xComponent.is() )
+            xComponent->dispose();
+        mxPopupMenuController.clear();
+    }
+
+    mxPopupMenu.clear();
+
+    svt::ToolboxController::dispose();
+}
+
+// --------------------------------------------------------------------
+// XStatusListener
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException )
+{
+    svt::ToolboxController::statusChanged(rEvent);
+    enable( rEvent.IsEnabled );
+}
+
+// --------------------------------------------------------------------
+// XToolbarController
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::execute( sal_Int16 KeyModifier ) throw (RuntimeException)
+{
+    svt::ToolboxController::execute( KeyModifier );
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::click() throw (RuntimeException)
+{
+    svt::ToolboxController::click();
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::doubleClick() throw (RuntimeException)
+{
+    svt::ToolboxController::doubleClick();
+}
+
+// --------------------------------------------------------------------
+
+bool PopupMenuController::CreatePopupMenuController() throw (Exception)
+{
+    Reference< XMultiComponentFactory > xPopupMenuControllerRegistration( getServiceManager()->createInstance( SERVICENAME_POPUPMENUCONTROLLERFACTORY ), UNO_QUERY_THROW );
+
+    Sequence< Any > aSeq( 2 );
+    PropertyValue aPropValue;
+
+    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
+    aPropValue.Value <<= getModuleName();
+    aSeq[0] <<= aPropValue;
+    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
+    aPropValue.Value <<= m_xFrame;
+    aSeq[1] <<= aPropValue;
+
+    Reference< XPropertySet >      xProps( getServiceManager(), UNO_QUERY_THROW );
+    Reference< XComponentContext > xComponentContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW );
+
+    Reference< XPopupMenuController > xPopupMenuController( xPopupMenuControllerRegistration->createInstanceWithArgumentsAndContext( getCommandURL(), aSeq, xComponentContext ), UNO_QUERY );
+    if ( xPopupMenuController.is() )
+    {
+        mxPopupMenuController = xPopupMenuController;
+        return true;
+    }
+    return false;
+}
+
+Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() throw (RuntimeException)
+{
+    ::vos::OGuard aSolarLock(Application::GetSolarMutex());
+
+    Reference< awt::XWindow > xRet;
+
+    try
+    {
+        ToolBox* pToolBox = dynamic_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) );
+        if( !pToolBox )
+            return xRet;
+
+        // get selected button
+        USHORT nItemId = pToolBox->GetDownItemId();
+        if( !nItemId )
+            return xRet;
+
+        ::Rectangle aRect( pToolBox->GetItemRect( nItemId ) );
+
+        if( !mxPopupMenuController.is() && !CreatePopupMenuController() )
+            return xRet;
+
+        if( !mxPopupMenu.is() )
+        {
+            mxPopupMenu = Reference< awt::XPopupMenu >( getServiceManager()->createInstance( DECLARE_ASCII( "stardiv.Toolkit.VCLXPopupMenu" ) ), UNO_QUERY_THROW );
+            mxPopupMenuController->setPopupMenu( mxPopupMenu );
+        }
+        else
+        {
+            mxPopupMenuController->updatePopupMenu();
+
+        }
+        pToolBox->SetItemDown( nItemId, TRUE );
+        Reference< awt::XWindowPeer > xPeer( getParent(), UNO_QUERY_THROW );
+        mxPopupMenu->execute( xPeer, VCLUnoHelper::ConvertToAWTRect( aRect ), 0 );
+        pToolBox->SetItemDown( nItemId, FALSE );
+    }
+    catch( Exception& )
+    {
+    }
+
+    return xRet;
+}
+
+// --------------------------------------------------------------------
+
+Reference< awt::XWindow > SAL_CALL PopupMenuController::createItemWindow( const Reference< awt::XWindow >& /*Parent*/ )  throw (RuntimeException)
+{
+    return Reference< awt::XWindow >();
+}
+
+// --------------------------------------------------------------------
+
+}
+
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index 2cd0ed891db6..a20f107ea22e 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -43,6 +43,7 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index cec95485dacd..64f05ed642cb 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -47,7 +47,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/util/XStringWidth.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
@@ -64,6 +63,7 @@
 #include <osl/file.hxx>
 //#include <tools/solar.hrc>
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -105,7 +105,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   RecentFilesMenuController
 DEFINE_INIT_SERVICE                     (   RecentFilesMenuController, {} )
 
 RecentFilesMenuController::RecentFilesMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_bDisabled( sal_False )
 {
 }
@@ -245,11 +245,11 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
     Reference< XDispatchProvider >    xDispatchProvider;
     Reference< XMultiServiceFactory > xServiceManager;
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     xPopupMenu          = m_xPopupMenu;
     xDispatchProvider   = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY );
     xServiceManager     = m_xServiceManager;
-    aLock.unlock();
+    aLock.clear();
 
     css::util::URL            aTargetURL;
     Sequence< PropertyValue > aArgsList;
@@ -312,7 +312,7 @@ void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw (
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xServiceManager.clear();
@@ -325,7 +325,7 @@ void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw (
 // XStatusListener
 void SAL_CALL RecentFilesMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_bDisabled = !Event.IsEnabled;
 }
 
@@ -336,11 +336,11 @@ void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEve
     Reference< XDispatchProvider >    xDispatchProvider;
     Reference< XMultiServiceFactory > xServiceManager;
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     xPopupMenu          = m_xPopupMenu;
     xDispatchProvider   = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY );
     xServiceManager     = m_xServiceManager;
-    aLock.unlock();
+    aLock.clear();
 
     css::util::URL aTargetURL;
     Sequence< PropertyValue > aArgsList;
@@ -355,7 +355,7 @@ void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEve
 
 void SAL_CALL RecentFilesMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     impl_setPopupMenu();
 }
 
@@ -368,17 +368,16 @@ void RecentFilesMenuController::impl_setPopupMenu()
 
 void SAL_CALL RecentFilesMenuController::updatePopupMenu() throw (RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
     Reference< XDispatch > xDispatch( m_xDispatch );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = m_aCommandURL;
     m_xURLTransformer->parseStrict( aTargetURL );
-    aLock.unlock();
+    aLock.clear();
 
     // Add/remove status listener to get a status update once
     if ( xDispatch.is() )
@@ -395,10 +394,9 @@ Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch(
     sal_Int32 /*nFlags*/ )
 throw( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     if ( aURL.Complete.indexOf( m_aBaseURL ) == 0 )
         return Reference< XDispatch >( static_cast< OWeakObject* >( this ), UNO_QUERY );
@@ -412,10 +410,9 @@ void SAL_CALL RecentFilesMenuController::dispatch(
     const Sequence< PropertyValue >& /*seqProperties*/ )
 throw( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     if ( aURL.Complete.indexOf( m_aBaseURL ) == 0 )
     {
@@ -448,12 +445,11 @@ void SAL_CALL RecentFilesMenuController::addStatusListener(
     const URL& aURL )
 throw( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
-    PopupMenuControllerBase::addStatusListener( xControl, aURL );
+    svt::PopupMenuControllerBase::addStatusListener( xControl, aURL );
 }
 
 void SAL_CALL RecentFilesMenuController::removeStatusListener(
@@ -461,7 +457,7 @@ void SAL_CALL RecentFilesMenuController::removeStatusListener(
     const URL& aURL )
 throw( RuntimeException )
 {
-    PopupMenuControllerBase::removeStatusListener( xControl, aURL );
+    svt::PopupMenuControllerBase::removeStatusListener( xControl, aURL );
 }
 
 IMPL_STATIC_LINK_NOINSTANCE( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile*, pLoadRecentFile )
diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/uielement/rootitemcontainer.cxx
index e67b734730e5..8c81f31f2394 100644
--- a/framework/source/uielement/rootitemcontainer.cxx
+++ b/framework/source/uielement/rootitemcontainer.cxx
@@ -127,7 +127,6 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo
         Reference< XPropertySet > xPropSet( rSourceContainer, UNO_QUERY );
         if ( xPropSet.is() )
         {
-            rtl::OUString aUIName;
             xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= m_aUIName;
         }
     }
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 43ad09ffc1ee..dad2775dc453 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -49,7 +49,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index cb9cbb2896f7..0bbdbc339a34 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -56,6 +56,7 @@
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/Command.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  other includes
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index a5e4263385fa..cf39edec2a7c 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/XControlNotificationListener.hpp>
 #include "com/sun/star/util/XMacroExpander.hpp"
 #include "com/sun/star/uno/XComponentContext.hpp"
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index d89b81c0f9b6..abb263497854 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -52,6 +52,7 @@
 #endif
 #include <classes/addonsoptions.hxx>
 #include <uielement/toolbarmerger.hxx>
+#include <helper/acceleratorinfo.hxx>
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -75,6 +76,7 @@
 #include <com/sun/star/ui/UIElementType.hpp>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/frame/status/Visibility.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  other includes
@@ -97,11 +99,14 @@
 #include <svtools/menuoptions.hxx>
 #include <unotools/cmdoptions.hxx>
 #include <boost/bind.hpp>
+#include <svtools/acceleratorexecute.hxx>
 
 //_________________________________________________________________________________________________________________
 //  namespaces
 //_________________________________________________________________________________________________________________
 
+using rtl::OUString;
+
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
@@ -112,6 +117,7 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::ui;
+using namespace ::com::sun::star;
 
 namespace framework
 {
@@ -257,7 +263,8 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
     m_xFrame( rFrame ),
     m_aListenerContainer( m_aLock.getShareableOslMutex() ),
     m_xServiceManager( rServiceManager ),
-    m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
+    m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() ),
+    m_bAcceleratorCfg( sal_False )
 {
     Window* pWindow = m_pToolBar;
     while ( pWindow && !pWindow->IsSystemWindow() )
@@ -663,6 +670,9 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException )
 
         m_xFrame.clear();
         m_xServiceManager.clear();
+        m_xGlobalAcceleratorManager.clear();
+        m_xModuleAcceleratorManager.clear();
+        m_xDocAcceleratorManager.clear();
 
         m_bDisposed = sal_True;
     }
@@ -803,17 +813,18 @@ void ToolBarManager::RemoveControllers()
     m_aControllerMap.clear();
 }
 
-::rtl::OUString ToolBarManager::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL )
+uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const ::rtl::OUString& rCmdURL )
 {
-    ::rtl::OUString aLabel;
+    Sequence< PropertyValue > aPropSeq;
 
-    // Retrieve popup menu labels
-    if ( !m_bModuleIdentified )
+    // Retrieve properties for command
+    try
     {
-        Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
-        Reference< XInterface > xIfac( m_xFrame, UNO_QUERY );
-        try
+        if ( !m_bModuleIdentified )
         {
+            Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
+            Reference< XInterface > xIfac( m_xFrame, UNO_QUERY );
+
             m_bModuleIdentified = sal_True;
             m_aModuleIdentifier = xModuleManager->identify( xIfac );
 
@@ -821,44 +832,57 @@ void ToolBarManager::RemoveControllers()
             {
                 Reference< XNameAccess > xNameAccess( m_xServiceManager->createInstance( SERVICENAME_UICOMMANDDESCRIPTION ), UNO_QUERY );
                 if ( xNameAccess.is() )
-                {
                     xNameAccess->getByName( m_aModuleIdentifier ) >>= m_xUICommandLabels;
-                }
             }
         }
-        catch ( Exception& )
+
+        if ( m_xUICommandLabels.is() )
         {
+            if ( rCmdURL.getLength() > 0 )
+                m_xUICommandLabels->getByName( rCmdURL ) >>= aPropSeq;
         }
     }
+    catch ( Exception& )
+    {
+    }
 
-    if ( m_xUICommandLabels.is() )
+    return aPropSeq;
+}
+
+::rtl::OUString ToolBarManager::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL )
+{
+    ::rtl::OUString aLabel;
+    Sequence< PropertyValue > aPropSeq;
+
+    // Retrieve popup menu labels
+    aPropSeq = GetPropsForCommand( aCmdURL );
+    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
     {
-        try
+        if ( aPropSeq[i].Name.equalsAscii( "Name" ))
         {
-            if ( aCmdURL.getLength() > 0 )
-            {
-                rtl::OUString aStr;
-                Sequence< PropertyValue > aPropSeq;
-                if ( m_xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq )
-                {
-                    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
-                    {
-                        if ( aPropSeq[i].Name.equalsAscii( "Name" ))
-                        {
-                            aPropSeq[i].Value >>= aStr;
-                            break;
-                        }
-                    }
-                }
-                aLabel = aStr;
-            }
+            aPropSeq[i].Value >>= aLabel;
+            break;
         }
-        catch ( com::sun::star::uno::Exception& )
+    }
+    return aLabel;
+}
+
+sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const ::rtl::OUString& aCmdURL )
+{
+    sal_Int32 nProperties(0);
+    Sequence< PropertyValue > aPropSeq;
+
+    // Retrieve popup menu labels
+    aPropSeq = GetPropsForCommand( aCmdURL );
+    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
+    {
+        if ( aPropSeq[i].Name.equalsAscii( "Properties" ))
         {
+            aPropSeq[i].Value >>= nProperties;
+            break;
         }
     }
-
-    return aLabel;
+    return nProperties;
 }
 
 void ToolBarManager::CreateControllers()
@@ -969,8 +993,15 @@ void ToolBarManager::CreateControllers()
                 {
                     MenuDescriptionMap::iterator it = m_aMenuMap.find( nId );
                     if ( it == m_aMenuMap.end() )
-                    xController = Reference< XStatusListener >(
-                        new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL ));
+                    {
+                        xController = Reference< XStatusListener >(
+                            new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL ));
+
+                        // Accessibility support: Set toggle button role for specific commands
+                        sal_Int32 nProps = RetrievePropertiesFromCommand( aCommandURL );
+                        if ( nProps & UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON )
+                            m_pToolBar->SetItemBits( nId, m_pToolBar->GetItemBits( nId ) | TIB_CHECKABLE );
+                    }
                     else
                         xController = Reference< XStatusListener >(
                             new MenuToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL, m_aModuleIdentifier, m_aMenuMap[ nId ] ));
@@ -1028,6 +1059,10 @@ void ToolBarManager::CreateControllers()
                 aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ));
                 aPropValue.Value <<= xToolbarWindow;
                 aPropertyVector.push_back( makeAny( aPropValue ));
+                aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
+                aPropValue.Value <<= m_aModuleIdentifier;
+                aPropertyVector.push_back( makeAny( aPropValue ));
+
                 if ( nWidth > 0 )
                 {
                     aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ));
@@ -1257,13 +1292,31 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                     m_pToolBar->InsertItem( nId, aString, nItemBits );
                     m_pToolBar->SetItemCommand( nId, aCommandURL );
                     if ( aTooltip.getLength() )
+                    {
                         m_pToolBar->SetQuickHelpText( nId, aTooltip );
+                    }
                     else
-                    m_pToolBar->SetQuickHelpText( nId, aString );
+                    {
+                         ::rtl::OUString sQuickHelp( aString );
+                         ::rtl::OUString sShortCut;
+                         if( RetrieveShortcut( aCommandURL, sShortCut ) )
+                         {
+                             sQuickHelp += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " (" ) );
+                             sQuickHelp += sShortCut;
+                             sQuickHelp += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
+                         }
+
+                        m_pToolBar->SetQuickHelpText( nId, sQuickHelp );
+                    }
+
                     if ( aLabel.getLength() > 0 )
+                    {
                         m_pToolBar->SetItemText( nId, aLabel );
+                    }
                     else
+                    {
                         m_pToolBar->SetItemText( nId, aString );
+                    }
                     m_pToolBar->EnableItem( nId, sal_True );
                     m_pToolBar->SetItemState( nId, STATE_NOCHECK );
 
@@ -1530,7 +1583,11 @@ IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG )
         Reference< XToolbarController > xController( pIter->second, UNO_QUERY );
 
         if ( xController.is() )
-            xController->createPopupWindow();
+        {
+            Reference< XWindow > xWin = xController->createPopupWindow();
+            if ( xWin.is() )
+                xWin->setFocus();
+        }
     }
     return 1;
 }
@@ -2102,6 +2159,121 @@ Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool
     return aImage;
 }
 
+bool ToolBarManager::impl_RetrieveShortcutsFromConfiguration(
+    const Reference< XAcceleratorConfiguration >& rAccelCfg,
+    const rtl::OUString& rCommand,
+    rtl::OUString& rShortCut )
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ToolBarManager::impl_RetrieveShortcutsFromConfiguration" );
+    if ( rAccelCfg.is() )
+    {
+        try
+        {
+            com::sun::star::awt::KeyEvent aKeyEvent;
+            Sequence< OUString > aCommands(1);
+            aCommands[0] = rCommand;
+
+            Sequence< Any > aSeqKeyCode( rAccelCfg->getPreferredKeyEventsForCommandList( aCommands ) );
+            if( aSeqKeyCode.getLength() == 1 )
+            {
+                if ( aSeqKeyCode[0] >>= aKeyEvent )
+                {
+                    rShortCut = svt::AcceleratorExecute::st_AWTKey2VCLKey( aKeyEvent ).GetName();
+                    return true;
+                }
+            }
+        }
+        catch ( IllegalArgumentException& )
+        {
+        }
+    }
+
+    return false;
+}
+
+bool ToolBarManager::RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OUString& rShortCut )
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ToolBarManager::RetrieveShortcuts" );
+    if ( m_bModuleIdentified )
+    {
+        Reference< XAcceleratorConfiguration > xDocAccelCfg( m_xDocAcceleratorManager );
+        Reference< XAcceleratorConfiguration > xModuleAccelCfg( m_xModuleAcceleratorManager );
+        Reference< XAcceleratorConfiguration > xGlobalAccelCfg( m_xGlobalAcceleratorManager );
+
+        if ( !m_bAcceleratorCfg )
+        {
+            // Retrieve references on demand
+            m_bAcceleratorCfg = sal_True;
+            if ( !xDocAccelCfg.is() )
+            {
+                Reference< XController > xController = m_xFrame->getController();
+                Reference< XModel > xModel;
+                if ( xController.is() )
+                {
+                    xModel = xController->getModel();
+                    if ( xModel.is() )
+                    {
+                        Reference< XUIConfigurationManagerSupplier > xSupplier( xModel, UNO_QUERY );
+                        if ( xSupplier.is() )
+                        {
+                            Reference< XUIConfigurationManager > xDocUICfgMgr( xSupplier->getUIConfigurationManager(), UNO_QUERY );
+                            if ( xDocUICfgMgr.is() )
+                            {
+                                xDocAccelCfg = Reference< XAcceleratorConfiguration >( xDocUICfgMgr->getShortCutManager(), UNO_QUERY );
+                                m_xDocAcceleratorManager = xDocAccelCfg;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if ( !xModuleAccelCfg.is() )
+            {
+                Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier( m_xServiceManager->createInstance(
+                                                                                            SERVICENAME_MODULEUICONFIGURATIONMANAGERSUPPLIER ),
+                                                                                        UNO_QUERY );
+                try
+                {
+                    Reference< XUIConfigurationManager > xUICfgMgr = xModuleCfgMgrSupplier->getUIConfigurationManager( m_aModuleIdentifier );
+                    if ( xUICfgMgr.is() )
+                    {
+                        xModuleAccelCfg = Reference< XAcceleratorConfiguration >( xUICfgMgr->getShortCutManager(), UNO_QUERY );
+                        m_xModuleAcceleratorManager = xModuleAccelCfg;
+                    }
+                }
+                catch ( RuntimeException& )
+                {
+                    throw;
+                }
+                catch ( Exception& )
+                {
+                }
+            }
+
+            if ( !xGlobalAccelCfg.is() )
+            {
+                xGlobalAccelCfg = Reference< XAcceleratorConfiguration >( m_xServiceManager->createInstance(
+                                                                            SERVICENAME_GLOBALACCELERATORCONFIGURATION ),
+                                                                          UNO_QUERY );
+                m_xGlobalAcceleratorManager = xGlobalAccelCfg;
+            }
+        }
+
+        bool bFound = false;
+
+        if ( m_xGlobalAcceleratorManager.is() )
+            bFound  = impl_RetrieveShortcutsFromConfiguration( xGlobalAccelCfg, rCommandURL, rShortCut );
+        if ( !bFound && m_xModuleAcceleratorManager.is() )
+            bFound = impl_RetrieveShortcutsFromConfiguration( xModuleAccelCfg, rCommandURL, rShortCut );
+        if ( !bFound && m_xDocAcceleratorManager.is() )
+            impl_RetrieveShortcutsFromConfiguration( xGlobalAccelCfg, rCommandURL, rShortCut );
+
+        if( bFound )
+            return true;
+    }
+    return false;
+}
+
 }
 
 
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 02402205bd1c..d0ddeccfab20 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -58,7 +58,6 @@
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/UIElementType.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
@@ -167,7 +166,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   ToolbarsMenuController
 DEFINE_INIT_SERVICE                     (   ToolbarsMenuController, {} )
 
 ToolbarsMenuController::ToolbarsMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_aPropUIName( RTL_CONSTASCII_USTRINGPARAM( "UIName" )),
     m_aPropResourceURL( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" )),
     m_bModuleIdentified( sal_False ),
@@ -563,7 +562,7 @@ void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( Ru
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xDocCfgMgr.clear();
@@ -584,9 +583,9 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev
     sal_Bool bSetCheckmark      = sal_False;
     sal_Bool bCheckmark         = sal_False;
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     Reference< css::awt::XPopupMenu > xPopupMenu( m_xPopupMenu );
-    aLock.unlock();
+    aLock.clear();
 
     if ( xPopupMenu.is() )
     {
@@ -633,13 +632,13 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent
     Reference< XFrame >                 xFrame;
     Reference< XNameAccess >            xPersistentWindowState;
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     xPopupMenu             = m_xPopupMenu;
     xServiceManager        = m_xServiceManager;
     xURLTransformer        = m_xURLTransformer;
     xFrame                 = m_xFrame;
     xPersistentWindowState = m_xPersistentWindowState;
-    aLock.unlock();
+    aLock.clear();
 
     if ( xPopupMenu.is() )
     {
@@ -792,7 +791,7 @@ void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) thr
     Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
     Reference< XURLTransformer >   xURLTransformer( m_xURLTransformer );
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         fillPopupMenu( m_xPopupMenu );
         aCmdVector = m_aCommandVector;
     }
@@ -829,10 +828,9 @@ void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) thr
 // XPopupMenuController
 void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     if ( m_xFrame.is() && !m_xPopupMenu.is() )
     {
@@ -848,11 +846,11 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X
 // XInitialization
 void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     sal_Bool bInitalized( m_bInitialized );
     if ( !bInitalized )
     {
-        PopupMenuControllerBase::initialize(aArguments);
+        svt::PopupMenuControllerBase::initialize(aArguments);
 
         if ( m_bInitialized )
         {
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 0e73b5616aa7..5a4fb7cddde4 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -53,6 +53,7 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  other includes
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index fdcd08f221fd..0d50aa4c36d4 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -340,7 +340,7 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const ::rtl::OUString&
         if ( !pIter->second.bCommandNameCreated )
             fillInfoFromResult( pIter->second, pIter->second.aLabel );
 
-        Sequence< PropertyValue > aPropSeq( 3 );
+        Sequence< PropertyValue > aPropSeq( 4 );
         aPropSeq[0].Name  = m_aPropLabel;
         aPropSeq[0].Value = pIter->second.aContextLabel.getLength() ?
                 makeAny( pIter->second.aContextLabel ): makeAny( pIter->second.aLabel );
@@ -348,6 +348,8 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const ::rtl::OUString&
         aPropSeq[1].Value <<= pIter->second.aCommandName;
         aPropSeq[2].Name  = m_aPropPopup;
         aPropSeq[2].Value <<= pIter->second.bPopup;
+        aPropSeq[3].Name  = m_aPropProperties;
+        aPropSeq[3].Value <<= pIter->second.nProperties;
         return makeAny( aPropSeq );
     }
 
diff --git a/framework/source/xml/makefile.mk b/framework/source/xml/makefile.mk
index dd40af0cbe05..a4f18a555ab3 100644
--- a/framework/source/xml/makefile.mk
+++ b/framework/source/xml/makefile.mk
@@ -47,7 +47,6 @@ SLOFILES=		\
                 $(SLO)$/statusbardocumenthandler.obj		\
                 $(SLO)$/toolboxconfiguration.obj			\
                 $(SLO)$/toolboxdocumenthandler.obj			\
-                $(SLO)$/toolboxlayoutdocumenthandler.obj	\
                 $(SLO)$/saxnamespacefilter.obj				\
                 $(SLO)$/xmlnamespaces.obj                   \
                 $(SLO)$/acceleratorconfigurationreader.obj  \
diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx
index 90f5fb25dec3..3fc5d1775be4 100644
--- a/framework/source/xml/menudocumenthandler.cxx
+++ b/framework/source/xml/menudocumenthandler.cxx
@@ -94,6 +94,7 @@
 
 #define ATTRIBUTE_ITEMSTYLE_TEXT    "text"
 #define ATTRIBUTE_ITEMSTYLE_IMAGE    "image"
+#define ATTRIBUTE_ITEMSTYLE_RADIO    "radio"
 
 // Property names of a menu/menu item ItemDescriptor
 static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
@@ -134,6 +135,7 @@ struct MenuStyleItem
 MenuStyleItem MenuItemStyles[ ] = {
     { ::com::sun::star::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE },
     { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT },
+    { ::com::sun::star::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO }
 };
 
 
@@ -437,8 +439,10 @@ throw( SAXException, RuntimeException )
                         {
                             if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
                                 nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT;
-                            if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
+                            else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
                                 nItemBits |= ::com::sun::star::ui::ItemStyle::ICON;
+                            else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) )
+                                nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK;
                         }
                     }
                     while ( nIndex >= 0 );
@@ -670,8 +674,10 @@ throw( SAXException, RuntimeException )
                     {
                         if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
                             nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT;
-                        if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
+                        else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
                             nItemBits |= ::com::sun::star::ui::ItemStyle::ICON;
+                        else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) )
+                            nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK;
                     }
                 }
                 while ( nIndex >= 0 );
@@ -725,8 +731,10 @@ throw( SAXException, RuntimeException )
                     {
                         if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
                             nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT;
-                        if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
+                        else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
                             nItemBits |= ::com::sun::star::ui::ItemStyle::ICON;
+                        else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) )
+                            nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK;
                     }
                 }
                 while ( nIndex >= 0 );
diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/xml/toolboxconfiguration.cxx
index 9cd1f25c3df5..9d1c91aa6849 100644
--- a/framework/source/xml/toolboxconfiguration.cxx
+++ b/framework/source/xml/toolboxconfiguration.cxx
@@ -30,7 +30,6 @@
 #include "precompiled_framework.hxx"
 #include <xml/toolboxconfiguration.hxx>
 #include <xml/toolboxdocumenthandler.hxx>
-#include <xml/toolboxlayoutdocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
 #include <services.h>
 
diff --git a/framework/source/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/xml/toolboxlayoutdocumenthandler.cxx
deleted file mode 100644
index 645750dc3f51..000000000000
--- a/framework/source/xml/toolboxlayoutdocumenthandler.cxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-#include <stdio.h>
-
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
-#include <threadhelp/resetableguard.hxx>
-#include <xml/toolboxlayoutdocumenthandler.hxx>
-#include <macros/debug.hxx>
-#include <xml/toolboxconfigurationdefines.hxx>
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-
-#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#endif
-
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
-#include <vcl/svapp.hxx>
-#include <vcl/toolbox.hxx>
-
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
diff --git a/framework/uiconfig/startmodule/accelerator/en-GB/default.xml b/framework/uiconfig/startmodule/accelerator/en-GB/default.xml
deleted file mode 100644
index eefe2b0dde23..000000000000
--- a/framework/uiconfig/startmodule/accelerator/en-GB/default.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <accel:item accel:code="KEY_Q" accel:mod1="true" xlink:href=".uno:Quit"/>
-    <accel:item accel:code="KEY_N" accel:shift="true" accel:mod1="true" xlink:href=".uno:NewDoc"/>
-    <accel:item accel:code="KEY_O" accel:mod1="true" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_OPEN" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_P" accel:mod1="true" xlink:href=".uno:Print"/>
-    <accel:item accel:code="KEY_S" accel:mod1="true" xlink:href=".uno:Save"/>
-    <accel:item accel:code="KEY_N" accel:mod1="true" xlink:href=".uno:AddDirect"/>
-    <accel:item accel:code="KEY_W" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_F4" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_X" accel:mod1="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_DELETE" accel:shift="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_CUT" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_C" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_INSERT" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_COPY" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_V" accel:mod1="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_INSERT" accel:shift="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_PASTE" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_DELETE" xlink:href=".uno:Delete"/>
-    <accel:item accel:code="KEY_A" accel:mod1="true" xlink:href=".uno:SelectAll"/>
-    <accel:item accel:code="KEY_F" accel:mod1="true" xlink:href=".uno:SearchDialog"/>
-    <accel:item accel:code="KEY_Q" accel:shift="true" accel:mod1="true" xlink:href=".uno:BasicBreak"/>
-    <accel:item accel:code="KEY_F4" xlink:href=".uno:ViewDataSourceBrowser"/>
-    <accel:item accel:code="KEY_F5" accel:mod1="true" xlink:href=".uno:GrabControlFocus"/>
-    <accel:item accel:code="KEY_F7" accel:shift="true" accel:mod1="true" xlink:href=".uno:HangulHanjaConversion"/>
-</accel:acceleratorlist>
diff --git a/framework/uiconfig/startmodule/accelerator/en-US/default.xml b/framework/uiconfig/startmodule/accelerator/en-US/default.xml
deleted file mode 100644
index eefe2b0dde23..000000000000
--- a/framework/uiconfig/startmodule/accelerator/en-US/default.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <accel:item accel:code="KEY_Q" accel:mod1="true" xlink:href=".uno:Quit"/>
-    <accel:item accel:code="KEY_N" accel:shift="true" accel:mod1="true" xlink:href=".uno:NewDoc"/>
-    <accel:item accel:code="KEY_O" accel:mod1="true" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_OPEN" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_P" accel:mod1="true" xlink:href=".uno:Print"/>
-    <accel:item accel:code="KEY_S" accel:mod1="true" xlink:href=".uno:Save"/>
-    <accel:item accel:code="KEY_N" accel:mod1="true" xlink:href=".uno:AddDirect"/>
-    <accel:item accel:code="KEY_W" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_F4" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_X" accel:mod1="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_DELETE" accel:shift="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_CUT" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_C" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_INSERT" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_COPY" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_V" accel:mod1="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_INSERT" accel:shift="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_PASTE" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_DELETE" xlink:href=".uno:Delete"/>
-    <accel:item accel:code="KEY_A" accel:mod1="true" xlink:href=".uno:SelectAll"/>
-    <accel:item accel:code="KEY_F" accel:mod1="true" xlink:href=".uno:SearchDialog"/>
-    <accel:item accel:code="KEY_Q" accel:shift="true" accel:mod1="true" xlink:href=".uno:BasicBreak"/>
-    <accel:item accel:code="KEY_F4" xlink:href=".uno:ViewDataSourceBrowser"/>
-    <accel:item accel:code="KEY_F5" accel:mod1="true" xlink:href=".uno:GrabControlFocus"/>
-    <accel:item accel:code="KEY_F7" accel:shift="true" accel:mod1="true" xlink:href=".uno:HangulHanjaConversion"/>
-</accel:acceleratorlist>
diff --git a/framework/util/exports.map b/framework/util/exports.map
deleted file mode 100644
index 85610ad80888..000000000000
--- a/framework/util/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-            GetVersionInfo;
-            component_getImplementationEnvironment;
-            component_getFactory;
-            component_writeInfo;
-
-    local:
-            *;
-};
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 9025de975b63..6a65b9986f1e 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -56,7 +56,6 @@ LIB1OBJFILES=   \
                 $(SLO)$/rootitemcontainer.obj                   \
                 $(SLO)$/constitemcontainer.obj                  \
                 $(SLO)$/jobconst.obj                            \
-                $(SLO)$/popupmenucontrollerbase.obj             \
                 $(SLO)$/mischelper.obj                          \
                 $(SLO)$/propertysethelper.obj
 
@@ -79,7 +78,6 @@ LIB2OBJFILES=   \
                 $(SLO)$/statusbardocumenthandler.obj            \
                 $(SLO)$/toolboxconfiguration.obj                \
                 $(SLO)$/toolboxdocumenthandler.obj              \
-                $(SLO)$/toolboxlayoutdocumenthandler.obj        \
                 $(SLO)$/imagesconfiguration.obj                 \
                 $(SLO)$/imagesdocumenthandler.obj               \
                 $(SLO)$/xmlnamespaces.obj                       \
@@ -199,7 +197,8 @@ SHL3OBJS=       $(SLO)$/mediatypedetectionhelper.obj\
                 $(SLO)$/dispatchrecorder.obj        \
                 $(SLO)$/dispatchrecordersupplier.obj\
                 $(SLO)$/dispatchhelper.obj          \
-                $(SLO)$/popupmenudispatcher.obj           \
+                $(SLO)$/popupmenudispatcher.obj     \
+                $(SLO)$/popupmenucontroller.obj
 
 SHL3STDLIBS=    \
                 $(FWILIB)                           \
@@ -221,7 +220,7 @@ SHL3DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2TARGETN)
 
 DEF3NAME=       $(SHL3TARGET)
 
-SHL3VERSIONMAP= exports.map
+SHL3VERSIONMAP= $(SOLARENV)/src/component.map
 
 # --- services library ----------------------------------------------------
 
@@ -362,7 +361,7 @@ SHL4DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2IMPLIBN) $(SHL2TARGETN)
 
 DEF4NAME=       $(SHL4TARGET)
 
-SHL4VERSIONMAP= exports.map
+SHL4VERSIONMAP= $(SOLARENV)/src/component.map
 
 # --- services library ----------------------------------------------------
 
@@ -393,7 +392,7 @@ SHL5DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN)
 
 DEF5NAME=       $(SHL5TARGET)
 
-SHL5VERSIONMAP= exports.map
+SHL5VERSIONMAP= $(SOLARENV)/src/component.map
 
 RESLIB1NAME=        fwe
 RESLIB1IMAGES=      $(PRJ)$/res
diff --git a/idl/util/svidl.hdb b/idl/util/svidl.hdb
deleted file mode 100644
index d57bedb45373..000000000000
--- a/idl/util/svidl.hdb
+++ /dev/null
@@ -1,25 +0,0 @@
-write "/*************************************************************************"
-write "* SV.HXX"
-write "* __DATE__"
-write "* (c) 1992-1994 STAR DIVISION"
-write "*************************************************************************/"
-write "#ifndef _SVIDL_HXX"
-write "#define _SVIDL_HXX"
-write "#ifndef _PSTREAM_HXX"
-write "#include <pstream.hxx>"
-write "#endif"
-write "#ifndef _SBX_HXX"
-write "#include <sbx.hxx>"
-write "#endif"
-write "#define IDL_COMPILER /*vorlaeufig immer */"
-file char.hxx
-file hash.hxx
-file lex.hxx
-file bastype.hxx
-file basobj.hxx
-file types.hxx
-file object.hxx
-file slot.hxx
-file module.hxx
-file database.hxx
-write "#endif"
diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst
index 8e09e3fd4226..57c332f6f3ea 100644
--- a/linguistic/prj/build.lst
+++ b/linguistic/prj/build.lst
@@ -3,3 +3,4 @@ lg	linguistic								usr1	-	all	lg_mkout NULL
 lg	linguistic\prj							get		-	all	lg_prj NULL
 lg	linguistic\inc							nmake	-	all	lg_inc NULL
 lg	linguistic\source						nmake	-	all	lg_src lg_inc NULL
+lg linguistic\qa\unoapi nmake - all lg_qa_unoapi NULL
diff --git a/linguistic/qa/unoapi/Test.java b/linguistic/qa/unoapi/Test.java
new file mode 100644
index 000000000000..4a96418255ff
--- /dev/null
+++ b/linguistic/qa/unoapi/Test.java
@@ -0,0 +1,51 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+package org.openoffice.linguistic.qa.unoapi;
+
+import org.openoffice.Runner;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+public final class Test {
+    @org.junit.Before public void setUp() throws Exception {
+        connection.setUp();
+    }
+
+    @org.junit.After public void tearDown()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        connection.tearDown();
+    }
+
+    @org.junit.Test public void test() {
+        assertTrue(
+            Runner.run(
+                "-sce", "lng.sce", "-xcl", "knownissues.xcl", "-cs",
+                connection.getDescription()));
+    }
+
+    private final OfficeConnection connection = new OfficeConnection();
+}
diff --git a/linguistic/qa/unoapi/makefile.mk b/linguistic/qa/unoapi/makefile.mk
index d24be0361501..bd330c6fbaca 100644
--- a/linguistic/qa/unoapi/makefile.mk
+++ b/linguistic/qa/unoapi/makefile.mk
@@ -1,7 +1,6 @@
 #*************************************************************************
-#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -22,19 +21,28 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+#***********************************************************************/
 
-PRJ=..$/..
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-PRJNAME=linguistic
-TARGET=qa_unoapi
+PRJ = ../..
+PRJNAME = linguistic
+TARGET = qa_unoapi
 
-.INCLUDE: settings.mk
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = org/openoffice/linguistic/qa/unoapi
+JAVATESTFILES = Test.java
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
+.INCLUDE: settings.mk
 .INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-ALLTAR : UNOAPI_TEST
+ALLTAR : javatest
 
-UNOAPI_TEST:
-    +$(SOLARENV)$/bin$/checkapi -sce lng.sce -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments
+.END
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 8ba4570ab658..2916b2ee6eec 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -398,41 +398,12 @@ void ConvDicNameContainer::AddConvDics(
 
 namespace
 {
-template<typename T, typename InitData,
-         typename Unique = InitData, typename Data = T>
-class StaticWithInit_ {
-public:
-    /** Gets the static.  Mutual exclusion is performed using the
-        osl global mutex.
-
-        @return
-                static variable
-    */
-    static T & get() {
-        return *rtl_Instance<
-            T, StaticInstanceWithInit,
-            ::osl::MutexGuard, ::osl::GetGlobalMutex,
-            Data, InitData >::create( StaticInstanceWithInit(),
-                                      ::osl::GetGlobalMutex(),
-                                      InitData() );
-    }
-private:
-    struct StaticInstanceWithInit {
-        T * operator () ( Data d ) {
-            static T instance(d);
-            return &instance;
+    struct StaticConvDicList : public rtl::StaticWithInit<
+        uno::Reference<XInterface>, StaticConvDicList> {
+        uno::Reference<XInterface> operator () () {
+            return (cppu::OWeakObject *) new ConvDicList;
         }
     };
-};
-
-//after src680m62 you can replace StaticWithInit_ with rtl::StaticWithInit and remove the above definition of StaticWithInit_
-
-struct StaticConvDicList : public StaticWithInit_<
-    uno::Reference<XInterface>, StaticConvDicList> {
-    uno::Reference<XInterface> operator () () {
-        return (cppu::OWeakObject *) new ConvDicList;
-    }
-};
 }
 
 
diff --git a/linguistic/source/staticmb.cxx b/linguistic/source/staticmb.cxx
deleted file mode 100644
index 8b2b6bc1a364..000000000000
--- a/linguistic/source/staticmb.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_linguistic.hxx"
diff --git a/linguistic/workben/lex.map b/linguistic/workben/lex.map
deleted file mode 100644
index bd76ef3b85ce..000000000000
--- a/linguistic/workben/lex.map
+++ /dev/null
@@ -1,8 +0,0 @@
-LEX_1_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/linguistic/workben/makefile.mk b/linguistic/workben/makefile.mk
index 5c8cc67e852c..26cbb7ec8d65 100644
--- a/linguistic/workben/makefile.mk
+++ b/linguistic/workben/makefile.mk
@@ -94,7 +94,7 @@ SHL1IMPLIB=		i$(TARGET)
 SHL1DEPN=		$(SHL1LIBS)
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 .IF "$(OS)"!="MACOSX"
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 .ENDIF
 
 # build DEF file
diff --git a/officecfg/prj/build.lst b/officecfg/prj/build.lst
index dba837c643a7..04d2cfd87aef 100644
--- a/officecfg/prj/build.lst
+++ b/officecfg/prj/build.lst
@@ -1,5 +1,4 @@
 oc  officecfg   :    l10n soltools solenv LIBXSLT:libxslt NULL
-oc  officecfg                                                       usr30073    -   none NULL
 oc  officecfg                                                       usr1  -   all oc_mkout NULL
 oc  officecfg\registry\schema                                       nmake -   all oc_reg_schema NULL
 oc  officecfg\registry                                              nmake -   all oc_reg NULL
diff --git a/officecfg/registry/component-update.dtd b/officecfg/registry/component-update.dtd
index 51623f40bafa..81acc5e35eee 100644
--- a/officecfg/registry/component-update.dtd
+++ b/officecfg/registry/component-update.dtd
@@ -113,7 +113,8 @@
 <!ELEMENT oor:items (item*)>
 <!ATTLIST oor:items>
 
-<!ELEMENT item ((prop | node)*)>
+<!ELEMENT item ((node | prop | value)*)>
 <!ATTLIST item
     oor:path CDATA #REQUIRED>
-        <!-- the absolute path representation of a set or group node -->
+        <!-- the absolute path representation of a localized property or a group
+             or set node -->
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 2936beb816a6..babe4a7aaeb1 100755
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -67,7 +67,7 @@
    </node>
    <node oor:name="F5_MOD1" oor:op="replace">
     <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-     <value xml:lang="en-US">.uno:GrabControlFocus</value>
+     <value xml:lang="en-US">.uno:ToggleControlFocus</value>
     </prop>
    </node>
    <node oor:name="F7_SHIFT_MOD1" oor:op="replace">
@@ -212,7 +212,7 @@
     </node>
     <node oor:name="F5_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-      <value xml:lang="en-US">.uno:GrabControlFocus</value>
+      <value xml:lang="en-US">.uno:ToggleControlFocus</value>
      </prop>
     </node>
     <node oor:name="F7_SHIFT_MOD1" oor:op="replace">
@@ -394,6 +394,7 @@
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:AlignBlock</value>
       <value xml:lang="en-US">.uno:Bold</value>
+      <value xml:lang="es">.uno:SearchDialog</value>
      </prop>
     </node>
     <node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -459,6 +460,7 @@
     <node oor:name="E_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:AlignHorizontalCenter</value>
+      <value xml:lang="es">.uno:SelectAll</value>
      </prop>
     </node>
     <node oor:name="F11" oor:op="replace">
@@ -828,6 +830,7 @@
     <node oor:name="U_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Underline</value>
+      <value xml:lang="es">.uno:AddDirect</value>
      </prop>
     </node>
     <node oor:name="U_SHIFT_MOD1" oor:op="replace">
@@ -988,6 +991,7 @@
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:JustifyPara</value>
       <value xml:lang="en-US">.uno:Bold</value>
+      <value xml:lang="es">.uno:SearchDialog</value>
      </prop>
     </node>
     <node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -1023,6 +1027,7 @@
     <node oor:name="E_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:CenterPara</value>
+      <value xml:lang="es">.uno:SelectAll</value>
      </prop>
     </node>
     <node oor:name="F11" oor:op="replace">
@@ -1228,6 +1233,7 @@
     <node oor:name="U_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Underline</value>
+      <value xml:lang="es">.uno:AddDirect</value>
      </prop>
     </node>
     <node oor:name="U_SHIFT_MOD1" oor:op="replace">
@@ -1336,6 +1342,7 @@
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:JustifyPara</value>
       <value xml:lang="en-US">.uno:Bold</value>
+      <value xml:lang="es">.uno:SearchDialog</value>
      </prop>
     </node>
     <node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -1421,6 +1428,7 @@
     <node oor:name="E_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:CenterPara</value>
+      <value xml:lang="es">.uno:SelectAll</value>
      </prop>
     </node>
     <node oor:name="F10_MOD1" oor:op="replace">
@@ -1835,6 +1843,7 @@
     <node oor:name="U_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Underline</value>
+      <value xml:lang="es">.uno:AddDirect</value>
      </prop>
     </node>
     <node oor:name="U_SHIFT_MOD1" oor:op="replace">
@@ -1931,6 +1940,7 @@
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:JustifyPara</value>
       <value xml:lang="en-US">.uno:Bold</value>
+      <value xml:lang="es">.uno:SearchDialog</value>
      </prop>
     </node>
     <node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -1971,6 +1981,7 @@
     <node oor:name="E_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:CenterPara</value>
+      <value xml:lang="es">.uno:SelectAll</value>
      </prop>
     </node>
     <node oor:name="F11" oor:op="replace">
@@ -2201,6 +2212,7 @@
     <node oor:name="U_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Underline</value>
+      <value xml:lang="es">.uno:AddDirect</value>
      </prop>
     </node>
     <node oor:name="U_SHIFT_MOD1" oor:op="replace">
@@ -2361,6 +2373,7 @@
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:JustifyPara</value>
       <value xml:lang="en-US">.uno:Bold</value>
+      <value xml:lang="es">.uno:SearchDialog</value>
      </prop>
     </node>
     <node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -2446,6 +2459,7 @@
     <node oor:name="E_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:CenterPara</value>
+      <value xml:lang="es">.uno:SelectAll</value>
      </prop>
     </node>
     <node oor:name="F10_MOD1" oor:op="replace">
@@ -2860,6 +2874,7 @@
     <node oor:name="U_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Underline</value>
+      <value xml:lang="es">.uno:AddDirect</value>
      </prop>
     </node>
     <node oor:name="U_SHIFT_MOD1" oor:op="replace">
@@ -2973,6 +2988,7 @@
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:JustifyPara</value>
       <value xml:lang="en-US">.uno:Bold</value>
+      <value xml:lang="es">.uno:SearchDialog</value>
      </prop>
     </node>
     <node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -3063,6 +3079,7 @@
     <node oor:name="E_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:CenterPara</value>
+      <value xml:lang="es">.uno:SelectAll</value>
      </prop>
     </node>
     <node oor:name="F10_MOD1" oor:op="replace">
@@ -3497,6 +3514,7 @@
     <node oor:name="U_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Underline</value>
+      <value xml:lang="es">.uno:AddDirect</value>
      </prop>
     </node>
     <node oor:name="U_SHIFT_MOD1" oor:op="replace">
@@ -3595,6 +3613,7 @@
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:JustifyPara</value>
       <value xml:lang="en-US">.uno:Bold</value>
+      <value xml:lang="es">.uno:SearchDialog</value>
      </prop>
     </node>
     <node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -3680,6 +3699,7 @@
     <node oor:name="E_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:CenterPara</value>
+      <value xml:lang="es">.uno:SelectAll</value>
      </prop>
     </node>
     <node oor:name="F10_MOD1" oor:op="replace">
@@ -4094,6 +4114,7 @@
     <node oor:name="U_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Underline</value>
+      <value xml:lang="es">.uno:AddDirect</value>
      </prop>
     </node>
     <node oor:name="U_SHIFT_MOD1" oor:op="replace">
@@ -4197,6 +4218,7 @@
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:JustifyPara</value>
       <value xml:lang="en-US">.uno:Bold</value>
+      <value xml:lang="es">.uno:SearchDialog</value>
      </prop>
     </node>
     <node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -4254,7 +4276,7 @@
       <value xml:lang="en-US">.uno:ParaRightToLeft</value>
      </prop>
     </node>
-    <node oor:name="END" oor:op="replace">
+     <node oor:name="END" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:GoToEndOfLine</value>
      </prop>
@@ -4282,6 +4304,7 @@
     <node oor:name="E_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:CenterPara</value>
+      <value xml:lang="es">.uno:SelectAll</value>
      </prop>
     </node>
     <node oor:name="F10_MOD1" oor:op="replace">
@@ -4696,6 +4719,7 @@
     <node oor:name="U_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Underline</value>
+      <value xml:lang="es">.uno:AddDirect</value>
      </prop>
     </node>
     <node oor:name="U_SHIFT_MOD1" oor:op="replace">
@@ -4804,6 +4828,7 @@
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:JustifyPara</value>
       <value xml:lang="en-US">.uno:Bold</value>
+      <value xml:lang="es">.uno:SearchDialog</value>
      </prop>
     </node>
     <node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -4889,6 +4914,7 @@
     <node oor:name="E_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:CenterPara</value>
+      <value xml:lang="es">.uno:SelectAll</value>
      </prop>
     </node>
     <node oor:name="F10_MOD1" oor:op="replace">
@@ -5303,6 +5329,7 @@
     <node oor:name="U_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Underline</value>
+      <value xml:lang="es">.uno:AddDirect</value>
      </prop>
     </node>
     <node oor:name="U_SHIFT_MOD1" oor:op="replace">
@@ -5541,7 +5568,19 @@
       <value xml:lang="en-US">.uno:Paste</value>
      </prop>
     </node>
-    <node oor:name="OPEN" oor:op="replace">
+     <node oor:name="K_MOD1" oor:op="replace">
+       <prop oor:name="Command">
+         <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+         <value xml:lang="es">.uno:Italic</value>
+       </prop>
+     </node>
+     <node oor:name="N_MOD1" oor:op="replace">
+       <prop oor:name="Command">
+         <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+         <value xml:lang="es">.uno:Bold</value>
+       </prop>
+     </node>
+     <node oor:name="OPEN" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Open</value>
      </prop>
@@ -5615,7 +5654,19 @@
       <value xml:lang="en-US">.uno:Paste</value>
      </prop>
     </node>
-    <node oor:name="OPEN" oor:op="replace">
+     <node oor:name="K_MOD1" oor:op="replace">
+       <prop oor:name="Command">
+         <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+         <value xml:lang="es">.uno:Italic</value>
+       </prop>
+     </node>
+     <node oor:name="N_MOD1" oor:op="replace">
+       <prop oor:name="Command">
+         <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+         <value xml:lang="es">.uno:Bold</value>
+       </prop>
+     </node>
+     <node oor:name="OPEN" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Open</value>
      </prop>
@@ -5625,6 +5676,20 @@
       <value xml:lang="en-US">.uno:Paste</value>
      </prop>
     </node>
+    <node oor:name="S_MOD1" oor:op="replace">
+      <prop oor:name="Command">
+        <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+        <value xml:lang="es">.uno:Underline</value>
+      </prop>
+    </node>
+    <node oor:name="T_MOD1" oor:op="replace">
+      <prop oor:name="Command">
+        <value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+        <value xml:lang="de" install:module="unxwnt">.uno:SubScript</value>
+        <value xml:lang="es" install:module="unxwnt">.uno:AlignHorizontalCenter</value>
+        <value xml:lang="en-US" install:module="macosx">.uno:DesignerDialog</value>
+      </prop>
+    </node>
     <node oor:name="UNDO" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:Undo</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index fe1fb92abb0e..03e37b72f9ad 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -134,7 +134,7 @@
         <prop oor:name="TemplateRepositoryURL" oor:type="xs:string">
             <value>${STARTCENTER_TEMPLREP_URL}</value>
         </prop>
-        <prop oor:name="StartCenterLayoutStyle" oor:type="xs:int">
+        <prop oor:name="StartCenterLayoutStyle" oor:type="xs:int" install:module="brand">
             <value>${STARTCENTER_LAYOUT_STYLE}</value>
         </prop>
     </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 8db415e7c57b..353cecfd51c2 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -123,27 +123,27 @@
           <node oor:name="ResourceList">
             <node oor:name="R0" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/taskpanel/MasterPages</value>
+                <value>private:resource/toolpanel/DrawingFramework/MasterPages</value>
               </prop>
             </node>
             <node oor:name="R1" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/taskpanel/Layouts</value>
+                <value>private:resource/toolpanel/DrawingFramework/Layouts</value>
               </prop>
             </node>
             <node oor:name="R2" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/taskpanel/TableDesign</value>
+                <value>private:resource/toolpanel/DrawingFramework/TableDesign</value>
               </prop>
             </node>
             <node oor:name="R3" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/taskpanel/CustomAnimations</value>
+                <value>private:resource/toolpanel/DrawingFramework/CustomAnimations</value>
               </prop>
             </node>
             <node oor:name="R4" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/taskpanel/SlideTransitions</value>
+                <value>private:resource/toolpanel/DrawingFramework/SlideTransitions</value>
               </prop>
             </node>
           </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/SFX.xcu b/officecfg/registry/data/org/openoffice/Office/SFX.xcu
index 5a576588c974..1fbf093170cf 100644
--- a/officecfg/registry/data/org/openoffice/Office/SFX.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/SFX.xcu
@@ -30,27 +30,27 @@
   <node oor:name="Help">
     <prop oor:name="HelpAgentStarterList">
         <value xml:lang="x-no-translate"></value>
-        <value xml:lang="de">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="en-US">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="zh-CN">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="ja">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="zh-TW">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="el">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="es">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="pl">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="pt">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="ko">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="fr">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="ar">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="ru">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="nl">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="da">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="it">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="tr">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="sv">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="fi">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="pt-BR">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
-        <value xml:lang="ca">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34119,34120,33368,10296,54946</value>
+        <value xml:lang="de">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="en-US">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="zh-CN">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="ja">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="zh-TW">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="el">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="es">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="pl">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="pt">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="ko">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="fr">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="ar">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="ru">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="nl">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="da">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="it">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="tr">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="sv">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="fi">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="pt-BR">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
+        <value xml:lang="ca">956368385,956368385,26220,26235,2567291937,2567291938,26272,26273,26063,957028378,26153,26312,958170133,958186547,958202951,26320,26321,956419588,956433419,26323,26324,20309,20308,20226,10371,27015,10087,10156,10350,27002,700810288,700810324,700730881,703778354,700777567,701124116,701124158,541248011,541249030,541249032,700763681,34023,957235721,3388501505,3388501506,3388501507,3388501508,3388501509,3388501510,10416,10297,5573,5573,5573,34099,34100,34101,34102,34104,34106,34107,34108,34109,34110,34112,34114,34115,34116,34117,34118,34120,33368,10296,54946</value>
   </prop>
   </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 8c76a2dadd9f..d3db05206a6a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -134,7 +134,7 @@
                     <value xml:lang="en-US">~Hyphenation...</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
+                    <value>9</value>
                 </prop>
             </node>
             <node oor:name=".uno:ObjectTitleDescription" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
index 29e26bbf29a9..304ce02282e6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
@@ -73,6 +73,90 @@
                     <value>true</value>
                 </prop>
             </node>
+            <node oor:name="private:resource/toolbar/basicshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Basic Shapes</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
+            <node oor:name="private:resource/toolbar/symbolshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Symbol Shapes</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
+            <node oor:name="private:resource/toolbar/arrowshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Block Arrows</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
+            <node oor:name="private:resource/toolbar/flowchartshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Flowchart</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
+            <node oor:name="private:resource/toolbar/calloutshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Callouts</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
+            <node oor:name="private:resource/toolbar/starshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Stars and Banners</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
         </node>
     </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 553d94fc2fdb..664bff660ca0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -218,6 +218,94 @@
           <value>com.sun.star.svx.FontHeightToolBoxController</value>
         </prop>
       </node>
+      <node oor:name="AssignLayout" oor:op="replace">
+     <prop oor:name="Command">
+          <value>.uno:AssignLayout</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.presentation.PresentationDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.sd.SlideLayoutController</value>
+        </prop>
+      </node>
+      <node oor:name="InsertPage" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:InsertPage</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.presentation.PresentationDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.sd.InsertSlideController</value>
+        </prop>
+      </node>
+    <node oor:name="ExtrusionDirectionFloater" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ExtrusionDirectionFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.ExtrusionDirectionController</value>
+        </prop>
+      </node>
+      <node oor:name="ExtrusionDepthController" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ExtrusionDepthFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.ExtrusionDepthController</value>
+        </prop>
+      </node>
+      <node oor:name="ExtrusionLightingFloater" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ExtrusionLightingFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.ExtrusionLightingController</value>
+        </prop>
+      </node>
+      <node oor:name="ExtrusionSurfaceFloater" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ExtrusionSurfaceFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.ExtrusionSurfaceController</value>
+        </prop>
+      </node>
+      <node oor:name="FontworkAlignmentFloater" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:FontworkAlignmentFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.FontworkAlignmentController</value>
+        </prop>
+      </node>
+      <node oor:name="FontworkCharacterSpacingFloater" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:FontworkCharacterSpacingFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.FontworkCharacterSpacingController</value>
+        </prop>
+      </node>
       <node oor:name="c3" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:ChartElementSelector</value>
@@ -229,7 +317,7 @@
           <value>com.sun.star.comp.chart.ElementSelectorToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c4" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.BasicShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:BasicShapes</value>
         </prop>
@@ -237,10 +325,10 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c5" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.SymbolShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:SymbolShapes</value>
         </prop>
@@ -248,10 +336,10 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c6" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.ArrowShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:ArrowShapes</value>
         </prop>
@@ -259,10 +347,10 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c7" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.FlowChartShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:FlowChartShapes</value>
         </prop>
@@ -270,10 +358,10 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c8" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.CalloutShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:CalloutShapes</value>
         </prop>
@@ -281,10 +369,10 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c9" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.StarShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:StarShapes</value>
         </prop>
@@ -292,7 +380,7 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
     </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 2925c2a97802..7138636549d6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1,533 +1,533 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
 <oor:component-data oor:name="DrawImpressCommands" oor:package="org.openoffice.Office.UI" 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="UserInterface">
-        <node oor:name="Commands">
-            <node oor:name=".uno:Polygon" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Polygon, filled</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ColorView" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Black &amp; White View</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:RenamePage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Rename Slide</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:RenameLayer" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Rename</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Presentation" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Slide Show</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:RehearseTimings" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Rehearse Timings</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Dia" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">SlideTransition</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ShowSlide" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Sho~w Slide</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HideSlide" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Hide Slide</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:TextAttributes" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Te~xt...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PagesPerRow" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Slides Per Row</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:TextFitToSizeTool" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Fit Text to Frame</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:VerticalTextFitToSizeTool" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Fit Vertical Text to Frame</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Objects3DToolbox" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">3D Objects</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Cube" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Cube</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Sphere" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Sphere</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Cylinder" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Cylinder</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Cone" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Cone</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Cyramid" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Pyramid</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEditMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Glue Points</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueInsertPoint" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Insert Glue Point</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GluePercent" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Glue Point Relative</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEscapeDirection" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Exit Direction</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueHorzAlignCenter" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Glue Point Horizontal Center</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueHorzAlignLeft" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Glue Point Horizontal Left</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueHorzAlignRight" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Glue Point Horizontal Right</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueVertAlignCenter" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Glue Point Vertical Center</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueVertAlignTop" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Glue Point Vertical Top</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueVertAlignBottom" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Glue Point Vertical Bottom</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Shell3D" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Shell</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Torus" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Torus</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HalfSphere" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Half-Sphere</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEscapeDirectionLeft" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Exit Direction Left</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEscapeDirectionRight" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Exit Direction Right</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEscapeDirectionTop" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Exit Direction Top</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEscapeDirectionBottom" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Exit Direction Bottom</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertToolbox" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Insert</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Morphing" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Cross-fading...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MeasureAttributes" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Dimen~sions...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GridFront" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Grid to ~Front</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HelplinesVisible" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Display Guides</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HelplinesFront" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Guides to ~Front</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:BeforeObject" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">In Front of ~Object</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PreviewWindow" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Pre~view</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CustomAnimation" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Custom Animation...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CustomAnimationSchemes" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Animation Schemes...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SlideChangeWindow" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Slide Transition...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorAttributes" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Connector...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PresentationDialog" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">S~lide Show Settings...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Hyphenation" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Hyphenation</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:NewRouting" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Reset Routing</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DuplicatePage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">D~uplicate Slide</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ExpandPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">E~xpand Slide</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SummaryPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Su~mmary Slide</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LeaveAllGroups" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Exit All Groups</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ParaspaceIncrease" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Increase Spacing</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ParaspaceDecrease" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Decrease Spacing</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SlideMasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Slide Master</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HandoutMasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Handout Master</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:NotesMasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Notes Master</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:TitleMasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Title Slide Master</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertPageQuick" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Insert Slide Direct</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertDateFieldVar" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Dat~e (variable)</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertDateFieldFix" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Date (fixed)</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertTimeFieldVar" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">T~ime (variable)</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertTimeFieldFix" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Time (fixed)</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertPageField" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Page Number</value>
-                </prop>
-            </node>
+  <node oor:name="UserInterface">
+    <node oor:name="Commands">
+      <node oor:name=".uno:Polygon" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Polygon, filled</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ColorView" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Black &amp; White View</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RenamePage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Rename Slide</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RenameLayer" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Rename</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Presentation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Slide Show</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RehearseTimings" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Rehearse Timings</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Dia" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">SlideTransition</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ShowSlide" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Sho~w Slide</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HideSlide" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Hide Slide</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:TextAttributes" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Te~xt...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PagesPerRow" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Slides Per Row</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:TextFitToSizeTool" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Fit Text to Frame</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:VerticalTextFitToSizeTool" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Fit Vertical Text to Frame</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Objects3DToolbox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">3D Objects</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Cube" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Cube</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Sphere" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Sphere</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Cylinder" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Cylinder</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Cone" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Cone</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Cyramid" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Pyramid</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEditMode" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Glue Points</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueInsertPoint" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Insert Glue Point</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GluePercent" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Relative</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEscapeDirection" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit Direction</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueHorzAlignCenter" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Horizontal Center</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueHorzAlignLeft" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Horizontal Left</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueHorzAlignRight" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Horizontal Right</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueVertAlignCenter" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Vertical Center</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueVertAlignTop" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Vertical Top</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueVertAlignBottom" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Vertical Bottom</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Shell3D" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Shell</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Torus" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Torus</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HalfSphere" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Half-Sphere</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEscapeDirectionLeft" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit Direction Left</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEscapeDirectionRight" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit Direction Right</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEscapeDirectionTop" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit Direction Top</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEscapeDirectionBottom" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit Direction Bottom</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertToolbox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Insert</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Morphing" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Cross-fading...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MeasureAttributes" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Dimen~sions...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GridFront" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Grid to ~Front</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HelplinesVisible" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Display Guides</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HelplinesFront" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Guides to ~Front</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:BeforeObject" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">In Front of ~Object</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PreviewWindow" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Pre~view</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CustomAnimation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Custom Animation...</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CustomAnimationSchemes" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Animation Schemes...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SlideChangeWindow" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Slide Transition...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorAttributes" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Connector...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PresentationDialog" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">S~lide Show Settings...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Hyphenation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Hyphenation</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:NewRouting" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Reset Routing</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DuplicatePage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">D~uplicate Slide</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ExpandPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">E~xpand Slide</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SummaryPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Su~mmary Slide</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LeaveAllGroups" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit All Groups</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ParaspaceIncrease" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Increase Spacing</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ParaspaceDecrease" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Decrease Spacing</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SlideMasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Slide Master</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HandoutMasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Handout Master</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:NotesMasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Notes Master</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:TitleMasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Title Slide Master</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertPageQuick" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Insert Slide Direct</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertDateFieldVar" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Dat~e (variable)</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertDateFieldFix" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Date (fixed)</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertTimeFieldVar" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">T~ime (variable)</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertTimeFieldFix" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Time (fixed)</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertPageField" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Page Number</value>
+        </prop>
+      </node>
       <node oor:name=".uno:InsertPagesField" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
 
@@ -535,1521 +535,1527 @@
         </prop>
       </node>
       <node oor:name=".uno:ModifyField" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">F~ields...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertFileField" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~File Name</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertAuthorField" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Author</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CustomShowDialog" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Custom Slide Show...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:OutputQualityColor" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Color</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:OutputQualityGrayscale" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Grayscale</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:OutputQualityBlackWhite" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Black and White</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PreviewQualityColor" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Color</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PreviewQualityGrayscale" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Grayscale</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PreviewQualityBlackWhite" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Black and White</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertInto3D" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">To 3~D</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertInto3DLatheFast" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">To 3D ~Rotation Object</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertIntoBitmap" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">To ~Bitmap</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertIntoMetaFile" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">To ~Metafile</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PackAndGo" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Pack</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:convert_to_contour" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">To C~ontour</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:EditHyperlink" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">H~yperlink...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PageSetup" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Page...</value>
-                </prop>
-            </node>
-                        <node oor:name=".uno:PasteSpecial" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Paste ~Special...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CopyObjects" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Duplicat~e...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ManageLinks" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Lin~ks...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertInto3DLathe" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">In 3D Rotation Object</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DrawingMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Drawing View</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:OutlineMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Outline</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:OutputQualityContrast" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~High Contrast</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DiaMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Sli~de Sorter</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PreviewQualityContrast" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~High Contrast</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Slid~e</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ImportFromFile" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~File...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ZoomPanning" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Shift</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PixelMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Pixel Mode</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ObjectPosition" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Arrange</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Combine" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Comb~ine</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ObjectTitleDescription" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Description...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:NameGroup" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Name...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorToolbox" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Connector</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Forward" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Bring ~Forward</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Backward" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Send Back~ward</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MirrorVert" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Vertically</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MirrorHorz" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Horizontally</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ChangeBezier" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">To ~Curve</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ChangePolygon" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">To ~Polygon</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CapturePoint" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Insert Snap Point/Line...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ShowRuler" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Ruler</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertLayer" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Layer...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ModifyPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Slide ~Layout...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ModifyLayer" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Layer...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PageMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Normal</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LayerMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Layer</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MeasureLine" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Dimension Line</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Master</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DiaEffect" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Slide Effects</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DiaSpeed" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Transition Speed</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DiaAuto" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">AutoTransition</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DiaTime" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Time</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Connector" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Connector</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ActionMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Allow Interaction</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:AnimationObjects" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Animated Image...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:AnimationEffects" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Interaction...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PresentationLayout" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Slide D~esign...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:NotesMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Notes ~Page</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HandoutMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">H~andout Page</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DeletePage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">D~elete Slide</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DeleteLayer" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Delete</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Dismantle" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Split</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PageStatus" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Slide/Layer</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LayoutStatus" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Layout</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CrookRotate" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Set in Circle (perspective)</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CrookSlant" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Set to circle (slant)</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CrookStretch" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Set in Circle (distort)</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Connect" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">C~onnect</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Break" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Break</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:AdvancedMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Effects</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InteractiveTransparence" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Transparency</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InteractiveGradient" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Gradient</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Shear" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Distort</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:BehindObject" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Be~hind Object</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ReverseOrder" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Reverse</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorArrowStart" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Connector Starts with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorArrowEnd" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Connector Ends with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorArrows" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Connector with Arrows</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCircleStart" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Connector Starts with Circle</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCircleEnd" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Connector Ends with Circle</value>
-                </prop>