[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/source svtools/source

[Tor Lillqvist (via logerrit)]

 sd/source/ui/unoidl/unomodel.cxx            |    4 ++++
 svtools/source/config/slidesorterbaropt.cxx |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 372854e1de4678607d25b76e6c4bae0476fded07
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Jan 21 12:43:51 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Jan 22 11:59:18 2020 +0100

    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 at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index dd6d74568045..723adf7ab7d5 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -71,6 +71,7 @@
 #include <editeng/unolingu.hxx>
 #include <svx/svdpagv.hxx>
 #include <svtools/unoimap.hxx>
+#include <svtools/slidesorterbaropt.hxx>
 #include <svx/unoshape.hxx>
 #include <editeng/unonrule.hxx>
 #include <editeng/eeitem.hxx>
@@ -2503,6 +2504,9 @@ void SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence<cs
     // causing 'Save' being disabled; so let's always save to the original
     // format
     SvtSaveOptions().SetWarnAlienFormat(false);
+
+    if (!getenv("LO_TESTNAME"))
+        SvtSlideSorterBarOptions().SetVisibleImpressView(true);
 }
 
 void SdXImpressDocument::postKeyEvent(int nType, int nCharCode, int nKeyCode)
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)