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

[Noel Grandin (via logerrit)]

 include/svtools/helpopt.hxx       |    2 --
 sfx2/source/appl/sfxhelp.cxx      |    2 +-
 svtools/source/config/helpopt.cxx |   18 ++----------------
 3 files changed, 3 insertions(+), 19 deletions(-)

New commits:
commit ba4f191300779cbd9e536d11c02895541fef24be
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Jul 23 11:45:22 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jul 23 20:46:55 2021 +0200

    use officecfg to retrieve help system
    
    Change-Id: I09f7a3a91ed63bab28c20984fa80d4d392e9d092
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119413
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx
index 962884a4676b..a532d6dbd698 100644
--- a/include/svtools/helpopt.hxx
+++ b/include/svtools/helpopt.hxx
@@ -43,8 +43,6 @@ public:
 
     const OUString& GetHelpStyleSheet()const;
     void            SetHelpStyleSheet(const OUString& rStyleSheet);
-
-    OUString const & GetSystem() const;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 2a1d4f6e8072..e96c3f7f4a0d 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -279,7 +279,7 @@ void AppendConfigToken( OUStringBuffer& rURL, bool bQuestionMark )
     rURL.append("Language=");
     rURL.append(aLocaleStr);
     rURL.append("&System=");
-    rURL.append(SvtHelpOptions().GetSystem());
+    rURL.append(officecfg::Office::Common::Help::System::get());
     rURL.append("&Version=");
     rURL.append(utl::ConfigManager::getProductVersion());
 }
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 7cdb3f5ab5e4..63b128d413fb 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -44,9 +44,8 @@ enum class HelpProperty
     ExtendedHelp    = 0,
     HelpTips        = 1,
     Locale          = 2,
-    System          = 3,
-    StyleSheet      = 4,
-    OfflineHelpPopUp = 5
+    StyleSheet      = 3,
+    OfflineHelpPopUp = 4
 };
 
 }
@@ -57,7 +56,6 @@ class SvtHelpOptions_Impl : public utl::ConfigItem
     bool            bHelpTips;
     bool            bOfflineHelpPopUp;
     OUString        aLocale;
-    OUString        aSystem;
     OUString        sHelpStyleSheet;
 
     static Sequence< OUString > const & GetPropertyNames();
@@ -77,7 +75,6 @@ public:
     bool            IsHelpTips() const                      { return bHelpTips; }
     void            SetOfflineHelpPopUp(bool b) { bOfflineHelpPopUp = b; SetModified();}
     bool            IsOfflineHelpPopUp() const { return bOfflineHelpPopUp;}
-    const OUString& GetSystem() const                       { return aSystem; }
 
     const OUString& GetHelpStyleSheet()const{return sHelpStyleSheet;}
     void            SetHelpStyleSheet(const OUString& rStyleSheet){sHelpStyleSheet = rStyleSheet; SetModified();}
@@ -168,9 +165,6 @@ void  SvtHelpOptions_Impl::Load(const uno::Sequence< OUString>& rPropertyNames)
                         aLocale = aTmpStr;
                         break;
 
-                    case HelpProperty::System:
-                        aSystem = aTmpStr;
-                        break;
                     case HelpProperty::StyleSheet:
                         sHelpStyleSheet = aTmpStr;
                     break;
@@ -216,9 +210,6 @@ void SvtHelpOptions_Impl::ImplCommit()
                 pValues[nProp] <<= aLocale;
                 break;
 
-            case HelpProperty::System:
-                pValues[nProp] <<= aSystem;
-                break;
             case HelpProperty::StyleSheet:
                 pValues[nProp] <<= sHelpStyleSheet;
             break;
@@ -287,11 +278,6 @@ bool SvtHelpOptions::IsHelpTips() const
     return pImpl->IsHelpTips();
 }
 
-OUString const & SvtHelpOptions::GetSystem() const
-{
-    return pImpl->GetSystem();
-}
-
 const OUString&   SvtHelpOptions::GetHelpStyleSheet()const
 {
     return pImpl->GetHelpStyleSheet();