diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-03-10 15:04:39 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-03-10 17:52:36 +0000 |
| commit | afb7b373c34bd6a1608a30eb8267fa6f8231e853 (patch) | |
| tree | d2b82b5e4c7d2ba186a0c8fabe7af58d89da3b43 | |
| parent | c804c5354855188b5a37219cfe11dc079dc235f4 (diff) | |
CppunitTest_sc_tiledrendering: reset CompatFlag in tearDown
Otherwise, there are some tests setting it to scPrintTwipsMsgs,
so depending on the order of execution, it might affect other
tests
Change-Id: Ib0d08b1fe4e172bd5b03d63260e6b1c3fde26595
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148635
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | comphelper/source/misc/lok.cxx | 4 | ||||
| -rw-r--r-- | sc/qa/unit/tiledrendering/tiledrendering.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx index 1f07cd2614eb..019865a63696 100644 --- a/comphelper/source/misc/lok.cxx +++ b/comphelper/source/misc/lok.cxx @@ -178,9 +178,9 @@ bool isLocalRendering() return g_bLocalRendering; } -void setCompatFlag(Compat flag) { g_eCompatFlags = static_cast<Compat>(g_eCompatFlags | flag); } +void setCompatFlag(Compat flag) { g_eCompatFlags = flag; } -bool isCompatFlagSet(Compat flag) { return (g_eCompatFlags & flag) == flag; } +bool isCompatFlagSet(Compat flag) { return g_eCompatFlags == flag; } void setLocale(const LanguageTag& rLanguageTag) { diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 84771a2c555c..adcb6415c6ec 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -226,6 +226,10 @@ void ScTiledRenderingTest::tearDown() } m_callbackWrapper.clear(); + + comphelper::LibreOfficeKit::setCompatFlag( + comphelper::LibreOfficeKit::Compat::none); + comphelper::LibreOfficeKit::setActive(false); UnoApiXmlTest::tearDown(); |