summaryrefslogtreecommitdiff
path: root/svtools/source
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-01-21 12:43:51 +0200
committerTor Lillqvist <tml@collabora.com>2020-01-22 11:59:18 +0100
commit372854e1de4678607d25b76e6c4bae0476fded07 (patch)
tree465f9f47f18efe308d776859678dc3cd399b8b2b /svtools/source
parent3f62c10548466119ec6b1a662ab339e5dbe0b05f (diff)
tdf#129388: Do as kendy suggested in 7e291eedbad335bf8bbc8a17cc3d633bf66d0e90
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>
Diffstat (limited to 'svtools/source')
-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 7c77d2bae968..622a49326851 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -371,7 +371,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)