CWS-TOOLING: integrate CWS native0

95 files changed, 3695 insertions, 2100 deletions

diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index fe688e2c4b..ca37442894 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -59,8 +59,8 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
 ..\%__SRC%\lib\liboffacc*.so %_DEST%\lib%_EXT%\liboffacc*.so
 ..\%__SRC%\lib\liboffacc*.dylib %_DEST%\lib%_EXT%\liboffacc*.dylib
 ..\%__SRC%\bin\migratio*.dll %_DEST%\bin%_EXT%\migratio*.dll
-..\%__SRC%\lib\migrationoo2.uno.so %_DEST%\lib%_EXT%\migrationoo2.uno.so
-..\%__SRC%\lib\migrationoo2.uno.dylib %_DEST%\lib%_EXT%\migrationoo2.uno.dylib
+..\%__SRC%\lib\migratio*.uno.so %_DEST%\lib%_EXT%\migratio*.uno.so
+..\%__SRC%\lib\migratio*.uno.dylib %_DEST%\lib%_EXT%\migratio*.uno.dylib
 
 ..\%__SRC%\bin\sweb %_DEST%\bin%_EXT%\sweb.bin
 
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 84bb6cd7b2..57e1a85a8c 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -230,7 +230,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
                         bViewEvent      = sal_False;
                         bStartEvent     = sal_False;
                         bDisplaySpec	= sal_False;
-                 }
+                     }
                     else if ( aArgStr.EqualsIgnoreCaseAscii( "-view" ))
                     {
                         // open in viewmode
@@ -242,31 +242,43 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
                         bViewEvent      = sal_True; 
                         bStartEvent     = sal_False;
                         bDisplaySpec	= sal_False;
-                 }
+                     }
                     else if ( aArgStr.EqualsIgnoreCaseAscii( "-show" ))
                     {
-                            // open in viewmode
-                            bOpenEvent      = sal_False;
-                            bViewEvent      = sal_False;
-                            bStartEvent     = sal_True;
-                            bPrintEvent     = sal_False;
-                            bPrintToEvent   = sal_False;
-                            bForceNewEvent  = sal_False;
-                            bForceOpenEvent = sal_False;
-                            bDisplaySpec	= sal_False;
+                        // open in viewmode
+                        bOpenEvent      = sal_False;
+                        bViewEvent      = sal_False;
+                        bStartEvent     = sal_True;
+                        bPrintEvent     = sal_False;
+                        bPrintToEvent   = sal_False;
+                        bForceNewEvent  = sal_False;
+                        bForceOpenEvent = sal_False;
+                        bDisplaySpec	= sal_False;
                     }
                     else if ( aArgStr.EqualsIgnoreCaseAscii( "-display" ))
                     {
-                            // open in viewmode
-                            bOpenEvent      = sal_False;
-                               bPrintEvent     = sal_False;
-                            bForceOpenEvent = sal_False;
-                            bPrintToEvent   = sal_False;
-                            bForceNewEvent  = sal_False;
-                            bViewEvent      = sal_False;
-                            bStartEvent     = sal_False;
-                            bDisplaySpec	= sal_True;
+                        // set display
+                        bOpenEvent      = sal_False;
+                           bPrintEvent     = sal_False;
+                        bForceOpenEvent = sal_False;
+                        bPrintToEvent   = sal_False;
+                        bForceNewEvent  = sal_False;
+                        bViewEvent      = sal_False;
+                        bStartEvent     = sal_False;
+                        bDisplaySpec	= sal_True;
+                    }
+                    else if ( aArgStr.EqualsIgnoreCaseAscii( "-language" ))
+                    {
+                        bOpenEvent      = sal_False;
+                           bPrintEvent     = sal_False;
+                        bForceOpenEvent = sal_False;
+                        bPrintToEvent   = sal_False;
+                        bForceNewEvent  = sal_False;
+                        bViewEvent      = sal_False;
+                        bStartEvent     = sal_False;
+                        bDisplaySpec	= sal_False;
                     }
+
                     #ifdef MACOSX
                     /* #i84053# ignore -psn on Mac
                        Platform dependent #ifdef here is ugly, however this is currently
@@ -275,15 +287,15 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
                     */
                     else if ( aArgStr.CompareToAscii( "-psn", 4 ) == COMPARE_EQUAL )
                     {
-                            // finder argument from MacOSX
-                            bOpenEvent      = sal_False;
-                               bPrintEvent     = sal_False;
-                            bForceOpenEvent = sal_False;
-                            bPrintToEvent   = sal_False;
-                            bForceNewEvent  = sal_False;
-                            bViewEvent      = sal_False;
-                            bStartEvent     = sal_False;
-                            bDisplaySpec	= sal_False;
+                        // finder argument from MacOSX
+                        bOpenEvent      = sal_False;
+                           bPrintEvent     = sal_False;
+                        bForceOpenEvent = sal_False;
+                        bPrintToEvent   = sal_False;
+                        bForceNewEvent  = sal_False;
+                        bViewEvent      = sal_False;
+                        bStartEvent     = sal_False;
+                        bDisplaySpec	= sal_False;
                     }
                     #endif
                 }
@@ -505,7 +517,12 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
     }
     else if ( aArgStr.Copy(0, 9).EqualsIgnoreCaseAscii( "-version=" ))
     {
-        AddStringListParam_Impl( CMD_STRINGPARAM_VERSION, aArgStr.Copy( 15 ) );
+        AddStringListParam_Impl( CMD_STRINGPARAM_VERSION, aArgStr.Copy( 9 ) );
+        return sal_True;
+    }
+    else if ( aArgStr.Copy(0, 10).EqualsIgnoreCaseAscii( "-language=" ))
+    {
+        AddStringListParam_Impl( CMD_STRINGPARAM_LANGUAGE, aArgStr.Copy( 10 ) );
         return sal_True;
     }
     else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-writer" )) == sal_True )
@@ -848,6 +865,13 @@ sal_Bool CommandLineArgs::GetPrinterName( ::rtl::OUString& rPara ) const
     return m_aStrSetParams[ CMD_STRINGPARAM_PRINTERNAME ];
 }
 
+sal_Bool CommandLineArgs::GetLanguage( ::rtl::OUString& rPara ) const
+{
+    osl::MutexGuard  aMutexGuard( m_aMutex );
+    rPara = m_aStrParams[ CMD_STRINGPARAM_LANGUAGE ];
+    return m_aStrSetParams[ CMD_STRINGPARAM_LANGUAGE ];
+}
+
 sal_Bool CommandLineArgs::IsEmpty() const
 {
     osl::MutexGuard  aMutexGuard( m_aMutex );
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index db4619151f..e2c3e112ab 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -93,6 +93,7 @@ class CommandLineArgs
             CMD_STRINGPARAM_PRINTTOLIST,
             CMD_STRINGPARAM_PRINTERNAME,
             CMD_STRINGPARAM_DISPLAY,
+            CMD_STRINGPARAM_LANGUAGE,
             CMD_STRINGPARAM_COUNT			// must be last element!
         };
 
@@ -168,6 +169,7 @@ class CommandLineArgs
         sal_Bool				GetPrintList( ::rtl::OUString& rPara) const;
         sal_Bool				GetPrintToList( ::rtl::OUString& rPara ) const;
         sal_Bool				GetPrinterName( ::rtl::OUString& rPara ) const;
+        sal_Bool                GetLanguage( ::rtl::OUString& rPara ) const;
 
         // Special analyzed states (does not match directly to a command line parameter!)
         sal_Bool                IsPrinting() const;
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 2ad0b382e4..42e0f925ea 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -33,15 +33,14 @@
 
 #include "app.hxx"
 #include "langselect.hxx"
+#include "cmdlineargs.hxx"
 #include <stdio.h>
 
-#ifndef _RTL_STRING_HXX
 #include <rtl/string.hxx>
-#endif
-#ifndef _SVTOOLS_PATHOPTIONS_HXX
+#include <rtl/bootstrap.hxx>
 #include <svtools/pathoptions.hxx>
-#endif
 #include <tools/resid.hxx>
+#include <tools/config.hxx>
 #include <i18npool/mslangid.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -55,6 +54,7 @@
 #include <rtl/locale.hxx>
 #include <rtl/instance.hxx>
 #include <osl/process.h>
+#include <osl/file.hxx>
 
 using namespace rtl;
 using namespace com::sun::star::uno;
@@ -65,10 +65,54 @@ using namespace com::sun::star::util;
 
 namespace desktop {
 
+static char const SOFFICE_BOOTSTRAP[] = "Bootstrap";
+static char const SOFFICE_STARTLANG[] = "STARTLANG";
 sal_Bool LanguageSelection::bFoundLanguage = sal_False;
 OUString LanguageSelection::aFoundLanguage;
 const OUString LanguageSelection::usFallbackLanguage = OUString::createFromAscii("en-US");
 
+
+static sal_Bool existsURL( OUString const& sURL )
+{
+    using namespace osl;
+    DirectoryItem aDirItem;
+
+    if (sURL.getLength() != 0)
+        return ( DirectoryItem::get( sURL, aDirItem ) == DirectoryItem::E_None );
+
+    return sal_False;
+}
+
+// locate soffice.ini/.rc file
+static OUString locateSofficeIniFile()
+{
+    OUString aUserDataPath;
+    OUString aSofficeIniFileURL;
+
+    // Retrieve the default file URL for the soffice.ini/rc
+    rtl::Bootstrap().getIniName( aSofficeIniFileURL );
+
+    if ( utl::Bootstrap::locateUserData( aUserDataPath ) == utl::Bootstrap::PATH_EXISTS )
+    {
+        const char CONFIG_DIR[] = "/config";
+
+        sal_Int32 nIndex = aSofficeIniFileURL.lastIndexOf( '/');
+        if ( nIndex > 0 )
+        {
+            OUString		aUserSofficeIniFileURL;
+            OUStringBuffer	aBuffer( aUserDataPath );
+            aBuffer.appendAscii( CONFIG_DIR );
+            aBuffer.append( aSofficeIniFileURL.copy( nIndex ));
+            aUserSofficeIniFileURL = aBuffer.makeStringAndClear();
+
+            if ( existsURL( aUserSofficeIniFileURL ))
+                return aUserSofficeIniFileURL;
+        }
+    }
+    // Fallback try to use the soffice.ini/rc from program folder
+    return aSofficeIniFileURL;
+}
+
 Locale LanguageSelection::IsoStringToLocale(const OUString& str)
 {
     Locale l;
@@ -122,8 +166,51 @@ bool LanguageSelection::prepareLanguage()
     catch (Exception&) 
     {
     }
+    
     // get the selected UI language as string
-    OUString aLocaleString = getLanguageString();
+    bool     bCmdLanguage( false );
+    bool     bIniLanguage( false );
+    OUString aEmpty;
+    OUString aLocaleString = getUserUILanguage();
+    
+    if ( aLocaleString.getLength() == 0 )
+    {
+        CommandLineArgs* pCmdLineArgs = Desktop::GetCommandLineArgs();
+        if ( pCmdLineArgs )
+        {
+            pCmdLineArgs->GetLanguage(aLocaleString);
+            if (isInstalledLanguage(aLocaleString, sal_False))
+            {
+                bCmdLanguage   = true;
+                bFoundLanguage = true;
+                aFoundLanguage = aLocaleString;
+            }
+            else
+                aLocaleString = aEmpty;
+        }
+        
+        if ( !bCmdLanguage )
+        {
+            OUString aSOfficeIniURL = locateSofficeIniFile();
+            Config aConfig(aSOfficeIniURL);
+            aConfig.SetGroup( SOFFICE_BOOTSTRAP );
+            OString sLang = aConfig.ReadKey( SOFFICE_STARTLANG );
+            aLocaleString = OUString( sLang.getStr(), sLang.getLength(), RTL_TEXTENCODING_ASCII_US );
+            if (isInstalledLanguage(aLocaleString, sal_False))
+            {
+                bIniLanguage   = true;
+                bFoundLanguage = true;
+                aFoundLanguage = aLocaleString;
+            }
+            else
+                aLocaleString = aEmpty;
+        }
+    }
+    
+    // user further fallbacks for the UI language
+    if ( aLocaleString.getLength() == 0 )
+        aLocaleString = getLanguageString();
+
     if ( aLocaleString.getLength() > 0 )
     {
         try
@@ -135,13 +222,24 @@ bool LanguageSelection::prepareLanguage()
             // flush any data already written to the configuration (which
             // currently uses independent caches for different locales and thus
             // would ignore data written to another cache):
-            Reference< XFlushable >(theConfigProvider, UNO_QUERY_THROW)->
-                flush();
+            Reference< XFlushable >(theConfigProvider, UNO_QUERY_THROW)->flush();
             theConfigProvider->setLocale(loc);
             
-            Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Setup/L10N/", sal_True), UNO_QUERY_THROW);
-            xProp->setPropertyValue(OUString::createFromAscii("ooLocale"), makeAny(aLocaleString));
-            Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
+            if ( !bCmdLanguage )
+            {
+                // Store language only 
+                Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Setup/L10N/", sal_True), UNO_QUERY_THROW);
+                xProp->setPropertyValue(OUString::createFromAscii("ooLocale"), makeAny(aLocaleString));
+                Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
+            }
+            
+            if ( bIniLanguage )
+            {
+                // Store language only 
+                Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
+                xProp->setPropertyValue(OUString::createFromAscii("UILocale"), makeAny(aLocaleString));
+                Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
+            }
 
             bSuccess = sal_True;
         }
@@ -156,7 +254,7 @@ bool LanguageSelection::prepareLanguage()
 
         }
     }
-
+    
     // #i32939# setting of default document locale
     // #i32939# this should not be based on the UI language
     setDefaultLanguage(aLocaleString);
@@ -188,11 +286,8 @@ void LanguageSelection::setDefaultLanguage(const OUString& sLocale)
     }
 }
 
-OUString LanguageSelection::getLanguageString()
+OUString LanguageSelection::getUserUILanguage()
 {
-    // did we already find a language?
-    if (bFoundLanguage)
-        return aFoundLanguage;
     // check whether the user has selected a specific language
     OUString aUserLanguage = getUserLanguage();
     if (aUserLanguage.getLength() > 0 )
@@ -210,6 +305,21 @@ OUString LanguageSelection::getLanguageString()
             resetUserLanguage();
         }
     }
+
+    return aUserLanguage;
+}
+
+OUString LanguageSelection::getLanguageString()
+{
+    // did we already find a language?
+    if (bFoundLanguage)
+        return aFoundLanguage;
+    
+    // check whether the user has selected a specific language
+    OUString aUserLanguage = getUserUILanguage();
+    if (aUserLanguage.getLength() > 0 )
+        return aUserLanguage ;
+    
     // try to use system default
     aUserLanguage = getSystemLanguage();
     if (aUserLanguage.getLength() > 0 )
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index 3418b80caf..3220557aa8 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -57,6 +57,7 @@ private:
     static com::sun::star::uno::Sequence< rtl::OUString > getInstalledLanguages();
     static sal_Bool isInstalledLanguage(rtl::OUString& usLocale, sal_Bool bExact=sal_False);
     static rtl::OUString getFirstInstalledLanguage();
+    static rtl::OUString getUserUILanguage();
     static rtl::OUString getUserLanguage();
     static rtl::OUString getSystemLanguage();
     static void resetUserLanguage();
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 4430b5b444..21688d51e7 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -94,8 +94,7 @@ using ::rtl::OUString;
 
 namespace dp_gui {
 
-#define ICON_OFFSET         50
-#define TOP_OFFSET           3
+#define TOP_OFFSET           5
 #define LINE_SIZE            4
 #define PROGRESS_WIDTH      60
 #define PROGRESS_HEIGHT     14
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index f4473c2c6f..68a06f2a30 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1,1175 +1,1175 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2009 by Sun Microsystems, Inc.

- *

- * 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_desktop.hxx"

-

-#include "svtools/controldims.hrc"

-

-#include "dp_gui.h"

-#include "dp_gui_extlistbox.hxx"

-#include "dp_gui_theextmgr.hxx"

-#include "dp_gui_dialog2.hxx"

-#include "dp_dependencies.hxx"

-

-#include "comphelper/processfactory.hxx"

-#include "com/sun/star/i18n/CollatorOptions.hpp"

-#include "com/sun/star/deployment/DependencyException.hpp"

-#include "com/sun/star/deployment/DeploymentException.hpp"

-

-

-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )

-

-using namespace ::com::sun::star;

-

-namespace dp_gui {

-

-//------------------------------------------------------------------------------

-//                          struct Entry_Impl

-//------------------------------------------------------------------------------

-Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,

-                        const uno::Reference< deployment::XPackageManager > &xPackageManager,

-                        PackageState eState ) :

-    m_bActive( false ),

-    m_bLocked( false ),

-    m_bHasOptions( false ),

-    m_bShared( false ),

-    m_bNew( false ),

-    m_bChecked( false ),

-    m_bMissingDeps( false ),

-    m_eState( eState ),

-    m_pPublisher( NULL ),

-    m_xPackage( xPackage ),

-    m_xPackageManager( xPackageManager )

-{

-    m_sTitle = xPackage->getDisplayName();

-    m_sVersion = xPackage->getVersion();

-    m_sDescription = xPackage->getDescription();

-

-    beans::StringPair aInfo( m_xPackage->getPublisherInfo() );

-    m_sPublisher = aInfo.First;

-    m_sPublisherURL = aInfo.Second;

-    

-    // get the icons for the package if there are any

-    uno::Reference< graphic::XGraphic > xGraphic = xPackage->getIcon( false );

-    if ( xGraphic.is() )

-        m_aIcon = Image( xGraphic );

-

-    xGraphic = xPackage->getIcon( true );

-    if ( xGraphic.is() )

-        m_aIconHC = Image( xGraphic );

-    else

-        m_aIconHC = m_aIcon;

-

-    m_bLocked = m_xPackageManager->isReadOnly();

-

-    if ( eState == AMBIGUOUS )

-        m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );

-    else if ( eState == NOT_REGISTERED )

-        checkDependencies();

-}

-

-//------------------------------------------------------------------------------

-Entry_Impl::~Entry_Impl()

-{}

-

-//------------------------------------------------------------------------------

-StringCompare Entry_Impl::CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const

-{

-    StringCompare eCompare = (StringCompare) pCollator->compareString( m_sTitle, pEntry->m_sTitle );

-    if ( eCompare == COMPARE_EQUAL )

-    {

-        eCompare = m_sVersion.CompareTo( pEntry->m_sVersion );

-        if ( eCompare == COMPARE_EQUAL )

-        {     

-            if ( m_xPackageManager != pEntry->m_xPackageManager )

-            {

-                sal_Int32 nCompare = m_xPackageManager->getContext().compareTo( pEntry->m_xPackageManager->getContext() );

-                if ( nCompare < 0 )

-                    eCompare = COMPARE_LESS;

-                else if ( nCompare > 0 )

-                    eCompare = COMPARE_GREATER;

-            }

-        }

-    }

-    return eCompare;

-}

-

-//------------------------------------------------------------------------------

-void Entry_Impl::checkDependencies()

-{

-    try {

-        m_xPackage->checkDependencies( uno::Reference< ucb::XCommandEnvironment >() );

-    }

-    catch ( deployment::DeploymentException &e )

-    {

-        deployment::DependencyException depExc;

-        if ( e.Cause >>= depExc )

-        {

-            rtl::OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) );

-            for ( sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i )

-            {

-                aMissingDep += OUSTR("\n");

-                aMissingDep += dp_misc::Dependencies::getErrorText( depExc.UnsatisfiedDependencies[i]);

-            }

-            aMissingDep += OUSTR("\n");

-            m_sErrorText = aMissingDep;

-            m_bMissingDeps = true;

-        }

-    }

-}

-//------------------------------------------------------------------------------

-// ExtensionRemovedListener

-//------------------------------------------------------------------------------

-void ExtensionRemovedListener::disposing( lang::EventObject const & rEvt )

-    throw ( uno::RuntimeException )

-{

-    uno::Reference< deployment::XPackage > xPackage( rEvt.Source, uno::UNO_QUERY );

-

-    if ( xPackage.is() )

-    {

-        m_pParent->removeEntry( xPackage );

-    }

-}

-

-//------------------------------------------------------------------------------

-ExtensionRemovedListener::~ExtensionRemovedListener()

-{

-}

-

-//------------------------------------------------------------------------------

-// ExtensionBox_Impl

-//------------------------------------------------------------------------------

-ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pManager ) :

-    IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),

-    m_bHasScrollBar( false ),

-    m_bHasActive( false ),

-    m_bNeedsRecalc( true ),

-    m_bHasNew( false ),

-    m_bInCheckMode( false ),

-    m_bAdjustActive( false ),

-    m_bInDelete( false ),

-    m_nActive( 0 ),

-    m_nTopIndex( 0 ),

-    m_nActiveHeight( 0 ),

-    m_nExtraHeight( 2 ),

-    m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),

-    m_aLockedImageHC( DialogHelper::getResId( RID_IMG_LOCKED_HC ) ),

-    m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),

-    m_aWarningImageHC( DialogHelper::getResId( RID_IMG_WARNING_HC ) ),

-    m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ),

-    m_aDefaultImageHC( DialogHelper::getResId( RID_IMG_EXTENSION_HC ) ),

-    m_pScrollBar( NULL ),

-    m_pManager( pManager )

-{

-    SetHelpId( HID_EXTENSION_MANAGER_LISTBOX );

-

-    m_pScrollBar = new ScrollBar( this, WB_VERT );

-    m_pScrollBar->SetScrollHdl( LINK( this, ExtensionBox_Impl, ScrollHdl ) );

-    m_pScrollBar->EnableDrag();

-

-    SetPaintTransparent( true );

-    SetPosPixel( Point( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ) );

-    long nIconHeight = 2*TOP_OFFSET + SMALL_ICON_SIZE;

-    long nTitleHeight = 2*TOP_OFFSET + GetTextHeight();

-    if ( nIconHeight < nTitleHeight )

-        m_nStdHeight = nTitleHeight;

-    else

-        m_nStdHeight = nIconHeight;

-    m_nStdHeight += GetTextHeight() + TOP_OFFSET;

-

-    nIconHeight = ICON_HEIGHT + 2*TOP_OFFSET + 1;

-    if ( m_nStdHeight < nIconHeight )

-        m_nStdHeight = nIconHeight;

-

-    m_nActiveHeight = m_nStdHeight;

-

-    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();

-    if( IsControlBackground() )

-        SetBackground( GetControlBackground() );

-    else

-        SetBackground( rStyleSettings.GetFieldColor() );

-

-    m_xRemoveListener = new ExtensionRemovedListener( this );

-

-    m_pLocale = new lang::Locale( Application::GetSettings().GetLocale() );

-    m_pCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );

-    m_pCollator->loadDefaultCollator( *m_pLocale, i18n::CollatorOptions::CollatorOptions_IGNORE_CASE );

-

-    Show();

-}

-

-//------------------------------------------------------------------------------

-ExtensionBox_Impl::~ExtensionBox_Impl()

-{

-    if ( ! m_bInDelete )

-        DeleteRemoved();

-

-    m_bInDelete = true;

-

-    typedef std::vector< TEntry_Impl >::iterator ITER;

-

-    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-    {

-        if ( (*iIndex)->m_pPublisher )

-        {

-            delete (*iIndex)->m_pPublisher;

-            (*iIndex)->m_pPublisher = NULL;

-        }

-        (*iIndex)->m_xPackage->removeEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );

-    }

-

-    m_vEntries.clear();

-

-    delete m_pScrollBar;

-

-    m_xRemoveListener.clear();

-

-    delete m_pLocale;

-    delete m_pCollator;

-}

-

-//------------------------------------------------------------------------------

-sal_Int32 ExtensionBox_Impl::getItemCount() const

-{

-    return static_cast< sal_Int32 >( m_vEntries.size() );

-}

-

-//------------------------------------------------------------------------------

-sal_Int32 ExtensionBox_Impl::getSelIndex() const

-{

-    if ( m_bHasActive )

-    {

-        OSL_ASSERT( m_nActive >= -1);

-        return static_cast< sal_Int32 >( m_nActive );

-    }

-    else

-        return static_cast< sal_Int32 >( EXTENSION_LISTBOX_ENTRY_NOTFOUND );

-}

-

-//------------------------------------------------------------------------------

-void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const

-{

-    if ( nIndex < 0 )

-        throw lang::IllegalArgumentException( OUSTR("The list index starts with 0"),0, 0 );

-    if ( static_cast< sal_uInt32 >( nIndex ) >= m_vEntries.size())

-        throw lang::IllegalArgumentException( OUSTR("There is no element at the provided position."

-        "The position exceeds the number of available list entries"),0, 0 );

-}

-

-//------------------------------------------------------------------------------

-rtl::OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    return m_vEntries[ nIndex ]->m_sTitle;

-}

-

-//------------------------------------------------------------------------------

-rtl::OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    return m_vEntries[ nIndex ]->m_sVersion;

-}

-

-//------------------------------------------------------------------------------

-rtl::OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    return m_vEntries[ nIndex ]->m_sDescription;

-}

-

-//------------------------------------------------------------------------------

-rtl::OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    return m_vEntries[ nIndex ]->m_sPublisher;

-}

-

-//------------------------------------------------------------------------------

-rtl::OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    return m_vEntries[ nIndex ]->m_sPublisherURL;

-}

-

-//------------------------------------------------------------------------------

-void ExtensionBox_Impl::select( sal_Int32 nIndex )

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    selectEntry( nIndex );   

-}

-

-//------------------------------------------------------------------------------

-void ExtensionBox_Impl::select( const rtl::OUString & sName )

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    typedef ::std::vector< TEntry_Impl >::const_iterator It;

-

-    for ( It iIter = m_vEntries.begin(); iIter < m_vEntries.end(); iIter++ )

-    {

-        if ( sName.equals( (*iIter)->m_sTitle ) )

-        {

-            long nPos = iIter - m_vEntries.begin();

-            selectEntry( nPos );

-            break;

-        }

-    }

-}

-

-//------------------------------------------------------------------------------

-//------------------------------------------------------------------------------

-// Title + description

-void ExtensionBox_Impl::CalcActiveHeight( const long nPos )

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-

-    // get title height

-    long aTextHeight;

-    long nIconHeight = 2*TOP_OFFSET + SMALL_ICON_SIZE;

-    long nTitleHeight = 2*TOP_OFFSET + GetTextHeight();

-    if ( nIconHeight < nTitleHeight )

-        aTextHeight = nTitleHeight;

-    else

-        aTextHeight = nIconHeight;

-

-    // calc description height

-    Size aSize = GetOutputSizePixel();

-    if ( m_bHasScrollBar )

-        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();

-

-    aSize.Width() -= ICON_OFFSET;

-    aSize.Height() = 10000;

-

-    rtl::OUString aText( m_vEntries[ nPos ]->m_sErrorText );

-    aText += m_vEntries[ nPos ]->m_sDescription;

-    

-    Rectangle aRect = GetTextRect( Rectangle( Point(), aSize ), aText,

-                                   TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );

-    aTextHeight += aRect.GetHeight();

-

-    if ( aTextHeight < m_nStdHeight )

-        aTextHeight = m_nStdHeight;

-

-    m_nActiveHeight = aTextHeight + m_nExtraHeight;

-}

-

-//------------------------------------------------------------------------------

-const Size ExtensionBox_Impl::GetMinOutputSizePixel() const

-{

-    return Size( 200, 80 );

-}

-

-//------------------------------------------------------------------------------

-Rectangle ExtensionBox_Impl::GetEntryRect( const long nPos ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-

-    Size aSize( GetOutputSizePixel() );

-

-    if ( m_bHasScrollBar )

-        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();

-

-    if ( m_vEntries[ nPos ]->m_bActive )

-        aSize.Height() = m_nActiveHeight;

-    else

-        aSize.Height() = m_nStdHeight;

-

-    Point aPos( 0, -m_nTopIndex + nPos * m_nStdHeight );

-    if ( m_bHasActive && ( nPos < m_nActive ) )

-        aPos.Y() += m_nActiveHeight - m_nStdHeight;

-

-    return Rectangle( aPos, aSize );

-}

-

-//------------------------------------------------------------------------------

-void ExtensionBox_Impl::DeleteRemoved()

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-

-    m_bInDelete = true;

-

-    if ( ! m_vRemovedEntries.empty() )

-    {

-        typedef std::vector< TEntry_Impl >::iterator ITER;

-

-        for ( ITER iIndex = m_vRemovedEntries.begin(); iIndex < m_vRemovedEntries.end(); ++iIndex )

-        {

-            if ( (*iIndex)->m_pPublisher )

-            {

-                delete (*iIndex)->m_pPublisher;

-                (*iIndex)->m_pPublisher = NULL;

-            }

-        }

-

-        m_vRemovedEntries.clear();

-    }

-

-    m_bInDelete = false;

-}

-

-//------------------------------------------------------------------------------

-//This function may be called with nPos < 0

-void ExtensionBox_Impl::selectEntry( const long nPos )

-{

-    //ToDo whe should not use the guard at such a big scope here.

-    //Currently it is used to gard m_vEntries and m_nActive. m_nActive will be 

-    //modified in this function.

-    //It would be probably best to always use a copy of m_vEntries

-    //and some other state variables from ExtensionBox_Impl for 

-    //the whole painting operation. See issue i86993

-    ::osl::ClearableMutexGuard guard(m_entriesMutex);

-

-    if ( m_bInCheckMode )

-        return;

-

-    if ( m_bHasActive )

-    {

-        if ( nPos == m_nActive )

-            return;

-

-        m_bHasActive = false;

-        m_vEntries[ m_nActive ]->m_bActive = false;

-    }

-

-    if ( ( nPos >= 0 ) && ( nPos < (long) m_vEntries.size() ) )

-    {

-        m_bHasActive = true;

-        m_nActive = nPos;

-        m_vEntries[ nPos ]->m_bActive = true;

-

-        if ( IsReallyVisible() )

-        {

-            m_bNeedsRecalc = true;

-            m_bAdjustActive = true;

-        }

-    }

-

-    if ( IsReallyVisible() )

-        Invalidate();

-

-    guard.clear();

-}

-

-// -----------------------------------------------------------------------

-void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry )

-{

-    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();

-

-    if ( pEntry->m_bActive )

-        SetTextColor( rStyleSettings.GetHighlightTextColor() );

-    else if ( ( pEntry->m_eState != REGISTERED ) && ( pEntry->m_eState != NOT_AVAILABLE ) )

-        SetTextColor( rStyleSettings.GetDisableColor() );

-    else if ( IsControlForeground() )

-        SetTextColor( GetControlForeground() );

-    else

-        SetTextColor( rStyleSettings.GetFieldTextColor() );

-

-    if ( pEntry->m_bActive )

-    {

-        SetLineColor();

-        SetFillColor( rStyleSettings.GetHighlightColor() );

-        DrawRect( rRect );

-    }

-    else

-    {

-        if( IsControlBackground() )

-            SetBackground( GetControlBackground() );

-        else

-            SetBackground( rStyleSettings.GetFieldColor() );

-

-        SetTextFillColor();

-        Erase( rRect );

-    }

-

-    // Draw extension icon

-    Point aPos( rRect.TopLeft() );

-    aPos += Point( TOP_OFFSET, TOP_OFFSET );

-    Image aImage;

-    if ( ! pEntry->m_aIcon )

-        aImage = isHCMode() ? m_aDefaultImageHC : m_aDefaultImage;

-    else

-        aImage = isHCMode() ? pEntry->m_aIconHC : pEntry->m_aIcon;

-    Size aImageSize = aImage.GetSizePixel();

-    if ( ( aImageSize.Width() <= ICON_HEIGHT ) && ( aImageSize.Height() <= ICON_HEIGHT ) )

-        DrawImage( Point( aPos.X()+((ICON_HEIGHT-aImageSize.Width())/2), aPos.Y()+((ICON_HEIGHT-aImageSize.Height())/2) ), aImage );

-    else

-        DrawImage( aPos, Size( ICON_HEIGHT, ICON_HEIGHT ), aImage );

-

-    // Setup fonts

-    Font aStdFont( GetFont() );

-    Font aBoldFont( aStdFont );

-    aBoldFont.SetWeight( WEIGHT_BOLD );

-    SetFont( aBoldFont );

-    long aTextHeight = GetTextHeight();

-

-    // Init publisher link here

-    if ( !pEntry->m_pPublisher && pEntry->m_sPublisher.Len() )

-    {

-        pEntry->m_pPublisher = new svt::FixedHyperlink( this );

-        pEntry->m_pPublisher->SetBackground();

-        pEntry->m_pPublisher->SetPaintTransparent( true );

-        pEntry->m_pPublisher->SetURL( pEntry->m_sPublisherURL );

-        pEntry->m_pPublisher->SetDescription( pEntry->m_sPublisher );

-        Size aSize = FixedText::CalcMinimumTextSize( pEntry->m_pPublisher );

-        pEntry->m_pPublisher->SetSizePixel( aSize );

-

-        if ( m_aClickHdl.IsSet() )

-            pEntry->m_pPublisher->SetClickHdl( m_aClickHdl );

-    }

-

-    // Get max title width

-    long nMaxTitleWidth = rRect.GetWidth() - ICON_OFFSET;

-    nMaxTitleWidth -= ( 2 * SMALL_ICON_SIZE ) + ( 4 * SPACE_BETWEEN );

-    if ( pEntry->m_pPublisher )

-    {

-        nMaxTitleWidth -= pEntry->m_pPublisher->GetSizePixel().Width() + (2*SPACE_BETWEEN);

-    }

-

-    long aVersionWidth = GetTextWidth( pEntry->m_sVersion );

-    long aTitleWidth = GetTextWidth( pEntry->m_sTitle ) + (aTextHeight / 3);

-

-    aPos = rRect.TopLeft() + Point( ICON_OFFSET, TOP_OFFSET );

-

-    if ( aTitleWidth > nMaxTitleWidth - aVersionWidth )

-    {

-        aTitleWidth = nMaxTitleWidth - aVersionWidth - (aTextHeight / 3);

-        String aShortTitle = GetEllipsisString( pEntry->m_sTitle, aTitleWidth );

-        DrawText( aPos, aShortTitle );

-        aTitleWidth += (aTextHeight / 3);

-    }

-    else

-        DrawText( aPos, pEntry->m_sTitle );

-

-    SetFont( aStdFont );

-    DrawText( Point( aPos.X() + aTitleWidth, aPos.Y() ), pEntry->m_sVersion );

-

-    long nIconHeight = TOP_OFFSET + SMALL_ICON_SIZE;

-    long nTitleHeight = TOP_OFFSET + GetTextHeight();

-    if ( nIconHeight < nTitleHeight )

-        aTextHeight = nTitleHeight;

-    else

-        aTextHeight = nIconHeight;

-

-    // draw description

-    String sDescription;

-    if ( pEntry->m_sErrorText.Len() )

-    {

-        if ( pEntry->m_bActive )

-            sDescription = pEntry->m_sErrorText + OUSTR("\n") + pEntry->m_sDescription;

-        else

-            sDescription = pEntry->m_sErrorText;

-    }

-    else

-        sDescription = pEntry->m_sDescription;

-

-    aPos.Y() += aTextHeight;

-    if ( pEntry->m_bActive )

-    {

-        DrawText( Rectangle( aPos.X(), aPos.Y(), rRect.Right(), rRect.Bottom() - m_nExtraHeight ),

-                  sDescription, TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );

-    }

-    else

-    {

-        const long nWidth = GetTextWidth( sDescription );

-        if ( nWidth > rRect.GetWidth() - aPos.X() )

-            sDescription = GetEllipsisString( sDescription, rRect.GetWidth() - aPos.X() );

-        DrawText( aPos, sDescription );

-    }

-

-    // Draw publisher link

-    if ( pEntry->m_pPublisher )

-    {

-        pEntry->m_pPublisher->Show();

-        aPos = rRect.TopLeft() + Point( ICON_OFFSET + nMaxTitleWidth + (2*SPACE_BETWEEN), TOP_OFFSET );

-        pEntry->m_pPublisher->SetPosPixel( aPos );

-    }

-

-    // Draw status icons

-    if ( pEntry->m_bShared )

-    {

-        aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SMALL_ICON_SIZE), TOP_OFFSET );

-        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aLockedImageHC : m_aLockedImage );

-    }

-    if ( ( pEntry->m_eState == AMBIGUOUS ) || pEntry->m_bMissingDeps )

-    {

-        aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SPACE_BETWEEN + 2*SMALL_ICON_SIZE), TOP_OFFSET );

-        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aWarningImageHC : m_aWarningImage );

-    }

-    

-    SetLineColor( Color( COL_LIGHTGRAY ) );

-    DrawLine( rRect.BottomLeft(), rRect.BottomRight() );

-}

-

-// -----------------------------------------------------------------------

-void ExtensionBox_Impl::RecalcAll()

-{

-    if ( m_bHasActive )

-        CalcActiveHeight( m_nActive );

-

-    SetupScrollBar();

-

-    if ( m_bHasActive )

-    {

-        Rectangle aEntryRect = GetEntryRect( m_nActive );

-

-        if ( m_bAdjustActive )

-        {

-            m_bAdjustActive = false;

-

-            // If the top of the selected entry isn't visible, make it visible

-            if ( aEntryRect.Top() < 0 )

-            {

-                m_nTopIndex += aEntryRect.Top();

-                aEntryRect.Move( 0, -aEntryRect.Top() );

-            }

-

-            // If the bottom of the selected entry isn't visible, make it visible even if now the top

-            // isn't visible any longer ( the buttons are more important )

-            Size aOutputSize = GetOutputSizePixel();

-            if ( aEntryRect.Bottom() > aOutputSize.Height() )

-            {

-                m_nTopIndex += ( aEntryRect.Bottom() - aOutputSize.Height() );

-                aEntryRect.Move( 0, -( aEntryRect.Bottom() - aOutputSize.Height() ) );

-            }

-

-            // If there is unused space below the last entry but all entries don't fit into the box,

-            // move the content down to use the whole space

-            const long nTotalHeight = GetTotalHeight();

-            if ( m_bHasScrollBar && ( aOutputSize.Height() + m_nTopIndex > nTotalHeight ) )

-            {

-                long nOffset = m_nTopIndex;

-                m_nTopIndex = nTotalHeight - aOutputSize.Height();

-                nOffset -= m_nTopIndex;

-                aEntryRect.Move( 0, nOffset );

-            }

-

-            if ( m_bHasScrollBar )

-                m_pScrollBar->SetThumbPos( m_nTopIndex );

-        }

-    }

-

-    m_bNeedsRecalc = false;

-}

-

-// -----------------------------------------------------------------------

-bool ExtensionBox_Impl::HandleTabKey( bool )

-{

-    return false;

-}

-

-// -----------------------------------------------------------------------

-bool ExtensionBox_Impl::HandleCursorKey( USHORT nKeyCode )

-{

-    if ( m_vEntries.empty() )

-        return true;

-

-    long nSelect = 0;

-

-    if ( m_bHasActive )

-    {

-        long nPageSize = GetOutputSizePixel().Height() / m_nStdHeight;

-        if ( nPageSize < 2 )

-            nPageSize = 2;

-

-        if ( ( nKeyCode == KEY_DOWN ) || ( nKeyCode == KEY_RIGHT ) )

-            nSelect = m_nActive + 1;

-        else if ( ( nKeyCode == KEY_UP ) || ( nKeyCode == KEY_LEFT ) )

-            nSelect = m_nActive - 1;

-        else if ( nKeyCode == KEY_HOME )

-            nSelect = 0;

-        else if ( nKeyCode == KEY_END )

-            nSelect = m_vEntries.size() - 1;

-        else if ( nKeyCode == KEY_PAGEUP )

-            nSelect = m_nActive - nPageSize + 1;

-        else if ( nKeyCode == KEY_PAGEDOWN )

-            nSelect = m_nActive + nPageSize - 1;

-    }

-    else // when there is no selected entry, we will select the first or the last.

-    {

-        if ( ( nKeyCode == KEY_DOWN ) || ( nKeyCode == KEY_PAGEDOWN ) || ( nKeyCode == KEY_HOME ) )

-            nSelect = 0;

-        else if ( ( nKeyCode == KEY_UP ) || ( nKeyCode == KEY_PAGEUP ) || ( nKeyCode == KEY_END ) )

-            nSelect = m_vEntries.size() - 1;

-    }

-

-    if ( nSelect < 0 )

-        nSelect = 0;

-    if ( nSelect >= (long) m_vEntries.size() )

-        nSelect = m_vEntries.size() - 1;

-

-    selectEntry( nSelect );

-

-    return true;

-}

-

-// -----------------------------------------------------------------------

-void ExtensionBox_Impl::Paint( const Rectangle &/*rPaintRect*/ )

-{

-    if ( !m_bInDelete )

-        DeleteRemoved();

-

-    if ( m_bNeedsRecalc )

-        RecalcAll();

-

-    Point aStart( 0, -m_nTopIndex );

-    Size aSize( GetOutputSizePixel() );

-

-    if ( m_bHasScrollBar )

-        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();

-

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-

-    typedef std::vector< TEntry_Impl >::iterator ITER;

-    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-    {

-        aSize.Height() = (*iIndex)->m_bActive ? m_nActiveHeight : m_nStdHeight;

-        Rectangle aEntryRect( aStart, aSize );

-        DrawRow( aEntryRect, *iIndex );

-        aStart.Y() += aSize.Height();

-    }

-}

-

-// -----------------------------------------------------------------------

-long ExtensionBox_Impl::GetTotalHeight() const

-{

-    long nHeight = m_vEntries.size() * m_nStdHeight;

-

-    if ( m_bHasActive )

-    {

-        nHeight += m_nActiveHeight - m_nStdHeight;

-    }

-

-    return nHeight;

-}

-

-// -----------------------------------------------------------------------

-void ExtensionBox_Impl::SetupScrollBar()

-{

-    const Size aSize = GetOutputSizePixel();

-    const long nScrBarSize = GetSettings().GetStyleSettings().GetScrollBarSize();

-    const long nTotalHeight = GetTotalHeight();

-    const bool bNeedsScrollBar = ( nTotalHeight > aSize.Height() );

-

-    if ( bNeedsScrollBar )

-    {

-        if ( m_nTopIndex + aSize.Height() > nTotalHeight )

-            m_nTopIndex = nTotalHeight - aSize.Height();

-

-        m_pScrollBar->SetPosSizePixel( Point( aSize.Width() - nScrBarSize, 0 ),

-                                       Size( nScrBarSize, aSize.Height() ) );

-        m_pScrollBar->SetRangeMax( nTotalHeight );

-        m_pScrollBar->SetVisibleSize( aSize.Height() );

-        m_pScrollBar->SetPageSize( ( aSize.Height() * 4 ) / 5 );

-        m_pScrollBar->SetLineSize( m_nStdHeight );

-        m_pScrollBar->SetThumbPos( m_nTopIndex );

-

-        if ( !m_bHasScrollBar )

-            m_pScrollBar->Show();

-    }

-    else if ( m_bHasScrollBar )

-    {

-        m_pScrollBar->Hide();

-        m_nTopIndex = 0;

-    }

-

-    m_bHasScrollBar = bNeedsScrollBar;

-}

-

-// -----------------------------------------------------------------------

-void ExtensionBox_Impl::Resize()

-{

-    RecalcAll();

-}

-

-//------------------------------------------------------------------------------

-long ExtensionBox_Impl::PointToPos( const Point& rPos )

-{

-    long nPos = ( rPos.Y() + m_nTopIndex ) / m_nStdHeight;

-

-    if ( m_bHasActive && ( nPos > m_nActive ) )

-    {

-        if ( rPos.Y() + m_nTopIndex <= m_nActive*m_nStdHeight + m_nActiveHeight )

-            nPos = m_nActive;

-        else

-            nPos = ( rPos.Y() + m_nTopIndex - (m_nActiveHeight - m_nStdHeight) ) / m_nStdHeight;

-    }

-

-    return nPos;

-}

-

-//------------------------------------------------------------------------------

-void ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )

-{

-    long nPos = PointToPos( rMEvt.GetPosPixel() );

-

-    if ( rMEvt.IsLeft() )

-    {

-        if ( rMEvt.IsMod1() && m_bHasActive )

-            selectEntry( m_vEntries.size() );   // Selecting an not existing entry will deselect the current one

-        else

-            selectEntry( nPos );

-    }

-}

-

-//------------------------------------------------------------------------------

-long ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )

-{

-    if ( !m_bInDelete )

-        DeleteRemoved();

-

-    bool bHandled = false;

-

-    if ( rNEvt.GetType() == EVENT_KEYINPUT )

-    {

-        const KeyEvent* pKEvt = rNEvt.GetKeyEvent();

-        KeyCode         aKeyCode = pKEvt->GetKeyCode();

-        USHORT          nKeyCode = aKeyCode.GetCode();

-

-        if ( nKeyCode == KEY_TAB )

-            bHandled = HandleTabKey( aKeyCode.IsShift() );

-        else if ( aKeyCode.GetGroup() == KEYGROUP_CURSOR )

-            bHandled = HandleCursorKey( nKeyCode );

-    }

-

-    if ( rNEvt.GetType() == EVENT_COMMAND )

-    {

-        if ( m_bHasScrollBar &&

-             ( rNEvt.GetCommandEvent()->GetCommand() == COMMAND_WHEEL ) )

-        {

-            const CommandWheelData* pData = rNEvt.GetCommandEvent()->GetWheelData();

-            if ( pData->GetMode() == COMMAND_WHEEL_SCROLL )

-            {

-                long nThumbPos = m_pScrollBar->GetThumbPos();

-                if ( pData->GetDelta() < 0 )

-                    m_pScrollBar->DoScroll( nThumbPos + m_nStdHeight );

-                else

-                    m_pScrollBar->DoScroll( nThumbPos - m_nStdHeight );

-                bHandled = true;

-            }

-        }

-    }

-

-    if ( !bHandled )

-        return Control::Notify( rNEvt );

-    else

-        return true;

-}

-

-//------------------------------------------------------------------------------

-bool ExtensionBox_Impl::FindEntryPos( const TEntry_Impl pEntry, const long nStart,

-                                      const long nEnd, long &nPos )

-{

-    nPos = nStart;

-    if ( nStart > nEnd )

-        return false;

-

-    StringCompare eCompare;

-

-    if ( nStart == nEnd )

-    {

-        eCompare = pEntry->CompareTo( m_pCollator, m_vEntries[ nStart ] );

-        if ( eCompare == COMPARE_LESS )

-            return false;

-        else if ( eCompare == COMPARE_EQUAL )

-        {

-            //Workaround. See i86963.

-            if (pEntry->m_xPackage != m_vEntries[nStart]->m_xPackage)

-                return false;

-

-            if ( m_bInCheckMode )

-                m_vEntries[ nStart ]->m_bChecked = true;

-            return true;

-        }

-        else

-        {

-            nPos = nStart + 1;

-            return false;

-        }

-    }

-

-    const long nMid = nStart + ( ( nEnd - nStart ) / 2 );

-    eCompare = pEntry->CompareTo( m_pCollator, m_vEntries[ nMid ] );

-

-    if ( eCompare == COMPARE_LESS )

-        return FindEntryPos( pEntry, nStart, nMid-1, nPos );

-    else if ( eCompare == COMPARE_GREATER )

-        return FindEntryPos( pEntry, nMid+1, nEnd, nPos );

-    else

-    {

-        //Workaround.See i86963.

-        if (pEntry->m_xPackage != m_vEntries[nMid]->m_xPackage)

-            return false;

-

-        if ( m_bInCheckMode )

-            m_vEntries[ nMid ]->m_bChecked = true;

-        nPos = nMid;

-        return true;

-    }

-}

-

-//------------------------------------------------------------------------------

-long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &xPackage,

-                                  const uno::Reference< deployment::XPackageManager > &xPackageManager )

-{

-    long nPos = 0;

-    PackageState eState = m_pManager->getPackageState( xPackage );

-

-    TEntry_Impl pEntry( new Entry_Impl( xPackage, xPackageManager, eState ) );

-    xPackage->addEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );

-

-    ::osl::ClearableMutexGuard guard(m_entriesMutex);

-    if ( m_vEntries.empty() )

-    {

-        pEntry->m_bHasOptions = m_pManager->supportsOptions( xPackage );

-        pEntry->m_bShared     = ( m_pManager->getSharedPkgMgr() == xPackageManager );

-        pEntry->m_bNew        = m_bInCheckMode;

-        m_vEntries.push_back( pEntry );

-    }

-    else

-    {

-        if ( !FindEntryPos( pEntry, 0, m_vEntries.size()-1, nPos ) )

-        {

-            pEntry->m_bHasOptions = m_pManager->supportsOptions( xPackage );

-            pEntry->m_bShared     = ( m_pManager->getSharedPkgMgr() == xPackageManager );

-            pEntry->m_bNew        = m_bInCheckMode;

-            m_vEntries.insert( m_vEntries.begin()+nPos, pEntry );

-        }

-        else if ( !m_bInCheckMode )

-        {

-            OSL_ENSURE( 0, "ExtensionBox_Impl::addEntry(): Will not add duplicate entries"  );

-        }

-    }

-    //access to m_nActive must be guarded

-    if ( !m_bInCheckMode && m_bHasActive && ( m_nActive >= nPos ) )

-        m_nActive += 1;

-

-    guard.clear();

-

-    if ( IsReallyVisible() )

-        Invalidate();

-

-    m_bNeedsRecalc = true;

-

-    return nPos;

-}

-

-//------------------------------------------------------------------------------

-void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage > &xPackage )

-{

-    typedef std::vector< TEntry_Impl >::iterator ITER;

-    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-    {

-        if ( (*iIndex)->m_xPackage == xPackage )

-        {

-            PackageState eState = m_pManager->getPackageState( xPackage );

-            (*iIndex)->m_bHasOptions = m_pManager->supportsOptions( xPackage );

-            (*iIndex)->m_eState = eState;

-            (*iIndex)->m_sTitle = xPackage->getDisplayName();

-            (*iIndex)->m_sVersion = xPackage->getVersion();

-            (*iIndex)->m_sDescription = xPackage->getDescription();

-

-            if ( eState == AMBIGUOUS )

-                (*iIndex)->m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );

-            else

-                (*iIndex)->m_sErrorText = String();

-

-            if ( IsReallyVisible() )

-                Invalidate();

-            break;

-        }

-    }

-}

-

-//------------------------------------------------------------------------------

-void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage > &xPackage )

-{

-    if ( ! m_bInDelete )

-    {

-        ::osl::ClearableMutexGuard aGuard( m_entriesMutex );

-

-        typedef std::vector< TEntry_Impl >::iterator ITER;

-

-        for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-        {

-            if ( (*iIndex)->m_xPackage == xPackage )

-            {

-                long nPos = iIndex - m_vEntries.begin();

-

-                // Entries mustn't removed here, because they contain a hyperlink control

-                // which can only be deleted when the thread has the solar mutex. Therefor 

-                // the entry will be moved into the m_vRemovedEntries list which will be

-                // cleared on the next paint event

-                m_vRemovedEntries.push_back( *iIndex );

-                m_vEntries.erase( iIndex );

-

-                m_bNeedsRecalc = true;

-

-                if ( IsReallyVisible() )

-                    Invalidate();

-

-                if ( m_bHasActive )

-                {

-                    if ( nPos < m_nActive )

-                        m_nActive -= 1;

-                    else if ( ( nPos == m_nActive ) &&

-                              ( nPos == (long) m_vEntries.size() ) )

-                        m_nActive -= 1;

-

-                    m_bHasActive = false;

-                    //clear before calling out of this method

-                    aGuard.clear();

-                    selectEntry( m_nActive );

-                }

-                break;

-            }

-        }

-    }

-}

-

-//------------------------------------------------------------------------------

-void ExtensionBox_Impl::RemoveUnlocked()

-{

-    bool bAllRemoved = false;

-

-    while ( ! bAllRemoved )

-    {

-        bAllRemoved = true;

-

-        ::osl::ClearableMutexGuard aGuard( m_entriesMutex );

-

-        typedef std::vector< TEntry_Impl >::iterator ITER;

-

-        for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-        {

-            if ( !(*iIndex)->m_bLocked )

-            {

-                bAllRemoved = false;

-                uno::Reference< deployment::XPackage> xPackage = (*iIndex)->m_xPackage;

-                aGuard.clear();

-                removeEntry( xPackage );

-                break;

-            }

-        }

-    }

-}

-

-//------------------------------------------------------------------------------

-void ExtensionBox_Impl::prepareChecking( const uno::Reference< deployment::XPackageManager > &xPackageMgr )

-{

-    m_bInCheckMode = true;

-    typedef std::vector< TEntry_Impl >::iterator ITER;

-    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-    {

-        if ( (*iIndex)->m_xPackageManager == xPackageMgr )

-            (*iIndex)->m_bChecked = false;

-        else

-            (*iIndex)->m_bChecked = true;

-        (*iIndex)->m_bNew = false;

-    }

-}

-

-//------------------------------------------------------------------------------

-void ExtensionBox_Impl::checkEntries()

-{

-    long nNewPos = -1;

-    long nPos = 0;

-    bool bNeedsUpdate = false;

-    

-    ::osl::ClearableMutexGuard guard(m_entriesMutex);

-    typedef std::vector< TEntry_Impl >::iterator ITER;

-    ITER iIndex = m_vEntries.begin();

-    while ( iIndex < m_vEntries.end() )

-    {

-        if ( (*iIndex)->m_bChecked == false )

-        {

-            bNeedsUpdate = true;

-            nPos = iIndex-m_vEntries.begin();

-            if ( (*iIndex)->m_bNew )

-            {

-                if ( nNewPos == - 1)

-                    nNewPos = nPos;

-                if ( nPos <= m_nActive )

-                    m_nActive += 1;

-            }

-        }

-        iIndex++;

-    }

-    guard.clear();

-

-    m_bInCheckMode = false;

-

-    if ( nNewPos != - 1)

-        selectEntry( nNewPos );

-

-    if ( bNeedsUpdate )

-    {

-        m_bNeedsRecalc = true;

-        if ( IsReallyVisible() )

-            Invalidate();

-    }

-}

-//------------------------------------------------------------------------------

-bool ExtensionBox_Impl::isHCMode()

-{

-    return (bool)GetDisplayBackground().GetColor().IsDark();

-}

-

-//------------------------------------------------------------------------------

-void ExtensionBox_Impl::SetScrollHdl( const Link& rLink )

-{

-    if ( m_pScrollBar )

-        m_pScrollBar->SetScrollHdl( rLink );

-}

-

-// -----------------------------------------------------------------------

-void ExtensionBox_Impl::DoScroll( long nDelta )

-{

-    m_nTopIndex += nDelta;

-    Point aNewSBPt( m_pScrollBar->GetPosPixel() );

-

-    Rectangle aScrRect( Point(), GetOutputSizePixel() );

-    aScrRect.Right() -= m_pScrollBar->GetSizePixel().Width();

-    Scroll( 0, -nDelta, aScrRect );

-

-    m_pScrollBar->SetPosPixel( aNewSBPt );

-}

-

-// -----------------------------------------------------------------------

-IMPL_LINK( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar )

-{

-    DoScroll( pScrBar->GetDelta() );

-

-    return 1;

-}

-

-} //namespace dp_gui

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2009 by Sun Microsystems, Inc.
+ *
+ * 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_desktop.hxx"
+
+#include "svtools/controldims.hrc"
+
+#include "dp_gui.h"
+#include "dp_gui_extlistbox.hxx"
+#include "dp_gui_theextmgr.hxx"
+#include "dp_gui_dialog2.hxx"
+#include "dp_dependencies.hxx"
+
+#include "comphelper/processfactory.hxx"
+#include "com/sun/star/i18n/CollatorOptions.hpp"
+#include "com/sun/star/deployment/DependencyException.hpp"
+#include "com/sun/star/deployment/DeploymentException.hpp"
+
+
+#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
+
+using namespace ::com::sun::star;
+
+namespace dp_gui {
+
+//------------------------------------------------------------------------------
+//                          struct Entry_Impl
+//------------------------------------------------------------------------------
+Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
+                        const uno::Reference< deployment::XPackageManager > &xPackageManager,
+                        PackageState eState ) :
+    m_bActive( false ),
+    m_bLocked( false ),
+    m_bHasOptions( false ),
+    m_bShared( false ),
+    m_bNew( false ),
+    m_bChecked( false ),
+    m_bMissingDeps( false ),
+    m_eState( eState ),
+    m_pPublisher( NULL ),
+    m_xPackage( xPackage ),
+    m_xPackageManager( xPackageManager )
+{
+    m_sTitle = xPackage->getDisplayName();
+    m_sVersion = xPackage->getVersion();
+    m_sDescription = xPackage->getDescription();
+
+    beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
+    m_sPublisher = aInfo.First;
+    m_sPublisherURL = aInfo.Second;
+    
+    // get the icons for the package if there are any
+    uno::Reference< graphic::XGraphic > xGraphic = xPackage->getIcon( false );
+    if ( xGraphic.is() )
+        m_aIcon = Image( xGraphic );
+
+    xGraphic = xPackage->getIcon( true );
+    if ( xGraphic.is() )
+        m_aIconHC = Image( xGraphic );
+    else
+        m_aIconHC = m_aIcon;
+
+    m_bLocked = m_xPackageManager->isReadOnly();
+
+    if ( eState == AMBIGUOUS )
+        m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );
+    else if ( eState == NOT_REGISTERED )
+        checkDependencies();
+}
+
+//------------------------------------------------------------------------------
+Entry_Impl::~Entry_Impl()
+{}
+
+//------------------------------------------------------------------------------
+StringCompare Entry_Impl::CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const
+{
+    StringCompare eCompare = (StringCompare) pCollator->compareString( m_sTitle, pEntry->m_sTitle );
+    if ( eCompare == COMPARE_EQUAL )
+    {
+        eCompare = m_sVersion.CompareTo( pEntry->m_sVersion );
+        if ( eCompare == COMPARE_EQUAL )
+        {     
+            if ( m_xPackageManager != pEntry->m_xPackageManager )
+            {
+                sal_Int32 nCompare = m_xPackageManager->getContext().compareTo( pEntry->m_xPackageManager->getContext() );
+                if ( nCompare < 0 )
+                    eCompare = COMPARE_LESS;
+                else if ( nCompare > 0 )
+                    eCompare = COMPARE_GREATER;
+            }
+        }
+    }
+    return eCompare;
+}
+
+//------------------------------------------------------------------------------
+void Entry_Impl::checkDependencies()
+{
+    try {
+        m_xPackage->checkDependencies( uno::Reference< ucb::XCommandEnvironment >() );
+    }
+    catch ( deployment::DeploymentException &e )
+    {
+        deployment::DependencyException depExc;
+        if ( e.Cause >>= depExc )
+        {
+            rtl::OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) );
+            for ( sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i )
+            {
+                aMissingDep += OUSTR("\n");
+                aMissingDep += dp_misc::Dependencies::getErrorText( depExc.UnsatisfiedDependencies[i]);
+            }
+            aMissingDep += OUSTR("\n");
+            m_sErrorText = aMissingDep;
+            m_bMissingDeps = true;
+        }
+    }
+}
+//------------------------------------------------------------------------------
+// ExtensionRemovedListener
+//------------------------------------------------------------------------------
+void ExtensionRemovedListener::disposing( lang::EventObject const & rEvt )
+    throw ( uno::RuntimeException )
+{
+    uno::Reference< deployment::XPackage > xPackage( rEvt.Source, uno::UNO_QUERY );
+
+    if ( xPackage.is() )
+    {
+        m_pParent->removeEntry( xPackage );
+    }
+}
+
+//------------------------------------------------------------------------------
+ExtensionRemovedListener::~ExtensionRemovedListener()
+{
+}
+
+//------------------------------------------------------------------------------
+// ExtensionBox_Impl
+//------------------------------------------------------------------------------
+ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pManager ) :
+    IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),
+    m_bHasScrollBar( false ),
+    m_bHasActive( false ),
+    m_bNeedsRecalc( true ),
+    m_bHasNew( false ),
+    m_bInCheckMode( false ),
+    m_bAdjustActive( false ),
+    m_bInDelete( false ),
+    m_nActive( 0 ),
+    m_nTopIndex( 0 ),
+    m_nActiveHeight( 0 ),
+    m_nExtraHeight( 2 ),
+    m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),
+    m_aLockedImageHC( DialogHelper::getResId( RID_IMG_LOCKED_HC ) ),
+    m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),
+    m_aWarningImageHC( DialogHelper::getResId( RID_IMG_WARNING_HC ) ),
+    m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ),
+    m_aDefaultImageHC( DialogHelper::getResId( RID_IMG_EXTENSION_HC ) ),
+    m_pScrollBar( NULL ),
+    m_pManager( pManager )
+{
+    SetHelpId( HID_EXTENSION_MANAGER_LISTBOX );
+
+    m_pScrollBar = new ScrollBar( this, WB_VERT );
+    m_pScrollBar->SetScrollHdl( LINK( this, ExtensionBox_Impl, ScrollHdl ) );
+    m_pScrollBar->EnableDrag();
+
+    SetPaintTransparent( true );
+    SetPosPixel( Point( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ) );
+    long nIconHeight = 2*TOP_OFFSET + SMALL_ICON_SIZE;
+    long nTitleHeight = 2*TOP_OFFSET + GetTextHeight();
+    if ( nIconHeight < nTitleHeight )
+        m_nStdHeight = nTitleHeight;
+    else
+        m_nStdHeight = nIconHeight;
+    m_nStdHeight += GetTextHeight() + TOP_OFFSET;
+
+    nIconHeight = ICON_HEIGHT + 2*TOP_OFFSET + 1;
+    if ( m_nStdHeight < nIconHeight )
+        m_nStdHeight = nIconHeight;
+
+    m_nActiveHeight = m_nStdHeight;
+
+    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+    if( IsControlBackground() )
+        SetBackground( GetControlBackground() );
+    else
+        SetBackground( rStyleSettings.GetFieldColor() );
+
+    m_xRemoveListener = new ExtensionRemovedListener( this );
+
+    m_pLocale = new lang::Locale( Application::GetSettings().GetLocale() );
+    m_pCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );
+    m_pCollator->loadDefaultCollator( *m_pLocale, i18n::CollatorOptions::CollatorOptions_IGNORE_CASE );
+
+    Show();
+}
+
+//------------------------------------------------------------------------------
+ExtensionBox_Impl::~ExtensionBox_Impl()
+{
+    if ( ! m_bInDelete )
+        DeleteRemoved();
+
+    m_bInDelete = true;
+
+    typedef std::vector< TEntry_Impl >::iterator ITER;
+
+    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+    {
+        if ( (*iIndex)->m_pPublisher )
+        {
+            delete (*iIndex)->m_pPublisher;
+            (*iIndex)->m_pPublisher = NULL;
+        }
+        (*iIndex)->m_xPackage->removeEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );
+    }
+
+    m_vEntries.clear();
+
+    delete m_pScrollBar;
+
+    m_xRemoveListener.clear();
+
+    delete m_pLocale;
+    delete m_pCollator;
+}
+
+//------------------------------------------------------------------------------
+sal_Int32 ExtensionBox_Impl::getItemCount() const
+{
+    return static_cast< sal_Int32 >( m_vEntries.size() );
+}
+
+//------------------------------------------------------------------------------
+sal_Int32 ExtensionBox_Impl::getSelIndex() const
+{
+    if ( m_bHasActive )
+    {
+        OSL_ASSERT( m_nActive >= -1);
+        return static_cast< sal_Int32 >( m_nActive );
+    }
+    else
+        return static_cast< sal_Int32 >( EXTENSION_LISTBOX_ENTRY_NOTFOUND );
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const
+{
+    if ( nIndex < 0 )
+        throw lang::IllegalArgumentException( OUSTR("The list index starts with 0"),0, 0 );
+    if ( static_cast< sal_uInt32 >( nIndex ) >= m_vEntries.size())
+        throw lang::IllegalArgumentException( OUSTR("There is no element at the provided position."
+        "The position exceeds the number of available list entries"),0, 0 );
+}
+
+//------------------------------------------------------------------------------
+rtl::OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    return m_vEntries[ nIndex ]->m_sTitle;
+}
+
+//------------------------------------------------------------------------------
+rtl::OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    return m_vEntries[ nIndex ]->m_sVersion;
+}
+
+//------------------------------------------------------------------------------
+rtl::OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    return m_vEntries[ nIndex ]->m_sDescription;
+}
+
+//------------------------------------------------------------------------------
+rtl::OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    return m_vEntries[ nIndex ]->m_sPublisher;
+}
+
+//------------------------------------------------------------------------------
+rtl::OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    return m_vEntries[ nIndex ]->m_sPublisherURL;
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::select( sal_Int32 nIndex )
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    selectEntry( nIndex );   
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::select( const rtl::OUString & sName )
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    typedef ::std::vector< TEntry_Impl >::const_iterator It;
+
+    for ( It iIter = m_vEntries.begin(); iIter < m_vEntries.end(); iIter++ )
+    {
+        if ( sName.equals( (*iIter)->m_sTitle ) )
+        {
+            long nPos = iIter - m_vEntries.begin();
+            selectEntry( nPos );
+            break;
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+// Title + description
+void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+
+    // get title height
+    long aTextHeight;
+    long nIconHeight = 2*TOP_OFFSET + SMALL_ICON_SIZE;
+    long nTitleHeight = 2*TOP_OFFSET + GetTextHeight();
+    if ( nIconHeight < nTitleHeight )
+        aTextHeight = nTitleHeight;
+    else
+        aTextHeight = nIconHeight;
+
+    // calc description height
+    Size aSize = GetOutputSizePixel();
+    if ( m_bHasScrollBar )
+        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();
+
+    aSize.Width() -= ICON_OFFSET;
+    aSize.Height() = 10000;
+
+    rtl::OUString aText( m_vEntries[ nPos ]->m_sErrorText );
+    aText += m_vEntries[ nPos ]->m_sDescription;
+    
+    Rectangle aRect = GetTextRect( Rectangle( Point(), aSize ), aText,
+                                   TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
+    aTextHeight += aRect.GetHeight();
+
+    if ( aTextHeight < m_nStdHeight )
+        aTextHeight = m_nStdHeight;
+
+    m_nActiveHeight = aTextHeight + m_nExtraHeight;
+}
+
+//------------------------------------------------------------------------------
+const Size ExtensionBox_Impl::GetMinOutputSizePixel() const
+{
+    return Size( 200, 80 );
+}
+
+//------------------------------------------------------------------------------
+Rectangle ExtensionBox_Impl::GetEntryRect( const long nPos ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+
+    Size aSize( GetOutputSizePixel() );
+
+    if ( m_bHasScrollBar )
+        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();
+
+    if ( m_vEntries[ nPos ]->m_bActive )
+        aSize.Height() = m_nActiveHeight;
+    else
+        aSize.Height() = m_nStdHeight;
+
+    Point aPos( 0, -m_nTopIndex + nPos * m_nStdHeight );
+    if ( m_bHasActive && ( nPos < m_nActive ) )
+        aPos.Y() += m_nActiveHeight - m_nStdHeight;
+
+    return Rectangle( aPos, aSize );
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::DeleteRemoved()
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+
+    m_bInDelete = true;
+
+    if ( ! m_vRemovedEntries.empty() )
+    {
+        typedef std::vector< TEntry_Impl >::iterator ITER;
+
+        for ( ITER iIndex = m_vRemovedEntries.begin(); iIndex < m_vRemovedEntries.end(); ++iIndex )
+        {
+            if ( (*iIndex)->m_pPublisher )
+            {
+                delete (*iIndex)->m_pPublisher;
+                (*iIndex)->m_pPublisher = NULL;
+            }
+        }
+
+        m_vRemovedEntries.clear();
+    }
+
+    m_bInDelete = false;
+}
+
+//------------------------------------------------------------------------------
+//This function may be called with nPos < 0
+void ExtensionBox_Impl::selectEntry( const long nPos )
+{
+    //ToDo whe should not use the guard at such a big scope here.
+    //Currently it is used to gard m_vEntries and m_nActive. m_nActive will be 
+    //modified in this function.
+    //It would be probably best to always use a copy of m_vEntries
+    //and some other state variables from ExtensionBox_Impl for 
+    //the whole painting operation. See issue i86993
+    ::osl::ClearableMutexGuard guard(m_entriesMutex);
+
+    if ( m_bInCheckMode )
+        return;
+
+    if ( m_bHasActive )
+    {
+        if ( nPos == m_nActive )
+            return;
+
+        m_bHasActive = false;
+        m_vEntries[ m_nActive ]->m_bActive = false;
+    }
+
+    if ( ( nPos >= 0 ) && ( nPos < (long) m_vEntries.size() ) )
+    {
+        m_bHasActive = true;
+        m_nActive = nPos;
+        m_vEntries[ nPos ]->m_bActive = true;
+
+        if ( IsReallyVisible() )
+        {
+            m_bNeedsRecalc = true;
+            m_bAdjustActive = true;
+        }
+    }
+
+    if ( IsReallyVisible() )
+        Invalidate();
+
+    guard.clear();
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry )
+{
+    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+
+    if ( pEntry->m_bActive )
+        SetTextColor( rStyleSettings.GetHighlightTextColor() );
+    else if ( ( pEntry->m_eState != REGISTERED ) && ( pEntry->m_eState != NOT_AVAILABLE ) )
+        SetTextColor( rStyleSettings.GetDisableColor() );
+    else if ( IsControlForeground() )
+        SetTextColor( GetControlForeground() );
+    else
+        SetTextColor( rStyleSettings.GetFieldTextColor() );
+
+    if ( pEntry->m_bActive )
+    {
+        SetLineColor();
+        SetFillColor( rStyleSettings.GetHighlightColor() );
+        DrawRect( rRect );
+    }
+    else
+    {
+        if( IsControlBackground() )
+            SetBackground( GetControlBackground() );
+        else
+            SetBackground( rStyleSettings.GetFieldColor() );
+
+        SetTextFillColor();
+        Erase( rRect );
+    }
+
+    // Draw extension icon
+    Point aPos( rRect.TopLeft() );
+    aPos += Point( TOP_OFFSET, TOP_OFFSET );
+    Image aImage;
+    if ( ! pEntry->m_aIcon )
+        aImage = isHCMode() ? m_aDefaultImageHC : m_aDefaultImage;
+    else
+        aImage = isHCMode() ? pEntry->m_aIconHC : pEntry->m_aIcon;
+    Size aImageSize = aImage.GetSizePixel();
+    if ( ( aImageSize.Width() <= ICON_WIDTH ) && ( aImageSize.Height() <= ICON_HEIGHT ) )
+        DrawImage( Point( aPos.X()+((ICON_WIDTH-aImageSize.Width())/2), aPos.Y()+((ICON_HEIGHT-aImageSize.Height())/2) ), aImage );
+    else
+        DrawImage( aPos, Size( ICON_WIDTH, ICON_HEIGHT ), aImage );
+
+    // Setup fonts
+    Font aStdFont( GetFont() );
+    Font aBoldFont( aStdFont );
+    aBoldFont.SetWeight( WEIGHT_BOLD );
+    SetFont( aBoldFont );
+    long aTextHeight = GetTextHeight();
+
+    // Init publisher link here
+    if ( !pEntry->m_pPublisher && pEntry->m_sPublisher.Len() )
+    {
+        pEntry->m_pPublisher = new svt::FixedHyperlink( this );
+        pEntry->m_pPublisher->SetBackground();
+        pEntry->m_pPublisher->SetPaintTransparent( true );
+        pEntry->m_pPublisher->SetURL( pEntry->m_sPublisherURL );
+        pEntry->m_pPublisher->SetDescription( pEntry->m_sPublisher );
+        Size aSize = FixedText::CalcMinimumTextSize( pEntry->m_pPublisher );
+        pEntry->m_pPublisher->SetSizePixel( aSize );
+
+        if ( m_aClickHdl.IsSet() )
+            pEntry->m_pPublisher->SetClickHdl( m_aClickHdl );
+    }
+
+    // Get max title width
+    long nMaxTitleWidth = rRect.GetWidth() - ICON_OFFSET;
+    nMaxTitleWidth -= ( 2 * SMALL_ICON_SIZE ) + ( 4 * SPACE_BETWEEN );
+    if ( pEntry->m_pPublisher )
+    {
+        nMaxTitleWidth -= pEntry->m_pPublisher->GetSizePixel().Width() + (2*SPACE_BETWEEN);
+    }
+
+    long aVersionWidth = GetTextWidth( pEntry->m_sVersion );
+    long aTitleWidth = GetTextWidth( pEntry->m_sTitle ) + (aTextHeight / 3);
+
+    aPos = rRect.TopLeft() + Point( ICON_OFFSET, TOP_OFFSET );
+
+    if ( aTitleWidth > nMaxTitleWidth - aVersionWidth )
+    {
+        aTitleWidth = nMaxTitleWidth - aVersionWidth - (aTextHeight / 3);
+        String aShortTitle = GetEllipsisString( pEntry->m_sTitle, aTitleWidth );
+        DrawText( aPos, aShortTitle );
+        aTitleWidth += (aTextHeight / 3);
+    }
+    else
+        DrawText( aPos, pEntry->m_sTitle );
+
+    SetFont( aStdFont );
+    DrawText( Point( aPos.X() + aTitleWidth, aPos.Y() ), pEntry->m_sVersion );
+
+    long nIconHeight = TOP_OFFSET + SMALL_ICON_SIZE;
+    long nTitleHeight = TOP_OFFSET + GetTextHeight();
+    if ( nIconHeight < nTitleHeight )
+        aTextHeight = nTitleHeight;
+    else
+        aTextHeight = nIconHeight;
+
+    // draw description
+    String sDescription;
+    if ( pEntry->m_sErrorText.Len() )
+    {
+        if ( pEntry->m_bActive )
+            sDescription = pEntry->m_sErrorText + OUSTR("\n") + pEntry->m_sDescription;
+        else
+            sDescription = pEntry->m_sErrorText;
+    }
+    else
+        sDescription = pEntry->m_sDescription;
+
+    aPos.Y() += aTextHeight;
+    if ( pEntry->m_bActive )
+    {
+        DrawText( Rectangle( aPos.X(), aPos.Y(), rRect.Right(), rRect.Bottom() - m_nExtraHeight ),
+                  sDescription, TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
+    }
+    else
+    {
+        const long nWidth = GetTextWidth( sDescription );
+        if ( nWidth > rRect.GetWidth() - aPos.X() )
+            sDescription = GetEllipsisString( sDescription, rRect.GetWidth() - aPos.X() );
+        DrawText( aPos, sDescription );
+    }
+
+    // Draw publisher link
+    if ( pEntry->m_pPublisher )
+    {
+        pEntry->m_pPublisher->Show();
+        aPos = rRect.TopLeft() + Point( ICON_OFFSET + nMaxTitleWidth + (2*SPACE_BETWEEN), TOP_OFFSET );
+        pEntry->m_pPublisher->SetPosPixel( aPos );
+    }
+
+    // Draw status icons
+    if ( pEntry->m_bShared )
+    {
+        aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SMALL_ICON_SIZE), TOP_OFFSET );
+        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aLockedImageHC : m_aLockedImage );
+    }
+    if ( ( pEntry->m_eState == AMBIGUOUS ) || pEntry->m_bMissingDeps )
+    {
+        aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SPACE_BETWEEN + 2*SMALL_ICON_SIZE), TOP_OFFSET );
+        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aWarningImageHC : m_aWarningImage );
+    }
+    
+    SetLineColor( Color( COL_LIGHTGRAY ) );
+    DrawLine( rRect.BottomLeft(), rRect.BottomRight() );
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::RecalcAll()
+{
+    if ( m_bHasActive )
+        CalcActiveHeight( m_nActive );
+
+    SetupScrollBar();
+
+    if ( m_bHasActive )
+    {
+        Rectangle aEntryRect = GetEntryRect( m_nActive );
+
+        if ( m_bAdjustActive )
+        {
+            m_bAdjustActive = false;
+
+            // If the top of the selected entry isn't visible, make it visible
+            if ( aEntryRect.Top() < 0 )
+            {
+                m_nTopIndex += aEntryRect.Top();
+                aEntryRect.Move( 0, -aEntryRect.Top() );
+            }
+
+            // If the bottom of the selected entry isn't visible, make it visible even if now the top
+            // isn't visible any longer ( the buttons are more important )
+            Size aOutputSize = GetOutputSizePixel();
+            if ( aEntryRect.Bottom() > aOutputSize.Height() )
+            {
+                m_nTopIndex += ( aEntryRect.Bottom() - aOutputSize.Height() );
+                aEntryRect.Move( 0, -( aEntryRect.Bottom() - aOutputSize.Height() ) );
+            }
+
+            // If there is unused space below the last entry but all entries don't fit into the box,
+            // move the content down to use the whole space
+            const long nTotalHeight = GetTotalHeight();
+            if ( m_bHasScrollBar && ( aOutputSize.Height() + m_nTopIndex > nTotalHeight ) )
+            {
+                long nOffset = m_nTopIndex;
+                m_nTopIndex = nTotalHeight - aOutputSize.Height();
+                nOffset -= m_nTopIndex;
+                aEntryRect.Move( 0, nOffset );
+            }
+
+            if ( m_bHasScrollBar )
+                m_pScrollBar->SetThumbPos( m_nTopIndex );
+        }
+    }
+
+    m_bNeedsRecalc = false;
+}
+
+// -----------------------------------------------------------------------
+bool ExtensionBox_Impl::HandleTabKey( bool )
+{
+    return false;
+}
+
+// -----------------------------------------------------------------------
+bool ExtensionBox_Impl::HandleCursorKey( USHORT nKeyCode )
+{
+    if ( m_vEntries.empty() )
+        return true;
+
+    long nSelect = 0;
+
+    if ( m_bHasActive )
+    {
+        long nPageSize = GetOutputSizePixel().Height() / m_nStdHeight;
+        if ( nPageSize < 2 )
+            nPageSize = 2;
+
+        if ( ( nKeyCode == KEY_DOWN ) || ( nKeyCode == KEY_RIGHT ) )
+            nSelect = m_nActive + 1;
+        else if ( ( nKeyCode == KEY_UP ) || ( nKeyCode == KEY_LEFT ) )
+            nSelect = m_nActive - 1;
+        else if ( nKeyCode == KEY_HOME )
+            nSelect = 0;
+        else if ( nKeyCode == KEY_END )
+            nSelect = m_vEntries.size() - 1;
+        else if ( nKeyCode == KEY_PAGEUP )
+            nSelect = m_nActive - nPageSize + 1;
+        else if ( nKeyCode == KEY_PAGEDOWN )
+            nSelect = m_nActive + nPageSize - 1;
+    }
+    else // when there is no selected entry, we will select the first or the last.
+    {
+        if ( ( nKeyCode == KEY_DOWN ) || ( nKeyCode == KEY_PAGEDOWN ) || ( nKeyCode == KEY_HOME ) )
+            nSelect = 0;
+        else if ( ( nKeyCode == KEY_UP ) || ( nKeyCode == KEY_PAGEUP ) || ( nKeyCode == KEY_END ) )
+            nSelect = m_vEntries.size() - 1;
+    }
+
+    if ( nSelect < 0 )
+        nSelect = 0;
+    if ( nSelect >= (long) m_vEntries.size() )
+        nSelect = m_vEntries.size() - 1;
+
+    selectEntry( nSelect );
+
+    return true;
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::Paint( const Rectangle &/*rPaintRect*/ )
+{
+    if ( !m_bInDelete )
+        DeleteRemoved();
+
+    if ( m_bNeedsRecalc )
+        RecalcAll();
+
+    Point aStart( 0, -m_nTopIndex );
+    Size aSize( GetOutputSizePixel() );
+
+    if ( m_bHasScrollBar )
+        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();
+
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+
+    typedef std::vector< TEntry_Impl >::iterator ITER;
+    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+    {
+        aSize.Height() = (*iIndex)->m_bActive ? m_nActiveHeight : m_nStdHeight;
+        Rectangle aEntryRect( aStart, aSize );
+        DrawRow( aEntryRect, *iIndex );
+        aStart.Y() += aSize.Height();
+    }
+}
+
+// -----------------------------------------------------------------------
+long ExtensionBox_Impl::GetTotalHeight() const
+{
+    long nHeight = m_vEntries.size() * m_nStdHeight;
+
+    if ( m_bHasActive )
+    {
+        nHeight += m_nActiveHeight - m_nStdHeight;
+    }
+
+    return nHeight;
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::SetupScrollBar()
+{
+    const Size aSize = GetOutputSizePixel();
+    const long nScrBarSize = GetSettings().GetStyleSettings().GetScrollBarSize();
+    const long nTotalHeight = GetTotalHeight();
+    const bool bNeedsScrollBar = ( nTotalHeight > aSize.Height() );
+
+    if ( bNeedsScrollBar )
+    {
+        if ( m_nTopIndex + aSize.Height() > nTotalHeight )
+            m_nTopIndex = nTotalHeight - aSize.Height();
+
+        m_pScrollBar->SetPosSizePixel( Point( aSize.Width() - nScrBarSize, 0 ),
+                                       Size( nScrBarSize, aSize.Height() ) );
+        m_pScrollBar->SetRangeMax( nTotalHeight );
+        m_pScrollBar->SetVisibleSize( aSize.Height() );
+        m_pScrollBar->SetPageSize( ( aSize.Height() * 4 ) / 5 );
+        m_pScrollBar->SetLineSize( m_nStdHeight );
+        m_pScrollBar->SetThumbPos( m_nTopIndex );
+
+        if ( !m_bHasScrollBar )
+            m_pScrollBar->Show();
+    }
+    else if ( m_bHasScrollBar )
+    {
+        m_pScrollBar->Hide();
+        m_nTopIndex = 0;
+    }
+
+    m_bHasScrollBar = bNeedsScrollBar;
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::Resize()
+{
+    RecalcAll();
+}
+
+//------------------------------------------------------------------------------
+long ExtensionBox_Impl::PointToPos( const Point& rPos )
+{
+    long nPos = ( rPos.Y() + m_nTopIndex ) / m_nStdHeight;
+
+    if ( m_bHasActive && ( nPos > m_nActive ) )
+    {
+        if ( rPos.Y() + m_nTopIndex <= m_nActive*m_nStdHeight + m_nActiveHeight )
+            nPos = m_nActive;
+        else
+            nPos = ( rPos.Y() + m_nTopIndex - (m_nActiveHeight - m_nStdHeight) ) / m_nStdHeight;
+    }
+
+    return nPos;
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
+{
+    long nPos = PointToPos( rMEvt.GetPosPixel() );
+
+    if ( rMEvt.IsLeft() )
+    {
+        if ( rMEvt.IsMod1() && m_bHasActive )
+            selectEntry( m_vEntries.size() );   // Selecting an not existing entry will deselect the current one
+        else
+            selectEntry( nPos );
+    }
+}
+
+//------------------------------------------------------------------------------
+long ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )
+{
+    if ( !m_bInDelete )
+        DeleteRemoved();
+
+    bool bHandled = false;
+
+    if ( rNEvt.GetType() == EVENT_KEYINPUT )
+    {
+        const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
+        KeyCode         aKeyCode = pKEvt->GetKeyCode();
+        USHORT          nKeyCode = aKeyCode.GetCode();
+
+        if ( nKeyCode == KEY_TAB )
+            bHandled = HandleTabKey( aKeyCode.IsShift() );
+        else if ( aKeyCode.GetGroup() == KEYGROUP_CURSOR )
+            bHandled = HandleCursorKey( nKeyCode );
+    }
+
+    if ( rNEvt.GetType() == EVENT_COMMAND )
+    {
+        if ( m_bHasScrollBar &&
+             ( rNEvt.GetCommandEvent()->GetCommand() == COMMAND_WHEEL ) )
+        {
+            const CommandWheelData* pData = rNEvt.GetCommandEvent()->GetWheelData();
+            if ( pData->GetMode() == COMMAND_WHEEL_SCROLL )
+            {
+                long nThumbPos = m_pScrollBar->GetThumbPos();
+                if ( pData->GetDelta() < 0 )
+                    m_pScrollBar->DoScroll( nThumbPos + m_nStdHeight );
+                else
+                    m_pScrollBar->DoScroll( nThumbPos - m_nStdHeight );
+                bHandled = true;
+            }
+        }
+    }
+
+    if ( !bHandled )
+        return Control::Notify( rNEvt );
+    else
+        return true;
+}
+
+//------------------------------------------------------------------------------
+bool ExtensionBox_Impl::FindEntryPos( const TEntry_Impl pEntry, const long nStart,
+                                      const long nEnd, long &nPos )
+{
+    nPos = nStart;
+    if ( nStart > nEnd )
+        return false;
+
+    StringCompare eCompare;
+
+    if ( nStart == nEnd )
+    {
+        eCompare = pEntry->CompareTo( m_pCollator, m_vEntries[ nStart ] );
+        if ( eCompare == COMPARE_LESS )
+            return false;
+        else if ( eCompare == COMPARE_EQUAL )
+        {
+            //Workaround. See i86963.
+            if (pEntry->m_xPackage != m_vEntries[nStart]->m_xPackage)
+                return false;
+
+            if ( m_bInCheckMode )
+                m_vEntries[ nStart ]->m_bChecked = true;
+            return true;
+        }
+        else
+        {
+            nPos = nStart + 1;
+            return false;
+        }
+    }
+
+    const long nMid = nStart + ( ( nEnd - nStart ) / 2 );
+    eCompare = pEntry->CompareTo( m_pCollator, m_vEntries[ nMid ] );
+
+    if ( eCompare == COMPARE_LESS )
+        return FindEntryPos( pEntry, nStart, nMid-1, nPos );
+    else if ( eCompare == COMPARE_GREATER )
+        return FindEntryPos( pEntry, nMid+1, nEnd, nPos );
+    else
+    {
+        //Workaround.See i86963.
+        if (pEntry->m_xPackage != m_vEntries[nMid]->m_xPackage)
+            return false;
+
+        if ( m_bInCheckMode )
+            m_vEntries[ nMid ]->m_bChecked = true;
+        nPos = nMid;
+        return true;
+    }
+}
+
+//------------------------------------------------------------------------------
+long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &xPackage,
+                                  const uno::Reference< deployment::XPackageManager > &xPackageManager )
+{
+    long nPos = 0;
+    PackageState eState = m_pManager->getPackageState( xPackage );
+
+    TEntry_Impl pEntry( new Entry_Impl( xPackage, xPackageManager, eState ) );
+    xPackage->addEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );
+
+    ::osl::ClearableMutexGuard guard(m_entriesMutex);
+    if ( m_vEntries.empty() )
+    {
+        pEntry->m_bHasOptions = m_pManager->supportsOptions( xPackage );
+        pEntry->m_bShared     = ( m_pManager->getSharedPkgMgr() == xPackageManager );
+        pEntry->m_bNew        = m_bInCheckMode;
+        m_vEntries.push_back( pEntry );
+    }
+    else
+    {
+        if ( !FindEntryPos( pEntry, 0, m_vEntries.size()-1, nPos ) )
+        {
+            pEntry->m_bHasOptions = m_pManager->supportsOptions( xPackage );
+            pEntry->m_bShared     = ( m_pManager->getSharedPkgMgr() == xPackageManager );
+            pEntry->m_bNew        = m_bInCheckMode;
+            m_vEntries.insert( m_vEntries.begin()+nPos, pEntry );
+        }
+        else if ( !m_bInCheckMode )
+        {
+            OSL_ENSURE( 0, "ExtensionBox_Impl::addEntry(): Will not add duplicate entries"  );
+        }
+    }
+    //access to m_nActive must be guarded
+    if ( !m_bInCheckMode && m_bHasActive && ( m_nActive >= nPos ) )
+        m_nActive += 1;
+
+    guard.clear();
+
+    if ( IsReallyVisible() )
+        Invalidate();
+
+    m_bNeedsRecalc = true;
+
+    return nPos;
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage > &xPackage )
+{
+    typedef std::vector< TEntry_Impl >::iterator ITER;
+    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+    {
+        if ( (*iIndex)->m_xPackage == xPackage )
+        {
+            PackageState eState = m_pManager->getPackageState( xPackage );
+            (*iIndex)->m_bHasOptions = m_pManager->supportsOptions( xPackage );
+            (*iIndex)->m_eState = eState;
+            (*iIndex)->m_sTitle = xPackage->getDisplayName();
+            (*iIndex)->m_sVersion = xPackage->getVersion();
+            (*iIndex)->m_sDescription = xPackage->getDescription();
+
+            if ( eState == AMBIGUOUS )
+                (*iIndex)->m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );
+            else
+                (*iIndex)->m_sErrorText = String();
+
+            if ( IsReallyVisible() )
+                Invalidate();
+            break;
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage > &xPackage )
+{
+    if ( ! m_bInDelete )
+    {
+        ::osl::ClearableMutexGuard aGuard( m_entriesMutex );
+
+        typedef std::vector< TEntry_Impl >::iterator ITER;
+
+        for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+        {
+            if ( (*iIndex)->m_xPackage == xPackage )
+            {
+                long nPos = iIndex - m_vEntries.begin();
+
+                // Entries mustn't removed here, because they contain a hyperlink control
+                // which can only be deleted when the thread has the solar mutex. Therefor 
+                // the entry will be moved into the m_vRemovedEntries list which will be
+                // cleared on the next paint event
+                m_vRemovedEntries.push_back( *iIndex );
+                m_vEntries.erase( iIndex );
+
+                m_bNeedsRecalc = true;
+
+                if ( IsReallyVisible() )
+                    Invalidate();
+
+                if ( m_bHasActive )
+                {
+                    if ( nPos < m_nActive )
+                        m_nActive -= 1;
+                    else if ( ( nPos == m_nActive ) &&
+                              ( nPos == (long) m_vEntries.size() ) )
+                        m_nActive -= 1;
+
+                    m_bHasActive = false;
+                    //clear before calling out of this method
+                    aGuard.clear();
+                    selectEntry( m_nActive );
+                }
+                break;
+            }
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::RemoveUnlocked()
+{
+    bool bAllRemoved = false;
+
+    while ( ! bAllRemoved )
+    {
+        bAllRemoved = true;
+
+        ::osl::ClearableMutexGuard aGuard( m_entriesMutex );
+
+        typedef std::vector< TEntry_Impl >::iterator ITER;
+
+        for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+        {
+            if ( !(*iIndex)->m_bLocked )
+            {
+                bAllRemoved = false;
+                uno::Reference< deployment::XPackage> xPackage = (*iIndex)->m_xPackage;
+                aGuard.clear();
+                removeEntry( xPackage );
+                break;
+            }
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::prepareChecking( const uno::Reference< deployment::XPackageManager > &xPackageMgr )
+{
+    m_bInCheckMode = true;
+    typedef std::vector< TEntry_Impl >::iterator ITER;
+    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+    {
+        if ( (*iIndex)->m_xPackageManager == xPackageMgr )
+            (*iIndex)->m_bChecked = false;
+        else
+            (*iIndex)->m_bChecked = true;
+        (*iIndex)->m_bNew = false;
+    }
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::checkEntries()
+{
+    long nNewPos = -1;
+    long nPos = 0;
+    bool bNeedsUpdate = false;
+    
+    ::osl::ClearableMutexGuard guard(m_entriesMutex);
+    typedef std::vector< TEntry_Impl >::iterator ITER;
+    ITER iIndex = m_vEntries.begin();
+    while ( iIndex < m_vEntries.end() )
+    {
+        if ( (*iIndex)->m_bChecked == false )
+        {
+            bNeedsUpdate = true;
+            nPos = iIndex-m_vEntries.begin();
+            if ( (*iIndex)->m_bNew )
+            {
+                if ( nNewPos == - 1)
+                    nNewPos = nPos;
+                if ( nPos <= m_nActive )
+                    m_nActive += 1;
+            }
+        }
+        iIndex++;
+    }
+    guard.clear();
+
+    m_bInCheckMode = false;
+
+    if ( nNewPos != - 1)
+        selectEntry( nNewPos );
+
+    if ( bNeedsUpdate )
+    {
+        m_bNeedsRecalc = true;
+        if ( IsReallyVisible() )
+            Invalidate();
+    }
+}
+//------------------------------------------------------------------------------
+bool ExtensionBox_Impl::isHCMode()
+{
+    return (bool)GetDisplayBackground().GetColor().IsDark();
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::SetScrollHdl( const Link& rLink )
+{
+    if ( m_pScrollBar )
+        m_pScrollBar->SetScrollHdl( rLink );
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::DoScroll( long nDelta )
+{
+    m_nTopIndex += nDelta;
+    Point aNewSBPt( m_pScrollBar->GetPosPixel() );
+
+    Rectangle aScrRect( Point(), GetOutputSizePixel() );
+    aScrRect.Right() -= m_pScrollBar->GetSizePixel().Width();
+    Scroll( 0, -nDelta, aScrRect );
+
+    m_pScrollBar->SetPosPixel( aNewSBPt );
+}
+
+// -----------------------------------------------------------------------
+IMPL_LINK( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar )
+{
+    DoScroll( pScrBar->GetDelta() );
+
+    return 1;
+}
+
+} //namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index e1a17bb06d..6ae6a5f6b8 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -1,271 +1,272 @@
-/*************************************************************************

- *

- * 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: dp_gui_dialog2.cxx,v $

- *

- * $Revision: 1.8.4.8 $

- *

- * 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 "rtl/ustring.hxx"

-#include "vcl/scrbar.hxx"

-#include "vcl/fixed.hxx"

-#include "vcl/dialog.hxx"

-

-#include "svtools/extensionlistbox.hxx"

-#include "svtools/fixedhyper.hxx"

-#include "cppuhelper/implbase1.hxx"

-#include "unotools/collatorwrapper.hxx"

-

-#include "com/sun/star/lang/Locale.hpp"

-#include "com/sun/star/lang/XEventListener.hpp"

-#include "com/sun/star/deployment/XPackage.hpp"

-#include "com/sun/star/deployment/XPackageManager.hpp"

-

-#include <boost/shared_ptr.hpp>

-

-namespace dp_gui {

-

-#define SMALL_ICON_SIZE     16

-#define TOP_OFFSET           3

-#define ICON_HEIGHT         42

-#define ICON_OFFSET         50

-#define RIGHT_ICON_OFFSET    5

-#define SPACE_BETWEEN        3

-

-class TheExtensionManager;

-

-typedef ::boost::shared_ptr< svt::FixedHyperlink > TFixedHyperlink;

-

-//------------------------------------------------------------------------------

-//                          struct Entry_Impl

-//------------------------------------------------------------------------------

-struct Entry_Impl;

-

-typedef ::boost::shared_ptr< Entry_Impl > TEntry_Impl;

-

-struct Entry_Impl

-{

-    bool            m_bActive;

-    bool            m_bLocked;

-    bool            m_bHasOptions;

-    bool            m_bShared;

-    bool            m_bNew;

-    bool            m_bChecked;

-    bool            m_bMissingDeps;

-    PackageState    m_eState;

-    String          m_sTitle;

-    String          m_sVersion;

-    String          m_sDescription;

-    String          m_sPublisher;

-    String          m_sPublisherURL;

-    String          m_sErrorText;

-    Image           m_aIcon;

-    Image           m_aIconHC;

-    svt::FixedHyperlink *m_pPublisher;

-

-    ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> m_xPackage;

-    ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager> m_xPackageManager;

-

-    Entry_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage,

-                const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageManager,

-                PackageState eState );

-   ~Entry_Impl();

-

-    StringCompare CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const;

-    void          checkDependencies();

-};

-

-//------------------------------------------------------------------------------

-//                          class ExtensionBox_Impl

-//------------------------------------------------------------------------------

-

-class ExtensionBox_Impl;

-

-//------------------------------------------------------------------------------

-class ExtensionRemovedListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >

-{

-    ExtensionBox_Impl   *m_pParent;

-

-public:

-

-    ExtensionRemovedListener( ExtensionBox_Impl *pParent ) { m_pParent = pParent; }

-   ~ExtensionRemovedListener();

-

-    //===================================================================================

-    // XEventListener

-    virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt )

-        throw (::com::sun::star::uno::RuntimeException);

-};

-

-//------------------------------------------------------------------------------

-class ExtensionBox_Impl : public ::svt::IExtensionListBox

-{

-    bool            m_bHasScrollBar;

-    bool            m_bHasActive;

-    bool            m_bNeedsRecalc;

-    bool            m_bHasNew;

-    bool            m_bInCheckMode;

-    bool            m_bAdjustActive;

-    bool            m_bInDelete;

-    //Must be guarded together with m_vEntries to ensure a valid index at all times.

-    //Use m_entriesMutex as guard.

-    long            m_nActive;

-    long            m_nTopIndex;

-    long            m_nStdHeight;

-    long            m_nActiveHeight;

-    long            m_nExtraHeight;

-    Size            m_aOutputSize;

-    Image           m_aLockedImage;

-    Image           m_aLockedImageHC;

-    Image           m_aWarningImage;

-    Image           m_aWarningImageHC;

-    Image           m_aDefaultImage;

-    Image           m_aDefaultImageHC;

-    Link            m_aClickHdl;

-    

-    ScrollBar      *m_pScrollBar;

-

-    com::sun::star::uno::Reference< ExtensionRemovedListener > m_xRemoveListener;

-

-    TheExtensionManager      *m_pManager;

-    //This mutex is used for synchronizing access to m_vEntries.

-    //Currently it is used to synchronize adding, removing entries and 

-    //functions like getItemName, getItemDescription, etc. to prevent

-    //that m_vEntries is accessed at an invalid index.

-    //ToDo: There are many more places where m_vEntries is read and which may

-    //fail. For example the Paint method is probable called from the main thread

-    //while new entries are added / removed in a separate thread.

-    mutable ::osl::Mutex    m_entriesMutex;

-    std::vector< TEntry_Impl > m_vEntries;

-    std::vector< TEntry_Impl > m_vRemovedEntries;

-

-    ::com::sun::star::lang::Locale    *m_pLocale;

-    CollatorWrapper *m_pCollator;

-

-    void            CalcActiveHeight( const long nPos );

-    long            GetTotalHeight() const;

-    void            SetupScrollBar();

-    void            DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry );

-    bool            HandleTabKey( bool bReverse );

-    bool            HandleCursorKey( USHORT nKeyCode );

-    bool            FindEntryPos( const TEntry_Impl pEntry, long nStart, long nEnd, long &nFound );

-    bool            isHCMode();

-    void            DeleteRemoved();

-

-    //-----------------

-    DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * );

-

-    //Index starts with 1.

-    //Throws an com::sun::star::lang::IllegalArgumentException, when the index is invalid.

-    void checkIndex(sal_Int32 pos) const;

-

-

-public:

-                    ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pManager );

-                   ~ExtensionBox_Impl();

-

-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );

-    virtual void    Paint( const Rectangle &rPaintRect );

-    virtual void    Resize();

-    virtual long    Notify( NotifyEvent& rNEvt );

-

-    const Size      GetMinOutputSizePixel() const;

-    void            SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }

-    TEntry_Impl     GetEntryData( long nPos ) { return m_vEntries[ nPos ]; } 

-    long            GetEntryCount() { return (long) m_vEntries.size(); }

-    Rectangle       GetEntryRect( const long nPos ) const;

-    bool            HasActive() { return m_bHasActive; }

-    long            PointToPos( const Point& rPos );

-    void            SetScrollHdl( const Link& rLink );

-    void            DoScroll( long nDelta );

-    void            SetHyperlinkHdl( const Link& rLink ){ m_aClickHdl = rLink; }

-    virtual void    RecalcAll();

-    void            RemoveUnlocked();

-

-    //-----------------

-    virtual void    selectEntry( const long nPos );

-    long            addEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage,

-                              const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageManager );

-    void            updateEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );

-    void            removeEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );

-

-    void            prepareChecking( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageMgr );

-    void            checkEntries();

-

-    TheExtensionManager*    getExtensionManager() const { return m_pManager; }

-

-    //===================================================================================

-    //These functions are used for automatic testing

-

-    /** @return  The count of the entries in the list box. */

-    virtual sal_Int32 getItemCount() const;

-

-    /** @return  The index of the first selected entry in the list box.

-        When nothing is selected, which is the case when getItemCount returns '0',

-        then this function returns EXTENSION_LISTBOX_ENTRY_NOTFOUND */

-    virtual sal_Int32 getSelIndex() const;

-

-    /** @return  The item name of the entry with the given index

-        The index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual ::rtl::OUString getItemName( sal_Int32 index ) const;

-

-    /** @return  The version string of the entry with the given index

-        The index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual ::rtl::OUString getItemVersion( sal_Int32 index ) const;

-

-    /** @return  The description string of the entry with the given index

-        The index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual ::rtl::OUString getItemDescription( sal_Int32 index ) const;

-

-    /** @return  The publisher string of the entry with the given index

-        The index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual ::rtl::OUString getItemPublisher( sal_Int32 index ) const;

-

-    /** @return  The link behind the publisher text of the entry with the given index

-        The index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual ::rtl::OUString getItemPublisherLink( sal_Int32 index ) const;

-

-    /** The entry at the given position will be selected

-        Index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual void select( sal_Int32 pos );

-

-    /** The first found entry with the given name will be selected

-        When there was no entry found with the name, the selection doesn't change.

-        Please note that there might be more than one entry with the same

-        name, because:

-            1. the name is not unique

-            2. one extension can be installed as user and shared extension.

-    */

-    virtual void select( const ::rtl::OUString & sName );

-};

-

-}

+/*************************************************************************
+ *
+ * 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: dp_gui_dialog2.cxx,v $
+ *
+ * $Revision: 1.8.4.8 $
+ *
+ * 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 "rtl/ustring.hxx"
+#include "vcl/scrbar.hxx"
+#include "vcl/fixed.hxx"
+#include "vcl/dialog.hxx"
+
+#include "svtools/extensionlistbox.hxx"
+#include "svtools/fixedhyper.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "unotools/collatorwrapper.hxx"
+
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/XEventListener.hpp"
+#include "com/sun/star/deployment/XPackage.hpp"
+#include "com/sun/star/deployment/XPackageManager.hpp"
+
+#include <boost/shared_ptr.hpp>
+
+namespace dp_gui {
+
+#define SMALL_ICON_SIZE     16
+#define TOP_OFFSET           5
+#define ICON_HEIGHT         42
+#define ICON_WIDTH          47
+#define ICON_OFFSET         72
+#define RIGHT_ICON_OFFSET    5
+#define SPACE_BETWEEN        3
+
+class TheExtensionManager;
+
+typedef ::boost::shared_ptr< svt::FixedHyperlink > TFixedHyperlink;
+
+//------------------------------------------------------------------------------
+//                          struct Entry_Impl
+//------------------------------------------------------------------------------
+struct Entry_Impl;
+
+typedef ::boost::shared_ptr< Entry_Impl > TEntry_Impl;
+
+struct Entry_Impl
+{
+    bool            m_bActive;
+    bool            m_bLocked;
+    bool            m_bHasOptions;
+    bool            m_bShared;
+    bool            m_bNew;
+    bool            m_bChecked;
+    bool            m_bMissingDeps;
+    PackageState    m_eState;
+    String          m_sTitle;
+    String          m_sVersion;
+    String          m_sDescription;
+    String          m_sPublisher;
+    String          m_sPublisherURL;
+    String          m_sErrorText;
+    Image           m_aIcon;
+    Image           m_aIconHC;
+    svt::FixedHyperlink *m_pPublisher;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> m_xPackage;
+    ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager> m_xPackageManager;
+
+    Entry_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageManager,
+                PackageState eState );
+   ~Entry_Impl();
+
+    StringCompare CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const;
+    void          checkDependencies();
+};
+
+//------------------------------------------------------------------------------
+//                          class ExtensionBox_Impl
+//------------------------------------------------------------------------------
+
+class ExtensionBox_Impl;
+
+//------------------------------------------------------------------------------
+class ExtensionRemovedListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >
+{
+    ExtensionBox_Impl   *m_pParent;
+
+public:
+
+    ExtensionRemovedListener( ExtensionBox_Impl *pParent ) { m_pParent = pParent; }
+   ~ExtensionRemovedListener();
+
+    //===================================================================================
+    // XEventListener
+    virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt )
+        throw (::com::sun::star::uno::RuntimeException);
+};
+
+//------------------------------------------------------------------------------
+class ExtensionBox_Impl : public ::svt::IExtensionListBox
+{
+    bool            m_bHasScrollBar;
+    bool            m_bHasActive;
+    bool            m_bNeedsRecalc;
+    bool            m_bHasNew;
+    bool            m_bInCheckMode;
+    bool            m_bAdjustActive;
+    bool            m_bInDelete;
+    //Must be guarded together with m_vEntries to ensure a valid index at all times.
+    //Use m_entriesMutex as guard.
+    long            m_nActive;
+    long            m_nTopIndex;
+    long            m_nStdHeight;
+    long            m_nActiveHeight;
+    long            m_nExtraHeight;
+    Size            m_aOutputSize;
+    Image           m_aLockedImage;
+    Image           m_aLockedImageHC;
+    Image           m_aWarningImage;
+    Image           m_aWarningImageHC;
+    Image           m_aDefaultImage;
+    Image           m_aDefaultImageHC;
+    Link            m_aClickHdl;
+    
+    ScrollBar      *m_pScrollBar;
+
+    com::sun::star::uno::Reference< ExtensionRemovedListener > m_xRemoveListener;
+
+    TheExtensionManager      *m_pManager;
+    //This mutex is used for synchronizing access to m_vEntries.
+    //Currently it is used to synchronize adding, removing entries and 
+    //functions like getItemName, getItemDescription, etc. to prevent
+    //that m_vEntries is accessed at an invalid index.
+    //ToDo: There are many more places where m_vEntries is read and which may
+    //fail. For example the Paint method is probable called from the main thread
+    //while new entries are added / removed in a separate thread.
+    mutable ::osl::Mutex    m_entriesMutex;
+    std::vector< TEntry_Impl > m_vEntries;
+    std::vector< TEntry_Impl > m_vRemovedEntries;
+
+    ::com::sun::star::lang::Locale    *m_pLocale;
+    CollatorWrapper *m_pCollator;
+
+    void            CalcActiveHeight( const long nPos );
+    long            GetTotalHeight() const;
+    void            SetupScrollBar();
+    void            DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry );
+    bool            HandleTabKey( bool bReverse );
+    bool            HandleCursorKey( USHORT nKeyCode );
+    bool            FindEntryPos( const TEntry_Impl pEntry, long nStart, long nEnd, long &nFound );
+    bool            isHCMode();
+    void            DeleteRemoved();
+
+    //-----------------
+    DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * );
+
+    //Index starts with 1.
+    //Throws an com::sun::star::lang::IllegalArgumentException, when the index is invalid.
+    void checkIndex(sal_Int32 pos) const;
+
+
+public:
+                    ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pManager );
+                   ~ExtensionBox_Impl();
+
+    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void    Paint( const Rectangle &rPaintRect );
+    virtual void    Resize();
+    virtual long    Notify( NotifyEvent& rNEvt );
+
+    const Size      GetMinOutputSizePixel() const;
+    void            SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }
+    TEntry_Impl     GetEntryData( long nPos ) { return m_vEntries[ nPos ]; } 
+    long            GetEntryCount() { return (long) m_vEntries.size(); }
+    Rectangle       GetEntryRect( const long nPos ) const;
+    bool            HasActive() { return m_bHasActive; }
+    long            PointToPos( const Point& rPos );
+    void            SetScrollHdl( const Link& rLink );
+    void            DoScroll( long nDelta );
+    void            SetHyperlinkHdl( const Link& rLink ){ m_aClickHdl = rLink; }
+    virtual void    RecalcAll();
+    void            RemoveUnlocked();
+
+    //-----------------
+    virtual void    selectEntry( const long nPos );
+    long            addEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage,
+                              const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageManager );
+    void            updateEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
+    void            removeEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
+
+    void            prepareChecking( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageMgr );
+    void            checkEntries();
+
+    TheExtensionManager*    getExtensionManager() const { return m_pManager; }
+
+    //===================================================================================
+    //These functions are used for automatic testing
+
+    /** @return  The count of the entries in the list box. */
+    virtual sal_Int32 getItemCount() const;
+
+    /** @return  The index of the first selected entry in the list box.
+        When nothing is selected, which is the case when getItemCount returns '0',
+        then this function returns EXTENSION_LISTBOX_ENTRY_NOTFOUND */
+    virtual sal_Int32 getSelIndex() const;
+
+    /** @return  The item name of the entry with the given index
+        The index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual ::rtl::OUString getItemName( sal_Int32 index ) const;
+
+    /** @return  The version string of the entry with the given index
+        The index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual ::rtl::OUString getItemVersion( sal_Int32 index ) const;
+
+    /** @return  The description string of the entry with the given index
+        The index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual ::rtl::OUString getItemDescription( sal_Int32 index ) const;
+
+    /** @return  The publisher string of the entry with the given index
+        The index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual ::rtl::OUString getItemPublisher( sal_Int32 index ) const;
+
+    /** @return  The link behind the publisher text of the entry with the given index
+        The index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual ::rtl::OUString getItemPublisherLink( sal_Int32 index ) const;
+
+    /** The entry at the given position will be selected
+        Index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual void select( sal_Int32 pos );
+
+    /** The first found entry with the given name will be selected
+        When there was no entry found with the name, the selection doesn't change.
+        Please note that there might be more than one entry with the same
+        name, because:
+            1. the name is not unique
+            2. one extension can be installed as user and shared extension.
+    */
+    virtual void select( const ::rtl::OUString & sName );
+};
+
+}
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index 3ee49627ef..f2cb02c238 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -56,6 +56,15 @@ namespace rtl { class OUString; }
 
 namespace dp_misc {
 
+struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC SimpleLicenseAttributes
+{
+    ::rtl::OUString acceptBy;
+    //Attribute suppress-on-update. Default is false.
+    bool suppressOnUpdate;
+    //Attribute suppress-if-required. Default is false.
+    bool suppressIfRequired;
+};
+
 /**
    Access to the content of an XML <code>description</code> element.
 
@@ -135,6 +144,13 @@ public:
     */
     ::rtl::OUString getLocalizedLicenseURL() const;
 
+    /** returns the attributes of the simple-license element
+        
+        As long as there is a simple-license element, the function will return
+        the structure. If it does not exist, then the optional object is uninitialized.
+    */
+    ::boost::optional<SimpleLicenseAttributes> getSimpleLicenseAttributes() const;
+
     /** returns the localized display name of the extensions.
         
         In case there is no localized display-name then an empty string is returned.
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index aff8ada634..a933cf01db 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -557,11 +557,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_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index d3c7f28115..0479c70845 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -373,6 +373,50 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls(
 
 }
 
+::boost::optional<SimpleLicenseAttributes> 
+DescriptionInfoset::getSimpleLicenseAttributes() const
+{
+    //Check if the node exist
+    css::uno::Reference< css::xml::dom::XNode > n;
+    if (m_element.is()) {
+        try {
+            n = m_xpath->selectSingleNode(m_element, 
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "/desc:description/desc:registration/desc:simple-license/@accept-by")));
+        } catch (css::xml::xpath::XPathException &) {
+            // ignore
+        }
+        if (n.is())
+        {
+            SimpleLicenseAttributes attributes;
+            attributes.acceptBy = 
+                getNodeValueFromExpression(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "/desc:description/desc:registration/desc:simple-license/@accept-by")));
+
+            ::boost::optional< ::rtl::OUString > suppressOnUpdate = getOptionalValue(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "/desc:description/desc:registration/desc:simple-license/@suppress-on-update")));
+            if (suppressOnUpdate)
+                attributes.suppressOnUpdate = (*suppressOnUpdate).trim().equalsIgnoreAsciiCase(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
+            else
+                attributes.suppressOnUpdate = false;
+
+            ::boost::optional< ::rtl::OUString > suppressIfRequired = getOptionalValue(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "/desc:description/desc:registration/desc:simple-license/@suppress-if-required")));
+            if (suppressIfRequired)
+                attributes.suppressIfRequired = (*suppressIfRequired).trim().equalsIgnoreAsciiCase(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
+            else
+                attributes.suppressIfRequired = false;
+
+            return ::boost::optional<SimpleLicenseAttributes>(attributes);
+        }
+    }
+    return ::boost::optional<SimpleLicenseAttributes>();
+}
+
 ::rtl::OUString DescriptionInfoset::getLocalizedDescriptionURL() const
 {
     return getLocalizedHREFAttrFromChild(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 543bb4fd6c..4cb3951265 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -184,6 +184,7 @@ OUString normalizeMediaType( OUString const & mediaType )
 }
 
 //______________________________________________________________________________
+
 void PackageRegistryImpl::insertBackend(
     Reference<deployment::XPackageRegistry> const & xBackend )
 {
@@ -204,7 +205,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) {
@@ -213,9 +215,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 );
             }
@@ -354,7 +360,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 ) );
@@ -448,7 +457,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 98f80df964..af792565be 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -73,7 +73,7 @@
 #include "com/sun/star/xml/dom/XDocumentBuilder.hpp"
 #include "com/sun/star/xml/xpath/XXPathAPI.hpp"
 #include "com/sun/star/deployment/XPackageManager.hpp"
-
+#include "boost/optional.hpp"
 #include <vector>
 #include <stdio.h>
 
@@ -290,7 +290,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;
@@ -345,17 +345,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(
@@ -578,21 +593,12 @@ bool BackendImpl::PackageImpl::checkDependencies(
 {
     try 
     {
-        css::uno::Reference<css::xml::dom::XNode> xRoot = desc.getRootElement();
-        css::uno::Reference<css::xml::xpath::XXPathAPI> xPath =
-            getDescriptionInfoset().getXpath();
-
-        css::uno::Reference<css::xml::dom::XNode> nodeSimpleLic;
-        try {
-            nodeSimpleLic = xPath->selectSingleNode(xRoot,
-            OUSTR("/desc:description/desc:registration/desc:simple-license"));
-        } catch (css::xml::xpath::XPathException &) {
-            // ignore
-        }
-
-        if (!nodeSimpleLic.is())
+        DescriptionInfoset info = getDescriptionInfoset();
+        ::boost::optional<SimpleLicenseAttributes> simplLicAttr
+            = info.getSimpleLicenseAttributes();
+       if (! simplLicAttr)
             return true;
-        OUString sLic = getDescriptionInfoset().getLocalizedLicenseURL();
+        OUString sLic = info.getLocalizedLicenseURL();
         //If we do not get a localized licence then there is an error in the description.xml
         //This should be handled by using a validating parser. Therefore we assume that no 
         //license is available.
@@ -601,23 +607,20 @@ bool BackendImpl::PackageImpl::checkDependencies(
                 OUSTR("Could not obtain path to license. Possible error in description.xml"), 0, Any()); 	
         OUString sHref = desc.getExtensionRootUrl() + OUSTR("/") + sLic;
            OUString sLicense = getTextFromURL(xCmdEnv, sHref);
-        //determine who has to agree to the license
-        css::uno::Reference<css::xml::xpath::XXPathObject> nodeAttribWho3 = 
-            xPath->eval(nodeSimpleLic, 
-            OUSTR("@accept-by"));
-        OUString sAccept = nodeAttribWho3->getString().trim();
+        ////determine who has to agree to the license
         //check correct value for attribute
-        if ( ! (sAccept.equals(OUSTR("user")) || sAccept.equals(OUSTR("admin"))))
+        if ( ! (simplLicAttr->acceptBy.equals(OUSTR("user")) || simplLicAttr->acceptBy.equals(OUSTR("admin"))))
             throw css::deployment::DeploymentException(
                 OUSTR("Could not obtain attribute simple-lincense@accept-by or it has no valid value"), 0, Any());
 
         //If if @accept-by="user" then every user needs to accept the license before it can be installed.
-        //Therefore we must prevent the installation as shared extension.
+        //Therefore we must prevent the installation as shared extension unless suppress-if-required="true"
         OSL_ASSERT(aContextName.getLength());
-        if (sAccept.equals(OUSTR("user")) && aContextName.equals(OUSTR("shared")))
+        if (simplLicAttr->acceptBy.equals(OUSTR("user")) && aContextName.equals(OUSTR("shared")))
         {
-        css::deployment::LicenseIndividualAgreementException exc =
-            css::deployment::LicenseIndividualAgreementException(OUString(), 0, m_name); 
+            css::deployment::LicenseIndividualAgreementException 
+                exc = css::deployment::LicenseIndividualAgreementException(
+                OUString(), 0, m_name, simplLicAttr->suppressIfRequired); 
 
             bool approve = false;
             bool abort = false;
@@ -627,32 +630,24 @@ bool BackendImpl::PackageImpl::checkDependencies(
                     OUSTR("Could not interact with user."), 0, Any());
                if (abort == true)
                 return false;
-            //We should always prevent installation
-            OSL_ASSERT(0);
-        }
-
-        //determine optional attribute simple-license@suppressOnUpdate
-        css::uno::Reference<css::xml::dom::XElement> elemSimpleLic(nodeSimpleLic, css::uno::UNO_QUERY_THROW);
-        sal_Bool bSuppress = sal_False;
-        if (elemSimpleLic->hasAttribute(OUSTR("suppress-on-update")))
-        {
-            if (elemSimpleLic->getAttribute(OUSTR("suppress-on-update")).equals(OUSTR("true")))
-                bSuppress = sal_True;
+ 
+            //If the unopkg --suppress-license was used and simplLicAttr->suppressIfRequired == true,
+            //then the user implicitely accepts the license           
         }
 
         //Only use interaction if there is no version of this extension already installed
         //and the suppress-on-update flag is not set for the new extension
-        // bInstalled | bSuppress | show license
+        // bInstalled | bSuppressOnUpdate | show license
         //----------------------------------------
-        //      0     |      0    |     1  
-        //      0     |      1    |     1
-        //      1     |      0    |     1
-        //      1     |      1    |     0
+        //      0     |      0            |     1  
+        //      0     |      1            |     1
+        //      1     |      0            |     1
+        //      1     |      1            |     0
             
-        if ( !(bInstalled && bSuppress)) 
+        if ( !(bInstalled && simplLicAttr->suppressOnUpdate)) 
         {
-            css::deployment::LicenseException licExc =
-                css::deployment::LicenseException(OUString(), 0, m_name, sLicense);
+            css::deployment::LicenseException licExc(
+                OUString(), 0, m_name, sLicense, simplLicAttr->suppressIfRequired);
             bool approve = false;
             bool abort = false;
             if (! interactContinuation(
@@ -1318,7 +1313,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/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 7cb230764f..0f78223964 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -37,6 +37,7 @@
 
 #include <unotools/textsearch.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
 #include <unotools/bootstrap.hxx>
 #include <rtl/bootstrap.hxx>
 #include <tools/config.hxx>
@@ -94,7 +95,6 @@ static void releaseImpl()
     }
 }
 
-
 // static main entry point for the migration process
 void Migration::doMigration()
 {
@@ -143,11 +143,11 @@ sal_Bool MigrationImpl::checkMigration()
 MigrationImpl::MigrationImpl(const uno::Reference< XMultiServiceFactory >& xFactory)
     : m_vrVersions(new strings_v)
     , m_xFactory(xFactory)
-    , m_vrMigrations(readMigrationSteps())
-    , m_aInfo(findInstallation())
-    , m_vrFileList(compileFileList())
-    , m_vrServiceList(compileServiceList())
 {
+    readAvailableMigrations(m_vMigrationsAvailable);
+    sal_Int32 nIndex = findPreferedMigrationProcess(m_vMigrationsAvailable);
+    if ( nIndex >= 0 )
+        m_vrMigrations = readMigrationSteps(m_vMigrationsAvailable[nIndex].name);
 }
 
 MigrationImpl::~MigrationImpl()
@@ -157,6 +157,10 @@ MigrationImpl::~MigrationImpl()
 
 sal_Bool MigrationImpl::doMigration()
 {
+    // compile file and service list for migration
+    m_vrFileList    = compileFileList();
+    m_vrServiceList = compileServiceList();
+    
     sal_Bool result = sal_False;
     try{
         copyFiles();
@@ -221,20 +225,61 @@ sal_Bool MigrationImpl::checkMigrationCompleted()
     return bMigrationCompleted;
 }
 
-
-migrations_vr MigrationImpl::readMigrationSteps()
+static void insertSorted(migrations_available& rAvailableMigrations, supported_migration& aSupportedMigration)
 {
+    bool                           bInserted( false );
+    migrations_available::iterator pIter = rAvailableMigrations.begin();
+    while ( !bInserted && pIter != rAvailableMigrations.end())
+    {
+        if ( pIter->nPriority < aSupportedMigration.nPriority )
+        {
+            rAvailableMigrations.insert(pIter, aSupportedMigration );
+            bInserted = true;
+        }
+        ++pIter;
+    }
+    if ( !bInserted )
+        rAvailableMigrations.push_back( aSupportedMigration );
+}
 
+bool MigrationImpl::readAvailableMigrations(migrations_available& rAvailableMigrations)
+{
     // get supported version names
-    uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration"), uno::UNO_QUERY_THROW);
-    uno::Sequence< OUString > seqVersions;
-    aMigrationAccess->getByName(OUString::createFromAscii("SupportedVersions")) >>= seqVersions;
-    for (sal_Int32 i=0; i<seqVersions.getLength(); i++)
-        m_vrVersions->push_back(seqVersions[i].trim());
+    uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW);
+    uno::Sequence< OUString > seqSupportedVersions = aMigrationAccess->getElementNames();
+    
+    const OUString aVersionIdentifiers( RTL_CONSTASCII_USTRINGPARAM( "VersionIdentifiers" ));
+    const OUString aPriorityIdentifier( RTL_CONSTASCII_USTRINGPARAM( "Priority" ));
 
+    for (sal_Int32 i=0; i<seqSupportedVersions.getLength(); i++)
+    {
+        sal_Int32                 nPriority( 0 );
+        uno::Sequence< OUString > seqVersions;
+        uno::Reference< XNameAccess > xMigrationData( aMigrationAccess->getByName(seqSupportedVersions[i]), uno::UNO_QUERY_THROW );
+        xMigrationData->getByName( aVersionIdentifiers ) >>= seqVersions;
+        xMigrationData->getByName( aPriorityIdentifier ) >>= nPriority;
+
+        supported_migration aSupportedMigration;
+        aSupportedMigration.name      = seqSupportedVersions[i];
+        aSupportedMigration.nPriority = nPriority;
+        for (sal_Int32 j=0; j<seqVersions.getLength(); j++)
+            aSupportedMigration.supported_versions.push_back(seqVersions[j].trim());
+        insertSorted( rAvailableMigrations, aSupportedMigration );
+    }
+
+    return true;
+}
+
+migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigrationName)
+{
+    // get migration access
+    uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW);
+    uno::Reference< XNameAccess > xMigrationData( aMigrationAccess->getByName(rMigrationName), uno::UNO_QUERY_THROW );
+    
     // get migration description from from org.openoffice.Setup/Migration
     // and build vector of migration steps
-    uno::Reference< XNameAccess > theNameAccess(getConfigAccess("org.openoffice.Setup/Migration/MigrationSteps"), uno::UNO_QUERY_THROW);
+    OUString aMigrationSteps( RTL_CONSTASCII_USTRINGPARAM( "MigrationSteps" ));
+    uno::Reference< XNameAccess > theNameAccess(xMigrationData->getByName(aMigrationSteps), uno::UNO_QUERY_THROW);
     uno::Sequence< OUString > seqMigrations = theNameAccess->getElementNames();
     uno::Reference< XNameAccess > tmpAccess;
     uno::Reference< XNameAccess > tmpAccess2;
@@ -276,6 +321,20 @@ migrations_vr MigrationImpl::readMigrationSteps()
                 tmpStep.excludeConfig.push_back(tmpSeq[j]);
         }
 
+        // included extensions...
+        if (tmpAccess->getByName(OUString::createFromAscii("IncludedExtensions")) >>= tmpSeq)
+        {
+            for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
+                tmpStep.includeExtensions.push_back(tmpSeq[j]);
+        }
+
+        // excluded extensions...
+        if (tmpAccess->getByName(OUString::createFromAscii("ExcludedExtensions")) >>= tmpSeq)
+        {
+            for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
+                tmpStep.excludeExtensions.push_back(tmpSeq[j]);
+        }
+
         // config components
         if (tmpAccess->getByName(OUString::createFromAscii("ServiceConfigComponents")) >>= tmpSeq)
         {
@@ -283,7 +342,6 @@ migrations_vr MigrationImpl::readMigrationSteps()
                 tmpStep.configComponents.push_back(tmpSeq[j]);
         }
 
-
         // generic service
         tmpAccess->getByName(OUString::createFromAscii("MigrationService")) >>= tmpStep.service;
 
@@ -305,7 +363,7 @@ static FileBase::RC _checkAndCreateDirectory(INetURLObject& dirURL)
         return result;
 }
 
-install_info MigrationImpl::findInstallation()
+install_info MigrationImpl::findInstallation(const strings_v& rVersions)
 {
     rtl::OUString aProductName;
     uno::Any aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME );
@@ -313,9 +371,9 @@ install_info MigrationImpl::findInstallation()
     aProductName = aProductName.toAsciiLowerCase();
 
     install_info aInfo;
-    strings_v::const_iterator i_ver = m_vrVersions->begin();
+    strings_v::const_iterator i_ver = rVersions.begin();
     uno::Reference < util::XStringSubstitution > xSubst( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.PathSubstitution")), uno::UNO_QUERY );
-    while (i_ver != m_vrVersions->end())
+    while (i_ver != rVersions.end())
     {
         ::rtl::OUString aVersion, aProfileName;
         sal_Int32 nSeparatorIndex = (*i_ver).indexOf('=');
@@ -333,7 +391,7 @@ install_info MigrationImpl::findInstallation()
             osl::Security().getConfigDir( aUserInst );
             if ( aUserInst.getLength() && aUserInst[ aUserInst.getLength()-1 ] != '/' )
                 aUserInst += ::rtl::OUString::createFromAscii("/");
-#ifdef UNX
+#if defined UNX && ! defined MACOSX
             // tribute to whoever had the "great" idea to use different names on Windows and Unix
             aUserInst += ::rtl::OUString::createFromAscii(".");
 #endif
@@ -348,12 +406,34 @@ install_info MigrationImpl::findInstallation()
             }
             catch( uno::Exception& ){}
         }
-        i_ver++;
+        ++i_ver;
     }
 
     return aInfo;
 }
 
+sal_Int32 MigrationImpl::findPreferedMigrationProcess(const migrations_available& rAvailableMigrations)
+{
+    sal_Int32    nIndex( -1 );
+    sal_Int32    i( 0 );
+    
+    migrations_available::const_iterator rIter = rAvailableMigrations.begin();
+    while ( rIter != rAvailableMigrations.end() )
+    {
+        install_info aInstallInfo = findInstallation(rIter->supported_versions);
+        if (aInstallInfo.productname.getLength() > 0 )
+        {
+            m_aInfo = aInstallInfo;
+            nIndex  = i;
+            break;
+        }
+        ++i;
+        ++rIter;
+    }
+
+    return nIndex;
+}
+
 strings_vr MigrationImpl::applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const
 {
     using namespace utl;
@@ -520,8 +600,6 @@ void MigrationImpl::copyConfig()
         aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
         OSL_ENSURE(sal_False, aMsg.getStr());
     }
-
-
 }
 
 // removes elements of vector 2 in vector 1
@@ -629,7 +707,6 @@ void MigrationImpl::copyFiles()
 
 void MigrationImpl::runServices()
 {
-
     //create stratum for old user layer
     OUString aOldLayerURL = m_aInfo.userdata;
     aOldLayerURL += OUString::createFromAscii("/user/registry");
@@ -640,7 +717,7 @@ void MigrationImpl::runServices()
         aStratumSvc, stratumArgs), uno::UNO_QUERY);
 
     // Build argument array
-    uno::Sequence< uno::Any > seqArguments(3);
+    uno::Sequence< uno::Any > seqArguments(4);
     seqArguments[0] = uno::makeAny(NamedValue(
         OUString::createFromAscii("Productname"),
         uno::makeAny(m_aInfo.productname)));
@@ -676,10 +753,21 @@ void MigrationImpl::runServices()
                     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(
+                    OUString::createFromAscii("ExtensionBlackList"),
+                    uno::makeAny( seqExtBlackList )));
 
                 xMigrationJob = uno::Reference< XJob >(m_xFactory->createInstanceWithArguments(
                     i_mig->service, seqArguments), uno::UNO_QUERY_THROW);
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index e07847aed5..aea93b596e 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -68,11 +68,21 @@ struct migration_step
     strings_v includeConfig;
     strings_v excludeConfig;
     strings_v configComponents;
+    strings_v includeExtensions;
+    strings_v excludeExtensions;
     rtl::OUString service;
 };
 
+struct supported_migration
+{
+    rtl::OUString name;
+    sal_Int32     nPriority;
+    strings_v     supported_versions;
+};
+
 typedef std::vector< migration_step > migrations_v;
 typedef std::auto_ptr< migrations_v > migrations_vr;
+typedef std::vector< supported_migration > migrations_available;
 
 class MigrationImpl
 {
@@ -80,18 +90,22 @@ class MigrationImpl
 private:
     strings_vr m_vrVersions;
     NS_UNO::Reference< NS_CSS::lang::XMultiServiceFactory > m_xFactory;
-    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
-
-    // initializer functions...
-    migrations_vr readMigrationSteps();
-    install_info findInstallation();
-    strings_vr compileFileList();
-    strings_vr compileConfigList();
-    strings_vr compileServiceList();
+    
+    migrations_available m_vMigrationsAvailable; // list of all available migrations
+    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&);
+    migrations_vr readMigrationSteps(const ::rtl::OUString& rMigrationName);
+    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/pages.cxx b/desktop/source/migration/pages.cxx
index 544ea04dee..a8bba2ee0a 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -58,6 +58,7 @@
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/file.hxx>
+#include <osl/thread.hxx>
 #include <unotools/bootstrap.hxx>
 #include <tools/config.hxx>
 
@@ -65,6 +66,7 @@ using namespace rtl;
 using namespace osl;
 using namespace utl;
 using namespace svt;
+using namespace com::sun::star;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::util;
@@ -315,12 +317,46 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // -------------------------------------------------------------------
 
-MigrationPage::MigrationPage( svt::OWizardMachine* parent, const ResId& resid)
+class MigrationThread : public ::osl::Thread
+{
+    public:
+        MigrationThread();
+        
+        virtual void SAL_CALL run();
+        virtual void SAL_CALL onTerminated(); 
+};
+
+MigrationThread::MigrationThread()
+{
+}
+
+void MigrationThread::run()
+{
+    try
+    {
+        Migration::doMigration();
+    }
+    catch ( uno::Exception& )
+    {
+    }
+}
+
+void MigrationThread::onTerminated()
+{
+}
+
+// -------------------------------------------------------------------
+
+MigrationPage::MigrationPage( 
+    svt::OWizardMachine* parent, 
+    const ResId& resid, 
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > xThrobber)
     : OWizardPage(parent, resid)
     , m_ftHead(this, WizardResId(FT_MIGRATION_HEADER))
     , m_ftBody(this, WizardResId(FT_MIGRATION_BODY))
     , m_cbMigration(this, WizardResId(CB_MIGRATION))
     , m_bMigrationDone(sal_False)
+    , m_xThrobber(xThrobber)
 {
     FreeResource();
     _setBold(m_ftHead);
@@ -335,9 +371,28 @@ sal_Bool MigrationPage::commitPage( CommitPageReason _eReason )
 {
     if (_eReason == eTravelForward && m_cbMigration.IsChecked() && !m_bMigrationDone)
     {        
-        EnterWait();
-        Migration::doMigration();
-        LeaveWait();
+        GetParent()->EnterWait();
+        FirstStartWizard* pWizard = dynamic_cast< FirstStartWizard* >( GetParent() );
+        if ( pWizard )
+            pWizard->DisableButtonsWhileMigration();
+        
+        uno::Reference< awt::XWindow > xWin( m_xThrobber, uno::UNO_QUERY );
+        xWin->setVisible( true );
+        m_xThrobber->start();
+        MigrationThread* pMigThread = new MigrationThread();
+        pMigThread->create();
+        
+        while ( pMigThread->isRunning() )
+        {
+            Application::Reschedule();
+        }
+        
+        m_xThrobber->stop();
+        GetParent()->LeaveWait();
+        // Next state will enable buttons - so no EnableButtons necessary!
+        xWin->setVisible( false );
+        pMigThread->join();
+        delete pMigThread;
         m_bMigrationDone = sal_True;
     }
     else
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index c5ab388687..0f3e660f89 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -41,6 +41,8 @@
 #include <svtools/lstner.hxx>
 #include <svtools/xtextedt.hxx>
 
+#include <com/sun/star/awt/XThrobber.hpp>
+
 namespace desktop
 {
 class WelcomePage : public svt::OWizardPage
@@ -124,8 +126,9 @@ private:
     FixedText m_ftBody;
     CheckBox m_cbMigration;
     sal_Bool m_bMigrationDone;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > m_xThrobber;
 public:
-    MigrationPage( svt::OWizardMachine* parent, const ResId& resid);
+    MigrationPage( svt::OWizardMachine* parent, const ResId& resid, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > xThrobber );
     virtual sal_Bool commitPage( CommitPageReason _eReason );
 
 protected:
diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx
new file mode 100755
index 0000000000..b33d78966f
--- /dev/null
+++ b/desktop/source/migration/services/cexportsoo3.cxx
@@ -0,0 +1,71 @@
+/*************************************************************************
+ *
+ * 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: cexports.cxx,v $
+ * $Revision: 1.9 $
+ *
+ * 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_desktop.hxx"
+
+#include "cppuhelper/implementationentry.hxx"
+#include "oo3extensionmigration.hxx"
+
+extern "C"
+{
+
+::cppu::ImplementationEntry entries [] =
+{
+    {
+        migration::OO3ExtensionMigration_create, migration::OO3ExtensionMigration_getImplementationName,
+        migration::OO3ExtensionMigration_getSupportedServiceNames, ::cppu::createSingleComponentFactory,
+        0, 0
+    },
+    { 0, 0, 0, 0, 0, 0 }
+};
+
+
+void SAL_CALL component_getImplementationEnvironment(
+    const sal_Char ** ppEnvTypeName, uno_Environment ** )
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+sal_Bool SAL_CALL component_writeInfo(
+    void * pServiceManager, void * pRegistryKey )
+{
+    return ::cppu::component_writeInfoHelper(
+        pServiceManager, pRegistryKey, entries );
+}
+
+void * SAL_CALL component_getFactory(
+    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+{
+    return ::cppu::component_getFactoryHelper(
+        pImplName, pServiceManager, pRegistryKey, entries );
+}
+
+}
diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk
index 22d28ee00c..55397a7cb1 100644
--- a/desktop/source/migration/services/makefile.mk
+++ b/desktop/source/migration/services/makefile.mk
@@ -35,6 +35,7 @@ PRJNAME=desktop
 TARGET = migrationoo2.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = migrationoo2
+LIBTARGET=NO
 
 # --- Settings -----------------------------------------------------
 .INCLUDE : ..$/..$/deployment/inc/dp_misc.mk
@@ -55,7 +56,17 @@ SLOFILES= \
         $(SLO)$/basicmigration.obj \
         $(SLO)$/wordbookmigration.obj \
         $(SLO)$/extensionmigration.obj \
-        $(SLO)$/autocorrmigration.obj
+        $(SLO)$/autocorrmigration.obj \
+        $(SLO)$/oo3extensionmigration.obj \
+        $(SLO)$/cexportsoo3.obj \
+
+SHL1OBJS= \
+        $(SLO)$/jvmfwk.obj \
+        $(SLO)$/cexports.obj \
+        $(SLO)$/basicmigration.obj \
+        $(SLO)$/wordbookmigration.obj \
+        $(SLO)$/extensionmigration.obj \
+        $(SLO)$/autocorrmigration.obj \
 
 SHL1TARGET=$(TARGET)
 SHL1VERSIONMAP = migrationoo2.map
@@ -72,16 +83,42 @@ SHL1STDLIBS= \
     $(JVMFWKLIB) \
     $(XMLSCRIPTLIB) \
     $(BERKELEYLIB)
-    
-    
 
 SHL1DEPN=
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
+SHL1IMPLIB=imigrationoo2
+#SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=$(SHL1TARGET)
 
+COMP2TYPELIST = migrationoo3
+SHL2TARGET=migrationoo3.uno
+SHL2VERSIONMAP = migrationoo3.map
+
+SHL2OBJS= \
+        $(SLO)$/cexportsoo3.obj \
+        $(SLO)$/oo3extensionmigration.obj
+
+SHL2STDLIBS= \
+    $(DEPLOYMENTMISCLIB) \
+    $(CPPULIB)		\
+    $(CPPUHELPERLIB)	\
+    $(SALLIB) \
+    $(UCBHELPERLIB)	\
+    $(UNOTOOLSLIB) \
+    $(TOOLSLIB)	\
+    $(I18NISOLANGLIB) \
+    $(JVMFWKLIB) \
+    $(XMLSCRIPTLIB) \
+    $(BERKELEYLIB)
+
+SHL2DEPN=
+SHL2IMPLIB=imigrationoo3
+#SHL2LIBS=$(SLB)$/$(SHL2TARGET).lib
+SHL2DEF=$(MISC)$/$(SHL2TARGET).def
+
+DEF2NAME=$(SHL2TARGET)
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : target.mk
diff --git a/desktop/source/migration/services/migrationoo3.map b/desktop/source/migration/services/migrationoo3.map
new file mode 100755
index 0000000000..ac2c3750bf
--- /dev/null
+++ b/desktop/source/migration/services/migrationoo3.map
@@ -0,0 +1,8 @@
+UDK_3_0_0 {
+    global:
+        component_getImplementationEnvironment;
+        component_writeInfo;
+        component_getFactory;
+    local:
+    *;
+};
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
new file mode 100755
index 0000000000..07e971b033
--- /dev/null
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -0,0 +1,656 @@
+/*************************************************************************
+ *
+ * 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: extensionmigration.cxx,v $
+ * $Revision: 1.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_desktop.hxx"
+
+#include "oo3extensionmigration.hxx"
+#include <rtl/instance.hxx>
+#include <osl/file.hxx>
+#include <osl/thread.h>
+#include <tools/urlobj.hxx>
+#include <unotools/bootstrap.hxx>
+#include <unotools/ucbstreamhelper.hxx>
+#include <unotools/textsearch.hxx>
+#include <comphelper/sequence.hxx>
+#include <comphelper/processfactory.hxx>
+#include <ucbhelper/content.hxx>
+
+#include <com/sun/star/deployment/thePackageManagerFactory.hpp>
+#include <com/sun/star/deployment/XPackageManagerFactory.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/ucb/XCommandInfo.hpp>
+#include <com/sun/star/ucb/TransferInfo.hpp>
+#include <com/sun/star/ucb/NameClash.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+
+namespace migration
+{
+
+static ::rtl::OUString sExtensionSubDir = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/uno_packages/" ) );
+static ::rtl::OUString sSubDirName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cache" ) );
+static ::rtl::OUString sConfigDir = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/registry/data" ) );
+static ::rtl::OUString sOrgDir = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/registry/data/org" ) );
+static ::rtl::OUString sExcludeDir1 = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/registry/data/org" ) );
+static ::rtl::OUString sExcludeDir2 = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/registry/data/org/openoffice" ) );
+static ::rtl::OUString sDescriptionXmlFile = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/description.xml" ) );
+static ::rtl::OUString sExtensionRootSubDirName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/uno_packages" ) );
+
+static ::rtl::OUString sConfigurationDataType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.star.configuration-data"));
+static ::rtl::OUString sConfigurationSchemaType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.star.configuration-schema"));
+
+// =============================================================================
+// component operations
+// =============================================================================
+
+::rtl::OUString OO3ExtensionMigration_getImplementationName()
+{
+    static ::rtl::OUString* pImplName = 0;
+    if ( !pImplName )
+    {
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+        if ( !pImplName )
+        {
+            static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.desktop.migration.OOo3Extensions" ) );
+            pImplName = &aImplName;
+        }
+    }
+    return *pImplName;
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > OO3ExtensionMigration_getSupportedServiceNames()
+{
+    static Sequence< ::rtl::OUString >* pNames = 0;
+    if ( !pNames )
+    {
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+        if ( !pNames )
+        {
+            static Sequence< ::rtl::OUString > aNames(1);
+            aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.migration.Extensions" ) );
+            pNames = &aNames;
+        }
+    }
+    return *pNames;
+}
+
+// =============================================================================
+// ExtensionMigration
+// =============================================================================
+
+OO3ExtensionMigration::OO3ExtensionMigration(Reference< XComponentContext > const & ctx) :
+m_ctx(ctx)
+{
+}
+
+// -----------------------------------------------------------------------------
+
+OO3ExtensionMigration::~OO3ExtensionMigration()
+{
+}
+
+::osl::FileBase::RC OO3ExtensionMigration::checkAndCreateDirectory( INetURLObject& rDirURL )
+{
+    ::osl::FileBase::RC aResult = ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
+    if ( aResult == ::osl::FileBase::E_NOENT )
+    {
+        INetURLObject aBaseURL( rDirURL );
+        aBaseURL.removeSegment();
+        checkAndCreateDirectory( aBaseURL );
+        return ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
+    }
+    else
+    {
+        return aResult;
+    }
+}
+
+void OO3ExtensionMigration::registerConfigurationPackage( const uno::Reference< deployment::XPackage > & xPkg)
+{
+    const ::rtl::OUString sMediaType = xPkg->getPackageType()->getMediaType();
+    if ( (sMediaType.equals(sConfigurationDataType) || sMediaType.equals(sConfigurationSchemaType) ) )
+    {
+        xPkg->revokePackage(uno::Reference< task::XAbortChannel >(), uno::Reference< ucb::XCommandEnvironment> ());
+        xPkg->registerPackage(uno::Reference< task::XAbortChannel >(), uno::Reference< ucb::XCommandEnvironment> ());
+    }
+}
+
+ void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions )
+{
+    osl::Directory    aScanRootDir( sSourceDir );
+    osl::FileStatus   fs(FileStatusMask_Type | FileStatusMask_FileURL);
+    osl::FileBase::RC nRetCode = aScanRootDir.open();
+    if ( nRetCode == osl::Directory::E_None )
+    {
+        sal_uInt32    nHint( 0 );
+        osl::DirectoryItem aItem;
+        while ( aScanRootDir.getNextItem( aItem, nHint ) == osl::Directory::E_None )
+        {
+            if (( aItem.getFileStatus(fs) == osl::FileBase::E_None ) &&
+                ( fs.getFileType() == osl::FileStatus::Directory   ))
+            {
+                //Check next folder as the "real" extension folder is below a temp folder!
+                ::rtl::OUString sExtensionFolderURL = fs.getFileURL();
+
+                osl::DirectoryItem aExtDirItem;
+                osl::Directory     aExtensionRootDir( sExtensionFolderURL );
+                
+                nRetCode = aExtensionRootDir.open();
+                if (( nRetCode == osl::Directory::E_None ) &&
+                    ( aExtensionRootDir.getNextItem( aExtDirItem, nHint ) == osl::Directory::E_None ))
+                {
+                    bool bFileStatus = aExtDirItem.getFileStatus(fs) == osl::FileBase::E_None;
+                    bool bIsDir      = fs.getFileType() == osl::FileStatus::Directory;
+                    
+                    if ( bFileStatus && bIsDir )
+                    {
+                        sExtensionFolderURL = fs.getFileURL();
+                        ScanResult eResult = scanExtensionFolder( sExtensionFolderURL );
+                        if ( eResult == SCANRESULT_MIGRATE_EXTENSION )
+                            aMigrateExtensions.push_back( sExtensionFolderURL );
+                    }
+                }
+            }
+        }
+    }
+}
+
+OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( const ::rtl::OUString& sExtFolder )
+{
+    ScanResult     aResult = SCANRESULT_NOTFOUND;
+    osl::Directory aDir(sExtFolder);
+    
+    // get sub dirs
+    if (aDir.open() == osl::FileBase::E_None)
+    {
+        // work through directory contents...
+        osl::DirectoryItem item;
+        osl::FileStatus fs(FileStatusMask_Type | FileStatusMask_FileURL);
+        TStringVector aDirectories;
+        while ((aDir.getNextItem(item) == osl::FileBase::E_None ) &&
+               ( aResult == SCANRESULT_NOTFOUND ))
+        {
+            if (item.getFileStatus(fs) == osl::FileBase::E_None)
+            {
+                ::rtl::OUString aDirEntryURL;
+                if (fs.getFileType() == osl::FileStatus::Directory)
+                    aDirectories.push_back( fs.getFileURL() );
+                else
+                {
+                    aDirEntryURL = fs.getFileURL();
+                    if ( aDirEntryURL.indexOf( sDescriptionXmlFile ) > 0 )
+                        aResult = scanDescriptionXml( aDirEntryURL ) ? SCANRESULT_MIGRATE_EXTENSION : SCANRESULT_DONTMIGRATE_EXTENSION;
+                }
+            }
+        }
+
+        TStringVector::const_iterator pIter = aDirectories.begin();
+        while ( pIter != aDirectories.end() && aResult == SCANRESULT_NOTFOUND )
+        {
+            aResult = scanExtensionFolder( *pIter );
+            ++pIter;
+        }
+    }
+    return aResult;
+}
+
+bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescriptionXmlURL )
+{
+    if ( !m_xDocBuilder.is() )
+    {
+        m_xDocBuilder = uno::Reference< xml::dom::XDocumentBuilder >(
+            m_ctx->getServiceManager()->createInstanceWithContext(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.DocumentBuilder")),
+                m_ctx ), uno::UNO_QUERY );
+    }
+
+    if ( !m_xSimpleFileAccess.is() )
+    {
+        m_xSimpleFileAccess = uno::Reference< ucb::XSimpleFileAccess >(
+            m_ctx->getServiceManager()->createInstanceWithContext(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")),
+                m_ctx ), uno::UNO_QUERY );
+    }
+    
+    ::rtl::OUString aExtIdentifier;
+    if ( m_xDocBuilder.is() && m_xSimpleFileAccess.is() )
+    {
+        try
+        {
+            uno::Reference< io::XInputStream > xIn = 
+                m_xSimpleFileAccess->openFileRead( sDescriptionXmlURL );
+
+            if ( xIn.is() )
+            {
+                uno::Reference< xml::dom::XDocument > xDoc = m_xDocBuilder->parse( xIn );
+                if ( xDoc.is() )
+                {
+                    uno::Reference< xml::dom::XElement > xRoot = xDoc->getDocumentElement();
+                    if ( xRoot.is() && 
+                         xRoot->getTagName().equals(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("description"))) )
+                    {
+                        uno::Reference< xml::xpath::XXPathAPI > xPath(
+                            m_ctx->getServiceManager()->createInstanceWithContext(
+                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.xpath.XPathAPI")),
+                                m_ctx),
+                            uno::UNO_QUERY);
+                        
+                        xPath->registerNS(
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc")),
+                            xRoot->getNamespaceURI());
+                        xPath->registerNS(
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xlink")),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.w3.org/1999/xlink")));
+                        
+                        try 
+                        {
+                            uno::Reference< xml::dom::XNode > xRootNode( xRoot, uno::UNO_QUERY );
+                            uno::Reference< xml::dom::XNode > xNode( 
+                                xPath->selectSingleNode(
+                                    xRootNode, 
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("desc:identifier/@value")) ));
+                            if ( xNode.is() )
+                                aExtIdentifier = xNode->getNodeValue();
+                        } 
+                        catch ( xml::xpath::XPathException& )
+                        {
+                        }
+                        catch ( xml::dom::DOMException& )
+                        {
+                        }
+                    }
+                }
+            }
+            
+            if ( aExtIdentifier.getLength() > 0 )
+            {
+                // scan extension identifier and try to match with our black list entries
+                for ( sal_uInt32 i = 0; i < m_aBlackList.size(); i++ )
+                {
+                    utl::SearchParam param(m_aBlackList[i], utl::SearchParam::SRCH_REGEXP);
+                    utl::TextSearch  ts(param, LANGUAGE_DONTKNOW);
+
+                    xub_StrLen start = 0;
+                    xub_StrLen end   = static_cast<USHORT>(aExtIdentifier.getLength());
+                    if (ts.SearchFrwrd(aExtIdentifier, &start, &end))
+                        return false;
+                }
+            }
+        }
+        catch ( ucb::CommandAbortedException& )
+        {
+        }
+        catch ( uno::RuntimeException& )
+        {
+        }
+
+        if ( aExtIdentifier.getLength() == 0 )
+        {
+            // Fallback: 
+            // Try to use the folder name to match our black list
+            // as some extensions don't provide an identifier in the 
+            // description.xml!
+            for ( sal_uInt32 i = 0; i < m_aBlackList.size(); i++ )
+            {
+                utl::SearchParam param(m_aBlackList[i], utl::SearchParam::SRCH_REGEXP);
+                utl::TextSearch  ts(param, LANGUAGE_DONTKNOW);
+
+                xub_StrLen start = 0;
+                xub_StrLen end   = static_cast<USHORT>(sDescriptionXmlURL.getLength());
+                if (ts.SearchFrwrd(sDescriptionXmlURL, &start, &end))
+                    return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+bool OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir )
+{
+    if ( !m_xPackageManager.is() )
+    {
+        try 
+        {
+            m_xPackageManager = deployment::thePackageManagerFactory::get( m_ctx )->getPackageManager( 
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "user" )) );
+        }
+        catch ( ucb::CommandFailedException & ){}
+        catch ( uno::RuntimeException & ) {}
+    }
+    
+    if ( m_xPackageManager.is() )
+    {
+        try
+        {
+            TmpRepositoryCommandEnv* pCmdEnv = new TmpRepositoryCommandEnv();
+            
+            uno::Reference< ucb::XCommandEnvironment > xCmdEnv( 
+                static_cast< cppu::OWeakObject* >( pCmdEnv ), uno::UNO_QUERY );
+            uno::Reference< task::XAbortChannel > xAbortChannel;
+            uno::Reference< deployment::XPackage > xPackage = 
+                m_xPackageManager->addPackage( sSourceDir, ::rtl::OUString(), xAbortChannel, xCmdEnv );
+
+            if ( xPackage.is() )
+                return true;
+        }
+        catch ( ucb::CommandFailedException& )
+        {
+        }
+        catch ( ucb::CommandAbortedException& )
+        {
+        }
+        catch ( lang::IllegalArgumentException& )
+        {
+        }
+    }
+
+    return false;
+}
+
+bool OO3ExtensionMigration::copy( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir )
+{
+    bool bRet = false;
+
+    INetURLObject aSourceObj( sSourceDir );
+    INetURLObject aDestObj( sTargetDir );
+    String aName = aDestObj.getName();
+    aDestObj.removeSegment();
+    aDestObj.setFinalSlash();
+
+    try
+    {
+        ::ucbhelper::Content aDestPath( aDestObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
+        uno::Reference< ucb::XCommandInfo > xInfo = aDestPath.getCommands();
+        ::rtl::OUString aTransferName = ::rtl::OUString::createFromAscii( "transfer" );
+        if ( xInfo->hasCommandByName( aTransferName ) )
+        {
+            aDestPath.executeCommand( aTransferName, uno::makeAny(
+                ucb::TransferInfo( sal_False, aSourceObj.GetMainURL( INetURLObject::NO_DECODE ), aName, ucb::NameClash::OVERWRITE ) ) );
+            bRet = true;
+        }
+    }
+    catch( uno::Exception& )
+    {
+    }
+
+    return bRet;
+}
+
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException)
+{
+    return OO3ExtensionMigration_getImplementationName();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OO3ExtensionMigration::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
+    const ::rtl::OUString* pNames = aNames.getConstArray();
+    const ::rtl::OUString* pEnd = pNames + aNames.getLength();
+    for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames )
+        ;
+
+    return pNames != pEnd;
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException)
+{
+    return OO3ExtensionMigration_getSupportedServiceNames();
+}
+
+// -----------------------------------------------------------------------------
+// XInitialization
+// -----------------------------------------------------------------------------
+
+void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    const Any* pIter = aArguments.getConstArray();
+    const Any* pEnd = pIter + aArguments.getLength();
+    for ( ; pIter != pEnd ; ++pIter )
+    {
+        beans::NamedValue aValue;
+        *pIter >>= aValue;
+        if ( aValue.Name.equalsAscii( "UserData" ) )
+        {
+            if ( !(aValue.Value >>= m_sSourceDir) )
+            {
+                OSL_ENSURE( false, "ExtensionMigration::initialize: argument UserData has wrong type!" );
+            }
+        }
+        else if ( aValue.Name.equalsAscii( "ExtensionBlackList" ) )
+        {
+            Sequence< ::rtl::OUString > aBlackList;
+            if ( (aValue.Value >>= aBlackList ) && ( aBlackList.getLength() > 0 ))
+            {
+                m_aBlackList.resize( aBlackList.getLength() );
+                ::comphelper::sequenceToArray< ::rtl::OUString >( &m_aBlackList[0], aBlackList );
+            }
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+TStringVectorPtr getContent( const ::rtl::OUString& rBaseURL )
+{
+    TStringVectorPtr aResult( new TStringVector );
+    ::osl::Directory aDir( rBaseURL);
+    if ( aDir.open() == ::osl::FileBase::E_None )
+    {
+        // iterate over directory content
+        TStringVector aSubDirs;
+        ::osl::DirectoryItem aItem;
+        while ( aDir.getNextItem( aItem ) == ::osl::FileBase::E_None )
+        {
+            ::osl::FileStatus aFileStatus( FileStatusMask_Type | FileStatusMask_FileURL );
+            if ( aItem.getFileStatus( aFileStatus ) == ::osl::FileBase::E_None )
+                aResult->push_back( aFileStatus.getFileURL() );
+        }
+    }
+
+    return aResult;
+}
+
+// -----------------------------------------------------------------------------
+// XJob
+// -----------------------------------------------------------------------------
+
+void OO3ExtensionMigration::copyConfig( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir )
+{
+    ::rtl::OUString sEx1( m_sSourceDir );
+    sEx1 += sExcludeDir1;
+    ::rtl::OUString sEx2( m_sSourceDir );
+    sEx2 += sExcludeDir2;
+
+    TStringVectorPtr aList = getContent( sSourceDir );
+    TStringVector::const_iterator aI = aList->begin();
+    while ( aI != aList->end() )
+    {
+        ::rtl::OUString sSourceLocalName = aI->copy( sSourceDir.getLength() );
+        ::rtl::OUString aTemp = aI->copy( m_sSourceDir.getLength() );
+        if ( aTemp != sExcludeDir1 && aTemp != sExcludeDir2 )
+        {
+            ::rtl::OUString sTargetName = sTargetDir + sSourceLocalName;
+            copy( (*aI), sTargetName );
+        }
+        ++aI;
+    }
+}
+
+Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& )
+    throw (lang::IllegalArgumentException, Exception, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    ::utl::Bootstrap::PathStatus aStatus = ::utl::Bootstrap::locateUserInstallation( m_sTargetDir );
+    if ( aStatus == ::utl::Bootstrap::PATH_EXISTS )
+    {
+        // copy all extensions
+        ::rtl::OUString sSourceDir( m_sSourceDir );
+        sSourceDir += sExtensionSubDir;
+        sSourceDir += sSubDirName;
+        sSourceDir += sExtensionRootSubDirName;
+        TStringVector aExtensionToMigrate;
+        scanUserExtensions( sSourceDir, aExtensionToMigrate );
+        if ( aExtensionToMigrate.size() > 0 )
+        {
+            TStringVector::iterator pIter = aExtensionToMigrate.begin();
+            while ( pIter != aExtensionToMigrate.end() )
+            {
+                migrateExtension( *pIter );
+                ++pIter;
+            }
+        }
+    }
+
+    return Any();
+}
+
+// -----------------------------------------------------------------------------
+// TmpRepositoryCommandEnv
+// -----------------------------------------------------------------------------
+
+TmpRepositoryCommandEnv::TmpRepositoryCommandEnv()
+{
+}
+
+TmpRepositoryCommandEnv::TmpRepositoryCommandEnv(
+    uno::Reference< task::XInteractionHandler> const & handler)
+    : m_forwardHandler(handler)
+{
+}
+
+TmpRepositoryCommandEnv::~TmpRepositoryCommandEnv()
+{
+}
+// XCommandEnvironment
+//______________________________________________________________________________
+uno::Reference< task::XInteractionHandler > TmpRepositoryCommandEnv::getInteractionHandler()
+throw ( uno::RuntimeException )
+{
+    return this;
+}
+
+//______________________________________________________________________________
+uno::Reference< ucb::XProgressHandler > TmpRepositoryCommandEnv::getProgressHandler()
+throw ( uno::RuntimeException )
+{
+    return this;
+}
+
+// XInteractionHandler
+void TmpRepositoryCommandEnv::handle(
+    uno::Reference< task::XInteractionRequest> const & xRequest )
+    throw ( uno::RuntimeException )
+{
+    uno::Any request( xRequest->getRequest() );
+    OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
+    
+    bool approve = true;
+    bool abort   = false;
+
+    // select:
+    uno::Sequence< Reference< task::XInteractionContinuation > > conts(
+        xRequest->getContinuations() );
+    Reference< task::XInteractionContinuation > const * pConts =
+        conts.getConstArray();
+    sal_Int32 len = conts.getLength();
+    for ( sal_Int32 pos = 0; pos < len; ++pos )
+    {
+        if (approve) {
+            uno::Reference< task::XInteractionApprove > xInteractionApprove(
+                pConts[ pos ], uno::UNO_QUERY );
+            if (xInteractionApprove.is()) {
+                xInteractionApprove->select();
+                // don't query again for ongoing continuations:
+                approve = false;
+            }
+        }
+        else if (abort) {
+            uno::Reference< task::XInteractionAbort > xInteractionAbort(
+                pConts[ pos ], uno::UNO_QUERY );
+            if (xInteractionAbort.is()) {           
+                xInteractionAbort->select();
+                // don't query again for ongoing continuations:
+                abort = false;
+            }
+        }
+    }
+}
+
+// XProgressHandler
+void TmpRepositoryCommandEnv::push( uno::Any const & /*Status*/ )
+throw (uno::RuntimeException)
+{
+}
+
+
+void TmpRepositoryCommandEnv::update( uno::Any const & /*Status */)
+throw (uno::RuntimeException)
+{
+}
+
+void TmpRepositoryCommandEnv::pop() throw (uno::RuntimeException)
+{
+}
+
+// =============================================================================
+// component operations
+// =============================================================================
+
+Reference< XInterface > SAL_CALL OO3ExtensionMigration_create(
+    Reference< XComponentContext > const & ctx )
+    SAL_THROW( () )
+{
+    return static_cast< lang::XTypeProvider * >( new OO3ExtensionMigration(
+        ctx) );
+}
+
+// -----------------------------------------------------------------------------
+
+}	// namespace migration
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
new file mode 100755
index 0000000000..4a2b389310
--- /dev/null
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -0,0 +1,171 @@
+/*************************************************************************
+ *
+ * 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: extensionmigration.hxx,v $
+ * $Revision: 1.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _DESKTOP_OO3EXTENSIONMIGRATION_HXX_
+#define _DESKTOP_OO3EXTENSIONMIGRATION_HXX_
+
+#include "misc.hxx"
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/task/XJob.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/deployment/XPackageManager.hpp>
+
+#include <osl/mutex.hxx>
+#include <osl/file.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/compbase3.hxx>
+#include <ucbhelper/content.hxx>
+#include <xmlscript/xmllib_imexp.hxx>
+
+namespace com { namespace sun { namespace star {
+    namespace uno {
+        class XComponentContext;
+    }
+    namespace deployment {
+        class XPackage;
+    }
+}}}
+
+class INetURLObject;
+
+
+namespace migration
+{
+
+    ::rtl::OUString SAL_CALL OO3ExtensionMigration_getImplementationName();
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OO3ExtensionMigration_getSupportedServiceNames();
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OO3ExtensionMigration_create(
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext )
+        SAL_THROW( (::com::sun::star::uno::Exception) );
+
+
+    // =============================================================================
+    // class ExtensionMigration
+    // =============================================================================
+
+    typedef ::cppu::WeakImplHelper3<
+        ::com::sun::star::lang::XServiceInfo,
+        ::com::sun::star::lang::XInitialization,
+        ::com::sun::star::task::XJob > ExtensionMigration_BASE;
+
+    class OO3ExtensionMigration : public ExtensionMigration_BASE
+    {
+    private:
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >      m_ctx;
+        ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XDocumentBuilder >  m_xDocBuilder;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >      m_xSimpleFileAccess;
+        ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > m_xPackageManager;
+        ::osl::Mutex            m_aMutex;
+        ::rtl::OUString         m_sSourceDir;
+        ::rtl::OUString         m_sTargetDir;
+        TStringVector           m_aBlackList;
+
+        enum ScanResult
+        {
+            SCANRESULT_NOTFOUND,
+            SCANRESULT_MIGRATE_EXTENSION,
+            SCANRESULT_DONTMIGRATE_EXTENSION
+        };
+
+        ::osl::FileBase::RC     checkAndCreateDirectory( INetURLObject& rDirURL );
+        void					copyConfig( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir );
+        bool					copy( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir );
+        ScanResult              scanExtensionFolder( const ::rtl::OUString& sExtFolder );
+        void                    scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions );
+        bool                    scanDescriptionXml( const ::rtl::OUString& sDescriptionXmlFilePath );
+        bool                    migrateExtension( const ::rtl::OUString& sSourceDir );
+        /* fills m_scriptElements and  m_dialogElements
+        */
+        void registerConfigurationPackage(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > & xPkg);
+
+    public:
+        OO3ExtensionMigration(::com::sun::star::uno::Reference<
+            ::com::sun::star::uno::XComponentContext > const & ctx);
+        virtual ~OO3ExtensionMigration();
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName()
+            throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName )
+            throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+            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);
+
+        // XJob
+        virtual ::com::sun::star::uno::Any SAL_CALL execute(
+            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments )
+            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception,
+                ::com::sun::star::uno::RuntimeException);
+    };
+
+    class TmpRepositoryCommandEnv
+        : public ::cppu::WeakImplHelper3< ::com::sun::star::ucb::XCommandEnvironment,
+                                          ::com::sun::star::task::XInteractionHandler,
+                                          ::com::sun::star::ucb::XProgressHandler >
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+        ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> m_forwardHandler;
+    public:
+        virtual ~TmpRepositoryCommandEnv();
+        TmpRepositoryCommandEnv();
+        TmpRepositoryCommandEnv(
+            ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> const & handler);
+
+        // XCommandEnvironment
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > SAL_CALL
+        getInteractionHandler() throw ( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler >
+        SAL_CALL getProgressHandler() throw ( ::com::sun::star::uno::RuntimeException );
+
+        // XInteractionHandler
+        virtual void SAL_CALL handle(
+            ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest > const & xRequest )
+            throw (::com::sun::star::uno::RuntimeException);
+
+        // XProgressHandler
+        virtual void SAL_CALL push( ::com::sun::star::uno::Any const & Status )
+            throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL update( ::com::sun::star::uno::Any const & Status )
+            throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL pop() throw (::com::sun::star::uno::RuntimeException);
+    };
+
+//.........................................................................
+}	// namespace migration
+//.........................................................................
+
+#endif // _DESKTOP_OO3EXTENSIONMIGRATION_HXX_
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx
index 73735814a5..658224027e 100644
--- a/desktop/source/migration/wizard.cxx
+++ b/desktop/source/migration/wizard.cxx
@@ -64,11 +64,14 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
+#include <com/sun/star/awt/WindowDescriptor.hpp>
+#include <com/sun/star/awt/WindowAttribute.hpp>
 
 using namespace svt;
 using namespace rtl;
 using namespace osl;
 using namespace utl;
+using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -80,13 +83,38 @@ using namespace com::sun::star::container;
 namespace desktop
 {
 
-const FirstStartWizard::WizardState FirstStartWizard::STATE_WELCOME = 0;
-const FirstStartWizard::WizardState FirstStartWizard::STATE_LICENSE = 1;
-const FirstStartWizard::WizardState FirstStartWizard::STATE_MIGRATION = 2;
-const FirstStartWizard::WizardState FirstStartWizard::STATE_USER = 3;
+const FirstStartWizard::WizardState FirstStartWizard::STATE_WELCOME      = 0;
+const FirstStartWizard::WizardState FirstStartWizard::STATE_LICENSE      = 1;
+const FirstStartWizard::WizardState FirstStartWizard::STATE_MIGRATION    = 2;
+const FirstStartWizard::WizardState FirstStartWizard::STATE_USER         = 3;
 const FirstStartWizard::WizardState FirstStartWizard::STATE_UPDATE_CHECK = 4;
 const FirstStartWizard::WizardState FirstStartWizard::STATE_REGISTRATION = 5;
 
+static uno::Reference< uno::XComponentContext > getComponentContext( const uno::Reference< lang::XMultiServiceFactory >& rFactory )
+{
+    uno::Reference< uno::XComponentContext > rContext;
+    uno::Reference< beans::XPropertySet > rPropSet( rFactory, uno::UNO_QUERY );
+    uno::Any a = rPropSet->getPropertyValue(
+        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) );
+    a >>= rContext;
+    return rContext;
+}
+
+static sal_Int32 getBuildId()
+{
+    ::rtl::OUString aDefault;
+    ::rtl::OUString aBuildIdData = utl::Bootstrap::getBuildIdData( aDefault );
+    sal_Int32 nBuildId( 0 );
+    sal_Int32 nIndex1 = aBuildIdData.indexOf(':');
+    sal_Int32 nIndex2 = aBuildIdData.indexOf(')');
+    if (( nIndex1 > 0 ) && ( nIndex2 > 0 ) && ( nIndex2-1 > nIndex1+1 ))
+    {
+        ::rtl::OUString aBuildId = aBuildIdData.copy( nIndex1+1, nIndex2-nIndex1-1 );
+        nBuildId = aBuildId.toInt32();
+    }
+    return nBuildId;
+}
+
 WizardResId::WizardResId( USHORT nId ) :
     ResId( nId, *FirstStartWizard::GetResManager() )
 {
@@ -121,7 +149,47 @@ FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAccep
 //	enableState(STATE_USER, sal_False);
 //  enableState(STATE_REGISTRATION, sal_False);
 
-    ShowButtonFixedLine(sal_True);
+    try 
+    {
+        Point pos(5, 210 );
+        Size size(11, 11 );
+        
+        pos  = LogicToPixel( pos, MAP_APPFONT );
+        size = LogicToPixel( size, MAP_APPFONT );
+        
+        uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+        uno::Reference< awt::XToolkit > xToolkit(    
+            uno::Reference< lang::XMultiComponentFactory >(
+                xFactory, uno::UNO_QUERY_THROW)->
+                    createInstanceWithContext(
+                        rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")),
+                        getComponentContext(xFactory)),
+                        uno::UNO_QUERY_THROW);
+        
+        m_xThrobber = uno::Reference< awt::XThrobber >(
+            xToolkit->createWindow(
+                awt::WindowDescriptor(
+                    awt::WindowClass_SIMPLE,
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Throbber")),
+                    GetComponentInterface(), 0,
+                    awt::Rectangle(
+                        pos.X(), pos.Y(), size.Width(), size.Height()),
+                        awt::WindowAttribute::SHOW)),
+                    uno::UNO_QUERY_THROW);
+    } 
+    catch (uno::RuntimeException &)
+    {
+        throw;
+    }
+    catch (Exception& )
+    {
+    }
+
+    uno::Reference< awt::XWindow > xThrobberWin( m_xThrobber, uno::UNO_QUERY );
+    if ( xThrobberWin.is() )
+        xThrobberWin->setVisible( false );
+    
     Size aTPSize(TP_WIDTH, TP_HEIGHT);
     SetPageSizePixel(LogicToPixel(aTPSize, MAP_APPFONT));
 
@@ -154,6 +222,16 @@ FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAccep
     defaultButton(WZB_NEXT);
 }
 
+void FirstStartWizard::EnableButtonsWhileMigration()
+{
+    enableButtons(0xff, sal_True);
+}
+
+void FirstStartWizard::DisableButtonsWhileMigration()
+{
+    enableButtons(0xff, sal_False);
+}
+
 ::svt::RoadmapWizardTypes::PathId FirstStartWizard::defineWizardPagesDependingFromContext()
 {
     ::svt::RoadmapWizardTypes::PathId aDefaultPath = 0;
@@ -283,7 +361,7 @@ TabPage* FirstStartWizard::createPage(WizardState _nState)
         pTabPage = new LicensePage(this, WizardResId(TP_LICENSE), m_aLicensePath);
         break;
     case STATE_MIGRATION:
-        pTabPage = new MigrationPage(this, WizardResId(TP_MIGRATION));
+        pTabPage = new MigrationPage(this, WizardResId(TP_MIGRATION), m_xThrobber );
         break;
     case STATE_USER:
         pTabPage = new UserPage(this, WizardResId(TP_USER));
@@ -346,13 +424,21 @@ sal_Bool FirstStartWizard::prepareLeaveCurrentState( CommitPageReason _eReason )
 
         storeAcceptDate();
         m_bLicenseWasAccepted = sal_True;        
-    } 
+    }
 
     return svt::RoadmapWizard::prepareLeaveCurrentState(_eReason);
 }
 
 sal_Bool FirstStartWizard::leaveState(WizardState)
 {    
+    if (( getCurrentState() == STATE_MIGRATION ) && m_bLicenseWasAccepted )
+    {
+        // Store accept date and patch level now as it has been 
+        // overwritten by the migration process!
+        storeAcceptDate();
+        setPatchLevel();
+    }
+
     return sal_True;
 }
 
@@ -439,6 +525,30 @@ void FirstStartWizard::storeAcceptDate()
 
 }
 
+void FirstStartWizard::setPatchLevel()
+{
+    try {
+        Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+        // get configuration provider
+        Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >(
+        xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
+        Sequence< Any > theArgs(1);
+        NamedValue v(OUString::createFromAscii("NodePath"), 
+            makeAny(OUString::createFromAscii("org.openoffice.Office.Common/Help/Registration")));
+        theArgs[0] <<= v;
+        Reference< XPropertySet > pset = Reference< XPropertySet >(
+            theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
+        Any result = pset->getPropertyValue(OUString::createFromAscii("ReminderDate"));
+
+        OUString aPatchLevel( RTL_CONSTASCII_USTRINGPARAM( "Patch" ));
+        aPatchLevel += OUString::valueOf( getBuildId(), 10 );
+        pset->setPropertyValue(OUString::createFromAscii("ReminderDate"), makeAny(aPatchLevel));
+        Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
+    } catch (const Exception&)
+    {
+    }
+}
+
 #ifdef WNT
 typedef int ( __stdcall * CleanCurUserRegProc ) ( wchar_t* );
 #endif
diff --git a/desktop/source/migration/wizard.hrc b/desktop/source/migration/wizard.hrc
index 65b825f77a..9022b79c4b 100644
--- a/desktop/source/migration/wizard.hrc
+++ b/desktop/source/migration/wizard.hrc
@@ -81,6 +81,7 @@
 #define ED_USER_LAST			17
 #define ED_USER_FATHER			18
 #define ED_USER_INITIALS		19
+#define TR_WAITING				20
 
 // global strings
 #define STR_STATE_WELCOME           RID_FIRSTSTSTART_START+100
diff --git a/desktop/source/migration/wizard.hxx b/desktop/source/migration/wizard.hxx
index 99f3a38f3f..edbae53318 100644
--- a/desktop/source/migration/wizard.hxx
+++ b/desktop/source/migration/wizard.hxx
@@ -35,6 +35,7 @@
 #include <svtools/roadmapwizard.hxx>
 #include <vcl/window.hxx>
 #include <tools/resid.hxx>
+#include <com/sun/star/awt/XThrobber.hpp>
 
 namespace desktop
 {
@@ -64,6 +65,9 @@ public:
     virtual short Execute();
     virtual long PreNotify( NotifyEvent& rNEvt );
 
+    void EnableButtonsWhileMigration();
+    void DisableButtonsWhileMigration();
+
 private:
     sal_Bool m_bOverride;
     WizardState _currentState;
@@ -76,10 +80,12 @@ private:
     sal_Bool m_bLicenseWasAccepted;
     sal_Bool m_bAutomaticUpdChk;
     Link m_lnkCancel;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > m_xThrobber;
 
     rtl::OUString m_aLicensePath;
 
     void storeAcceptDate();
+    void setPatchLevel();
     void disableWizard();
     void enableQuickstart();
 
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 2a1c71288c..fc56984781 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -85,6 +85,8 @@ const char s_usingText [] =
 " -V, --version           version information\n"
 " -v, --verbose           verbose output to stdout\n"
 " -f, --force             force overwriting existing extensions\n"
+" -s, --suppress-license  prevents showing the license provided that\n"
+"                         the extension allows it\n"
 " --log-file <file>       custom log file; default: <cache-dir>/log.txt\n"
 " --shared                expert feature: operate on shared installation\n"
 "                                         deployment context;\n"
@@ -106,6 +108,7 @@ const OptionInfo s_option_infos [] = {
     { RTL_CONSTASCII_STRINGPARAM("shared"), '\0', false },
     { RTL_CONSTASCII_STRINGPARAM("deployment-context"), '\0', true },
     { RTL_CONSTASCII_STRINGPARAM("bundled"), '\0', false},
+    { RTL_CONSTASCII_STRINGPARAM("suppress-license"), 's', false},
 
     { 0, 0, '\0', false }
 };
@@ -210,6 +213,7 @@ extern "C" int unopkg_main()
     bool option_force = false;
     bool option_verbose = false;
     bool option_bundled = false;
+    bool option_suppressLicense = false;
     bool subcmd_add = false;
     bool subcmd_gui = false;
     OUString logFile;
@@ -233,6 +237,9 @@ extern "C" int unopkg_main()
         s_option_infos, OUSTR("version") );
     OptionInfo const * info_bundled = getOptionInfo(
         s_option_infos, OUSTR("bundled") );
+    OptionInfo const * info_suppressLicense = getOptionInfo(
+        s_option_infos, OUSTR("suppress-license") );
+
     
     Reference<XComponentContext> xComponentContext;
     Reference<XComponentContext> xLocalComponentContext;
@@ -274,6 +281,7 @@ extern "C" int unopkg_main()
                      !readOption( &option_shared, info_shared, &nPos ) &&
                      !readOption( &option_force, info_force, &nPos ) &&
                      !readOption( &option_bundled, info_bundled, &nPos ) &&
+                     !readOption( &option_suppressLicense, info_suppressLicense, &nPos ) &&
                      !readArgument( &deploymentContext, info_context, &nPos ) &&
                      !isBootstrapVariable(&nPos))
             {
@@ -345,7 +353,8 @@ extern "C" int unopkg_main()
         
         Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv(
             createCmdEnv( xComponentContext, logFile,
-                          option_force, option_verbose, option_bundled) );
+                          option_force, option_verbose, option_bundled, 
+                          option_suppressLicense) );
         
         if (subcmd_add ||
             subCommand.equalsAsciiL(
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 7dbce92fd1..4c542445c4 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -89,6 +89,7 @@ class CommandEnvironmentImpl
     bool m_option_force_overwrite;
     bool m_option_verbose;
     bool m_option_bundled;
+    bool m_option_suppressLicense;
     Reference< XComponentContext > m_xComponentContext;
     Reference< XProgressHandler > m_xLogFile;
 
@@ -102,7 +103,8 @@ public:
         OUString const & log_file,
         bool option_force_overwrite,
         bool option_verbose,
-        bool option_bundled);
+        bool option_bundled,
+        bool option_suppressLicense);
     
     // XCommandEnvironment
     virtual Reference< task::XInteractionHandler > SAL_CALL
@@ -127,11 +129,13 @@ CommandEnvironmentImpl::CommandEnvironmentImpl(
     OUString const & log_file,
     bool option_force_overwrite,
     bool option_verbose,
-    bool option_bundled)
+    bool option_bundled,
+    bool option_suppressLicense)
     : m_logLevel(0),
       m_option_force_overwrite( option_force_overwrite ),
       m_option_verbose( option_verbose ),
       m_option_bundled( option_bundled),
+      m_option_suppressLicense( option_suppressLicense),
       m_xComponentContext(xComponentContext)
 {
     if (log_file.getLength() > 0) {
@@ -282,15 +286,25 @@ void CommandEnvironmentImpl::handle(
     }
     else if (request >>= licAgreementExc)
     {
-        String sResMsg( ResId( RID_STR_UNOPKG_NO_SHARED_ALLOWED, *DeploymentResMgr::get() ) );
-        sResMsg.SearchAndReplaceAllAscii( "%NAME", licAgreementExc.ExtensionName );
-        dp_misc::writeConsole(OUSTR("\n") + sResMsg + OUSTR("\n\n"));
-        abort = true;
+        if (m_option_suppressLicense && licAgreementExc.SuppressIfRequired)
+        {
+            approve = true;
+        }
+        else
+        {
+            String sResMsg( ResId( RID_STR_UNOPKG_NO_SHARED_ALLOWED, *DeploymentResMgr::get() ) );
+            sResMsg.SearchAndReplaceAllAscii( "%NAME", licAgreementExc.ExtensionName );
+            dp_misc::writeConsole(OUSTR("\n") + sResMsg + OUSTR("\n\n"));
+            abort = true;
+        }
     }
     else if (request >>= licExc)
     {
         bLicenseException = true;
-        printLicense(licExc.Text, approve, abort);
+        if (m_option_suppressLicense && licExc.SuppressIfRequired)
+            approve = true;
+        else
+            printLicense(licExc.Text, approve, abort);
     }
        else if (request >>= instExc)
     {
@@ -435,10 +449,12 @@ Reference< XCommandEnvironment > createCmdEnv(
     OUString const & logFile,
     bool option_force_overwrite,
     bool option_verbose,
-    bool option_bundled)
+    bool option_bundled,
+    bool option_suppressLicense)
 {
     return new CommandEnvironmentImpl(
-        xContext, logFile, option_force_overwrite, option_verbose, option_bundled);
+        xContext, logFile, option_force_overwrite, option_verbose, option_bundled,
+        option_suppressLicense);
 }
 
 } // unopkg
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index b17b89ead1..31cbd48398 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -166,7 +166,8 @@ css::uno::Reference<css::ucb::XCommandEnvironment> createCmdEnv(
     ::rtl::OUString const & logFile,
     bool option_force_overwrite,
     bool option_verbose,
-    bool option_bundled);
+    bool option_bundled,
+    bool option_suppressLicense);
 
 //==============================================================================
 void printf_packages(
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 6101fa652b..be36d3b14d 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -47,6 +47,8 @@
 #include <rtl/logfile.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
+#include <vcl/graph.hxx>
+#include <svtools/filter.hxx>
 
 #define NOT_LOADED  ((long)-1)
 
@@ -61,6 +63,7 @@ SplashScreen::SplashScreen(const Reference< XMultiServiceFactory >& rSMgr)
     , _vdev(*((IntroWindow*)this))
     , _cProgressFrameColor(sal::static_int_cast< ColorData >(NOT_LOADED))
     , _cProgressBarColor(sal::static_int_cast< ColorData >(NOT_LOADED))
+    , _bNativeProgress(true)
     , _iMax(100)
     , _iProgress(0)
     , _eBitmapMode(BM_DEFAULTMODE)
@@ -298,6 +301,9 @@ void SplashScreen::loadConfig()
         OUString( RTL_CONSTASCII_USTRINGPARAM( "ProgressPosition" ) ) );
     OUString sFullScreenSplash = implReadBootstrapKey(
         OUString( RTL_CONSTASCII_USTRINGPARAM( "FullScreenSplash" ) ) );
+    OUString sNativeProgress = implReadBootstrapKey(
+        OUString( RTL_CONSTASCII_USTRINGPARAM( "NativeProgress" ) ) );
+                                                    
 
     // Determine full screen splash mode
     _bFullScreenSplash = (( sFullScreenSplash.getLength() > 0 ) && 
@@ -347,6 +353,11 @@ void SplashScreen::loadConfig()
             _cProgressBarColor = Color( nRed, nGreen, nBlue );
         }
     }
+    
+    if( sNativeProgress.getLength() )
+    {
+        _bNativeProgress = sNativeProgress.toBoolean();
+    }
 
     if ( sSize.getLength() )
     {
@@ -421,9 +432,15 @@ bool SplashScreen::loadBitmap(
     SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
     if ( !aStrm.GetError() )
     {
+        // Use graphic class to also support more graphic formats (bmp,png,...)
+        Graphic aGraphic;
+
+        GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
+        pGF->ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW );
+
         // Default case, we load the intro bitmap from a seperate file
         // (e.g. staroffice_intro.bmp or starsuite_intro.bmp)
-        aStrm >> _aIntroBmp;
+        _aIntroBmp = aGraphic.GetBitmapEx();
         return true;
     }
 
@@ -441,8 +458,14 @@ bool SplashScreen::findBitmap(rtl::OUString const & path) {
             haveBitmap = findAppBitmap(path);
     }
     if ( !haveBitmap )
+    {
         haveBitmap = loadBitmap(
-            path, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("intro.bmp")));
+            path, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("intro.png")));
+        if ( !haveBitmap )
+            haveBitmap = loadBitmap(
+                path, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("intro.bmp")));
+    }
+
     return haveBitmap;
 }
 
@@ -472,21 +495,34 @@ bool SplashScreen::findScreenBitmap(rtl::OUString const & path)
     aStrBuf.append( OUString::valueOf( nWidth ));
     aStrBuf.appendAscii( "x" );
     aStrBuf.append( OUString::valueOf( nHeight ));
-    aStrBuf.appendAscii( ".bmp" );
-    OUString aBmpFileName = aStrBuf.makeStringAndClear();
+    
+    OUString aRootIntroFileName = aStrBuf.makeStringAndClear();
+    OUString aBmpFileName       = aRootIntroFileName + OUString::createFromAscii(".png");
 
     bool haveBitmap = loadBitmap( path, aBmpFileName );
     if ( !haveBitmap )
     {
+        aBmpFileName = aRootIntroFileName + OUString::createFromAscii(".bmp");
+        haveBitmap   = loadBitmap( path, aBmpFileName );
+    }
+    
+    if ( !haveBitmap )
+    {
         aStrBuf.appendAscii( "intro_" );
         aStrBuf.appendAscii( "_" );
         aStrBuf.append( OUString::valueOf( nWidth ));
         aStrBuf.appendAscii( "x" );
         aStrBuf.append( OUString::valueOf( nHeight ));
-        aStrBuf.appendAscii( ".bmp" );
-        aBmpFileName = aStrBuf.makeStringAndClear();
+        
+        aRootIntroFileName = aStrBuf.makeStringAndClear();
+        aBmpFileName = aRootIntroFileName + OUString::createFromAscii(".png");
 
         haveBitmap = loadBitmap( path, aBmpFileName );
+        if ( !haveBitmap )
+        {
+            aBmpFileName = aRootIntroFileName + OUString::createFromAscii(".bmp");
+            haveBitmap   = loadBitmap( path, aBmpFileName );
+        }
     }
     return haveBitmap;
 }
@@ -501,9 +537,16 @@ bool SplashScreen::findAppBitmap(rtl::OUString const & path)
         aStrBuf.appendAscii( "intro_" );
         aStrBuf.appendAscii( "_" );
         aStrBuf.append( _sAppName );
-        aStrBuf.appendAscii( ".bmp" );
-        OUString aBmpFileName = aStrBuf.makeStringAndClear();
+        
+        OUString aRootIntroFileName = aStrBuf.makeStringAndClear();
+        
+        OUString aBmpFileName = aRootIntroFileName + OUString::createFromAscii( ".png" );
         haveBitmap = loadBitmap( path, aBmpFileName );
+        if ( !haveBitmap )
+        {
+            aBmpFileName = aRootIntroFileName + OUString::createFromAscii( ".bmp" );
+            haveBitmap = loadBitmap( path, aBmpFileName );
+        }
     }
     return haveBitmap;
 }
@@ -587,9 +630,9 @@ void SplashScreen::Paint( const Rectangle&)
     BOOL bNativeOK = FALSE;
     
     // in case of native controls we need to draw directly to the window
-    if( IsNativeControlSupported( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL ) )
+    if( _bNativeProgress && IsNativeControlSupported( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL ) )
     {
-        DrawBitmap( Point(), _aIntroBmp );
+        DrawBitmapEx( Point(), _aIntroBmp );
         
         ImplControlValue aValue( _iProgress * _barwidth / _iMax);
         Rectangle aDrawRect( Point(_tlx, _tly), Size( _barwidth, _barheight ) );
@@ -615,7 +658,7 @@ void SplashScreen::Paint( const Rectangle&)
     //non native drawing
     // draw bitmap
     if (_bPaintBitmap)
-        _vdev.DrawBitmap( Point(), _aIntroBmp );
+        _vdev.DrawBitmapEx( Point(), _aIntroBmp );
 
     if (_bPaintProgress) {
         // draw progress...
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index b8953b6651..680a91382c 100644
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
@@ -37,7 +37,7 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <vcl/introwin.hxx>
-#include <vcl/bitmap.hxx>
+#include <vcl/bitmapex.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <osl/mutex.hxx>
 #include <vcl/virdev.hxx>
@@ -89,9 +89,10 @@ private:
     Reference< XMultiServiceFactory > _rFactory;
 
     VirtualDevice   _vdev;
-    Bitmap          _aIntroBmp;
+    BitmapEx        _aIntroBmp;
     Color           _cProgressFrameColor;
     Color           _cProgressBarColor;
+    bool            _bNativeProgress;
     OUString        _sAppName;
     std::vector< FullScreenProgressRatioValue > _sFullScreenProgressRatioValues;
 
diff --git a/desktop/test/deployment/simple_license/suppress_license.oxt b/desktop/test/deployment/simple_license/suppress_license.oxt
new file mode 100755
index 0000000000..2bacd6aa37
--- /dev/null
+++ b/desktop/test/deployment/simple_license/suppress_license.oxt
diff --git a/desktop/test/deployment/simple_license/tests_simple_license.odt b/desktop/test/deployment/simple_license/tests_simple_license.odt
index b0f5410d99..b0c86e11c6 100644
--- a/desktop/test/deployment/simple_license/tests_simple_license.odt
+++ b/desktop/test/deployment/simple_license/tests_simple_license.odt
diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc
index 0e9f01ddc3..874adee77f 100644
--- a/desktop/util/ooverinfo.rc
+++ b/desktop/util/ooverinfo.rc
@@ -69,7 +69,7 @@ VS_VERSION_INFO versioninfo
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	"SOFFICE.EXE\0"
 				value "InternalName",		"SOFFICE\0"
-				value "LegalCopyright",		S_CRIGHT " Sun Microsystems, Inc.\0"
+				value "LegalCopyright",		S_CRIGHT " Oracle, Inc.\0"
 			}
 #else
 			block "040904E4"
@@ -81,7 +81,7 @@ VS_VERSION_INFO versioninfo
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	"SOFFICE.EXE\0"
 				value "InternalName", 		"SOFFICE\0"
-				value "LegalCopyright", 	S_CRIGHT " Sun Microsystems, Inc.\0"
+				value "LegalCopyright", 	S_CRIGHT " Oracle, Inc.\0"
 			}
 #endif
 		}
diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
index 105933ff13..5fcc8cc758 100644
--- a/desktop/util/verinfo.rc
+++ b/desktop/util/verinfo.rc
@@ -68,25 +68,25 @@ VS_VERSION_INFO versioninfo
 			block "040704E4"
 			{
 				// German StringTable
-				value "CompanyName",		"Sun Microsystems, Inc.\0"
+				value "CompanyName",		"Oracle, Inc.\0"
 				value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	"SOFFICE.EXE\0"
 				value "InternalName",		"SOFFICE\0"
-				value "LegalCopyright",		S_CRIGHT " Sun Microsystems, Inc.\0"
+				value "LegalCopyright",		S_CRIGHT " Oracle, Inc.\0"
 			}
 #else
 			block "040904E4"
 			{
 				// International StringTable
-				value "CompanyName", 		"Sun Microsystems, Inc.\0"
+				value "CompanyName", 		"Oracle, Inc.\0"
 				value "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	"SOFFICE.EXE\0"
 				value "InternalName", 		"SOFFICE\0"
-				value "LegalCopyright", 	S_CRIGHT " Sun Microsystems, Inc.\0"
+				value "LegalCopyright", 	S_CRIGHT " Oracle, Inc.\0"
 			}
 #endif
 		}
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 70e5c801b9..2845ac5979 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -40,17 +40,17 @@ TARGET=zipintro
 DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice nologo_broffice nologo_dev_broffice intro
 
 ZIP1LIST= \
-    $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS))
+    $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.png $(INTRO_BITMAPS)) \
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
 ZIP2LIST= \
-    $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS))
+    $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.png $(INTRO_BITMAPS)) \
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
 ZIP3LIST= \
-    $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS))
+    $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo$/introabout$/intro.png $(INTRO_BITMAPS)) \
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
 ZIP4LIST= \
-    $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS))
+    $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.png $(INTRO_BITMAPS)) \
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
 ZIP5LIST= \
     $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
     $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS))
@@ -58,11 +58,11 @@ ZIP6LIST= \
     $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
     $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS))
 ZIP7LIST= \
-        $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
-        $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS))
+    $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS))
 ZIP8LIST= \
-        $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
-        $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS))
+    $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS))
 
 ZIP1TARGET=dev_intro
 ZIP1DEPS=$(ZIP1LIST)
@@ -133,3 +133,6 @@ $(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
+$(MISC)$/%.png : $(SOLARSRC)$/%.png
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 068bdd0802..30d6fd5f75 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -62,14 +62,11 @@
 #define BMP_BACKING_FORMULA                 11
 #define BMP_BACKING_OPENFILE                12
 #define BMP_BACKING_OPENTEMPLATE            13
-#define BMP_BACKING_EXT                     14
 #define STR_BACKING_EXTHELP                 15
-#define BMP_BACKING_REG                     16
 #define STR_BACKING_REGHELP                 17
-#define BMP_BACKING_INFO                    18
 #define STR_BACKING_INFOHELP                19
-#define BMP_BACKING_TPLREP                  20
 #define STR_BACKING_TPLREP                  21
+#define BMP_BACKING_FOLDER                  22
 
 #define RES_BACKING_IMAGES                  (DLG_BACKING+1)
 #define RES_BACKING_IMAGES_HC               (DLG_BACKING+2)
@@ -79,6 +76,10 @@
 #define BMP_BACKING_BACKGROUND_RIGHT        3
 #define BMP_BACKING_BACKGROUND_RTL_LEFT     4
 #define BMP_BACKING_BACKGROUND_RTL_RIGHT    5
+#define BMP_BACKING_EXT                     6
+#define BMP_BACKING_REG                     7
+#define BMP_BACKING_INFO                    8
+#define BMP_BACKING_TPLREP                  9
 
 // Ids of TabWindow
 #define WIN_TABWINDOW                       (RID_FWK_DIALOG_START+101)
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index a33339003a..17bf03da0e 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -112,39 +112,66 @@ Size DecoToolBox::getMinSize()
     return maMinSize;
 }
 
+#define STC_BUTTON_STYLE  (WB_LEFT | WB_VCENTER | WB_FLATBUTTON | WB_BEVELBUTTON)
 
 BackingWindow::BackingWindow( Window* i_pParent ) :
     Window( i_pParent, FwkResId( DLG_BACKING ) ),
     maWelcome( this, WB_LEFT ),
     maProduct( this, WB_LEFT ),
-    maCreateText( this, WB_LEFT ),
     maWriterText( this, WB_WORDBREAK | WB_VCENTER ),
-    maWriterButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maWriterButton( this, STC_BUTTON_STYLE ),
     maCalcText( this, WB_WORDBREAK | WB_VCENTER ),
-    maCalcButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maCalcButton( this, STC_BUTTON_STYLE ),
     maImpressText( this, WB_WORDBREAK | WB_VCENTER ),
-    maImpressButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maImpressButton( this, STC_BUTTON_STYLE ),
+    maOpenText( this, WB_WORDBREAK | WB_VCENTER ),
+    maOpenButton( this, STC_BUTTON_STYLE ),
     maDrawText( this, WB_WORDBREAK | WB_VCENTER ),
-    maDrawButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maDrawButton( this, STC_BUTTON_STYLE ),
     maDBText( this, WB_WORDBREAK | WB_VCENTER ),
-    maDBButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maDBButton( this, STC_BUTTON_STYLE ),
     maMathText( this, WB_WORDBREAK | WB_VCENTER ),
-    maMathButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maMathButton( this, STC_BUTTON_STYLE ),
     maTemplateText( this, WB_WORDBREAK | WB_VCENTER ),
-    maTemplateButton( this, WB_CENTER | WB_BEVELBUTTON ),
-    maOpenText( this, WB_WORDBREAK | WB_VCENTER ),
-    maOpenButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maTemplateButton( this, STC_BUTTON_STYLE ),
     maToolbox( this, WB_DIALOGCONTROL ),
     maWelcomeString( FwkResId( STR_BACKING_WELCOME ) ),
     maProductString( FwkResId( STR_BACKING_WELCOMEPRODUCT ) ),
-    maCreateString( FwkResId( STR_BACKING_CREATE ) ),
     maOpenString( FwkResId( STR_BACKING_FILE ) ),
     maTemplateString( FwkResId( STR_BACKING_TEMPLATE ) ),
     maButtonImageSize( 10, 10 ),
     mbInitControls( false ),
-    mpAccExec( NULL )
+    mnLayoutStyle( 0 ),
+    mpAccExec( NULL ),
+    mnBtnPos( 120 )
 {
     mnColumnWidth[0] = mnColumnWidth[1] = 0;
+    mnTextColumnWidth[0] = mnTextColumnWidth[1] = 0;
+
+    try
+    {
+        Reference<lang::XMultiServiceFactory> xConfig( comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_CFGPROVIDER),UNO_QUERY);
+        if( xConfig.is() )
+        {
+            Sequence<Any> args(1);
+            PropertyValue val(
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("nodepath") ),
+                0,
+                Any(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common/Help/StartCenter"))),
+                PropertyState_DIRECT_VALUE);
+            args.getArray()[0] <<= val;
+            Reference<container::XNameAccess> xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,args), UNO_QUERY);
+            if( xNameAccess.is() )
+            {
+                //throws css::container::NoSuchElementException, css::lang::WrappedTargetException
+                Any value( xNameAccess->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartCenterLayoutStyle"))) );
+                mnLayoutStyle = value.get<sal_Int32>();
+            }
+        }
+    }
+    catch (Exception& )
+    {
+    }
     
     // get icon images from vcl resource and set them on the appropriate buttons
     loadImage( FwkResId( BMP_BACKING_WRITER ), maWriterButton );
@@ -153,16 +180,12 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     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 );
+    loadImage( FwkResId( BMP_BACKING_FOLDER ), maOpenButton );
+    loadImage( FwkResId( BMP_BACKING_FOLDER ), maTemplateButton );
     
-    BitmapEx aExtImage( FwkResId( BMP_BACKING_EXT ) );
     String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
-    BitmapEx aRegImage( FwkResId( BMP_BACKING_REG ) );
     String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
-    BitmapEx aInfoImage( FwkResId( BMP_BACKING_INFO ) );
     String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
-    BitmapEx aTplRepImage( FwkResId( BMP_BACKING_TPLREP ) );
     String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) );
     
     // clean up resource stack
@@ -182,25 +205,25 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     maToolbox.SetStyle( maToolbox.GetStyle() | WB_FORCETABCYCLE );
 
     // insert toolbox items
-    maToolbox.InsertItem( nItemId_TplRep, Image( aTplRepImage ) );
+    maToolbox.InsertItem( nItemId_TplRep, Image() );
     maToolbox.SetItemText( nItemId_TplRep, aTplRepHelpText );
     maToolbox.SetQuickHelpText( nItemId_TplRep, aTplRepHelpText );
     maToolbox.SetItemCommand( nItemId_TplRep, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:TemplateRepository" ) ) );
     maToolbox.ShowItem( nItemId_TplRep );
 
-    maToolbox.InsertItem( nItemId_Extensions, Image( aExtImage ) );
+    maToolbox.InsertItem( nItemId_Extensions, Image() );
     maToolbox.SetQuickHelpText( nItemId_Extensions, aExtHelpText );
     maToolbox.SetItemText( nItemId_Extensions, aExtHelpText );
     maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) );
     maToolbox.ShowItem( nItemId_Extensions );
     
-    maToolbox.InsertItem( nItemId_Reg, Image( aRegImage ) );
+    maToolbox.InsertItem( nItemId_Reg, Image() );
     maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText );
     maToolbox.SetItemText( nItemId_Reg, aRegHelpText );
     maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) );
     maToolbox.ShowItem( nItemId_Reg );
     
-    maToolbox.InsertItem( nItemId_Info, Image( aInfoImage ) );
+    maToolbox.InsertItem( nItemId_Info, Image() );
     maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
     maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
     maToolbox.SetItemCommand( nItemId_Info, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Info" ) ) );
@@ -254,7 +277,13 @@ void BackingWindow::initBackground()
     SetBackground( GetSettings().GetStyleSettings().GetWorkspaceGradient() );
     
     bool bDark = GetSettings().GetStyleSettings().GetHighContrastMode();
-    maWelcomeTextColor = maLabelTextColor =  bDark ? Color( COL_WHITE ) : Color( 0x26, 0x35, 0x42 );
+    if( bDark )
+        maWelcomeTextColor = maLabelTextColor = Color( COL_WHITE );
+    else if( mnLayoutStyle == 1 )
+        maWelcomeTextColor = maLabelTextColor = Color( COL_BLACK );
+    else 
+        maWelcomeTextColor = maLabelTextColor = Color( 0x26, 0x35, 0x42 );
+    
     Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE );
 
     // select image set
@@ -281,13 +310,15 @@ void BackingWindow::initBackground()
         maBackgroundLeft = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_LEFT ) );
         maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT ) );
     }
+    maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId( BMP_BACKING_EXT ) ) );
+    maToolbox.SetItemImage( nItemId_Reg, BitmapEx( FwkResId( BMP_BACKING_REG ) ) );
+    maToolbox.SetItemImage( nItemId_Info, BitmapEx( FwkResId( BMP_BACKING_INFO ) ) );
+    maToolbox.SetItemImage( nItemId_TplRep, BitmapEx( FwkResId( BMP_BACKING_TPLREP ) ) );
 
     maWelcome.SetControlForeground( maWelcomeTextColor );
     maWelcome.SetBackground();
     maProduct.SetControlForeground( maWelcomeTextColor );
     maProduct.SetBackground();
-    maCreateText.SetControlForeground( maLabelTextColor );
-    maCreateText.SetControlBackground( aTextBGColor );
     maWriterText.SetControlForeground( maLabelTextColor );
     maWriterText.SetControlBackground( aTextBGColor );
     maCalcText.SetControlForeground( maLabelTextColor );
@@ -304,6 +335,14 @@ void BackingWindow::initBackground()
     maTemplateText.SetControlBackground( aTextBGColor );
     maOpenText.SetControlForeground( maLabelTextColor );
     maOpenText.SetControlBackground( aTextBGColor );
+    
+    if( mnLayoutStyle == 1 )
+    {
+        if( Application::GetSettings().GetLayoutRTL() )
+            mnBtnPos = maBackgroundRight.GetSizePixel().Width() + 40;
+        else
+            mnBtnPos = maBackgroundLeft.GetSizePixel().Width() + 40;
+    }
 }
 
 void BackingWindow::initControls()
@@ -339,11 +378,9 @@ void BackingWindow::initControls()
     
     nYPos += (maWelcomeSize.Height()*3)/2;
     
-    if( maControlRect.GetWidth() < nBtnPos + maWelcomeSize.Width() + 20 )
-        maControlRect.Right() = maControlRect.Left() + maWelcomeSize.Width() + nBtnPos + 20;
+    if( maControlRect.GetWidth() < mnBtnPos + maWelcomeSize.Width() + 20 )
+        maControlRect.Right() = maControlRect.Left() + maWelcomeSize.Width() + mnBtnPos + 20;
 
-    maWelcome.Show();
-    
     nYPos += maWelcomeSize.Height();
     
     // set product string
@@ -360,10 +397,14 @@ void BackingWindow::initControls()
     maProductSize = Size( maProduct.GetTextWidth( maProductString ), maProduct.GetTextHeight() );
     maProductSize.Width() = (maProductSize.Width() * 20)/19;
     
-    if( maControlRect.GetWidth() < maProductSize.Width() + nBtnPos + 10 )
-        maControlRect.Right() = maControlRect.Left() + maProductSize.Width() + nBtnPos + 10;
+    if( maControlRect.GetWidth() < maProductSize.Width() + mnBtnPos + 10 )
+        maControlRect.Right() = maControlRect.Left() + maProductSize.Width() + mnBtnPos + 10;
 
-    maProduct.Show();
+    if( mnLayoutStyle == 1 )
+    {
+        maWelcome.Show();        
+        maProduct.Show();
+    }
     
     nYPos += (maProductSize.Height()*3)/2;
     
@@ -371,14 +412,6 @@ void BackingWindow::initControls()
     maTextFont.SetSize( Size( 0, 11 ) );
     maTextFont.SetWeight( WEIGHT_NORMAL );
     
-    maCreateText.SetText( maCreateString );
-    maCreateText.SetFont( maTextFont );
-    maCreateText.SetControlFont( maTextFont );
-    maCreateSize = Size( maCreateText.GetTextWidth( maCreateString ), maCreateText.GetTextHeight() );
-    maCreateText.Show();
-    
-    nYPos += (maCreateSize.Height()*3)/2;
-
     // collect the URLs of the entries in the File/New menu
     SvtModuleOptions	aModuleOptions;
     std::set< rtl::OUString > aFileNewAppsAvailable;
@@ -421,41 +454,62 @@ void BackingWindow::initControls()
     layoutButtonAndText( WRITER_URL, 0, aFileNewAppsAvailable,
                          aModuleOptions, SvtModuleOptions::E_SWRITER,
                          maWriterButton, maWriterText, aMnemns );
-    layoutButtonAndText( CALC_URL, 1, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SCALC,
-                         maCalcButton, maCalcText, aMnemns );
-    nYPos += maButtonImageSize.Height() + 10;
-    layoutButtonAndText( IMPRESS_WIZARD_URL, 0, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SIMPRESS,
-                         maImpressButton, maImpressText, aMnemns );
     layoutButtonAndText( DRAW_URL, 1, aFileNewAppsAvailable,
                          aModuleOptions, SvtModuleOptions::E_SDRAW,
                          maDrawButton, maDrawText, aMnemns );
     nYPos += maButtonImageSize.Height() + 10;
-    layoutButtonAndText( BASE_URL, 0, aFileNewAppsAvailable,
+    layoutButtonAndText( CALC_URL, 0, aFileNewAppsAvailable,
+                         aModuleOptions, SvtModuleOptions::E_SCALC,
+                         maCalcButton, maCalcText, aMnemns );
+    layoutButtonAndText( BASE_URL, 1, aFileNewAppsAvailable,
                          aModuleOptions, SvtModuleOptions::E_SDATABASE,
                          maDBButton, maDBText, 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 );
     
     nYPos += 3*maButtonImageSize.Height() / 2;
-    layoutButtonAndText( NULL, -1, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SWRITER,
-                         maTemplateButton, maTemplateText, aMnemns, maTemplateString );
-
-    nYPos += 10;
-    layoutButtonAndText( NULL, -1, aFileNewAppsAvailable,
+    
+    layoutButtonAndText( NULL, 0, aFileNewAppsAvailable,
                          aModuleOptions, SvtModuleOptions::E_SWRITER,
                          maOpenButton, maOpenText, aMnemns, maOpenString );
+    layoutButtonAndText( NULL, 1, aFileNewAppsAvailable,
+                         aModuleOptions, SvtModuleOptions::E_SWRITER,
+                         maTemplateButton, maTemplateText, aMnemns, maTemplateString );    
     nYPos += 10;
     
     DBG_ASSERT( nYPos < maControlRect.GetHeight(), "misformatting !" );
-    if( mnColumnWidth[0] + mnColumnWidth[1] + nBtnPos + 20 > maControlRect.GetWidth() )
-        maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] + mnColumnWidth[1] + nBtnPos + 20;
+    if( mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20 > maControlRect.GetWidth() )
+        maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20;
+    
+    mnTextColumnWidth[0] = mnColumnWidth[0];
+    mnTextColumnWidth[1] = mnColumnWidth[1];
+    
+    if( mnTextColumnWidth[1] > mnTextColumnWidth[0] )
+    {
+        mnColumnWidth[0]     = mnColumnWidth[1];
+        mnTextColumnWidth[0] = mnTextColumnWidth[1];
+    }
+    else
+    {
+        mnColumnWidth[1]     = mnColumnWidth[0];
+        mnTextColumnWidth[1] = mnTextColumnWidth[0];
+    }
+    if( maControlRect.GetWidth() < maControlRect.GetHeight() * 3 / 2 )
+    {
+        maControlRect.Right() = maControlRect.Left() + maControlRect.GetHeight() * 3 / 2;
+        long nDelta = (maControlRect.GetWidth() - mnBtnPos - mnColumnWidth[1] - mnColumnWidth[0] - 20);
+        mnColumnWidth[0] += nDelta/2;
+        mnColumnWidth[1] += nDelta/2;
+    }
     
     maToolbox.SetSelectHdl( LINK( this, BackingWindow, ToolboxHdl ) );
-    maToolbox.Show();
+    if( mnLayoutStyle == 0 )
+        maToolbox.Show();
     
     // scale middle map to formatted width
     Size aMiddleSegmentSize( maControlRect.GetSize().Width() + nShadowLeft + nShadowRight,
@@ -504,39 +558,34 @@ void BackingWindow::layoutButtonAndText(
         i_rBtn.Enable( FALSE );
     }
     
-    // setup text
-    i_rText.SetFont( maTextFont );
-    i_rText.SetControlFont( maTextFont );
+    i_rBtn.SetFont( maTextFont );
+    i_rBtn.SetControlFont( maTextFont );
     String aText( i_rStr.Len() ? i_rStr : SvFileInformationManager::GetDescription( INetURLObject( aURL ) ) );
     i_rMnemns.CreateMnemonic( aText );
-    i_rText.SetText( aText );
-
-    long nTextWidth = i_rText.GetTextWidth( i_rText.GetText() );
-    i_rText.SetPaintTransparent( TRUE );
+    i_rBtn.SetText( aText );
+    
+    long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() );
 
-    nTextWidth += maButtonImageSize.Width() + 30;
+    nTextWidth += maButtonImageSize.Width();
     if( nColumn >= 0 && nColumn < static_cast<int>(sizeof(mnColumnWidth)/sizeof(mnColumnWidth[0])) )
     {
         if( nTextWidth > mnColumnWidth[nColumn] )
             mnColumnWidth[nColumn] = nTextWidth;
     }
     
+    i_rBtn.SetImageAlign( IMAGEALIGN_LEFT );
     // show the controls
     i_rBtn.Show();
-    i_rText.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& )
 {
-    bool bDark = GetSettings().GetStyleSettings().GetHighContrastMode();
-    
-    Color aBackColor( bDark ? COL_BLACK : COL_WHITE );
-
-    // fill control rect
-    SetLineColor();
-    SetFillColor( aBackColor );
-    DrawRect( maControlRect );
-    
     // draw bitmap
     if( GetSettings().GetLayoutRTL() )
     {
@@ -602,8 +651,10 @@ void BackingWindow::Resize()
     
     maToolbox.calcMinSize();
     Size aTBSize( maToolbox.getMinSize() );
-    Point aTBPos( maControlRect.Right() - aTBSize.Width() - 10,
+    Point aTBPos( maControlRect.Left() + mnBtnPos,
                   maControlRect.Bottom() - aTBSize.Height() - 10 );
+    if( Application::GetSettings().GetLayoutRTL() )
+        aTBPos.X() = maControlRect.Right() - aTBSize.Width() - mnBtnPos;
     maToolbox.SetPosSizePixel( aTBPos, aTBSize );
 
     // #i93631# squeeze controls so they fit into the box
@@ -612,7 +663,6 @@ void BackingWindow::Resize()
     const long nWDelta    = maWelcomeSize.Height();
     const long nW2Delta   = (maWelcomeSize.Height()*3)/2;
     const long nPDelta    = (maProductSize.Height()*3)/2;
-    const long nCDelta    = (maCreateSize.Height()*3)/2;
     const long nBDelta    = maButtonImageSize.Height() + 10;
     const long nB2Delta   = 3*maButtonImageSize.Height()/2;
     const long nLastDelta = maButtonImageSize.Height();
@@ -621,7 +671,6 @@ void BackingWindow::Resize()
                  (nWDelta - nDiff) +
                  (nW2Delta- nDiff) +
                  (nPDelta - nDiff) +
-                 (nCDelta - nDiff) +
              3 * (nBDelta - nDiff) +
                  (nB2Delta- nDiff) +
                  nLastDelta
@@ -632,47 +681,26 @@ void BackingWindow::Resize()
     
     long nYPos = maControlRect.Top();
     nYPos += nW2Delta - nDiff;
-    maWelcome.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ),
-                                Size( maControlRect.GetWidth() - nBtnPos - 5, (maWelcomeSize.Height()*20)/19 ) );
+    maWelcome.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ),
+                                Size( maControlRect.GetWidth() - mnBtnPos - 5, (maWelcomeSize.Height()*20)/19 ) );
     nYPos += nWDelta - nDiff;    
-    maProduct.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), Size( maControlRect.GetWidth() - nBtnPos - 5, (maProductSize.Height()*20)/19 ) );
+    maProduct.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( maControlRect.GetWidth() - mnBtnPos - 5, (maProductSize.Height()*20)/19 ) );
     nYPos += nPDelta - nDiff;
     
-    maCreateText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ),
-                                  Size( maControlRect.GetWidth() - nBtnPos - 5, maCreateSize.Height() ) );
-    
-    nYPos += nCDelta - nDiff;
+    nYPos += nWDelta/2 - nDiff;
 
-    maWriterButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), maButtonImageSize );
-    maWriterText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10, nYPos ),
-                                  Size( mnColumnWidth[0] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
-    maCalcButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + mnColumnWidth[0], nYPos ), maButtonImageSize );
-    maCalcText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10 + mnColumnWidth[0], nYPos ),
-                                  Size( mnColumnWidth[1] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
+    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;
-    maImpressButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), maButtonImageSize );
-    maImpressText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10, nYPos ),
-                                  Size( mnColumnWidth[0] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
-    maDrawButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + mnColumnWidth[0], nYPos ), maButtonImageSize );
-    maDrawText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10 + mnColumnWidth[0], nYPos ),
-                                  Size( mnColumnWidth[1] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
+    maCalcButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
+    maDBButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
     nYPos += nBDelta - nDiff;
-    maDBButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), maButtonImageSize );
-    maDBText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10, nYPos ),
-                                  Size( mnColumnWidth[0] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
-    maMathButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + mnColumnWidth[0], nYPos ), maButtonImageSize );
-    maMathText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10 + mnColumnWidth[0], nYPos ),
-                                    Size( mnColumnWidth[1] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
+    maImpressButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
+    maMathButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
 
     nYPos += nB2Delta - nDiff;
-    maTemplateButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), maButtonImageSize );
-    maTemplateText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10, nYPos ),
-                                Size( mnColumnWidth[0]+mnColumnWidth[1] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
-    nYPos += nBDelta - nDiff;
-    maOpenButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), maButtonImageSize );
-    maOpenText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10, nYPos ),
-                                Size( mnColumnWidth[0]+mnColumnWidth[1] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
-    nYPos += nBDelta - nDiff;
+    maOpenButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
+    maTemplateButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
 }
 
 IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index 9722ddfc86..36cd692513 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -89,14 +89,14 @@ namespace framework
         Size                            maWelcomeSize;
         FixedText                       maProduct;
         Size                            maProductSize;
-        FixedText                       maCreateText;
-        Size                            maCreateSize;
         FixedText                       maWriterText;
         ImageButton                     maWriterButton;
         FixedText                       maCalcText;
         ImageButton                     maCalcButton;
         FixedText                       maImpressText;
         ImageButton                     maImpressButton;
+        FixedText                       maOpenText;
+        ImageButton                     maOpenButton;
         FixedText                       maDrawText;
         ImageButton                     maDrawButton;
         FixedText                       maDBText;
@@ -105,8 +105,6 @@ namespace framework
         ImageButton                     maMathButton;
         FixedText                       maTemplateText;
         ImageButton                     maTemplateButton;
-        FixedText                       maOpenText;
-        ImageButton                     maOpenButton;
         
         DecoToolBox                     maToolbox;
         
@@ -124,16 +122,18 @@ namespace framework
         Rectangle                       maControlRect;
         
         long                            mnColumnWidth[2];
+        long                            mnTextColumnWidth[2];
         Color                           maLabelTextColor;
         Color                           maWelcomeTextColor;
         
         Size                            maButtonImageSize;
         
         bool                            mbInitControls;
+        sal_Int32                       mnLayoutStyle;
         svt::AcceleratorExecute*        mpAccExec;
-
+        
+        long                            mnBtnPos;
                 
-        static const long nBtnPos = 240;
         static const int nItemId_Extensions = 1;
         static const int nItemId_Reg = 2;
         static const int nItemId_Info = 3;
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index b3916da9e3..8a10752c81 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -80,42 +80,22 @@ Window DLG_BACKING
     {
         File = "odf_32.png";
     };
-    Bitmap BMP_BACKING_OPENFILE
+    Bitmap BMP_BACKING_FOLDER
     {
-        File = "open_32.png";
-    };
-    Bitmap BMP_BACKING_OPENTEMPLATE
-    {
-        File = "template_32.png";
-    };
-    Bitmap BMP_BACKING_EXT
-    {
-        File = "extension_plus_26.png";
+        File = "folder_32.png";
     };
     String STR_BACKING_EXTHELP
     {
         Text [ en-US ] = "Add new features to %PRODUCTNAME";
     };
-    Bitmap BMP_BACKING_REG
-    {
-        File = "register_32.png";
-    };
     String STR_BACKING_REGHELP
     {
         Text [ en-US ] = "Register your %PRODUCTNAME";
     };
-    Bitmap BMP_BACKING_INFO
-    {
-        File = "info_26.png";
-    };
     String STR_BACKING_INFOHELP
     {
         Text [ en-US ] = "Get more information about %PRODUCTNAME";
     };
-    Bitmap BMP_BACKING_TPLREP
-    {
-        File = "addtemplate_32.png";
-    };
     String STR_BACKING_TPLREP
     {
         Text [ en-US ] = "Get more templates for %PRODUCTNAME";
@@ -144,6 +124,22 @@ Resource RES_BACKING_IMAGES
     {
         File = "backing_rtl_right.png";
     };
+    Bitmap BMP_BACKING_EXT
+    {
+        File = "extension.png";
+    };
+    Bitmap BMP_BACKING_REG
+    {
+        File = "register_32.png";
+    };
+    Bitmap BMP_BACKING_INFO
+    {
+        File = "info_26.png";
+    };
+    Bitmap BMP_BACKING_TPLREP
+    {
+        File = "addtemplate_32.png";
+    };
 };
 
 Resource RES_BACKING_IMAGES_HC
@@ -168,6 +164,22 @@ Resource RES_BACKING_IMAGES_HC
     {
         File = "backing_rtl_right_hc.png";
     };
+    Bitmap BMP_BACKING_EXT
+    {
+        File = "extension_hc.png";
+    };
+    Bitmap BMP_BACKING_REG
+    {
+        File = "register_hc.png";
+    };
+    Bitmap BMP_BACKING_INFO
+    {
+        File = "info_hc.png";
+    };
+    Bitmap BMP_BACKING_TPLREP
+    {
+        File = "template_hc.png";
+    };
 };
 
 Window WIN_TABWINDOW
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index c9747dc9de..cd8c0c83dc 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -116,6 +116,9 @@
         <prop oor:name="TemplateRepositoryURL" oor:type="xs:string">
             <value>${STARTCENTER_TEMPLREP_URL}</value>
         </prop>
+        <prop oor:name="StartCenterLayoutStyle" oor:type="xs:int">
+            <value>${STARTCENTER_LAYOUT_STYLE}</value>
+        </prop>
     </node>
     <node oor:name="Registration">
       <prop oor:name="TemplateURL">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index bc52e1136d..d8c92a59de 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -132,9 +132,6 @@
                 <prop oor:name="DockingArea" oor:type="xs:int">
                     <value>0</value>
                 </prop>
-                <prop oor:name="Style" oor:type="xs:int">
-                    <value>2</value>
-                </prop>
                 <prop oor:name="Visible" oor:type="xs:boolean">
                     <value>true</value>
                 </prop>
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 75d67f0a01..3ed8e9e89b 100644..100755
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -754,174 +754,182 @@
             <value>true</value>
         </prop>
     </node>
-    <node oor:name="Migration">
-        <prop oor:name="SupportedVersions">
-                  <value oor:separator=",">OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
+  <node oor:name="Migration">
+    <node oor:name="SupportedVersions">
+      <node oor:name="OpenOffice.org2+StarOffice8+StarSuite8" oor:op="replace">
+        <prop oor:name="Priority">
+          <value>10</value>
         </prop>
-        <node oor:name="MigrationSteps">
-            <node oor:name="Datasources" oor:op="replace">
-                <prop oor:name="IncludedFiles">
-                    <value>.*/database/biblio/biblio\.dbf</value>
-                </prop>
-                <prop oor:name="ExcludedFiles">
-                </prop>
-                <prop oor:name="IncludedNodes">
-          <value>org.openoffice.Office.DataAccess</value>
-                </prop>
-                <prop oor:name="ExcludedNodes">
-           <value>
-           org.openoffice.Office.DataAccess/Bibliography
-           org.openoffice.Office.DataAccess/ConnectionPool
-           org.openoffice.Office.DataAccess/DataSources
-           org.openoffice.Office.DataAccess/DriverManager
-         </value>
-                </prop>
-            </node>
-            <node oor:name="Deployment" oor:op="replace">
-                <prop oor:name="MigrationService">
-                    <value>com.sun.star.migration.Extensions</value>
-                </prop>
-            </node>
-            <node oor:name="Inet" oor:op="replace">
-                <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Inet
-                    </value>
-                </prop>
-            </node>
-            <node oor:name="Basic" oor:op="replace">
-                <prop oor:name="MigrationService">
-                    <value>com.sun.star.migration.Basic</value>
-                </prop>
-            </node>
-      <node oor:name="UserProfile" oor:op="replace">
-                <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.UserProfile</value>
-                </prop>
-            </node>
-      <node oor:name="Common" oor:op="replace">
-        <prop oor:name="IncludedFiles">
-                    <value>
-            .*/autotext/.*
-            .*/autocorr/.*
-            .*/config/.*\.so[bcdegh]
-            .*/config/soffice.cfg/modules/.*/toolbar/custom.*\.xml
-            .*/config/soffice.cfg/modules/.*/images/.*
-            .*/gallery/.*
-            .*/template/.*
-          </value>
-                </prop>
-        <prop oor:name="IncludedNodes">
-          <value>
-            org.openoffice.Office.Compatibility
-            org.openoffice.Office.Custom
-            org.openoffice.Office.Embedding
-            org.openoffice.Office.Events
-            org.openoffice.Office.ExtendedColorScheme
-            org.openoffice.Office.Common/Accessibility
-            org.openoffice.Office.Common/Accessibility/AutoDetectSystemHC
-            org.openoffice.Office.Common/AsianLayout
-            org.openoffice.Office.Common/AutoCorrect
-            org.openoffice.Office.Common/Cache
-            org.openoffice.Office.Common/DateFormat
-            org.openoffice.Office.Common/ExternalMailer/Program
-            org.openoffice.Office.Common/Filter
-            org.openoffice.Office.Common/Font
-            org.openoffice.Office.Common/Forms
-            org.openoffice.Office.Common/Gallery
-            org.openoffice.Office.Common/Help
-            org.openoffice.Office.Common/History
-            org.openoffice.Office.Common/I18N
-            org.openoffice.Office.Common/InternalMSExport
-            org.openoffice.Office.Common/Load
-            org.openoffice.Office.Common/Misc/FormControlPilotsEnabled
-            org.openoffice.Office.Common/Misc/PluginsEnabled
-            org.openoffice.Office.Common/Misc/SymbolSet
-            org.openoffice.Office.Common/Misc/UseSystemFileDialog
-            org.openoffice.Office.Common/Misc/UseSystemPrintDialog
-            org.openoffice.Office.Common/Misc/SymbolStyle
-            org.openoffice.Office.Common/Passwords
-            org.openoffice.Office.Common/Print/PrintingModifiesDocument
-            org.openoffice.Office.Common/Print/Warning
-            org.openoffice.Office.Common/Vectorize
-            org.openoffice.Office.Common/Save
-            org.openoffice.Office.Common/SearchOptions
-            org.openoffice.Office.Common/Undo
-            org.openoffice.Office.Common/View/Dialog/Dialog/MiddleMouseButton
-            org.openoffice.Office.Common/View/Dialog/MousePositioning
-            org.openoffice.Office.Common/View/Localization
-            org.openoffice.Office.Common/View/Menu
-            org.openoffice.Office.Common/_3D_Engine
-          </value>
-        </prop>
-                 <prop oor:name="ExcludedNodes">
-          <value>
-            org.openoffice.Office.Common/_3D_Engine/OpenGL
-            org.openoffice.Office.Common/Help/Registration
-          </value>
-                </prop>
-      </node>
-             <node oor:name="Calc" oor:op="replace">
-                <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Calc</value>
-                </prop>
-            </node>
-      <node oor:name="Chart" oor:op="replace">
-                <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Chart</value>
-                </prop>
-            </node>
-      <node oor:name="Draw" oor:op="replace">
-                <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Draw</value>
-                </prop>
-            </node>
-      <node oor:name="Impress" oor:op="replace">
-                <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Impress</value>
-                </prop>
-            </node>
-      <node oor:name="Labels" oor:op="replace">
-                <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Labels</value>
-                </prop>
-            </node>
-      <node oor:name="Linguistic" oor:op="replace">
-        <prop oor:name="MigrationService">
-          <value>com.sun.star.migration.Wordbooks</value>
-        </prop>
-        <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Linguistic</value>
-                </prop>
-                 <prop oor:name="ExcludedNodes">
-          <value>org.openoffice.Office.Linguistic/ServiceManager</value>
-        </prop>
-            </node>
-      <node oor:name="Math" oor:op="replace">
-                <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Math</value>
-                </prop>
-            </node>
-      <node oor:name="Security" oor:op="replace">
-                <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Security</value>
-                </prop>
-            </node>
-      <node oor:name="UI" oor:op="replace">
-                <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.UI/ColorScheme</value>
-                </prop>
-            </node>
-      <node oor:name="Writer" oor:op="replace">
-                <prop oor:name="IncludedNodes">
-                    <value>
-            org.openoffice.Office.Writer
-                  org.openoffice.Office.WriterWeb
-          </value>
-                </prop>
-                <prop oor:name="ExcludedNodes">
-          <value>org.openoffice.Office.Writer/Wizard</value>
+        <prop oor:name="VersionIdentifiers">
+          <value oor:separator=",">OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
         </prop>
+        <node oor:name="MigrationSteps">
+          <node oor:name="Datasources" oor:op="replace">
+            <prop oor:name="IncludedFiles">
+              <value>.*/database/biblio/biblio\.dbf</value>
+            </prop>
+            <prop oor:name="ExcludedFiles">
+            </prop>
+            <prop oor:name="IncludedNodes">
+              <value>org.openoffice.Office.DataAccess</value>
+            </prop>
+            <prop oor:name="ExcludedNodes">
+              <value>
+                org.openoffice.Office.DataAccess/Bibliography
+                org.openoffice.Office.DataAccess/ConnectionPool
+                org.openoffice.Office.DataAccess/DataSources
+                org.openoffice.Office.DataAccess/DriverManager
+              </value>
+            </prop>
+          </node>
+          <node oor:name="Deployment" oor:op="replace">
+            <prop oor:name="MigrationService">
+              <value>com.sun.star.migration.Extensions</value>
+            </prop>
+          </node>
+          <node oor:name="Inet" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>
+                org.openoffice.Inet
+              </value>
+            </prop>
+          </node>
+          <node oor:name="Basic" oor:op="replace">
+            <prop oor:name="MigrationService">
+              <value>com.sun.star.migration.Basic</value>
+            </prop>
+          </node>
+          <node oor:name="UserProfile" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>org.openoffice.UserProfile</value>
+            </prop>
+          </node>
+          <node oor:name="Common" oor:op="replace">
+            <prop oor:name="IncludedFiles">
+              <value>
+                .*/autotext/.*
+                .*/autocorr/.*
+                .*/config/.*\.so[bcdegh]
+                .*/config/soffice.cfg/modules/.*/toolbar/custom.*\.xml
+                .*/config/soffice.cfg/modules/.*/images/.*
+                .*/gallery/.*
+                .*/template/.*
+              </value>
+            </prop>
+            <prop oor:name="IncludedNodes">
+              <value>
+                org.openoffice.Office.Compatibility
+                org.openoffice.Office.Custom
+                org.openoffice.Office.Embedding
+                org.openoffice.Office.Events
+                org.openoffice.Office.ExtendedColorScheme
+                org.openoffice.Office.Common/Accessibility
+                org.openoffice.Office.Common/Accessibility/AutoDetectSystemHC
+                org.openoffice.Office.Common/AsianLayout
+                org.openoffice.Office.Common/AutoCorrect
+                org.openoffice.Office.Common/Cache
+                org.openoffice.Office.Common/DateFormat
+                org.openoffice.Office.Common/ExternalMailer/Program
+                org.openoffice.Office.Common/Filter
+                org.openoffice.Office.Common/Font
+                org.openoffice.Office.Common/Forms
+                org.openoffice.Office.Common/Gallery
+                org.openoffice.Office.Common/Help
+                org.openoffice.Office.Common/History
+                org.openoffice.Office.Common/I18N
+                org.openoffice.Office.Common/InternalMSExport
+                org.openoffice.Office.Common/Load
+                org.openoffice.Office.Common/Misc/FormControlPilotsEnabled
+                org.openoffice.Office.Common/Misc/PluginsEnabled
+                org.openoffice.Office.Common/Misc/SymbolSet
+                org.openoffice.Office.Common/Misc/UseSystemFileDialog
+                org.openoffice.Office.Common/Misc/UseSystemPrintDialog
+                org.openoffice.Office.Common/Misc/SymbolStyle
+                org.openoffice.Office.Common/Passwords
+                org.openoffice.Office.Common/Print/PrintingModifiesDocument
+                org.openoffice.Office.Common/Print/Warning
+                org.openoffice.Office.Common/Vectorize
+                org.openoffice.Office.Common/Save
+                org.openoffice.Office.Common/SearchOptions
+                org.openoffice.Office.Common/Undo
+                org.openoffice.Office.Common/View/Dialog/Dialog/MiddleMouseButton
+                org.openoffice.Office.Common/View/Dialog/MousePositioning
+                org.openoffice.Office.Common/View/Localization
+                org.openoffice.Office.Common/View/Menu
+                org.openoffice.Office.Common/_3D_Engine
+              </value>
+            </prop>
+            <prop oor:name="ExcludedNodes">
+              <value>
+                org.openoffice.Office.Common/_3D_Engine/OpenGL
+                org.openoffice.Office.Common/Help/Registration
+              </value>
+            </prop>
+          </node>
+          <node oor:name="Calc" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>org.openoffice.Office.Calc</value>
+            </prop>
+          </node>
+          <node oor:name="Chart" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>org.openoffice.Office.Chart</value>
+            </prop>
+          </node>
+          <node oor:name="Draw" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>org.openoffice.Office.Draw</value>
+            </prop>
+          </node>
+          <node oor:name="Impress" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>org.openoffice.Office.Impress</value>
+            </prop>
+          </node>
+          <node oor:name="Labels" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>org.openoffice.Office.Labels</value>
+            </prop>
+          </node>
+          <node oor:name="Linguistic" oor:op="replace">
+            <prop oor:name="MigrationService">
+              <value>com.sun.star.migration.Wordbooks</value>
+            </prop>
+            <prop oor:name="IncludedNodes">
+              <value>org.openoffice.Office.Linguistic</value>
+            </prop>
+            <prop oor:name="ExcludedNodes">
+              <value>org.openoffice.Office.Linguistic/ServiceManager</value>
+            </prop>
+          </node>
+          <node oor:name="Math" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>org.openoffice.Office.Math</value>
+            </prop>
+          </node>
+          <node oor:name="Security" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>org.openoffice.Office.Security</value>
+            </prop>
+          </node>
+          <node oor:name="UI" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>org.openoffice.Office.UI/ColorScheme</value>
+            </prop>
+          </node>
+          <node oor:name="Writer" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>
+                org.openoffice.Office.Writer
+                org.openoffice.Office.WriterWeb
+              </value>
+            </prop>
+            <prop oor:name="ExcludedNodes">
+              <value>org.openoffice.Office.Writer/Wizard</value>
+            </prop>
           </node>
         </node>
+      </node>
+    </node>
     </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/makefile.mk b/officecfg/registry/data/org/openoffice/makefile.mk
index 6d5a1b264d..6d5a1b264d 100644..100755
--- a/officecfg/registry/data/org/openoffice/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/makefile.mk
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f816a55e93..61e3221659 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3547,6 +3547,12 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
 					</info>
 					<value/>
 				</prop>
+				<prop oor:name="StartCenterLayoutStyle" oor:type="xs:int">
+					<info>
+						<desc>Contains a number deciding the layout style of the start center</desc>
+					</info>
+					<value>0</value>
+				</prop>
             </group>
 			<group oor:name="Registration">
 				<info>
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index ad6b4d9ce4..21ee286df7 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -37,61 +37,86 @@
 	<templates>
 		<group oor:name="InstalledLocale">
 			<info>
-                <author>JB</author>
+        <author>JB</author>
 				<desc>Describes a language pack that is installed to provide a localized office UI.</desc>
 			</info>
 			<prop oor:name="Origin" oor:type="xs:string">
-                <info>
-                    <author>JB</author>
-                    <desc>Identifies the organization, group or person that provided this language pack.</desc>
-                </info>
+        <info>
+          <author>JB</author>
+          <desc>Identifies the organization, group or person that provided this language pack.</desc>
+        </info>
 			</prop>
 		</group>
-		<group oor:name="MigrationStep">
+    <group oor:name="MigrationStep">
+      <info>
+        <desc>Describes one step of migration</desc>
+      </info>
+      <prop oor:name="MigrationService" oor:type="xs:string">
+        <info>
+          <desc>an optional uno service that is called after files and nodes have been copied in order to perform custom migration actions. The service needs to support XInitializable and XJob interfaces according do http://specs.openoffice.org/appwide/migration/spec_migration.sxw</desc>
+        </info>
+      </prop>
+      <prop oor:name="ServiceConfigComponents" oor:type="oor:string-list">
+        <info>
+          <desc>a list of config components that are to be passed to service</desc>
+        </info>
+      </prop>
+      <prop oor:name="IncludedFiles" oor:type="oor:string-list">
+        <info>
+          <desc>a list of wildcards relative to the old userdata origin that are to be copied</desc>
+        </info>
+      </prop>
+      <prop oor:name="ExcludedFiles" oor:type="oor:string-list">
+        <info>
+          <desc>a list of wildcards relative to the old userdata origin that are to be copied</desc>
+        </info>
+      </prop>
+      <prop oor:name="IncludedNodes" oor:type="oor:string-list">
+        <info>
+          <desc>a list of configuration node paths that are to be moved from the old user layer to the new user layer</desc>
+        </info>
+      </prop>
+      <prop oor:name="ExcludedNodes" oor:type="oor:string-list">
+        <info>
+          <desc>a list of configuration node paths that are not to be moved from the old user layer to the new user layer</desc>
+        </info>
+      </prop>
+      <prop oor:name="IncludedExtensions" oor:type="oor:string-list">
+        <info>
+          <desc>a list of extension identifiers that are to be copied from the old user layer to the new user layer</desc>
+        </info>
+      </prop>
+      <prop oor:name="ExcludedExtensions" oor:type="oor:string-list">
+        <info>
+          <desc>a list of extension identifiers that are not to be copied from the old user layer to the new user layer</desc>
+        </info>
+      </prop>
+    </group>
+    <group oor:name="MigrateVersion">
+      <info>
+        <desc>Describes migration steps specific for certain version(s)</desc>
+      </info>
+      <prop oor:name="VersionIdentifiers" oor:type="oor:string-list">
+        <info>
+          <desc>version identifiers, that are supported for migration</desc>
+        </info>
+        <value/>
+      </prop>
+      <prop oor:name="Priority" oor:type="xs:int">
+        <info>
+          <desc>Contains the priority value to specify which migration should be prefered. Higher values are prefered.</desc>
+        </info>
+        <value/>
+      </prop>
+      <set oor:name="MigrationSteps" oor:node-type="MigrationStep">
+        <info>
+          <desc>Contains necessary migration steps for specific versions</desc>
+        </info>
+      </set>
+    </group>
+    <group oor:name="Factory">
 			<info>
-				<author>LO</author>
-				<desc>Describes one step of migration</desc>
-			</info>
-			<prop oor:name="MigrationService" oor:type="xs:string">
-				<info>
-					<author>LO</author>
-					<desc>an optional uno service that is called after files and nodes have been copied in order to perform custom migration actions. The service needs to support XInitializable and XJob interfaces according do http://specs.openoffice.org/appwide/migration/spec_migration.sxw</desc>
-				</info>
-			</prop>
-			<prop oor:name="ServiceConfigComponents" oor:type="oor:string-list">
-				<info>
-					<author>LO</author>
-					<desc>a list of config components that are to be passed to service</desc>
-				</info>
-			</prop>
-			<prop oor:name="IncludedFiles" oor:type="oor:string-list">
-				<info>
-					<author>LO</author>
-					<desc>a list of wildcards relative to the old userdata origin that are to be copied</desc>
-				</info>
-			</prop>
-			<prop oor:name="ExcludedFiles" oor:type="oor:string-list">
-				<info>
-					<author>LO</author>
-					<desc>a list of wildcards relative to the old userdata origin that are to be copied</desc>
-				</info>
-			</prop>
-			<prop oor:name="IncludedNodes" oor:type="oor:string-list">
-				<info>
-					<author>LO</author>
-					<desc>a list of configuration node paths that are to be moved from the old user layer to the new user layer</desc>
-				</info>
-			</prop>
-			<prop oor:name="ExcludedNodes" oor:type="oor:string-list">
-				<info>
-					<author>LO</author>
-					<desc>a list of configuration node paths that are not to be moved from the old user layer to the new user layer</desc>
-				</info>
-			</prop>
-		</group>
-		<group oor:name="Factory">
-			<info>
-                <author>AS</author>
+        <author>AS</author>
 				<desc>Describes an application module (a document factory, such as Writer).</desc>
 			</info>
 			<prop oor:name="ooSetupFactoryActualFilter" oor:type="xs:string">
@@ -419,30 +444,21 @@
 			</info>
 			<prop oor:name="TransferUserSettingsOnce" oor:type="xs:boolean" oor:nillable="false">
 				<info>
-                    <deprecated>This feature is not supported any more since OOo 2.0</deprecated>
+          <deprecated>This feature is not supported any more since OOo 2.0</deprecated>
 					<author>JB</author>
-                    <desc>Deprecated</desc>
-				</info>
-			</prop>
-		</group>
-		<group oor:name="Migration">
-			<info>
-				<author>LO</author>
-				<desc>Contains settings that control configuration data access.</desc>
-			</info>
-			<set oor:name="MigrationSteps" oor:node-type="MigrationStep">
-				<info>
-					<author>LO</author>
-					<desc>The enumeration of migration steps that are to be applied on first start</desc>
-				</info>
-			</set>
-			<prop oor:name="SupportedVersions" oor:type="oor:string-list">
-				<info>
-					<author>LO</author>
-					<desc>version identifiers, that are supported for migration</desc>
+          <desc>Deprecated</desc>
 				</info>
-                <value/>
 			</prop>
 		</group>
-	</component>
+    <group oor:name="Migration">
+      <info>
+        <desc>Contains settings that control the migration process for certain versions.</desc>
+      </info>
+      <set oor:name="SupportedVersions" oor:node-type="MigrateVersion">
+        <info>
+          <desc>Define migration steps for supported versions</desc>
+        </info>
+      </set>
+    </group>
+  </component>
 </oor:component-schema>
diff --git a/sfx2/inc/about.hxx b/sfx2/inc/about.hxx
index 88df8f6221..9ac21f1a6a 100644
--- a/sfx2/inc/about.hxx
+++ b/sfx2/inc/about.hxx
@@ -32,15 +32,10 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _RESARY_HXX //autogen
 #include <tools/resary.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
-#ifndef _ACCEL_HXX //autogen
 #include <vcl/accel.hxx>
-#endif
+#include <svtools/svmedit.hxx>
 #include <tools/list.hxx>
 #include <svtools/stdctrl.hxx>
 #include <sfx2/basedlgs.hxx>		// SfxModalDialog
@@ -56,13 +51,14 @@ private:
     Image			aAppLogo;
 
     FixedInfo   	aVersionText;
-    FixedInfo   	aCopyrightText;
+    MultiLineEdit  	aCopyrightText;
     FixedInfo   	aBuildData;
 
     ResStringArray	aDeveloperAry;
     String			aDevVersionStr;
     String 			aAccelStr;
     String			aVersionData;
+    String          aCopyrightTextStr;
 
     AccelList 		aAccelList;
 
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index ce6b09adbb..09d5087d3c 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -219,6 +219,7 @@
 #define ABOUT_STR_DEVELOPER_ARY             1
 #define ABOUT_STR_FRENCH_COPYRIGHT          2
 #define ABOUT_STR_ACCEL                     3
+#define ABOUT_STR_COPYRIGHT					4
 
 #define RID_APPTITLE                        (RID_SFX_START+4)
 #define RID_BUILDVERSION                    (RID_SFX_START+5)
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index bae0b9c171..c37d824a9a 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -50,6 +50,8 @@
 #include <unotools/bootstrap.hxx>
 #include <com/sun/star/uno/Any.h>
 #include <unotools/configmgr.hxx>
+#include <vcl/graph.hxx>
+#include <svtools/filter.hxx>
 
 #include <sfx2/sfxuno.hxx>
 #include "about.hxx"
@@ -95,8 +97,15 @@ static bool impl_loadBitmap(
     SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
     if ( !aStrm.GetError() )
     {
-        Bitmap aBmp;
-        aStrm >> aBmp;
+        // Use graphic class to also support more graphic formats (bmp,png,...)
+        Graphic aGraphic;
+
+        GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
+        pGF->ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW );
+
+        // Default case, we load the intro bitmap from a seperate file
+        // (e.g. staroffice_intro.bmp or starsuite_intro.bmp)
+        BitmapEx aBmp = aGraphic.GetBitmapEx();
         rLogo = Image( aBmp );
         return true;
     }
@@ -114,6 +123,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
     aDeveloperAry	( 			ResId( ABOUT_STR_DEVELOPER_ARY, *rId.GetResMgr() ) ),
     aDevVersionStr	( rVerStr ),
     aAccelStr		( 			ResId( ABOUT_STR_ACCEL, *rId.GetResMgr() ) ),
+    aCopyrightTextStr(          ResId( ABOUT_STR_COPYRIGHT, *rId.GetResMgr() ) ),
     aTimer          (),
     nOff            ( 0 ),
     m_nDeltaWidth   ( 0 ),
@@ -154,14 +164,22 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
     {
         bLoaded = impl_loadBitmap(
             rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
-            rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
+            rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
+        if ( !bLoaded )
+            bLoaded = impl_loadBitmap(
+                rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
+                rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
     }
 
     if ( !bLoaded )
     {
         bLoaded = impl_loadBitmap(
             rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
-            rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
+            rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
+        if ( !bLoaded )
+            bLoaded = impl_loadBitmap(
+                rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
+                rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
     }
 
     // Transparenter Font
@@ -234,46 +252,40 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
 
     // determine size and position of the dialog & elements
     Size aAppLogoSiz = aAppLogo.GetSizePixel();
-    Size aOutSiz = GetOutputSizePixel();
-    aOutSiz.Width() = aAppLogoSiz.Width();
-    // spacing to the margin
-    Size a6Size = aVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
-    long nDlgMargin = a6Size.Width() * 4 ;
-    // The URL (if found in copyright text) should not be line-wrapped
-    if ( aCopyrightText.GetText().Search( WELCOME_URL ) != STRING_NOTFOUND )
-    {
-        long nURLWidth = GetTextWidth( WELCOME_URL ) + nDlgMargin + (2*SPACE_OFFSET);
-        if ( nURLWidth > aAppLogoSiz.Width() )
-        {
-            // pb: can be used to align the position of the logo
-            // m_nDeltaWidth = nURLWidth - aOutSiz.Width();
+    Size aOutSiz     = GetOutputSizePixel();
+    aOutSiz.Width()  = aAppLogoSiz.Width();
 
-            aOutSiz.Width() = nURLWidth;
-        }
-    }
-
-    // layout the text-elements
-    long nTextWidth = aOutSiz.Width() - nDlgMargin;
-    long nY = aAppLogoSiz.Height() + ( a6Size.Height() * 2 );
+    Size a6Size      = aVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
+    long nY          = aAppLogoSiz.Height() + ( a6Size.Height() * 2 );
+    long nDlgMargin  = a6Size.Width() * 4 ;
+    long nCtrlMargin = a6Size.Height() * 2;
+    long nTextWidth  = aOutSiz.Width() - nDlgMargin;
 
+    aCopyrightText.SetText( aCopyrightTextStr );
+    
     layoutText( aVersionText, nY, nTextWidth, a6Size );
-    nY += ( a6Size.Height() / 3 );
-    layoutText( aCopyrightText, nY, nTextWidth, a6Size );
-    nY += ( a6Size.Height() / 3 );
-    if( aBuildString.Len() > 0 )
-    {
-        layoutText( aBuildData, nY, nTextWidth, a6Size );
-        nY += ( a6Size.Height() / 2 );
-    }
-
+    nY += nCtrlMargin;
+    
     // OK-Button-Position (at the bottom and centered)
     Size aOKSiz = aOKButton.GetSizePixel();
     Point aOKPnt = aOKButton.GetPosPixel();
+    
+    // Multiline edit with Copyright-Text
+    Point aCopyPnt = aCopyrightText.GetPosPixel();
+    Size aCopySize = aCopyrightText.GetSizePixel();
+    aCopySize.Width()  = nTextWidth;
+    aCopySize.Height() = aOutSiz.Height() - nY - ( aOKSiz.Height() * 2 ) - nCtrlMargin;
+
+    aCopyPnt.X() = ( aOutSiz.Width() - aCopySize.Width() ) / 2;
+    aCopyPnt.Y() = nY;
+    aCopyrightText.SetPosSizePixel( aCopyPnt, aCopySize );
+
+    nY += aCopySize.Height() + nCtrlMargin;
     aOKPnt.X() = ( aOutSiz.Width() - aOKSiz.Width() ) / 2;
-    aOKPnt.Y() = nY + 8;
+    aOKPnt.Y() = nY;
     aOKButton.SetPosPixel( aOKPnt );
-    nY = aOKPnt.Y() + aOKSiz.Height() + a6Size.Height();
-    aOutSiz.Height() = nY;
+
+    // Change the width of the dialog
     SetOutputSizePixel( aOutSiz );
 
     FreeResource();
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
index 66cac43b3b..25cd0ce8b0 100644
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.src
@@ -62,7 +62,7 @@ String RID_BUILDVERSION
 ModalDialog RID_DEFAULTABOUT
 {
     OutputSize = TRUE ;
-    Size = MAP_APPFONT ( 245 , 200 ) ;
+    Size = MAP_APPFONT ( 245 , 260 ) ;
     Moveable = TRUE ;
     SVLook = TRUE ;
     TEXT_DEFAULTABOUT
@@ -79,12 +79,18 @@ ModalDialog RID_DEFAULTABOUT
         WordBreak = TRUE ;
         Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
     };
-    FixedText ABOUT_FTXT_COPYRIGHT
+    MultiLineEdit ABOUT_FTXT_COPYRIGHT
     {
+        Border = TRUE ;
         Pos = MAP_APPFONT ( 54 , 25 ) ;
         Size = MAP_APPFONT ( 168 , 51 ) ;
-        WordBreak = TRUE ;
-        Text[ en-US ] = "Copyright © 2005-2009 Sun Microsystems, Inc. All rights reserved. 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. 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. 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. UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd.\n\nThis product is based on the OpenOffice.org project." ;
+        IgnoreTab = TRUE ;
+        ReadOnly = TRUE ;
+        AutoVScroll = TRUE ;
+    };
+    String ABOUT_STR_COPYRIGHT
+    {
+        Text[ en-US ] = "Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.\n\nThis software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.\n\nThe information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.\n\nIf this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:\n\nU.S. GOVERNMENT RIGHTS\nPrograms, software, databases, and related documentation and technical data delivered to U.S. Government customers are \"commercial computer software\" or \"commercial technical data\" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.\n\nThis software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.\n\nOracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.\n\nThis software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.\n\nThis product is based on the OpenOffice.org project.";
     };
     StringArray ABOUT_STR_DEVELOPER_ARY
     {
@@ -92,7 +98,7 @@ ModalDialog RID_DEFAULTABOUT
     };
     String ABOUT_STR_FRENCH_COPYRIGHT
     {
-        Text = "Copyright © 2005-2009 Sun Microsystems, Inc. Tous droits réservés. Sun Microsystems, Inc. détient les droits de propriété intellectuels relatifs á la technologie incorporée dans le produit qui est décrit dans ce document. En particulier, et ce sans limitation, ces droits de propriété intellectuelle peuvent inclure un ou plus des brevets américains listés á l'adresse http://www.sun.com/patents et un ou les brevets supplémentaires ou les applications de brevet en attente aux Etats - Unis et dans les autres pays. L'utilisation est soumise aux termes du contrat de licence. Cette distribution peut comprendre des composants développés par des tierces parties. 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 pays. 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 pays. UNIX est une marque déposée aux Etats-Unis et dans d'autres pays et licenciée exlusivement par X/Open Company, Ltd.\n\nCe produit a été créé á partir du projet OpenOffice.org." ;
+        Text = "Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.\n\nThis software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.\n\nThe information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.\n\nIf this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:\n\nU.S. GOVERNMENT RIGHTS\nPrograms, software, databases, and related documentation and technical data delivered to U.S. Government customers are ""commercial computer software"" or ""commercial technical data"" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.\n\nThis software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.\n\nOracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.\n\nThis software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.\n\nThis product is based on the OpenOffice.org project." ;
     };
     String ABOUT_STR_ACCEL
     {
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index a29ea00665..6e770483b3 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
@@ -1,4 +1,4 @@
-/*************************************************************************
+/*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -68,7 +68,7 @@ String RID_BUILDVERSION
 ModalDialog RID_DEFAULTABOUT
 {
     OutputSize = TRUE ;
-    Size = MAP_APPFONT ( 245 , 200 ) ;
+    Size = MAP_APPFONT ( 245 , 260 ) ;
     Moveable = TRUE ;
     SVLook = TRUE ;
     TEXT_DEFAULTABOUT
@@ -84,13 +84,19 @@ ModalDialog RID_DEFAULTABOUT
         Size = MAP_APPFONT ( 118 , 16 ) ;
         WordBreak = TRUE ;
         Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
-       };
-    FixedText ABOUT_FTXT_COPYRIGHT
+    };
+    MultiLineEdit ABOUT_FTXT_COPYRIGHT
     {
+        Border = TRUE ;
         Pos = MAP_APPFONT ( 54 , 25 ) ;
         Size = MAP_APPFONT ( 168 , 51 ) ;
-        Text[ en-US ] ="Copyright 2000-2009 Sun Microsystems Inc.\nThis product was created by " OOO_VENDOR ", based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html.";
-        WordBreak = TRUE ;
+        IgnoreTab = TRUE ;
+        ReadOnly = TRUE ;
+        AutoVScroll = TRUE ;
+    };
+    String ABOUT_STR_COPYRIGHT
+    {
+        Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by " OOO_VENDOR ", based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";	
     };
     StringArray ABOUT_STR_DEVELOPER_ARY
     {
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/base.png b/sysui/desktop/icons/hicolor/128x128/apps/base.png
index 42b027626c..398c2f058d 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/base.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/base.png
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/calc.png b/sysui/desktop/icons/hicolor/128x128/apps/calc.png
index 368fb03e2d..8156308833 100644
--- a/sysui/desktop/icons/hicolor/128x128/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/calc.png
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/draw.png b/sysui/desktop/icons/hicolor/128x128/apps/draw.png
index 72b67c8312..3f71b25fe1 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/draw.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/draw.png
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/impress.png b/sysui/desktop/icons/hicolor/128x128/apps/impress.png
index 32ad785e16..b62b449e57 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/impress.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/impress.png
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/main.png b/sysui/desktop/icons/hicolor/128x128/apps/main.png
index fd68a10960..1b51a60bdd 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/main.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/math.png b/sysui/desktop/icons/hicolor/128x128/apps/math.png
index 79e71ce223..d37c98aa40 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/math.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/math.png
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/writer.png b/sysui/desktop/icons/hicolor/128x128/apps/writer.png
index 0d057fa4ba..b991a6d2e2 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/writer.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/writer.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/base.png b/sysui/desktop/icons/hicolor/16x16/apps/base.png
index 3a08ee1182..57a4477cc6 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/base.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/base.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/calc.png b/sysui/desktop/icons/hicolor/16x16/apps/calc.png
index 2dc540711b..78f923d0ed 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/calc.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/draw.png b/sysui/desktop/icons/hicolor/16x16/apps/draw.png
index afc037060d..7779dd46f3 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/draw.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/draw.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/impress.png b/sysui/desktop/icons/hicolor/16x16/apps/impress.png
index f1957da748..ff07597b1d 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/impress.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/impress.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/main.png b/sysui/desktop/icons/hicolor/16x16/apps/main.png
new file mode 100755
index 0000000000..3aa8f08a8c
--- /dev/null
+++ b/sysui/desktop/icons/hicolor/16x16/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/math.png b/sysui/desktop/icons/hicolor/16x16/apps/math.png
index de1488226a..10c71e6caa 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/math.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/math.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/writer.png b/sysui/desktop/icons/hicolor/16x16/apps/writer.png
index 8304269862..2b82110e18 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/writer.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/writer.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/base.png b/sysui/desktop/icons/hicolor/32x32/apps/base.png
index f30fe4a53c..f4772d75da 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/base.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/base.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/calc.png b/sysui/desktop/icons/hicolor/32x32/apps/calc.png
index 4e7e423d71..a1eae7b37a 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/calc.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/draw.png b/sysui/desktop/icons/hicolor/32x32/apps/draw.png
index f34faf5b51..4dc928a351 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/draw.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/draw.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/impress.png b/sysui/desktop/icons/hicolor/32x32/apps/impress.png
index 7b8ec6432f..9abced7df4 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/impress.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/impress.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/main.png b/sysui/desktop/icons/hicolor/32x32/apps/main.png
new file mode 100755
index 0000000000..296c6f4c58
--- /dev/null
+++ b/sysui/desktop/icons/hicolor/32x32/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/math.png b/sysui/desktop/icons/hicolor/32x32/apps/math.png
index 6c3c3b68f0..146a7dea71 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/math.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/math.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/writer.png b/sysui/desktop/icons/hicolor/32x32/apps/writer.png
index 8a59432558..97b9d3f5cf 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/writer.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/writer.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/base.png b/sysui/desktop/icons/hicolor/48x48/apps/base.png
index d68e712812..382ad3e6ec 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/base.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/base.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/calc.png b/sysui/desktop/icons/hicolor/48x48/apps/calc.png
index 33690ba3c2..d94aae38fb 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/calc.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/draw.png b/sysui/desktop/icons/hicolor/48x48/apps/draw.png
index 2acb57226d..1a2d252c7c 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/draw.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/draw.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/impress.png b/sysui/desktop/icons/hicolor/48x48/apps/impress.png
index a46324e006..35d3b25c55 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/impress.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/impress.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/main.png b/sysui/desktop/icons/hicolor/48x48/apps/main.png
new file mode 100755
index 0000000000..86bcf59955
--- /dev/null
+++ b/sysui/desktop/icons/hicolor/48x48/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/math.png b/sysui/desktop/icons/hicolor/48x48/apps/math.png
index 691ef832b1..3572d76b6b 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/math.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/math.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/writer.png b/sysui/desktop/icons/hicolor/48x48/apps/writer.png
index 9ae7402374..8041a209dd 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/writer.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/writer.png
diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns
index c7ee5d7552..8357c09c0c 100644..100755
--- a/sysui/desktop/icons/main.icns
+++ b/sysui/desktop/icons/main.icns
diff --git a/sysui/desktop/icons/ooo3_base_app.ico b/sysui/desktop/icons/ooo3_base_app.ico
index c728e83027..ba96b79876 100644..100755
--- a/sysui/desktop/icons/ooo3_base_app.ico
+++ b/sysui/desktop/icons/ooo3_base_app.ico
diff --git a/sysui/desktop/icons/ooo3_calc_app.ico b/sysui/desktop/icons/ooo3_calc_app.ico
index f46433ec08..c960415415 100644..100755
--- a/sysui/desktop/icons/ooo3_calc_app.ico
+++ b/sysui/desktop/icons/ooo3_calc_app.ico
diff --git a/sysui/desktop/icons/ooo3_draw_app.ico b/sysui/desktop/icons/ooo3_draw_app.ico
index 74abe03ace..6e00cb8937 100644..100755
--- a/sysui/desktop/icons/ooo3_draw_app.ico
+++ b/sysui/desktop/icons/ooo3_draw_app.ico
diff --git a/sysui/desktop/icons/ooo3_impress_app.ico b/sysui/desktop/icons/ooo3_impress_app.ico
index 1eed9c1f17..23ee3ecc5e 100644..100755
--- a/sysui/desktop/icons/ooo3_impress_app.ico
+++ b/sysui/desktop/icons/ooo3_impress_app.ico
diff --git a/sysui/desktop/icons/ooo3_main_app.ico b/sysui/desktop/icons/ooo3_main_app.ico
index f858d92bdd..98fcea3748 100644..100755
--- a/sysui/desktop/icons/ooo3_main_app.ico
+++ b/sysui/desktop/icons/ooo3_main_app.ico
diff --git a/sysui/desktop/icons/ooo3_math_app.ico b/sysui/desktop/icons/ooo3_math_app.ico
index a712362795..605814c96e 100644..100755
--- a/sysui/desktop/icons/ooo3_math_app.ico
+++ b/sysui/desktop/icons/ooo3_math_app.ico
diff --git a/sysui/desktop/icons/ooo3_writer_app.ico b/sysui/desktop/icons/ooo3_writer_app.ico
index 3e7efa610b..005bd58766 100644..100755
--- a/sysui/desktop/icons/ooo3_writer_app.ico
+++ b/sysui/desktop/icons/ooo3_writer_app.ico
diff --git a/sysui/desktop/icons/so9_base_app.ico b/sysui/desktop/icons/so9_base_app.ico
index 56a323c07e..aa7036eb90 100644..100755
--- a/sysui/desktop/icons/so9_base_app.ico
+++ b/sysui/desktop/icons/so9_base_app.ico
diff --git a/sysui/desktop/icons/so9_calc_app.ico b/sysui/desktop/icons/so9_calc_app.ico
index 81e6948d39..d7182cad09 100644..100755
--- a/sysui/desktop/icons/so9_calc_app.ico
+++ b/sysui/desktop/icons/so9_calc_app.ico
diff --git a/sysui/desktop/icons/so9_draw_app.ico b/sysui/desktop/icons/so9_draw_app.ico
index a2c108ad6f..a8b3c3270f 100644..100755
--- a/sysui/desktop/icons/so9_draw_app.ico
+++ b/sysui/desktop/icons/so9_draw_app.ico
diff --git a/sysui/desktop/icons/so9_impress_app.ico b/sysui/desktop/icons/so9_impress_app.ico
index 0fe4cea9f2..cf10331c5f 100644..100755
--- a/sysui/desktop/icons/so9_impress_app.ico
+++ b/sysui/desktop/icons/so9_impress_app.ico
diff --git a/sysui/desktop/icons/so9_main_app.ico b/sysui/desktop/icons/so9_main_app.ico
index 197b924d33..90f193d80d 100644..100755
--- a/sysui/desktop/icons/so9_main_app.ico
+++ b/sysui/desktop/icons/so9_main_app.ico
diff --git a/sysui/desktop/icons/so9_math_app.ico b/sysui/desktop/icons/so9_math_app.ico
index 4d947c2e59..11fbbf9a49 100644..100755
--- a/sysui/desktop/icons/so9_math_app.ico
+++ b/sysui/desktop/icons/so9_math_app.ico
diff --git a/sysui/desktop/icons/so9_writer_app.ico b/sysui/desktop/icons/so9_writer_app.ico
index 2df20830d9..10c964dba9 100644..100755
--- a/sysui/desktop/icons/so9_writer_app.ico
+++ b/sysui/desktop/icons/so9_writer_app.ico
diff --git a/sysui/source/win32/QuickStart/OOQuickStart.rc b/sysui/source/win32/QuickStart/OOQuickStart.rc
index ebeed2560d..0dc4dab256 100644
--- a/sysui/source/win32/QuickStart/OOQuickStart.rc
+++ b/sysui/source/win32/QuickStart/OOQuickStart.rc
@@ -31,10 +31,10 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-ICON_ACTIVE             ICON    DISCARDABLE     "../../desktop/icons/ooo-main-app.ico"
-IDI_QUICKSTART          ICON    DISCARDABLE     "../../desktop/icons/ooo-main-app.ico"
-IDI_SMALL               ICON    DISCARDABLE     "../../desktop/icons/ooo-main-app.ico"
-ICON_INACTIVE           ICON    DISCARDABLE     "../../desktop/icons/ooo-main-app.ico"
+ICON_ACTIVE             ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
+IDI_QUICKSTART          ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
+IDI_SMALL               ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
+ICON_INACTIVE           ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/sysui/source/win32/QuickStart/so/QuickStart.rc b/sysui/source/win32/QuickStart/so/QuickStart.rc
index 48da2388b1..c48dc2358d 100644
--- a/sysui/source/win32/QuickStart/so/QuickStart.rc
+++ b/sysui/source/win32/QuickStart/so/QuickStart.rc
@@ -31,10 +31,10 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-ICON_ACTIVE             ICON    DISCARDABLE     "../../../desktop/icons/so8-main-app.ico"
-IDI_QUICKSTART          ICON    DISCARDABLE     "../../../desktop/icons/so8-main-app.ico"
-IDI_SMALL               ICON    DISCARDABLE     "../../../desktop/icons/so8-main-app.ico"
-ICON_INACTIVE           ICON    DISCARDABLE     "../../../desktop/icons/so8-main-app.ico"
+ICON_ACTIVE             ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
+IDI_QUICKSTART          ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
+IDI_SMALL               ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
+ICON_INACTIVE           ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -105,7 +105,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "SoQuickStart"
     IDC_QUICKSTART          "QUICKSTART"
-    IDS_TOOLTIP             "StarOffice 6.0 QuickStart"
+    IDS_TOOLTIP             "Oracle Open Office 3.2 QuickStart"
 END
 
 STRINGTABLE DISCARDABLE