sd/source/ui/app/sddll.cxx | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
New commits:
commit b9645ac5b97c0c61514cfe484f770626e61d58a0
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Wed Feb 15 11:25:19 2023 -0400
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Mon Nov 27 12:08:20 2023 +0100
sd: lok: only register supported views
The Presentation ViewShells:
SlideSorter,
Outline,
Presentation
They are not supported in tiled rendering case,
so switch to default view.
Signed-off-by: Henry Castro <hcas...@collabora.com>
Change-Id: I33b255e0ca530734af6490d14fe48a2512272afc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147095
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152900
Tested-by: Jenkins
(cherry picked from commit 5b35703d11089975d625fede2605ce3bc449b294)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159895
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index c195869b790e..b4734310a39b 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -91,12 +91,24 @@ void SdDLL::RegisterFactorys()
{
::sd::ImpressViewShellBase::RegisterFactory (
::sd::IMPRESS_FACTORY_ID);
- ::sd::SlideSorterViewShellBase::RegisterFactory (
- ::sd::SLIDE_SORTER_FACTORY_ID);
- ::sd::OutlineViewShellBase::RegisterFactory (
- ::sd::OUTLINE_FACTORY_ID);
- ::sd::PresentationViewShellBase::RegisterFactory (
- ::sd::PRESENTATION_FACTORY_ID);
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ ::sd::ImpressViewShellBase::RegisterFactory (
+ ::sd::SLIDE_SORTER_FACTORY_ID);
+ ::sd::ImpressViewShellBase::RegisterFactory (
+ ::sd::OUTLINE_FACTORY_ID);
+ ::sd::ImpressViewShellBase::RegisterFactory (
+ ::sd::PRESENTATION_FACTORY_ID);
+ }
+ else
+ {
+ ::sd::SlideSorterViewShellBase::RegisterFactory (
+ ::sd::SLIDE_SORTER_FACTORY_ID);
+ ::sd::OutlineViewShellBase::RegisterFactory (
+ ::sd::OUTLINE_FACTORY_ID);
+ ::sd::PresentationViewShellBase::RegisterFactory (
+ ::sd::PRESENTATION_FACTORY_ID);
+ }
}
if (!utl::ConfigManager::IsFuzzing() && SvtModuleOptions().IsDraw())
{
