summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Tietze <tietze.heiko@gmail.com>2020-10-13 13:02:57 +0200
committerHeiko Tietze <heiko.tietze@documentfoundation.org>2020-10-13 14:46:27 +0200
commitc35db66435cfecaa957b469d96ca70a31187a224 (patch)
treea400f221f99a44152704ae137ff09ee7714773ec
parentf21f3d094cfb495c89dfb0a23ecb061ef1a2178e (diff)
Resolves tdf#137424 - UI Picker missing 'Contextual single'
Exclusion by experimental on/off updated Change-Id: I714b8ffc5a148d09607ab20763b6d35de2a9e2be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104231 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
-rw-r--r--cui/inc/toolbarmode.hrc4
-rw-r--r--cui/source/dialogs/toolbarmodedlg.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/cui/inc/toolbarmode.hrc b/cui/inc/toolbarmode.hrc
index 7e7510b08eda..602d066e8fe1 100644
--- a/cui/inc/toolbarmode.hrc
+++ b/cui/inc/toolbarmode.hrc
@@ -31,7 +31,7 @@ const std::tuple<const char*, OUString, OUString> TOOLBARMODES_ARRAY[] =
};
//hide experimental UIs
-constexpr int nContextSingle = 7;
-constexpr int nContextGroup = 8;
+constexpr int nGroupedbarFull = 6;
+constexpr int nContextualGroups = 8;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/toolbarmodedlg.cxx b/cui/source/dialogs/toolbarmodedlg.cxx
index 21bd7055bd96..7362ad22e54b 100644
--- a/cui/source/dialogs/toolbarmodedlg.cxx
+++ b/cui/source/dialogs/toolbarmodedlg.cxx
@@ -118,8 +118,8 @@ ToolbarmodeDialog::ToolbarmodeDialog(weld::Window* pParent)
if (!SvtMiscOptions().IsExperimentalMode())
{
- m_pRadioButtons[nContextSingle]->set_visible(false);
- m_pRadioButtons[nContextGroup]->set_visible(false);
+ m_pRadioButtons[nGroupedbarFull]->set_visible(false);
+ m_pRadioButtons[nContextualGroups]->set_visible(false);
}
}