sc/source/ui/attrdlg/attrdlg.cxx | 7 +------
vcl/jsdialog/enabled.cxx | 1 +
2 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 11ccb687f6739d58d5ad878aece31db330825d08
Author: Hubert Figuière <h...@collabora.com>
AuthorDate: Mon Feb 12 17:32:31 2024 -0500
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Tue Feb 13 20:58:26 2024 +0100
sc: add back protect cell tab from cell format dialog
Also enable the tab in jsdialogs
Signed-off-by: Hubert Figuière <h...@collabora.com>
Change-Id: I2c4eac029568cc0de4be5ebb6b0f4ae47f2da1a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163263
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
(cherry picked from commit 6cda8155c66bfcd3ebda49ac8254d529629a300e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163287
Tested-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index faa08bf3ca00..c0653ad4f1d0 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -30,7 +30,6 @@
#include <editeng/editids.hrc>
#include <editeng/flstitem.hxx>
#include <osl/diagnose.h>
-#include <comphelper/lok.hxx>
ScAttrDlg::ScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs)
: SfxTabDialogController(pParent, "modules/scalc/ui/formatcellsdialog.ui",
@@ -58,11 +57,7 @@ ScAttrDlg::ScAttrDlg(weld::Window* pParent, const
SfxItemSet* pCellAttrs)
AddTabPage( "borders", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER ), nullptr );
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ),
"GetTabPageCreatorFunc fail!");
AddTabPage( "background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG
), nullptr );
-
- if (!comphelper::LibreOfficeKit::isActive())
- AddTabPage( "cellprotection" , ScTabPageProtection::Create,
nullptr );
- else
- RemoveTabPage( "cellprotection" );
+ AddTabPage( "cellprotection" , ScTabPageProtection::Create, nullptr );
}
ScAttrDlg::~ScAttrDlg()
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index beb12b5dd081..b04418257bff 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -97,6 +97,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
// scalc
|| rUIFile == u"modules/scalc/ui/advancedfilterdialog.ui"
|| rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui"
+ || rUIFile == u"modules/scalc/ui/cellprotectionpage.ui"
|| rUIFile == u"modules/scalc/ui/chardialog.ui"
|| rUIFile == u"modules/scalc/ui/chisquaretestdialog.ui"
|| rUIFile == u"modules/scalc/ui/colwidthdialog.ui"
