use officecfg for SvxHtmlOptions

Change-Id: Ie7db7d20509e45fd87d8460c7fae6c0131e0a1f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119494
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

15 files changed, 44 insertions, 58 deletions

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx
index b4f307131e8f..76f27831ec10 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -1099,9 +1099,8 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testChinese)
     mxComponent = loadFromDesktop(aURL, "com.sun.star.text.TextDocument", {});
 
     // Prevent parseXmlStream guess incompatible encoding and complaint.
-    SvxHtmlOptions& rOptions = SvxHtmlOptions::Get();
-    rtl_TextEncoding eOldEncoding = rOptions.GetTextEncoding();
-    rOptions.SetTextEncoding(RTL_TEXTENCODING_UTF8);
+    rtl_TextEncoding eOldEncoding = SvxHtmlOptions::GetTextEncoding();
+    SvxHtmlOptions::SetTextEncoding(RTL_TEXTENCODING_UTF8);
 
     // Export it.
     ExportToReqif();
@@ -1112,7 +1111,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testChinese)
     // Without the accompanying fix in place, this test would have failed as the output was not
     // well-formed.
     CPPUNIT_ASSERT(pDoc);
-    rOptions.SetTextEncoding(eOldEncoding);
+    SvxHtmlOptions::SetTextEncoding(eOldEncoding);
 }
 
 CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifComment)
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 70b68e4e1df1..ffed09c38cca 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -117,6 +117,7 @@
 #include <officecfg/Office/Writer.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/sequence.hxx>
+#include <officecfg/Office/Common.hxx>
 
 #include <swerror.h>
 #include <ndole.hxx>
@@ -327,16 +328,15 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn,
     memset(m_xAttrTab.get(), 0, sizeof(HTMLAttrTable));
 
     // Read the font sizes 1-7 from the INI file
-    SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
-    m_aFontHeights[0] = rHtmlOptions.GetFontSize( 0 ) * 20;
-    m_aFontHeights[1] = rHtmlOptions.GetFontSize( 1 ) * 20;
-    m_aFontHeights[2] = rHtmlOptions.GetFontSize( 2 ) * 20;
-    m_aFontHeights[3] = rHtmlOptions.GetFontSize( 3 ) * 20;
-    m_aFontHeights[4] = rHtmlOptions.GetFontSize( 4 ) * 20;
-    m_aFontHeights[5] = rHtmlOptions.GetFontSize( 5 ) * 20;
-    m_aFontHeights[6] = rHtmlOptions.GetFontSize( 6 ) * 20;
+    m_aFontHeights[0] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_1::get() * 20;
+    m_aFontHeights[1] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_2::get() * 20;
+    m_aFontHeights[2] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_3::get() * 20;
+    m_aFontHeights[3] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_4::get() * 20;
+    m_aFontHeights[4] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_5::get() * 20;
+    m_aFontHeights[5] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_6::get() * 20;
+    m_aFontHeights[6] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_7::get() * 20;
 
-    m_bKeepUnknown = rHtmlOptions.IsImportUnknown();
+    m_bKeepUnknown = officecfg::Office::Common::Filter::HTML::Import::UnknownTag::get();
 
     if(bReadNewDoc)
     {
@@ -359,7 +359,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn,
     m_xDoc->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, true);
 
     m_pCSS1Parser.reset(new SwCSS1Parser(m_xDoc.get(), *this, m_aFontHeights, m_sBaseURL, IsNewDoc()));
-    m_pCSS1Parser->SetIgnoreFontFamily( rHtmlOptions.IsIgnoreFontFamily() );
+    m_pCSS1Parser->SetIgnoreFontFamily( officecfg::Office::Common::Filter::HTML::Import::FontSetting::get() );
 
     if( bReadUTF8 )
     {
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index ebe0918750a9..49993c7bc684 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -82,6 +82,7 @@
 #include <comphelper/scopeguard.hxx>
 #include <unotools/tempfile.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <officecfg/Office/Common.hxx>
 
 #define MAX_INDENT_LEVEL 20
 
@@ -273,20 +274,18 @@ ErrCode SwHTMLWriter::WriteStream()
     }
     comphelper::ScopeGuard g([this, pOldPasteStream] { this->SetStream(pOldPasteStream); });
 
-    SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
-
     // font heights 1-7
-    m_aFontHeights[0] = rHtmlOptions.GetFontSize( 0 ) * 20;
-    m_aFontHeights[1] = rHtmlOptions.GetFontSize( 1 ) * 20;
-    m_aFontHeights[2] = rHtmlOptions.GetFontSize( 2 ) * 20;
-    m_aFontHeights[3] = rHtmlOptions.GetFontSize( 3 ) * 20;
-    m_aFontHeights[4] = rHtmlOptions.GetFontSize( 4 ) * 20;
-    m_aFontHeights[5] = rHtmlOptions.GetFontSize( 5 ) * 20;
-    m_aFontHeights[6] = rHtmlOptions.GetFontSize( 6 ) * 20;
+    m_aFontHeights[0] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_1::get() * 20;
+    m_aFontHeights[1] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_2::get() * 20;
+    m_aFontHeights[2] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_3::get() * 20;
+    m_aFontHeights[3] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_4::get() * 20;
+    m_aFontHeights[4] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_5::get() * 20;
+    m_aFontHeights[5] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_6::get() * 20;
+    m_aFontHeights[6] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_7::get() * 20;
 
     // output styles anyway
     // (then also top and bottom paragraph spacing)
-    m_nExportMode = rHtmlOptions.GetExportMode();
+    m_nExportMode = SvxHtmlOptions::GetExportMode();
     m_nHTMLMode = GetHtmlMode(nullptr);
 
     if( HTML_CFG_WRITER == m_nExportMode || HTML_CFG_NS40 == m_nExportMode )
@@ -321,19 +320,19 @@ ErrCode SwHTMLWriter::WriteStream()
     m_eCSS1Unit = SW_MOD()->GetMetric( m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) );
 
     bool bWriteUTF8 = m_bWriteClipboardDoc;
-    m_eDestEnc = bWriteUTF8 ? RTL_TEXTENCODING_UTF8 : rHtmlOptions.GetTextEncoding();
+    m_eDestEnc = bWriteUTF8 ? RTL_TEXTENCODING_UTF8 : SvxHtmlOptions::GetTextEncoding();
     const char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( m_eDestEnc );
     m_eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet );
 
     // Only for the MS-IE we favour the export of styles.
     m_bCfgPreferStyles = HTML_CFG_MSIE == m_nExportMode;
 
-    m_bCfgStarBasic = rHtmlOptions.IsStarBasic();
+    m_bCfgStarBasic = officecfg::Office::Common::Filter::HTML::Export::Basic::get();
 
     m_bCfgFormFeed = !IsHTMLMode(HTMLMODE_PRINT_EXT);
-    m_bCfgCpyLinkedGrfs = rHtmlOptions.IsSaveGraphicsLocal();
+    m_bCfgCpyLinkedGrfs = officecfg::Office::Common::Filter::HTML::Export::LocalGraphic::get();
 
-    m_bCfgPrintLayout = rHtmlOptions.IsPrintLayoutExtension();
+    m_bCfgPrintLayout = SvxHtmlOptions::IsPrintLayoutExtension();
 
     // get HTML template
     bool bOldHTMLMode = false;
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index ad6670d14d87..225c0472de9c 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -73,8 +73,7 @@ SwParaDlg::SwParaDlg(weld::Window *pParent,
     AddTabPage("labelTP_PARA_ALIGN", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),
                                       pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH));
 
-    SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-    if (!bDrawParaDlg && (!bHtmlMode || rHtmlOpt.IsPrintLayoutExtension()))
+    if (!bDrawParaDlg && (!bHtmlMode || SvxHtmlOptions::IsPrintLayoutExtension()))
     {
         OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!");
         OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!");
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 6e081c68a9a1..cc659cbebd74 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -969,8 +969,7 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi
         case MM_DOCTYPE_HTML:
         {
             bAsBody = true;
-            SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
-            eEncoding = rHtmlOptions.GetTextEncoding();
+            eEncoding = SvxHtmlOptions::GetTextEncoding();
         }
         break;
         case MM_DOCTYPE_TEXT:
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index edc96fa6ba13..288fe0d1e5e2 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1361,8 +1361,7 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog(
     AddTabPage("notes", SwSectionFootnoteEndTabPage::Create, nullptr);
     AddTabPage("indents", SwSectionIndentTabPage::Create, nullptr);
 
-    SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-    tools::Long nHtmlMode = rHtmlOpt.GetExportMode();
+    tools::Long nHtmlMode = SvxHtmlOptions::GetExportMode();
 
     bool bWeb = dynamic_cast<SwWebDocShell*>( rSh.GetView().GetDocShell()  ) != nullptr ;
     if(bWeb)
@@ -1997,8 +1996,7 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog(
     AddTabPage("notes", SwSectionFootnoteEndTabPage::Create, nullptr);
     AddTabPage("indents", SwSectionIndentTabPage::Create, nullptr);
 
-    SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-    tools::Long nHtmlMode = rHtmlOpt.GetExportMode();
+    tools::Long nHtmlMode = SvxHtmlOptions::GetExportMode();
     bool bWeb = dynamic_cast<SwWebDocShell*>( rSh.GetView().GetDocShell()  ) != nullptr ;
     if(bWeb)
     {
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 08e52b4d8400..2062b69bee45 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -148,8 +148,7 @@ SwTemplateDlgController::SwTemplateDlgController(weld::Window* pParent,
             SvtCJKOptions aCJKOptions;
             if(nHtmlMode & HTMLMODE_ON)
             {
-                SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-                if (!rHtmlOpt.IsPrintLayoutExtension())
+                if (!SvxHtmlOptions::IsPrintLayoutExtension())
                     RemoveTabPage("textflow");
                 RemoveTabPage("asiantypo");
                 RemoveTabPage("tabs");
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 36964d4f10fe..a797a69f1af2 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1428,8 +1428,7 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
 void   SwTextFlowPage::Reset( const SfxItemSet* rSet )
 {
     const SfxPoolItem* pItem;
-    SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-    bool bFlowAllowed = !bHtmlMode || rHtmlOpt.IsPrintLayoutExtension();
+    bool bFlowAllowed = !bHtmlMode || SvxHtmlOptions::IsPrintLayoutExtension();
     if(bFlowAllowed)
     {
         //Inserting of the existing page templates in the list box
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index aeb593036e30..80029f5535c1 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -633,8 +633,9 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
     if( pFlt->GetUserData() == "HTML" )
     {
 #if HAVE_FEATURE_SCRIPTING
-        SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-        if( !rHtmlOpt.IsStarBasic() && rHtmlOpt.IsStarBasicWarning() && HasBasic() )
+        if( !officecfg::Office::Common::Filter::HTML::Export::Basic::get()
+            && officecfg::Office::Common::Filter::HTML::Export::Warning::get()
+            && HasBasic() )
         {
             uno::Reference< XLibraryContainer > xLibCont = GetBasicContainer();
             uno::Reference< XNameAccess > xLib;
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 52fe3223a9b7..8e297f06298f 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -107,6 +107,7 @@
 #include <com/sun/star/script/vba/VBAEventId.hpp>
 #include <editeng/acorrcfg.hxx>
 #include <officecfg/Office/Security.hxx>
+#include <officecfg/Office/Common.hxx>
 
 #include <sfx2/fcontnr.hxx>
 #include <svx/ClassificationDialog.hxx>
@@ -1452,11 +1453,10 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie
     // A EnterBasicCall is not needed here, because nothing is called and
     // there can't be any Dok-Basic, that has not yet been loaded inside
     // of an HTML document.
-    SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
     //#59620# HasBasic() shows, that there already is a BasicManager at the DocShell.
     //          That was always generated in HTML-Import, when there are
     //          Macros in the source code.
-    if( rHtmlOptions.IsStarBasic() && HasBasic())
+    if( officecfg::Office::Common::Filter::HTML::Export::Basic::get() && HasBasic())
     {
         BasicManager *pBasicMan = GetBasicManager();
         if( pBasicMan && (pBasicMan != SfxApplication::GetBasicManager()) )
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 0f196fcdf0a7..86cbd0291d1e 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -203,8 +203,7 @@ void  SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
 
             case SID_STYLE_FAMILY4:
             {
-                SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-                if (m_xDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) && !rHtmlOpt.IsPrintLayoutExtension())
+                if (m_xDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) && !SvxHtmlOptions::IsPrintLayoutExtension())
                     rSet.DisableItem( nWhich );
                 else
                 {
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index f36530c355ad..66ea4daa05f4 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -357,8 +357,7 @@ sal_uInt16      GetHtmlMode(const SwDocShell* pShell)
     if(!pShell || dynamic_cast<const SwWebDocShell*>( pShell) )
     {
         nRet = HTMLMODE_ON | HTMLMODE_SOME_STYLES;
-        SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-        switch ( rHtmlOpt.GetExportMode() )
+        switch ( SvxHtmlOptions::GetExportMode() )
         {
             case HTML_CFG_MSIE:
                 nRet |= HTMLMODE_FULL_STYLES;
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 132743c030fd..f1cad9f7cb52 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1122,8 +1122,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
             {
                 sMailBodyMimeType = "text/html; charset=" + OUString::createFromAscii(
                                     rtl_getBestMimeCharsetFromTextEncoding( sMailEncoding ));
-                SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
-                sMailEncoding = rHtmlOptions.GetTextEncoding();
+                sMailEncoding = SvxHtmlOptions::GetTextEncoding();
             }
             else
                 sMailBodyMimeType = "text/plain; charset=UTF-8; format=flowed";
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 0f19e33153d9..af3fc2e21494 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -427,8 +427,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
         bool bSingleCol = false;
         if( nullptr!= dynamic_cast< SwWebDocShell*>( GetView().GetDocShell()) )
         {
-            SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-            if( HTML_CFG_MSIE == rHtmlOpt.GetExportMode() )
+            if( HTML_CFG_MSIE == SvxHtmlOptions::GetExportMode() )
             {
                 bSingleCol = true;
             }
@@ -613,8 +612,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
                     }
                     else if(SID_INSERT_FLOATINGFRAME == nWhich && bHtmlModeOn)
                     {
-                        SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-                        const sal_uInt16 nExport = rHtmlOpt.GetExportMode();
+                        const sal_uInt16 nExport = SvxHtmlOptions::GetExportMode();
                         if(HTML_CFG_MSIE != nExport && HTML_CFG_WRITER != nExport )
                             rSet.DisableItem(nWhich);
                     }
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 1a7816c33223..e7b2059a1ec0 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -159,9 +159,8 @@ static rtl_TextEncoding lcl_GetStreamCharSet(rtl_TextEncoding eLoadEncoding)
     rtl_TextEncoding eRet = eLoadEncoding;
     if(RTL_TEXTENCODING_DONTKNOW == eRet)
     {
-        SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
         const char *pCharSet =
-            rtl_getBestMimeCharsetFromTextEncoding( rHtmlOptions.GetTextEncoding() );
+            rtl_getBestMimeCharsetFromTextEncoding( SvxHtmlOptions::GetTextEncoding() );
         eRet = rtl_getTextEncodingFromMimeCharset( pCharSet );
     }
     return eRet;
@@ -752,9 +751,8 @@ void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 
 void SwSrcView::Load(SwDocShell* pDocShell)
 {
-    SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
     const char *pCharSet =
-        rtl_getBestMimeCharsetFromTextEncoding( rHtmlOptions.GetTextEncoding() );
+        rtl_getBestMimeCharsetFromTextEncoding( SvxHtmlOptions::GetTextEncoding() );
     rtl_TextEncoding eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet );
 
     aEditWin->SetReadonly(pDocShell->IsReadOnly());