From 0566fe1d60f5e764fea219e11683e8b0dbf498eb Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Wed, 7 Jan 2009 16:36:05 +0000
Subject: CWS-TOOLING: integrate CWS menuchanges 2009-01-07 17:12:18 +0100 mod
r265974 : throw out comment tracking accellerator 2009-01-07 16:23:35 +0100
mod r265972 : CWS-TOOLING: rebase CWS menuchanges to trunk@265758
(milestone: DEV300:m38) 2008-12-03 16:21:15 +0100 mod r264798 : menu
shortcut fixes 2008-12-03 15:53:23 +0100 mod r264794 : some shortcut changes
2008-12-02 13:35:56 +0100 fredrikh r264696 : i96794 2008-12-01 20:09:07
+0100 fredrikh r264633 : i96768 2008-12-01 20:08:37 +0100 fredrikh r264632
: i96768 2008-12-01 16:40:18 +0100 fredrikh r264619 : i96762 2008-12-01
16:37:37 +0100 fredrikh r264618 : i96762 2008-12-01 16:37:09 +0100 fredrikh
r264617 : i96762 2008-12-01 13:14:43 +0100 fredrikh r264595 : i90650
2008-11-28 18:26:38 +0100 fredrikh r264569 : i94758 2008-11-28 18:22:31
+0100 fredrikh r264568 : i94758 2008-11-28 12:46:26 +0100 fredrikh r264541
: i94758 2008-11-26 16:58:51 +0100 fredrikh r264423 : i96625 2008-11-26
16:14:10 +0100 fredrikh r264412 : i96623 2008-11-26 16:13:02 +0100 fredrikh
r264410 : i96623 2008-11-25 19:46:42 +0100 fredrikh r264330 : i96359
2008-11-25 13:50:34 +0100 fredrikh r264307 : i96556 2008-11-25 13:49:46
+0100 fredrikh r264306 : i96556 2008-11-25 13:48:32 +0100 fredrikh r264305
: i96556 2008-11-25 13:46:55 +0100 fredrikh r264304 : i96556 2008-11-25
13:45:29 +0100 fredrikh r264303 : i96357 2008-11-25 13:42:11 +0100 fredrikh
r264302 : i96556 & i94758 2008-11-25 13:34:54 +0100 fredrikh r264301 :
i96556 2008-11-25 13:33:30 +0100 fredrikh r264300 : i96556 2008-11-25
13:32:31 +0100 fredrikh r264299 : i96556 2008-11-25 13:31:57 +0100 fredrikh
r264298 : i96556 2008-11-25 13:31:27 +0100 fredrikh r264297 : i96556
2008-11-25 13:30:31 +0100 fredrikh r264295 : i96556 2008-11-25 13:29:29
+0100 fredrikh r264294 : i96556 2008-11-25 13:28:17 +0100 fredrikh r264292
: i96556 2008-11-25 13:27:44 +0100 fredrikh r264290 : i96556 2008-11-25
13:26:54 +0100 fredrikh r264288 : i96556 2008-11-25 13:25:03 +0100 fredrikh
r264287 : i96556 2008-11-25 13:21:29 +0100 fredrikh r264286 : i96556
2008-11-19 16:14:07 +0100 fredrikh r264004 : i96359 2008-11-19 14:35:43
+0100 fredrikh r263995 : i96353 2008-11-19 14:05:58 +0100 fredrikh r263991
: i96347 2008-11-19 14:05:36 +0100 fredrikh r263990 : i96347 2008-11-19
14:05:07 +0100 fredrikh r263989 : i96347 2008-11-19 13:11:59 +0100 fredrikh
r263983 : i96347 2008-11-19 13:00:09 +0100 fredrikh r263982 : i96347
2008-10-29 14:54:51 +0100 mod r262804 : 94633 2008-10-29 14:54:10 +0100 mod
r262803 : #i94633# 2008-10-29 12:58:38 +0100 ufi r262787 : i94958,3rd
2008-10-29 12:42:41 +0100 ufi r262783 : i94958,2nd 2008-10-29 12:00:23 +0100
ufi r262777 : i94958 2008-10-28 23:45:34 +0100 mod r262766 : #i95457#
2008-10-18 19:09:38 +0200 mod r262295 : accelerator change 2008-10-17
15:45:11 +0200 mod r262289 : fix typo 2008-10-15 23:17:04 +0200 mod r262245
: menu fix 2008-10-15 22:58:30 +0200 mod r262244 : fix footnote setting
dialog 2008-10-15 22:58:01 +0200 mod r262243 : further changes to menu
2008-10-14 10:27:46 +0200 mod r262195 : new accelerator and menu changes
2008-10-14 10:27:37 +0200 mod r262194 : new accelerator and menu changes
2008-10-07 14:23:26 +0200 mod r262081 : #i79329# #i85158# #i88351#
2008-10-02 10:31:52 +0200 mod r262026 : #i94551# 2008-10-02 10:23:57 +0200
mod r262025 : #i87347#
---
helpcontent2/source/text/swriter/00/00000404.xhp | 88 ++++++------
helpcontent2/source/text/swriter/00/00000405.xhp | 147 +++++++++++++++++++--
helpcontent2/source/text/swriter/00/00000406.xhp | 32 ++---
helpcontent2/source/text/swriter/01/02110000.xhp | 122 +++++++++--------
helpcontent2/source/text/swriter/01/02150000.xhp | 42 +++---
helpcontent2/source/text/swriter/01/04030000.xhp | 24 ++--
helpcontent2/source/text/swriter/01/04130000.xhp | 30 ++---
helpcontent2/source/text/swriter/01/05150000.xhp | 35 +++--
helpcontent2/source/text/swriter/01/05150100.xhp | 35 +++--
helpcontent2/source/text/swriter/01/05150200.xhp | 37 +++---
helpcontent2/source/text/swriter/01/05150300.xhp | 33 +++--
helpcontent2/source/text/swriter/01/06080000.xhp | 42 +++---
helpcontent2/source/text/swriter/01/06090000.xhp | 22 ++-
.../source/text/swriter/guide/auto_numbering.xhp | 85 ++++++------
.../source/text/swriter/guide/auto_off.xhp | 44 +++---
.../source/text/swriter/guide/auto_spellcheck.xhp | 28 ++--
.../source/text/swriter/guide/autocorr_except.xhp | 23 ++--
.../source/text/swriter/guide/footnote_usage.xhp | 47 +++----
.../text/swriter/guide/nonprintable_text.xhp | 26 ++--
.../text/swriter/guide/removing_line_breaks.xhp | 28 ++--
.../source/text/swriter/guide/smarttags.xhp | 27 ++--
.../source/text/swriter/guide/text_centervert.xhp | 26 ++--
.../source/text/swriter/guide/text_frame.xhp | 14 +-
.../source/text/swriter/guide/word_completion.xhp | 27 ++--
helpcontent2/source/text/swriter/main0102.xhp | 20 ++-
helpcontent2/source/text/swriter/main0103.xhp | 18 +--
helpcontent2/source/text/swriter/main0104.xhp | 21 ++-
helpcontent2/source/text/swriter/main0106.xhp | 25 ++--
28 files changed, 619 insertions(+), 529 deletions(-)
(limited to 'helpcontent2/source/text/swriter')
diff --git a/helpcontent2/source/text/swriter/00/00000404.xhp b/helpcontent2/source/text/swriter/00/00000404.xhp
index bae3e97c9b..b81496ce3f 100644
--- a/helpcontent2/source/text/swriter/00/00000404.xhp
+++ b/helpcontent2/source/text/swriter/00/00000404.xhp
@@ -1,9 +1,8 @@
-
-
-
+
+
-
-
-
+
+
-
+
Insert Menu
/text/swriter/00/00000404.xhp
@@ -74,16 +72,17 @@
-
+
-Icon
+{ENTER ALTERNATE DESCRIPTION HERE}
-
+
Insert Fields
+
Choose Insert - Fields - Other - Document tab
@@ -108,16 +107,17 @@
-
+
-Icon
+{ENTER ALTERNATE DESCRIPTION HERE}
-
+
Section
+
Choose Insert - Section - Section tab or choose Format - Sections
@@ -125,38 +125,40 @@
Choose Insert - Section - Indents tab or choose Format - Sections
-Footnote: Choose Insert - Footnote
+Choose Insert - Footnote/Endnote
-Open context menu - choose Footnote (inserted Footnote/Endnote)
+Open context menu - choose Footnote/Endnote (inserted Footnote/Endnote)
Open Insert toolbar, click
-
+
-Icon
+{ENTER ALTERNATE DESCRIPTION HERE}
-
+
Insert Footnote Directly
+
-
+
-Icon
+{ENTER ALTERNATE DESCRIPTION HERE}
-
+
Insert Endnote Directly
+
Choose Insert - Caption
@@ -177,16 +179,17 @@
-
+
-Icon
+{ENTER ALTERNATE DESCRIPTION HERE}
-
+
Bookmark
+
Choose Insert - Script (only HTML documents)
@@ -200,16 +203,17 @@
-
+
-Icon
+{ENTER ALTERNATE DESCRIPTION HERE}
-
+
Entry
+
Choose Insert - Indexes and Tables - Indexes and Tables
@@ -254,7 +258,8 @@
Choose Insert - Indexes and Tables - Indexes and Tables - Entries tab (when Bibliography is the selected type)
-Choose Insert - Indexes and Tables - Bibliography Entry and click Edit
+Choose Insert - Indexes and Tables -
+Bibliography Entry and click Edit
Choose Insert - Indexes and Tables - Indexes and Tables - Styles tab
@@ -269,22 +274,23 @@
Choose Insert - Frame
-Choose Format - Frame
+Choose Format - Frame/Object
Open Insert toolbar, click
-
+
-Frame
+{ENTER ALTERNATE DESCRIPTION HERE}
-
+
Insert Frame Manually
+
@@ -296,16 +302,17 @@
-
+
-Icon
+{ENTER ALTERNATE DESCRIPTION HERE}
-
+
Table
+
Choose Insert - Horizontal Line
@@ -317,16 +324,17 @@
-
+
-Icon
+{ENTER ALTERNATE DESCRIPTION HERE}
-
+
File
+
Choose Insert - Header
diff --git a/helpcontent2/source/text/swriter/00/00000405.xhp b/helpcontent2/source/text/swriter/00/00000405.xhp
index ae349c9ef0..46708e8126 100644
--- a/helpcontent2/source/text/swriter/00/00000405.xhp
+++ b/helpcontent2/source/text/swriter/00/00000405.xhp
@@ -70,7 +70,7 @@
Choose Format - Page - Columns tab
-Choose Format - Frame - Columns tab
+Choose Format - Frame/Object - Columns tab
Choose Format - Styles and Formatting - open context menu Modify/New - Columns tab
Choose Insert - Frame - Columns tab
Choose Insert/Format - Section(s) - Columns tab
@@ -95,13 +95,13 @@
Choose Format - Styles and Formatting - open context menu Modify/New (for Numbering Styles)
-Choose Format - AutoFormat - While Typing
+Choose Format - AutoCorrect - While Typing
-Choose Format - AutoFormat
+Choose Format - AutoCorrect
-Choose Format - AutoFormat - Apply
+Choose Format - AutoCorrect - Apply
-Choose Format - AutoFormat - Apply and Edit Changes
+Choose Format - AutoCorrect - Apply and Edit Changes
Choose Table - AutoFormat (with cursor in a table)
@@ -117,7 +117,11 @@
+<<<<<<< .working
+{ENTER ALTERNATE DESCRIPTION HERE}
+=======
{ENTER ALTERNATE DESCRIPTION HERE}
+>>>>>>> .merge-right.r265757
@@ -130,13 +134,13 @@
Choose Format - Picture - Type tab
-Choose Format - Frame - Type tabUFI: removed some lines with Format-Object, see #i64150
+Choose Format - Frame/Object - Type tabUFI: removed some lines with Format-Object, see #i64150
Choose Format - Styles and Formatting - open context menu Modify/New - Type tab
Choose Insert - Frame - Type tab
Choose Format - Picture - Wrap tab
-Choose Format - Frame - Wrap tab
+Choose Format - Frame/Object - Wrap tab
Choose Insert - Frame - Wrap tab
Choose Format - Wrap
@@ -145,12 +149,12 @@
Choose Format - Picture - Hyperlink tab
-Choose Format - Frame - Hyperlink tab
+Choose Format - Frame/Object - Hyperlink tab
Choose Insert - Frame - Hyperlink tab
Choose Format - Picture - Options tab
-Choose Format - Frame - Options tab
+Choose Format - Frame/Object - Options tab
Choose Format - Styles and Formatting - open context menu Modify/New - Options tab
Choose Insert - Frame - Options tab
@@ -158,7 +162,7 @@
Choose Insert/Format - Picture - Macro tab
-Choose Insert/Format - Frame - Macro tab
+Choose Insert/Format - Frame/Object - Macro tab
Choose Edit - AutoText - AutoText (button) - Macro
Choose Edit - ImageMap - open context menu - Macro
@@ -180,6 +184,49 @@
Right-click in a table, choose Cell
+<<<<<<< .working
+
+Choose Table - Merge Cells
+
+On the Table Bar, click
+
+
+
+
+
+{ENTER ALTERNATE DESCRIPTION HERE}
+
+
+
+Merge Cells
+
+
+
+
+
+
+
+Choose Table - Split Cells
+
+On the Table Bar, click
+
+
+
+
+
+{ENTER ALTERNATE DESCRIPTION HERE}
+
+
+
+Split Cells
+
+
+
+
+
+
+=======
+>>>>>>> .merge-right.r265757
In the context menu of a cell, choose Cell - Protect
@@ -200,7 +247,11 @@
+<<<<<<< .working
+{ENTER ALTERNATE DESCRIPTION HERE}
+=======
{ENTER ALTERNATE DESCRIPTION HERE}
+>>>>>>> .merge-right.r265757
@@ -211,6 +262,29 @@
+<<<<<<< .working
+
+Choose Table - Autofit - Distribute Rows Equally
+
+Open Optimize toolbar from Table Bar, click
+
+
+
+
+
+{ENTER ALTERNATE DESCRIPTION HERE}
+
+
+
+Distribute Rows Equally
+
+
+
+
+
+
+=======
+>>>>>>> .merge-right.r265757
Choose Table - Select - Row
@@ -222,7 +296,11 @@
+<<<<<<< .working
+{ENTER ALTERNATE DESCRIPTION HERE}
+=======
{ENTER ALTERNATE DESCRIPTION HERE}
+>>>>>>> .merge-right.r265757
@@ -247,7 +325,11 @@
+<<<<<<< .working
+{ENTER ALTERNATE DESCRIPTION HERE}
+=======
{ENTER ALTERNATE DESCRIPTION HERE}
+>>>>>>> .merge-right.r265757
@@ -258,6 +340,29 @@
+<<<<<<< .working
+
+Choose Table - Autofit - Distribute Columns Equally
+
+Open Optimize toolbar from Table Bar, click
+
+
+
+
+
+{ENTER ALTERNATE DESCRIPTION HERE}
+
+
+
+Space Columns Equally
+
+
+
+
+
+
+=======
+>>>>>>> .merge-right.r265757
Choose Table - Select - Column
@@ -270,7 +375,11 @@
+<<<<<<< .working
+{ENTER ALTERNATE DESCRIPTION HERE}
+=======
{ENTER ALTERNATE DESCRIPTION HERE}
+>>>>>>> .merge-right.r265757
@@ -280,7 +389,11 @@
+<<<<<<< .working
+{ENTER ALTERNATE DESCRIPTION HERE}
+=======
{ENTER ALTERNATE DESCRIPTION HERE}
+>>>>>>> .merge-right.r265757
@@ -299,7 +412,11 @@
+<<<<<<< .working
+{ENTER ALTERNATE DESCRIPTION HERE}
+=======
{ENTER ALTERNATE DESCRIPTION HERE}
+>>>>>>> .merge-right.r265757
@@ -311,14 +428,18 @@