From 851daf6ab20c046509725cf26ff72473fb61a761 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 23 Jun 2020 20:04:21 +0100 Subject: tdf#134243 only do the toc-terms localization when showing toc preview MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and not when previewing another document, which sidesteps the infinite loop in this example Change-Id: Ideb41029f4c98a50555cd35227867d9fdd5ae5a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96977 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sw/source/ui/index/cnttab.cxx | 2 +- sw/source/uibase/inc/unotools.hxx | 5 +++-- sw/source/uibase/utlui/unotools.cxx | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'sw/source') diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 3fc5120696ed..1531ad09e987 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -432,7 +432,7 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, ShowPreviewHdl, weld::ToggleButton&, void) else { Link aLink(LINK(this, SwMultiTOXTabDialog, CreateExample_Hdl)); - m_xExampleFrame.reset(new SwOneExampleFrame(EX_SHOW_ONLINE_LAYOUT, &aLink, &sTemplate)); + m_xExampleFrame.reset(new SwOneExampleFrame(EX_SHOW_ONLINE_LAYOUT | EX_LOCALIZE_TOC_STRINGS, &aLink, &sTemplate)); m_xExampleFrameWin.reset(new weld::CustomWeld(*m_xBuilder, "example", *m_xExampleFrame)); } m_xShowExampleCB->set_visible(m_xExampleFrame != nullptr); diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index 1c6c3708d433..4e72a5309920 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -26,12 +26,13 @@ #include #include -#define EX_SHOW_ONLINE_LAYOUT 0x001 - +#define EX_SHOW_ONLINE_LAYOUT 0x01 // hard zoom value #define EX_SHOW_BUSINESS_CARDS 0x02 //don't modify page size #define EX_SHOW_DEFAULT_PAGE 0x04 +//replace sample toc strings in the template to localized versions +#define EX_LOCALIZE_TOC_STRINGS 0x08 class SwView; diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index dd4470b0667f..fbad314f1309 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -294,7 +294,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer, void ) auto pCursor = comphelper::getUnoTunnelImplementation(m_xCursor); SwDoc *pDoc = pCursor ? pCursor->GetDoc() : nullptr; - if (pDoc) + if (pDoc && (m_nStyleFlags & EX_LOCALIZE_TOC_STRINGS)) { SwEditShell* pSh = pDoc->GetEditShell(); -- cgit