sd/source/ui/unoidl/unomodel.cxx | 4 ++++
svtools/source/config/slidesorterbaropt.cxx | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 5e6514e027b9d6dc9972f8aaf1977079982856d3
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Jan 21 12:43:51 2020 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon May 18 08:45:26 2020 +0200
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit 372854e1de4678607d25b76e6c4bae0476fded07)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94218
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 8bc98bbc6693..26263aa21cc3 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -64,6 +64,7 @@
#include <svx/svdpool.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>
@@ -2472,6 +2473,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 ecf29453c765..c09b8047fe6f 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -360,7 +360,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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
