sd/source/ui/dlg/present.cxx | 4 ----
sd/source/ui/slideshow/slideshow.cxx | 9 +--------
2 files changed, 1 insertion(+), 12 deletions(-)
New commits:
commit dec271194f9b2b0647f075f014af7dbd2da4036a
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Thu Apr 4 21:19:02 2024 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sun Apr 7 00:18:26 2024 +0200
IASS: make live slideshow non-experimental
Change-Id: I36fb6eae8f77f02fa1a9bcf96a7c074d78ba86c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165804
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 4f97a76fa8fe..401f7ba27250 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -24,8 +24,6 @@
#include <svl/stritem.hxx>
#include <vcl/svapp.hxx>
-#include <officecfg/Office/Common.hxx>
-
#include <sdattr.hrc>
#include <present.hxx>
#include <cusshow.hxx>
@@ -155,8 +153,6 @@
SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxI
m_xLbConsole->set_active(PresenterConsoleMode::Windowed);
m_xCbxInteractiveMode->set_active( static_cast<const SfxBoolItem&>(
rOutAttrs.Get( ATTR_PRESENT_INTERACTIVE ) ).GetValue() );
- if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
- m_xCbxInteractiveMode->set_visible(false);
InitMonitorSettings();
diff --git a/sd/source/ui/slideshow/slideshow.cxx
b/sd/source/ui/slideshow/slideshow.cxx
index 5f6620ee346a..d8f73dfcf2fd 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -39,8 +39,6 @@
#include <framework/FrameworkHelper.hxx>
#include <comphelper/extract.hxx>
-#include <officecfg/Office/Common.hxx>
-
#include <FrameView.hxx>
#include <createpresentation.hxx>
#include <unomodel.hxx>
@@ -242,12 +240,7 @@ bool SlideShow::IsInteractiveSlideshow(const
ViewShellBase* pViewShellBase)
bool SlideShow::IsInteractiveSlideshow() const
{
- // allow override with ENV_VAR for practical dev reasons
- static bool
g_bEnable_Interactive_Slideshow(getenv("ENABLE_INTERACTIVE_SLIDESHOW"));
- if (g_bEnable_Interactive_Slideshow)
- return true;
-
- return officecfg::Office::Common::Misc::ExperimentalMode::get() &&
mpDoc->getPresentationSettings().mbInteractive;
+ return mpDoc->getPresentationSettings().mbInteractive;
}
void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView,
vcl::Window* pParentWindow )
