diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-23 20:04:21 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-06-30 10:15:05 +0100 |
| commit | 370043ea8a0731ddab60445eb5de40a9aa6463c6 (patch) | |
| tree | f4d7635a54cd18a9ececdde171b4c3c5b8f5503c /sw | |
| parent | 16899d9fac5cbff5b3b48207388978a942be5bd7 (diff) | |
tdf#134243 only do the toc-terms localization when showing toc preview
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/+/96889
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/unotools.hxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/unotools.cxx | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 0238c3138638..520720b30dbd 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -444,7 +444,7 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, ShowPreviewHdl, weld::ToggleButton&, void) else { Link<SwOneExampleFrame&,void> 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 830e39085a52..0890536dab16 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -26,12 +26,13 @@ #include <com/sun/star/text/XTextCursor.hpp> #include <swdllapi.h> -#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 8fa6df88650b..4eb0bc361495 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -304,7 +304,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer, void ) auto pCursor = comphelper::getUnoTunnelImplementation<OTextCursorHelper>(m_xCursor); SwDoc *pDoc = pCursor ? pCursor->GetDoc() : nullptr; - if (pDoc) + if (pDoc && (m_nStyleFlags & EX_LOCALIZE_TOC_STRINGS)) { SwEditShell* pSh = pDoc->GetEditShell(); |