cws tl74: merge with DEV300_m72

123 files changed, 1576 insertions, 2402 deletions

diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index d83ee8602204..44c5e1efd4ed 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_log.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 75005b728465..d93c5a52c782 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_persmap.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -81,19 +78,6 @@ PersistentMap::~PersistentMap()
 }
 
 //______________________________________________________________________________
-void PersistentMap::flush() const
-{
-    try {
-        int err = m_db.sync(0);
-        if (err != 0)
-            throw_rtexc(err);
-    }
-    catch (DbException & exc) {
-        throw_rtexc( exc.get_errno(), exc.what() );
-    }
-}
-
-//______________________________________________________________________________
 PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
     : m_db( 0, 0 )
 {
diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index c98522a168df..c83a62bfd17e 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_services.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx
index 8ed30ccc9066..0453ab8372c0 100644
--- a/desktop/source/deployment/dp_xml.cxx
+++ b/desktop/source/deployment/dp_xml.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_xml.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx
index f38f80f27620..5df203c60fc9 100644
--- a/desktop/source/deployment/gui/descedit.cxx
+++ b/desktop/source/deployment/gui/descedit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: descedit.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx
index 8afd5a561bd6..023551ac360d 100644
--- a/desktop/source/deployment/gui/descedit.hxx
+++ b/desktop/source/deployment/gui/descedit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: descedit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 7f2cb7a9626a..85e6eaef3544 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui.h,v $
- * $Revision: 1.24.86.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,6 @@
 
 #include "dp_gui_updatedata.hxx"
 #include "dp_misc.h"
-#include "dp_gui_updatability.hxx"
 #include "dp_gui.hrc"
 #include "rtl/ref.hxx"
 #include "rtl/instance.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 387072c98618..8da4db5ca74f 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
index 9a0b76773f27..ce69797db0a8 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_autoscrolledit.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
index 3353bd42f04d..421b00517998 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_autoscrolledit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_backend.src b/desktop/source/deployment/gui/dp_gui_backend.src
index 18c44fdf6e46..4d554ab4ded9 100644
--- a/desktop/source/deployment/gui/dp_gui_backend.src
+++ b/desktop/source/deployment/gui/dp_gui_backend.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_backend.src,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 2e8b64dd237d..4c5dfdfc89d4 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_dependencydialog.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index 7030ea68ffd5..98cb7de7a04f 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_dependencydialog.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.src b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
index dc03e75f4291..fa7465678326 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_dependencydialog.src,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index e7c785c86973..79c0c5172030 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_dialog.src,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index b2620703a44a..31019948f043 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * 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
@@ -769,12 +765,6 @@ ExtMgrDialog::~ExtMgrDialog()
 }
 
 //------------------------------------------------------------------------------
-void ExtMgrDialog::selectEntry( long nPos )
-{
-    m_pExtensionBox->selectEntry( nPos );
-}
-
-//------------------------------------------------------------------------------
 void ExtMgrDialog::setGetExtensionsURL( const ::rtl::OUString &rURL )
 {
     m_aGetExtensions.SetURL( rURL );
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 7536aa403cfe..d5e939ace8a9 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_dialog2.hxx,v $
- *
- * $Revision: 1.4.74.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -163,7 +159,6 @@ public:
     virtual void    updatePackageInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
 
     void            setGetExtensionsURL( const ::rtl::OUString &rURL );
-    void            selectEntry( long nPos );
     virtual long    addPackageToList( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &,
                                       const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > & );
     bool enablePackage( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageManager,
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index 7e4004bca1d4..d55421d50d75 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_dialog2.src,v $
- *
- * $Revision: 1.2.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 889fdc04c9e1..58a5ab1c19ea 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_extensioncmdqueue.cxx,v $
- *
- * $Revision: 1.7.4.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -252,7 +248,6 @@ public:
                           const bool bEnable );
     void checkForUpdates( const std::vector< TUpdateListEntry > &vExtensionList );
     void stop();
-    bool hasTerminated();
     bool isBusy();
 
     static OUString searchAndReplaceAll( const OUString &rSource,
@@ -745,13 +740,6 @@ void ExtensionCmdQueue::Thread::stop()
 }
 
 //------------------------------------------------------------------------------
-bool ExtensionCmdQueue::Thread::hasTerminated()
-{
-    osl::MutexGuard aGuard( m_mutex );
-    return m_bTerminated;
-}
-
-//------------------------------------------------------------------------------
 bool ExtensionCmdQueue::Thread::isBusy()
 {
     osl::MutexGuard aGuard( m_mutex );
@@ -1161,17 +1149,6 @@ void ExtensionCmdQueue::stop()
     m_thread->stop();
 }
 
-void ExtensionCmdQueue::stopAndWait()
-{
-    m_thread->stop();
-    m_thread->join();
-}
-
-bool ExtensionCmdQueue::hasTerminated()
-{
-    return m_thread->hasTerminated();
-}
-
 bool ExtensionCmdQueue::isBusy()
 {
     return m_thread->isBusy();
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
index 2d24f00e3c8e..f984c71c6c1c 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_extensioncmdqueue.hxx,v $
- *
- * $Revision: 1.3.14.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -96,14 +92,6 @@ public:
     */
     void stop();
 
-    /** Determines if thread of this class has terminated.
-    */
-    bool hasTerminated();
-
-    /** Blocks until the thread has terminated. All URLs in the queue will be processed.
-    */
-    void stopAndWait();
-
     bool isBusy();
 private:
     ExtensionCmdQueue(ExtensionCmdQueue &); // not defined
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 36f08dbf5b32..b95a7e5f8cfb 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)GetSettings().GetStyleSettings().GetHighContrastMode();

-}

-

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

-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 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_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)GetSettings().GetStyleSettings().GetHighContrastMode();
+}
+
+//------------------------------------------------------------------------------
+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 e1a17bb06dc9..18487dffe6e1 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -1,271 +1,267 @@
-/*************************************************************************

- *

- * 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 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "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 );
+};
+
+}
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index ee8c5d26c24f..061988d5b04d 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_service.cxx,v $
- * $Revision: 1.23.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index 0b23ccbd5f4c..4fa94c5ca17c 100644
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_shared.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_system.cxx b/desktop/source/deployment/gui/dp_gui_system.cxx
index 15f9597ce2df..740f598499fe 100644
--- a/desktop/source/deployment/gui/dp_gui_system.cxx
+++ b/desktop/source/deployment/gui/dp_gui_system.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_system.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_system.hxx b/desktop/source/deployment/gui/dp_gui_system.hxx
index 68eb0fe28f32..dfdbbdfc0831 100644
--- a/desktop/source/deployment/gui/dp_gui_system.hxx
+++ b/desktop/source/deployment/gui/dp_gui_system.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_system.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 3d994f31c395..70fede4cd2f1 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_theextmgr.cxx,v $
- *
- * $Revision: 1.3.14.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 4ce6005a9346..1cdd1851d59e 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_theextmgr.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_thread.cxx b/desktop/source/deployment/gui/dp_gui_thread.cxx
index d8a60b0ca4e5..24055fae72f6 100644
--- a/desktop/source/deployment/gui/dp_gui_thread.cxx
+++ b/desktop/source/deployment/gui/dp_gui_thread.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_thread.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_thread.hxx b/desktop/source/deployment/gui/dp_gui_thread.hxx
index a58469c41c3b..ffcc2a5ddc54 100644
--- a/desktop/source/deployment/gui/dp_gui_thread.hxx
+++ b/desktop/source/deployment/gui/dp_gui_thread.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_thread.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_updatability.cxx b/desktop/source/deployment/gui/dp_gui_updatability.cxx
deleted file mode 100644
index 4d3d8efbce2b..000000000000
--- a/desktop/source/deployment/gui/dp_gui_updatability.cxx
+++ /dev/null
@@ -1,280 +0,0 @@
-/*************************************************************************
- *
- * 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_updatability.cxx,v $
- * $Revision: 1.6.86.1 $
- *
- * 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 "sal/config.h"
-
-#include <cstddef>
-
-#include "com/sun/star/deployment/DeploymentException.hpp"
-#include "com/sun/star/deployment/UpdateInformationProvider.hpp"
-#include "com/sun/star/deployment/XPackage.hpp"
-#include "com/sun/star/deployment/XPackageManager.hpp"
-#include "com/sun/star/deployment/XUpdateInformationProvider.hpp"
-#include "com/sun/star/task/XAbortChannel.hpp"
-#include "com/sun/star/ucb/CommandAbortedException.hpp"
-#include "com/sun/star/ucb/CommandFailedException.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "osl/conditn.hxx"
-#include "osl/diagnose.h"
-#include "osl/mutex.hxx"
-#include "rtl/ref.hxx"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "vcl/svapp.hxx"
-#include "vcl/window.hxx"
-#include "vos/mutex.hxx"
-
-#include "dp_misc.h"
-#include "dp_gui_thread.hxx"
-#include "dp_gui_updatability.hxx"
-
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
-
-using dp_gui::Updatability;
-
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
-class Updatability::Thread: public dp_gui::Thread {
-public:
-    Thread(
-        css::uno::Sequence< css::uno::Reference<
-            css::deployment::XPackageManager > > const & packageManagers,
-        Window & enabled);
-
-    void start();
-
-    void stop();
-
-private:
-    Thread(Thread &); // not defined
-    void operator =(Thread &); // not defined
-
-    virtual ~Thread();
-
-    virtual void execute();
-
-    enum Input { NONE, START, STOP };
-
-    bool m_predeterminedUpdateUrl;
-    css::uno::Sequence< css::uno::Reference<
-        css::deployment::XPackageManager > > m_packageManagers;
-
-    osl::Condition m_wakeup;
-    osl::Mutex m_mutex;
-    Window * m_enabled;
-    Input m_input;
-    css::uno::Reference< css::task::XAbortChannel > m_abort;
-};
-
-Updatability::Thread::Thread(
-    css::uno::Sequence< css::uno::Reference<
-        css::deployment::XPackageManager > > const & packageManagers,
-    Window & enabled):
-    m_predeterminedUpdateUrl(dp_misc::getExtensionDefaultUpdateURL().getLength() > 0),
-    m_packageManagers(packageManagers),
-    m_enabled(&enabled),
-    m_input(NONE)
-{}
-
-void Updatability::Thread::start() {
-    css::uno::Reference< css::task::XAbortChannel > abort;
-    {
-        osl::MutexGuard g(m_mutex);
-        m_input = START;
-        abort = m_abort;
-        m_abort.clear();
-    }
-    m_wakeup.set();
-    if (abort.is()) {
-        abort->sendAbort();
-    }
-}
-
-void Updatability::Thread::stop() {
-    css::uno::Reference< css::task::XAbortChannel > abort;
-    {
-        vos::OGuard g1(Application::GetSolarMutex());
-        osl::MutexGuard g2(m_mutex);
-        m_input = STOP;
-        m_enabled = NULL;
-        abort = m_abort;
-        m_abort.clear();
-    }
-    m_wakeup.set();
-    if (abort.is()) {
-        abort->sendAbort();
-    }
-}
-
-Updatability::Thread::~Thread() {}
-
-void Updatability::Thread::execute() {
-    for (;;) {
-
-        if (m_wakeup.wait() != osl::Condition::result_ok) {
-            dp_misc::TRACE("dp_gui::Updatability::Thread::run: ignored \n");
-            dp_misc::TRACE("osl::Condition::wait failure\n");
-        }
-        m_wakeup.reset();
-        Input input;
-        {
-            osl::MutexGuard g(m_mutex);
-            input = m_input;
-            m_input = NONE;
-        }
-        if (input == NONE) {
-            continue;
-        }
-    start:
-        if (input == STOP) {
-            break;
-        }
-        bool enabled = false;
-        for (sal_Int32 i = 0; !enabled && i < m_packageManagers.getLength();
-             ++i)
-        {
-            css::uno::Reference< css::task::XAbortChannel > abort(
-                m_packageManagers[i]->createAbortChannel());
-            {
-                osl::MutexGuard g(m_mutex);
-                input = m_input;
-                m_input = NONE;
-                if (input == NONE) {
-                    //In case input would be STOP then we would later break out of the loop
-                    //before further calls to the XPackageManger are done. That is, the abort
-                    //channel would not be used anyway.
-                    m_abort = abort;
-                }
-                if (input != NONE) {
-                    goto start;
-                }
-            }
-            css::uno::Sequence<
-                css::uno::Reference< css::deployment::XPackage > > ps;
-            try {
-                ps = m_packageManagers[i]->getDeployedPackages(
-                    abort,
-                    css::uno::Reference< css::ucb::XCommandEnvironment >());
-            } catch (css::deployment::DeploymentException &) {
-                // If there are any problematic package managers, enable the
-                // update button and let the update process report any problems
-                // to the user:
-                enabled = true;
-                continue;
-            } catch (css::ucb::CommandFailedException &) {
-                throw css::uno::RuntimeException(
-                    rtl::OUString(
-                        RTL_CONSTASCII_USTRINGPARAM(
-                            "CommandFailedException: cannot happen")),
-                    css::uno::Reference< css::uno::XInterface >());
-            } catch (css::ucb::CommandAbortedException &) {
-                osl::MutexGuard g(m_mutex);
-                input = m_input;
-                m_input = NONE;
-                OSL_ASSERT(input != NONE);
-                goto start;
-            } catch (css::lang::IllegalArgumentException &) {
-                throw css::uno::RuntimeException(
-                    rtl::OUString(
-                        RTL_CONSTASCII_USTRINGPARAM(
-                            "IllegalArgumentException: cannot happen")),
-                    css::uno::Reference< css::uno::XInterface >());
-            }
-            if (m_predeterminedUpdateUrl && ps.getLength() != 0) {
-                enabled = true;
-            } else {
-                for (sal_Int32 j = 0; j < ps.getLength(); ++j) {
-                    if (ps[j]->getUpdateInformationURLs().getLength() != 0) {
-                        enabled = true;
-                        break;
-                    }
-                    {
-                        osl::MutexGuard g(m_mutex);
-                        input = m_input;
-                        m_input = NONE;
-                    }
-                    if (input != NONE) {
-                        goto start;
-                    }
-                }
-            }
-        }
-        vos::OGuard g1(Application::GetSolarMutex());
-        Window * e;
-        {
-            osl::MutexGuard g2(m_mutex);
-            e = m_enabled;
-        }
-        if (e != NULL) {
-            e->Enable(enabled);
-        }
-    }
-}
-
-Updatability::Updatability(
-    css::uno::Sequence<
-        css::uno::Reference< css::deployment::XPackageManager > > const &
-        packageManagers,
-    Window & enabled):
-    m_thread(new Thread(packageManagers, enabled))
-{
-    m_thread->launch();
-}
-
-Updatability::~Updatability() {
-
-}
-
-void Updatability::start() {
-    m_thread->start();
-}
-
-void Updatability::stop() {
-    m_thread->stop();
-    // Bad hack; m_thread calls Application::GetSolarMutex, which only works
-    // as long as DeInitVCL has not been called:
-    ULONG n = Application::ReleaseSolarMutex();
-    m_thread->join();
-    Application::AcquireSolarMutex(n);
-}
diff --git a/desktop/source/deployment/gui/dp_gui_updatability.hxx b/desktop/source/deployment/gui/dp_gui_updatability.hxx
deleted file mode 100644
index 3cefdb019f6d..000000000000
--- a/desktop/source/deployment/gui/dp_gui_updatability.hxx
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************************************
- *
- * 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_updatability.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATABILITY_HXX
-#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATABILITY_HXX
-
-#include "sal/config.h"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "rtl/ref.hxx"
-
-/// @HTML
-
-class Window;
-namespace com { namespace sun { namespace star {
-    namespace deployment { class XPackageManager; }
-    namespace uno { class XComponentContext; }
-} } }
-
-namespace dp_gui {
-
-/**
-   Asynchronously determine whether <code>dp_gui::DialogImpl</code>'s
-   &ldquo;Check for Updates...&rdquo; button shall be enabled (which
-   theoretically can take some time).
-
-   <p>Note that, due to the asynchronous operation, the button may be enabled
-   even if there are no updatable extensions.</p>
-
-   <p>Each instance of this class must be called from a single thread in order
-   to adhere to the following protocol: <code>stop</code> must be called exactly
-   once, with no intervening calls to <code>start</code>, before the destructor
-   is called.</p>
-*/
-class Updatability {
-public:
-    /**
-       Create an instance.
-
-       @param packageManagers
-       a list of non-null package managers
-
-       @param enabled
-       <code>dp_gui::DialogImpl</code>'s &ldquo;Check for Updates...&rdquo;
-       button; will only be accessed with the solar mutex locked
-    */
-    Updatability(
-         com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
-            com::sun::star::deployment::XPackageManager > > const &
-            packageManagers,
-        Window & enabled);
-
-    ~Updatability();
-
-    /**
-       (Re-)start determining whether <code>dp_gui::DialogImpl</code>'s
-       &ldquo;Check for Updates...&rdquo; button shall be enabled.
-    */
-    void start();
-
-    /**
-       Orderly shut down this instance.
-    */
-    void stop();
-
-private:
-    Updatability(Updatability &); // not defined
-    void operator =(Updatability &); // not defined
-
-    class Thread;
-
-    rtl::Reference< Thread > m_thread;
-};
-
-}
-
-#endif
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 610960b99734..dda6126f70d0 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_updatedata.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 58e2cbd9bd0a..61479f799e6f 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -256,9 +256,9 @@ private:
     virtual ~Thread();
 
     virtual void execute();
-
+#if 0
     void handleGeneralError(css::uno::Any const & exception) const;
-
+#endif
     void handleSpecificError(
         css::uno::Reference< css::deployment::XPackage > const & package,
         css::uno::Any const & exception) const;
@@ -413,7 +413,7 @@ void UpdateDialog::Thread::execute()
         m_dialog.checkingDone();
     }
 }
-
+#if 0
 void UpdateDialog::Thread::handleGeneralError(css::uno::Any const & exception)
     const
 {
@@ -427,7 +427,7 @@ void UpdateDialog::Thread::handleGeneralError(css::uno::Any const & exception)
         m_dialog.addGeneralError(message);
     }
 }
-
+#endif
 //Parameter package can be null
 void UpdateDialog::Thread::handleSpecificError(
     css::uno::Reference< css::deployment::XPackage > const & package,
@@ -782,7 +782,7 @@ void UpdateDialog::addDisabledUpdate(UpdateDialog::DisabledUpdate const & data)
         SvLBoxButtonKind_disabledCheckbox);
         // position overflow is rather harmless
 }
-
+#if 0
 void UpdateDialog::addGeneralError(rtl::OUString const & message) {
     std::vector< rtl::OUString >::size_type n = m_generalErrors.size();
     m_generalErrors.push_back(message);
@@ -793,7 +793,7 @@ void UpdateDialog::addGeneralError(rtl::OUString const & message) {
         UpdateDialog::Index::newGeneralError(n), SvLBoxButtonKind_staticImage);
         // position overflow is rather harmless
 }
-
+#endif
 void UpdateDialog::addSpecificError(UpdateDialog::SpecificError const & data) {
     std::vector< UpdateDialog::SpecificError >::size_type n =
         m_specificErrors.size();
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 578ad6b6f01d..1a8484e2c20f 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -157,9 +157,9 @@ private:
         rtl::OUString const & name, dp_gui::UpdateData const & data);
 
     void addDisabledUpdate(UpdateDialog::DisabledUpdate const & data);
-
+#if 0
     void addGeneralError(rtl::OUString const & message);
-
+#endif
     void addSpecificError(UpdateDialog::SpecificError const & data);
 
     void checkingDone();
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 49d3c1c0cf8e..b86a8ad66f08 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 76e182825397..113e6d2069ac 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_updateinstalldialog.cxx,v $
- * $Revision: 1.9.76.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 9c755354fbf6..c3d01c8ee6d9 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_updateinstalldialog.hxx,v $
- * $Revision: 1.4.126.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
index 873eaabbf23f..d77dd256582c 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_updateinstalldialog.src,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_versionboxes.src b/desktop/source/deployment/gui/dp_gui_versionboxes.src
index 1e154c017328..878521ad6dd2 100644
--- a/desktop/source/deployment/gui/dp_gui_versionboxes.src
+++ b/desktop/source/deployment/gui/dp_gui_versionboxes.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_versionboxes.src,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 5a503b57c89d..50992eb07a97 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: license_dialog.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index 76bba106917f..4733922dc607 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: license_dialog.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
index fbd3272c78e4..10a08434d4ee 100644
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.20.30.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +52,6 @@ SLOFILES = \
         $(SLO)$/license_dialog.obj \
         $(SLO)$/dp_gui_dependencydialog.obj \
         $(SLO)$/dp_gui_thread.obj \
-        $(SLO)$/dp_gui_updatability.obj \
         $(SLO)$/dp_gui_updatedialog.obj \
         $(SLO)$/dp_gui_updateinstalldialog.obj \
         $(SLO)$/dp_gui_autoscrolledit.obj \
diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx
index 42c0e734cf0f..75dbd942a7cd 100644
--- a/desktop/source/deployment/inc/db.hxx
+++ b/desktop/source/deployment/inc/db.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: db.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx
index bff5e2c8a89f..13be1e8612fb 100644
--- a/desktop/source/deployment/inc/dp_dependencies.hxx
+++ b/desktop/source/deployment/inc/dp_dependencies.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_dependencies.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,20 +63,6 @@ namespace Dependencies {
     check(::dp_misc::DescriptionInfoset const & infoset);
 
     /**
-       Obtain the (human-readable) name of a dependency.
-
-       @param dependency
-       a dependency represented as a non-null XML element
-
-       @return
-       the name of the dependency; will never be empty, as a localized
-       &ldquo;unknown&rdquo; is substituted for an empty/missing name
-     */
-    DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString name(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::dom::XElement > const & dependency);
-
-    /**
        Obtain the (human-readable) error message of a failed dependency.
 
        @param dependency
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index 0ad48316e0fa..f9b3e1d989f1 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_descriptioninfoset.hxx,v $
- * $Revision: 1.9.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx
index ac7b89ba6fbd..6fc49c30085c 100644
--- a/desktop/source/deployment/inc/dp_identifier.hxx
+++ b/desktop/source/deployment/inc/dp_identifier.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_identifier.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index dd93cf2baf1a..b6116b9a1266 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_interact.h,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
index 0c90ed25375a..a717e7797c8a 100644
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_misc.h,v $
- * $Revision: 1.13.86.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_misc.mk b/desktop/source/deployment/inc/dp_misc.mk
index 29ba4d489860..829a6bb96bbf 100644
--- a/desktop/source/deployment/inc/dp_misc.mk
+++ b/desktop/source/deployment/inc/dp_misc.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: dp_misc.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_misc_api.hxx b/desktop/source/deployment/inc/dp_misc_api.hxx
index ba95bdcc1135..ef34ef06872c 100644
--- a/desktop/source/deployment/inc/dp_misc_api.hxx
+++ b/desktop/source/deployment/inc/dp_misc_api.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_misc_api.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index 3a0873e5c05b..bb3f58269e62 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_persmap.h,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,8 +53,6 @@ public:
     /** in mem db */
     PersistentMap();
 
-    void flush() const;
-
     bool has( ::rtl::OString const & key ) const;
     bool get( ::rtl::OString * value, ::rtl::OString const & key ) const;
     t_string2string_map getEntries() const;
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index 51c33f49dffe..95853746bef2 100644
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_platform.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index c7b5045d268a..7dcdd7df7fbb 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_resource.h,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index 1d8aabb72a50..6f9127504860 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_ucb.h,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx
index 94a01fa6601f..9808ebaab388 100644
--- a/desktop/source/deployment/inc/dp_version.hxx
+++ b/desktop/source/deployment/inc/dp_version.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_version.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index 4f175010306e..41c12f282428 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_xml.h,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index f63661df4cd5..412535e00e80 100644
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index d97b94d62acb..04dc22b77a77 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_activepackages.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index 8ef57c3fe56d..1c58f76be245 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_activepackages.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index a769d083e75f..9f2e0c9e1177 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index f0635eec3d72..06afd14e4581 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_manager.cxx,v $
- * $Revision: 1.33.8.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 6051eea9f757..ffa7252d7883 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_manager.h,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/manager/dp_manager.hrc b/desktop/source/deployment/manager/dp_manager.hrc
index fc5ddf95fc50..bdbfc079cda6 100644
--- a/desktop/source/deployment/manager/dp_manager.hrc
+++ b/desktop/source/deployment/manager/dp_manager.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_manager.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/manager/dp_manager.src b/desktop/source/deployment/manager/dp_manager.src
index 34a8bfa3ac5e..95ede4aa6227 100644
--- a/desktop/source/deployment/manager/dp_manager.src
+++ b/desktop/source/deployment/manager/dp_manager.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_manager.src,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index a96284d2ff1a..d4c9df1d57af 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_managerfac.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/manager/makefile.mk b/desktop/source/deployment/manager/makefile.mk
index 6e4c282b3573..a9ff47881fc3 100644
--- a/desktop/source/deployment/manager/makefile.mk
+++ b/desktop/source/deployment/manager/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/migration/dp_migration.cxx b/desktop/source/deployment/migration/dp_migration.cxx
index c09abd5e89cb..49362f7e2f5f 100644
--- a/desktop/source/deployment/migration/dp_migration.cxx
+++ b/desktop/source/deployment/migration/dp_migration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_migration.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/migration/makefile.mk b/desktop/source/deployment/migration/makefile.mk
index 8eaccc68cd8b..a37b7e5bebf8 100644
--- a/desktop/source/deployment/migration/makefile.mk
+++ b/desktop/source/deployment/migration/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/db.cxx b/desktop/source/deployment/misc/db.cxx
index c51c0bcadc8c..a394731921c8 100644
--- a/desktop/source/deployment/misc/db.cxx
+++ b/desktop/source/deployment/misc/db.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: db.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 6ddadcf7c24a..63badbb0c211 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -127,18 +127,6 @@ check(::dp_misc::DescriptionInfoset const & infoset) {
     return unsatisfied;
 }
 
-::rtl::OUString
-name(css::uno::Reference< css::xml::dom::XElement > const & dependency) {
-    ::rtl::OUString n(
-        dependency->getAttributeNS(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(xmlNamespace)),
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name"))));
-    return n.getLength() == 0
-        ? ::rtl::OUString(
-            ::String(::dp_misc::getResId(RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN)))
-        : n;
-}
-
 ::rtl::OUString getErrorText( css::uno::Reference< css::xml::dom::XElement > const & dependency )
 {
     ::rtl::OUString sReason;
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 2d5d8835b7f3..587e31bebfb9 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_descriptioninfoset.cxx,v $
- * $Revision: 1.7.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx
index 639672449454..9659bc6759fd 100644
--- a/desktop/source/deployment/misc/dp_identifier.cxx
+++ b/desktop/source/deployment/misc/dp_identifier.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_identifier.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index 76688ff2ae58..36e7fd037ccf 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_interact.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index d63d901290a0..3ed2d554b59f 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_misc.cxx,v $
- * $Revision: 1.19.8.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -439,19 +436,19 @@ OUString readConsole()
     {
         OSL_ASSERT((dwRead % 2) == 0);
         OUString value( aBuffer, dwRead / 2);
-        value = value.trim();
-        return value;
+        return value.trim();
     }
-    return OUString();
-
 #else
     char buf[1024];
     rtl_zeroMemory(buf, 1024);
     // read one char less so that the last char in buf is always zero
-    fgets(buf, 1024, stdin);
-    OUString value = ::rtl::OStringToOUString(::rtl::OString(buf), osl_getThreadTextEncoding());
-    return value.trim();
+    if (fgets(buf, 1024, stdin) != NULL)
+    {
+        OUString value = ::rtl::OStringToOUString(::rtl::OString(buf), osl_getThreadTextEncoding());
+        return value.trim();
+    }
 #endif
+    return OUString();
 }
 
 void TRACE(::rtl::OUString const & sText)
diff --git a/desktop/source/deployment/misc/dp_misc.hrc b/desktop/source/deployment/misc/dp_misc.hrc
index 287ce3d99def..55fabac5c5b5 100644
--- a/desktop/source/deployment/misc/dp_misc.hrc
+++ b/desktop/source/deployment/misc/dp_misc.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_misc.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src
index 98f3d8bc2211..0d341122af16 100644
--- a/desktop/source/deployment/misc/dp_misc.src
+++ b/desktop/source/deployment/misc/dp_misc.src
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 218eb0a98113..bb93f78689b6 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_platform.cxx,v $
- *
- * $Revision: 1.2.86.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index e89fb9358b26..10ee436ff60c 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_resource.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index 013ba0e2ce23..571aef9c1b95 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_ucb.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx
index dac726583693..1668ebe4a0b7 100644
--- a/desktop/source/deployment/misc/dp_version.cxx
+++ b/desktop/source/deployment/misc/dp_version.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_version.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk
index b06788de8d8b..e191169202fd 100644
--- a/desktop/source/deployment/misc/makefile.mk
+++ b/desktop/source/deployment/misc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 361004b353a3..f84e71bca0a9 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_component.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/component/dp_component.hrc b/desktop/source/deployment/registry/component/dp_component.hrc
index 9324eb0eed1a..53085a48d185 100644
--- a/desktop/source/deployment/registry/component/dp_component.hrc
+++ b/desktop/source/deployment/registry/component/dp_component.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_component.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/component/dp_component.src b/desktop/source/deployment/registry/component/dp_component.src
index 2f2b04610610..36f2a1cc4a5c 100644
--- a/desktop/source/deployment/registry/component/dp_component.src
+++ b/desktop/source/deployment/registry/component/dp_component.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_component.src,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/component/makefile.mk b/desktop/source/deployment/registry/component/makefile.mk
index af5e4c6d49ea..4c4016f9bf6c 100644
--- a/desktop/source/deployment/registry/component/makefile.mk
+++ b/desktop/source/deployment/registry/component/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index b1c67f642efb..df64402f5192 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_configuration.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.hrc b/desktop/source/deployment/registry/configuration/dp_configuration.hrc
index 4dfb8db84a24..01e1905228b3 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.hrc
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_configuration.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.src b/desktop/source/deployment/registry/configuration/dp_configuration.src
index 13f8ff08556d..7ff749b18459 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.src
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_configuration.src,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/configuration/makefile.mk b/desktop/source/deployment/registry/configuration/makefile.mk
index 433b1e638f49..f549b0e7b0f8 100644
--- a/desktop/source/deployment/registry/configuration/makefile.mk
+++ b/desktop/source/deployment/registry/configuration/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index aa67536bd425..0c5e8117b07d 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_backend.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 0c3e8bd214d4..c6572364aac0 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_registry.cxx,v $
- * $Revision: 1.12.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/dp_registry.src b/desktop/source/deployment/registry/dp_registry.src
index 7a29c802f03e..68a52621741f 100644
--- a/desktop/source/deployment/registry/dp_registry.src
+++ b/desktop/source/deployment/registry/dp_registry.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_registry.src,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 690549db0119..8c95d5874b4c 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_executable.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/executable/makefile.mk b/desktop/source/deployment/registry/executable/makefile.mk
index 7ad5289655a6..1e57f5ecf3b1 100644
--- a/desktop/source/deployment/registry/executable/makefile.mk
+++ b/desktop/source/deployment/registry/executable/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 4477d9ba101d..2b0d91250e4a 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_help.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/help/dp_help.hrc b/desktop/source/deployment/registry/help/dp_help.hrc
index 3cdd12cb5bdb..c1e10547ccdd 100644
--- a/desktop/source/deployment/registry/help/dp_help.hrc
+++ b/desktop/source/deployment/registry/help/dp_help.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_help.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/help/dp_help.src b/desktop/source/deployment/registry/help/dp_help.src
index be85542dc3b0..6b6a3f9a6508 100644
--- a/desktop/source/deployment/registry/help/dp_help.src
+++ b/desktop/source/deployment/registry/help/dp_help.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_help.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/help/makefile.mk b/desktop/source/deployment/registry/help/makefile.mk
index 9e11f82d3a02..ba904bb7f28a 100644
--- a/desktop/source/deployment/registry/help/makefile.mk
+++ b/desktop/source/deployment/registry/help/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 256d4680d795..c3bf83505ee2 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_backend.h,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/inc/dp_registry.hrc b/desktop/source/deployment/registry/inc/dp_registry.hrc
index 12dd5c5ba8c3..4a3b1d0b1a4a 100644
--- a/desktop/source/deployment/registry/inc/dp_registry.hrc
+++ b/desktop/source/deployment/registry/inc/dp_registry.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_registry.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/makefile.mk b/desktop/source/deployment/registry/makefile.mk
index 7741583d930a..de0e943654d9 100644
--- a/desktop/source/deployment/registry/makefile.mk
+++ b/desktop/source/deployment/registry/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/package/dp_description.cxx b/desktop/source/deployment/registry/package/dp_description.cxx
index 846205a5faf0..7c05bfd90a5b 100644
--- a/desktop/source/deployment/registry/package/dp_description.cxx
+++ b/desktop/source/deployment/registry/package/dp_description.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_description.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/package/dp_description.hxx b/desktop/source/deployment/registry/package/dp_description.hxx
index 154cd3c8d562..eb74c454af75 100644
--- a/desktop/source/deployment/registry/package/dp_description.hxx
+++ b/desktop/source/deployment/registry/package/dp_description.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_description.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 1771cc93ec07..70a7ed72304a 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_package.cxx,v $
- * $Revision: 1.34.16.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/package/dp_package.hrc b/desktop/source/deployment/registry/package/dp_package.hrc
index df73bcdb80c4..3a840b64f0b6 100644
--- a/desktop/source/deployment/registry/package/dp_package.hrc
+++ b/desktop/source/deployment/registry/package/dp_package.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_package.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/package/dp_package.src b/desktop/source/deployment/registry/package/dp_package.src
index 6e77f8ae8934..57307040bba4 100644
--- a/desktop/source/deployment/registry/package/dp_package.src
+++ b/desktop/source/deployment/registry/package/dp_package.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_package.src,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/package/makefile.mk b/desktop/source/deployment/registry/package/makefile.mk
index 007574eeff42..ccadc2070301 100644
--- a/desktop/source/deployment/registry/package/makefile.mk
+++ b/desktop/source/deployment/registry/package/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx
index c9bf36dc68ec..be6170cdf5d8 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.cxx
+++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_lib_container.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index 3546dba7352d..3e7cbf54cbae 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_lib_container.h,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index dbc644e60f44..4af0cbb84130 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_script.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc
index df37ed091fec..8ddfa6f51ffc 100644
--- a/desktop/source/deployment/registry/script/dp_script.hrc
+++ b/desktop/source/deployment/registry/script/dp_script.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_script.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/script/dp_script.src b/desktop/source/deployment/registry/script/dp_script.src
index 7a8f10cd6f48..117f4eac945a 100644
--- a/desktop/source/deployment/registry/script/dp_script.src
+++ b/desktop/source/deployment/registry/script/dp_script.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_script.src,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/script/makefile.mk b/desktop/source/deployment/registry/script/makefile.mk
index 76195895b227..ae159914a548 100644
--- a/desktop/source/deployment/registry/script/makefile.mk
+++ b/desktop/source/deployment/registry/script/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
index 23d7c36cda79..bf35aa2f50a5 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_parceldesc.cxx,v $
- * $Revision: 1.7.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index c7d15a297996..a23e9f865894 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_parceldesc.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index de515dd78372..52ced6908bd8 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_sfwk.cxx,v $
- * $Revision: 1.16.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
index 922affecf252..0eb619e839e3 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_sfwk.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.src b/desktop/source/deployment/registry/sfwk/dp_sfwk.src
index bd9994693b36..c8d37ce067ac 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.src
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_sfwk.src,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/sfwk/makefile.mk b/desktop/source/deployment/registry/sfwk/makefile.mk
index 2884e7986140..a052296d5c21 100644
--- a/desktop/source/deployment/registry/sfwk/makefile.mk
+++ b/desktop/source/deployment/registry/sfwk/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/target.pmk b/desktop/source/deployment/target.pmk
index 067db401b150..82b41766b253 100644
--- a/desktop/source/deployment/target.pmk
+++ b/desktop/source/deployment/target.pmk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: target.pmk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/unopkg/makefile.mk b/desktop/source/deployment/unopkg/makefile.mk
index c34f7e18253e..06b39cd2d04e 100644
--- a/desktop/source/deployment/unopkg/makefile.mk
+++ b/desktop/source/deployment/unopkg/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src
index bb5be7e8bbd6..79c578628676 100644
--- a/desktop/source/deployment/unopkg/unopkg.src
+++ b/desktop/source/deployment/unopkg/unopkg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopkg.src,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify