From ad16351d9d8fd440bb8941c453b802ad5c109b23 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 6 Apr 2017 12:49:40 +0100
Subject: Resolves: rhbz#1438876 detect preferred help module for csv dialog

For calc import before any toplevel is created the context is otherwise
unknown. If a help id starts with a specific module name, then default to that
module name as default help category context. Cosmetic, same help is shown in
any case because its in the shared section, but title bar would state "Writer"
when context is expected to be "Calc"

Change-Id: I3323bc55ef23ec162dad4349efb5e84ec3e8054c
---
 sfx2/source/appl/sfxhelp.cxx | 51 ++++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 18 deletions(-)

(limited to 'sfx2/source/appl/sfxhelp.cxx')

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 2042ece510c9..f3f9c160373f 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -322,31 +322,46 @@ namespace
     }
 }
 
-OUString SfxHelp::GetHelpModuleName_Impl()
+OUString SfxHelp::GetHelpModuleName_Impl(const OUString& rHelpID)
 {
     OUString aFactoryShortName;
-    OUString aModuleIdentifier = getCurrentModuleIdentifier_Impl();
 
-    if ( !aModuleIdentifier.isEmpty() )
+    //rhbz#1438876 detect preferred module for this help id, e.g. csv dialog
+    //for calc import before any toplevel is created and so context is
+    //otherwise unknown. Cosmetic, same help is shown in any case because its
+    //in the shared section, but title bar would state "Writer" when context is
+    //expected to be "Calc"
+    OUString sRemainder;
+    if (rHelpID.startsWith("modules/", &sRemainder))
     {
-        try
+        sal_Int32 nEndModule = sRemainder.indexOf('/');
+        aFactoryShortName = nEndModule != -1 ? sRemainder.copy(0, nEndModule) : sRemainder;
+    }
+
+    if (aFactoryShortName.isEmpty())
+    {
+        OUString aModuleIdentifier = getCurrentModuleIdentifier_Impl();
+        if (!aModuleIdentifier.isEmpty())
         {
-            Reference < XModuleManager2 > xModuleManager(
-                ModuleManager::create(::comphelper::getProcessComponentContext()) );
-            Sequence< PropertyValue > lProps;
-            xModuleManager->getByName( aModuleIdentifier ) >>= lProps;
-            for ( sal_Int32 i = 0; i < lProps.getLength(); ++i )
+            try
             {
-                if ( lProps[i].Name == "ooSetupFactoryShortName" )
+                Reference < XModuleManager2 > xModuleManager(
+                    ModuleManager::create(::comphelper::getProcessComponentContext()) );
+                Sequence< PropertyValue > lProps;
+                xModuleManager->getByName( aModuleIdentifier ) >>= lProps;
+                for ( sal_Int32 i = 0; i < lProps.getLength(); ++i )
                 {
-                    lProps[i].Value >>= aFactoryShortName;
-                    break;
+                    if ( lProps[i].Name == "ooSetupFactoryShortName" )
+                    {
+                        lProps[i].Value >>= aFactoryShortName;
+                        break;
+                    }
                 }
             }
-        }
-        catch (const Exception&)
-        {
-            SAL_WARN( "sfx.appl", "SfxHelp::GetHelpModuleName_Impl(): exception of XNameAccess::getByName()" );
+            catch (const Exception&)
+            {
+                SAL_WARN( "sfx.appl", "SfxHelp::GetHelpModuleName_Impl(): exception of XNameAccess::getByName()" );
+            }
         }
     }
 
@@ -451,7 +466,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask   ,
 
 OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const vcl::Window* pWindow )
 {
-    OUString sModuleName = GetHelpModuleName_Impl();
+    OUString sModuleName = GetHelpModuleName_Impl(aCommandURL);
     OUString sRealCommand = vcl::CommandInfoProvider::GetRealCommandForCommand( aCommandURL, getCurrentModuleIdentifier_Impl() );
     OUString sHelpText = SfxHelp_Impl::GetHelpText( sRealCommand.isEmpty() ? aCommandURL : sRealCommand, sModuleName );
 
@@ -565,7 +580,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const
             break;
         default:
         {
-            OUString aHelpModuleName( GetHelpModuleName_Impl() );
+            OUString aHelpModuleName(GetHelpModuleName_Impl(rURL));
             OUString aRealCommand;
 
             if ( nProtocol == INetProtocol::Uno )
-- 
cgit