diff options
| author | Justin Luth <jluth@mail.com> | 2023-06-19 16:35:05 -0400 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2023-06-20 16:48:22 +0200 |
| commit | 1ff817faad79952e6271bab178d41cae2a0d9ecd (patch) | |
| tree | 0829a2b68f8195403574535d8a2747e448b82266 /sd/source | |
| parent | 90f40e996fe1aaa93606f7e1b1fb60882bcf058b (diff) | |
tdf#126095 impress notebookbar: don't force Master/Presentation toolbars
When in the notebookbar mode, non-notebookbar toolbars should
not be enabled automatically by the application.
The user still has the ability to turn them on.
Change-Id: Ib601b63390a8d806604b68ed2ea198198f4318ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153303
Tested-by: Justin Luth <jluth@mail.com>
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index bff9f67872bd..2be9dad20226 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -33,6 +33,7 @@ #include <svx/svdoole2.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/module.hxx> +#include <sfx2/notebookbar/SfxNotebookBar.hxx> #include <svx/svdopage.hxx> #include <svx/fmshell.hxx> #include <tools/debug.hxx> @@ -471,7 +472,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) // If the master view toolbar is to be shown we turn it on after the // edit mode has been changed. - if (::sd::ViewShell::mpImpl->mbIsInitialized + if (::sd::ViewShell::mpImpl->mbIsInitialized && !sfx2::SfxNotebookBar::IsActive() && IsMainViewShell()) { if (bShowMasterViewToolbar) |