[Libreoffice-commits] help.git: source/text

Thu Mar 2 18:25:59 UTC 2017

source/text/scalc/01/06060200.xhp      |   10 ++++++++--
 source/text/shared/01/password_dlg.xhp |    1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 817d5bea68df8fa5c0fd63d7a352c6e9edb86c1d
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Tue Feb 21 04:31:45 2017 +0100

    tdf#60874 (partial) Show correct page from "Protect Document" window
    
    The bookmark for the Password entry was used on the wrong page.
    This needed to be moved over and the entry description set up
    as extended help.
    
    A new help ID was needed to be added to the Confirm entry
    with an accompanying extended help. Hidden, as this page
    is rather a howto and not a window description (thankfully).
    
    Change-Id: I6583f8708cd4c0b0891ead7067ce486153dd2be1
    Reviewed-on: https://gerrit.libreoffice.org/34502
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/source/text/scalc/01/06060200.xhp b/source/text/scalc/01/06060200.xhp
index e7a1361..c01967c 100644
--- a/source/text/scalc/01/06060200.xhp
+++ b/source/text/scalc/01/06060200.xhp
@@ -30,7 +30,7 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/.uno:ToolProtectionDocument" id="bm_id3209635" localize="false"/><!-- HID added by script -->
+
 <bookmark xml-lang="en-US" branch="hid/.uno:ToolProtectionDocument" id="bm_id3150791" localize="false"/>
 <paragraph role="heading" id="hd_id3150541" xml-lang="en-US" level="1" l10n="U" oldref="1">Protecting document</paragraph>
 <paragraph role="paragraph" id="par_id3145172" xml-lang="en-US"><variable id="dokumenttext"><ahelp hid=".uno:ToolProtectionDocument">Protects the sheet structure of your document from modifications. It is impossible to insert, delete, rename, move or copy sheets.</ahelp></variable> Open the <emph>Protect document</emph> dialog with <emph>Tools - Protect Spreadsheet</emph>. Optionally enter a password and click OK.</paragraph>
@@ -39,8 +39,14 @@
 </section>
 <paragraph role="paragraph" id="par_id3153188" xml-lang="en-US">The structure of protected spreadsheet documents can be changed only if the <emph>Protect</emph> option is disabled. On the context menus for the spreadsheet tabs at the lower graphic border, only the menu item <emph>Select All Sheets</emph> can be activated. All other menu items are deactivated. To remove the protection, call up the command <emph>Tools - Protect Spreadsheet</emph> again. If no password is assigned, protection is immediately removed. If you were assigned a password, the <emph>Remove Spreadsheet Protection</emph> dialog appears, in which you must enter the password. Only then can you remove the check mark specifying that protection is active.</paragraph>
 <paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="7">A protected document, once saved, can only be saved again with the <emph>File - Save As</emph> menu command. </paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SC_HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
 <paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="2" l10n="U" oldref="4">Password (optional)</paragraph>
-<paragraph role="paragraph" id="par_id3155412" xml-lang="en-US" l10n="U" oldref="5">You can create a password to protect your document against unauthorized or accidental modifications.</paragraph>
+<paragraph role="paragraph" id="par_id3155412" xml-lang="en-US"><ahelp hid="SC_HID_PASSWD_DOC">You can create a password to protect your document against unauthorized or accidental modifications.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SC_HID_PASSWD_DOC_CONFIRM" id="bm_id3154864" localize="false"/>
+<paragraph role="paragraph" id="par_id3155413" xml-lang="en-US"><ahelp hid="SC_HID_PASSWD_DOC_CONFIRM" visibility="hidden">Re-enter the password.</ahelp></paragraph>
+
 <paragraph role="note" id="par_id3150717" xml-lang="en-US">You can completely protect your work by combining the options <emph>Tools - Protect Sheet</emph> and <emph>Tools - Protect Spreadsheet</emph>, including password entry. If you want to prevent the document from being opened by other users, select <emph>Save With Password </emph>and click the <emph>Save</emph> button. The <emph>Enter Password</emph> dialog appears. Consider carefully when choosing a password; if you forget it after you close a document you will be unable to access the document.</paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/password_dlg.xhp b/source/text/shared/01/password_dlg.xhp
index 6151689..6db9005 100644
--- a/source/text/shared/01/password_dlg.xhp
+++ b/source/text/shared/01/password_dlg.xhp
@@ -49,7 +49,6 @@
          <paragraph xml-lang="en-US" id="par_id3150502" role="paragraph" l10n="CHG" oldref="62"><ahelp hid="HID_PASSWD_TABLE">Type a password. A password is case sensitive.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/password/confirm1ed" id="bm_id3149496" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/password/confirm2ed" id="bm_id3149497" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/uui/ui/password/confirmpassEntry" id="bm_id0928200904190676" localize="false"/>
 
 <paragraph xml-lang="en-US" id="hd_id3153029" role="heading" level="2" l10n="U"
