sc/inc/globstr.hrc | 2 +-
sc/source/ui/view/cellsh1.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2d771c81d1292ea20f954364a0b8f34875973a17
Author: Gulsah Kose <gulsah.1...@gmail.com>
Date: Thu Jan 4 16:30:48 2018 +0300
tdf#61418 Show message on protected sheets for conditional formatting.
.uno:ConditionalFormatDialog, .uno:ColorScaleFormatDialog,
.uno:DataBarFormatDialog, .uno:IconSetFormatDialog and
.uno:CondDateFormatDialog show an error message on protected sheets
for conditional formatting. The patch was sent for the ULAKBIM/Pardus
project.
Change-Id: Id3c1d6f76d1245b0395082b24fa5175c14f55555
Signed-off-by: Gulsah Kose <gulsah.1...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/47395
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index ffa5101df16b..3612e159f972 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -465,7 +465,7 @@
#define STR_COND_LASTYEAR NC_("STR_COND_LASTYEAR", "last
year")
#define STR_COND_NEXTYEAR NC_("STR_COND_NEXTYEAR", "next
year")
#define STR_COND_AND NC_("STR_COND_AND", "and")
-#define STR_ERR_CONDFORMAT_PROTECTED
NC_("STR_ERR_CONDFORMAT_PROTECTED", "Conditional Formats can not be created,
deleted or changed in protected sheets!")
+#define STR_ERR_CONDFORMAT_PROTECTED
NC_("STR_ERR_CONDFORMAT_PROTECTED", "Conditional Formats can not be created,
deleted or changed in protected sheets.")
#define STR_EDIT_EXISTING_COND_FORMATS
NC_("STR_EDIT_EXISTING_COND_FORMATS", "The selected cell already contains
conditional formatting. You can either edit the existing conditional format or
you define a new overlapping conditional format.\n\n Do you want to edit the
existing conditional format?")
#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS
NC_("STR_QUERY_FORMULA_RECALC_ONLOAD_ODS", "This document was last saved by an
application other than %PRODUCTNAME. Some formula cells may produce different
results when recalculated.\n\nDo you want to recalculate all formula cells in
this document now?")
#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS
NC_("STR_QUERY_FORMULA_RECALC_ONLOAD_XLS", "This document was last saved by
Excel. Some formula cells may produce different results when
recalculated.\n\nDo you want to recalculate all formula cells now?")
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 7a7ecf3da833..f4599a40b35f 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1948,7 +1948,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScDocument* pDoc = GetViewData()->GetDocument();
if(pDoc->IsTabProtected(pData->GetTabNo()))
{
- //ErrorMessage( STR_ERR_CONDFORMAT_PROTECTED );
+ pTabViewShell->ErrorMessage( STR_ERR_CONDFORMAT_PROTECTED
);
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
