[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Caolán McNamara]

 include/sfx2/sfxhelp.hxx     |    2 -
 sfx2/source/appl/sfxhelp.cxx |   51 +++++++++++++++++++++++++++----------------
 2 files changed, 34 insertions(+), 19 deletions(-)

New commits:
commit ad16351d9d8fd440bb8941c453b802ad5c109b23
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 6 12:49:40 2017 +0100

    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

diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index 561b336cfa1a..06da6f412e6c 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
@@ -36,7 +36,7 @@ private:
     SAL_DLLPRIVATE static bool Start_Impl( const OUString& rURL, const vcl::Window* pWindow, const OUString& rKeyword );
     SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ) override;
     SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const vcl::Window* pWindow ) override;
-    SAL_DLLPRIVATE static OUString GetHelpModuleName_Impl();
+    SAL_DLLPRIVATE static OUString GetHelpModuleName_Impl(const OUString &rHelpId);
     SAL_DLLPRIVATE static OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName );
 
 public:
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 )