diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/chrdlg/pardlg.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/app/docst.cxx | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index e4980b311f5e..738d47c8978a 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -439,7 +439,7 @@ ErrCode SwHTMLWriter::WriteStream() m_bCfgFormFeed = !IsHTMLMode(HTMLMODE_PRINT_EXT); m_bCfgCpyLinkedGrfs = officecfg::Office::Common::Filter::HTML::Export::LocalGraphic::get(); - m_bCfgPrintLayout = SvxHtmlOptions::IsPrintLayoutExtension(); + m_bCfgPrintLayout = officecfg::Office::Common::Filter::HTML::Export::PrintLayout::get(); // get HTML template bool bOldHTMLMode = false; diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index f28acc46bc87..379ee335cad8 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -20,7 +20,6 @@ #include <sfx2/htmlmode.hxx> #include <sfx2/tabdlg.hxx> #include <svl/style.hxx> -#include <svtools/htmlcfg.hxx> #include <svl/cjkoptions.hxx> #include <docsh.hxx> #include <wrtsh.hxx> @@ -38,6 +37,7 @@ #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> #include <osl/diagnose.h> +#include <officecfg/Office/Common.hxx> SwParaDlg::SwParaDlg(weld::Window *pParent, SwView& rVw, @@ -73,7 +73,7 @@ SwParaDlg::SwParaDlg(weld::Window *pParent, AddTabPage("labelTP_PARA_ALIGN", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH)); - if (!m_bDrawParaDlg && (!bHtmlMode || SvxHtmlOptions::IsPrintLayoutExtension())) + if (!m_bDrawParaDlg && (!bHtmlMode || officecfg::Office::Common::Filter::HTML::Export::PrintLayout::get())) { 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/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 497a8d40e10a..0a5d6686dadd 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -25,7 +25,6 @@ #include <osl/diagnose.h> #include <sfx2/htmlmode.hxx> #include <sfx2/sfxdlg.hxx> -#include <svtools/htmlcfg.hxx> #include <svl/cjkoptions.hxx> #include <vcl/svapp.hxx> #include <numpara.hxx> @@ -58,6 +57,7 @@ #include <svl/intitem.hxx> #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> +#include <officecfg/Office/Common.hxx> // the dialog's carrier SwTemplateDlgController::SwTemplateDlgController(weld::Window* pParent, @@ -146,7 +146,7 @@ SwTemplateDlgController::SwTemplateDlgController(weld::Window* pParent, if(m_nHtmlMode & HTMLMODE_ON) { - if (!SvxHtmlOptions::IsPrintLayoutExtension()) + if (!officecfg::Office::Common::Filter::HTML::Export::PrintLayout::get()) RemoveTabPage("textflow"); RemoveTabPage("asiantypo"); RemoveTabPage("tabs"); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 51bd2519304d..daedfffe46f1 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -31,7 +31,6 @@ #include <fmtpdsc.hxx> #include <fmtlsplt.hxx> -#include <svtools/htmlcfg.hxx> #include <fmtrowsplt.hxx> #include <sfx2/htmlmode.hxx> #include <sfx2/sfxdlg.hxx> @@ -57,6 +56,7 @@ #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> #include <osl/diagnose.h> +#include <officecfg/Office/Common.hxx> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> @@ -1427,7 +1427,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet ) void SwTextFlowPage::Reset( const SfxItemSet* rSet ) { - bool bFlowAllowed = !m_bHtmlMode || SvxHtmlOptions::IsPrintLayoutExtension(); + bool bFlowAllowed = !m_bHtmlMode || officecfg::Office::Common::Filter::HTML::Export::PrintLayout::get(); if(bFlowAllowed) { //Inserting of the existing page templates in the list box diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 02e234bdc6df..ba6c850a86d0 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -43,7 +43,6 @@ #include <sfx2/htmlmode.hxx> #include <swmodule.hxx> #include <fchrfmt.hxx> -#include <svtools/htmlcfg.hxx> #include <svx/xdef.hxx> #include <SwStyleNameMapper.hxx> #include <SwRewriter.hxx> @@ -85,6 +84,7 @@ #include <AccessibilityCheck.hxx> #include <docmodel/theme/Theme.hxx> #include <svx/svdpage.hxx> +#include <officecfg/Office/Common.hxx> using namespace ::com::sun::star; @@ -221,7 +221,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) case SID_STYLE_FAMILY4: { - if (m_xDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) && !SvxHtmlOptions::IsPrintLayoutExtension()) + if (m_xDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) && !officecfg::Office::Common::Filter::HTML::Export::PrintLayout::get()) rSet.DisableItem( nWhich ); else { |