diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-06 12:34:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-06 12:53:15 +0000 |
| commit | f0e4c91aba989507913d1f88133050409dd109c5 (patch) | |
| tree | 8fcf198d4d6b4e5750d3e38ff7efb649c072194b /sfx2 | |
| parent | 653588e1bbad1e4d954afa4b12325996fd1cceb7 (diff) | |
split out module->help mapping
and add the missing not-toplevel-in-help ones from...
ls instdir/share/config/soffice.cfg/modules|sort|uniq
Change-Id: I618d91e1271b3a200928494156d93cbfef45c19f
Reviewed-on: https://gerrit.libreoffice.org/36206
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 67 |
1 files changed, 40 insertions, 27 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 2fa709a4c098..2042ece510c9 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -286,6 +286,42 @@ OUString getCurrentModuleIdentifier_Impl() return sIdentifier; } +namespace +{ + OUString MapModuleIdentifier(const OUString &rFactoryShortName) + { + OUString aFactoryShortName(rFactoryShortName); + + // Map some module identifiers to their "real" help module string. + if ( aFactoryShortName == "chart2" ) + aFactoryShortName = "schart" ; + else if ( aFactoryShortName == "BasicIDE" ) + aFactoryShortName = "sbasic"; + else if ( aFactoryShortName == "sweb" + || aFactoryShortName == "sglobal" + || aFactoryShortName == "swxform" ) + aFactoryShortName = "swriter" ; + else if ( aFactoryShortName == "dbquery" + || aFactoryShortName == "dbbrowser" + || aFactoryShortName == "dbrelation" + || aFactoryShortName == "dbtable" + || aFactoryShortName == "dbapp" + || aFactoryShortName == "dbreport" + || aFactoryShortName == "dbtdata" + || aFactoryShortName == "swreport" + || aFactoryShortName == "swform" ) + aFactoryShortName = "sdatabase"; + else if ( aFactoryShortName == "sbibliography" + || aFactoryShortName == "sabpilot" + || aFactoryShortName == "scanner" + || aFactoryShortName == "spropctrlr" + || aFactoryShortName == "StartModule" ) + aFactoryShortName.clear(); + + return aFactoryShortName; + } +} + OUString SfxHelp::GetHelpModuleName_Impl() { OUString aFactoryShortName; @@ -314,33 +350,10 @@ OUString SfxHelp::GetHelpModuleName_Impl() } } - OUString sDefaultModule = getDefaultModule_Impl(); - if ( !aFactoryShortName.isEmpty() ) - { - // Map some module identifiers to their "real" help module string. - if ( aFactoryShortName == "chart2" ) - aFactoryShortName = "schart" ; - else if ( aFactoryShortName == "BasicIDE" ) - aFactoryShortName = "sbasic"; - else if ( aFactoryShortName == "sweb" - || aFactoryShortName == "sglobal" - || aFactoryShortName == "swxform" ) - aFactoryShortName = "swriter" ; - else if ( aFactoryShortName == "dbquery" - || aFactoryShortName == "dbbrowser" - || aFactoryShortName == "dbrelation" - || aFactoryShortName == "dbtable" - || aFactoryShortName == "dbapp" - || aFactoryShortName == "dbreport" - || aFactoryShortName == "swreport" - || aFactoryShortName == "swform" ) - aFactoryShortName = "sdatabase"; - else if ( aFactoryShortName == "sbibliography" - || aFactoryShortName == "StartModule" ) - aFactoryShortName = sDefaultModule; - } - else - aFactoryShortName = sDefaultModule; + if (!aFactoryShortName.isEmpty()) + aFactoryShortName = MapModuleIdentifier(aFactoryShortName); + if (aFactoryShortName.isEmpty()) + aFactoryShortName = getDefaultModule_Impl(); return aFactoryShortName; } |