diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2024-04-04 21:19:02 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2024-04-04 23:10:47 +0200 |
| commit | 2f093d16be4c87d0535d0c6338c308ad9f6a3c84 (patch) | |
| tree | ffa8dc521c053e61d55e98e0be0808c696f42790 | |
| parent | c8ee0e8f581b8a6e41b1a6b8aa4d40b442c1d463 (diff) | |
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.behrens@allotropia.de>
| -rw-r--r-- | sd/source/ui/dlg/present.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 9 |
2 files changed, 1 insertions, 12 deletions
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index d3e238b7bd3d..9640c5b72fd7 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -25,8 +25,6 @@ #include <svl/stritem.hxx> #include <vcl/svapp.hxx> -#include <officecfg/Office/Common.hxx> - #include <sdattr.hrc> #include <present.hxx> #include <cusshow.hxx> @@ -180,8 +178,6 @@ SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxI #endif 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 c25f0114c876..39e3e6a21221 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> @@ -240,12 +238,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 ) |