odficonsso1: merge with DEV300_m67

6 files changed, 43 insertions, 9 deletions

diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index ce2ed07f57e4..3f51d13cec1b 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -21,7 +21,7 @@ dt	desktop\os2\source\applauncher			nmake	-	p	dt_applauncher dt_inc NULL
 dt	desktop\unx\source\officeloader		nmake	-	u	dt_officeloader_unx dt_inc NULL
 dt	desktop\source\pagein					nmake	-	u	dt_pagein dt_inc NULL
 dt	desktop\source\pkgchk\unopkg			nmake	-	all	dt_unopkg dt_dp_misc dt_app dt_inc dt_guiloader.w NULL
-dt	desktop\source\deployment				nmake	-	all	dt_deployment dt_dp_manager dt_dp_registry dt_dp_registry_package dt_dp_registry_executable dt_dp_registry_help dt_dp_registry_script dt_dp_registry_sfwk dt_dp_registry_component dt_dp_registry_configuration dt_dp_migration dt_dp_unopkg dt_inc NULL
+dt	desktop\source\deployment				nmake	-	all	dt_deployment dt_dp_manager dt_dp_registry dt_dp_registry_package dt_dp_registry_executable dt_dp_registry_help dt_dp_registry_script dt_dp_registry_sfwk dt_dp_registry_component dt_dp_registry_configuration dt_dp_migration dt_dp_unopkg dt_inc dt_dp_misc NULL
 dt	desktop\source\deployment\misc				nmake	-	all	dt_dp_misc dt_inc NULL
 dt	desktop\source\deployment\unopkg			nmake	-	all	dt_dp_unopkg dt_inc NULL
 dt	desktop\source\deployment\migration			nmake	-	all	dt_dp_migration dt_inc NULL
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d4e0a91c1d17..ede5fdf7511a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1468,6 +1468,13 @@ void Desktop::Main()
                     xContainerWindow = xBackingFrame->getContainerWindow();
                 if (xContainerWindow.is())
                 {
+                    // set the WB_EXT_DOCUMENT style. Normally, this is done by the TaskCreator service when a "_blank"
+                    // frame/window is created. Since we do not use the TaskCreator here, we need to mimic its behavior,
+                    // otherwise documents loaded into this frame will later on miss functionality depending on the style.
+                    Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+                    OSL_ENSURE( pContainerWindow, "Desktop::Main: no implementation access to the frame's container window!" );
+                    pContainerWindow->SetExtendedStyle( pContainerWindow->GetExtendedStyle() | WB_EXT_DOCUMENT );
+
                     SetSplashScreenProgress(75);
                     Sequence< Any > lArgs(1);
                     lArgs[0] <<= xContainerWindow;
@@ -1738,8 +1745,15 @@ sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& r
         aSeq[0] <<= bQuickstart;
 
         // Try to instanciate quickstart service. This service is not mandatory, so
-        // do nothing if service is not available.
+        // do nothing if service is not available
+
+        // #i105753# the following if was invented for performance
+        // unfortunately this broke the QUARTZ behavior which is to always run
+        // in quickstart mode since Mac applications do not usually quit
+        // when the last document closes
+        #ifndef QUARTZ
         if ( bQuickstart )
+        #endif
         {
             Reference < XComponent > xQuickstart( rSMgr->createInstanceWithArguments(
                                                 DEFINE_CONST_UNICODE( "com.sun.star.office.Quickstart" ), aSeq ),
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index f4473c2c6fd8..36f08dbf5b32 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1141,7 +1141,7 @@ void ExtensionBox_Impl::checkEntries()
 //------------------------------------------------------------------------------

 bool ExtensionBox_Impl::isHCMode()

 {

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

+    return (bool)GetSettings().GetStyleSettings().GetHighContrastMode();

 }

 

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

diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 0e1955359bbc..58e2cbd9bd0a 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 bbc6a983c1fd..555b7578b327 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -215,7 +215,7 @@ LicenseDialogImpl::LicenseDialogImpl(
 
 {
 
-    if (GetBackground().GetColor().IsDark())
+    if (GetSettings().GetStyleSettings().GetHighContrastMode())
     {
         // high contrast mode needs other images
         m_fiArrow1.SetImage(Image(DpGuiResId(IMG_LICENCE_ARROW_HC)));
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 80c5849ee4d9..2c85828f540f 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -373,9 +373,11 @@ UserPage::UserPage( svt::OWizardMachine* parent, const ResId& resid)
     SvtUserOptions aUserOpt;
     m_edFirst.SetText(aUserOpt.GetFirstName());
     m_edLast.SetText(aUserOpt.GetLastName());
+#if 0
     rtl::OUString aUserName;
     vos::OSecurity().getUserName( aUserName );
        aUserOpt.SetID( aUserName );
+#endif
 
     m_edInitials.SetText(aUserOpt.GetID());
     if (m_lang == LANGUAGE_RUSSIAN)