jl145: merge with DEV300_m69

15 files changed, 43 insertions, 19 deletions

diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 43fe8b87f3..04f3f19d2e 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -104,7 +104,7 @@ PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
             OSL_ASSERT( false );
         }
         OString cstr_sysPath(
-            OUStringToOString( m_sysPath, osl_getThreadTextEncoding() ) );
+            OUStringToOString( m_sysPath, RTL_TEXTENCODING_UTF8 ) );
         char const * pcstr_sysPath = cstr_sysPath.getStr();
         
         u_int32_t flags = DB_CREATE;
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
index af99601334..dc9ea6fea8 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
@@ -33,7 +33,7 @@
 
 
 #include "svtools/svmedit2.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
 #include "svtools/xtextedt.hxx"
 #include "vcl/scrbar.hxx"
 
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
index c73a4df82c..6ed3d3c723 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
@@ -31,7 +31,7 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_AUTOSCROLLEDIT_HXX
 
 #include "svtools/svmedit2.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
 
 namespace dp_gui {
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 4430b5b444..e8acd11e45 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -34,7 +34,7 @@
 
 #include "dp_gui.hrc"
 #include "svtools/controldims.hrc"
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 
 #include "dp_gui.h"
 #include "dp_gui_dialog2.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index ea05a7394b..2620a1f29a 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -284,8 +284,8 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_context;
     UpdateDialog & m_dialog;
     std::vector< dp_gui::TUpdateListEntry > m_vExtensionList;
-    css::uno::Reference< css::deployment::XUpdateInformationProvider >
-        m_updateInformation;
+    css::uno::Reference< css::deployment::XUpdateInformationProvider > m_updateInformation;
+    css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHdl;
 
     // guarded by Application::GetSolarMutex():
     css::uno::Reference< css::task::XAbortChannel > m_abort;
@@ -302,7 +302,21 @@ UpdateDialog::Thread::Thread(
     m_updateInformation(
         css::deployment::UpdateInformationProvider::create(context)),
     m_stop(false)
-{}
+{
+    if( m_context.is() )
+    {
+        css::uno::Reference< css::lang::XMultiComponentFactory > xServiceManager( m_context->getServiceManager() );
+
+        if( xServiceManager.is() )
+        {
+            m_xInteractionHdl = css::uno::Reference< css::task::XInteractionHandler > (
+                                xServiceManager->createInstanceWithContext( OUSTR( "com.sun.star.task.InteractionHandler" ), m_context),
+                                css::uno::UNO_QUERY );
+            if ( m_xInteractionHdl.is() )
+                m_updateInformation->setInteractionHandler( m_xInteractionHdl );
+        }
+    }
+}
 
 void UpdateDialog::Thread::stop() {
     css::uno::Reference< css::task::XAbortChannel > abort;
@@ -327,7 +341,11 @@ UpdateDialog::Thread::Entry::Entry(
     version(theVersion)
 {}
 
-UpdateDialog::Thread::~Thread() {}
+UpdateDialog::Thread::~Thread()
+{
+    if ( m_xInteractionHdl.is() )
+        m_updateInformation->setInteractionHandler( css::uno::Reference< css::task::XInteractionHandler > () );
+}
 
 void UpdateDialog::Thread::execute()
 {
@@ -1260,7 +1278,7 @@ IMPL_LINK( UpdateDialog, hyperlink_clicked, svt::FixedHyperlink*, pHyperlink )
     {
         css::uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
             m_context->getServiceManager()->createInstanceWithContext(
-                ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" ),
+                OUSTR( "com.sun.star.system.SystemShellExecute" ),
                 m_context), css::uno::UNO_QUERY_THROW);
         //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException
         xSystemShellExecute->execute(
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index e2dab99af7..21e0671a39 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -43,7 +43,7 @@
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "com/sun/star/task/XJobExecutor.hpp"
 #include "svtools/svmedit.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
 #include "svtools/xtextedt.hxx"
 #include <vcl/scrbar.hxx>
 #include "vcl/threadex.hxx"
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index 8ee3efd34f..f63661df4c 100644
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -82,6 +82,7 @@ SHL1STDLIBS = \
         $(TOOLSLIB) \
         $(XMLSCRIPTLIB) \
         $(SVLLIB) \
+        $(UNOTOOLSLIB) \
         $(DEPLOYMENTMISCLIB) \
     $(HELPLINKERLIB)
 
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 5f9ec21c35..1c99bcc45b 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -49,7 +49,7 @@
 #include "comphelper/servicedecl.hxx"
 #include "comphelper/sequence.hxx"
 #include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/lang/DisposedException.hpp"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
 #include "com/sun/star/beans/UnknownPropertyException.hpp"
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index a8cd387228..bd1d4914c3 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -45,7 +45,7 @@
 #include "comphelper/servicedecl.hxx"
 #include "comphelper/sequence.hxx"
 #include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
 #include "com/sun/star/container/XNameContainer.hpp"
 #include "com/sun/star/container/XHierarchicalNameAccess.hpp"
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index bf63a338ee..e13d580e2b 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -45,7 +45,7 @@
 #include "comphelper/anytostring.hxx"
 #include "comphelper/servicedecl.hxx"
 #include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/ucb/NameClash.hpp"
 #include "com/sun/star/io/XActiveDataSink.hpp"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 902d9f6645..5ecfab8b34 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -38,7 +38,7 @@
 #include "osl/file.hxx"
 #include "ucbhelper/content.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "cppuhelper/implbase1.hxx"
 
 using namespace ::com::sun::star;
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 8ef0a7141a..10ef1a7001 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -38,7 +38,8 @@
 #include "osl/file.hxx"
 #include "ucbhelper/content.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
+#include "unotools/pathoptions.hxx"
 
 #include <transex3/compilehelp.hxx> 
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
@@ -350,8 +351,12 @@ void BackendImpl::implProcessHelp
                     pXhpFiles[iXhp] = aXhpRelFile;
                 }
 
+                rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() );
+                rtl::OUString aOfficeHelpPathFileURL;
+                ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL ); 
+
                 HelpProcessingErrorInfo aErrorInfo;
-                bool bSuccess = compileExtensionHelp( aHelpStr, aLangURL, 
+                bool bSuccess = compileExtensionHelp( aOfficeHelpPathFileURL, aHelpStr, aLangURL,
                     nXhpFileCount, pXhpFiles, aErrorInfo );
 
                 if( bSuccess && xInvocation.is() )
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 39929de77e..92ec602ba3 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -44,7 +44,7 @@
 #include "cppuhelper/exc_hlp.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "ucbhelper/content.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "comphelper/anytostring.hxx"
 #include "comphelper/makesequence.hxx"
 #include "comphelper/sequence.hxx"
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 1a8a0e4d1b..f5c2ee3e3e 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -40,7 +40,7 @@
 #include "cppuhelper/exc_hlp.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/util/XUpdatable.hpp"
 #include "com/sun/star/script/XLibraryContainer.hpp"
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index c460409890..953cdb8901 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -38,7 +38,7 @@
 #include "ucbhelper/content.hxx"
 #include "cppuhelper/exc_hlp.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
 #include <memory>