mib16: rebase to m83

17 files changed, 82 insertions, 434 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index efba60ca75b9..6f00d47332ac 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -359,6 +359,8 @@ namespace
         : public rtl::Static< String, Version > {};
     struct AboutBoxVersion
         : public rtl::Static< String, AboutBoxVersion > {};
+    struct OOOVendor
+        : public rtl::Static< String, OOOVendor > {};
     struct Extension
         : public rtl::Static< String, Extension > {};
     struct XMLFileFormatName
@@ -422,6 +424,21 @@ void ReplaceStringHookProc( UniString& rStr )
         rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATNAME", rXMLFileFormatName );
         rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATVERSION", rXMLFileFormatVersion );
     }
+    if ( rStr.SearchAscii( "%OOOVENDOR" ) != STRING_NOTFOUND )
+    {
+        String &rOOOVendor = OOOVendor::get();
+
+        if ( !rOOOVendor.Len() )
+        {
+            rtl::OUString aTmp;
+            Any aRet = ::utl::ConfigManager::GetDirectConfigProperty(
+                    ::utl::ConfigManager::OOOVENDOR );
+            aRet >>= aTmp;
+            rOOOVendor = aTmp;
+
+        }
+        rStr.SearchAndReplaceAllAscii( "%OOOVENDOR" ,rOOOVendor );
+    }
 
     if ( rStr.SearchAscii( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != STRING_NOTFOUND )
     {
diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx
index 0453ab8372c0..65c48d70c92d 100644
--- a/desktop/source/deployment/dp_xml.cxx
+++ b/desktop/source/deployment/dp_xml.cxx
@@ -44,6 +44,20 @@ namespace dp_misc
 
 //==============================================================================
 void xml_parse(
+    Reference<xml::input::XRoot> const & xRoot,
+    ::ucbhelper::Content & ucb_content,
+    Reference<XComponentContext> const & xContext )
+{
+    const Any arg(xRoot);
+    const Reference<xml::sax::XDocumentHandler> xDocHandler(
+        xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
+            OUSTR("com.sun.star.xml.input.SaxDocumentHandler"),
+            Sequence<Any>( &arg, 1 ), xContext ), UNO_QUERY_THROW );
+    xml_parse( xDocHandler, ucb_content, xContext );
+ }
+
+//==============================================================================
+void xml_parse(
     Reference<xml::sax::XDocumentHandler> const & xDocHandler,
     ::ucbhelper::Content & ucb_content,
     Reference<XComponentContext> const & xContext )
@@ -61,199 +75,4 @@ void xml_parse(
     xParser->parseStream( source );
 }
 
-//==============================================================================
-void xml_parse(
-    Reference<xml::input::XRoot> const & xRoot,
-    ::ucbhelper::Content & ucb_content,
-    Reference<XComponentContext> const & xContext )
-{
-    const Any arg(xRoot);
-    const Reference<xml::sax::XDocumentHandler> xDocHandler(
-        xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
-            OUSTR("com.sun.star.xml.input.SaxDocumentHandler"),
-            Sequence<Any>( &arg, 1 ), xContext ), UNO_QUERY_THROW );
-    xml_parse( xDocHandler, ucb_content, xContext );
-}
-
-//##############################################################################
-
-//______________________________________________________________________________
-XmlRootElement::XmlRootElement(
-    OUString const & uri, OUString const & localname )
-    : m_uri( uri )
-{
-    m_localname = localname;
-}
-
-//______________________________________________________________________________
-XmlRootElement::~XmlRootElement()
-{
-}
-
-// XRoot
-//______________________________________________________________________________
-void XmlRootElement::startDocument(
-    Reference<xml::input::XNamespaceMapping> const & xMapping )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-    m_xNamespaceMapping = xMapping;
-
-    try {
-        m_uid = m_xNamespaceMapping->getUidByUri( m_uri );
-    }
-    catch (container::NoSuchElementException & exc) {
-        throw xml::sax::SAXException(
-            exc.Message, static_cast<OWeakObject *>(this), Any(exc) );
-    }
-}
-
-//______________________________________________________________________________
-void XmlRootElement::endDocument()
-    throw (xml::sax::SAXException, RuntimeException)
-{
-}
-
-//______________________________________________________________________________
-void XmlRootElement::processingInstruction(
-    OUString const &, OUString const & )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-}
-
-//______________________________________________________________________________
-void XmlRootElement::setDocumentLocator(
-    Reference<xml::sax::XLocator> const & )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-}
-
-//______________________________________________________________________________
-Reference<xml::input::XElement> XmlRootElement::startRootElement(
-    sal_Int32 uid, OUString const & localname,
-    Reference<xml::input::XAttributes> const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-    check_xmlns( uid );
-    if (! localname.equals( m_localname )) {
-        throw xml::sax::SAXException(
-            OUSTR("unexpected root element ") + localname,
-            static_cast<OWeakObject *>(this), Any() );
-    }
-    m_xAttributes = xAttributes;
-
-    return this;
-}
-
-//##############################################################################
-
-//______________________________________________________________________________
-XmlElement::~XmlElement()
-{
-}
-
-//______________________________________________________________________________
-void XmlElement::check_xmlns( sal_Int32 uid ) const
-    throw (xml::sax::SAXException)
-{
-    if (uid != m_uid)
-    {
-        ::rtl::OUStringBuffer buf;
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("illegal xml namespace uri=\"") );
-        try {
-            buf.append( m_xNamespaceMapping->getUriByUid( uid ) );
-        }
-        catch (container::NoSuchElementException & exc) {
-            throw xml::sax::SAXException(
-                exc.Message, static_cast<OWeakObject *>(
-                    const_cast<XmlElement *>(this) ), Any(exc) );
-        }
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
-        throw xml::sax::SAXException(
-            buf.makeStringAndClear(),
-            static_cast<OWeakObject *>( const_cast<XmlElement *>(this) ),
-            Any() );
-    }
-}
-
-// XElement
-//______________________________________________________________________________
-Reference<xml::input::XElement> XmlElement::getParent()
-    throw (RuntimeException)
-{
-    return m_xParent;
-}
-
-//______________________________________________________________________________
-OUString XmlElement::getLocalName()
-    throw (RuntimeException)
-{
-    return m_localname;
-}
-
-//______________________________________________________________________________
-sal_Int32 XmlElement::getUid()
-    throw (RuntimeException)
-{
-    return m_uid;
-}
-
-//______________________________________________________________________________
-Reference<xml::input::XAttributes> XmlElement::getAttributes()
-    throw (RuntimeException)
-{
-    return m_xAttributes;
-}
-
-//______________________________________________________________________________
-void XmlElement::ignorableWhitespace(
-    OUString const & )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-}
-
-//______________________________________________________________________________
-void XmlElement::characters( OUString const & chars )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-    m_characters += chars;
-}
-
-//______________________________________________________________________________
-void XmlElement::processingInstruction(
-    OUString const &, OUString const & )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-}
-
-//______________________________________________________________________________
-void XmlElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
-{
-    m_got_endElement = true;
-}
-
-//______________________________________________________________________________
-Reference<xml::input::XElement> XmlElement::startChildElement(
-    sal_Int32 uid, OUString const & localName,
-    Reference<xml::input::XAttributes> const & )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-    ::rtl::OUStringBuffer buf;
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("unexpected element "
-                                                "{ tag=\"") );
-    buf.append( localName );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\", uri=\"") );
-    try {
-        buf.append( m_xNamespaceMapping->getUriByUid( uid ) );
-    }
-    catch (container::NoSuchElementException & exc) {
-        throw xml::sax::SAXException(
-            exc.Message, static_cast<OWeakObject *>(this), Any(exc) );
-    }
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" }!") );
-    throw xml::sax::SAXException(
-        buf.makeStringAndClear(), static_cast<OWeakObject *>(this), Any() );
-}
-
 }
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 8da4db5ca74f..1d2f4869cc7f 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -138,6 +138,8 @@
 #define RID_IMG_LOCKED_HC                      (RID_DEPLOYMENT_GUI_START+59)
 #define RID_IMG_EXTENSION                      (RID_DEPLOYMENT_GUI_START+60)
 #define RID_IMG_EXTENSION_HC                   (RID_DEPLOYMENT_GUI_START+61)
+#define RID_IMG_SHARED                         (RID_DEPLOYMENT_GUI_START+62)
+#define RID_IMG_SHARED_HC                      (RID_DEPLOYMENT_GUI_START+63)
 
 #define RID_STR_ADD_PACKAGES                   (RID_DEPLOYMENT_GUI_START+70)
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 21ec1ce46ff5..71fda4d9b3e0 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -239,7 +239,10 @@ void ExtBoxWithBtns_Impl::RecalcAll()
     const sal_Int32 nActive = getSelIndex();
 
     if ( nActive != EXTENSION_LISTBOX_ENTRY_NOTFOUND )
+    {
         SetButtonPos( GetEntryRect( nActive ) );
+        SetButtonStatus( GetEntryData( nActive) );
+    }
     else
     {
         m_pOptionsBtn->Hide();
@@ -257,21 +260,6 @@ void ExtBoxWithBtns_Impl::selectEntry( const long nPos )
         return;
 
     ExtensionBox_Impl::selectEntry( nPos );
-
-    if ( ( nPos >= 0 ) && ( nPos < GetEntryCount() ) )
-    {
-        if ( IsReallyVisible() )
-        {
-            SetButtonPos( GetEntryRect( nPos ) );
-        }
-        SetButtonStatus( GetEntryData( nPos) );
-    }
-    else
-    {
-        m_pOptionsBtn->Hide();
-        m_pEnableBtn->Hide();
-        m_pRemoveBtn->Hide();
-    }
 }
 
 // -----------------------------------------------------------------------
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index d55421d50d75..7c47365999a0 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -165,11 +165,21 @@ Image RID_IMG_WARNING_HC
 
 Image RID_IMG_LOCKED
 {
-    ImageBitmap = Bitmap { File = "shared_16.png"; };
+    ImageBitmap = Bitmap { File = "lock_16.png"; };
 };
 
 Image RID_IMG_LOCKED_HC
 {
+    ImageBitmap = Bitmap { File = "lock_16_h.png"; };
+};
+
+Image RID_IMG_SHARED
+{
+    ImageBitmap = Bitmap { File = "shared_16.png"; };
+};
+
+Image RID_IMG_SHARED_HC
+{
     ImageBitmap = Bitmap { File = "shared_16_h.png"; };
 };
 
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 2e02a90f59fd..bcaa3252ea8f 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -177,6 +177,8 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan
     m_nTopIndex( 0 ),
     m_nActiveHeight( 0 ),
     m_nExtraHeight( 2 ),
+    m_aSharedImage( DialogHelper::getResId( RID_IMG_SHARED ) ),
+    m_aSharedImageHC( DialogHelper::getResId( RID_IMG_SHARED_HC ) ),
     m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),
     m_aLockedImageHC( DialogHelper::getResId( RID_IMG_LOCKED_HC ) ),
     m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),
@@ -469,13 +471,15 @@ void ExtensionBox_Impl::selectEntry( const long nPos )
 
         if ( IsReallyVisible() )
         {
-            m_bNeedsRecalc = true;
             m_bAdjustActive = true;
         }
     }
 
     if ( IsReallyVisible() )
+    {
+        m_bNeedsRecalc = true;
         Invalidate();
+    }
 
     guard.clear();
 }
@@ -618,7 +622,10 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     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_bLocked )
+            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aLockedImageHC : m_aLockedImage );
+        else
+            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aSharedImageHC : m_aSharedImage );
     }
     if ( ( pEntry->m_eState == AMBIGUOUS ) || pEntry->m_bMissingDeps )
     {
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index ad62bfd1a2d8..16ef974deff9 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -135,6 +135,8 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
     long            m_nActiveHeight;
     long            m_nExtraHeight;
     Size            m_aOutputSize;
+    Image           m_aSharedImage;
+    Image           m_aSharedImageHC;
     Image           m_aLockedImage;
     Image           m_aLockedImageHC;
     Image           m_aWarningImage;
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 061988d5b04d..578ff04a6c88 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -92,6 +92,8 @@ namespace
         : public rtl::Static< String, Version > {};
     struct AboutBoxVersion
         : public rtl::Static< String, AboutBoxVersion > {};
+    struct OOOVendor
+        : public rtl::Static< String, OOOVendor > {};
     struct Extension
         : public rtl::Static< String, Extension > {};
 }
@@ -107,6 +109,7 @@ void ReplaceProductNameHookProc( String& rStr )
         String &rVersion = Version::get();
         String &rAboutBoxVersion = AboutBoxVersion::get();
         String &rExtension = Extension::get();
+        String &rOOOVendor = OOOVendor::get();
 
         if ( !rProductName.Len() )
         {
@@ -123,6 +126,10 @@ void ReplaceProductNameHookProc( String& rStr )
             aRet >>= aTmp;
             rAboutBoxVersion = aTmp;
 
+            aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::OOOVENDOR );
+            aRet >>= aTmp;
+            rOOOVendor = aTmp;
+
             if ( !rExtension.Len() )
             {
                 aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTEXTENSION );
@@ -135,6 +142,7 @@ void ReplaceProductNameHookProc( String& rStr )
         rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rProductName );
         rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
         rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
+        rStr.SearchAndReplaceAllAscii( "%OOOVENDOR", rOOOVendor );
         rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );
     }
 }
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index 38a1870782ed..e58ff1e71acd 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -216,16 +216,6 @@ public:
     */
     ::rtl::OUString getIconURL( sal_Bool bHighContrast ) const;
 
-    /**
-       Allow direct access to the XPath functionality.
-
-       @return
-       direct access to the XPath functionality; null iff this instance was
-       constructed with a null <code>element</code>
-    */
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::xpath::XXPathAPI >
-    getXpath() const;
-
 private:
     SAL_DLLPRIVATE ::boost::optional< ::rtl::OUString > getOptionalValue(
         ::rtl::OUString const & expression) const;
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index 41c12f282428..300051bd1512 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -52,110 +52,6 @@ void xml_parse(
     ::ucbhelper::Content & ucb_content,
     css::uno::Reference< css::uno::XComponentContext > const & xContext );
 
-//==============================================================================
-void xml_parse(
-    css::uno::Reference< css::xml::input::XRoot > const & xRoot,
-    ::ucbhelper::Content & ucb_content,
-    css::uno::Reference< css::uno::XComponentContext > const & xContext );
-
-//==============================================================================
-class XmlElement : public ::cppu::WeakImplHelper1< css::xml::input::XElement >
-{
-protected:
-    css::uno::Reference<css::xml::input::XNamespaceMapping> m_xNamespaceMapping;
-    const css::uno::Reference<css::xml::input::XElement> m_xParent;
-    sal_Int32 m_uid;
-    ::rtl::OUString m_localname;
-    css::uno::Reference<css::xml::input::XAttributes> m_xAttributes;
-    ::rtl::OUString m_characters;
-    bool m_got_endElement;
-
-    void check_xmlns( sal_Int32 uid ) const throw (css::xml::sax::SAXException);
-
-    inline XmlElement()
-        : m_uid( -1 ),
-          m_got_endElement( false )
-        {}
-    virtual ~XmlElement();
-public:
-    inline bool isParsed() const { return m_got_endElement; }
-
-    inline XmlElement(
-        css::uno::Reference<css::xml::input::XNamespaceMapping>
-        const & xMapping,
-        css::uno::Reference<css::xml::input::XElement> const & xParent,
-        sal_Int32 uid, ::rtl::OUString const & localname,
-        css::uno::Reference< css::xml::input::XAttributes >
-        const & xAttributes )
-        : m_xNamespaceMapping( xMapping ),
-          m_xParent( xParent ),
-          m_uid( uid ),
-          m_localname( localname ),
-          m_xAttributes( xAttributes ),
-          m_got_endElement( false )
-        {}
-
-    // XElement
-    virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL
-    getParent() throw (css::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getUid()
-        throw (css::uno::RuntimeException);
-    virtual css::uno::Reference<css::xml::input::XAttributes> SAL_CALL
-    getAttributes() throw (css::uno::RuntimeException);
-    virtual void SAL_CALL ignorableWhitespace(
-        ::rtl::OUString const & rWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL characters( ::rtl::OUString const & rChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL processingInstruction(
-        ::rtl::OUString const & Target, ::rtl::OUString const & Data )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL
-    startChildElement(
-        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-};
-
-//==============================================================================
-class XmlRootElement : public ::cppu::ImplInheritanceHelper1<
-                                        XmlElement, css::xml::input::XRoot >
-{
-    const ::rtl::OUString m_uri;
-
-protected:
-    virtual ~XmlRootElement();
-public:
-    inline ::rtl::OUString const & getUri() const
-        { return m_uri; }
-
-    XmlRootElement(
-        ::rtl::OUString const & uri, ::rtl::OUString const & localname );
-
-    // XRoot
-    virtual void SAL_CALL startDocument(
-        css::uno::Reference<css::xml::input::XNamespaceMapping>
-        const & xMapping )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL endDocument()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL processingInstruction(
-        ::rtl::OUString const & target, ::rtl::OUString const & data )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL setDocumentLocator(
-        css::uno::Reference<css::xml::sax::XLocator> const & xLocator )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL
-    startRootElement(
-        sal_Int32 uid, ::rtl::OUString const & localname,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-};
-
 }
 
 #endif
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 28f45918e9e2..049f781dfd90 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -264,12 +264,6 @@ DescriptionInfoset::getUpdateDownloadUrls() const
             ::boost::optional< ::rtl::OUString >();
 }
 
-css::uno::Reference< css::xml::xpath::XXPathAPI > DescriptionInfoset::getXpath()
-    const
-{
-    return m_xpath;
-}
-
 ::boost::optional< ::rtl::OUString > DescriptionInfoset::getOptionalValue(
     ::rtl::OUString const & expression) const
 {
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 11cc61ed84ff..53ec488c2082 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -357,9 +357,9 @@ MigrationPage::MigrationPage(
     m_ftBody.SetText( aText );
 }
 
-sal_Bool MigrationPage::commitPage( CommitPageReason _eReason )
+sal_Bool MigrationPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
 {
-    if (_eReason == eTravelForward && m_cbMigration.IsChecked() && !m_bMigrationDone)
+    if (_eReason == svt::WizardTypes::eTravelForward && m_cbMigration.IsChecked() && !m_bMigrationDone)
     {
         GetParent()->EnterWait();
         FirstStartWizard* pWizard = dynamic_cast< FirstStartWizard* >( GetParent() );
@@ -433,7 +433,7 @@ UserPage::UserPage( svt::OWizardMachine* parent, const ResId& resid)
     }
 }
 
-sal_Bool UserPage::commitPage( CommitPageReason )
+sal_Bool UserPage::commitPage( svt::WizardTypes::CommitPageReason )
 {
     SvtUserOptions aUserOpt;
     aUserOpt.SetFirstName(m_edFirst.GetText());
@@ -463,9 +463,9 @@ UpdateCheckPage::UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resi
     _setBold(m_ftHead);
 }
 
-sal_Bool UpdateCheckPage::commitPage( CommitPageReason _eReason )
+sal_Bool UpdateCheckPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
 {
-    if ( _eReason == eTravelForward )
+    if ( _eReason == svt::WizardTypes::eTravelForward )
     {
         try {
             Reference < XNameReplace > xUpdateAccess;
@@ -589,9 +589,9 @@ void RegistrationPage::updateButtonStates()
     m_rbNever.Show( m_bNeverVisible );
 }
 
-sal_Bool RegistrationPage::commitPage( CommitPageReason _eReason )
+sal_Bool RegistrationPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
 {
-    if ( _eReason == eFinish )
+    if ( _eReason == svt::WizardTypes::eFinish )
     {
         ::utl::RegOptions aOptions;
         rtl::OUString aEvent;
@@ -665,7 +665,7 @@ void RegistrationPage::executeSingleMode()
     // the registration modes "Now" and "Later" are handled by the page
     RegistrationPage::RegistrationMode eMode = pPage->getRegistrationMode();
     if ( eMode == RegistrationPage::rmNow || eMode == RegistrationPage::rmLater )
-        pPage->commitPage( IWizardPage::eFinish );
+        pPage->commitPage( WizardTypes::eFinish );
     if ( eMode != RegistrationPage::rmLater )
         ::utl::RegOptions().removeReminder();
 }
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index 9740773fe602..776268eb475c 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -125,7 +125,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > m_xThrobber;
 public:
     MigrationPage( svt::OWizardMachine* parent, const ResId& resid, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > xThrobber );
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 
 protected:
     virtual void ActivatePage();
@@ -148,7 +148,7 @@ private:
 
 public:
     UserPage( svt::OWizardMachine* parent, const ResId& resid);
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 protected:
     virtual void ActivatePage();
 };
@@ -161,7 +161,7 @@ private:
     CheckBox m_cbUpdateCheck;
 public:
     UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resid);
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 
 protected:
     virtual void ActivatePage();
@@ -188,7 +188,7 @@ protected:
     virtual bool canAdvance() const;
     virtual void ActivatePage();
 
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 
 public:
     RegistrationPage( Window* parent, const ResId& resid);
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 11bf8129cc04..b7da88b85013 100755..100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -139,17 +139,7 @@ OO3ExtensionMigration::~OO3ExtensionMigration()
     }
 }
 
-void OO3ExtensionMigration::registerConfigurationPackage( const uno::Reference< deployment::XPackage > & xPkg)
-{
-    const ::rtl::OUString sMediaType = xPkg->getPackageType()->getMediaType();
-    if ( (sMediaType.equals(sConfigurationDataType) || sMediaType.equals(sConfigurationSchemaType) ) )
-    {
-        xPkg->revokePackage(uno::Reference< task::XAbortChannel >(), uno::Reference< ucb::XCommandEnvironment> ());
-        xPkg->registerPackage(uno::Reference< task::XAbortChannel >(), uno::Reference< ucb::XCommandEnvironment> ());
-    }
-}
-
- void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions )
+void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions )
 {
     osl::Directory    aScanRootDir( sSourceDir );
     osl::FileStatus   fs(FileStatusMask_Type | FileStatusMask_FileURL);
@@ -382,35 +372,6 @@ bool OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir
     return false;
 }
 
-bool OO3ExtensionMigration::copy( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir )
-{
-    bool bRet = false;
-
-    INetURLObject aSourceObj( sSourceDir );
-    INetURLObject aDestObj( sTargetDir );
-    String aName = aDestObj.getName();
-    aDestObj.removeSegment();
-    aDestObj.setFinalSlash();
-
-    try
-    {
-        ::ucbhelper::Content aDestPath( aDestObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
-        uno::Reference< ucb::XCommandInfo > xInfo = aDestPath.getCommands();
-        ::rtl::OUString aTransferName = ::rtl::OUString::createFromAscii( "transfer" );
-        if ( xInfo->hasCommandByName( aTransferName ) )
-        {
-            aDestPath.executeCommand( aTransferName, uno::makeAny(
-                ucb::TransferInfo( sal_False, aSourceObj.GetMainURL( INetURLObject::NO_DECODE ), aName, ucb::NameClash::OVERWRITE ) ) );
-            bRet = true;
-        }
-    }
-    catch( uno::Exception& )
-    {
-    }
-
-    return bRet;
-}
-
 
 // -----------------------------------------------------------------------------
 // XServiceInfo
@@ -496,32 +457,6 @@ TStringVectorPtr getContent( const ::rtl::OUString& rBaseURL )
     return aResult;
 }
 
-// -----------------------------------------------------------------------------
-// XJob
-// -----------------------------------------------------------------------------
-
-void OO3ExtensionMigration::copyConfig( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir )
-{
-    ::rtl::OUString sEx1( m_sSourceDir );
-    sEx1 += sExcludeDir1;
-    ::rtl::OUString sEx2( m_sSourceDir );
-    sEx2 += sExcludeDir2;
-
-    TStringVectorPtr aList = getContent( sSourceDir );
-    TStringVector::const_iterator aI = aList->begin();
-    while ( aI != aList->end() )
-    {
-        ::rtl::OUString sSourceLocalName = aI->copy( sSourceDir.getLength() );
-        ::rtl::OUString aTemp = aI->copy( m_sSourceDir.getLength() );
-        if ( aTemp != sExcludeDir1 && aTemp != sExcludeDir2 )
-        {
-            ::rtl::OUString sTargetName = sTargetDir + sSourceLocalName;
-            copy( (*aI), sTargetName );
-        }
-        ++aI;
-    }
-}
-
 Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& )
     throw (lang::IllegalArgumentException, Exception, RuntimeException)
 {
@@ -559,12 +494,6 @@ TmpRepositoryCommandEnv::TmpRepositoryCommandEnv()
 {
 }
 
-TmpRepositoryCommandEnv::TmpRepositoryCommandEnv(
-    uno::Reference< task::XInteractionHandler> const & handler)
-    : m_forwardHandler(handler)
-{
-}
-
 TmpRepositoryCommandEnv::~TmpRepositoryCommandEnv()
 {
 }
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index a001f41d92c5..fb7e69c2b87f 100755..100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -97,16 +97,10 @@ namespace migration
         };
 
         ::osl::FileBase::RC     checkAndCreateDirectory( INetURLObject& rDirURL );
-        void                    copyConfig( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir );
-        bool                    copy( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir );
         ScanResult              scanExtensionFolder( const ::rtl::OUString& sExtFolder );
         void                    scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions );
         bool                    scanDescriptionXml( const ::rtl::OUString& sDescriptionXmlFilePath );
         bool                    migrateExtension( const ::rtl::OUString& sSourceDir );
-        /* fills m_scriptElements and  m_dialogElements
-        */
-        void registerConfigurationPackage(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > & xPkg);
 
     public:
         OO3ExtensionMigration(::com::sun::star::uno::Reference<
@@ -142,8 +136,6 @@ namespace migration
     public:
         virtual ~TmpRepositoryCommandEnv();
         TmpRepositoryCommandEnv();
-        TmpRepositoryCommandEnv(
-            ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> const & handler);
 
         // XCommandEnvironment
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > SAL_CALL
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx
index 48ee2abc71ca..81a789a613b9 100644
--- a/desktop/source/migration/wizard.cxx
+++ b/desktop/source/migration/wizard.cxx
@@ -219,11 +219,6 @@ FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAccep
     defaultButton(WZB_NEXT);
 }
 
-void FirstStartWizard::EnableButtonsWhileMigration()
-{
-    enableButtons(0xff, sal_True);
-}
-
 void FirstStartWizard::DisableButtonsWhileMigration()
 {
     enableButtons(0xff, sal_False);
@@ -439,10 +434,10 @@ sal_Bool FirstStartWizard::leaveState(WizardState)
     return sal_True;
 }
 
-sal_Bool FirstStartWizard::onFinish(sal_Int32 _nResult)
+sal_Bool FirstStartWizard::onFinish()
 {
     // return sal_True;
-    if (svt::RoadmapWizard::onFinish(_nResult))
+    if ( svt::RoadmapWizard::onFinish() )
     {
 #ifndef OS2 // cannot enable quickstart on first startup, see shutdownicon.cxx comments.
         enableQuickstart();
diff --git a/desktop/source/migration/wizard.hxx b/desktop/source/migration/wizard.hxx
index e41bfe373cde..3317880f8bd6 100644
--- a/desktop/source/migration/wizard.hxx
+++ b/desktop/source/migration/wizard.hxx
@@ -62,7 +62,6 @@ public:
     virtual short Execute();
     virtual long PreNotify( NotifyEvent& rNEvt );
 
-    void EnableButtonsWhileMigration();
     void DisableButtonsWhileMigration();
 
 private:
@@ -97,7 +96,7 @@ protected:
     virtual TabPage* createPage(WizardState _nState);
     virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason );
     virtual sal_Bool leaveState(WizardState _nState );
-    virtual sal_Bool onFinish(sal_Int32 _nResult);
+    virtual sal_Bool onFinish();
     virtual void     enterState(WizardState _nState);
 
     // from svt::RoadmapWizard