From 8daa94aa1ff1135d3d2552182c7f2d23cc21d6f2 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Thu, 7 Sep 2023 14:16:13 -0300 Subject: [PATCH] tdf#155875 UI cmds Writer/Table in Help(34) + refactoring + Table - Protection (part 34) + protection is called by "uno.Protect" in menus + in Calc: protect sheet dialog + in Writer: protect cell directly + merged in shared/01/Protect.xhp with app switch + removed obsolete files Change-Id: Ieada8a774a14a19f79f58e22fd807bf5aacaf64b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156678 Tested-by: Jenkins Reviewed-by: Olivier Hallot --- AllLangHelp_scalc.mk | 1 - AllLangHelp_shared.mk | 1 + AllLangHelp_swriter.mk | 1 - source/text/scalc/01/06060000.xhp | 6 +- source/text/scalc/01/06060100.xhp | 111 ------------------ source/text/scalc/guide/cell_protect.xhp | 4 +- source/text/scalc/menu/sheet_tab_menu.xhp | 2 +- source/text/shared/01/Protect.xhp | 137 ++++++++++++++++++++++ source/text/swriter/00/00000405.xhp | 39 +++++- source/text/swriter/01/05100000.xhp | 2 +- source/text/swriter/01/05100300.xhp | 41 ------- source/text/swriter/01/05100400.xhp | 31 +++-- source/text/swriter/main0110.xhp | 7 +- 13 files changed, 197 insertions(+), 186 deletions(-) delete mode 100644 source/text/scalc/01/06060100.xhp create mode 100644 source/text/shared/01/Protect.xhp delete mode 100644 source/text/swriter/01/05100300.xhp diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 6192819d40..f69425a60f 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -133,7 +133,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/06040000 \ helpcontent2/source/text/scalc/01/06050000 \ helpcontent2/source/text/scalc/01/06060000 \ - helpcontent2/source/text/scalc/01/06060100 \ helpcontent2/source/text/scalc/01/06060200 \ helpcontent2/source/text/scalc/01/06070000 \ helpcontent2/source/text/scalc/01/06080000 \ diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index c40c7c4209..d19ddefb7c 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -383,6 +383,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/01/pasterowabove \ helpcontent2/source/text/shared/01/pastecolumnleft \ helpcontent2/source/text/shared/01/profile_safe_mode \ + helpcontent2/source/text/shared/01/Protect \ helpcontent2/source/text/shared/01/qrcode \ helpcontent2/source/text/shared/01/quickcolorselector \ helpcontent2/source/text/shared/01/ref_epub_export \ diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index 26ffea7b41..0fcd7e2805 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -129,7 +129,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/01/05090201 \ helpcontent2/source/text/swriter/01/05090300 \ helpcontent2/source/text/swriter/01/05100000 \ - helpcontent2/source/text/swriter/01/05100300 \ helpcontent2/source/text/swriter/01/05100400 \ helpcontent2/source/text/swriter/01/05110100 \ helpcontent2/source/text/swriter/01/05110300 \ diff --git a/source/text/scalc/01/06060000.xhp b/source/text/scalc/01/06060000.xhp index b57bd65a69..fc4972f06a 100644 --- a/source/text/scalc/01/06060000.xhp +++ b/source/text/scalc/01/06060000.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -38,8 +38,8 @@ -

Sheets

- +

Sheets

+

Documents

diff --git a/source/text/scalc/01/06060100.xhp b/source/text/scalc/01/06060100.xhp deleted file mode 100644 index 0e39d0d27e..0000000000 --- a/source/text/scalc/01/06060100.xhp +++ /dev/null @@ -1,111 +0,0 @@ - - - - - -Protecting Sheet -/text/scalc/01/06060100.xhp - - - - - - - -insert rows;protected sheet -insert columns;protected sheet -delete columns;protected sheet -delete rows;protected sheet -protected sheet;insert columns -protected sheet;insert rows -protected sheet;delete rows -protected sheet;delete columns -protect;sheet -selection;in protected cells - -
-

Protect Sheet

-Protects the cells in the current sheet from being modified. -
-Choose Tools - Protect Sheet to open the Protect Sheet dialog in which you then specify sheet protection with or without a password, and select the elements of the sheet to protect. -
- - -
-To protect cells from further editing, the Protected check box must be checked on the Format - Cells - Cell Protection tab page or on the Format Cells context menu. - -

Protect this sheet and contents of the protected cells

-Mark this checkbox to activate protection of sheet and cell contents. -

Password / Confirm

-Allows you to enter a password to protect the sheet from unauthorized changes. Confirm the password entered in the first box. -

Allow users of this sheet to

-Select the elements to protect from user actions: - - - Select protected cells: mark this checkbox to allow you to select protected cells. When the checkbox is unmarked, you cannot select protected cells, the cursor cannot enter in a protected range. - - - Select unprotected cells: mark this checkbox to allow user to select unprotected cells. When the checkbox is unmarked, user cannot select unprotected cells, the cursor cannot enter in a unprotected cell or range. - - - Insert columns: Allow column insertions even when the sheet is protected. Note that when column insertions is enabled, you can insert columns even when the range to insert the new columns into contains protected cells which will get shifted after the insertion. Cells of the newly inserted columns inherit the Protection property of the range it belongs: when the new cell is inside a protected range, the cell is protected, and when it is in an unprotected range, the cell is unprotected. - - - Insert rows: Allow row insertions even when the sheet is protected. Note that when row insertions is enabled, you can insert rows even when the range to insert the new rows into contains protected cells which will get shifted after the insertion. Cells of the newly inserted rows inherit the Protection property of the range it belongs: when the new cell is inside a protected range it is protected, and when it is in an unprotected range, the cell is unprotected. - - - Delete columns: Allow column deletions. Note that column deletions are only allowed on unprotected cells. - - - - Delete rows: Allow row deletions. Note that row deletions are only allowed on unprotected cells. - - - -Unprotected cells or cell ranges can be set up on a protected sheet by using the Tools - Protect Sheet and Format - Cells - Cell Protection menus: - - -Select the cells that will be unprotected - - -Select Format - Cells - Cell Protection. Unmark the Protected box and click OK. - - - On the Tools - Protect Sheet menu, activate protection for the sheet. Effective immediately, only the cell range you selected in step 1 can be edited. - - -To later change an unprotected area to a protected area: - - - Select the range of cells that will be protected. - - - On the Format - Cells - Cell Protection tab page, check the Protected box. - - - Choose the Tools - Protect Sheet menu. The previously editable range is now protected. - - -Sheet protection also affects the context menu of the sheet tabs at the bottom of the screen. The Delete and Rename commands cannot be selected. -If a sheet is protected, you will not be able to modify or delete any Cell Styles. -A protected sheet or cell range can no longer be modified until this protection is disabled, with the exceptions of the settings for columns and row of the Tools - Protect Sheet dialog. To disable the protection, choose the Tools - Protect Sheet command. If no password was set, the sheet protection is immediately disabled. If the sheet was password protected, the Remove Protection dialog opens, where you must enter the password. -Once saved, protected sheets can only be saved again by using the File - Save As command. -Complete protection of your work can be achieved by combining the options Tools - Protect Sheet and Tools - Protect Spreadsheet Structure, including password protection. To prohibit opening the document altogether, in the Save dialog mark the Save with password box before you click the Save button. - - diff --git a/source/text/scalc/guide/cell_protect.xhp b/source/text/scalc/guide/cell_protect.xhp index e72eb0aaaf..dae3e517f1 100644 --- a/source/text/scalc/guide/cell_protect.xhp +++ b/source/text/scalc/guide/cell_protect.xhp @@ -63,7 +63,7 @@ Apply the protection options. - To protect the cells from being changed, viewed or printed according to your settings in the Format - Cells dialog, choose Tools - Protect Sheet. + To protect the cells from being changed, viewed or printed according to your settings in the Format - Cells dialog, choose Tools - Protect Sheet. To protect the structure of the document, for example the count, names, and order of the sheets, from being changed, choose Tools - Protect Spreadsheet Structure. @@ -75,7 +75,7 @@
- + diff --git a/source/text/scalc/menu/sheet_tab_menu.xhp b/source/text/scalc/menu/sheet_tab_menu.xhp index cd549dd2fe..de6e37b7b6 100644 --- a/source/text/scalc/menu/sheet_tab_menu.xhp +++ b/source/text/scalc/menu/sheet_tab_menu.xhp @@ -34,7 +34,7 @@

Select all sheets

Selects all of the sheets in the current spreadsheet. - + diff --git a/source/text/shared/01/Protect.xhp b/source/text/shared/01/Protect.xhp new file mode 100644 index 0000000000..d58232c169 --- /dev/null +++ b/source/text/shared/01/Protect.xhp @@ -0,0 +1,137 @@ + + + + + + + Protect + /text/shared/01/Protect.xhp + + + + Same UNO command name for totally different modules and behaviour + + + +
+

Protect Cells

+ Prevents the contents of the selected cells from being modified. +
+
+ +
+ When the cursor is in a read-only cell, a note appears on the Status Bar. + To remove cell protection, select the cell(s), right-click, and then choose Unprotect Cells. +
+ +
+ + + + + + insert rows;protected sheet + insert columns;protected sheet + delete columns;protected sheet + delete rows;protected sheet + protected sheet;insert columns + protected sheet;insert rows + protected sheet;delete rows + protected sheet;delete columns + protect;sheet + selection;in protected cells + +
+

Protect Sheet

+ Protects the cells in the current sheet from being modified. +
+ Choose Tools - Protect Sheet to open the Protect Sheet dialog in which you then specify sheet protection with or without a password, and select the elements of the sheet to protect. +
+ + +
+ To protect cells from further editing, the Protected check box must be checked on the Format - Cells - Cell Protection tab page or on the Format Cells context menu. + +

Protect this sheet and contents of the protected cells

+ Mark this checkbox to activate protection of sheet and cell contents. +

Password / Confirm

+ Allows you to enter a password to protect the sheet from unauthorized changes. Confirm the password entered in the first box. +

Allow users of this sheet to

+ Select the elements to protect from user actions: + + + Select protected cells: mark this checkbox to allow you to select protected cells. When the checkbox is unmarked, you cannot select protected cells, the cursor cannot enter in a protected range. + + + Select unprotected cells: mark this checkbox to allow user to select unprotected cells. When the checkbox is unmarked, user cannot select unprotected cells, the cursor cannot enter in a unprotected cell or range. + + + Insert columns: Allow column insertions even when the sheet is protected. Note that when column insertions is enabled, you can insert columns even when the range to insert the new columns into contains protected cells which will get shifted after the insertion. Cells of the newly inserted columns inherit the Protection property of the range it belongs: when the new cell is inside a protected range, the cell is protected, and when it is in an unprotected range, the cell is unprotected. + + + Insert rows: Allow row insertions even when the sheet is protected. Note that when row insertions is enabled, you can insert rows even when the range to insert the new rows into contains protected cells which will get shifted after the insertion. Cells of the newly inserted rows inherit the Protection property of the range it belongs: when the new cell is inside a protected range it is protected, and when it is in an unprotected range, the cell is unprotected. + + + Delete columns: Allow column deletions. Note that column deletions are only allowed on unprotected cells. + + + + Delete rows: Allow row deletions. Note that row deletions are only allowed on unprotected cells. + + + + Unprotected cells or cell ranges can be set up on a protected sheet by using the Tools - Protect Sheet and Format - Cells - Cell Protection menus: + + + Select the cells that will be unprotected + + + Select Format - Cells - Cell Protection. Unmark the Protected box and click OK. + + + On the Tools - Protect Sheet menu, activate protection for the sheet. Effective immediately, only the cell range you selected in step 1 can be edited. + + + To later change an unprotected area to a protected area: + + + Select the range of cells that will be protected. + + + On the Format - Cells - Cell Protection tab page, check the Protected box. + + + Choose the Tools - Protect Sheet menu. The previously editable range is now protected. + + + Sheet protection also affects the context menu of the sheet tabs at the bottom of the screen. The Delete and Rename commands cannot be selected. + If a sheet is protected, you will not be able to modify or delete any Cell Styles. + A protected sheet or cell range can no longer be modified until this protection is disabled, with the exceptions of the settings for columns and row of the Tools - Protect Sheet dialog. To disable the protection, choose the Tools - Protect Sheet command. If no password was set, the sheet protection is immediately disabled. If the sheet was password protected, the Remove Protection dialog opens, where you must enter the password. + Once saved, protected sheets can only be saved again by using the File - Save As command. + Complete protection of your work can be achieved by combining the options Tools - Protect Sheet and Tools - Protect Spreadsheet Structure, including password protection. To prohibit opening the document altogether, in the Save dialog mark the Save with password box before you click the Save button. + + + + + + + + + + diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp index 167397b411..484695d288 100644 --- a/source/text/swriter/00/00000405.xhp +++ b/source/text/swriter/00/00000405.xhp @@ -320,11 +320,42 @@
- In the context menu of a cell, choose Cell - Protect. -
- In the context menu of a cell, choose Cell - Unprotect. - Open context menu in Navigator for tables. + +
+ + Choose Table - Protect Cells. + + On the Table menu of the Table tab, choose Protect Cells. + + + + + Icon Protect Cells + + + Protect Cells + + +
+ +
+ + Choose Table - Unprotect Cells. + + On the Table menu of the Table tab, choose Unprotect Cells. + + + + Icon Unprotect Cells + + + Unprotect Cells + + +
+
+ In the context menu of a cell, choose Row.
diff --git a/source/text/swriter/01/05100000.xhp b/source/text/swriter/01/05100000.xhp index a49388111c..2337b2bd00 100644 --- a/source/text/swriter/01/05100000.xhp +++ b/source/text/swriter/01/05100000.xhp @@ -39,7 +39,7 @@ - + diff --git a/source/text/swriter/01/05100300.xhp b/source/text/swriter/01/05100300.xhp deleted file mode 100644 index 404fe935c7..0000000000 --- a/source/text/swriter/01/05100300.xhp +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - Protect - /text/swriter/01/05100300.xhp - - - -
- -

Protect

-
- Prevents the contents of the selected cells from being modified. -
-
-
- -
- When the cursor is in a read-only cell, a note appears on the Status Bar. - To remove cell protection, select the cell(s), right-click, and then choose Cell - Unprotect. - - diff --git a/source/text/swriter/01/05100400.xhp b/source/text/swriter/01/05100400.xhp index 05e45055f9..d8628dd6c1 100644 --- a/source/text/swriter/01/05100400.xhp +++ b/source/text/swriter/01/05100400.xhp @@ -20,24 +20,23 @@ - Unprotect + Unprotect /text/swriter/01/05100400.xhp -
- -

Unprotect

-
- Removes the cell protection for all selected cells in the current table. -
-
-
- -
- To remove the protection from several tables at once, select the tables, and then press Command -Ctrl+Shift+T. To remove the protection from all of the tables in a document, click anywhere in the document, and then press Command -Ctrl+Shift+T. - You can also remove cell protection from a table in the Navigator. - + +
+

Unprotect

+ Removes the cell protection for all selected cells in the current table. +
+
+ +
+To remove the protection from several tables at once, select the tables, and then press CommandCtrl+Shift+T. To remove the protection from all of the tables in a document, click anywhere in the document, and then press CommandCtrl+Shift+T. +You can also remove cell protection from a table in the Navigator. +
+ +
+ diff --git a/source/text/swriter/main0110.xhp b/source/text/swriter/main0110.xhp index 5d2c190bc5..bb9a9fc9b4 100644 --- a/source/text/swriter/main0110.xhp +++ b/source/text/swriter/main0110.xhp @@ -51,11 +51,8 @@ -

Protect Cells

- - -

Unprotect Cells

- + +

AutoFormat Styles