summaryrefslogtreecommitdiff
path: root/svtools/source/config
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-01-21 12:43:51 +0200
committerTor Lillqvist <tml@collabora.com>2020-01-23 14:20:03 +0100
commitb80445bce9ef9d145bb239b60b3f57ebc9f40a26 (patch)
tree15d91c6f9d7428ee0b25e4bab46a5ad06866c82f /svtools/source/config
parent48f32d77f914fb880fc023365c4e2910e741a7b9 (diff)
Keep the behaviour as before when a unit test is running, though. Otherwise CppunitTest_sd_tiledrendering fails. (Yes, I know, this is the wrong thing to do, so sue me.) Change-Id: Iae969eee800994b937d32646cfdf50f8132ae185 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87131 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 372854e1de4678607d25b76e6c4bae0476fded07) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87254 Tested-by: Jenkins
Diffstat (limited to 'svtools/source/config')
-rw-r--r--svtools/source/config/slidesorterbaropt.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx
index 83b10595869c..770876048b42 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -358,7 +358,8 @@ SvtSlideSorterBarOptions::~SvtSlideSorterBarOptions()
bool SvtSlideSorterBarOptions::GetVisibleImpressView() const
{
- return m_pImpl->m_bVisibleImpressView && !comphelper::LibreOfficeKit::isActive();
+ static const bool bRunningUnitTest = getenv("LO_TESTNAME");
+ return m_pImpl->m_bVisibleImpressView && (!bRunningUnitTest || !comphelper::LibreOfficeKit::isActive());
}
void SvtSlideSorterBarOptions::SetVisibleImpressView(bool bVisible)