diff options
| -rw-r--r-- | AllLangHelp_swriter.mk | 1 | ||||
| -rw-r--r-- | source/auxiliary/swriter.tree | 1 | ||||
| -rw-r--r-- | source/text/shared/01/02230150.xhp | 2 | ||||
| -rw-r--r-- | source/text/shared/01/02230300.xhp | 12 | ||||
| -rw-r--r-- | source/text/shared/01/02230400.xhp | 6 | ||||
| -rw-r--r-- | source/text/shared/01/02240000.xhp | 4 | ||||
| -rw-r--r-- | source/text/swriter/track_changes_toolbar.xhp | 246 |
7 files changed, 264 insertions, 8 deletions
diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index 2ac115c022..60751d9444 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -421,6 +421,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/menu/insert_frame \ helpcontent2/source/text/swriter/menu/submenu_more_breaks \ helpcontent2/source/text/swriter/mailmergetoolbar \ + helpcontent2/source/text/swriter/track_changes_toolbar \ )) # vim: set noet sw=4 ts=4: diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree index 4f8168608e..2c96b6b4de 100644 --- a/source/auxiliary/swriter.tree +++ b/source/auxiliary/swriter.tree @@ -48,6 +48,7 @@ <topic id="swriter/text/swriter/main0202.xhp">Formatting Bar</topic> <topic id="swriter/text/swriter/main0203.xhp">Image Bar</topic> <topic id="swriter/text/swriter/main0204.xhp">Table Bar</topic> + <topic id="swriter/text/swriter/track_changes_toolbar.xhp">Track Changes Bar</topic> <topic id="swriter/text/swriter/main0205.xhp">Drawing Object Properties Bar</topic> <topic id="swriter/text/swriter/main0206.xhp">Bullets and Numbering Bar</topic> <topic id="swriter/text/swriter/main0208.xhp">Status Bar</topic> diff --git a/source/text/shared/01/02230150.xhp b/source/text/shared/01/02230150.xhp index f4300bb8fd..2efadc76ee 100644 --- a/source/text/shared/01/02230150.xhp +++ b/source/text/shared/01/02230150.xhp @@ -31,7 +31,7 @@ <section id="red_protect"> <bookmark xml-lang="en-US" branch="hid/SC_HID_CHG_PROTECT" id="bm_id3153116" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:ProtectTraceChangeMode" id="bm_id4566479" localize="false"/> -<paragraph role="heading" id="hd_id3154349" xml-lang="en-US" level="1"><link href="text/shared/01/02230150.xhp" name="Protect Changes">Protect Changes</link></paragraph> +<h1 id="hd_id3154349"><link href="text/shared/01/02230150.xhp" name="Protect Changes">Protect Changes</link></h1> <paragraph role="paragraph" id="par_id3150794" xml-lang="en-US"><ahelp hid=".">Prevents a user from deactivating the record changes feature, or from accepting or rejecting changes unless the user enters a password.</ahelp></paragraph> </section> <section id="relatedtopics"> diff --git a/source/text/shared/01/02230300.xhp b/source/text/shared/01/02230300.xhp index 364f5babeb..17781eec26 100644 --- a/source/text/shared/01/02230300.xhp +++ b/source/text/shared/01/02230300.xhp @@ -33,14 +33,18 @@ <bookmark xml-lang="en-US" branch="hid/cui/ui/comment/CommentDialog" id="bm_id3153882" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/comment/@@nowidget@@" id="bm_id3153882" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/comment/edit" id="bm_id3153883" localize="false"/> -<paragraph role="heading" id="hd_id3083278" xml-lang="en-US" level="1">Comment</paragraph> + +<section id="trackchangecommenthead"> + <h1 id="hd_id3083278">Insert Track Change Comment</h1> <paragraph role="paragraph" id="par_id3148983" xml-lang="en-US"><variable id="kommentartext"><ahelp hid=".">Enter a comment for the recorded change.</ahelp> -</variable></paragraph> + </variable></paragraph> +</section> + <section id="howtoget"> <embed href="text/shared/00/edit_menu.xhp#comment"/> </section> -<paragraph role="note" id="par_id3155391" xml-lang="en-US">You can attach a comment when <switchinline select="appl"><caseinline select="WRITER">the cursor is in a changed text passage</caseinline><caseinline select="CALC">the changed cell is selected -</caseinline></switchinline>, or in the <emph>Manage Changes</emph> dialog.</paragraph> +<note id="par_id3155391">You can attach a comment when <switchinline select="appl"><caseinline select="WRITER">the cursor is in a changed text passage</caseinline><caseinline select="CALC">the changed cell is selected +</caseinline></switchinline>, or in the <emph>Manage Changes</emph> dialog.</note> <paragraph role="paragraph" id="par_id3156426" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC">Comments are displayed as callouts in the sheet when you rest your mouse pointer over a cell with a recorded change. You can also view comments that are attached to a changed cell in the changes list in the <link href="text/shared/01/02230400.xhp" name="Manage Changes"><emph>Manage Changes</emph></link> dialog.</caseinline></switchinline></paragraph> </body> </helpdocument> diff --git a/source/text/shared/01/02230400.xhp b/source/text/shared/01/02230400.xhp index f16c7a8526..afa5ca7082 100644 --- a/source/text/shared/01/02230400.xhp +++ b/source/text/shared/01/02230400.xhp @@ -32,8 +32,12 @@ <bookmark xml-lang="en-US" branch="hid/svx/ui/redlinecontrol/tabcontrol/@@nowidget@@" id="bm_id3154025" localize="false"/> <bookmark xml-lang="en-US" branch="hid/svx/ui/redlinecontrol/tabcontrol" id="bm_id3154025" localize="false"/> <bookmark xml-lang="en-US" branch="hid/SW_HID_REDLINE_CTRL" id="bm_id2513258" localize="false"/> - <paragraph role="heading" level="1" id="hd_id3145138" xml-lang="en-US">Manage changes</paragraph> + + <section id="managechangeshead"> + <h1 id="hd_id3145138"><variable id="Manage changesh1"><link href="text/shared/01/02230400.xhp" name="Manage changes">Manage changes</link></variable></h1> <paragraph role="paragraph" id="par_id3147240" xml-lang="en-US"><variable id="redlining"><ahelp hid=".">Accept or reject recorded changes.</ahelp></variable></paragraph> + </section> + <section id="howtoget"> <embed href="text/shared/00/edit_menu.xhp#rotlinie"/> </section> diff --git a/source/text/shared/01/02240000.xhp b/source/text/shared/01/02240000.xhp index 5a7eb811dc..c5db1f9fe5 100644 --- a/source/text/shared/01/02240000.xhp +++ b/source/text/shared/01/02240000.xhp @@ -30,7 +30,7 @@ <body> <section id="compare_document"> <bookmark branch="hid/.uno:CompareDocuments" id="bm_id3146807" xml-lang="en-US" localize="false"/> -<paragraph role="heading" id="hd_id3149877" xml-lang="en-US" level="1">Compare Document</paragraph> +<h1 id="hd_id3149877"><variable id="Compare Documenth1"><link href="text/shared/01/02240000.xhp" name="Compare Document">Compare Document</link></variable></h1> <paragraph role="paragraph" id="par_id3150838" xml-lang="en-US"> <variable id="dokver"><ahelp hid=".uno:CompareDocuments">Compares the current document with a document that you select.</ahelp> </variable> The contents of the selected document are marked as deletions in the dialog that opens. If you want, you can insert the contents of the selected file into the current document by selecting the relevant deleted entries, clicking <emph>Reject</emph>, and then clicking <emph>Insert</emph>.</paragraph> @@ -41,7 +41,7 @@ <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/> <switch select="appl"> <case select="WRITER"> -<paragraph role="warning" id="par_id3153662" xml-lang="en-US">The contents of footnotes, headers, frames and fields are ignored.</paragraph> +<warning id="par_id3153662">The contents of footnotes, headers, frames and fields are ignored.</warning> </case> </switch> diff --git a/source/text/swriter/track_changes_toolbar.xhp b/source/text/swriter/track_changes_toolbar.xhp new file mode 100644 index 0000000000..f80ada4190 --- /dev/null +++ b/source/text/swriter/track_changes_toolbar.xhp @@ -0,0 +1,246 @@ +<?xml version="1.0" encoding="UTF-8"?> +<helpdocument version="1.0"> + <!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + --> + + <meta> + <topic id="trachchangestollbar" indexer="include" status="PUBLISH"> + <title id="tit" xml-lang="en-US">Track Changes Toolbar</title> + <filename>/text/swriter/track_changes_toolbar.xhp</filename> + </topic> + </meta> + <body> + <section id="trackcahangestoolbarHead"> + <bookmark id="bm_id811647012520592" xml-lang="en-US" branch="hid/zzzz" localize="false"/> + <h1 id="hd_id671647012520594"><variable id="h1"><link href="text/shared/track_changes_toolbar.xhp" name="Track Changes Toolbar">Track Changes Toolbar</link></variable></h1> + <paragraph id="par_id471647012520596" role="paragraph" xml-lang="en-US">Contains the commands that are available for tracking changes in your file.</paragraph> + </section> + <section id="howtoget"> + <paragraph role="paragraph" id="par_id261647012734234">Choose <menuitem>View - Toolbars - Track Changes</menuitem>.</paragraph> + </section> + <embed href="text/shared/01/02230200.xhp#showchanges"/> + <table id="tab_id751647013245369"> + <tablerow> + <tablecell> + <paragraph id="par_id221647013245370" role="paragraph"> + <image src="cmd/lc_showtrackedchanges.svg" id="img_id801647013245371" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id821647013245372">Icon Show track changes</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id31647013245373" role="paragraph" xml-lang="en-US">Show track changes</paragraph> + </tablecell> + </tablerow> + </table> + + <embed href="text/shared/01/02230100.xhp#record_changes"/> + <table id="tab_id121647013362399"> + <tablerow> + <tablecell> + <paragraph id="par_id791647013362400" role="paragraph"> + <image src="cmd/lc_trackchanges.svg" id="img_id921647013362401" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id561647013362402">Icon Record Changes</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id781647013362404" role="paragraph" xml-lang="en-US">Record Changes</paragraph> + </tablecell> + </tablerow> + </table> + + + <h2 id="hd_id731647013552967">Previous Track Change</h2> + <table id="tab_id701647013566068"> + <tablerow> + <tablecell> + <paragraph id="par_id901647013566069" role="paragraph"> + <image src="cmd/lc_previoustrackedchange.svg" id="img_id151647013566070" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id981647013566071">Icon Previous track change</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id391647013566073" role="paragraph" xml-lang="en-US">Previous track change</paragraph> + </tablecell> + </tablerow> + </table> + <h2 id="hd_id551647013674361">Next Track Change</h2> + <table id="tab_id891647013679439"> + <tablerow> + <tablecell> + <paragraph id="par_id231647013679440" role="paragraph"> + <image src="cmd/lc_nexttrackedchange.svg" id="img_id1001647013679441" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id971647013679442">Icon Next track change</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id531647013679443" role="paragraph" xml-lang="en-US">Next track change</paragraph> + </tablecell> + </tablerow> + </table> + <h2 id="hd_id421647013795427">Accept Track Change</h2> + <table id="tab_id451647013785664"> + <tablerow> + <tablecell> + <paragraph id="par_id1001647013785665" role="paragraph"> + <image src="cmd/lc_accepttrackedchange.svg" id="img_id491647013785666" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id301647013785667">Icon Accept Track Change</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id971647013785668" role="paragraph" xml-lang="en-US">Accept Track Change</paragraph> + </tablecell> + </tablerow> + </table> + <h2 id="hd_id871647013918576">Reject Track Change</h2> + <table id="tab_id701647013912300"> + <tablerow> + <tablecell> + <paragraph id="par_id981647013912301" role="paragraph"> + <image src="cmd/lc_rejecttrackedchange.svg" id="img_id931647013912302" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id811647013912303">Icon Reject Track Change</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id21647013912304" role="paragraph" xml-lang="en-US">Reject Track Change</paragraph> + </tablecell> + </tablerow> + </table> + <h2 id="hd_id991647014048136">Accept All Tracked Changes</h2> + <table id="tab_id391647014053975"> + <tablerow> + <tablecell> + <paragraph id="par_id161647014053976" role="paragraph"> + <image src="cmd/lc_acceptalltrackedchanges.svg" id="img_id981647014053977" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id761647014053978">Icon Accept All Tracked Changes</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id701647014053979" role="paragraph" xml-lang="en-US">Accept All Tracked Changes</paragraph> + </tablecell> + </tablerow> + </table> + <h2 id="hd_id341647014115494">Reject All Tracked Changes</h2> + <table id="tab_id631647014121790"> + <tablerow> + <tablecell> + <paragraph id="par_id891647014121791" role="paragraph"> + <image src="cmd/lc_rejectalltrackedchanges.svg" id="img_id141647014121792" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id861647014121793">Icon Reject All Tracked Changes</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id451647014121795" role="paragraph" xml-lang="en-US">Reject All Tracked Changes</paragraph> + </tablecell> + </tablerow> + </table> + <h2 id="hd_id901647014258055">Accept Track Change and select next one</h2> + <table id="tab_id841647014293795"> + <tablerow> + <tablecell> + <paragraph id="par_id511647014293796" role="paragraph"> + <image src="cmd/lc_accepttrackedchangetonext.svg" id="img_id791647014293797" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id611647014293798">Icon Accept Track Change and select next one</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id851647014293800" role="paragraph" xml-lang="en-US">Accept Track Change and select next one</paragraph> + </tablecell> + </tablerow> + </table> + <h2 id="hd_id451647014408416">Reject Track Change and select next one</h2> + <table id="tab_id421647014413667"> + <tablerow> + <tablecell> + <paragraph id="par_id971647014413668" role="paragraph"> + <image src="cmd/lc_rejecttrackedchangetonext.svg" id="img_id631647014413669" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id661647014413670">Icon Reject Track Change and select next one</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id361647014413671" role="paragraph" xml-lang="en-US">Reject Track Change and select next one</paragraph> + </tablecell> + </tablerow> + </table> + + <embed href="text/shared/01/02230400.xhp#managechangeshead"/> + <table id="tab_id491647014498849"> + <tablerow> + <tablecell> + <paragraph id="par_id721647014498850" role="paragraph"> + <image src="cmd/lc_accepttrackedchanges.svg" id="img_id551647014498851" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id381647014498852">Icon Manage Track Changes</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id641647014498854" role="paragraph" xml-lang="en-US">Manage Track Changes</paragraph> + </tablecell> + </tablerow> + </table> + + <embed href="text/shared/01/04050000.xhp#comment"/> + <table id="tab_id211647018300376"> + <tablerow> + <tablecell> + <paragraph id="par_id111647018300377" role="paragraph"> + <image src="cmd/lc_shownote.svg" id="img_id271647018300378" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id61647018300380">Icon Insert Comment</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id851647018300382" role="paragraph" xml-lang="en-US">Insert Comment</paragraph> + </tablecell> + </tablerow> + </table> + + <embed href="text/shared/01/02230300.xhp#trackchangecommenthead"/> + <table id="tab_id41647015103298"> + <tablerow> + <tablecell> + <paragraph id="par_id411647015103299" role="paragraph"> + <image src="cmd/lc_commentchangetracking.svg" id="img_id181647015103300" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id381647015103301">Icon Insert Track Change Comment</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id611647015103302" role="paragraph" xml-lang="en-US">Insert Track Change Comment</paragraph> + </tablecell> + </tablerow> + </table> + + <embed href="text/shared/01/02230150.xhp#red_protect"/> + <table id="tab_id711647015406605"> + <tablerow> + <tablecell> + <paragraph id="par_id481647015406606" role="paragraph"> + <image src="cmd/lc_protecttracechangemode.svg" id="img_id591647015406607" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id311647015406608">Icon Protect Changes</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id901647015406609" role="paragraph" xml-lang="en-US">Protect Changes</paragraph> + </tablecell> + </tablerow> + </table> + + <embed href="text/shared/01/02240000.xhp#compare_document"/> + <table id="tab_id151647015829635"> + <tablerow> + <tablecell> + <paragraph id="par_id611647015829636" role="paragraph"> + <image src="cmd/lc_comparedocuments.svg" id="img_id31647015829637" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id691647015829638">Icon Compare Document</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id441647015829640" role="paragraph" xml-lang="en-US">Compare Document</paragraph> + </tablecell> + </tablerow> + </table> + + <embed href="text/shared/01/02230500.xhp#merge_documents"/> + <table id="tab_id101647019044606"> + <tablerow> + <tablecell> + <paragraph id="par_id331647019044607" role="paragraph"> + <image src="cmd/lc_mergedocuments.svg" id="img_id271647019044609" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id451647019044610">Icon Merge Document</alt></image> + </paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id201647019044612" role="paragraph" xml-lang="en-US">Merge Document</paragraph> + </tablecell> + </tablerow> + </table> + +</body> +</helpdocument> |