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

[Caolán McNamara]

 helpers/help_hid.lst   |1 -
 source/text/shared/01/0206.xhp |4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 72c2f044662c92c8e1dec700160cb94835bfc092
Author: Caolán McNamara 
Date:   Sun Feb 25 19:11:44 2018 +

update help for warning dialog conversion

Change-Id: I8c4bae6f0e43178b2189b3986c9f280dcb76b085

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b8f60ebe5..38b78a1fc 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2505,7 +2505,6 @@ HID_SC_RENAME_AUTOFMT,58943,
 HID_SC_RENAME_NAME,58913,
 HID_SC_RENAME_OBJECT,58947,
 HID_SC_REN_AFMT_NAME,58944,
-HID_SC_REPLCELLSWARN,59001,
 HID_SC_SCENWIN_BOTTOM,58911,
 HID_SC_SCENWIN_TOP,58910,
 HID_SC_SHEET_CELL_ERG,58779,
diff --git a/source/text/shared/01/0206.xhp 
b/source/text/shared/01/0206.xhp
index ff369ea62..a0215c651 100644
--- a/source/text/shared/01/0206.xhp
+++ b/source/text/shared/01/0206.xhp
@@ -36,10 +36,10 @@
 clipboard; pasting
 cells;pasting
 mw deleted "cell ranges,pasting"
-
+
 
 
-overwrite dialog in 
Calc if target is not empty
+overwrite
 dialog in Calc if target is not empty
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst  |5 -
 source/text/scalc/01/0211.xhp |   20 ++--
 2 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit 15646c9c9d2ceab21b8688cbd993a8ee881f7c7f
Author: Caolán McNamara 
Date:   Mon Apr 10 10:37:44 2017 +0100

update help ids for .ui conversion

Change-Id: I2dc481b16b2af15682bbd5e504892eff679f8699

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index fb8fe79a5..b8f60ebe5 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2487,9 +2487,6 @@ HID_SC_APPEND_NAME,58914,
 HID_SC_ASCII_TABCTR,58926,
 HID_SC_AUTOFMT_NAME,58921,
 HID_SC_DRAW_RENAME,59007,
-HID_SC_DROPMODE_COPY,58924,
-HID_SC_DROPMODE_LINK,58923,
-HID_SC_DROPMODE_URL,58922,
 HID_SC_FAP_EDIT1,58916,
 HID_SC_FAP_EDIT2,58917,
 HID_SC_FAP_EDIT3,58918,
@@ -2509,8 +2506,6 @@ HID_SC_RENAME_NAME,58913,
 HID_SC_RENAME_OBJECT,58947,
 HID_SC_REN_AFMT_NAME,58944,
 HID_SC_REPLCELLSWARN,59001,
-HID_SC_SCENARIO_DELETE,58927,
-HID_SC_SCENARIO_EDIT,58928,
 HID_SC_SCENWIN_BOTTOM,58911,
 HID_SC_SCENWIN_TOP,58910,
 HID_SC_SHEET_CELL_ERG,58779,
diff --git a/source/text/scalc/01/0211.xhp 
b/source/text/scalc/01/0211.xhp
index a07f3842d..0d96ea1b1 100644
--- a/source/text/scalc/01/0211.xhp
+++ b/source/text/scalc/01/0211.xhp
@@ -146,12 +146,12 @@
 
 
 If 
the Navigator displays scenarios, you can access the following commands when 
you right-click a scenario entry:
-
+
 Delete
-Deletes the selected 
scenario.
-
+Deletes the 
selected scenario.
+
 Properties
-Opens the Edit scenario dialog, where you can 
edit the scenario properties.
+Opens the Edit scenario dialog, where you can 
edit the scenario properties.
 
 Drag Mode
 Opens a 
submenu for selecting the drag mode. You decide which action is performed when 
dragging and dropping an object from the Navigator into a document. Depending 
on the mode you select, the icon indicates whether a hyperlink, link or a copy 
is created.
@@ -168,16 +168,16 @@
 
 
 
-
+
 Insert as Hyperlink
-Inserts a hyperlink when you 
drag-and-drop an object from the Navigator into a document. You can 
later click the created hyperlink to set the cursor and the view to the 
respective object. 
+Inserts a 
hyperlink when you drag-and-drop an object from the Navigator into a 
document. You can later click the created hyperlink to set the cursor 
and the view to the respective object. 
 If you 
insert a hyperlink that links to an open document, you need to save the 
document before you can use the hyperlink.UFI: fixes bugtraq 
5009354
-
+
 Insert as Link
-Creates a link when you 
drag-and-drop an object from the Navigator into a document.
-
+Creates a link when you 
drag-and-drop an object from the Navigator into a document.
+
 Insert as Copy
-Generates a copy when you 
drag-and-drop an object from the Navigator into a document.
+Generates a copy when 
you drag-and-drop an object from the Navigator into a 
document.
 
 Objects
 Displays 
all objects in your document.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |8 
 source/text/shared/01/0301.xhp |   14 +++---
 2 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit b1f5e0083595ceef845ee8a39e82ad1ed023896f
Author: Caolán McNamara 
Date:   Thu Apr 6 11:41:02 2017 +0100

update help ids for .ui conversion

Change-Id: I945ba9cc0ebce82363ae569da1701c5d01136619

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6e935cab5..fb8fe79a5 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1944,14 +1944,6 @@ HID_MNU_FUNC_MAX,34039,
 HID_MNU_FUNC_MIN,34040,
 HID_MNU_FUNC_NONE,34042,
 HID_MNU_FUNC_SUM,34041,
-HID_MNU_ZOOM_100,34030,
-HID_MNU_ZOOM_150,34029,
-HID_MNU_ZOOM_200,34028,
-HID_MNU_ZOOM_50,34032,
-HID_MNU_ZOOM_75,34031,
-HID_MNU_ZOOM_OPTIMAL,34033,
-HID_MNU_ZOOM_PAGE_WIDTH,34034,
-HID_MNU_ZOOM_WHOLE_PAGE,34035,
 HID_MN_CALC_ACOS,53401,
 HID_MN_CALC_AND,53385,
 HID_MN_CALC_ASIN,53400,
diff --git a/source/text/shared/01/0301.xhp 
b/source/text/shared/01/0301.xhp
index 2ddd7088f..081aef05d 100644
--- a/source/text/shared/01/0301.xhp
+++ b/source/text/shared/01/0301.xhp
@@ -51,23 +51,23 @@
 Zoom 
factor
 Set the zoom 
factor at which to display the current document and all documents of the same 
type that you open thereafter.
 
-
+
 
 Optimal
-Resizes the display to fit the width of the selected cell area at 
the moment the command is started.Resizes the 
display to fit the width of the text in the document at the moment the command 
is started.
+Resizes the display to fit the width of the selected cell area at 
the moment the command is started.Resizes the 
display to fit the width of the text in the document at the moment the command 
is started.
 
-
+
 
 Fit 
width and height
-Resizes the display to fit the width and height of the selected 
cell area at the moment the command is 
started.Displays the entire page on your 
screen.
+Resizes the display to fit the width and height of the selected 
cell area at the moment the command is 
started.Displays the entire page on your 
screen.
 
-
+
 
 Fit 
width
-Displays the complete width of the document page. 
The top and bottom edges of the page may not be visible.
+Displays the complete width of the document page. 
The top and bottom edges of the page may not be visible.
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |3 ---
 source/text/shared/01/06040500.xhp |   14 --
 2 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit a43b8eb31d44f4a3193029f7593281152ed2e5f9
Author: Caolán McNamara 
Date:   Fri Feb 24 20:59:21 2017 +

update helpids for .ui spell menu conversion

Change-Id: I89488bd75c33fb732e780c5ffc4515c0615b

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ef53254..df93635 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1841,12 +1841,9 @@ HID_LETTER_PAGE6,53274,
 HID_LETTER_PAGE7,53275,
 HID_LETTER_PAGE8,53276,
 HID_LETTER_PAGE9,53277,
-HID_LINGU_ADD_WORD,53430,
 HID_LINGU_AUTOCORR,53433,
-HID_LINGU_IGNORE_WORD,53431,
 HID_LINGU_PARA_LANGUAGE,53438,
 HID_LINGU_REPLACE,53434,
-HID_LINGU_SPELLING_DLG,53432,
 HID_LINGU_WORD_LANGUAGE,53437,
 HID_LISTWIZARD_CANCEL,34819,
 HID_LISTWIZARD_FINISH,34820,
diff --git a/source/text/shared/01/06040500.xhp 
b/source/text/shared/01/06040500.xhp
index 4647634..1a938b7 100644
--- a/source/text/shared/01/06040500.xhp
+++ b/source/text/shared/01/06040500.xhp
@@ -36,20 +36,22 @@
 Replacement Suggestions
 Click the word to replace the 
highlighted word. Use the AutoCorrect submenu for permanent 
replacement.UFI: see i60431
 
-
+
 Spellcheck
-Opens the Spellcheck 
dialog.
+Opens the 
Spellcheck 
dialog.
 
 
-
+
+
 Add
-Adds the highlighted word to a 
user-defined dictionary.
+Adds the highlighted 
word to a user-defined dictionary.
 
-
+
 Ignore all
-Ignores all instances of the 
highlighted word in the current document.
+Ignores all 
instances of the highlighted word in the current document.
 
 
+
 
 AutoCorrect
 To always replace the highlighted word, click a word 
in the list. The word pair is stored in the replacement table under Tools - 
AutoCorrect - AutoCorrect Options - Replace.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |5 
 source/text/shared/01/02230401.xhp |   42 ++---
 2 files changed, 21 insertions(+), 26 deletions(-)

New commits:
commit 0dbfd3f53a4cb4074ea5745fa5c7331d87c2742e
Author: Caolán McNamara 
Date:   Tue Feb 21 17:08:02 2017 +

update help ids for writer sort/edit comments menu .ui conversion

Change-Id: I960d72cd9e7903c9682e84770d8587fd69b4883b

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a792828..ef53254 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1284,7 +1284,6 @@ HID_EDITENG_SPELLER_ADDWORD,34066,
 HID_EDITENG_SPELLER_AUTOCORRECT,34068,
 HID_EDITENG_SPELLER_IGNORE,34067,
 HID_EDITENG_SPELLER_START,34065,
-HID_EDIT_COMMENT,53056,
 HID_EDIT_FORMULA,53896,
 HID_EDIT_WIN,52821,
 HID_ENDNOTE_OPTIONS,53216,
@@ -2846,10 +2845,6 @@ HID_SMA_XUNDERBRACEY,63839,
 HID_SMA_XUNIONY,63118,
 HID_SMA_XWIDEBSLASHY,63837,
 HID_SMA_XWIDESLASHY,63836,
-HID_SORT_ACTION,53050,
-HID_SORT_AUTHOR,53051,
-HID_SORT_COMMENT,53053,
-HID_SORT_DATE,53052,
 HID_SOURCEVIEW,52825,
 HID_SOURCE_EDITWIN,52836,
 HID_SPELLCHECK,33822,
diff --git a/source/text/shared/01/02230401.xhp 
b/source/text/shared/01/02230401.xhp
index 75f0246..6ffca38 100644
--- a/source/text/shared/01/02230401.xhp
+++ b/source/text/shared/01/02230401.xhp
@@ -94,25 +94,25 @@
 Lists the changes that 
were recorded in the document. When you select an entry in the list, the change 
is highlighted in the document. To sort the list, click a column heading. 
 Hold down CommandCtrl
 while you click to select multiple entries in the list.
 To edit the comment for an entry in the list, right-click the entry, 
and then choose Edit - Comment.
 After you accept or reject a change, the entries of the list are 
re-ordered according to "Accepted" or "Rejected" status.
-
+
 Action
-Lists the 
changes that were made in the document.
+Lists the 
changes that were made in the document.
 Position 
 
 Lists the 
cells with contents that were changed. 
 
-
+
 Author
-  Lists the user 
who made the change.
-
+  Lists the 
user who made the change.
+
 Date
-  Lists the date 
and time that the change was made.
-
+  Lists the 
date and time that the change was made.
+
 Comment
-  Lists the 
comments that are attached to the change.
+  Lists the 
comments that are attached to the change.
 
 
 If you made 
changes by choosing Format - AutoCorrect - Apply and Edit Changes, 
the Undo button appears in the dialog. Reverse the last Accept or Reject 
command.
 
   There are additional commands in the context menu of 
the list:
-
-
+
+
 Edit comment
-  Edit the comment 
for the selected change.
+  Edit the 
comment for the selected change.
   Sort
   Sorts the list according to the column headings.
-
+
 Action
-  Sorts the list according to the type 
of change.
-
+  Sorts 
the list according to the type of change.
+
 Author
-  Sorts the list according to the 
Author.
-
+  Sorts 
the list according to the Author.
+
 Date
-  Sorts the list according to the date and 
time.
-
+  Sorts the 
list according to the date and time.
+
 Comment
-  Sorts the list according to the 
comments that are attached to the changes.
-
+  Sorts the 
list according to the comments that are attached to the 
changes.
+
 Document Position
-  Sorts the 
list in a descending order according to the position of the changes in the 
document. This is the default sorting method.
+  Sorts 
the list in a descending order according to the position of the changes in the 
document. This is the default sorting method.

 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |6 --
 source/text/shared/01/02230401.xhp |   24 
 2 files changed, 12 insertions(+), 18 deletions(-)

New commits:
commit 358d6c4eb7e82309fb1bc1f362d5f43297cbc2ba
Author: Caolán McNamara 
Date:   Tue Feb 21 16:17:02 2017 +

update help ids for calc sort/edit comments menu .ui conversion

Change-Id: Ib95596c2063b3edb7ace4d4f9cc1c25c829a00c1

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b606081..a792828 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2498,7 +2498,6 @@ HID_SC_ADD_AUTOFMT,58920,
 HID_SC_APPEND_NAME,58914,
 HID_SC_ASCII_TABCTR,58926,
 HID_SC_AUTOFMT_NAME,58921,
-HID_SC_CHANGES_COMMENT,58990,
 HID_SC_DRAW_RENAME,59007,
 HID_SC_DROPMODE_COPY,58924,
 HID_SC_DROPMODE_LINK,58923,
@@ -2533,10 +2532,6 @@ HID_SC_SHEET_CELL_UEB,58781,
 HID_SC_SHEET_CELL_UEB1,58782,
 HID_SC_SHEET_PAGE_REP,58789,
 HID_SC_SHEET_PAGE_STD,58788,
-HID_SC_SORT_ACTION,58985,
-HID_SC_SORT_AUTHOR,58986,
-HID_SC_SORT_COMMENT,58988,
-HID_SC_SORT_DATE,58987,
 HID_SC_TOOLBOX_DRAW,58940,
 HID_SC_TOOLBOX_DRTEXT,58941,
 HID_SC_WIN_GRIDWIN,58818,
@@ -2855,7 +2850,6 @@ HID_SORT_ACTION,53050,
 HID_SORT_AUTHOR,53051,
 HID_SORT_COMMENT,53053,
 HID_SORT_DATE,53052,
-HID_SORT_POSITION,58989,
 HID_SOURCEVIEW,52825,
 HID_SOURCE_EDITWIN,52836,
 HID_SPELLCHECK,33822,
diff --git a/source/text/shared/01/02230401.xhp 
b/source/text/shared/01/02230401.xhp
index a989f5f..75f0246 100644
--- a/source/text/shared/01/02230401.xhp
+++ b/source/text/shared/01/02230401.xhp
@@ -94,25 +94,25 @@
 Lists the changes that 
were recorded in the document. When you select an entry in the list, the change 
is highlighted in the document. To sort the list, click a column heading. 
 Hold down CommandCtrl
 while you click to select multiple entries in the list.
 To edit the comment for an entry in the list, right-click the entry, 
and then choose Edit - Comment.
 After you accept or reject a change, the entries of the list are 
re-ordered according to "Accepted" or "Rejected" status.
-
+
 Action
-Lists the changes that were made in 
the document.
+Lists the 
changes that were made in the document.
 Position 
 
 Lists the 
cells with contents that were changed. 
 
-
+
 Author
-  Lists the user who made the 
change.
-
+  Lists the user 
who made the change.
+
 Date
-  Lists the date and time that the 
change was made.
-
+  Lists the date 
and time that the change was made.
+
 Comment
-  Lists the comments that are 
attached to the change.
+  Lists the 
comments that are attached to the change.
 
 
 
   There are additional commands in the context menu of 
the list:
 
-
+
 Edit comment
-  Edit the comment for the 
selected change.
+  Edit the comment 
for the selected change.
   Sort
   Sorts the list according to the column headings.
@@ -166,9 +166,9 @@
 Comment
   Sorts the list according to the 
comments that are attached to the changes.
-
+
 Document Position
-  Sorts the list in a descending order 
according to the position of the changes in the document. This is the default 
sorting method.
+  Sorts the 
list in a descending order according to the position of the changes in the 
document. This is the default sorting method.

 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |1 -
 source/text/sbasic/shared/01050300.xhp |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7fd043d303a6e19088260e76748a431be9b8abf9
Author: Caolán McNamara 
Date:   Mon Jan 30 16:02:43 2017 +

update helpids for .ui conversion

Change-Id: I88db8390a188e3d6b60dead17428826eb36a0232

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 5449b0f..b606081 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -785,7 +785,6 @@ HID_BACKGROUND_CTL_BGDCOLORSET,33868,
 HID_BACKGROUND_CTL_POSITION,33871,
 HID_BACKINGWINDOW,40368,
 HID_BASICIDE_BREAKPOINTWINDOW,63564,
-HID_BASICIDE_BRKDLG,63556,
 HID_BASICIDE_DIALOGWINDOW,63562,
 HID_BASICIDE_EDITORWINDOW,63563,
 HID_BASICIDE_MODULWINDOW,63561,
diff --git a/source/text/sbasic/shared/01050300.xhp 
b/source/text/sbasic/shared/01050300.xhp
index e9b6911..2dacbc1 100644
--- a/source/text/sbasic/shared/01050300.xhp
+++ b/source/text/sbasic/shared/01050300.xhp
@@ -31,7 +31,7 @@
 
 
 
-
+
 
 
 Manage Breakpoints
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |2 --
 source/text/sbasic/shared/01050300.xhp |4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 26ed1b1d98c0f0e7f6e94f67eb08871001efeff3
Author: Caolán McNamara 
Date:   Mon Jan 30 15:52:15 2017 +

update helpids for .ui conversion

Change-Id: I685964b0b111eaa548bba3b880bcbac9cd84a217

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index be4da1f..5449b0f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -784,10 +784,8 @@ HID_BACKGROUND,33784,
 HID_BACKGROUND_CTL_BGDCOLORSET,33868,
 HID_BACKGROUND_CTL_POSITION,33871,
 HID_BACKINGWINDOW,40368,
-HID_BASICIDE_ACTIV,63557,
 HID_BASICIDE_BREAKPOINTWINDOW,63564,
 HID_BASICIDE_BRKDLG,63556,
-HID_BASICIDE_BRKPROPS,63558,
 HID_BASICIDE_DIALOGWINDOW,63562,
 HID_BASICIDE_EDITORWINDOW,63563,
 HID_BASICIDE_MODULWINDOW,63561,
diff --git a/source/text/sbasic/shared/01050300.xhp 
b/source/text/sbasic/shared/01050300.xhp
index e504199..e9b6911 100644
--- a/source/text/sbasic/shared/01050300.xhp
+++ b/source/text/sbasic/shared/01050300.xhp
@@ -32,7 +32,7 @@
 
 
 
-
+
 
 Manage Breakpoints
 Specifies 
the options for breakpoints.
@@ -41,7 +41,7 @@
 Breakpoints
 Enter the 
line number for a new breakpoint, then click 
New.
 
-
+
 Active
 Activates 
or deactivates the current breakpoint.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 helpers/help_hid.lst|1 -
 source/text/shared/autopi/0110.xhp  |4 ++--
 source/text/shared/explorer/database/menuinsert.xhp |1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 4f39d66542067430093d3887a83bde67d838e20b
Author: Maxim Monastirsky 
Date:   Thu Oct 27 11:51:19 2016 +0300

Update after recent dbaccess HID removal

Change-Id: Ifbbfaf592aca44eb2a2a83e9afef3427aef364b8

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e8c072b..be4da1f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1250,7 +1250,6 @@ HID_DLG_NAME,33818,
 HID_DLG_PASSWD_SECTION,53440,
 HID_DLG_WORDCOUNT,54987,
 HID_DOCINFO_EDT,33070,
-HID_DOCUMENT_CREATE_REPWIZ,38995,
 HID_DRAW_TEXT_TOOLBOX,54835,
 HID_DRAW_TOOLBOX,54832,
 HID_DSADMIN_BOOLEANCOMPARISON,39017,
diff --git a/source/text/shared/autopi/0110.xhp 
b/source/text/shared/autopi/0110.xhp
index 411cde7..7ff349d 100644
--- a/source/text/shared/autopi/0110.xhp
+++ b/source/text/shared/autopi/0110.xhp
@@ -27,9 +27,9 @@
 
 
 
-
+
 Report Wizard
-Activates the wizard for creating 
reports.
+Activates the wizard for 
creating reports.
 
 
 
diff --git a/source/text/shared/explorer/database/menuinsert.xhp 
b/source/text/shared/explorer/database/menuinsert.xhp
index a34e51e..0b3abcc 100644
--- a/source/text/shared/explorer/database/menuinsert.xhp
+++ b/source/text/shared/explorer/database/menuinsert.xhp
@@ -41,7 +41,6 @@
 Opens a new query in design mode.
 Query (SQL View)
 Opens a new query in SQL mode.
-
 Table Design
 Opens the table design view.
 View Design
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst  |4 
 source/text/scalc/01/0408.xhp |   10 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit a4da1a4e16caf0c413b5a4e4f3e2e7c068fede51
Author: Caolán McNamara 
Date:   Mon Oct 24 13:03:53 2016 +0100

update help ids for function panel .ui conversion

Change-Id: Ie6623190ca919e7e4cf0d76ba94fd67056a09f3e

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 32385d7..6805688 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -30,7 +30,6 @@ FID_FILL_TO_RIGHT,26225,.uno:FillRight
 FID_FILL_TO_TOP,26226,.uno:FillUp
 FID_FILTER_OK,26108,.uno:FilterExecute
 FID_FOCUS_POSWND,26645,.uno:FocusCellAddress
-FID_FUNCTION_BOX,26248,.uno:FunctionBox
 FID_HARD_RECALC,26318,.uno:CalculateHard
 FID_INPUTLINE_BLOCK,26129,.uno:InputLineBlock
 FID_INPUTLINE_ENTER,26101,.uno:InputLineEnter
@@ -4879,10 +4878,7 @@ sc_CheckBox_RID_SCPAGE_CALC_BTN_REGEX,957252628,
 sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575,
 sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637,
 sc_FloatingWindow_RID_SCDLG_TEAM,231304704,
-sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481,
 sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304,
-sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289,
-sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
diff --git a/source/text/scalc/01/0408.xhp 
b/source/text/scalc/01/0408.xhp
index 7b46e44..36aa5b7 100644
--- a/source/text/scalc/01/0408.xhp
+++ b/source/text/scalc/01/0408.xhp
@@ -42,15 +42,15 @@
 
 
 The 
Function List window is a resizable dockable 
window. Use it to quickly enter functions in the spreadsheet. By 
double-clicking an entry in the functions list, the respective function is 
directly inserted with all parameters.
-
+
 
 Category List
 
-
+
 
 Function List
-Displays the available 
functions. When you select a function, the area below the list box 
displays a short description. To insert the selected function double-click it 
or click the Insert Function into calculation sheet 
icon.
-
+Displays the available 
functions. When you select a function, the area below the list box 
displays a short description. To insert the selected function double-click it 
or click the Insert Function into calculation sheet 
icon.
+
 
 Insert 
Function into calculation sheet
 
@@ -60,7 +60,7 @@
Icon
 
 
-  Inserts the selected function 
into the document.
+  Inserts the selected function into 
the document.
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst |   12 
 source/text/simpress/01/0211.xhp |   35 +--
 2 files changed, 17 insertions(+), 30 deletions(-)

New commits:
commit 50bab958d34bf90c4b345dbf2b66050fc58538fd
Author: Caolán McNamara 
Date:   Wed Oct 12 10:08:31 2016 +0100

update help ids for impress/draw navigator ui conversion

Change-Id: Id0827a67d46232f519726e5851b8bfdd02880e0c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e9a1dac..b46370f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2595,17 +2595,6 @@ HID_SD_HTMLEXPORT_PAGE6,59878,
 HID_SD_NAMEDIALOG_LINEEND,59898,
 HID_SD_NAMEDIALOG_OBJECT,59896,
 HID_SD_NAMEDIALOG_PAGE,59897,
-HID_SD_NAVIGATOR,59794,
-HID_SD_NAVIGATOR_LB,59799,
-HID_SD_NAVIGATOR_TBI_DRAGTYPE,59806,
-HID_SD_NAVIGATOR_TBI_FIRST,59802,
-HID_SD_NAVIGATOR_TBI_LAST,59805,
-HID_SD_NAVIGATOR_TBI_NEXT,59804,
-HID_SD_NAVIGATOR_TBI_PEN,59801,
-HID_SD_NAVIGATOR_TBI_PREV,59803,
-HID_SD_NAVIGATOR_TBI_SHAPE_FILTER,59807,
-HID_SD_NAVIGATOR_TBX,59798,
-HID_SD_NAVIGATOR_TLB,59793,
 HID_SD_OPTIONS_LAYOUT,59788,
 HID_SD_OPTIONS_SNAP,59769,
 HID_SD_RECENT_MASTERS,59907,
@@ -2627,7 +2616,6 @@ HID_SD_TASK_PANE_VIEW_MENU,59941,
 HID_SD_TEXT_TOOLBOX,59817,
 HID_SD_UNDODELETEWARNING_CBX,59894,
 HID_SD_UNDODELETEWARNING_DLG,59893,
-HID_SD_WIN_DOCUMENT,59787,
 HID_SD_WIN_PRESENTATION,59836,
 HID_SECTION_FTNENDNOTES_PAGE,53249,
 HID_SELECTTABLES,59000,
diff --git a/source/text/simpress/01/0211.xhp 
b/source/text/simpress/01/0211.xhp
index 871d4d9..caa1272 100644
--- a/source/text/simpress/01/0211.xhp
+++ b/source/text/simpress/01/0211.xhp
@@ -34,9 +34,8 @@
 presentations; navigating
 
 
-
-Navigator
-Opens the Navigator, where you can 
quickly jump to other slides or move between open files.
+Navigator
+Opens 
the Navigator, where you can quickly jump to other slides or move between open 
files.
 
 You can dock the Navigator to the edge of your workspace.
 
@@ -57,8 +56,8 @@
 
 
 
-First Slide
-Jumps to the first slide in 
the slide show.
+First Slide
+Jumps to the 
first slide in the slide show.
 
 
 
@@ -71,8 +70,8 @@
 
 
 
-Previous Slide
-Moves back one slide in the 
slide show.
+Previous Slide
+Moves back 
one slide in the slide show.
 
 
 
@@ -85,8 +84,8 @@
 
 
 
-Next Slide
-Move forward one slide in 
the slide show.
+Next Slide
+Move forward 
one slide in the slide show.
 
 
 
@@ -99,8 +98,8 @@
 
 
 
-Last Slide
-Jumps to the last slide in 
the slide show.
+Last Slide
+Jumps to the 
last slide in the slide show.
 
 
 
@@ -113,8 +112,8 @@
 
 
 
-Drag Mode
-Drag and drop slides and 
named objects into the active slide. You can only insert slides and 
named objects from a saved file. You can only insert named objects as 
copies.
+Drag Mode
+Drag and 
drop slides and named objects into the active slide. You can only 
insert slides and named objects from a saved file. You can only insert named 
objects as copies.
 
 
 
@@ -153,11 +152,11 @@
 Inserts slides as a link into 
the active slide.
 Insert as copy
 Inserts a copy of a slide or named object into the active 
slide.
-Show Shapes
+Show Shapes
 In the submenu you can choose to display a list of 
all shapes or only the named shapes. Use drag-and-drop in the list to reorder 
the shapes. When you set the focus to a slide and press the Tab key, the next shape in the defined order is 
selected.
-Existing Slides
-Lists available slides. 
Double-click a slide to make it the active slide.
-Open Documents
-Lists available $[officename] 
files. Select a file to display the contents you can insert.
+Existing Slides
+Lists 
available slides. Double-click a slide to make it the active 
slide.
+Open Documents
+Lists 
available $[officename] files. Select a file to display the contents 
you can insert.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst|   26 ---
 source/text/shared/01/0211.xhp  |   18 +-
 source/text/swriter/01/0211.xhp |   59 ++--
 3 files changed, 39 insertions(+), 64 deletions(-)

New commits:
commit b223bd2e0ccf3c09d69b0cbf4da063f15ca453ef
Author: Caolán McNamara 
Date:   Tue Oct 11 11:33:41 2016 +0100

update helpids for writer navigator .ui conversion

Change-Id: Ib25355ffe0d58a50eaad7e5aaeb1d10efc101404

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2168ac7..f25231d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2017,36 +2017,10 @@ HID_NAVIGATOR_LISTBOX,52978,
 HID_NAVIGATOR_TOOLBOX,52977,
 HID_NAVIGATOR_TREELIST,52974,
 HID_NAVIGATOR_WINDOW,33154,
-HID_NAVI_CONTENT,53044,
 HID_NAVI_DRAG_COPY,52831,
 HID_NAVI_DRAG_HYP,52829,
 HID_NAVI_DRAG_LINK,52830,
-HID_NAVI_GLOBAL,53045,
 HID_NAVI_OUTLINES,52832,
-HID_NAVI_TBX1,52987,
-HID_NAVI_TBX10,52996,
-HID_NAVI_TBX11,52997,
-HID_NAVI_TBX12,52998,
-HID_NAVI_TBX13,52999,
-HID_NAVI_TBX14,53000,
-HID_NAVI_TBX15,53001,
-HID_NAVI_TBX16,53005,
-HID_NAVI_TBX17,53011,
-HID_NAVI_TBX18,53012,
-HID_NAVI_TBX19,53013,
-HID_NAVI_TBX2,52988,
-HID_NAVI_TBX20,53014,
-HID_NAVI_TBX21,53015,
-HID_NAVI_TBX22,53016,
-HID_NAVI_TBX23,53017,
-HID_NAVI_TBX24,53018,
-HID_NAVI_TBX3,52989,
-HID_NAVI_TBX4,52990,
-HID_NAVI_TBX5,52991,
-HID_NAVI_TBX6,52992,
-HID_NAVI_TBX7,52993,
-HID_NAVI_TBX8,52994,
-HID_NAVI_TBX9,52995,
 HID_NAVI_VS,53002,
 HID_NID_BKM,55007,
 HID_NID_CTRL,55004,
diff --git a/source/text/shared/01/0211.xhp 
b/source/text/shared/01/0211.xhp
index 0ea745b..2ef8f03 100644
--- a/source/text/shared/01/0211.xhp
+++ b/source/text/shared/01/0211.xhp
@@ -48,7 +48,7 @@
  
   
 
-
+
 
 Edit
   Edit the contents of the component 
selected in the Navigator list. If the selection is a file, the file is opened 
for editing. If the selection is an index, the index dialog is 
opened.
@@ -65,7 +65,7 @@
  
   
 
-
+
 
 Update
@@ -103,7 +103,7 @@
 Edit link
   This command is found by right-clicking an inserted file in the 
Navigator.Changes the link properties for 
the selected file.
-
+
 
 Insert
@@ -138,10 +138,10 @@
 Text
   Inserts a new 
paragraph in the master document where you can enter text. You cannot insert 
text next to an existing text entry in the 
Navigator.i81372
-
+
 Save Contents as well
-  Saves a copy of the contents of the 
linked files in the master document. This ensures that the current contents are 
available when the linked files cannot be accessed.
+  Saves a copy of 
the contents of the linked files in the master document. This ensures that the 
current contents are available when the linked files cannot be 
accessed.
   
  
 
@@ -155,10 +155,10 @@
  
   
 
-
+
 Move Down
-  Moves the selection down one position 
in the Navigator list. You can also move entries by dragging and 
dropping them in the list. If you move a text section onto another text 
section, the text sections are merged.
+  Moves the 
selection down one position in the Navigator list. You can also move 
entries by dragging and dropping them in the list. If you move a text section 
onto another text section, the text sections are merged.
   
  
 
@@ -172,10 +172,10 @@
  
   
 
-
+
 Move Up
-  Moves the selection up one position in 
the Navigator list. You can also move entries by dragging and dropping 
them in the list. If you move a text section onto another text section, the 
text sections are merged.
+  Moves the 
selection up one position in the Navigator list. You can also move 
entries by dragging and dropping them in the list. If you move a text section 
onto another text section, the text sections are merged.
   
  
 
diff --git a/source/text/swriter/01/0211.xhp 
b/source/text/swriter/01/0211.xhp
index be2fca6..c452b7e 100644
--- a/source/text/swriter/01/0211.xhp
+++ b/source/text/swriter/01/0211.xhp
@@ -39,7 +39,8 @@
 Click the plus sign (+) next to a category in the Navigator to view 
the items in the category. To view the number of items in a category, rest your 
mouse pointer over the category in the Navigator. To jump to an item in the 
document, double-click the item in the Navigator.
 To jump to the next or previous item in a document, click the Navigation icon to 
open the Navigation toolbar, click the item category, and then click the up or 
down arrows.
 A hidden section in a document appears gray in the Navigator, and 
displays the text "hidden" when you rest the mouse pointer over it. The same 
applies to header and footer contents of Page Styles that are not used in a 
document, and hidden contents in tables, text frames, graphics, OLE objects, 
and indexes.
-
+
+
 Toggle Master View
 Switches between master view and 
normal view if a master document is 

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

[Caolán McNamara]

 helpers/help_hid.lst  |   13 ---
 source/text/scalc/01/0211.xhp |   44 +++---
 2 files changed, 22 insertions(+), 35 deletions(-)

New commits:
commit 1b422723b57ca4bd856ab5eab9e9dd7767888a2c
Author: Caolán McNamara 
Date:   Fri Oct 7 17:42:39 2016 +0100

update help ids for calc navigator .ui conversion

Change-Id: I9d71a91bc1c9fbef6c4bd92c10d46f59090c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a619604..477ead6 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2551,19 +2551,6 @@ HID_SC_HF_DATE,58906,
 HID_SC_HF_PAGES,58905,
 HID_SC_HF_TIME,58907,
 HID_SC_INPUTWIN,58912,
-HID_SC_NAVIGATOR,58895,
-HID_SC_NAVIPI_COL,58855,
-HID_SC_NAVIPI_DATA,58857,
-HID_SC_NAVIPI_DOC,58856,
-HID_SC_NAVIPI_DOWN,58859,
-HID_SC_NAVIPI_DROP,58863,
-HID_SC_NAVIPI_ENTRIES,58853,
-HID_SC_NAVIPI_ROOT,58861,
-HID_SC_NAVIPI_ROW,58854,
-HID_SC_NAVIPI_SCEN,58862,
-HID_SC_NAVIPI_TOOLBOX,58867,
-HID_SC_NAVIPI_UP,58858,
-HID_SC_NAVIPI_ZOOM,58860,
 HID_SC_REDLIN_CTR,58934,
 HID_SC_RENAME_AUTOFMT,58943,
 HID_SC_RENAME_NAME,58913,
diff --git a/source/text/scalc/01/0211.xhp 
b/source/text/scalc/01/0211.xhp
index a3db377..dd7c042 100644
--- a/source/text/scalc/01/0211.xhp
+++ b/source/text/scalc/01/0211.xhp
@@ -43,15 +43,15 @@
 
 
 Choose View - Navigator to display the 
Navigator.
-
+
 Column
-Enter the column letter. Press Enter 
to reposition the cell cursor to the specified column in the same 
row.
-
+Enter the column 
letter. Press Enter to reposition the cell cursor to the specified column in 
the same row.
+
 Row
-Enter a row number. Press Enter to 
reposition the cell cursor to the specified row in the same 
column.
-
+Enter a row number. 
Press Enter to reposition the cell cursor to the specified row in the same 
column.
+
 Data Range
-Specifies the current data range 
denoted by the position of the cell cursor.
+Specifies 
the current data range denoted by the position of the cell 
cursor.
 
 
 
@@ -65,9 +65,9 @@
 
 
 
-
+
 Start
-Moves to the cell at the beginning of 
the current data range, which you can highlight using the Data 
Range button.
+Moves to the 
cell at the beginning of the current data range, which you can highlight using 
the Data Range button.
 
 
 
@@ -81,9 +81,9 @@
 
 
 
-
+
 End
-Moves to the cell at the end of the 
current data range, which you can highlight using the Data Range 
button.
+Moves to the cell 
at the end of the current data range, which you can highlight using the 
Data Range button.
 
 
 
@@ -97,9 +97,9 @@
 
 
 
-
+
 Toggle
-Toggles the content view. Only the 
selected Navigator element and its subelements are displayed. Click the 
icon again to restore all elements for viewing.
+Toggles the 
content view. Only the selected Navigator element and its subelements are 
displayed. Click the icon again to restore all elements for 
viewing.
 
 
 
@@ -113,9 +113,9 @@
 
 
 
-
+
 Contents
-Allows you to hide/show the 
contents.
+Allows you to 
hide/show the contents.
 
 
 
@@ -129,9 +129,9 @@
 
 
 
-
+
 Scenarios
-Displays all available scenarios. 
Double-click a name to apply that scenario. The result is shown in the 
sheet. For more information, choose Tools - Scenarios.
+Displays all 
available scenarios. Double-click a name to apply that scenario. The 
result is shown in the sheet. For more information, choose Tools - 
Scenarios.
 
 
 
@@ -152,9 +152,9 @@
 
 Properties
 Opens the Edit scenario dialog, where you can 
edit the scenario properties.
-
+
 Drag Mode
-Opens a submenu for selecting the 
drag mode. You decide which action is performed when dragging and dropping an 
object from the Navigator into a document. Depending on the mode you select, 
the icon indicates whether a hyperlink, link or a copy is 
created.
+Opens a 
submenu for selecting the drag mode. You decide which action is performed when 
dragging and dropping an object from the Navigator into a document. Depending 
on the mode you select, the icon indicates whether a hyperlink, link or a copy 
is created.
 
 
 
@@ -178,11 +178,11 @@
 
 Insert as Copy
 Generates a copy when you 
drag-and-drop an object from the Navigator into a document.
-
+
 Objects
-Displays all objects in your 
document.
-
+Displays 
all objects in your document.
+
 Documents
-Displays the names of all open 
documents. To switch to another open document in the Navigator, click 
the document name. The status (active, inactive) of the document is shown in 
brackets after the name. You can switch the active document in the 
Window menu.
+Displays the 
names of all open documents. To switch to another open document in the 
Navigator, click the document name. The status (active, inactive) of the 
document is shown in brackets after the name. You can switch the active 
document in the Window menu.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

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

[Caolán McNamara]

 helpers/help_hid.lst   |6 --
 source/text/shared/01/0225.xhp |6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 7d13cf69810e9a6ea8ab42bbf943d9a708e66fc6
Author: Caolán McNamara 
Date:   Tue Mar 8 16:22:31 2016 +

update help ids for bibliography toolbar conversion

Change-Id: I3059a98f6ad79f413395550bc1a270a5396decf3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1efefc1..650f3ad 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -826,7 +826,6 @@ HID_BIB_AUTHORITYTYPE_POS,34775,
 HID_BIB_AUTHOR_POS,34776,
 HID_BIB_BASE,52769,
 HID_BIB_BOOKTITLE_POS,34780,
-HID_BIB_CHANGESOURCE,34769,
 HID_BIB_CHAPTER_POS,34781,
 HID_BIB_CUSTOM1_POS,34800,
 HID_BIB_CUSTOM2_POS,34801,
@@ -834,7 +833,6 @@ HID_BIB_CUSTOM3_POS,34802,
 HID_BIB_CUSTOM4_POS,34803,
 HID_BIB_CUSTOM5_POS,34804,
 HID_BIB_DB_GRIDCTRL,34806,
-HID_BIB_DB_TBX,34805,
 HID_BIB_EDITION_POS,34782,
 HID_BIB_EDITOR_POS,34783,
 HID_BIB_HOWPUBLISHED_POS,34784,
@@ -842,7 +840,6 @@ HID_BIB_IDENTIFIER_POS,34774,
 HID_BIB_INSTITUTION_POS,34785,
 HID_BIB_ISBN_POS,34779,
 HID_BIB_JOURNAL_POS,34786,
-HID_BIB_MAPPINGDLG,34770,
 HID_BIB_MONTH_POS,34787,
 HID_BIB_NOTE_POS,34788,
 HID_BIB_NUMBER_POS,34790,
@@ -852,9 +849,6 @@ HID_BIB_PUBLISHER_POS,34793,
 HID_BIB_REPORTTYPE_POS,34797,
 HID_BIB_SCHOOL_POS,34795,
 HID_BIB_SERIES_POS,34796,
-HID_BIB_TBX_AUTOFILTER,34773,
-HID_BIB_TBX_SEARCH,34772,
-HID_BIB_TBX_TABLE,34771,
 HID_BIB_TITLE_POS,34777,
 HID_BIB_URL_POS,34799,
 HID_BIB_VOLUME_POS,34798,
diff --git a/source/text/shared/01/0225.xhp 
b/source/text/shared/01/0225.xhp
index 0425a0d..fe85275 100644
--- a/source/text/shared/01/0225.xhp
+++ b/source/text/shared/01/0225.xhp
@@ -30,10 +30,10 @@
   
 
 
-
+
 Bibliography Database
   
-  Insert, 
delete, edit, and organize records in the bibliography database.
+  Insert, delete, edit, 
and organize records in the bibliography database.
 
   
  
@@ -112,7 +112,7 @@
  oldref="38">Data Source
   Select the data source for the 
bibliography database.
 
-
+
 
 Column Arrangement
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |   32 --
 source/text/shared/01/0528.xhp |   82 ++---
 2 files changed, 41 insertions(+), 73 deletions(-)

New commits:
commit a958bc9cd64c9658a021296ebcd85a88b8e50d7f
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Dec 31 11:44:11 2014 +

update help ids for fontwork docking window .ui conversion

Change-Id: Ie82b8bb7a8991e90540071565cd3773480c75145

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 02b6dc2..1efefc1 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1404,21 +1404,6 @@ HID_FM_PROPDLG_TAB_DATA,38175,
 HID_FM_PROPDLG_TAB_EVT,38176,
 HID_FM_PROPDLG_TAB_GENERAL,38174,
 HID_FONTWORK_CTL_FORMS,33879,
-HID_FONTWORK_TBI_ADJUST_AUTOSIZE,33910,
-HID_FONTWORK_TBI_ADJUST_CENTER,33908,
-HID_FONTWORK_TBI_ADJUST_LEFT,33907,
-HID_FONTWORK_TBI_ADJUST_MIRROR,33906,
-HID_FONTWORK_TBI_ADJUST_RIGHT,33909,
-HID_FONTWORK_TBI_OUTLINE,33912,
-HID_FONTWORK_TBI_SHADOW_NORMAL,33914,
-HID_FONTWORK_TBI_SHADOW_OFF,33913,
-HID_FONTWORK_TBI_SHADOW_SLANT,33915,
-HID_FONTWORK_TBI_SHOWFORM,33911,
-HID_FONTWORK_TBI_STYLE_OFF,33901,
-HID_FONTWORK_TBI_STYLE_ROTATE,33902,
-HID_FONTWORK_TBI_STYLE_SLANTX,33904,
-HID_FONTWORK_TBI_STYLE_SLANTY,33905,
-HID_FONTWORK_TBI_STYLE_UPRIGHT,33903,
 HID_FOOTNOTE_OPTIONS,53215,
 HID_FOOTNOTE_PAGE,53175,
 HID_FORMAT_COLUMN,52789,
@@ -3904,7 +3889,6 @@ SID_FOCUS_INPUTLINE,26089,.uno:FocusInputLine
 SID_FONT,30306,
 SID_FONTNAMELIST,11066,
 SID_FONTSIZE,30307,
-SID_FONTWORK,10256,.uno:FontWork
 SID_FONTWORK_ALIGNMENT,10984,.uno:FontworkAlignment
 SID_FONTWORK_ALIGNMENT_FLOATER,10981,.uno:FontworkAlignmentFloater
 SID_FONTWORK_CHARACTER_SPACING,10985,.uno:FontworkCharacterSpacing
@@ -3920,18 +3904,7 @@ SID_FORMATMENUSTATE,5791,.uno:FormatMenuState
 SID_FORMATPAGE,26295,.uno:PageFormatDialog
 SID_FORMATPAINTBRUSH,5715,.uno:PersistentCopy
 SID_FORMAT_TABLE_DLG,11083,
-SID_FORMTEXT_ADJUST,10258,.uno:FontWorkTextAdjust
-SID_FORMTEXT_DISTANCE,10259,.uno:FontWorkTextDistance
 SID_FORMTEXT_HIDEFORM,10268,.uno:FormatFontWorkClose
-SID_FORMTEXT_MIRROR,10261,.uno:FontWorkTextMirror
-SID_FORMTEXT_OUTLINE,10262,.uno:FontWorkTextOutline
-SID_FORMTEXT_SHADOW,10263,.uno:FontWorkTextShadow
-SID_FORMTEXT_SHDWCOLOR,10264,.uno:FontWorkTextShadowColor
-SID_FORMTEXT_SHDWXVAL,10265,.uno:FontWorkTextShadowXVal
-SID_FORMTEXT_SHDWYVAL,10266,.uno:FontWorkTextShadowYVal
-SID_FORMTEXT_START,10260,.uno:FontWorkTextStart
-SID_FORMTEXT_STDFORM,10267,.uno:FontWorkTextClearAttributes
-SID_FORMTEXT_STYLE,10257,.uno:FontWorkTextStyle
 SID_FORMULACURSOR,30271,
 SID_FORM_CREATE_REPWIZ_PRE_SEL,12301,
 SID_FRAMECOUNT,6510,.uno:FrameCount
@@ -5212,7 +5185,6 @@ 
svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_VERT,1238295052,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_BIND,1368919573,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_METHOD,1368919568,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_REPLACE,1368919575,
-svx_ListBox_RID_SVXDLG_FONTWORK_CLB_SHADOW_COLOR,3386592769,
 svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103,
 svx_ListBox_RID_SVXDLG_RUBY_LB_CHAR_STYLE,2315374083,
 svx_ListBox_RID_SVXDLG_RUBY_LB_POSITION,2315374105,
@@ -5243,10 +5215,6 @@ svx_ListBox_RID_SVXPAGE_SHADOW_LB_SHADOW_COLOR,701713930,
 svx_ListBox_RID_SVXPAGE_STD_PARAGRAPH_LB_LINEDIST,700812840,
 svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT,701009435,
 svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME,701009432,
-svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_DISTANCE,3386595841,
-svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_X,3386595843,
-svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_Y,3386595844,
-svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_TEXTSTART,3386595842,
 svx_MetricField_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS,700733988,
 svx_MetricField_RID_SVXPAGE_BACKGROUND_MF_GRAPH_TRANS,700733990,
 svx_MetricField_RID_SVXPAGE_BORDER_ED_SHADOWSIZE,700799522,
diff --git a/source/text/shared/01/0528.xhp 
b/source/text/shared/01/0528.xhp
index e6373e5..7d737d5 100644
--- a/source/text/shared/01/0528.xhp
+++ b/source/text/shared/01/0528.xhp
@@ -34,7 +34,7 @@ UFI: exclude from indexing/lastedited
 body
 section id=fontwork
 bookmark xml-lang=en-US branch=hid/.uno:FontWork id=bm_id8473091 
localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:FontWork id=bm_id3155620 
localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/dockingfontwork/DockingFontwork 
id=bm_id3155620 localize=false/
 paragraph role=heading id=hd_id3146959 xml-lang=en-US level=1 
l10n=U oldref=51variable id=fntwrklink 
href=text/shared/01/0528.xhp name=FontWorkFontwork Dialog (Previous 
Version)/link/variable/paragraph
 paragraph role=paragraph id=par_id3151097 xml-lang=en-US l10n=CHG 
oldref=52ahelp hid=.uno:FontWorkEdits Fontwork effects of the selected 
object that has been created with the previous Fontwork 
dialog./ahelpcommentUFI: this old dialog is still available to edit old 
docs containing old Fontwork objects. 

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

[Caolán McNamara]

 helpers/help_hid.lst   |   67 -
 source/text/shared/01/0535.xhp |2 -
 source/text/shared/01/05350200.xhp |   52 ++--
 source/text/shared/01/05350300.xhp |   24 ++---
 source/text/shared/01/05350400.xhp |   34 +-
 source/text/shared/01/05350500.xhp |   48 +-
 source/text/shared/01/05350600.xhp |   30 
 7 files changed, 95 insertions(+), 162 deletions(-)

New commits:
commit 45bd6c6e23810a5778b23b3bf1c2f30e37d0021c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Dec 30 11:46:34 2014 +

update help ids for docking 3d effects .ui conversion

Change-Id: I1c65497e38a0fae848127ae022a7121bf2613708

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index dbdeae4..02b6dc2 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3116,7 +3116,6 @@ SID_3D_SPHERE,27297,.uno:Sphere
 SID_3D_STATE,10645,.uno:State3D
 SID_3D_TORUS,27312,.uno:Torus
 SID_3D_VIEW,30527,
-SID_3D_WIN,10644,.uno:Window3D
 SID_ABOUT,5301,.uno:About
 SID_ACTIVATE,5525,.uno:Activate
 SID_ACTIVATE_STYLE_APPLY,6715,
@@ -5194,48 +5193,6 @@ 
svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_LIGHTING,1790656512,
 svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_SURFACE,1790672896,
 svx_FloatingWindow_RID_SVXFLOAT_FONTWORK_ALIGNMENT,1790869504,
 svx_FloatingWindow_RID_SVXFLOAT_FONTWORK_CHARSPACING,1790885888,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_AMBIENT_COLOR,3388501583,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_ASSIGN,3388501512,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_CHANGE_TO_3D,3388501514,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_DOUBLE_SIDED,3388501548,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_EMISSION_COLOR,3388501621,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_GEO,3388501506,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_LATHE_OBJ,3388501515,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_LIGHT,3388501508,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_LIGHT_1,3388501564,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_LIGHT_2,3388501565,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_LIGHT_3,3388501566,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_LIGHT_4,3388501567,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_LIGHT_5,3388501568,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_LIGHT_6,3388501569,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_LIGHT_7,3388501570,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_LIGHT_8,3388501571,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_LIGHT_COLOR,3388501580,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_MATERIAL,3388501510,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_MAT_COLOR,3388501618,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_NORMALS_FLAT,3388501543,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_NORMALS_INVERT,3388501546,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_NORMALS_OBJ,3388501542,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_NORMALS_SPHERE,3388501544,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_PERSPECTIVE,3388501513,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_REPRESENTATION,3388501507,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_SHADOW_3D,3388501551,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_SPECULAR_COLOR,3388501624,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEXTURE,3388501509,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_BLEND,3388501600,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_CIRCLE_X,3388501603,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_CIRCLE_Y,3388501607,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_COLOR,3388501596,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_FILTER,3388501610,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_LUMINANCE,3388501595,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_MODULATE,3388501599,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_OBJECT_X,3388501604,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_OBJECT_Y,3388501608,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_PARALLEL_X,3388501602,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_PARALLEL_Y,3388501606,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TEX_REPLACE,3388501598,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_TWO_SIDED_LIGHTING,3388501545,
-svx_ImageButton_RID_SVXFLOAT_3D_BTN_UPDATE,3388501511,
 svx_ImageButton_RID_SVXPAGE_BITMAP_BTN_LOAD,701672965,
 svx_ImageButton_RID_SVXPAGE_BITMAP_BTN_SAVE,701672966,
 svx_ImageButton_RID_SVXPAGE_HYPERLINK_DOCUMENT_BTN_BROWSE,704491020,
@@ -5259,20 +5216,6 @@ 
svx_ListBox_RID_SVXDLG_FONTWORK_CLB_SHADOW_COLOR,3386592769,
 svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103,
 svx_ListBox_RID_SVXDLG_RUBY_LB_CHAR_STYLE,2315374083,
 svx_ListBox_RID_SVXDLG_RUBY_LB_POSITION,2315374105,
-svx_ListBox_RID_SVXFLOAT_3D_LB_AMBIENTLIGHT,3388493390,
-svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_1,3388493380,
-svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_2,3388493381,
-svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_3,3388493382,
-svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_4,3388493383,
-svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_5,3388493384,
-svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_6,3388493385,
-svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_7,3388493386,
-svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_8,3388493387,
-svx_ListBox_RID_SVXFLOAT_3D_LB_MAT_COLOR,3388493425,
-svx_ListBox_RID_SVXFLOAT_3D_LB_MAT_EMISSION,3388493428,

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

[Caolán McNamara]

 helpers/help_hid.lst   |   19 --
 source/text/shared/01/0603.xhp |   47 ++---
 2 files changed, 24 insertions(+), 42 deletions(-)

New commits:
commit 908b90852c513400669814a73b64245a0702ec21
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 18 13:19:51 2014 +

update help ids for docking color replace window .ui conversion

Change-Id: Ib5c095382573ee7b83465d53075857d6403b1d84

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e4b843b..ea42701 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -859,9 +859,6 @@ HID_BIB_TITLE_POS,34777,
 HID_BIB_URL_POS,34799,
 HID_BIB_VOLUME_POS,34798,
 HID_BIB_YEAR_POS,34778,
-HID_BMPMASK_CTL_PIPETTE,33873,
-HID_BMPMASK_CTL_QCOL_1,33872,
-HID_BMPMASK_TBI_PIPETTE,33898,
 HID_BORDER,33783,
 HID_BORDER_CTL_PRESETS,33874,
 HID_BORDER_CTL_SHADOWS,33875,
@@ -3377,7 +3374,6 @@ SID_BEZIER_MOVE,10121,.uno:BezierMove
 SID_BEZIER_SMOOTH,10123,.uno:BezierSmooth
 SID_BEZIER_SYMMTR,27067,.uno:BezierSymmetric
 SID_BITMAP_LIST,10182,.uno:BitmapListState
-SID_BMPMASK,10350,.uno:BmpMask
 SID_BMPMASK_EXEC,10353,.uno:BmpMaskExec
 SID_BMPMASK_PIPETTE,10351,.uno:BmpMaskPipette
 SID_BORDER_OBJECT,10340,.uno:Border
@@ -5119,11 +5115,6 @@ 
svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINHEIGHTDEFAULT,1598211094,
 svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINWIDTHDEFAULT,1598211093,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709,
-svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_1,339194,
-svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_2,3391947780,
-svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_3,3391947779,
-svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_4,3391947778,
-svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_TRANS,3391947781,
 svx_CheckBox_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE_CB_JSCPT_DISABLE,1241269470,
 svx_CheckBox_RID_SVXDLG_RUBY_CB_AUTO_DETECT,2315371521,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_EXPAND,703775795,
@@ -5267,11 +5258,6 @@ 
svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_VERT,1238295052,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_BIND,1368919573,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_METHOD,1368919568,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_REPLACE,1368919575,
-svx_ListBox_RID_SVXDLG_BMPMASK_LB_1,3391950337,
-svx_ListBox_RID_SVXDLG_BMPMASK_LB_2,3391950338,
-svx_ListBox_RID_SVXDLG_BMPMASK_LB_3,3391950339,
-svx_ListBox_RID_SVXDLG_BMPMASK_LB_4,3391950340,
-svx_ListBox_RID_SVXDLG_BMPMASK_LB_TRANS,3391950341,
 svx_ListBox_RID_SVXDLG_FONTWORK_CLB_SHADOW_COLOR,3386592769,
 svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103,
 svx_ListBox_RID_SVXDLG_RUBY_LB_CHAR_STYLE,2315374083,
@@ -5317,10 +5303,6 @@ svx_ListBox_RID_SVXPAGE_SHADOW_LB_SHADOW_COLOR,701713930,
 svx_ListBox_RID_SVXPAGE_STD_PARAGRAPH_LB_LINEDIST,700812840,
 svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT,701009435,
 svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME,701009432,
-svx_MetricField_RID_SVXDLG_BMPMASK_SP_1,3391953410,
-svx_MetricField_RID_SVXDLG_BMPMASK_SP_2,3391953412,
-svx_MetricField_RID_SVXDLG_BMPMASK_SP_3,3391953409,
-svx_MetricField_RID_SVXDLG_BMPMASK_SP_4,3391953411,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_DISTANCE,3386595841,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_X,3386595843,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_Y,3386595844,
@@ -5392,7 +5374,6 @@ 
svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT,809013821,
 svx_PushButton_RID_SFXPAGE_PATH_BTN_PATH,733581837,
 svx_PushButton_RID_SFXPAGE_PATH_BTN_STANDARD,733581838,
 svx_PushButton_RID_SVXDLG_ADD_SUBMISSION_PB_SUBMIT_REF,1368920595,
-svx_PushButton_RID_SVXDLG_BMPMASK_BTN_EXEC,3391951361,
 svx_PushButton_RID_SVXDLG_RUBY_PB_CLOSE,2315375112,
 svx_PushButton_RID_SVXDLG_RUBY_PB_STYLIST,2315375108,
 svx_PushButton_RID_SVXPAGE_BACKGROUND_BTN_BROWSE,700731924,
diff --git a/source/text/shared/01/0603.xhp 
b/source/text/shared/01/0603.xhp
index 50815e1..4162738 100644
--- a/source/text/shared/01/0603.xhp
+++ b/source/text/shared/01/0603.xhp
@@ -29,6 +29,7 @@
 body
 section id=pipette
 bookmark xml-lang=en-US branch=hid/.uno:BmpMask id=bm_id3085157 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/svx/ui/dockingcolorreplace/DockingColorReplace id=bm_id3085156 
localize=false/
 paragraph role=heading id=hd_id3156324 xml-lang=en-US level=1 
l10n=CHG oldref=1link href=text/shared/01/0603.xhp name=Color 
ReplacerColor Replacer/link/paragraph
 paragraph role=paragraph id=par_id3145138 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=.uno:BmpMaskOpens the Color Replacer dialog, where you 
can replace colors in bitmap and meta file graphics./ahelp/paragraph
 /section
@@ -55,42 +56,42 @@
 /tablerow
 /table
 
-bookmark xml-lang=en-US branch=hid/SVX_HID_BMPMASK_TBI_PIPETTE 
id=bm_id3155535 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/dockingcolorreplace/pipette 
id=bm_id3155535 localize=false/
 paragraph role=paragraph 

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

[Caolán McNamara]

 helpers/help_hid.lst |   17 
 source/text/simpress/01/0605.xhp |   68 +--
 2 files changed, 34 insertions(+), 51 deletions(-)

New commits:
commit 52ecb7b19fd337cad7809298849909493dff0c56
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Dec 17 12:35:08 2014 +

update helpids for animation docking window .ui conversion

Change-Id: I968c67e7d1b74ecbfee02b37c8d11c13f8c80a37

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 0566315..e4b843b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3152,7 +3152,6 @@ SID_ANCHOR_CELL,26411,.uno:SetAnchorToCell
 SID_ANCHOR_PAGE,26410,.uno:SetAnchorToPage
 SID_ANCHOR_TOGGLE,26412,.uno:ToggleAnchorType
 SID_ANIMATION_EFFECTS,27063,.uno:AnimationEffects
-SID_ANIMATION_OBJECTS,27062,.uno:AnimationObjects
 SID_ANIMATOR_ADD,27110,.uno:AnimatorAddObject
 SID_ANIMATOR_CREATE,27111,.uno:AnimatorCreateObject
 SID_ANIMATOR_INIT,27294,.uno:AnimatorInit
@@ -5012,35 +5011,22 @@ 
sd_DockingWindow_FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW,3234201600,
 sd_DockingWindow_FLT_RIGHT_PANE_DOCKING_WINDOW,3234234368,
 sd_Edit_DLG_ASS_EDT_PAGE4_ASKNAME,1088489495,
 sd_Edit_DLG_ASS_EDT_PAGE4_ASKTOPIC,1088489497,
-sd_ImageButton_FLT_WIN_ANIMATION_BTN_FIRST,3231378945,
-sd_ImageButton_FLT_WIN_ANIMATION_BTN_GET_ALL_OBJECTS,3231378951,
-sd_ImageButton_FLT_WIN_ANIMATION_BTN_GET_ONE_OBJECT,3231378950,
-sd_ImageButton_FLT_WIN_ANIMATION_BTN_LAST,3231378949,
-sd_ImageButton_FLT_WIN_ANIMATION_BTN_PLAY,3231378948,
-sd_ImageButton_FLT_WIN_ANIMATION_BTN_REMOVE_ALL,3231378953,
-sd_ImageButton_FLT_WIN_ANIMATION_BTN_REMOVE_BITMAP,3231378952,
-sd_ImageButton_FLT_WIN_ANIMATION_BTN_REVERSE,3231378946,
-sd_ImageButton_FLT_WIN_ANIMATION_BTN_STOP,3231378947,
 sd_ListBox_DLG_ASS_LB_PAGE2_LAYOUT,1088491041,
 sd_ListBox_DLG_ASS_LB_PAGE3_EFFECT,1088491051,
 sd_ListBox_DLG_ASS_LB_PAGE3_SPEED,1088491053,
 sd_ListBox_DLG_PRINTDIALOG_CB_CONTENT,1104006659,
 sd_ListBox_DLG_PRINTDIALOG_CB_SLIDESPERPAGE,1104006661,
-sd_ListBox_FLT_WIN_ANIMATION_LB_ADJUSTMENT,3231370754,
-sd_ListBox_FLT_WIN_ANIMATION_LB_LOOP_COUNT,3231370755,
 sd_ModalDialog_DLG_CUSTOMANIMATION_SCHEMES_PANE,1415741440,
 sd_ModalDialog_DLG_INSERT_PASTE,1084850176,
 sd_ModalDialog_DLG_PRINTDIALOG,1104003072,
 sd_ModalDialog_DLG_PRINT_WARNINGS,1087307776,
 sd_MultiLineEdit_DLG_ASS_EDT_PAGE4_ASKINFORMATION,1088490011,
-sd_NumericField_FLT_WIN_ANIMATION_NUM_FLD_BITMAP,3231373313,
 sd_PushButton_DLG_ASS_BUT_LAST,1088492035,
 sd_PushButton_DLG_ASS_BUT_NEXT,1088492036,
 sd_PushButton_DLG_ASS_PB_PAGE1_OPEN,1088492049,
 sd_PushButton_DLG_CUSTOMANIMATION_SCHEMES_PANE_1,1415746049,
 sd_PushButton_DLG_CUSTOMANIMATION_SCHEMES_PANE_2,1415746050,
 sd_PushButton_DLG_CUSTOMANIMATION_SCHEMES_PANE_3,1415746051,
-sd_PushButton_FLT_WIN_ANIMATION_BTN_CREATE_GROUP,3231371786,
 sd_RadioButton_DLG_ASS_RB_PAGE1_EMPTY,1088487947,
 sd_RadioButton_DLG_ASS_RB_PAGE1_OPEN,1088487951,
 sd_RadioButton_DLG_ASS_RB_PAGE1_TEMPLATE,1088487948,
@@ -5058,11 +5044,8 @@ sd_RadioButton_DLG_PRINTDIALOG_RBT_VERTICAL,1104003592,
 sd_RadioButton_DLG_PRINT_WARNINGS_RBT_CUT,1087308291,
 sd_RadioButton_DLG_PRINT_WARNINGS_RBT_POSTER,1087308290,
 sd_RadioButton_DLG_PRINT_WARNINGS_RBT_SCALE,1087308289,
-sd_RadioButton_FLT_WIN_ANIMATION_RBT_BITMAP,3231367682,
-sd_RadioButton_FLT_WIN_ANIMATION_RBT_GROUP,3231367681,
 sd_TimeField_DLG_ASS_TMF_PAGE3_BREAK,1088495668,
 sd_TimeField_DLG_ASS_TMF_PAGE3_TIME,1088495666,
-sd_TimeField_FLT_WIN_ANIMATION_TIME_FIELD,3231375361,
 sfx2_CheckBox_RID_WARN_PRINTTRANSPARENCY_CBX_NOPRINTTRANSWARN,1113048129,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO2,1078102023,
diff --git a/source/text/simpress/01/0605.xhp 
b/source/text/simpress/01/0605.xhp
index 5f9123d..fb387e6 100644
--- a/source/text/simpress/01/0605.xhp
+++ b/source/text/simpress/01/0605.xhp
@@ -29,7 +29,7 @@
body
   section id=animation
 bookmark xml-lang=en-US branch=hid/.uno:AnimationObjects 
id=bm_id8175410 localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:AnimationObjects 
id=bm_id3156444 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/dockinganimation/DockingAnimation 
id=bm_id3156444 localize=false/
 paragraph xml-lang=en-US id=hd_id3153726 role=heading level=1 
l10n=U oldref=1link href=text/simpress/01/0605.xhp 
name=AnimationAnimation/link/paragraph
  paragraph xml-lang=en-US id=par_id3150012 role=paragraph 
l10n=U oldref=2variable id=animtextahelp 
hid=.uno:AnimationObjectsCreates a custom animation on the current 
slide./ahelp You can only use existing objects to create an animation. 
 /variable/paragraph
@@ -40,8 +40,8 @@
   paragraph xml-lang=en-US id=par_id3155444 role=tip l10n=U 
oldref=86You can copy and paste animations into item 
type=productname%PRODUCTNAME/item Writer./paragraph
   paragraph xml-lang=en-US id=hd_id3155959 role=heading level=2 
l10n=U oldref=3Animation/paragraph
   

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

[Caolán McNamara]

 helpers/help_hid.lst  |   11 ---
 source/text/smath/01/03090100.xhp |4 ++--
 source/text/smath/01/03090200.xhp |4 ++--
 source/text/smath/01/03090300.xhp |4 ++--
 source/text/smath/01/03090400.xhp |4 ++--
 source/text/smath/01/03090500.xhp |4 ++--
 source/text/smath/01/03090600.xhp |4 ++--
 source/text/smath/01/03090700.xhp |4 ++--
 source/text/smath/01/03090800.xhp |4 ++--
 source/text/smath/01/03091600.xhp |2 +-
 10 files changed, 17 insertions(+), 28 deletions(-)

New commits:
commit 8b3f1eb34638d512b8dbe3e426e28bbf50439e90
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Sep 5 21:05:29 2014 +0100

update help ids for floating elements .ui conversion

Change-Id: I72e92d9e834bc1e380d9ec8df5b5364ba218a544

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2b40431..0566315 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2729,14 +2729,12 @@ HID_SMA_ARCSINX,63142,
 HID_SMA_ARCTANX,63144,
 HID_SMA_ARSINHX,63150,
 HID_SMA_ARTANHX,63152,
-HID_SMA_ATTRIBUTES_CAT,63184,
 HID_SMA_ATTRIBUTES_TBX,63193,
 HID_SMA_ATTRIBUT_DIST,63824,
 HID_SMA_BARX,63205,
 HID_SMA_BINOMXY,63249,
 HID_SMA_BLANK,63247,
 HID_SMA_BOLDX,63220,
-HID_SMA_BRACKETS_CAT,63185,
 HID_SMA_BRACKETS_TBX,63194,
 HID_SMA_BRACKET_DIST,63821,
 HID_SMA_BRACKET_EXCHEIGHT,63820,
@@ -2776,14 +2774,12 @@ HID_SMA_EXPX,63135,
 HID_SMA_FACTX,63131,
 HID_SMA_FONTXY,63223,
 HID_SMA_FORALL,63161,
-HID_SMA_FORMAT_CAT,63186,
 HID_SMA_FORMAT_TBX,63195,
 HID_SMA_FRACLINE_EXCWIDTH,63816,
 HID_SMA_FRACLINE_LINEWIDTH,63817,
 HID_SMA_FROMX,63169,
 HID_SMA_FROMXTOY,63171,
 HID_SMA_FUNCTIONSOTHER1_MENU,63199,
-HID_SMA_FUNCTIONS_CAT,63182,
 HID_SMA_FUNCTIONS_TBX,63191,
 HID_SMA_GRAVEX,63212,
 HID_SMA_HATX,63213,
@@ -2825,18 +2821,15 @@ HID_SMA_MATRIXCOL_DIST,63823,
 HID_SMA_MATRIXROW_DIST,63822,
 HID_SMA_MINUSPLUSX,63077,
 HID_SMA_MINUSX,63075,
-HID_SMA_MISC_CAT,63178,
 HID_SMA_MISC_MENU,63198,
 HID_SMA_NABLA,63162,
 HID_SMA_NEGX,63078,
 HID_SMA_NEWLINE,63248,
 HID_SMA_NROOTXY,63133,
 HID_SMA_NUMERATOR_DIST,63814,
-HID_SMA_OPERATORS_CAT,63183,
 HID_SMA_OPERATORS_TBX,63192,
 HID_SMA_OPERATOR_DIST,63827,
 HID_SMA_OPERATOR_EXCHEIGHT,63826,
-HID_SMA_OPERATOR_WIN,63187,
 HID_SMA_OVERLINEX,63217,
 HID_SMA_OVERSTRIKEX,63218,
 HID_SMA_PARTIAL,63260,
@@ -2845,7 +2838,6 @@ HID_SMA_PLUSMINUSX,63076,
 HID_SMA_PLUSX,63074,
 HID_SMA_PRODX,63155,
 HID_SMA_RE,63257,
-HID_SMA_RELATIONS_CAT,63180,
 HID_SMA_RELATIONS_TBX,63189,
 HID_SMA_RIGHTARROW,63806,
 HID_SMA_RIGHTBORDER_DIST,63829,
@@ -2853,10 +2845,8 @@ HID_SMA_ROOT_DIST,63811,
 HID_SMA_RSUBX,63242,
 HID_SMA_RSUPX,63243,
 HID_SMA_SBLANK,63246,
-HID_SMA_SELECTION_TBX,63196,
 HID_SMA_SETC,63797,
 HID_SMA_SETN,63793,
-HID_SMA_SETOPERATIONS_CAT,63181,
 HID_SMA_SETOPERATIONS_TBX,63190,
 HID_SMA_SETQ,63795,
 HID_SMA_SETR,63796,
@@ -2885,7 +2875,6 @@ HID_SMA_TANHX,63148,
 HID_SMA_TANX,63140,
 HID_SMA_TILDEX,63214,
 HID_SMA_TOX,63170,
-HID_SMA_UNBINOPS_CAT,63179,
 HID_SMA_UNBINOPS_TBX,63188,
 HID_SMA_UNDERLINEX,63216,
 HID_SMA_UPARROW,63807,
diff --git a/source/text/smath/01/03090100.xhp 
b/source/text/smath/01/03090100.xhp
index 0e9c52d..62ae193 100644
--- a/source/text/smath/01/03090100.xhp
+++ b/source/text/smath/01/03090100.xhp
@@ -59,9 +59,9 @@ dedr: fixed #i30769#/lastedited
 bookmark_valueuser-defined operators;unary and binary/bookmark_value
 /bookmark
 bookmark xml-lang=en-US branch=hid/STARMATH_HID_SMA_UNBINOPS_TBX 
id=bm_id3150200 localize=false/
-bookmark xml-lang=en-US branch=hid/STARMATH_HID_SMA_UNBINOPS_CAT 
id=bm_id3149499 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/smath/ui/floatingelements/RID_UNBINOPS_CAT 
id=bm_id3149499 localize=false/
 paragraph role=heading id=hd_id3150342 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/smath/01/03090100.xhp name=Unary/Binary 
OperatorsUnary/Binary Operators/link/paragraph
-paragraph role=paragraph id=par_id3151241 xml-lang=en-US l10n=U 
oldref=2ahelp hid=HID_SMA_UNBINOPS_CATYou can choose various unary and 
binary operators to build your $[officename] Math formula. Unary refers to 
operators that affect one placeholder. Binary refers to operators that connect 
two placeholders. The lower area of the Elements window displays the individual 
operators./ahelp The link href=text/shared/00/0001.xhp#kontextmenue 
name=context menucontext menu/link of the emphCommands/emph window 
also contains a list of these operators, as well as additional operators. If 
you need an operator that is not contained in the Elements window, use the 
context menu or type it directly in the emphCommands/emph 
window./paragraph
+paragraph role=paragraph id=par_id3151241 xml-lang=en-US l10n=U 
oldref=2ahelp hid=smath/ui/floatingelements/RID_UNBINOPS_CATYou can 
choose various unary and binary operators to build your $[officename] Math 
formula. Unary refers to operators that affect one placeholder. Binary refers 
to operators that connect two placeholders. The lower area of the 

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

[Caolán McNamara]

 helpers/help_hid.lst|   18 -
 source/text/swriter/01/05060201.xhp |   65 +---
 2 files changed, 32 insertions(+), 51 deletions(-)

New commits:
commit a142ecbf720d2dbdf1930f5c2ba958a90df5b056
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Sep 5 15:40:32 2014 +0100

update help ids for contour floating window .ui conversion

Change-Id: I1376f54c72200f7e85e3edb814cf98e86d8eb3d5

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 099bac5..2b40431 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -925,22 +925,6 @@ HID_COMPATIBILITY_OPTIONS_BOX,53252,
 HID_CONFIG_EVENT_DOCUMENT_BASED,33167,
 HID_CONFIG_EVENT_OFFICE_BASED,33166,
 HID_CONFIRM_DROP_BUTTON_ALL,38937,
-HID_CONTDLG_APPLY,33918,
-HID_CONTDLG_AUTOCONTOUR,33931,
-HID_CONTDLG_CIRCLE,33922,
-HID_CONTDLG_GRAPHWND,33980,
-HID_CONTDLG_PIPETTE,33932,
-HID_CONTDLG_POLY,33923,
-HID_CONTDLG_POLYDELETE,33928,
-HID_CONTDLG_POLYEDIT,33925,
-HID_CONTDLG_POLYINSERT,33927,
-HID_CONTDLG_POLYMOVE,33926,
-HID_CONTDLG_RECT,33921,
-HID_CONTDLG_REDO,33930,
-HID_CONTDLG_SELECT,33920,
-HID_CONTDLG_TOOLBOX,33979,
-HID_CONTDLG_UNDO,33929,
-HID_CONTDLG_WORKPLACE,33919,
 HID_CONTROLS_DATE_N_TIME,38194,
 HID_CTL_ACTION_DLG_1,59870,
 HID_CTL_ACTION_DLG_2,59871,
@@ -5244,7 +5228,6 @@ svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEPARATOR,703334448,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_URL,703334446,
 svx_Edit_RID_SVX_MDLG_ERR_REP_OPTIONS_ED_ERROPT_PROXYPORT,1237796872,
 svx_Edit_RID_SVX_MDLG_ERR_REP_OPTIONS_ED_ERROPT_PROXYSERVER,1237796870,
-svx_FloatingWindow_RID_SVXDLG_CONTOUR,1782005760,
 svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_DEPTH,1790640128,
 svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_DIRECTION,1790590976,
 svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_LIGHTING,1790656512,
@@ -5366,7 +5349,6 @@ svx_MetricField_RID_SVXDLG_BMPMASK_SP_1,3391953410,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_2,3391953412,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_3,3391953409,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_4,3391953411,
-svx_MetricField_RID_SVXDLG_CONTOUR_MTF_TOLERANCE,1782012417,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_DISTANCE,3386595841,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_X,3386595843,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_Y,3386595844,
diff --git a/source/text/swriter/01/05060201.xhp 
b/source/text/swriter/01/05060201.xhp
index 029686d..7af6fe5 100644
--- a/source/text/swriter/01/05060201.xhp
+++ b/source/text/swriter/01/05060201.xhp
@@ -31,20 +31,19 @@
 /history
 /meta
 body
-bookmark xml-lang=en-US branch=hid/svx:FloatingWindow:RID_SVXDLG_CONTOUR 
id=bm_id3151318 localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:ContourDialog id=bm_id8126690 
localize=false/!-- HID added by script --
+bookmark xml-lang=en-US branch=hid/svx/ui/floatingcontour/FloatingContour 
id=bm_id3151318 localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:ContourDialog id=bm_id3154564 
localize=false/
 paragraph role=heading id=hd_id3153539 xml-lang=en-US level=1 
l10n=U oldref=1Contour Editor/paragraph
 paragraph role=paragraph id=par_id3153677 xml-lang=en-US l10n=U 
oldref=2variable id=konturtextahelp hid=.uno:ContourDialogChanges 
the contour of the selected object. $[officename] uses the contour when 
determining the link href=text/swriter/01/05060200.xhp name=text wraptext 
wrap/link options for the object./ahelp
 /variable/paragraph
-bookmark xml-lang=en-US branch=hid/SVX_HID_CONTDLG_GRAPHWND 
id=bm_id3155903 localize=false/
-paragraph role=paragraph id=par_id3155892 xml-lang=en-US l10n=U 
oldref=46ahelp hid=HID_CONTDLG_GRAPHWNDDisplays a preview of the 
contour./ahelpcommentand this bubble text hides both from view if not set 
to 0 length/comment/paragraph
+bookmark xml-lang=en-US branch=hid/svx/ui/floatingcontour/container 
id=bm_id3155903 localize=false/
+paragraph role=paragraph id=par_id3155892 xml-lang=en-US l10n=U 
oldref=46ahelp hid=svx/ui/floatingcontour/containerDisplays a preview of 
the contour./ahelpcommentand this bubble text hides both from view if not 
set to 0 length/comment/paragraph
 section id=howtoget
   embed href=text/swriter/00/0405.xhp#kontureditor/
 /section
-bookmark xml-lang=en-US branch=hid/SVX_HID_CONTDLG_APPLY 
id=bm_id3155178 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/floatingcontour/TBI_APPLY 
id=bm_id3155178 localize=false/
 paragraph role=heading id=hd_id3159195 xml-lang=en-US level=2 
l10n=U oldref=3Apply/paragraph
-paragraph role=paragraph id=par_id3155184 xml-lang=en-US l10n=U 
oldref=4ahelp hid=HID_CONTDLG_APPLYApplies the contour to the selected 
object./ahelp/paragraph
+paragraph role=paragraph id=par_id3155184 xml-lang=en-US l10n=U 
oldref=4ahelp hid=svx/ui/floatingcontour/TBI_APPLYApplies the contour to 
the selected object./ahelp/paragraph
 table id=tbl_id3149495
 tablerow
 tablecell colspan= rowspan=
@@ -58,9 +57,9 @@
 /tablerow
 /table
 
-bookmark xml-lang=en-US branch=hid/SVX_HID_CONTDLG_WORKPLACE 

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

[Caolán McNamara]

 helpers/help_hid.lst   |2 --
 source/text/shared/01/01010203.xhp |4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 18f215920e94df8383c1e30f8eb0a93c3e076016
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Aug 30 21:19:33 2014 +0100

update help ids for DLG_SYNC_BTN conversion to .ui

Change-Id: I6b0f0b4425c39189a424793211805b13ad8a0be3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 8009a63..ed32034 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3003,7 +3003,6 @@ HID_SVX_MODIFY_TOOLBAR,40051,
 HID_SVX_MODIFY_TOOLBAR_ITEM,40041,
 HID_SVX_SAVE_IN,40042,
 HID_SW_SORT_POSITION,53054,
-HID_SYNC_BTN,53055,
 HID_TABDESIGN_BACKGROUND,38884,
 HID_TABDESIGN_COMMENTCELL,3,
 HID_TABDESIGN_NAMECELL,38886,
@@ -5622,7 +5621,6 @@ 
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_CLOSE,1972294214,
 
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_DETAILS,1972294210,
 sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_STOP,1972294213,
 sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
-sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820,
 sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT,879350288,
 sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_RESET,879350287,
 sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_LANDSCAPE,1411285528,
diff --git a/source/text/shared/01/01010203.xhp 
b/source/text/shared/01/01010203.xhp
index 9bd92a1..8383e46 100644
--- a/source/text/shared/01/01010203.xhp
+++ b/source/text/shared/01/01010203.xhp
@@ -50,9 +50,9 @@
   paragraph l10n=U role=paragraph id=par_id3166410 xml-lang=en-US 
oldref=10ahelp hid=modules/swriter/ui/labeloptionspage/rows 
visibility=visibleEnter the number of rows of labels or business cards that 
you want to have on your page./ahelp/paragraph
   bookmark branch=hid/modules/swriter/ui/labeloptionspage/synchronize 
xml-lang=en-US id=bm_id3159166 localize=false/paragraph role=heading 
level=2 id=hd_id3149237 l10n=U xml-lang=en-US oldref=15Synchronize 
contents/paragraph
   paragraph l10n=U role=paragraph id=par_id3155342 xml-lang=en-US 
oldref=16ahelp visibility=visible 
hid=modules/swriter/ui/labeloptionspage/synchronizeAllows you to edit a 
single label or business card and updates the contents of the remaining labels 
or business cards on the page when you click the emphSynchronize Labels 
/emphbutton./ahelp/paragraph
-  bookmark branch=hid/sw:PushButton:DLG_SYNC_BTN:BTN_SYNC xml-lang=en-US 
id=bm_id3145119 localize=false/paragraph role=heading level=2 
id=hd_id3149164 l10n=U xml-lang=en-US oldref=18Synchronize 
Labels/paragraph
+  bookmark branch=hid/modules/swriter/ui/floatingsync/sync xml-lang=en-US 
id=bm_id3145119 localize=false/paragraph role=heading level=2 
id=hd_id3149164 l10n=U xml-lang=en-US oldref=18Synchronize 
Labels/paragraph
   paragraph xml-lang=en-US oldref=17 l10n=U role=paragraph 
id=par_id3148474The emphSynchronize labels /emphbutton only appears in 
your document if you selected the emphSynchronize contents /emphon 
theemph Options tab /emphwhen you created the labels or business 
cards./paragraph
-  paragraph l10n=U role=paragraph id=par_id3149762 xml-lang=en-US 
oldref=19ahelp hid=SW:PUSHBUTTON:DLG_SYNC_BTN:BTN_SYNC 
visibility=visibleCopies the contents of the top left label or business card 
to the remaining labels or business cards on the page./ahelp/paragraph
+  paragraph l10n=U role=paragraph id=par_id3149762 xml-lang=en-US 
oldref=19ahelp hid=modules/swriter/ui/floatingsync/sync 
visibility=visibleCopies the contents of the top left label or business card 
to the remaining labels or business cards on the page./ahelp/paragraph
   paragraph role=heading level=2 id=hd_id3150504 l10n=U 
xml-lang=en-US oldref=11Printer/paragraph
   paragraph role=paragraph id=par_id3148990 l10n=U xml-lang=en-US 
oldref=12Displays the name of the currently selected printer./paragraph
   bookmark branch=hid/modules/swriter/ui/labeloptionspage/setup 
xml-lang=en-US id=bm_id3155180 localize=false/paragraph role=heading 
level=2 id=hd_id3153127 l10n=U xml-lang=en-US 
oldref=13Setup/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst|1 -
 source/text/swriter/01/04090006.xhp |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit b1ba04f8f29b92d30d65968e6253d48fbcc168ac
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Aug 25 14:19:22 2014 +0100

update help ids for print merge querybox .ui conversion

Change-Id: Ibe2bd1e3872d05cbff519fd0466231e080301085

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 0542f80..8009a63 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2179,7 +2179,6 @@ HID_POPUP_FRAME,33840,
 HID_POPUP_LINE,33841,
 HID_POPUP_LINEEND,34072,
 HID_POPUP_LINEEND_CTRL,34073,
-HID_PRINT_AS_MERGE,54949,
 HID_PRINT_OPTIONS,33124,
 HID_PROP_ALIGN,37816,
 HID_PROP_ALLOW_ADDITIONS,37784,
diff --git a/source/text/swriter/01/04090006.xhp 
b/source/text/swriter/01/04090006.xhp
index 13859ca..ada92b8 100644
--- a/source/text/swriter/01/04090006.xhp
+++ b/source/text/swriter/01/04090006.xhp
@@ -117,7 +117,7 @@
 bookmark xml-lang=en-US branch=hid/modules/swriter/ui/flddbpage/format 
id=bm_id3150087 localize=false/
 paragraph role=heading id=hd_id3146948 xml-lang=en-US level=3 
l10n=U oldref=29List of user-defined formats/paragraph
 paragraph role=paragraph id=par_id3150093 xml-lang=en-US l10n=U 
oldref=30ahelp hid=modules/swriter/ui/flddbpage/formatLists the 
available user-defined formats./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/SW_HID_PRINT_AS_MERGE 
id=bm_id1835383 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/printmergedialog/PrintMergeDialog 
id=bm_id1835383 localize=false/
 paragraph role=heading id=par_idN107FF xml-lang=en-US level=2 
l10n=NEWPrinting a form letter/paragraph
 paragraph role=paragraph id=par_idN10803 xml-lang=en-US 
l10n=NEWahelp hid=.When you print a document that contains database 
fields, a dialog asks you if you want to print a form letter. If you answer 
Yes, the link href=text/swriter/01/0115.xhpMail Merge/link dialog 
opens where you can select the database records to print./ahelp/paragraph
 paragraph role=heading id=par_idN10812 xml-lang=en-US level=3 
l10n=NEWDo not show warning again/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |2 --
 source/text/shared/01/0225.xhp |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 5ca651f48f04a382b5e915ab9ebb330a28274822
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Aug 20 14:05:49 2014 +0100

update helpids for bibliography tabpage .ui conversion

Change-Id: I27ac3278072b03dccc6419f53e6e27f5434434f3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f88daf1..c94bb50 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -828,8 +828,6 @@ HID_BIB_BASE,52769,
 HID_BIB_BOOKTITLE_POS,34780,
 HID_BIB_CHANGESOURCE,34769,
 HID_BIB_CHAPTER_POS,34781,
-HID_BIB_CONTROL_PAGE,34807,
-HID_BIB_CONTROL_PARENT,34808,
 HID_BIB_CUSTOM1_POS,34800,
 HID_BIB_CUSTOM2_POS,34801,
 HID_BIB_CUSTOM3_POS,34802,
diff --git a/source/text/shared/01/0225.xhp 
b/source/text/shared/01/0225.xhp
index a0cf696..0425a0d 100644
--- a/source/text/shared/01/0225.xhp
+++ b/source/text/shared/01/0225.xhp
@@ -29,7 +29,7 @@
body
   section id=litdat
 bookmark xml-lang=en-US branch=hid/.uno:BibliographyComponent 
id=bm_id1785233 localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:BibliographyComponent 
id=bm_id3150756 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/sbibliography/ui/generalpage/GeneralPage id=bm_id3150756 
localize=false/
 bookmark xml-lang=en-US branch=hid/EXTENSIONS_HID_BIB_DB_TBX 
id=bm_id3155354 localize=false/
 paragraph xml-lang=en-US id=hd_id3150999 role=heading level=1 
l10n=U oldref=1link href=text/shared/01/0225.xhp name=Bibliography 
DatabaseBibliography Database/link/paragraph
   /section
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 helpers/help_hid.lst   |2 --
 source/text/shared/01/01020103.xhp |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 9a8ca9edc790d35cafbb1b7eb1b0465b806e428f
Author: David Tardon dtar...@redhat.com
Date:   Wed Aug 20 15:12:45 2014 +0200

update help ids for Filter Selection dlg

Change-Id: I898c8844c7d5309d4d41c09214a6b98108762e9d

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index c94bb50..0542f80 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1271,7 +1271,6 @@ HID_DLG_ADABAS_TRANSACTIONLOG,37282,
 HID_DLG_ADABAS_TRANSACTIONLOG_SIZE,37287,
 HID_DLG_ADABAS_USR,37276,
 HID_DLG_DATABASE_WIZARD,39148,
-HID_DLG_FILTER_SELECT,35842,
 HID_DLG_FLDEDT_ADDRESS,53061,
 HID_DLG_FLDEDT_NEXT,53059,
 HID_DLG_FLDEDT_PREV,53060,
@@ -5669,7 +5668,6 @@ uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_PASSWORD,1311344669,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_PATH,1311344662,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_USERNAME,1311344666,
 uui_Edit_DLG_UUI_MASTERPASSWORD_ED_MASTERPASSWORD,1311508501,
-uui_ListBox_DLG_FILTER_SELECT_LB_FILTERS,1311477279,
 uui_PushButton_DLG_COOKIES_BTN_COOKIES_CANCEL,1311363614,
 uui_PushButton_DLG_COOKIES_BTN_COOKIES_OK,1311363615,
 uui_PushButton_DLG_UUI_LOGIN_BTN_LOGIN_PATH,1311347224,
diff --git a/source/text/shared/01/01020103.xhp 
b/source/text/shared/01/01020103.xhp
index b0f340a..bd2afef 100644
--- a/source/text/shared/01/01020103.xhp
+++ b/source/text/shared/01/01020103.xhp
@@ -37,7 +37,7 @@
   embed href=text/shared/00/0404.xhp#filterauswahl/
 /section
 !-- removed HID SFX2:LISTBOX:DLG_FILTER_SELECT:LB_DLG_LISTBOX --
-bookmark xml-lang=en-US 
branch=hid/uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS id=bm_id1646778 
localize=false/
+bookmark xml-lang=en-US branch=hid/uui/ui/filterselect/filters 
id=bm_id1646778 localize=false/
 paragraph role=heading id=hd_id3151100 xml-lang=en-US level=2 
l10n=U oldref=4Filter list/paragraph
 paragraph role=paragraph id=par_id3159201 xml-lang=en-US l10n=U 
oldref=5ahelp hid=SFX2:LISTBOX:DLG_FILTER_SELECT:LB_DLG_LISTBOXSelect 
the import filter for the file that you want to open./ahelp/paragraph
 paragraph role=paragraph id=par_id3152918 xml-lang=en-US l10n=U 
oldref=6If $[officename] does not recognize the file type of the document 
that your want to open, try any of the following:/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |2 --
 source/text/shared/05/0110.xhp |8 
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 5b425ae93b4459d31ddfca0d070761ad1024d78b
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Aug 15 13:18:00 2014 +0100

update help ids for helpcontrol .ui conversion

Change-Id: I107c35b221c9e5c8ede0711df41085ebd44bef31

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1160de3..2719ac9 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1810,9 +1810,7 @@ HID_HELPBAR,33151,
 HID_HELP_BOOKMARKS_DELETE,33366,
 HID_HELP_BOOKMARKS_OPEN,33364,
 HID_HELP_BOOKMARKS_RENAME,33365,
-HID_HELP_LISTBOX,33347,
 HID_HELP_ONSTARTUP_BOX,33389,
-HID_HELP_TABCONTROL,33348,
 HID_HELP_TEXT_SELECTION_MODE,33373,
 HID_HELP_TOOLBOX,33349,
 HID_HELP_TOOLBOXITEM_BACKWARD,33352,
diff --git a/source/text/shared/05/0110.xhp 
b/source/text/shared/05/0110.xhp
index d805f58..339761c 100644
--- a/source/text/shared/05/0110.xhp
+++ b/source/text/shared/05/0110.xhp
@@ -159,10 +159,10 @@
 bookmark xml-lang=en-US branch=hid/sfx/ui/searchdialog/search 
id=bm_id5264137 localize=false/
 paragraph xml-lang=en-US id=par_idN109F5 role=paragraph 
l10n=NEWahelp hid=sfx/ui/searchdialog/search visibility=hiddenFinds 
the next occurrence of the search term./ahelp/paragraph
   paragraph xml-lang=en-US id=hd_id3149202 role=heading level=2 
l10n=U oldref=8Navigation Pane/paragraph
-bookmark xml-lang=en-US branch=hid/SFX2_HID_HELP_TABCONTROL 
id=bm_id3147229 localize=false/
-paragraph xml-lang=en-US id=par_id3148673 role=paragraph l10n=U 
oldref=9ahelp hid=HID_HELP_TABCONTROLThe navigation pane of the Help 
window contains the tab pages emphContents/emph, emphIndex/emph, 
emphFind/emph and emphBookmarks/emph./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/SFX2_HID_HELP_LISTBOX 
id=bm_id3145421 localize=false/
-paragraph xml-lang=en-US id=par_id3159149 role=paragraph l10n=U 
oldref=19ahelp hid=HID_HELP_LISTBOXThe list box located at the very top 
is where you can select other item type=productname%PRODUCTNAME/item Help 
modules./ahelp The emphIndex/emph and emphFind/emph tab pages only 
contain the data for the selected item type=productname%PRODUCTNAME/item 
module./paragraph
+bookmark xml-lang=en-US branch=hid/sfx/ui/helpcontrol/tabcontrol 
id=bm_id3147229 localize=false/
+paragraph xml-lang=en-US id=par_id3148673 role=paragraph l10n=U 
oldref=9ahelp hid=sfx/ui/helpcontrol/tabcontrolThe navigation pane of 
the Help window contains the tab pages emphContents/emph, 
emphIndex/emph, emphFind/emph and 
emphBookmarks/emph./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/sfx/ui/helpcontrol/active 
id=bm_id3145421 localize=false/
+paragraph xml-lang=en-US id=par_id3159149 role=paragraph l10n=U 
oldref=19ahelp hid=sfx/ui/helpcontrol/activeThe list box located at the 
very top is where you can select other item 
type=productname%PRODUCTNAME/item Help modules./ahelp The 
emphIndex/emph and emphFind/emph tab pages only contain the data for 
the selected item type=productname%PRODUCTNAME/item module./paragraph
   table id=tbl_id3144434
  tablerow
 tablecell
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst |5 -
 source/text/shared/01/xformsdata.xhp |   22 +++---
 2 files changed, 11 insertions(+), 16 deletions(-)

New commits:
commit 7c3b223b9dece4def80895f1fe50b4fc1c11d0b6
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Aug 15 16:02:55 2014 +0100

update helpids for data navigator .ui conversion

Change-Id: I279e888f4978a73889dacc274ba2c724086fdeb3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2719ac9..f88daf1 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -963,7 +963,6 @@ HID_DAI_FUNC_DIFFYEARS,59193,
 HID_DAI_FUNC_ROT13,59194,
 HID_DAI_FUNC_WEEKSINYEAR,59190,
 HID_DATABROWSE_HEADER,38785,
-HID_DATA_NAVIGATOR_WIN,38107,
 HID_DBPATH_CTL_PATH,35153,
 HID_DBPATH_HEADERBAR,35154,
 HID_DBWIZ_CANCEL,39057,
@@ -3078,10 +3077,6 @@ HID_VS_RULER,52984,
 HID_WARNING_SECURITY_HYPERLINK,33374,
 HID_WIZARD_NEXT,33022,
 HID_WIZARD_PREVIOUS,33023,
-HID_XFORMS_INSTANCES_MENUBTN,38132,
-HID_XFORMS_MODELS_LIST,38130,
-HID_XFORMS_MODELS_MENUBTN,38131,
-HID_XFORMS_TAB_CONTROL,38137,
 HID_XFORMS_TOOLBOX_ITEM_ADD,38124,
 HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE,38126,
 HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT,38125,
diff --git a/source/text/shared/01/xformsdata.xhp 
b/source/text/shared/01/xformsdata.xhp
index 788f4c6..248cf45 100644
--- a/source/text/shared/01/xformsdata.xhp
+++ b/source/text/shared/01/xformsdata.xhp
@@ -35,18 +35,18 @@
 /bookmarkcommentMW made Data Navigator.. a two level entry/comment
 bookmark xml-lang=en-US branch=hid/.uno:ShowDataNavigator 
id=bm_id7463799 localize=false/
 bookmark xml-lang=en-US branch=hid/svx/ui/xformspage/toolbar 
id=bm_id0130200901571189 localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_XFORMS_TAB_CONTROL 
id=bm_id0130200901573014 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/datanavigator/DataNavigator 
id=bm_id0130200901573014 localize=false/
 paragraph xml-lang=en-US id=par_idN1054E role=heading level=1 
l10n=NEWvariable id=xformsdatalink 
href=text/shared/01/xformsdata.xhpData Navigator/link
 /variable/paragraph
  paragraph xml-lang=en-US id=par_idN1056C role=paragraph 
l10n=CHGahelp hid=.Specifies the data structure of the current XForms 
document./ahelp/paragraph
   /section
-bookmark xml-lang=en-US branch=hid/SVX_HID_XFORMS_MODELS_LIST 
id=bm_id759300 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/datanavigator/modelslist 
id=bm_id759300 localize=false/
 paragraph xml-lang=en-US id=par_idN1056F role=heading level=2 
l10n=NEWModel name/paragraph
   paragraph xml-lang=en-US id=par_idN10573 role=paragraph 
l10n=NEWahelp hid=.Selects the XForms model that you want to 
use./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/SVX_HID_XFORMS_MODELS_MENUBTN 
id=bm_id6110721 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/datanavigator/modelsbutton 
id=bm_id6110721 localize=false/
 paragraph xml-lang=en-US id=par_idN10576 role=heading level=2 
l10n=NEWModels/paragraph
   paragraph xml-lang=en-US id=par_idN1057A role=paragraph 
l10n=NEWahelp hid=.Adds, renames, and removes XForms 
models./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/SVX_HID_MN_XFORMS_MODELS_ADD 
id=bm_id6934415 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/datanavigator/modelsadd 
id=bm_id6934415 localize=false/
 paragraph xml-lang=en-US id=par_idN10604 role=heading level=3 
l10n=NEWAdd/paragraph
   paragraph xml-lang=en-US id=par_idN10608 role=paragraph 
l10n=CHGahelp hid=.Opens the Add Model dialog where you can add an XForm 
model./ahelp/paragraph
 bookmark xml-lang=en-US branch=hid/svx/ui/addmodeldialog/name 
id=bm_id0130200901582112 localize=false/
@@ -54,13 +54,13 @@
 bookmark xml-lang=en-US branch=hid/svx/ui/addmodeldialog/modify 
id=bm_id0910200811130823 localize=false/
 paragraph xml-lang=en-US id=hd_id0910200811173295 role=heading 
level=3 l10n=NEWModel data updates change document's modification 
status/paragraph
   paragraph xml-lang=en-US id=par_id0910200811173255 role=paragraph 
l10n=NEWahelp hid=.When enabled, the document status will be set to 
modified when you change any form control that is bound to any data in the 
model. When not enabled, such a change does not set the document status to 
modified./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/SVX_HID_MN_XFORMS_MODELS_REMOVE 
id=bm_id5671559 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/datanavigator/modelsremove 
id=bm_id5671559 localize=false/
 paragraph xml-lang=en-US id=par_idN10612 role=heading level=3 
l10n=NEWRemove/paragraph
   paragraph xml-lang=en-US id=par_idN10616 role=paragraph 
l10n=NEWahelp hid=.Deletes the selected XForm model. You cannot delete 
the last model./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/SVX_HID_MN_XFORMS_MODELS_EDIT 
id=bm_id8617816 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/datanavigator/modelsedit 
id=bm_id8617816 localize=false/
 paragraph xml-lang=en-US 

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

[Caolán McNamara]

 helpers/help_hid.lst   |4 
 source/text/shared/02/01170904.xhp |9 +++--
 source/text/shared/autopi/01120400.xhp |6 +++---
 3 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 658fb3a6464d2f73bfe853278596d57457fcee77
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Aug 14 16:28:47 2014 +0100

update help ids for combobo dbfield options page

Change-Id: Ibf2e4e8084967c114a1eea5ec9ffc8fb1fe5ae1a

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 3040d75..f5ba7de 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -4999,16 +4999,12 @@ 
desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW,586088965,
 extensions_CheckBox_RID_TP_LICENSE_CB_ACCEPT,55366,
 
extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836,
 
extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374,
-extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220,
 extensions_ModalDialog_RID_DLG_OEMWIZARD,1090519040,
 extensions_MultiLineEdit_RID_TP_LICENSE_ML_LICENSE,553667083,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649,
 extensions_PushButton_RID_TP_LICENSE_PB_PAGEDOWN,553669138,
-extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148,
-extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES,859718147,
 extensions_TabPage_RID_PAGE_LCW_CONTENTSELECTION_FIELD,859766784,
-extensions_TabPage_RID_PAGE_OPTION_DBFIELD,859717632,
 extensions_TabPage_RID_TP_LICENSE,553664512,
 extensions_TabPage_RID_TP_WELCOME,553697280,
 filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_ALL,1090520065,
diff --git a/source/text/shared/02/01170904.xhp 
b/source/text/shared/02/01170904.xhp
index b611dfb..1eba3a4 100644
--- a/source/text/shared/02/01170904.xhp
+++ b/source/text/shared/02/01170904.xhp
@@ -41,15 +41,12 @@
 /section
 paragraph role=heading id=hd_id3149760 xml-lang=en-US level=2 
l10n=U oldref=3Do you want to save the value in a database 
field?/paragraph
 paragraph role=paragraph id=par_id3150178 xml-lang=en-US l10n=U 
oldref=4Two options are available for this question:/paragraph
-!-- removed HID DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES 
--
 paragraph role=heading id=hd_id3153394 xml-lang=en-US level=3 
l10n=U oldref=5Yes, I want to save it in the following database 
field/paragraph
-paragraph role=paragraph id=par_id3147043 xml-lang=en-US l10n=U 
oldref=6ahelp 
hid=DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YESSpecifies 
whether the user's entered or selected combination field value should be saved 
in a database field./ahelp Several database table fields are offered which 
can be accessed in the current form./paragraph
+paragraph role=paragraph id=par_id3147043 xml-lang=en-US l10n=U 
oldref=6ahelp 
hid=modules/sabpilot/ui/optionsdbfieldpage/yesRadiobuttonSpecifies whether 
the user's entered or selected combination field value should be saved in a 
database field./ahelp Several database table fields are offered which can be 
accessed in the current form./paragraph
 paragraph role=paragraph id=par_id3145212 xml-lang=en-US l10n=U 
oldref=11In link href=text/shared/02/01170102.xhp name=Control - 
PropertiesControl - Properties/link the selected field appears as an entry 
in the emphData/emph tab page under emphData field/emph./paragraph
-!-- removed HID DBP_LISTBOX_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD --
 paragraph role=heading id=hd_id3149177 xml-lang=en-US level=3 
l10n=U oldref=7List field/paragraph
-paragraph role=paragraph id=par_id3147008 xml-lang=en-US l10n=U 
oldref=8ahelp 
hid=DBP_LISTBOX_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELDSpecifies the data 
field where the combination field value should be saved./ahelp/paragraph
-!-- removed HID DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO --
+paragraph role=paragraph id=par_id3147008 xml-lang=en-US l10n=U 
oldref=8ahelp 
hid=modules/sabpilot/ui/optionsdbfieldpage/storeInFieldComboboxSpecifies the 
data field where the combination field value should be 
saved./ahelp/paragraph
 paragraph role=heading id=hd_id3148538 xml-lang=en-US level=3 
l10n=U oldref=9No, I only want to save the value in the form/paragraph
-paragraph role=paragraph id=par_id3149398 xml-lang=en-US l10n=U 
oldref=10ahelp 
hid=DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NOSpecifies that 
the value of this combination field will not be written in the database and 
will only be saved in the form./ahelp/paragraph
+paragraph role=paragraph id=par_id3149398 xml-lang=en-US l10n=U 
oldref=10ahelp 
hid=modules/sabpilot/ui/optionsdbfieldpage/noRadiobuttonSpecifies that the 
value of this combination field will not be written in the database and will 
only be saved in the form./ahelp/paragraph
 /body
 /helpdocument
diff --git a/source/text/shared/autopi/01120400.xhp 
b/source/text/shared/autopi/01120400.xhp
index a6b14a0..21d112b 

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

[David Tardon]

 helpers/help_hid.lst|5 -
 source/text/shared/guide/collab.xhp |   10 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 9411c73cf8ac2f036ce21c99962788e59148158c
Author: David Tardon dtar...@redhat.com
Date:   Wed Aug 6 18:39:17 2014 +0200

update help ids for Resolve Conflicts dlg

Change-Id: I5b682de419e348bfe46ac34fcd1ac72251cbef2d

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d33cab6..8a97f7f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2551,7 +2551,6 @@ HID_RPT_START_IMAGE,64517,
 HID_RPT_START_TITLE,64516,
 HID_RPT_VERT_SCROLLBAR,64459,
 HID_RUBY_DIALOG,34187,
-HID_SCDLG_CONFLICTS,59023,
 HID_SCH_CT_INDICATE,63291,
 HID_SCH_DATA_SERIES_LABEL,63367,
 HID_SCH_LEGEND_POS_BOTTOM,63343,
@@ -5073,10 +5072,6 @@ sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPOTHER,1495585284,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATE1904,957252107,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESC10,957252106,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESTD,957252105,
diff --git a/source/text/shared/guide/collab.xhp 
b/source/text/shared/guide/collab.xhp
index accd82f..22d675c 100644
--- a/source/text/shared/guide/collab.xhp
+++ b/source/text/shared/guide/collab.xhp
@@ -64,15 +64,15 @@
 paragraph id=par_id5323343 role=paragraph xml-lang=en-USThe 
spreadsheet document is in shared mode./paragraph
 paragraph id=par_id5824457 role=paragraph xml-lang=en-USThe user sees 
a message that the document is in shared mode and that some features are not 
available in this mode. The user can disable this message for the future. After 
clicking OK, the document is opened in shared mode./paragraph
 /listitem/listcommentResolve Conflicts dialog/comment
-bookmark xml-lang=en-US branch=hid/SC_HID_SCDLG_CONFLICTS 
id=bm_id9671926 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/conflictsdialog/ConflictsDialog id=bm_id9671926 
localize=false/
 paragraph id=par_id5800653 role=paragraph xml-lang=en-USahelp hid=. 
visibility=hiddenIf the same contents are changed by different users, the 
Resolve Conflicts dialog opens. For each conflict, decide which changes to 
keep./ahelp/paragraphcommentKeep Mine/comment
-bookmark xml-lang=en-US 
branch=hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE id=bm_id1640369 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/conflictsdialog/keepmine id=bm_id1640369 
localize=false/
 paragraph id=par_id6263924 role=paragraph xml-lang=en-USahelp hid=. 
visibility=hiddenKeeps your change, voids the other 
change./ahelp/paragraphcommentKeep Other/comment
-bookmark xml-lang=en-US 
branch=hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER id=bm_id1640360 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/conflictsdialog/keepother id=bm_id1640360 
localize=false/
 paragraph id=par_id3609118 role=paragraph xml-lang=en-USahelp hid=. 
visibility=hiddenKeeps the change of the other user, voids your 
change./ahelp/paragraphcommentKeep All Mine/comment
-bookmark xml-lang=en-US 
branch=hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE 
id=bm_id1640361 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/conflictsdialog/keepallmine id=bm_id1640361 
localize=false/
 paragraph id=par_id7184057 role=paragraph xml-lang=en-USahelp hid=. 
visibility=hiddenKeeps all your changes, voids all other 
changes./ahelp/paragraphcommentKeep All Others/comment
-bookmark xml-lang=en-US 
branch=hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS 
id=bm_id1640363 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/conflictsdialog/keepallothers id=bm_id1640363 
localize=false/
 paragraph id=par_id786767 role=paragraph xml-lang=en-USahelp hid=. 
visibility=hiddenKeeps the changes of all other users, voids your 
changes./ahelp/paragraph
 paragraph id=hd_id2934965 role=heading xml-lang=en-US level=3Saving 
a shared spreadsheet document/paragraph
 paragraph id=par_id1174657 role=paragraph xml-lang=en-USUser A saves a 
shared document. The following conditions can apply:/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 helpers/help_hid.lst |6 --
 source/text/shared/explorer/database/dabapropgen.xhp |4 ++--
 source/text/shared/explorer/database/dabawiz02jdbc.xhp   |4 ++--
 source/text/shared/explorer/database/dabawiz02oracle.xhp |2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 400d593bd7f28ed51f0f3e0d0c9a381436e1ca27
Author: David Tardon dtar...@redhat.com
Date:   Tue Aug 5 13:15:17 2014 +0200

update help ids for ConnectionPage

Change-Id: I41f485e025de7254c46010024a48b720df124fe6

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e7da7b9..2fb7be5 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1294,7 +1294,6 @@ HID_DSADMIN_CHARSET,38777,
 HID_DSADMIN_DBASE_INDICIES,38814,
 HID_DSADMIN_DBASE_PATH,39007,
 HID_DSADMIN_DECIMAL_SEPARATOR,38820,
-HID_DSADMIN_DRIVERCLASS,38815,
 HID_DSADMIN_FIELD_SEPARATOR,38818,
 HID_DSADMIN_FLAT_PATH,39014,
 HID_DSADMIN_HOSTNAME,39034,
@@ -4967,7 +4966,6 @@ chart2_TabPage_TP_LOCATION,551829504,
 chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120,
 chart2_TabPage_TP_YERRORBAR,551927808,
 dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657,
-dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
 dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
 dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589,
 dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588,
@@ -4978,7 +4976,6 @@ dbaccess_Edit_DLG_PARAMETERS_ET_PARAM,1388398596,
 dbaccess_Edit_PAGE_ADABAS_ET_CTRLPASSWORD,851527681,
 dbaccess_Edit_PAGE_ADABAS_ET_CTRLUSERNAME,851527682,
 dbaccess_Edit_PAGE_ADABAS_ET_HOSTNAME,851527685,
-dbaccess_Edit_PAGE_CONNECTION_ET_USERNAME,851544065,
 dbaccess_Edit_PAGE_MYSQL_JDBC_ET_JDBCDRIVERCLASS,851773444,
 dbaccess_Edit_PAGE_MYSQL_NATIVE_ET_USERNAME,851838977,
 dbaccess_Edit_PAGE_ORACLE_JDBC_ET_JDBCDRIVERCLASS,851888132,
@@ -5007,8 +5004,6 @@ 
dbaccess_NumericField_PAGE_USERDRIVER_NF_PORTNUMBER,851761153,
 dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697,
 dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158,
 dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241,
-dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION,851546626,
-dbaccess_PushButton_PAGE_CONNECTION_PB_TESTDRIVERCLASS,851546625,
 dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT,851448326,
 dbaccess_PushButton_PAGE_MYSQL_JDBC_PB_TESTDRIVERCLASS,851776005,
 dbaccess_PushButton_PAGE_ORACLE_JDBC_PB_TESTDRIVERCLASS,851890693,
@@ -5019,7 +5014,6 @@ dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385,
 dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386,
 dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC,851444227,
 dbaccess_TabPage_PAGE_ADVANCED_SETTINGS_SPECIAL,851820544,
-dbaccess_TabPage_PAGE_CONNECTION,851542016,
 dbaccess_TabPage_PAGE_MYSQL_JDBC,851771392,
 dbaccess_TabPage_PAGE_MYSQL_NATIVE,851836928,
 dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240,
diff --git a/source/text/shared/explorer/database/dabapropgen.xhp 
b/source/text/shared/explorer/database/dabapropgen.xhp
index 5267576..e5959d5 100644
--- a/source/text/shared/explorer/database/dabapropgen.xhp
+++ b/source/text/shared/explorer/database/dabapropgen.xhp
@@ -42,7 +42,7 @@
 paragraph role=warning id=par_idN1057C xml-lang=en-US l10n=NEWEnsure 
that the *.dbf file name extension of the dBASE files is 
lowercase.commentmoved from 
shared\explorer\database\1103.xhp/comment/paragraph
 paragraph role=heading id=par_idN10591 xml-lang=en-US level=2 
l10n=NEWBrowsecommentUFI: found for dBase/comment/paragraph
 paragraph role=paragraph id=par_idN10595 xml-lang=en-US 
l10n=NEWahelp hid=.Opens a dialog where you can select a file or a 
directory./ahelpcommentwhich one? or depends?/comment/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION 
id=bm_id7854243 localize=false/paragraph role=heading id=par_idN105AA 
xml-lang=en-US level=2 l10n=NEWTest ConnectioncommentUFI: found for 
dBase/commentcommentand for Calc doc/comment/paragraph
+bookmark xml-lang=en-US 
branch=hid/dbaccess/ui/connectionpage/connectionButton id=bm_id7854243 
localize=false/paragraph role=heading id=par_idN105AA xml-lang=en-US 
level=2 l10n=NEWTest ConnectioncommentUFI: found for 
dBase/commentcommentand for Calc doc/comment/paragraph
 paragraph role=paragraph id=par_idN105AE xml-lang=en-US 
l10n=NEWahelp hid=.Tests the database connection with the current 
settings./ahelp/paragraph
 bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DSADMIN_FLAT_PATH 
id=bm_id4529251 localize=false/paragraph role=heading id=par_idN105B1 
xml-lang=en-US level=2 l10n=NEWPath to the text filescommentUFI: found 
for text file folder/comment/paragraph
 paragraph role=paragraph id=par_idN105B5 xml-lang=en-US 
l10n=CHGahelp hid=.Enter the path to the folder of the text 
files./ahelp/paragraph
@@ -52,7 +52,7 @@
 paragraph role=paragraph id=par_idN105C3 xml-lang=en-US 
l10n=NEWahelp hid=.Enter the name of the ODBC data 

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

[David Tardon]

 helpers/help_hid.lst  |2 --
 source/text/scalc/01/12090102.xhp |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 3d472f792cc7d9e213e5fdce5b1a3ee95714c1f0
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 4 21:29:21 2014 +0200

update help ids for Show Detail dlg

Change-Id: Id5f6d7de1ce298a479e190c51c93876b969a1dc9

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 7912ce4..e7da7b9 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2599,7 +2599,6 @@ HID_SC_APPEND_NAME,58914,
 HID_SC_ASCII_TABCTR,58926,
 HID_SC_AUTOFMT_NAME,58921,
 HID_SC_CHANGES_COMMENT,58990,
-HID_SC_DPSHOWDETAIL,59014,
 HID_SC_DRAW_RENAME,59007,
 HID_SC_DROPMODE_COPY,58924,
 HID_SC_DROPMODE_LINK,58923,
@@ -5095,7 +5094,6 @@ sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289,
 sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291,
 sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290,
 sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505,
-sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS,1495453194,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
diff --git a/source/text/scalc/01/12090102.xhp 
b/source/text/scalc/01/12090102.xhp
index 7d363a7..ec5e879 100644
--- a/source/text/scalc/01/12090102.xhp
+++ b/source/text/scalc/01/12090102.xhp
@@ -98,7 +98,7 @@
  /listitem
   /list
   paragraph xml-lang=en-US id=par_idN108F1 role=paragraph 
l10n=NEWIf you double-click a field which has adjacent fields at the same 
level, the emphShow Detail/emph dialog opens:/paragraph
-bookmark xml-lang=en-US 
branch=hid/sc:ListBox:RID_SCDLG_DPSHOWDETAIL:LB_DIMS id=bm_id9630726 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/showdetaildialog/dimsTreeview id=bm_id9630726 
localize=false/
 paragraph xml-lang=en-US id=par_idN10900 role=heading level=2 
l10n=NEWShow Detail/paragraph
   paragraph xml-lang=en-US id=par_idN10904 role=paragraph 
l10n=NEWahelp hid=.Choose the field that you want to view the details 
for./ahelp/paragraph
   section id=relatedtopics
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |9 -
 source/text/shared/01/06202000.xhp |   29 ++---
 2 files changed, 14 insertions(+), 24 deletions(-)

New commits:
commit 54d171d06783a9ec286e82aa6150c3fc1b230d5f
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jul 25 10:25:27 2014 +0100

update help ids for hangul hanga edit dictionary dialog .ui conversion

Change-Id: Ie0b0c32e71e1d09b97b408f09b1effa0315cade7

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 83096e3..347348c 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1818,7 +1818,6 @@ HID_HANGULDLG_EDIT_NEWWORD,39895,
 HID_HANGULDLG_SUGGESTIONS,40038,
 HID_HANGULDLG_SUGGESTIONS_GRID,40039,
 HID_HANGULDLG_SUGGESTIONS_LIST,40040,
-HID_HANGULHANJA_EDIT_DLG,39992,
 HID_HELPBAR,33151,
 HID_HELP_BOOKMARKS_DELETE,33366,
 HID_HELP_BOOKMARKS_OPEN,33364,
@@ -5314,7 +5313,6 @@ 
svx_ComboBox_RID_SVXPAGE_HYPERLINK_MAIL_CB_FRAME,704466976,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_NEWDOCUMENT_CB_FRAME,704499744,
 svx_ComboBox_RID_SVX_FONT_SUBSTITUTION_CB_FONT1,701009923,
 svx_ComboBox_RID_SVX_FONT_SUBSTITUTION_CB_FONT2,701009925,
-svx_ComboBox_RID_SVX_MDLG_HANGULHANJA_EDIT_LB_ORIGINAL,1237667842,
 svx_DockingWindow_RID_SVX_FMEXPLORER,3516235776,
 svx_Edit_MD_INSERT_OBJECT_APPLET_ED_CLASSFILE,1598179339,
 svx_Edit_MD_INSERT_OBJECT_APPLET_ED_CLASSLOCATION,1598179340,
@@ -5364,10 +5362,6 @@ svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_URL,703334446,
 svx_Edit_RID_SVX_MDLG_DOCRECOVERY_BROKEN_ED_BROKEN_SAVEDIR,1237780485,
 svx_Edit_RID_SVX_MDLG_ERR_REP_OPTIONS_ED_ERROPT_PROXYPORT,1237796872,
 svx_Edit_RID_SVX_MDLG_ERR_REP_OPTIONS_ED_ERROPT_PROXYSERVER,1237796870,
-svx_Edit_RID_SVX_MDLG_HANGULHANJA_EDIT_ED_1,1237665793,
-svx_Edit_RID_SVX_MDLG_HANGULHANJA_EDIT_ED_2,1237665794,
-svx_Edit_RID_SVX_MDLG_HANGULHANJA_EDIT_ED_3,1237665795,
-svx_Edit_RID_SVX_MDLG_HANGULHANJA_EDIT_ED_4,1237665796,
 svx_FloatingWindow_RID_SVXDLG_CONTOUR,1782005760,
 svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_DEPTH,1790640128,
 svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_DIRECTION,1790590976,
@@ -5488,7 +5482,6 @@ 
svx_ListBox_RID_SVXTBX_UNDO_REDO_CTRL_LB_SVXTBX_UNDO_REDO_CTRL,1788300811,
 svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT,701009435,
 svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME,701009432,
 svx_ListBox_RID_SVX_MDLG_DOCRECOVERY_BROKEN_LB_BROKEN_FILELIST,1237782019,
-svx_ListBox_RID_SVX_MDLG_HANGULHANJA_EDIT_LB_BOOK,1237667329,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_1,3391953410,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_2,3391953412,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_3,3391953409,
@@ -5590,8 +5583,6 @@ svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_ADD,704860692,
 svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_CLASSPATH,704860694,
 svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_PARAMETER,704860693,
 svx_PushButton_RID_SVX_MDLG_DOCRECOVERY_BROKEN_BTN_BROKEN_SAVEDIR,1237783046,
-svx_PushButton_RID_SVX_MDLG_HANGULHANJA_EDIT_PB_HHE_DELETE,1237668354,
-svx_PushButton_RID_SVX_MDLG_HANGULHANJA_EDIT_PB_HHE_NEW,1237668353,
 svx_PushButton_RID_SVX_MDLG_HANGULHANJA_PB_FIND,1237602817,
 svx_RadioButton_DLG_INS_ROW_COL_CB_POS_AFTER,1240138251,
 svx_RadioButton_DLG_INS_ROW_COL_CB_POS_BEFORE,1240138250,
diff --git a/source/text/shared/01/06202000.xhp 
b/source/text/shared/01/06202000.xhp
index 4b1afe3..6f15c96 100644
--- a/source/text/shared/01/06202000.xhp
+++ b/source/text/shared/01/06202000.xhp
@@ -29,22 +29,21 @@
 /topic
 /meta
 body
+bookmark xml-lang=en-US 
branch=hid/cui/ui/hangulhanjaeditdictdialog/HangulHanjaEditDictDialog 
id=bm_id9376505 localize=false/
 paragraph role=heading id=par_idN10542 xml-lang=en-US level=1 
l10n=NEWEdit Custom Dictionary/paragraph
 paragraph role=paragraph id=par_idN10546 xml-lang=en-US l10n=NEWAdd 
and delete entries that are used for the link 
href=text/shared/01/0620.xhpHangul/Hanja Conversion/link./paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK 
id=bm_id9376506 localize=false/paragraph role=heading id=par_idN1055F 
xml-lang=en-US level=2 l10n=NEWBook/paragraph
-paragraph role=paragraph id=par_idN10563 xml-lang=en-US 
l10n=NEWahelp 
hid=svx:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOKSelect the user-defined 
dictionary that you want to edit./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL 
id=bm_id6413159 localize=false/paragraph role=heading id=par_idN1057A 
xml-lang=en-US level=2 l10n=NEWOriginal/paragraph
-paragraph role=paragraph id=par_idN1057E xml-lang=en-US 
l10n=NEWahelp 
hid=svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINALSelect the entry 
in the current dictionary that you want to edit. If you want, you can also type 
a new entry in this box./ahelp To move from the Original box to the first 
text box in the Suggestions area, press Enter./paragraph
-!-- removed HID svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_EDIT:CB_REPLACEBYCHAR 
--paragraph role=heading id=par_idN10596 

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

[Caolán McNamara]

 helpers/help_hid.lst|2 --
 source/text/shared/explorer/database/migrate_macros.xhp |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 10fd3e1326ecf705030189e233a895be7918ea72
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jul 22 09:15:59 2014 +0100

update help ids for summary page .ui conversion

Change-Id: Ife99575dbcdcedb0dfad2415f419de3501849651

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ccbf62c..9e7049b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5024,7 +5024,6 @@ dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624,
 dbaccess_ModalDialog_DLG_PARAMETERS,1388396544,
 dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528,
 dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768,
-dbaccess_MultiLineEdit_TP_SUMMARY_ED_CHANGES,851495426,
 dbaccess_MultiListBox_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES,851610626,
 dbaccess_NumericField_DLG_ADABASSTAT_ET_MEMORYUSING,1388615683,
 dbaccess_NumericField_PAGE_ADABAS_NF_CACHE_SIZE,851531778,
@@ -5054,7 +5053,6 @@ dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240,
 dbaccess_TabPage_PAGE_ORACLE_JDBC,851886080,
 dbaccess_TabPage_TAB_WIZ_NAME_MATCHING,851623936,
 dbaccess_TabPage_TP_MIGRATE,851476480,
-dbaccess_TabPage_TP_SUMMARY,851492864,
 desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859,
 desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011,
 desktop_Edit_TP_USER_ED_USER_FATHER,586123282,
diff --git a/source/text/shared/explorer/database/migrate_macros.xhp 
b/source/text/shared/explorer/database/migrate_macros.xhp
index 6ea336b..9e54904 100644
--- a/source/text/shared/explorer/database/migrate_macros.xhp
+++ b/source/text/shared/explorer/database/migrate_macros.xhp
@@ -40,7 +40,7 @@
   /section
 bookmark xml-lang=en-US branch=hid/dbaccess/ui/backuppage/browse 
id=bm_id022420091141368 localize=false/
 paragraph xml-lang=en-US id=par_id0224200911454780 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenChoose a location and file name 
to save the new database file. By default, the new file gets the same name as 
the old file, while the old file gets renamed with the string backup in the 
name./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:MultiLineEdit:TP_SUMMARY:ED_CHANGES 
id=bm_id0224200911450172 localize=false/
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/summarypage/textview 
id=bm_id0224200911450172 localize=false/
 paragraph xml-lang=en-US id=par_id022420091145472 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenThe list shows all changes that 
were applied to the database file./ahelp/paragraph
   paragraph xml-lang=en-US id=par_id0112200902353542 role=paragraph 
l10n=NEWPreviously, macros have been allowed to reside only in the text 
sub-documents of forms and reports. Now macros can also be stored in the Base 
file itself. This means that macros in Base files can be called now from any of 
its sub-components: forms, reports, table design, query design, relation 
design, table data view./paragraph
   paragraph xml-lang=en-US id=par_id0112200903075865 role=paragraph 
l10n=NEWHowever, it is technically not possible to store macros both in a 
Base file and in its sub-documents at the same time. So, if you want to attach 
some new macros to the Base file, while retaining any existing old macros that 
were stored in the sub-documents, you must move the existing old macros up to 
the Base file's macro storage area. /paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst|1 -
 source/text/shared/explorer/database/migrate_macros.xhp |3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f9ce693a67d940f48f5f9c7e2a76213cc97c092c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jul 22 10:12:39 2014 +0100

connect macro migration tabpages to help

Change-Id: I2ab17e0790d3b032bc664051e190d31d3f2d7bac

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1e049d2..164fc9b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5020,7 +5020,6 @@ dbaccess_ListBox_DLG_PARAMETERS_LB_ALLPARAMS,1388400129,
 dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST,851447299,
 dbaccess_ModalDialog_DLG_ADABASSTAT,1388609536,
 dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840,
-dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624,
 dbaccess_ModalDialog_DLG_PARAMETERS,1388396544,
 dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528,
 dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768,
diff --git a/source/text/shared/explorer/database/migrate_macros.xhp 
b/source/text/shared/explorer/database/migrate_macros.xhp
index 9e54904..dd2b688 100644
--- a/source/text/shared/explorer/database/migrate_macros.xhp
+++ b/source/text/shared/explorer/database/migrate_macros.xhp
@@ -33,6 +33,9 @@
  bookmark_valuemacros;attaching new (Base)/bookmark_value
  bookmark_valuemigrating macros (Base)/bookmark_value
 /bookmarkcommentMW added 2 index entries/comment
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/prepagepage/PreparePage 
id=bm_id0224200911450173 localize=false/
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/summarypage/SummaryPage 
id=bm_id0224200911450174 localize=false/
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/migratepage/MigratePage 
id=bm_id0224200911450175 localize=false/
 bookmark xml-lang=en-US branch=hid/dbaccess/ui/backuppage/BackupPage 
id=bm_id022420091141366 localize=false/
 paragraph xml-lang=en-US id=hd_id0112200902353472 role=heading 
level=1 l10n=NEWlink 
href=text/shared/explorer/database/migrate_macros.xhpMigrate 
Macros/link/paragraph
 bookmark xml-lang=en-US branch=hid/.uno:DBMigrateScripts 
id=bm_id0224200911384751 localize=false/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst|4 
 source/text/shared/explorer/database/migrate_macros.xhp |5 +++--
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 3d0fefd1db11ee86be12b2db37fed812f6561d7c
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jul 21 17:07:20 2014 +0100

update helpids for backup page .ui conversion

Change-Id: I5fb852ee9bc507f1f0dda3cbafe5815e332c65cc

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ab927c8..ccbf62c 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1982,7 +1982,6 @@ HID_LTRWIZ_TXTSENDERPOSTCODE,40804,
 HID_LTRWIZ_TXTSENDERSTATE_TEXT,40805,
 HID_LTRWIZ_TXTSENDERSTREET,40803,
 HID_LTRWIZ_TXTTEMPLATENAME,40812,
-HID_MACRO_MIGRATION_BACKUP_LOCATION,39152,
 HID_MD_COPY_TO_CLIPBOARD,53441,
 HID_MD_GLOS_DEFINE,53424,
 HID_MD_GLOS_DEFINE_TEXT,53439,
@@ -4994,7 +4993,6 @@ chart2_TabPage_TP_YERRORBAR,551927808,
 dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657,
 dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
 dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
-dbaccess_ComboBox_TP_SAVE_DBDOC_AS_ED_SAVE_AS_LOCATION,851464193,
 dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589,
 dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588,
 dbaccess_Edit_DLG_ADABASSTAT_ET_SYSDEVSPACE,1388611585,
@@ -5043,7 +5041,6 @@ 
dbaccess_PushButton_PAGE_ORACLE_JDBC_PB_TESTDRIVERCLASS,851890693,
 dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_ALL,851628560,
 dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_NONE,851628561,
 dbaccess_PushButton_TAB_WIZ_TYPE_SELECT_PB_AUTO,851612165,
-dbaccess_PushButton_TP_SAVE_DBDOC_AS_PB_BROWSE_SAVE_AS_LOCATION,851464705,
 dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385,
 dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386,
 dbaccess_RadioButton_PAGE_DBWIZARD_MYSQL_INTRO_RB_CONNECTVIANATIVE,852197893,
@@ -5057,7 +5054,6 @@ dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240,
 dbaccess_TabPage_PAGE_ORACLE_JDBC,851886080,
 dbaccess_TabPage_TAB_WIZ_NAME_MATCHING,851623936,
 dbaccess_TabPage_TP_MIGRATE,851476480,
-dbaccess_TabPage_TP_SAVE_DBDOC_AS,851460096,
 dbaccess_TabPage_TP_SUMMARY,851492864,
 desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859,
 desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011,
diff --git a/source/text/shared/explorer/database/migrate_macros.xhp 
b/source/text/shared/explorer/database/migrate_macros.xhp
index 1f74a79..6ea336b 100644
--- a/source/text/shared/explorer/database/migrate_macros.xhp
+++ b/source/text/shared/explorer/database/migrate_macros.xhp
@@ -33,11 +33,12 @@
  bookmark_valuemacros;attaching new (Base)/bookmark_value
  bookmark_valuemigrating macros (Base)/bookmark_value
 /bookmarkcommentMW added 2 index entries/comment
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/backuppage/BackupPage 
id=bm_id022420091141366 localize=false/
 paragraph xml-lang=en-US id=hd_id0112200902353472 role=heading 
level=1 l10n=NEWlink 
href=text/shared/explorer/database/migrate_macros.xhpMigrate 
Macros/link/paragraph
 bookmark xml-lang=en-US branch=hid/.uno:DBMigrateScripts 
id=bm_id0224200911384751 localize=false/
 paragraph xml-lang=en-US id=par_id0112200902353466 role=paragraph 
l10n=NEWahelp hid=.The Database Document Macro Migration Wizard moves 
existing macros from sub-documents of an old Base file into the new Base file's 
macro storage area./ahelp/paragraph
   /section
-bookmark xml-lang=en-US 
branch=hid/dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION 
id=bm_id022420091141368 localize=false/
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/backuppage/browse 
id=bm_id022420091141368 localize=false/
 paragraph xml-lang=en-US id=par_id0224200911454780 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenChoose a location and file name 
to save the new database file. By default, the new file gets the same name as 
the old file, while the old file gets renamed with the string backup in the 
name./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/dbaccess:MultiLineEdit:TP_SUMMARY:ED_CHANGES 
id=bm_id0224200911450172 localize=false/
 paragraph xml-lang=en-US id=par_id022420091145472 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenThe list shows all changes that 
were applied to the database file./ahelp/paragraph
@@ -54,4 +55,4 @@
  paragraph xml-lang=en-US id=par_id0112200902353554 
role=paragraph l10n=NEWlink 
href=http://wiki.documentfoundation.org/Macros_in_Database_Documents;An in 
depth explanation by the developers (Wiki)./link/paragraph
   /section
/body
-/helpdocument
\ No newline at end of file
+/helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |3 ---
 source/text/shared/00/0001.xhp |5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit a8c8f80b933a42a284e681c1d1973166445a4451
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jul 16 13:33:08 2014 +0100

update help ids for options dialog .ui conversion

Change-Id: I230c456c2d68793383d89afb97e6ec7358912c8a

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ba3230b..cb2d646 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2140,7 +2140,6 @@ HID_NUM_OUTL_NUM_SAVEAS,53037,
 HID_NUM_RESET,54852,
 HID_NUM_TOOLBOX,54836,
 HID_OFACTL_AUTOCORR_REPLACE,35032,
-HID_OFADLG_OPTIONS_TREE,35097,
 HID_OFADLG_TREELISTBOX,35098,
 HID_OFAPAGE_AUTOCORR_OPTIONS,35029,
 HID_OFAPAGE_AUTOFORMAT_CLB,35075,
@@ -5551,7 +5550,6 @@ svx_ModalDialog_MD_INSERT_OBJECT_APPLET,1598177280,
 svx_ModalDialog_MD_INSERT_OBJECT_IFRAME,1598210048,
 svx_ModalDialog_MD_LINKEDIT,1598095360,
 svx_ModalDialog_RID_DEFAULTABOUT,1078001664,
-svx_ModalDialog_RID_OFADLG_OPTIONS_TREE_HINT,1346011136,
 svx_ModalDialog_RID_SVXDLG_ASSIGNCOMPONENT,1242447872,
 svx_ModalDialog_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE,1241268224,
 svx_ModalDialog_RID_SVXDLG_SETFORM,1368735744,
@@ -5577,7 +5575,6 @@ 
svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_DEL,1241813512,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_EDIT,1241813510,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_RENAME,1241813511,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_RUN,1241813507,
-svx_PushButton_RID_OFADLG_OPTIONS_TREE_PB_BACK,1345966596,
 svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT,809013821,
 svx_PushButton_RID_SFXPAGE_PATH_BTN_PATH,733581837,
 svx_PushButton_RID_SFXPAGE_PATH_BTN_STANDARD,733581838,
diff --git a/source/text/shared/00/0001.xhp 
b/source/text/shared/00/0001.xhp
index 55a2bfb..01a0313 100644
--- a/source/text/shared/00/0001.xhp
+++ b/source/text/shared/00/0001.xhp
@@ -207,11 +207,10 @@
  paragraph xml-lang=en-US id=par_id3152473 role=paragraph 
l10n=U oldref=71ahelp hid=.Click theemph Next /emphbutton, and the 
wizard uses the current dialog settings and proceeds to the next step. If you 
are on the last step, this button becomes 
emphCreate/emph./ahelp/paragraph
   /section
   section id=zurueck
-!-- removed HID OFFMGR_PUSHBUTTON_RID_OFADLG_OPTIONS_TREE_PB_BACK --
-bookmark xml-lang=en-US 
branch=hid/cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK id=bm_id4539933 
localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/optionsdialog/revert 
id=bm_id4539933 localize=false/
 paragraph xml-lang=en-US id=hd_id3149670 role=heading level=2 l10n=U
 oldref=13Backcommentin Tools - 
Options/comment/paragraph
- paragraph xml-lang=en-US id=par_id3145068 role=paragraph 
l10n=U oldref=14ahelp 
hid=OFFMGR_PUSHBUTTON_RID_OFADLG_OPTIONS_TREE_PB_BACKResets modified values 
back to the $[officename] default values./ahelp/paragraph
+ paragraph xml-lang=en-US id=par_id3145068 role=paragraph 
l10n=U oldref=14ahelp hid=cui/ui/optionsdialog/revertResets modified 
values back to the $[officename] default values./ahelp/paragraph
   /section
   section id=zurueck2
 bookmark xml-lang=en-US branch=hid/SFX2_HID_TABDLG_RESET_BTN 
id=bm_id3151054 localize=false/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst |3 ---
 source/text/shared/01/xformsdata.xhp |   11 +++
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9f3d8e13a9180997db0bc525030fbc5e8ba59f21
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jul 11 09:45:46 2014 +0100

update help ids for RID_SVX_XFORMS_TABPAGES .ui conversion

Change-Id: Ided41f1c9c3deecabdb092315c7fe3e586b7d899

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a3513a3..06738f4 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3121,11 +3121,9 @@ HID_WARNING_SECURITY_HYPERLINK,33374,
 HID_WIZARD_NEXT,33022,
 HID_WIZARD_PREVIOUS,33023,
 HID_XFORMS_INSTANCES_MENUBTN,38132,
-HID_XFORMS_ITEMS_LIST,38129,
 HID_XFORMS_MODELS_LIST,38130,
 HID_XFORMS_MODELS_MENUBTN,38131,
 HID_XFORMS_TAB_CONTROL,38137,
-HID_XFORMS_TOOLBOX,38123,
 HID_XFORMS_TOOLBOX_ITEM_ADD,38124,
 HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE,38126,
 HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT,38125,
@@ -5663,7 +5661,6 @@ 
svx_RadioButton_RID_SVX_MDLG_HANGULHANJA_RB_SIMPLE_CONVERSION,1237598721,
 svx_TabPage_RID_OFA_TP_INTERNATIONAL,811335680,
 svx_TabPage_RID_SVXPAGE_IMPROVEMENT,705658880,
 svx_TabPage_RID_SVX_GRFFILTER_DLG_EMBOSS_TAB,706232320,
-svx_TabPage_RID_SVX_XFORMS_TABPAGES,832110592,
 svx_TriStateBox_RID_SVXPAGE_LINE_TSB_CENTER_END,701548037,
 svx_TriStateBox_RID_SVXPAGE_LINE_TSB_CENTER_START,701548036,
 svx_TriStateBox_RID_SVXPAGE_SHADOW_TSB_SHOW_SHADOW,701711874,
diff --git a/source/text/shared/01/xformsdata.xhp 
b/source/text/shared/01/xformsdata.xhp
index 95d392d..788f4c6 100644
--- a/source/text/shared/01/xformsdata.xhp
+++ b/source/text/shared/01/xformsdata.xhp
@@ -34,8 +34,7 @@
  bookmark_valueData Navigator;display options/bookmark_value
 /bookmarkcommentMW made Data Navigator.. a two level entry/comment
 bookmark xml-lang=en-US branch=hid/.uno:ShowDataNavigator 
id=bm_id7463799 localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:ShowDataNavigator 
id=bm_id7677236 localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_XFORMS_TOOLBOX 
id=bm_id0130200901571189 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/xformspage/toolbar 
id=bm_id0130200901571189 localize=false/
 bookmark xml-lang=en-US branch=hid/SVX_HID_XFORMS_TAB_CONTROL 
id=bm_id0130200901573014 localize=false/
 paragraph xml-lang=en-US id=par_idN1054E role=heading level=1 
l10n=NEWvariable id=xformsdatalink 
href=text/shared/01/xformsdata.xhpData Navigator/link
 /variable/paragraph
@@ -64,10 +63,9 @@
 bookmark xml-lang=en-US branch=hid/SVX_HID_MN_XFORMS_SHOW_DETAILS 
id=bm_id5646229 localize=false/
 paragraph xml-lang=en-US id=par_idN10619 role=heading level=3 
l10n=NEWShow Details/paragraph
   paragraph xml-lang=en-US id=par_idN1061D role=paragraph 
l10n=NEWahelp hid=.Switches the display to show or hide 
details./ahelpcommentUFI: not explained in spec/comment/paragraph
-bookmark xml-lang=en-US branch=hid/SVX_HID_XFORMS_ITEMS_LIST 
id=bm_id2524491 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/xformspage/items 
id=bm_id2524491 localize=false/
 paragraph xml-lang=en-US id=par_idN1057D role=heading level=2 
l10n=NEWInstance/paragraph
   paragraph xml-lang=en-US id=par_idN10682 role=paragraph 
l10n=NEWahelp hid=.Lists the items that belong to the current 
instance./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/SVX_HID_XFORMS_TOOLBOX_ITEM_ADD 
id=bm_id4040955 localize=false/
 paragraph xml-lang=en-US id=par_idN1058B role=heading level=2 
l10n=NEWSubmissions/paragraph
   paragraph xml-lang=en-US id=par_idN1058F role=paragraph 
l10n=NEWahelp hid=.Lists the submissions./ahelpcommentUFI. it's not 
in the spec/comment/paragraph
   paragraph xml-lang=en-US id=par_idN10592 role=heading level=2 
l10n=NEWBindings/paragraph
@@ -87,14 +85,19 @@
   paragraph xml-lang=en-US id=par_idN1065E role=heading level=3 
l10n=NEWShow data types/paragraph
   paragraph xml-lang=en-US id=par_idN10662 role=paragraph 
l10n=NEWahelp hid=.Switches the display to show more or less 
details./ahelpcommentUFI: not explained in spec/comment/paragraph
 bookmark xml-lang=en-US 
branch=hid/SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT id=bm_id2156132 
localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/xformspage/TBI_ITEM_ADD_ELEMENT 
id=bm_id1840879 localize=false/
 bookmark xml-lang=en-US 
branch=hid/SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE id=bm_id9931943 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/svx/ui/xformspage/TBI_ITEM_ADD_ATTRIBUTE id=bm_id1840878 
localize=false/
 bookmark xml-lang=en-US branch=hid/SVX_HID_XFORMS_TOOLBOX_ITEM_ADD 
id=bm_id1840876 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/xformspage/TBI_ITEM_ADD 
id=bm_id1840877 localize=false/
 paragraph xml-lang=en-US id=par_idN10584 role=heading level=3 
l10n=CHGAdd/paragraph
   paragraph xml-lang=en-US id=par_idN10588 role=paragraph 
l10n=CHGahelp hid=.Opens a dialog to add a new item (element, attribute, 
submission, or 

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

[Caolán McNamara]

 helpers/help_hid.lst   |3 ---
 source/text/shared/01/06140402.xhp |5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 44176ebad23f662e45d29d7b99ccf972067c15cb
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 10 13:45:20 2014 +0100

update help ids for icon selector dialog .ui conversion

Change-Id: I1c602f1f349a97839ded3f3769fc072c979b64a7

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 3f7dbfd..042de0e 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3031,7 +3031,6 @@ HID_SVXDLG_FILTER_WARNING,34195,
 HID_SVXTBX_UNDO_REDO_CTRL,34189,
 HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS,40019,
 HID_SVX_CONFIG_EVENT,40001,
-HID_SVX_CONFIG_ICON_SELECTOR,40044,
 HID_SVX_CONFIG_NAME_SUBMENU,40045,
 HID_SVX_CONFIG_RENAME_MENU,40046,
 HID_SVX_CONFIG_RENAME_MENU_ITEM,40047,
@@ -5597,8 +5596,6 @@ svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_2,701569026,
 svx_NumericField_RID_SVX_SPLITCELLDLG_ED_COUNT,1238292482,
 svx_PatternField_RID_SVXPAGE_INET_PROXY_ED_DNS,703288939,
 svx_PushButton_DLG_CHINESETRANSLATION_PB_EDITTERMS,1078661633,
-svx_PushButton_MD_ICONSELECTOR_BTN_DELETE,1080136601,
-svx_PushButton_MD_ICONSELECTOR_BTN_IMPORT,1080136589,
 svx_PushButton_MD_INSERT_OBJECT_APPLET_BTN_CLASS,1598181901,
 svx_PushButton_MD_INSERT_OBJECT_IFRAME_BT_FILEOPEN,1598214663,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_CREATE,1241813509,
diff --git a/source/text/shared/01/06140402.xhp 
b/source/text/shared/01/06140402.xhp
index 79da935..7129b1d 100644
--- a/source/text/shared/01/06140402.xhp
+++ b/source/text/shared/01/06140402.xhp
@@ -29,14 +29,15 @@
 /topic
 /meta
 body
+bookmark xml-lang=en-US branch=hid/cui/ui/iconselectordialog/IconSelector 
id=bm_id1383710 localize=false/
 paragraph role=heading id=par_idN10543 xml-lang=en-US level=1 
l10n=NEWChange Icon/paragraph
 paragraph role=heading id=par_idN10547 xml-lang=en-US level=2 
l10n=CHGIcons/paragraph
 paragraph role=paragraph id=par_idN1054B xml-lang=en-US 
l10n=NEWDisplays the available icons in %PRODUCTNAME. To replace the icon 
that you selected in the link 
href=text/shared/01/06140400.xhpCustomize/link dialog, click an icon, then 
click the emphOK/emph button./paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT id=bm_id1383709 
localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/iconselectordialog/importButton 
id=bm_id1383709 localize=false/
 paragraph role=heading id=par_idN1055C xml-lang=en-US level=2 
l10n=NEWImport/paragraph
 paragraph role=paragraph id=par_idN10560 xml-lang=en-US 
l10n=NEWahelp hid=.Adds new icons to the list of icons. You see a file 
open dialog that imports the selected icon or icons into the internal icon 
directory of %PRODUCTNAME./ahelp/paragraph
 paragraph role=note id=par_idN10575 xml-lang=en-US l10n=NEWYou can 
only import icons that are in the PNG file format and that are 16x16 or 26x26 
pixels in size./paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:PushButton:MD_ICONSELECTOR:BTN_DELETE id=bm_id1383799 
localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/iconselectordialog/deleteButton 
id=bm_id1383799 localize=false/
 paragraph role=paragraph id=par_id8224433 xml-lang=en-US 
l10n=NEWahelp hid=.Click to remove the selected icon from the list. Only 
user-defined icons can be removed./ahelp/paragraph
 /body
 /helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |4 
 source/text/shared/01/02180100.xhp |   10 --
 2 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 084ad682be0cd73a58d6e0481b35ae2c16fac650
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 10 14:20:38 2014 +0100

update help ids for dde link modify .ui conversion

Change-Id: Ifb94d4653811f22b77b40f19fa36d5a71c4f96fa

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 042de0e..12e5139 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5245,13 +5245,9 @@ sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO2,1078102023,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO3,1078102025,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO4,1078102027,
-sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_APP,1082214450,
-sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_ITEM,1082214452,
-sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_TOPIC,1082214451,
 sfx2_Edit_RID_URLOPEN_RID_URLOPEN_URL,1112573955,
 sfx2_FT_DOCNAME_DLG_PRINTMONITOR,2218852352,
 sfx2_FloatingWindow_SID_RECORDING_FLOATWINDOW,1705639936,
-sfx2_ModalDialog_MD_DDE_LINKEDIT,1082212352,
 sfx2_ModalDialog_RID_URLOPEN,1112571904,
 sfx2_ModalDialog_RID_WARN_PRINTTRANSPARENCY,1113047040,
 sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
diff --git a/source/text/shared/01/02180100.xhp 
b/source/text/shared/01/02180100.xhp
index b17d43b..7014edd 100644
--- a/source/text/shared/01/02180100.xhp
+++ b/source/text/shared/01/02180100.xhp
@@ -31,6 +31,7 @@
 /history
 /meta
 body
+bookmark xml-lang=en-US branch=hid/sfx/ui/linkeditdialog/LinkEditDialog 
id=bm_id3418988 localize=false/
 bookmark xml-lang=en-US branch=index 
id=bm_id3149877bookmark_valuelinks; modifying/bookmark_value
 bookmark_valuechanging; links/bookmark_value
 /bookmarkcommentMW changed modifying;... to changing;.../comment
@@ -41,14 +42,11 @@
 /section
 paragraph role=heading id=hd_id3149549 xml-lang=en-US level=2 
l10n=U oldref=3Edit Links/paragraph
 paragraph role=paragraph id=par_id3153114 xml-lang=en-US l10n=U 
oldref=4Lets you set the properties for the selected link./paragraph
-!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_APP --
 paragraph role=heading id=hd_id3148548 xml-lang=en-US level=3 
l10n=U oldref=5Application:/paragraph
-paragraph role=paragraph id=par_id3154751 xml-lang=en-US l10n=U 
oldref=6ahelp hid=SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_APPLists the 
application that last saved the source file./ahelp/paragraph
-!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_TOPIC --
+paragraph role=paragraph id=par_id3154751 xml-lang=en-US l10n=U 
oldref=6ahelp hid=sfx/ui/linkeditdialog/appLists the application that 
last saved the source file./ahelp/paragraph
 paragraph role=heading id=hd_id3155338 xml-lang=en-US level=3 
l10n=U oldref=7File:/paragraph
-paragraph role=paragraph id=par_id3153527 xml-lang=en-US l10n=U 
oldref=8ahelp hid=SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_TOPICLists the path to 
the source file./ahelp/paragraph
-!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_ITEM --
+paragraph role=paragraph id=par_id3153527 xml-lang=en-US l10n=U 
oldref=8ahelp hid=sfx/ui/linkeditdialog/fileLists the path to the source 
file./ahelp/paragraph
 paragraph role=heading id=hd_id3153577 xml-lang=en-US level=3 
l10n=U oldref=9Section/paragraph
-paragraph role=paragraph id=par_id3146958 xml-lang=en-US l10n=U 
oldref=10ahelp hid=SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_ITEMLists the section 
that the link refers to in the source file. If you want, you can enter a new 
section here./ahelp/paragraph
+paragraph role=paragraph id=par_id3146958 xml-lang=en-US l10n=U 
oldref=10ahelp hid=sfx/ui/linkeditdialog/categoryLists the section that 
the link refers to in the source file. If you want, you can enter a new section 
here./ahelp/paragraph
 /body
 /helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |   11 ---
 source/text/shared/02/01170101.xhp |3 +--
 source/text/shared/autopi/01120200.xhp |   15 +++
 source/text/shared/autopi/01120300.xhp |   11 +--
 source/text/shared/autopi/01120500.xhp |7 +++
 5 files changed, 16 insertions(+), 31 deletions(-)

New commits:
commit 957d5ee976dc602e7c433e2659d748f453f086ac
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 10 16:02:47 2014 +0100

update help ids for forms groupbox dialog .ui conversions

Change-Id: Ia931c4364f8070c72b7f12e797dc098f37682c56

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 12e5139..a3513a3 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5078,15 +5078,10 @@ desktop_PushButton_TP_LICENSE_PB_LICENSE_DOWN,586142215,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER,586088966,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW,586088965,
-extensions_CheckBox_RID_DLG_SELECTLABELCONTROL_1,1090126849,
 extensions_CheckBox_RID_TP_LICENSE_CB_ACCEPT,55366,
 
extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836,
-extensions_Edit_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT,859736067,
-extensions_Edit_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE,859703298,
 extensions_ListBox_RID_DLG_SELECTION_LB_ENTRIES,1090178561,
-extensions_ListBox_RID_PAGE_DEFAULTFIELDSELECTION_LB_DEFSELECTIONFIELD,859688451,
 
extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374,
-extensions_ListBox_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS,859704835,
 extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220,
 extensions_ModalDialog_RID_DLG_FORMLINKS,1090158592,
 extensions_ModalDialog_RID_DLG_GRIDWIZARD,1396555776,
@@ -5094,20 +5089,14 @@ 
extensions_ModalDialog_RID_DLG_GROUPBOXWIZARD,1396523008,
 extensions_ModalDialog_RID_DLG_LISTCOMBOWIZARD,1396539392,
 extensions_ModalDialog_RID_DLG_OEMWIZARD,1090519040,
 extensions_ModalDialog_RID_DLG_SELECTION,1090174976,
-extensions_ModalDialog_RID_DLG_SELECTLABELCONTROL,1090125824,
 extensions_MultiLineEdit_RID_TP_LICENSE_ML_LICENSE,553667083,
 extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649,
 extensions_PushButton_RID_TP_LICENSE_PB_PAGEDOWN,553669138,
-extensions_RadioButton_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO,859685378,
-extensions_RadioButton_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES,859685377,
 extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148,
 extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES,859718147,
-extensions_TabPage_RID_PAGE_DEFAULTFIELDSELECTION,859684864,
 extensions_TabPage_RID_PAGE_LCW_CONTENTSELECTION_FIELD,859766784,
-extensions_TabPage_RID_PAGE_OPTIONS_FINAL,859734016,
-extensions_TabPage_RID_PAGE_OPTIONVALUES,859701248,
 extensions_TabPage_RID_PAGE_OPTION_DBFIELD,859717632,
 extensions_TabPage_RID_TP_LICENSE,553664512,
 extensions_TabPage_RID_TP_WELCOME,553697280,
diff --git a/source/text/shared/02/01170101.xhp 
b/source/text/shared/02/01170101.xhp
index e00238e..ffad7b3 100644
--- a/source/text/shared/02/01170101.xhp
+++ b/source/text/shared/02/01170101.xhp
@@ -214,8 +214,7 @@
  paragraph xml-lang=en-US id=par_id3153223 role=paragraph 
l10n=U oldref=231To define one character of the label as a mnemonic, so 
that the user can access this control by pressing the character on the 
keyboard, insert a tilde (~) character in front of the character in the 
label./paragraph
  paragraph xml-lang=en-US id=par_id3154502 role=paragraph 
l10n=U oldref=218Only the text of a group frame can be used as the label 
field when using radio buttons. This text applies to all of the radio buttons 
of the same group./paragraph
  paragraph xml-lang=en-US id=par_id3148587 role=paragraph 
l10n=CHG oldref=219If you click on the emph.../emph button next to the 
text field, you will see the emphLabel Field Selection/emph dialog. Select 
a label from the list./paragraph
-!-- removed HID PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1 --
-paragraph xml-lang=en-US id=par_id3154512 role=paragraph l10n=CHG 
oldref=220ahelp hid=PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1Check the 
emphNo assignment /emphbox to remove the link between a control and the 
assigned label field./ahelp/paragraph
+paragraph xml-lang=en-US id=par_id3154512 role=paragraph l10n=CHG 
oldref=220ahelp 
hid=modules/sabpilot/ui/labelselectiondialog/LabelSelectionDialogCheck the 
emphNo assignment /emphbox to remove the link between a control and the 
assigned label field./ahelp/paragraph
   /section
   section id=Section57
 bookmark xml-lang=en-US branch=hid/EXTENSIONS_HID_PROP_WIDTH 
id=bm_id3156356 localize=false/
diff --git a/source/text/shared/autopi/01120200.xhp 

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

[Caolán McNamara]

 helpers/help_hid.lst   |   22 --
 source/text/shared/01/0201.xhp |5 --
 source/text/shared/01/0202.xhp |5 --
 source/text/shared/01/0222.xhp |   78 ++---
 4 files changed, 43 insertions(+), 67 deletions(-)

New commits:
commit 57ff135efcb010472bc58b57dd2749d3b488f96a
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jul 9 11:05:19 2014 +0100

update help ids for imap dialog .ui conversion

Change-Id: I3058ee9350d74b6560385556467cfb97e42c3f5f

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1c7367f..3f7dbfd 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1849,25 +1849,6 @@ HID_ICCDIALOG_OK_BTN,34093,
 HID_ICCDIALOG_RESET_BTN,34088,
 HID_IMAGECONTROL2,41152,
 HID_IMAGECONTROL3,41124,
-HID_IMAPDLG_ACTIVE,33950,
-HID_IMAPDLG_APPLY,33936,
-HID_IMAPDLG_CIRCLE,33941,
-HID_IMAPDLG_FREEPOLY,33943,
-HID_IMAPDLG_GRAPHWND,33982,
-HID_IMAPDLG_MACRO,33951,
-HID_IMAPDLG_OPEN,33937,
-HID_IMAPDLG_POLY,33942,
-HID_IMAPDLG_POLYDELETE,33947,
-HID_IMAPDLG_POLYEDIT,33944,
-HID_IMAPDLG_POLYINSERT,33946,
-HID_IMAPDLG_POLYMOVE,33945,
-HID_IMAPDLG_PROPERTY,33952,
-HID_IMAPDLG_RECT,33940,
-HID_IMAPDLG_REDO,33949,
-HID_IMAPDLG_SAVEAS,33938,
-HID_IMAPDLG_SELECT,33939,
-HID_IMAPDLG_TOOLBOX,33981,
-HID_IMAPDLG_UNDO,33948,
 HID_IMPGRF_CB_PREVIEW,33971,
 HID_INDEX_DIALOG_ACTION_TB,39147,
 HID_INSERT_CHART,52971,
@@ -5369,7 +5350,6 @@ 
svx_CheckBox_RID_SVX_MDLG_HANGULHANJA_CB_HANGUL_ONLY,1237599234,
 svx_CheckBox_RID_SVX_MDLG_HANGULHANJA_CB_HANJA_ONLY,1237599235,
 svx_CheckBox_RID_SVX_MDLG_HANGULHANJA_CB_REPLACE_BY_CHARACTER,1237599233,
 svx_CheckBox_RID_SVX_SPLITCELLDLG_CB_PROP,1238287371,
-svx_ComboBox_RID_SVXDLG_IMAP_CBB_URL,2318700545,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_DOCUMENT_CB_FRAME,704483360,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_INTERNET_CB_FRAME,704450592,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_MAIL_CB_FRAME,704466976,
@@ -5387,7 +5367,6 @@ 
svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_ACTION,1368918030,
 svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_NAME,1368918028,
 svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_REF,1368918034,
 svx_Edit_RID_SVXDLG_ASSIGNCOMPONENT_EDIT_METHOD,1242449965,
-svx_Edit_RID_SVXDLG_IMAP_EDT_TEXT,2318698497,
 svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_1,2315372554,
 svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_2,2315372555,
 svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_3,2315372556,
@@ -5604,7 +5583,6 @@ svx_ModalDialog_RID_SVXDLG_ASSIGNCOMPONENT,1242447872,
 svx_ModalDialog_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE,1241268224,
 svx_ModalDialog_RID_SVXDLG_SETFORM,1368735744,
 svx_ModalDialog_RID_SVX_SPLITCELLDLG,1238286336,
-svx_ModelessDialog_RID_SVXDLG_IMAP,2318696448,
 svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701,
 svx_MultiLineEdit_MD_INSERT_OBJECT_APPLET_ED_APPLET_OPTIONS,1598179860,
 svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719,
diff --git a/source/text/shared/01/0201.xhp 
b/source/text/shared/01/0201.xhp
index 662867a..a880be1 100644
--- a/source/text/shared/01/0201.xhp
+++ b/source/text/shared/01/0201.xhp
@@ -36,10 +36,9 @@
 bookmark_valueediting;undoing/bookmark_value
 /bookmark
 bookmark xml-lang=en-US branch=hid/.uno:Undo id=bm_id87410 
localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:Undo id=bm_id3155934 
localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_IMAPDLG_UNDO id=bm_id3148983 
localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/imapdialog/TBI_UNDO 
id=bm_id3148983 localize=false/
 paragraph role=heading id=hd_id3155069 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/01/0201.xhp 
name=UndoUndo/link/paragraph
-paragraph role=paragraph id=par_id3149205 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=HID_IMAPDLG_UNDOReverses the last command or the last 
entry you typed. To select the command that you want to reverse, click the 
arrow next to the emphUndo /emphicon on the Standard 
bar./ahelp/paragraph
+paragraph role=paragraph id=par_id3149205 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=svx/ui/imapdialog/TBI_UNDOReverses the last command or 
the last entry you typed. To select the command that you want to reverse, click 
the arrow next to the emphUndo /emphicon on the Standard 
bar./ahelp/paragraph
 /section
 section id=howtoget
   embed href=text/shared/00/0402.xhp#do/
diff --git a/source/text/shared/01/0202.xhp 
b/source/text/shared/01/0202.xhp
index 914c01e..734f627 100644
--- a/source/text/shared/01/0202.xhp
+++ b/source/text/shared/01/0202.xhp
@@ -33,10 +33,9 @@
 bookmark_valueredo command/bookmark_value
 /bookmarkcommentmw made restoring... a two level entry/comment
 bookmark xml-lang=en-US branch=hid/.uno:Redo id=bm_id5051868 
localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:Redo id=bm_id3154840 
localize=false/
-bookmark xml-lang=en-US branch=hid/SVX_HID_IMAPDLG_REDO id=bm_id3155069 
localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/imapdialog/TBI_REDO 
id=bm_id3155069 localize=false/

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

[Caolán McNamara]

 helpers/help_hid.lst   |   18 --
 source/text/shared/02/01170801.xhp |7 +++
 source/text/shared/02/01170802.xhp |4 ++--
 source/text/shared/02/01170901.xhp |4 ++--
 source/text/shared/02/01170903.xhp |9 +
 source/text/shared/autopi/01090100.xhp |5 -
 source/text/shared/autopi/01120100.xhp |   17 +
 7 files changed, 21 insertions(+), 43 deletions(-)

New commits:
commit e59cf1d627e4e71d9dc40d9e58d93f25b10875f5
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jul 7 13:43:56 2014 +0100

update help ids for various form wizard pages .ui conversions

Change-Id: Ibddbfcfe1c93269ad223ff2af64b072d46a7fb11

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 34d66d6..8b1bdd0 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5104,19 +5104,12 @@ 
desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW,586088965,
 extensions_CheckBox_RID_DLG_SELECTLABELCONTROL_1,1090126849,
 extensions_CheckBox_RID_TP_LICENSE_CB_ACCEPT,55366,
-extensions_ComboBox_RID_PAGE_LCW_FIELDLINK_CMB_TABLEFIELD,859787266,
-extensions_ComboBox_RID_PAGE_LCW_FIELDLINK_CMB_VALUELISTFIELD,859787265,
-extensions_Edit_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS,859670529,
 
extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836,
 extensions_Edit_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT,859736067,
 extensions_Edit_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE,859703298,
 extensions_ListBox_RID_DLG_SELECTION_LB_ENTRIES,1090178561,
 
extensions_ListBox_RID_PAGE_DEFAULTFIELDSELECTION_LB_DEFSELECTIONFIELD,859688451,
-extensions_ListBox_RID_PAGE_GROUPRADIOSELECTION_LB_RADIOBUTTONS,859672067,
-extensions_ListBox_RID_PAGE_GW_FIELDSELECTION_LB_EXISTING_FIELDS,859803143,
-extensions_ListBox_RID_PAGE_GW_FIELDSELECTION_LB_SELECTED_FIELDS,859803144,
 
extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374,
-extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_TABLE_LB_SELECTTABLE,859753989,
 extensions_ListBox_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS,859704835,
 extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220,
 extensions_ModalDialog_RID_DLG_FORMLINKS,1090158592,
@@ -5130,24 +5123,13 @@ 
extensions_MultiLineEdit_RID_TP_LICENSE_ML_LICENSE,553667083,
 extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649,
-extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETOLEFT,859673090,
-extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETORIGHT,859673089,
-extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT,859804166,
-extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSRIGHT,859804164,
-extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_FIELDLEFT,859804165,
-extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_FIELDRIGHT,859804163,
 extensions_PushButton_RID_TP_LICENSE_PB_PAGEDOWN,553669138,
 
extensions_RadioButton_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO,859685378,
 
extensions_RadioButton_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES,859685377,
 extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148,
 extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES,859718147,
 extensions_TabPage_RID_PAGE_DEFAULTFIELDSELECTION,859684864,
-extensions_TabPage_RID_PAGE_FORM_DATASOURCE_STATUS,859815936,
-extensions_TabPage_RID_PAGE_GROUPRADIOSELECTION,859668480,
-extensions_TabPage_RID_PAGE_GW_FIELDSELECTION,859799552,
 extensions_TabPage_RID_PAGE_LCW_CONTENTSELECTION_FIELD,859766784,
-extensions_TabPage_RID_PAGE_LCW_CONTENTSELECTION_TABLE,859750400,
-extensions_TabPage_RID_PAGE_LCW_FIELDLINK,859783168,
 extensions_TabPage_RID_PAGE_OPTIONS_FINAL,859734016,
 extensions_TabPage_RID_PAGE_OPTIONVALUES,859701248,
 extensions_TabPage_RID_PAGE_OPTION_DBFIELD,859717632,
diff --git a/source/text/shared/02/01170801.xhp 
b/source/text/shared/02/01170801.xhp
index 6821cd0..9ed8be4 100644
--- a/source/text/shared/02/01170801.xhp
+++ b/source/text/shared/02/01170801.xhp
@@ -32,17 +32,16 @@
 /meta
 body
 section id=seite1
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/tableselectionpage/TableSelectionPage 
id=bm_id3150808 localize=false/
 paragraph role=heading id=hd_id3153323 xml-lang=en-US level=1 
l10n=U oldref=3link href=text/shared/02/01170801.xhp name=Table 
Element / List Box / Combo Box Wizard: DataTable Element / List Box / Combo 
Box Wizard: Data/link/paragraph
 paragraph role=paragraph id=par_id3150476 xml-lang=en-US l10n=U 
oldref=4Select the data source and table to which the form field 
corresponds. If you insert the form field in a document that is already linked 
to a data source, this page becomes invisible./paragraph
 /section
 section id=howtoget
   embed href=text/shared/00/00040501.xhp#aupitab1/
 

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

[Caolán McNamara]

 helpers/help_hid.lst  |5 -
 source/text/shared/explorer/database/menufilesave.xhp |9 +
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 0f1f83aefafb087df4b324437de11c7217f77d1a
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jul 2 09:53:07 2014 +0100

update help ids for collection view .ui conversion

Change-Id: I09e7a1ee6f3277eff5afbcda163cee2b2abdf2b9

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ff90cf3..401e55d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1369,7 +1369,6 @@ HID_EVT_SUBMITTED,38086,
 HID_EVT_TEXTCHANGED,38087,
 HID_EVT_UNLOADED,38088,
 HID_EVT_UNLOADING,38099,
-HID_EXPLORERDLG_COLLECTION,39037,
 HID_EXPLORERDLG_FILE,32998,
 HID_EXTENSION_MANAGER_LISTBOX,42791,
 HID_EXTENSION_MANAGER_LISTBOX_DISABLE,42794,
@@ -5029,7 +5028,6 @@ dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589,
 dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588,
 dbaccess_Edit_DLG_ADABASSTAT_ET_SYSDEVSPACE,1388611585,
 dbaccess_Edit_DLG_ADABASSTAT_ET_TRANSACTIONLOG,1388611586,
-dbaccess_Edit_DLG_COLLECTION_VIEW_ED_EXPLORERFILE_FILENAME,1388759041,
 dbaccess_Edit_DLG_DOMAINPASSWORD_ET_PASSWORD,1388709890,
 dbaccess_Edit_DLG_PARAMETERS_ET_PARAM,1388398596,
 dbaccess_Edit_PAGE_ADABAS_ET_CTRLPASSWORD,851527681,
@@ -5044,8 +5042,6 @@ dbaccess_Edit_PAGE_USERDRIVER_ET_OPTIONS,851757059,
 dbaccess_FL_SEPARATOR2_PAGE_MYSQL_NATIVE,851836928,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_MYSQL_JDBC,851771392,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_ORACLE_JDBC,851886080,
-dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_NEWFOLDER,1388768769,
-dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_UP,1388768770,
 dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN,851635725,
 dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT,851635727,
 dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP,851635724,
@@ -5066,7 +5062,6 @@ dbaccess_NumericField_PAGE_ADABAS_NF_CACHE_SIZE,851531778,
 dbaccess_NumericField_PAGE_ADABAS_NF_DATA_INCREMENT,851531777,
 dbaccess_NumericField_PAGE_USERDRIVER_NF_PORTNUMBER,851761153,
 dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697,
-dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE,1388761603,
 dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158,
 dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241,
 dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION,851546626,
diff --git a/source/text/shared/explorer/database/menufilesave.xhp 
b/source/text/shared/explorer/database/menufilesave.xhp
index 240a8c3..3256351 100644
--- a/source/text/shared/explorer/database/menufilesave.xhp
+++ b/source/text/shared/explorer/database/menufilesave.xhp
@@ -31,18 +31,19 @@
 /history
 /meta
 body
+bookmark xml-lang=en-US 
branch=hid/dbaccess/ui/collectionviewdialog/CollectionView id=bm_id2862637 
localize=false/
 paragraph role=heading id=par_idN10547 xml-lang=en-US level=1 
l10n=NEWSave/paragraph
 paragraph role=paragraph id=par_idN1054B xml-lang=en-US l10n=NEWIn 
this dialog, you can specify the position and name of a form commentUFI: spec 
says also for report, but reports can be created only by Wizard and are 
autosaved there/commentcommentUFI: spec says also for query, cannot 
verify/comment that you save within a link 
href=text/shared/explorer/database/dabadoc.xhpdatabase file/link. The 
dialog opens automatically when you save a form the first time.commentUFI: no 
chance to open the dialog a second time/comment/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER
 id=bm_id2862636 localize=false/
+bookmark xml-lang=en-US 
branch=hid/dbaccess/ui/collectionviewdialog/newFolderButton id=bm_id2862636 
localize=false/
 paragraph role=heading id=par_idN10564 xml-lang=en-US level=2 
l10n=NEWCreate New Directory/paragraph
 paragraph role=paragraph id=par_idN10568 xml-lang=en-US 
l10n=NEWahelp hid=.Click to create a new folder within the database 
file./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP 
id=bm_id2447279 localize=false/
+bookmark xml-lang=en-US 
branch=hid/dbaccess/ui/collectionviewdialog/upButton id=bm_id2447279 
localize=false/
 paragraph role=heading id=par_idN1057F xml-lang=en-US level=2 
l10n=NEWUp One Level/paragraph
 paragraph role=paragraph id=par_idN10583 xml-lang=en-US 
l10n=NEWahelp hid=.Click to go up one level in the folder 
hierarchy./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME 
id=bm_id1669362 localize=false/
+bookmark xml-lang=en-US 
branch=hid/dbaccess/ui/collectionviewdialog/fileNameEntry id=bm_id1669362 
localize=false/
 paragraph role=heading id=par_idN1059A xml-lang=en-US level=2 
l10n=NEWFile name/paragraph
 paragraph role=paragraph id=par_idN1059E xml-lang=en-US 
l10n=NEWahelp hid=.Enter the file name for the saved 

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

[Caolán McNamara]

 helpers/help_hid.lst |5 -
 source/text/swriter/01/mm_emabod.xhp |5 +++--
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 5e7710362c86e7559f15d9c3dea4e392c2605caf
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jul 2 12:09:41 2014 +0100

update help ids for mailmerge body dialog .ui conversion

Change-Id: I7f312236f7bb3398724eec24ab2d674068380661

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 401e55d..34d66d6 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2026,8 +2026,6 @@ HID_MM_BODY_LB_MALE,55029,
 HID_MM_BODY_PB_FEMALE,55028,
 HID_MM_BODY_PB_MALE,55030,
 HID_MM_CUSTOMFIELDS,54986,
-HID_MM_DBTABLEPREVIEWDIALOG,54965,
-HID_MM_MAILBODY,54982,
 HID_MM_MAILSTATUS_TLB,54988,
 HID_MM_NEXT_PAGE,55016,
 HID_MM_PREV_PAGE,55017,
@@ -5740,7 +5738,6 @@ sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_RTF,1446609942,
 sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940,
 sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938,
 sw_CheckBox_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE,1446609961,
-sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279,
 sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186,
 sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196,
 sw_CheckBox_TP_LAB_LAB_BOX_ADDR,909689858,
@@ -5774,7 +5771,6 @@ sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969,
 sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960,
 sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
 sw_Edit_TP_LINENUMBERING_ED_DIVISOR,87975,
-sw_FT_BODY_DLG_MM_MAILBODY,1435402240,
 sw_ImageButton_TP_LAB_LAB_BTN_INSERT,909700627,
 sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_DOWN,888499833,
 sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_UP,888499832,
@@ -5829,7 +5825,6 @@ sw_MetricField_TP_TABLE_COLUMN_ED_SPACE,888494718,
 sw_ModalDialog_DLG_CHANGE_DB,1419591680,
 sw_ModalDialog_DLG_DBSELECTION,1435009024,
 sw_ModalDialog_DLG_MAILMERGEWIZARD,1435058176,
-sw_MultiLineEdit_DLG_MM_MAILBODY_MLE_BODY,1435404831,
 sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395,
 sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045,
 sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047,
diff --git a/source/text/swriter/01/mm_emabod.xhp 
b/source/text/swriter/01/mm_emabod.xhp
index 1b7501d..e407eb2 100644
--- a/source/text/swriter/01/mm_emabod.xhp
+++ b/source/text/swriter/01/mm_emabod.xhp
@@ -31,9 +31,10 @@
 /history
 /meta
 body
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/mmmailbody/MailBodyDialog id=bm_id495011 
localize=false/
 paragraph role=heading id=par_idN1053C xml-lang=en-US level=1 
l10n=NEWE-Mail Message/paragraph
 paragraph role=paragraph id=par_idN10540 xml-lang=en-US l10n=NEWType 
the message and the salutation for files that you send as link 
href=text/swriter/01/mailmerge08.xhpe-mail/link attachments./paragraph
-bookmark xml-lang=en-US 
branch=hid/SW_CHECKBOX_DLG_MM_MAILBODY_CB_GREETINGLINE id=bm_id1831110 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmailbody/greeting 
id=bm_id1831110 localize=false/
 paragraph role=heading id=par_idN10554 xml-lang=en-US level=2 
l10n=NEWThis e-mail should contain a salutation/paragraph
 paragraph role=paragraph id=par_idN10558 xml-lang=en-US 
l10n=NEWahelp hid=.Adds a salutation to the e-mail./ahelp/paragraph
 !-- removed HID 1435403266 --
@@ -60,7 +61,7 @@
 !-- removed HID 1435406350 --
 paragraph role=heading id=par_idN105A8 xml-lang=en-US level=3 
l10n=NEWGeneral salutation/paragraph
 paragraph role=paragraph id=par_idN105AC xml-lang=en-US 
l10n=NEWahelp hid=.Select the default greeting to use if a personalized 
salutation cannot be created./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/SW_MULTILINEEDIT_DLG_MM_MAILBODY_MLE_BODY id=bm_id495010 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmailbody/bodymle 
id=bm_id495010 localize=false/
 paragraph role=heading id=par_idN105AF xml-lang=en-US level=3 
l10n=NEWWrite your message here/paragraph
 paragraph role=paragraph id=par_idN105B3 xml-lang=en-US 
l10n=NEWahelp hid=.Enter the main text of the e-mail./ahelp/paragraph
 /body
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |   15 ---
 source/text/shared/01/0102.xhp |   28 +++-
 source/text/shared/01/0107.xhp |4 ++--
 3 files changed, 13 insertions(+), 34 deletions(-)

New commits:
commit 4afc42f9eb3f50b542f22414045856bfc588855e
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jun 30 15:02:44 2014 +0100

update help ids for file picker .ui conversion

Change-Id: Ia6e6f34a0762cff50b4dfbafe0abd59620e391bb

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 5d70b29..ff90cf3 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1399,7 +1399,6 @@ HID_FIELDLINK_DETAIL_COLUMN,37917,
 HID_FIELDLINK_MASTER_COLUMN,37918,
 HID_FIELD_SEL,38070,
 HID_FIELD_SEL_WIN,38071,
-HID_FILEDLG_AUTOCOMPLETEBOX,33286,
 HID_FILEDLG_CHARDLG,53063,
 HID_FILEDLG_FRMPAGE,53068,
 HID_FILEDLG_INSERT_BTN,33290,
@@ -1413,7 +1412,6 @@ HID_FILEDLG_SRCVIEW,53069,
 HID_FILEDLG_STANDARD,33095,
 HID_FILEDLG_WIZDOKU,53070,
 HID_FILEOPEN_IMAGE_TEMPLATE,33018,
-HID_FILEOPEN_READONLY,33016,
 HID_FILEOPEN_VERSION,33017,
 HID_FILESAVE_AUTOEXTENSION,33010,
 HID_FILESAVE_CREATEDIRECTORY,33003,
@@ -5171,19 +5169,6 @@ 
filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_SLIDE_CONTENTS,1090520068,
 filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_SOUND,1090520069,
 filter_ModalDialog_DLG_OPTIONS,1090519040,
 filter_NumericField_DLG_OPTIONS_NUM_FLD_QUALITY,1090525185,
-fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_AUTO_EXTENSION,1334641706,
-fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_EXPLORERFILE_PASSWORD,1334641705,
-fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_EXPLORERFILE_READONLY,1334641704,
-fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_OPTIONS,1334641707,
-fpicker_Edit_DLG_SVT_EXPLORERFILE_ED_EXPLORERFILE_FILENAME,1334642719,
-fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_DETAILSVIEW,1334652429,
-fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_LISTVIEW,1334652428,
-fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER,1334652427,
-fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE,1334644259,
-fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_SHARED_LISTBOX,1334644257,
-fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD,1334652943,
-fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP,1334652942,
-fpicker_PushButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN,1334645264,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_FOOTERLST,2114719236,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_GROUPONLST,2114719238,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_HEADERLST,2114719234,
diff --git a/source/text/shared/01/0102.xhp 
b/source/text/shared/01/0102.xhp
index 2038aeb..d2344de 100644
--- a/source/text/shared/01/0102.xhp
+++ b/source/text/shared/01/0102.xhp
@@ -41,28 +41,25 @@
   bookmark_valuestyles; 'changed' message/bookmark_value
 /bookmarkcommentmw replaced wildcards by regular 
expressions/commentcommentmw deleted regular expressions; and 
files;/comment
 bookmark xml-lang=en-US branch=hid/.uno:Open id=bm_id3908743 
localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:Open id=bm_id3146765 
localize=false/
-bookmark xml-lang=en-US branch=hid/SVT_HID_EXPLORERDLG_FILE 
id=bm_id3147069 localize=false/
+bookmark xml-lang=en-US 
branch=hid/fpicker/ui/explorerfiledialog/ExplorerFileDialog id=bm_id3147069 
localize=false/
 paragraph xml-lang=en-US id=hd_id3146936 role=heading level=1 
l10n=U oldref=1link href=text/shared/01/0102.xhp 
name=OpenOpen/link/paragraph
-  paragraph xml-lang=en-US id=par_id3151191 role=paragraph l10n=U 
oldref=2variable id=oeffnentextahelp hid=HID_EXPLORERDLG_FILEOpens 
or imports a file./ahelp
+  paragraph xml-lang=en-US id=par_id3151191 role=paragraph l10n=U 
oldref=2variable id=oeffnentextahelp 
hid=fpicker/ui/explorerfiledialog/ExplorerFileDialogOpens or imports a 
file./ahelp
 /variable/paragraph
 section id=howtoget
 embed href=text/shared/00/0401.xhp#oeffnen/
 /section
 paragraph role=paragraph id=par_id3149877 xml-lang=en-US l10n=U 
oldref=109The following sections describe the item 
type=productname%PRODUCTNAME/item emphOpen/emph dialog box. To 
activate the item type=productname%PRODUCTNAME/item emphOpen/emph and 
emphSave/emph dialog boxes, choose emphswitchinline 
select=syscaseinline select=MAC%PRODUCTNAME - 
Preferences/caseinlinedefaultinlineTools - 
Options/defaultinline/switchinline - link 
href=text/shared/optionen/01010600.xhp name=%PRODUCTNAME - 
General%PRODUCTNAME- General/link/emph, and then select the emphUse 
%PRODUCTNAME dialogs/emph in the emphOpen/Save dialogs/emph 
area./paragraph
 paragraph role=note id=par_id3150713 xml-lang=en-US l10n=U 
oldref=52If the file that you want to open contains Styles, link 
href=text/shared/01/0102.xhp#vorlagen name=special rulesspecial 
rules/link apply./paragraph
-!-- removed HID SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP 
--
 embed 

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

[Caolán McNamara]

 helpers/help_hid.lst   |   11 --
 source/text/shared/autopi/01050100.xhp |   36 -
 source/text/shared/autopi/01050200.xhp |   26 +++
 source/text/shared/autopi/01050300.xhp |   32 ++---
 source/text/shared/autopi/01050400.xhp |   14 ++--
 source/text/shared/autopi/01050500.xhp |6 ++---
 6 files changed, 57 insertions(+), 68 deletions(-)

New commits:
commit c18a4da59f386b125bf65adc0238a4fa712910a5
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jun 23 13:56:08 2014 +0100

update helpids for impress wizard .ui conversion

Change-Id: I9c611a8b336396140f092f76c76c68d0cbc0a110

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f96074c..5d70b29 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2708,16 +2708,6 @@ HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL,59926,
 HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY,59927,
 HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW,59928,
 HID_SD_ANNOTATIONS,59969,
-HID_SD_AUTOPILOT_OPEN,59887,
-HID_SD_AUTOPILOT_PAGE1,59771,
-HID_SD_AUTOPILOT_PAGE2,59772,
-HID_SD_AUTOPILOT_PAGE3,59773,
-HID_SD_AUTOPILOT_PAGE4,59774,
-HID_SD_AUTOPILOT_PAGE5,59775,
-HID_SD_AUTOPILOT_PAGE6,59776,
-HID_SD_AUTOPILOT_PAGETEMPLATES,59888,
-HID_SD_AUTOPILOT_REGION,59885,
-HID_SD_AUTOPILOT_TEMPLATES,59886,
 HID_SD_BTN_DRAW,59782,
 HID_SD_BTN_FILTERDIALOG,59778,
 HID_SD_BTN_HANDOUT,59786,
@@ -4581,7 +4571,6 @@ SID_SC_EDIT_OBJECT,26234,.uno:EditObject
 SID_SC_RANGE,26585,.uno:Range
 SID_SC_SELECTION,26586,.uno:Selection
 SID_SC_SETTEXT,26617,.uno:PutCell
-SID_SD_AUTOPILOT,10425,.uno:AutoPilotPresentations
 SID_SD_EDITOPTIONS,10434,.uno:SdEditOptions
 SID_SD_GRAPHIC_OPTIONS,10447,.uno:SdGraphicOptions
 SID_SEARCH_DLG,5961,.uno:SearchDialog
diff --git a/source/text/shared/autopi/01050100.xhp 
b/source/text/shared/autopi/01050100.xhp
index 8dc225f..3914595 100644
--- a/source/text/shared/autopi/01050100.xhp
+++ b/source/text/shared/autopi/01050100.xhp
@@ -33,39 +33,39 @@ dedr: fixed #i31165#/lastedited
 /meta
 body
 section id=autopilotseite1
-bookmark xml-lang=en-US branch=hid/SD_HID_SD_AUTOPILOT_PAGE1 
id=bm_id3155364 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/assistentdialog/page1Box id=bm_id3155364 
localize=false/
 paragraph role=heading id=hd_id3155320 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/autopi/01050100.xhp 
name=Presentation Wizard Page 1Presentation Wizard Page 1/link/paragraph
-paragraph role=paragraph id=par_id3152594 xml-lang=en-US l10n=U 
oldref=14ahelp hid=HID_SD_AUTOPILOT_PAGE1Specifies the presentation type 
and allows you to select a template./ahelp/paragraph
+paragraph role=paragraph id=par_id3152594 xml-lang=en-US l10n=U 
oldref=14ahelp hid=modules/simpress/ui/assistentdialog/page1BoxSpecifies 
the presentation type and allows you to select a template./ahelp/paragraph
 /section
 section id=howtoget
   embed href=text/shared/00/0401.xhp#dtapse/
 /section
 paragraph role=heading id=hd_id3145090 xml-lang=en-US level=2 
l10n=U oldref=15Type/paragraph
 paragraph role=paragraph id=par_id3153684 xml-lang=en-US l10n=U 
oldref=23You can determine the presentation type in this area./paragraph
-bookmark xml-lang=en-US branch=hid/sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY 
id=bm_id3153749 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/assistentdialog/emptyRadiobutton 
id=bm_id3153749 localize=false/
 paragraph role=heading id=hd_id3153527 xml-lang=en-US level=3 
l10n=U oldref=16Empty presentation/paragraph
-paragraph role=paragraph id=par_id3149388 xml-lang=en-US l10n=U 
oldref=24ahelp hid=SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_EMPTYCreates a new 
(empty) presentation./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE id=bm_id3153346 
localize=false/
+paragraph role=paragraph id=par_id3149388 xml-lang=en-US l10n=U 
oldref=24ahelp 
hid=modules/simpress/ui/assistentdialog/emptyRadiobuttonCreates a new 
(empty) presentation./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/assistentdialog/templateRadiobutton 
id=bm_id3153346 localize=false/
 paragraph role=heading id=hd_id3147008 xml-lang=en-US level=3 
l10n=U oldref=17From template/paragraph
-paragraph role=paragraph id=par_id3154318 xml-lang=en-US l10n=U 
oldref=25ahelp hid=SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_TEMPLATEOpens a list 
box containing various modifiable presentations./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN 
id=bm_id3166460 localize=false/
+paragraph role=paragraph id=par_id3154318 xml-lang=en-US l10n=U 
oldref=25ahelp 
hid=modules/simpress/ui/assistentdialog/templateRadiobuttonOpens a list box 
containing various modifiable presentations./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/assistentdialog/openRadiobutton 
id=bm_id3166460 localize=false/
 paragraph role=heading id=hd_id3153662 

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

[Caolán McNamara]

 helpers/help_hid.lst  |3 ---
 source/text/shared/01/securitywarning.xhp |   12 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 63b93ef85a0c7f0081cabb2a69d707ca67bd7cea
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 18 15:11:50 2014 +0100

update help ids for macro warning message .ui conversion

Change-Id: I527e0426a158563722a8a25f6d3919b51bb6

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index bd465ae..845a227 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3174,7 +3174,6 @@ HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE,38126,
 HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT,38125,
 HID_XFORMS_TOOLBOX_ITEM_EDIT,38127,
 HID_XFORMS_TOOLBOX_ITEM_REMOVE,38128,
-HID_XMLSECDLG_MACROWARN,35847,
 HID_XMLSEC_CALL,40016,
 HID_XMLSEC_CTRL_ELEMENTS,43079,
 HID_XMLSEC_DLG_CERTCHOOSER,43077,
@@ -5939,7 +5938,6 @@ tab_PushButton_TP_LICENSE_PB_LICENSE_DOWN,545182215,
 tab_PushButton_TP_PURCHASE_PB_PURCHASE_GET,545116676,
 uui_CheckBox_DLG_UUI_LOGIN_CB_LOGIN_SAVEPASSWORD,1311343648,
 uui_CheckBox_DLG_UUI_LOGIN_CB_LOGIN_USESYSCREDS,1311343650,
-uui_CheckBox_RID_XMLSECDLG_MACROWARN_CB_ALWAYSTRUST,1311802374,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_ACCOUNT,1311344671,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_PASSWORD,1311344669,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_PATH,1311344662,
@@ -5950,7 +5948,6 @@ uui_PushButton_DLG_COOKIES_BTN_COOKIES_CANCEL,1311363614,
 uui_PushButton_DLG_COOKIES_BTN_COOKIES_OK,1311363615,
 uui_PushButton_DLG_UUI_LOGIN_BTN_LOGIN_PATH,1311347224,
 uui_PushButton_RID_DLG_NEWER_VERSION_WARNING_PB_UPDATE,1312182797,
-uui_PushButton_RID_XMLSECDLG_MACROWARN_PB_VIEWSIGNS,1311805956,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_IGNORE,1311359509,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_INTERACTIVE,1311359510,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_SEND,1311359508,
diff --git a/source/text/shared/01/securitywarning.xhp 
b/source/text/shared/01/securitywarning.xhp
index dac9af0..cd8d190 100644
--- a/source/text/shared/01/securitywarning.xhp
+++ b/source/text/shared/01/securitywarning.xhp
@@ -37,18 +37,18 @@
 bookmark_valuemacros;security warning dialog/bookmark_value
 /bookmark
 bookmark xml-lang=en-US branch=hid/SFX2_HID_WARNING_SECURITY_HYPERLINK 
id=bm_id5382854 localize=false/
-bookmark xml-lang=en-US branch=hid/UUI_HID_XMLSECDLG_MACROWARN 
id=bm_id947 localize=false/
+bookmark xml-lang=en-US branch=hid/uui/ui/macrowarnmedium/MacroWarnMedium 
id=bm_id947 localize=false/
 paragraph role=heading id=par_idN1054D xml-lang=en-US level=1 
l10n=NEWvariable id=securitywarninglink 
href=text/shared/01/securitywarning.xhpSecurity Warning/link
 /variable/paragraph
 paragraph role=paragraph id=par_idN1056B xml-lang=en-US l10n=NEWWhen 
you open a document that contains an unsigned macro, or a signed macro from an 
unknown source, the emphSecurity Warning/emph dialog opens./paragraph
-paragraph role=paragraph id=par_idN105FC xml-lang=en-US 
l10n=NEWahelp hid=.Enable or disable the macros. Choose 
emph%PRODUCTNAME - Security/emph in the Options dialog box to set the 
options./ahelp/paragraph
+paragraph role=paragraph id=par_idN105FC xml-lang=en-US 
l10n=NEWahelp hid=Enable or disable the macros. Choose 
emph%PRODUCTNAME - Security/emph in the Options dialog box to set the 
options./ahelp/paragraph
 paragraph role=heading id=par_idN1056E xml-lang=en-US level=2 
l10n=NEWView Signature/paragraph
-paragraph role=paragraph id=par_idN10572 xml-lang=en-US 
l10n=NEWahelp hid=.Opens a dialog where you can view the 
signature./ahelp/paragraph
+paragraph role=paragraph id=par_idN10572 xml-lang=en-US 
l10n=NEWahelp hid=uui/ui/macrowarnmedium/viewSignsButtonOpens a dialog 
where you can view the signature./ahelp/paragraph
 paragraph role=heading id=par_idN10587 xml-lang=en-US level=2 
l10n=NEWAlways trust macros from this source/paragraph
-paragraph role=paragraph id=par_idN1058B xml-lang=en-US 
l10n=NEWahelp hid=.Adds the current macro source to the list of link 
href=text/shared/optionen/macrosecurity_ts.xhptrusted 
sources/link./ahelp/paragraph
+paragraph role=paragraph id=par_idN1058B xml-lang=en-US 
l10n=NEWahelp hid=uui/ui/macrowarnmedium/alwaysTrustCheckbuttonAdds the 
current macro source to the list of link 
href=text/shared/optionen/macrosecurity_ts.xhptrusted 
sources/link./ahelp/paragraph
 paragraph role=heading id=par_idN1059C xml-lang=en-US level=2 
l10n=NEWEnable Macros/paragraph
-paragraph role=paragraph id=par_idN105A0 xml-lang=en-US 
l10n=NEWahelp hid=.Allows macros in the document to 
run./ahelp/paragraph
+paragraph role=paragraph id=par_idN105A0 xml-lang=en-US 
l10n=NEWahelp hid=uui/ui/macrowarnmedium/okAllows macros in the document 
to run./ahelp/paragraph
 paragraph role=heading id=par_idN105A3 xml-lang=en-US level=2 
l10n=NEWDisable Macros/paragraph
-paragraph role=paragraph id=par_idN105A7 xml-lang=en-US 
l10n=NEWahelp hid=.Does not allow macros in the document to 
run./ahelp/paragraph
+paragraph role=paragraph 

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

[Caolán McNamara]

 helpers/help_hid.lst   |4 
 source/text/shared/02/09070100.xhp |6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit d2a1a4fa5f1f45b6d137e9792bb3259e062cc3ff
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 18 15:48:04 2014 +0100

update help ids for hyperlink mark window .ui conversion

Change-Id: I245ebd9c6e73917aef722b2a2a1d75b9118b9f18

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 845a227..f96074c 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1845,10 +1845,6 @@ HID_HYPERDLG_MAIL_PATH,34091,
 HID_HYPERLINK_DOCUMENT,34085,
 HID_HYPERLINK_INTERNET,34083,
 HID_HYPERLINK_MAIL,34084,
-HID_HYPERLINK_MARKWND,34087,
-HID_HYPERLINK_MARKWND_APPLY,34095,
-HID_HYPERLINK_MARKWND_CLOSE,34096,
-HID_HYPERLINK_MARKWND_TREE,34097,
 HID_HYPERLINK_NEWDOCUMENT,34086,
 HID_ICCDIALOG_CANCEL_BTN,34094,
 HID_ICCDIALOG_CHOICECTRL,34089,
diff --git a/source/text/shared/02/09070100.xhp 
b/source/text/shared/02/09070100.xhp
index cad4eb3..658df75 100644
--- a/source/text/shared/02/09070100.xhp
+++ b/source/text/shared/02/09070100.xhp
@@ -46,9 +46,9 @@
 paragraph role=paragraph id=par_id9887081 xml-lang=en-US 
l10n=NEWahelp hid=.Enter a URL for the file that you want to open when 
you click the hyperlink. If you do not specify a target frame, the file opens 
in the current document or frame./ahelpcommentsee 
i48946/comment/paragraph
 bookmark xml-lang=en-US 
branch=hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE 
id=bm_id3158432 localize=false/paragraph role=heading id=hd_id3155628 
xml-lang=en-US level=3 l10n=U oldref=13WWW Browser/paragraph
 paragraph role=paragraph id=par_id3153760 xml-lang=en-US l10n=U 
oldref=14ahelp 
hid=SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSEOpens a web 
browser, into which you can load the desired URL./ahelp You can then copy and 
paste the URL into the emphTarget/emph field./paragraph
-bookmark xml-lang=en-US branch=hid/CUI_HID_HYPERLINK_MARKWND_TREE 
id=bm_id3159167 localize=false/paragraph role=paragraph 
id=par_id3147335 xml-lang=en-US l10n=U oldref=33ahelp 
hid=HID_HYPERLINK_MARKWND_TREE visibility=hiddenSpecifies the position in 
the target document where you wish to jump to./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/CUI_HID_HYPERLINK_MARKWND_APPLY 
id=bm_id3159177 localize=false/paragraph role=paragraph 
id=par_id3149164 xml-lang=en-US l10n=U oldref=34ahelp 
hid=HID_HYPERLINK_MARKWND_APPLY visibility=hiddenInserts the target in the 
emphTarget/emph field of the emphHyperlink/emph 
dialog./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/CUI_HID_HYPERLINK_MARKWND_CLOSE 
id=bm_id3145416 localize=false/paragraph role=paragraph 
id=par_id3155388 xml-lang=en-US l10n=U oldref=35ahelp 
hid=HID_HYPERLINK_MARKWND_CLOSE visibility=hiddenOnce the hyperlink has 
been completely entered, click on emphClose/emph to set the link and leave 
the dialog./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/hyperlinkmarkdialog/TreeListBox 
id=bm_id3159167 localize=false/paragraph role=paragraph 
id=par_id3147335 xml-lang=en-US l10n=U oldref=33ahelp 
hid=cui/ui/hyperlinkmarkdialog/TreeListBox visibility=hiddenSpecifies the 
position in the target document where you wish to jump to./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/hyperlinkmarkdialog/apply 
id=bm_id3159177 localize=false/paragraph role=paragraph 
id=par_id3149164 xml-lang=en-US l10n=U oldref=34ahelp 
hid=cui/ui/hyperlinkmarkdialog/apply visibility=hiddenInserts the target 
in the emphTarget/emph field of the emphHyperlink/emph 
dialog./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/hyperlinkmarkdialog/close 
id=bm_id3145416 localize=false/paragraph role=paragraph 
id=par_id3155388 xml-lang=en-US l10n=U oldref=35ahelp 
hid=cui/ui/hyperlinkmarkdialog/close visibility=hiddenOnce the hyperlink 
has been completely entered, click on emphClose/emph to set the link and 
leave the dialog./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN id=bm_id3154307 
localize=false/paragraph role=heading id=hd_id3153320 xml-lang=en-US 
level=3 l10n=U oldref=15Login name/paragraph
 paragraph role=paragraph id=par_id3151384 xml-lang=en-US l10n=U 
oldref=16ahelp 
hid=SVX:EDIT:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGINSpecifies your login 
name, if you are working with FTP addresses./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD 
id=bm_id3154923 localize=false/paragraph role=heading id=hd_id3148944 
xml-lang=en-US level=3 l10n=U oldref=17Password/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst |3 ---
 source/text/swriter/01/mm_seltab.xhp |5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit e7a1c4616c4c5487191a047d155cf841d75cd530
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jun 16 11:48:49 2014 +0100

update helpds ids for select table dialog .ui conversion

Change-Id: I1550e863403b8d01eacfc3f7a2207bacfef8d09f

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 5f3877b..87cf3ad 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2053,8 +2053,6 @@ HID_MM_MAILBODY,54982,
 HID_MM_MAILSTATUS_TLB,54988,
 HID_MM_NEXT_PAGE,55016,
 HID_MM_PREV_PAGE,55017,
-HID_MM_SELECTDBTABLEDDIALOG,54963,
-HID_MM_SELECTDBTABLEDDIALOG_LISTBOX,54964,
 HID_MM_SENDMAILS,54983,
 HID_MM_SENDMAILS_STATUSLB,54984,
 HID_MNU_FUNC_AVG,34036,
@@ -5925,7 +5923,6 @@ 
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_DETAILS,1972294210,
 sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_STOP,1972294213,
 sw_PushButton_DLG_MAILMERGE_PB_ATTACH,1446613538,
 sw_PushButton_DLG_MAILMERGE_PB_PATH,1446613530,
-sw_PushButton_DLG_MM_SELECTDBTABLEDDIALOG_PB_PREVIEW,1435210243,
 sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
 sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820,
 sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT,879350288,
diff --git a/source/text/swriter/01/mm_seltab.xhp 
b/source/text/swriter/01/mm_seltab.xhp
index 7613945..77c0755 100644
--- a/source/text/swriter/01/mm_seltab.xhp
+++ b/source/text/swriter/01/mm_seltab.xhp
@@ -24,14 +24,15 @@
helpdocument version=1.0
 meta
 topic id=textswriter01mm_seltabxml indexer=include status=PUBLISH
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/selecttabledialog/SelectTableDialog 
id=bm_id6627093 localize=false/
 title id=tit xml-lang=en-USSelect Table/title
 filename/text/swriter/01/mm_seltab.xhp/filename
 /topic
 /meta
 body
-bookmark xml-lang=en-US branch=hid/SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX 
id=bm_id6627094 localize=false/paragraph role=heading id=par_idN10542 
xml-lang=en-US level=1 l10n=NEWSelect Table/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/selecttabledialog/table id=bm_id6627094 
localize=false/paragraph role=heading id=par_idN10542 xml-lang=en-US 
level=1 l10n=NEWSelect Table/paragraph
 paragraph role=paragraph id=par_idN10546 xml-lang=en-US 
l10n=NEWahelp hid=.Select the table that you want to use for link 
href=text/swriter/01/mm_seladdlis.xhpmail merge/link 
addresses./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sw:PushButton:DLG_MM_SELECTDBTABLEDDIALOG:PB_PREVIEW 
id=bm_id2926419 localize=false/paragraph role=heading id=par_idN10557 
xml-lang=en-US level=2 l10n=NEWPreview/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/selecttabledialog/preview id=bm_id2926419 
localize=false/paragraph role=heading id=par_idN10557 xml-lang=en-US 
level=2 l10n=NEWPreview/paragraph
 paragraph role=paragraph id=par_idN1055B xml-lang=en-US 
l10n=NEWahelp hid=.Opens the emphMail Merge Recipients/emph 
dialog./ahelp/paragraph
 /body
 /helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |   32 
 source/text/shared/01/0225.xhp |   36 +++-
 2 files changed, 3 insertions(+), 65 deletions(-)

New commits:
commit 2a5201adaccab4f47cf314270fd4ffda76942057
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Jun 14 16:16:04 2014 +0100

connect help documentation for mapping dialog to the right place

Change-Id: I5e38489d26162552fae72da8c6aca0e14a90e28f

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index fe07541..5f3877b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1280,7 +1280,6 @@ HID_DLG_FILTER_SELECT,35842,
 HID_DLG_FLDEDT_ADDRESS,53061,
 HID_DLG_FLDEDT_NEXT,53059,
 HID_DLG_FLDEDT_PREV,53060,
-HID_DLG_MAPPING,34842,
 HID_DLG_NAME,33818,
 HID_DLG_NEWERVERSIONWARNING,35848,
 HID_DLG_PASSWD_SECTION,53440,
@@ -5154,37 +5153,6 @@ 
extensions_Edit_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS,859670529,
 
extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836,
 extensions_Edit_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT,859736067,
 extensions_Edit_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE,859703298,
-extensions_ListBox_RID_DLG_MAPPING_LB_ADDRESS,1330990603,
-extensions_ListBox_RID_DLG_MAPPING_LB_ANNOTE,1330990605,
-extensions_ListBox_RID_DLG_MAPPING_LB_AUTHOR,1330990607,
-extensions_ListBox_RID_DLG_MAPPING_LB_AUTHORITYTYPE,1330990601,
-extensions_ListBox_RID_DLG_MAPPING_LB_BOOKTITLE,1330990617,
-extensions_ListBox_RID_DLG_MAPPING_LB_CHAPTER,1330990619,
-extensions_ListBox_RID_DLG_MAPPING_LB_CUSTOM1,1330990651,
-extensions_ListBox_RID_DLG_MAPPING_LB_CUSTOM2,1330990653,
-extensions_ListBox_RID_DLG_MAPPING_LB_CUSTOM3,1330990655,
-extensions_ListBox_RID_DLG_MAPPING_LB_CUSTOM4,1330990657,
-extensions_ListBox_RID_DLG_MAPPING_LB_CUSTOM5,1330990659,
-extensions_ListBox_RID_DLG_MAPPING_LB_EDITION,1330990621,
-extensions_ListBox_RID_DLG_MAPPING_LB_EDITOR,1330990623,
-extensions_ListBox_RID_DLG_MAPPING_LB_HOWPUBLISHED,1330990625,
-extensions_ListBox_RID_DLG_MAPPING_LB_IDENTIFIER,1330990598,
-extensions_ListBox_RID_DLG_MAPPING_LB_INSTITUTION,1330990627,
-extensions_ListBox_RID_DLG_MAPPING_LB_ISBN,1330990615,
-extensions_ListBox_RID_DLG_MAPPING_LB_JOURNAL,1330990629,
-extensions_ListBox_RID_DLG_MAPPING_LB_MONTH,1330990611,
-extensions_ListBox_RID_DLG_MAPPING_LB_NOTE,1330990631,
-extensions_ListBox_RID_DLG_MAPPING_LB_NUMBER,1330990633,
-extensions_ListBox_RID_DLG_MAPPING_LB_ORGANIZATIONS,1330990635,
-extensions_ListBox_RID_DLG_MAPPING_LB_PAGES,1330990637,
-extensions_ListBox_RID_DLG_MAPPING_LB_PUBLISHER,1330990639,
-extensions_ListBox_RID_DLG_MAPPING_LB_REPORTTYPE,1330990645,
-extensions_ListBox_RID_DLG_MAPPING_LB_SCHOOL,1330990641,
-extensions_ListBox_RID_DLG_MAPPING_LB_SERIES,1330990643,
-extensions_ListBox_RID_DLG_MAPPING_LB_TITLE,1330990609,
-extensions_ListBox_RID_DLG_MAPPING_LB_URL,1330990649,
-extensions_ListBox_RID_DLG_MAPPING_LB_VOLUME,1330990647,
-extensions_ListBox_RID_DLG_MAPPING_LB_YEAR,1330990613,
 extensions_ListBox_RID_DLG_SELECTION_LB_ENTRIES,1090178561,
 
extensions_ListBox_RID_PAGE_DEFAULTFIELDSELECTION_LB_DEFSELECTIONFIELD,859688451,
 extensions_ListBox_RID_PAGE_GROUPRADIOSELECTION_LB_RADIOBUTTONS,859672067,
diff --git a/source/text/shared/01/0225.xhp 
b/source/text/shared/01/0225.xhp
index 31e845b..a0cf696 100644
--- a/source/text/shared/01/0225.xhp
+++ b/source/text/shared/01/0225.xhp
@@ -113,45 +113,15 @@
   paragraph xml-lang=en-US id=par_id3151118 role=paragraph l10n=U 
oldref=39ahelp hid=.uno:Bib/sdbsourceSelect the data source for the 
bibliography database./ahelp/paragraph
 bookmark xml-lang=en-US branch=hid/.uno:Bib/Mapping id=bm_id3154944 
localize=false/
 bookmark xml-lang=en-US branch=hid/EXTENSIONS_HID_BIB_MAPPINGDLG 
id=bm_id4552446 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/sbibliography/ui/mappingdialog/MappingDialog 
id=bm_id4552446 localize=false/
 paragraph xml-lang=en-US id=hd_id3145645 role=heading level=3 l10n=U
  oldref=35Column Arrangement/paragraph
   paragraph xml-lang=en-US id=par_id3151282 role=paragraph l10n=U 
oldref=36ahelp hid=.uno:Bib/MappingLets you map the column headings to 
data fields from a different data source. To define a different data source for 
your bibliography, click theemph Data Source/emph button on the 
recordemph Object Bar/emph./ahelp/paragraph
-!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_IDENTIFIER --
-!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_TITLE --
-!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_ISBN --
-!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_EDITION --
-!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_INSTITUTION --
-!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_ANNOTE --
-!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_PAGES --
-!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_SCHOOL --
-!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_VOLUME --
-!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM2 --
-!-- 

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

[Caolán McNamara]

 helpers/help_hid.lst |   17 -
 source/text/swriter/01/mm_matfie.xhp |1 +
 2 files changed, 1 insertion(+), 17 deletions(-)

New commits:
commit 179e4d655622b1926a2de0e8bc93627961fcc3c7
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jun 12 10:11:54 2014 +0100

connect match fields help to dialog

Change-Id: I7bef5bb5f7d25d1c4bf403fd44664002f45f4704

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 7571dcc..e520bfa 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2040,8 +2040,6 @@ HID_MEMO_PAGE3,53291,
 HID_MEMO_PAGE4,53292,
 HID_MEMO_PAGE5,53293,
 HID_MERGE_PRINTMONITOR,52773,
-HID_MM_ASSIGNFIELDS,54972,
-HID_MM_ASSIGN_FIELDS,55034,
 HID_MM_BODY_CB_FEMALEFIELD,55032,
 HID_MM_BODY_CB_NEUTRAL,55033,
 HID_MM_BODY_CB_PERSONALIZED,55026,
@@ -2052,20 +2050,6 @@ HID_MM_BODY_PB_FEMALE,55028,
 HID_MM_BODY_PB_MALE,55030,
 HID_MM_CUSTOMFIELDS,54986,
 HID_MM_DBTABLEPREVIEWDIALOG,54965,
-HID_MM_HEADER_0,55035,
-HID_MM_HEADER_1,55036,
-HID_MM_HEADER_10,55045,
-HID_MM_HEADER_11,55046,
-HID_MM_HEADER_12,55047,
-HID_MM_HEADER_13,55048,
-HID_MM_HEADER_2,55037,
-HID_MM_HEADER_3,55038,
-HID_MM_HEADER_4,55039,
-HID_MM_HEADER_5,55040,
-HID_MM_HEADER_6,55041,
-HID_MM_HEADER_7,55042,
-HID_MM_HEADER_8,55043,
-HID_MM_HEADER_9,55044,
 HID_MM_MAILBODY,54982,
 HID_MM_MAILSTATUS_TLB,54988,
 HID_MM_NEXT_PAGE,55016,
@@ -5906,7 +5890,6 @@ sw_ListBox_DLG_FLD_DROPDOWN_LB_LISTITEMS,1419644418,
 sw_ListBox_DLG_MAILMERGE_LB_ADDRESSFLD,1446612494,
 sw_ListBox_DLG_MAILMERGE_LB_COLUMN,1446612510,
 sw_ListBox_DLG_MAILMERGE_LB_FILTER,1446612524,
-sw_ListBox_DLG_MM_ASSIGNFIELDS_CT_FIELDS_LB_FIELDS,1074908678,
 sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINEPOS,877956631,
 sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINETYPE,877956629,
 sw_ListBox_TP_FORMAT_TABLE_LB_TEXTORIENTATION,878218796,
diff --git a/source/text/swriter/01/mm_matfie.xhp 
b/source/text/swriter/01/mm_matfie.xhp
index 8b28ea5..960f409 100644
--- a/source/text/swriter/01/mm_matfie.xhp
+++ b/source/text/swriter/01/mm_matfie.xhp
@@ -31,6 +31,7 @@
 /history
 /meta
 body
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/assignfieldsdialog/AssignFieldsDialog 
id=bm_id8489027 localize=false/
 paragraph role=heading id=par_idN10539 xml-lang=en-US level=1 
l10n=NEWMatch Fields/paragraph
 paragraph role=paragraph id=par_idN1053D xml-lang=en-US 
l10n=NEWMatches the logical field names of the layout dialog to the field 
names in your database when you create new link 
href=text/swriter/01/mailmerge03.xhpaddress blocks/link or link 
href=text/swriter/01/mailmerge04.xhpsalutations/link./paragraph
 paragraph role=heading id=par_idN1054E xml-lang=en-US level=2 
l10n=NEWMatches to:/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst  |3 -
 source/text/shared/explorer/database/05010100.xhp |   34 +++---
 2 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit 1730831c4ee7c46ecc58c43c157ff0eb85119d35
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jun 10 13:30:36 2014 +0100

update help ids for index design dialog .ui conversion

Change-Id: I947a451bf222bae76672e293b00a8a3657cdf6d1

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1efe17a..2e7e0aa 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5074,7 +5074,6 @@ chart2_TabPage_TP_LAYOUT,551731200,
 chart2_TabPage_TP_LOCATION,551829504,
 chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120,
 chart2_TabPage_TP_YERRORBAR,551927808,
-dbaccess_CheckBox_DLG_INDEXDESIGN_CB_UNIQUE,1388626945,
 dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657,
 dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
 dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
@@ -5109,7 +5108,6 @@ dbaccess_ListBox_DLG_PARAMETERS_LB_ALLPARAMS,1388400129,
 dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST,851447299,
 dbaccess_ModalDialog_DLG_ADABASSTAT,1388609536,
 dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840,
-dbaccess_ModalDialog_DLG_INDEXDESIGN,1388625920,
 dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624,
 dbaccess_ModalDialog_DLG_PARAMETERS,1388396544,
 dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528,
@@ -5122,7 +5120,6 @@ 
dbaccess_NumericField_PAGE_ADABAS_NF_DATA_INCREMENT,851531777,
 dbaccess_NumericField_PAGE_USERDRIVER_NF_PORTNUMBER,851761153,
 dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697,
 dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE,1388761603,
-dbaccess_PushButton_DLG_INDEXDESIGN_PB_CLOSE,1388630529,
 dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158,
 dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241,
 dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION,851546626,
diff --git a/source/text/shared/explorer/database/05010100.xhp 
b/source/text/shared/explorer/database/05010100.xhp
index 00f9184..1fb529a 100644
--- a/source/text/shared/explorer/database/05010100.xhp
+++ b/source/text/shared/explorer/database/05010100.xhp
@@ -30,7 +30,7 @@
 /meta
 body
 section id=indexentwurf
-bookmark xml-lang=en-US branch=hid/dbaccess:ModalDialog:DLG_INDEXDESIGN 
id=bm_id3156410 localize=false/
+bookmark xml-lang=en-US 
branch=hid/dbaccess/ui/indexdesigndialog/IndexDesignDialog id=bm_id3156410 
localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:DBIndexDesign id=bm_id3149828 
localize=false/paragraph role=heading id=hd_id3153311 xml-lang=en-US 
level=1 l10n=U oldref=1link 
href=text/shared/explorer/database/05010100.xhp name=Index designIndex 
design/link/paragraph
 paragraph role=paragraph id=par_id3166460 xml-lang=en-US l10n=U 
oldref=2ahelp hid=.uno:DBIndexDesignThe emphIndex Design /emphdialog 
allows you edit the indexes for the current table./ahelp/paragraph
 /section
@@ -38,29 +38,29 @@
   embed href=text/shared/00/0450.xhp#indexentwurf/
 /section
 embed href=text/shared/guide/data_tabledefine.xhp#data_tabledefine/
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLGIDX_INDEXLIST 
id=bm_id3148473 localize=false/paragraph role=heading id=hd_id3149578 
xml-lang=en-US level=2 l10n=U oldref=3Index list/paragraph
-paragraph role=paragraph id=par_id3155342 xml-lang=en-US l10n=CHG 
oldref=4ahelp hid=HID_DLGIDX_INDEXLISTDisplays the available indexes. 
Select an index from the list to edit. The details of the selected index are 
displayed in the dialog./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLGIDX_NEWINDEX 
id=bm_id3158430 localize=false/paragraph role=heading id=hd_id3149795 
xml-lang=en-US level=3 l10n=U oldref=5New Index/paragraph
-paragraph role=paragraph id=par_id3150085 xml-lang=en-US l10n=U 
oldref=6ahelp hid=HID_DLGIDX_NEWINDEXCreates a new 
index./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLGIDX_DROPINDEX 
id=bm_id3148642 localize=false/paragraph role=heading id=hd_id3145317 
xml-lang=en-US level=3 l10n=U oldref=7Delete Current Index/paragraph
-paragraph role=paragraph id=par_id3154860 xml-lang=en-US l10n=U 
oldref=8ahelp hid=HID_DLGIDX_DROPINDEXDeletes the current 
index./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLGIDX_RENAMEINDEX 
id=bm_id3154285 localize=false/paragraph role=heading id=hd_id3150986 
xml-lang=en-US level=3 l10n=U oldref=9Rename Current Index/paragraph
-paragraph role=paragraph id=par_id3148685 xml-lang=en-US l10n=U 
oldref=10ahelp hid=HID_DLGIDX_RENAMEINDEXRenames the current 
index./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLGIDX_SAVEINDEX 
id=bm_id3151245 localize=false/paragraph role=heading id=hd_id3153628 
xml-lang=en-US level=3 l10n=U oldref=11Save Current Index/paragraph
-paragraph role=paragraph id=par_id3148563 xml-lang=en-US l10n=U 
oldref=12ahelp 

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

[Caolán McNamara]

 helpers/help_hid.lst   |8 
 source/text/shared/01/0218.xhp |   28 ++--
 2 files changed, 14 insertions(+), 22 deletions(-)

New commits:
commit 0ff06dc9b3b3635d6fda133d352ae4e6b3ede68d
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jun 3 10:54:56 2014 +0100

update helpids for update links dialog .ui conversion

Change-Id: Ifc837de26053ba300a646be847315cf612a3127f

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b64e9dd..d12e0ff 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1958,7 +1958,6 @@ HID_LINGU_PARA_LANGUAGE,53438,
 HID_LINGU_REPLACE,53434,
 HID_LINGU_SPELLING_DLG,53432,
 HID_LINGU_WORD_LANGUAGE,53437,
-HID_LINKDLG_TABLB,34869,
 HID_LISTWIZARD_CANCEL,34819,
 HID_LISTWIZARD_FINISH,34820,
 HID_LISTWIZARD_NEXT,34818,
@@ -5768,7 +5767,6 @@ svx_ModalDialog_MD_ICONCHANGE,1080606720,
 svx_ModalDialog_MD_INSERT_OBJECT_APPLET,1598177280,
 svx_ModalDialog_MD_INSERT_OBJECT_IFRAME,1598210048,
 svx_ModalDialog_MD_LINKEDIT,1598095360,
-svx_ModalDialog_MD_UPDATE_BASELINKS,1598062592,
 svx_ModalDialog_RID_DEFAULTABOUT,1078001664,
 svx_ModalDialog_RID_OFADLG_OPTIONS_TREE_HINT,1346011136,
 svx_ModalDialog_RID_SVXDLG_ASSIGNCOMPONENT,1242447872,
@@ -5794,10 +5792,6 @@ svx_PushButton_MD_ICONSELECTOR_BTN_DELETE,1080136601,
 svx_PushButton_MD_ICONSELECTOR_BTN_IMPORT,1080136589,
 svx_PushButton_MD_INSERT_OBJECT_APPLET_BTN_CLASS,1598181901,
 svx_PushButton_MD_INSERT_OBJECT_IFRAME_BT_FILEOPEN,1598214663,
-svx_PushButton_MD_UPDATE_BASELINKS_PB_BREAK_LINK,1598067238,
-svx_PushButton_MD_UPDATE_BASELINKS_PB_CHANGE_SOURCE,1598067237,
-svx_PushButton_MD_UPDATE_BASELINKS_PB_OPEN_SOURCE,1598067236,
-svx_PushButton_MD_UPDATE_BASELINKS_PB_UPDATE_NOW,1598067235,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_CREATE,1241813509,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_DEL,1241813512,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_EDIT,1241813510,
@@ -5844,8 +5838,6 @@ 
svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_FRMBORDER_ON,1598210578,
 svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGAUTO,1598210575,
 svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGOFF,1598210574,
 svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGON,1598210573,
-svx_RadioButton_MD_UPDATE_BASELINKS_RB_AUTOMATIC,1598063146,
-svx_RadioButton_MD_UPDATE_BASELINKS_RB_MANUAL,1598063147,
 svx_RadioButton_RID_OFA_TP_INTERNATIONAL_RB_TXTDIR_LEFT2RIGHT,811336194,
 svx_RadioButton_RID_OFA_TP_INTERNATIONAL_RB_TXTDIR_RIGHT2LEFT,811336195,
 svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_CENTERALIGN,703775264,
diff --git a/source/text/shared/01/0218.xhp 
b/source/text/shared/01/0218.xhp
index fc57c04..28cb03a 100644
--- a/source/text/shared/01/0218.xhp
+++ b/source/text/shared/01/0218.xhp
@@ -27,7 +27,6 @@
   /topic
/meta
body
-!-- removed HID SO3:MODALDIALOG:MD_UPDATE_BASELINKS --
 bookmark xml-lang=en-US branch=hid/.uno:LinkDialog id=bm_id199976 
localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:LinkDialog id=bm_id3150008 
localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:EditLinks id=bm_id5458456 
localize=false/
@@ -39,6 +38,7 @@
   bookmark_valueupdating; links, on opening/bookmark_value
   bookmark_valuelinks; opening files with/bookmark_value
 /bookmarkcommentMW changed opening;.../comment
+bookmark xml-lang=en-US branch=hid/cui/ui/baselinksdialog/BaseLinksDialog 
id=bm_id4889980 localize=false/
 paragraph xml-lang=en-US id=hd_id3150279 role=heading level=1 
l10n=U oldref=1Edit Links/paragraph
   paragraph xml-lang=en-US id=par_id3150774 role=paragraph l10n=U 
oldref=2variable id=verknuepfungentextahelp hid=.uno:ManageLinksLets 
you edit the properties of each link in the current document, including the 
path to the source file. This command is not available if the current document 
does not contain links to other files./ahelp
 /variable/paragraph
@@ -47,8 +47,8 @@
   /section
   paragraph xml-lang=en-US id=par_id3156156 role=note l10n=U 
oldref=27When you open a file that contains links, you are prompted to 
update the links. Depending on where the linked files are stored, the update 
process can take several minutes to complete./paragraph
   paragraph xml-lang=en-US id=par_id3143270 role=note l10n=U 
oldref=28If you are loading a file that contains DDE links, you are prompted 
to update the links. Decline the update if you do not want to establish a 
connection to the DDE server./paragraph
-bookmark xml-lang=en-US branch=hid/CUI_HID_LINKDLG_TABLB 
id=bm_id4889980 localize=false/
-paragraph xml-lang=en-US id=par_idN10646 role=paragraph 
l10n=NEWahelp hid=34869Double-click a link in the list to open a file 
dialog where you can select another object for this link./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/baselinksdialog/TB_LINKS 
id=bm_id4889980 localize=false/
+paragraph xml-lang=en-US id=par_idN10646 role=paragraph 
l10n=NEWahelp 

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

[Caolán McNamara]

 helpers/help_hid.lst  |1 -
 source/text/shared/01/extensionupdate.xhp |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 5916c2b39f6aa68c6d47f266be84085a84d9a8c7
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 27 11:47:37 2014 +0100

update help ids for update extension progress dialog

Change-Id: Iced0717584f8b9343062c8428664bc2fff1128f0

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 9523de0..ab0b737 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -972,7 +972,6 @@ HID_DBWIZ_FINISH,39058,
 HID_DBWIZ_NEXT,39056,
 HID_DBWIZ_PREVIOUS,39055,
 HID_DB_SELECTION_TLB,54845,
-HID_DEPLOYMENT_GUI_UPDATEINSTALL,42787,
 HID_DIALOG_HANGULHANJA,39883,
 HID_DID_SAVE_PACKED_XML,33368,
 HID_DLGCONVERT_CBBACK,34675,
diff --git a/source/text/shared/01/extensionupdate.xhp 
b/source/text/shared/01/extensionupdate.xhp
index a34d16b..e0374da 100644
--- a/source/text/shared/01/extensionupdate.xhp
+++ b/source/text/shared/01/extensionupdate.xhp
@@ -25,7 +25,7 @@
 /meta
 body
 bookmark xml-lang=en-US branch=hid/desktop/ui/updatedialog/UpdateDialog 
id=bm_id5684377 localize=false/
-bookmark xml-lang=en-US 
branch=hid/DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL id=bm_id7576525 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/desktop/ui/updateinstalldialog/UpdateInstallDialog 
id=bm_id7576525 localize=false/
 paragraph id=hd_id9688100 role=heading xml-lang=en-US 
level=1Extension Update/paragraph
 paragraph id=par_id5084688 role=paragraph xml-lang=en-USahelp 
hid=.Click the emphCheck for Updates/emph button in the link 
href=text/shared/01/packagemanager.xhpExtension Manager/link to check for 
online updates for all installed extensions. To check for online updates for 
only the selected extension, right-click to open the context menu, then choose 
emphUpdate/emph./ahelp/paragraph
 section id=howtogetembed 
href=text/shared/00/0406.xhp#packagemanager_eu/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst  |   10 --
 source/text/shared/01/extensionupdate.xhp |8 
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 2ef15cb93840390d9927f64bddb958ad699cb792
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 21 13:53:15 2014 +0100

update help ids for update extensions .ui conversion

Change-Id: If0ffb1b7eaebd8fc30f66e26c1170708b72c495a

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2aa45ee..22c4081 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -972,11 +972,7 @@ HID_DBWIZ_FINISH,39058,
 HID_DBWIZ_NEXT,39056,
 HID_DBWIZ_PREVIOUS,39055,
 HID_DB_SELECTION_TLB,54845,
-HID_DEPLOYMENT_GUI_UPDATE,42786,
 HID_DEPLOYMENT_GUI_UPDATEINSTALL,42787,
-HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES,42790,
-HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER,42788,
-HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES,42789,
 HID_DIALOG_HANGULHANJA,39883,
 HID_DID_SAVE_PACKED_XML,33368,
 HID_DLGCONVERT_CBBACK,34675,
@@ -5160,7 +5156,6 @@ dbaccess_TabPage_TP_MIGRATE,851476480,
 dbaccess_TabPage_TP_PREPARE,851443712,
 dbaccess_TabPage_TP_SAVE_DBDOC_AS,851460096,
 dbaccess_TabPage_TP_SUMMARY,851492864,
-desktop_CheckBox_RID_DLG_UPDATE_RID_DLG_UPDATE_ALL,1106674693,
 desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859,
 desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011,
 desktop_Edit_TP_USER_ED_USER_FATHER,586123282,
@@ -5169,14 +5164,9 @@ desktop_Edit_TP_USER_ED_USER_INITIALS,586123283,
 desktop_Edit_TP_USER_ED_USER_LAST,586123281,
 desktop_ListBox_RID_DLG_DEPENDENCIES_RID_DLG_DEPENDENCIES_LIST,1106529794,
 desktop_ModalDialog_RID_DLG_DEPENDENCIES,1106526208,
-desktop_MultiLineEdit_RID_DLG_UPDATEINSTALL_RID_DLG_UPDATE_INSTALL_INFO,1106840076,
-desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS,1106676231,
 desktop_MultiLineEdit_TP_LICENSE_ML_LICENSE,586140166,
 desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_ADD,2180256268,
 
desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_CHECK_UPDATES,2180256269,
-desktop_PushButton_RID_DLG_UPDATE_REQUIRED_RID_EM_BTN_CHECK_UPDATES,1106694669,
-desktop_PushButton_RID_DLG_UPDATE_REQUIRED_RID_EM_BTN_CLOSE,1106694666,
-desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK,1106678282,
 desktop_PushButton_TP_LICENSE_PB_LICENSE_DOWN,586142215,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER,586088966,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967,
diff --git a/source/text/shared/01/extensionupdate.xhp 
b/source/text/shared/01/extensionupdate.xhp
index c627538..a34d16b 100644
--- a/source/text/shared/01/extensionupdate.xhp
+++ b/source/text/shared/01/extensionupdate.xhp
@@ -24,14 +24,14 @@
 /topic
 /meta
 body
-bookmark xml-lang=en-US branch=hid/DESKTOP_HID_DEPLOYMENT_GUI_UPDATE 
id=bm_id5684377 localize=false/
+bookmark xml-lang=en-US branch=hid/desktop/ui/updatedialog/UpdateDialog 
id=bm_id5684377 localize=false/
 bookmark xml-lang=en-US 
branch=hid/DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL id=bm_id7576525 
localize=false/
 paragraph id=hd_id9688100 role=heading xml-lang=en-US 
level=1Extension Update/paragraph
 paragraph id=par_id5084688 role=paragraph xml-lang=en-USahelp 
hid=.Click the emphCheck for Updates/emph button in the link 
href=text/shared/01/packagemanager.xhpExtension Manager/link to check for 
online updates for all installed extensions. To check for online updates for 
only the selected extension, right-click to open the context menu, then choose 
emphUpdate/emph./ahelp/paragraph
 section id=howtogetembed 
href=text/shared/00/0406.xhp#packagemanager_eu/
 /sectioncommentinsert hidden text for Exclude from this update/from all 
updates/include again, see i115834 - not needed because no Help ID 
assigned/comment
 paragraph id=par_id6401257 role=paragraph xml-lang=en-USWhen you click 
the item type=menuitemCheck for Updates/item button or choose the item 
type=menuitemUpdate/item command, the Extension Update dialog is displayed 
and the check for availability of updates starts immediately./paragraph
-bookmark xml-lang=en-US 
branch=hid/desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS 
id=bm_id7764824 localize=false/
+bookmark xml-lang=en-US branch=hid/desktop/ui/updatedialog/DESCRIPTIONS 
id=bm_id7764824 localize=false/
 paragraph id=par_id5841242 role=paragraph xml-lang=en-USahelp 
hid=.While checking for updates, you see a progress indicator. Wait for some 
messages to show up in the dialog, or click Cancel to abort the update 
check./ahelp/paragraph
 paragraph id=par_id6794030 role=paragraph xml-lang=en-USIf no updates 
are available, the message in the dialog tells you there are no updates. Close 
the dialog./paragraph
 paragraph id=par_id7096774 role=paragraph xml-lang=en-USIf updates are 
available, the updates can either be installed automatically, or you must 
respond with some action:/paragraph
@@ -46,14 +46,14 @@
 listitem
 paragraph id=par_id791039 role=paragraph xml-lang=en-USA 

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

[Caolán McNamara]

 helpers/help_hid.lst |   29 --
 source/text/shared/00/0001.xhp   |2 
 source/text/shared/optionen/01010400.xhp |   19 +++--
 source/text/shared/optionen/01010500.xhp |   54 +-
 source/text/shared/optionen/01010501.xhp |3 -
 source/text/shared/optionen/01010800.xhp |   64 ---
 source/text/shared/optionen/01011000.xhp |2 
 source/text/shared/optionen/01130200.xhp |1 
 source/text/shared/optionen/java.xhp |1 
 9 files changed, 65 insertions(+), 110 deletions(-)

New commits:
commit fdfcaa991224f6ac15fdc778e0a301b9285208eb
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 19 16:13:12 2014 +0100

Related: fdo#58170 save some orphaned help pages

Change-Id: I23d9623aa8b96796e622adea863a155af02a9272

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 52be570..2aa45ee 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2217,7 +2217,6 @@ HID_OFA_FONT_SUBST_CLB,35084,
 HID_OFA_HYPERLINK_NAME,35079,
 HID_OFA_HYPERLINK_TARGET,35053,
 HID_OFA_HYPERLINK_URL,35081,
-HID_OFA_TP_VIEW,35057,
 HID_OLE_TOOLBOX,54831,
 HID_OPTCREATEFAX,41150,
 HID_OPTIONS_COLOR,33808,
@@ -5566,13 +5565,6 @@ svx_CB_USE_VARIANTS_DLG_CHINESETRANSLATION,1078657024,
 svx_CheckBox_DLG_CHINESETRANSLATION_CB_TRANSLATE_COMMONTERMS,1078658050,
 svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINHEIGHTDEFAULT,1598211094,
 svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINWIDTHDEFAULT,1598211093,
-svx_CheckBox_OFA_TP_VIEW_CB_FONTANTIALIASING,810517567,
-svx_CheckBox_OFA_TP_VIEW_CB_FONT_HISTORY,810517566,
-svx_CheckBox_OFA_TP_VIEW_CB_FONT_SHOW,810517564,
-svx_CheckBox_OFA_TP_VIEW_CB_SELECTION,810517575,
-svx_CheckBox_OFA_TP_VIEW_CB_SYSTEM_FONT,810517561,
-svx_CheckBox_OFA_TP_VIEW_CB_USE_ANTIALIASE,810517573,
-svx_CheckBox_OFA_TP_VIEW_CB_USE_HARDACCELL,810517572,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709,
 svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_1,339194,
@@ -5632,7 +5624,6 @@ svx_Edit_RID_SVXDLG_RUBY_ED_RIGHT_1,2315372558,
 svx_Edit_RID_SVXDLG_RUBY_ED_RIGHT_2,2315372559,
 svx_Edit_RID_SVXDLG_RUBY_ED_RIGHT_3,2315372560,
 svx_Edit_RID_SVXDLG_RUBY_ED_RIGHT_4,2315372561,
-svx_Edit_RID_SVXPAGE_COLOR_EDT_NAME,701696001,
 svx_Edit_RID_SVXPAGE_ERR_REP_SEND_ED_ERRSEND_DOCTYPE,700893205,
 svx_Edit_RID_SVXPAGE_ERR_REP_SEND_ED_ERRSEND_EMAILADDR,700893212,
 svx_Edit_RID_SVXPAGE_HYPERLINK_DOCUMENT_ED_INDICATION,704481316,
@@ -5719,8 +5710,6 @@ 
svx_ImageButton_RID_SVXFLOAT_3D_BTN_TWO_SIDED_LIGHTING,3388501545,
 svx_ImageButton_RID_SVXFLOAT_3D_BTN_UPDATE,3388501511,
 svx_ImageButton_RID_SVXPAGE_BITMAP_BTN_LOAD,701672965,
 svx_ImageButton_RID_SVXPAGE_BITMAP_BTN_SAVE,701672966,
-svx_ImageButton_RID_SVXPAGE_COLOR_BTN_LOAD,701705733,
-svx_ImageButton_RID_SVXPAGE_COLOR_BTN_SAVE,701705734,
 svx_ImageButton_RID_SVXPAGE_HYPERLINK_DOCUMENT_BTN_BROWSE,704491020,
 svx_ImageButton_RID_SVXPAGE_HYPERLINK_DOCUMENT_BTN_FILEOPEN,704491012,
 svx_ImageButton_RID_SVXPAGE_HYPERLINK_DOCUMENT_BTN_SCRIPT,704491047,
@@ -5735,11 +5724,6 @@ svx_ImageButton_RID_SVXPAGE_LINE_DEF_BTN_LOAD,701574661,
 svx_ImageButton_RID_SVXPAGE_LINE_DEF_BTN_SAVE,701574662,
 svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_HORZ,1238295050,
 svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_VERT,1238295052,
-svx_ListBox_OFA_TP_VIEW_LB_ICONSIZE,810520118,
-svx_ListBox_OFA_TP_VIEW_LB_ICONSTYLE,810520120,
-svx_ListBox_OFA_TP_VIEW_LB_MENU_ICONS,810520105,
-svx_ListBox_OFA_TP_VIEW_LB_MOUSEMIDDLE,810520098,
-svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS,810520095,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_BIND,1368919573,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_METHOD,1368919568,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_REPLACE,1368919575,
@@ -5778,8 +5762,6 @@ svx_ListBox_RID_SVXPAGE_BITMAP_LB_COLOR,701664769,
 svx_ListBox_RID_SVXPAGE_BORDER_LB_LINECOLOR,700796438,
 svx_ListBox_RID_SVXPAGE_BORDER_LB_LINESTYLE,700796437,
 svx_ListBox_RID_SVXPAGE_BORDER_LB_SHADOWCOLOR,700796452,
-svx_ListBox_RID_SVXPAGE_COLOR_LB_COLOR,701697537,
-svx_ListBox_RID_SVXPAGE_COLOR_LB_COLORMODEL,701697538,
 svx_ListBox_RID_SVXPAGE_DOCRECOVERY_SAVE_LB_SAVE_FILELIST,700845574,
 svx_ListBox_RID_SVXPAGE_HYPERLINK_DOCUMENT_LB_FORM,704482850,
 svx_ListBox_RID_SVXPAGE_HYPERLINK_INTERNET_LB_FORM,704450082,
@@ -5799,8 +5781,6 @@ 
svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT,701009435,
 svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME,701009432,
 svx_ListBox_RID_SVX_MDLG_DOCRECOVERY_BROKEN_LB_BROKEN_FILELIST,1237782019,
 svx_ListBox_RID_SVX_MDLG_HANGULHANJA_EDIT_LB_BOOK,1237667329,
-svx_MetricField_OFA_TP_VIEW_MF_SELECTION,810523208,
-svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE,810523158,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_1,3391953410,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_2,3391953412,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_3,3391953409,
@@ -5825,10 +5805,6 @@ 

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

[Caolán McNamara]

 helpers/help_hid.lst  |9 --
 source/text/shared/explorer/database/05030100.xhp |   31 +++---
 2 files changed, 16 insertions(+), 24 deletions(-)

New commits:
commit 43d91a4743d30b2e4c194d991c865b7c4be7616c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 13 13:33:52 2014 +0100

update help ids for copy table page .ui conversion

Change-Id: Idc93a475b278d96753757329ab5b1c666c234630

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 03efbbf..52be570 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3166,8 +3166,6 @@ HID_TAB_PAGE_PBUSER,38949,
 HID_TAB_PAGE_PBUSERDELETE,38951,
 HID_TAB_PAGE_TBLGRANTS,38952,
 HID_TAB_PAGE_USERADMIN,38948,
-HID_TAB_WIZ_COPYTABLE,38918,
-HID_TAB_WIZ_TABLENAME_EDIT,38919,
 HID_TAB_WIZ_TYPE_SELECT,38915,
 HID_TBXCONTROL_FILENEW,33360,
 HID_TEMPLATEDLG_DIALOG,32989,
@@ -5091,8 +5089,6 @@ dbaccess_CheckBox_DLG_INDEXDESIGN_CB_UNIQUE,1388626945,
 dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657,
 dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
 dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
-dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN,851641349,
-dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_USEHEADERLINE,851641350,
 dbaccess_ComboBox_TP_SAVE_DBDOC_AS_ED_SAVE_AS_LOCATION,851464193,
 dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589,
 dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588,
@@ -5110,7 +5106,6 @@ dbaccess_Edit_PAGE_MYSQL_NATIVE_ET_USERNAME,851838977,
 dbaccess_Edit_PAGE_ORACLE_JDBC_ET_JDBCDRIVERCLASS,851888132,
 dbaccess_Edit_PAGE_USERDRIVER_ET_HOSTNAME,851757061,
 dbaccess_Edit_PAGE_USERDRIVER_ET_OPTIONS,851757059,
-dbaccess_Edit_TAB_WIZ_COPYTABLE_ET_KEYNAME,851642371,
 dbaccess_FL_SEPARATOR2_PAGE_MYSQL_NATIVE,851836928,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_MYSQL_JDBC,851771392,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_ORACLE_JDBC,851886080,
@@ -5154,10 +5149,6 @@ dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385,
 dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386,
 dbaccess_RadioButton_PAGE_DBWIZARD_MYSQL_INTRO_RB_CONNECTVIANATIVE,852197893,
 dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC,851444227,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_APPENDDATA,851640836,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_DEF,851640834,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_DEFDATA,851640833,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_VIEW,851640835,
 dbaccess_TabPage_PAGE_ADVANCED_SETTINGS_SPECIAL,851820544,
 dbaccess_TabPage_PAGE_CONNECTION,851542016,
 dbaccess_TabPage_PAGE_DBWIZARD_MYSQL_INTRO,852197376,
diff --git a/source/text/shared/explorer/database/05030100.xhp 
b/source/text/shared/explorer/database/05030100.xhp
index df18fbf..d58c2fc 100644
--- a/source/text/shared/explorer/database/05030100.xhp
+++ b/source/text/shared/explorer/database/05030100.xhp
@@ -30,30 +30,31 @@
 /meta
 body
 section id=tabkop
+bookmark xml-lang=en-US 
branch=hid/dbaccess/ui/copytablepage/CopyTablePage id=bm_id3154841 
localize=false/
 paragraph role=heading id=hd_id3085157 xml-lang=en-US level=1 
l10n=U oldref=28link href=text/shared/explorer/database/05030100.xhp 
name=Copy TableCopy Table/link/paragraph
 paragraph role=paragraph id=par_id3149264 xml-lang=en-US l10n=CHG 
oldref=29You can copy a table by dragging and dropping the table onto the 
table area of a database file window. The emphCopy table /emphdialog 
appears./paragraph
 /section
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT 
id=bm_id3154840 localize=false/paragraph role=heading id=hd_id3154926 
xml-lang=en-US level=2 l10n=U oldref=3Table name/paragraph
-paragraph role=paragraph id=par_id3144740 xml-lang=en-US l10n=U 
oldref=4ahelp hid=HID_TAB_WIZ_TABLENAME_EDITSpecifies a name for the 
copy./ahelp Some databases only accept names containing eight or fewer 
characters./paragraph
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/copytablepage/name 
id=bm_id3154840 localize=false/paragraph role=heading id=hd_id3154926 
xml-lang=en-US level=2 l10n=U oldref=3Table name/paragraph
+paragraph role=paragraph id=par_id3144740 xml-lang=en-US l10n=U 
oldref=4ahelp hid=dbaccess/ui/copytablepage/nameSpecifies a name for the 
copy./ahelp Some databases only accept names containing eight or fewer 
characters./paragraph
 paragraph role=heading id=hd_id3154228 xml-lang=en-US level=2 
l10n=U oldref=5Options/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA 
id=bm_id3147576 localize=false/paragraph role=heading id=hd_id3157898 
xml-lang=en-US level=3 l10n=U oldref=7Definition and data/paragraph
-paragraph role=paragraph id=par_id3150178 xml-lang=en-US l10n=U 
oldref=8ahelp 
hid=DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEFDATACreates a 1:1 copy of 
the database table./ahelp The table definition and the complete data are 
copied. The table definition includes the table structure and format from 
different data fields, including 

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

[Caolán McNamara]

 helpers/help_hid.lst   |2 --
 source/text/shared/autopi/01170200.xhp |5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 679ee563257a53b03eaf7ac75c79426a4d70befb
Author: Caolán McNamara caol...@redhat.com
Date:   Fri May 9 09:27:20 2014 +0100

update help ids for invoke admin page .ui conversion

Change-Id: Id27ee52a0d1b183be8a119fe813b92d9e26048af

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 31c223c..75f6315 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5274,7 +5274,6 @@ 
extensions_PushButton_GRID_DIALOG_GRID_DIALOG_RESET_BTN,1091768835,
 extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649,
-extensions_PushButton_RID_PAGE_ADMININVOKATION_PB_INVOKE_ADMIN_DIALOG,860639745,
 extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETOLEFT,859673090,
 extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETORIGHT,859673089,
 extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT,859804166,
@@ -5289,7 +5288,6 @@ 
extensions_RadioButton_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO,8596853
 
extensions_RadioButton_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES,859685377,
 extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148,
 extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES,859718147,
-extensions_TabPage_RID_PAGE_ADMININVOKATION,860635136,
 extensions_TabPage_RID_PAGE_DEFAULTFIELDSELECTION,859684864,
 extensions_TabPage_RID_PAGE_FORM_DATASOURCE_STATUS,859815936,
 extensions_TabPage_RID_PAGE_GROUPRADIOSELECTION,859668480,
diff --git a/source/text/shared/autopi/01170200.xhp 
b/source/text/shared/autopi/01170200.xhp
index 5d8cba3..2f41a66 100644
--- a/source/text/shared/autopi/01170200.xhp
+++ b/source/text/shared/autopi/01170200.xhp
@@ -32,15 +32,16 @@
 /meta
 body
 section id=weitere
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/invokeadminpage/InvokeAdminPage 
id=bm_id3153682 localize=false/
 paragraph role=heading id=hd_id3154094 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/autopi/01170200.xhp 
name=Additional SettingsAdditional Settings/link/paragraph
 paragraph role=paragraph id=par_id3143281 xml-lang=en-US l10n=U 
oldref=2ahelp hid=.Allows you to enter additional settings for LDAP 
address data and other external data sources./ahelp/paragraph
 /section
 section id=howtoget
   embed href=text/shared/00/0401.xhp#addressimport2/
 /section
-bookmark xml-lang=en-US 
branch=hid/extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOG
 id=bm_id3153681 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/invokeadminpage/settings id=bm_id3153681 
localize=false/
 paragraph role=heading id=hd_id315 xml-lang=en-US level=2 
l10n=U oldref=3Settings/paragraph
-paragraph role=paragraph id=par_id3153311 xml-lang=en-US l10n=U 
oldref=4ahelp 
hid=extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOGCalls
 a dialog in which you can enter additional settings./ahelp/paragraph
+paragraph role=paragraph id=par_id3153311 xml-lang=en-US l10n=U 
oldref=4ahelp hid=modules/sabpilot/ui/invokeadminpage/settingsCalls a 
dialog in which you can enter additional settings./ahelp/paragraph
 paragraph role=paragraph id=par_id3159233 xml-lang=en-US l10n=CHG 
oldref=5If you selected emphLDAP/emph on the first page, you will see 
the link href=text/shared/explorer/database/dabawiz02ldap.xhp 
name=LDAPLDAP/link page./paragraphcommentUFI: deleted a para/comment
 /body
 /helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst  |7 ---
 source/text/shared/explorer/database/05030200.xhp |   19 ++-
 2 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit ec761d90416db68a0e8e683c3df44e43f593bb17
Author: Caolán McNamara caol...@redhat.com
Date:   Fri May 9 16:12:45 2014 +0100

update help ids for apply col page .ui conversion

Change-Id: If1b60ef633d390c81aa559609ff0d68f623c1880

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 75f6315..03efbbf 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3166,7 +3166,6 @@ HID_TAB_PAGE_PBUSER,38949,
 HID_TAB_PAGE_PBUSERDELETE,38951,
 HID_TAB_PAGE_TBLGRANTS,38952,
 HID_TAB_PAGE_USERADMIN,38948,
-HID_TAB_WIZ_COLUMN_SELECT,38914,
 HID_TAB_WIZ_COPYTABLE,38918,
 HID_TAB_WIZ_TABLENAME_EDIT,38919,
 HID_TAB_WIZ_TYPE_SELECT,38915,
@@ -5117,10 +5116,6 @@ dbaccess_FT_JDBCDRIVERCLASS_PAGE_MYSQL_JDBC,851771392,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_ORACLE_JDBC,851886080,
 dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_NEWFOLDER,1388768769,
 dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_UP,1388768770,
-dbaccess_ImageButton_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_LH,851602948,
-dbaccess_ImageButton_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_RH,851602947,
-dbaccess_ImageButton_TAB_WIZ_COLUMN_SELECT_IB_COLUMN_LH,851602946,
-dbaccess_ImageButton_TAB_WIZ_COLUMN_SELECT_IB_COLUMN_RH,851602945,
 dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN,851635725,
 dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT,851635727,
 dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP,851635724,
@@ -5136,8 +5131,6 @@ dbaccess_ModalDialog_DLG_PARAMETERS,1388396544,
 dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528,
 dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768,
 dbaccess_MultiLineEdit_TP_SUMMARY_ED_CHANGES,851495426,
-dbaccess_MultiListBox_TAB_WIZ_COLUMN_SELECT_LB_NEW_COLUMN_NAMES,851594242,
-dbaccess_MultiListBox_TAB_WIZ_COLUMN_SELECT_LB_ORG_COLUMN_NAMES,851594241,
 dbaccess_MultiListBox_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES,851610626,
 dbaccess_NumericField_DLG_ADABASSTAT_ET_MEMORYUSING,1388615683,
 dbaccess_NumericField_PAGE_ADABAS_NF_CACHE_SIZE,851531778,
diff --git a/source/text/shared/explorer/database/05030200.xhp 
b/source/text/shared/explorer/database/05030200.xhp
index cc35527..39bc238 100644
--- a/source/text/shared/explorer/database/05030200.xhp
+++ b/source/text/shared/explorer/database/05030200.xhp
@@ -30,19 +30,20 @@
 /meta
 body
 section id=tabkop2
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/applycolpage/ApplyColPage 
id=bm_id3155806 localize=false/
 paragraph role=heading id=hd_id3150445 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/explorer/database/05030200.xhp 
name=Apply columnsApply columns/link/paragraph
 paragraph role=paragraph id=par_id3147143 xml-lang=en-US l10n=U 
oldref=2In the data source explorer, you can copy a table by dragging and 
dropping the table onto the table container. The emphApply columns 
/emphdialog is the second window of the emphCopy table/emph 
dialog./paragraph
 /section
 paragraph role=heading id=hd_id312 xml-lang=en-US level=2 
l10n=U oldref=3Existing columns/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES 
id=bm_id3155805 localize=false/paragraph role=heading id=hd_id3154751 
xml-lang=en-US level=3 l10n=U oldref=4Left list box/paragraph
-paragraph role=paragraph id=par_id3147088 xml-lang=en-US l10n=CHG 
oldref=5ahelp 
hid=DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_ORG_COLUMN_NAMESLists the 
available data fields that you can include in the copied table. To copy a data 
field, click its name, and then click the gt; button. To copy all of the 
fields, click the emphgt;gt;/emph button./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_NEW_COLUMN_NAMES 
id=bm_id3149827 localize=false/paragraph role=heading id=hd_id3154823 
xml-lang=en-US level=3 l10n=U oldref=6Right list box/paragraph
-paragraph role=paragraph id=par_id3156426 xml-lang=en-US l10n=U 
oldref=7ahelp 
hid=DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_NEW_COLUMN_NAMESLists the 
fields that you want to include in the copied table./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_RH 
id=bm_id3152781 localize=false/
-bookmark xml-lang=en-US 
branch=hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_RH 
id=bm_id3147653 localize=false/
-bookmark xml-lang=en-US 
branch=hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_LH 
id=bm_id3151110 localize=false/
-bookmark xml-lang=en-US 
branch=hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_LH 
id=bm_id3152996 localize=false/paragraph role=heading id=hd_id3147242 
xml-lang=en-US level=3 l10n=U oldref=8Buttons/paragraph
-paragraph role=paragraph id=par_id3146797 xml-lang=en-US l10n=U 

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

[Caolán McNamara]

 helpers/help_hid.lst   |6 --
 source/text/shared/autopi/01170300.xhp |5 +++--
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 9674052b7254ff18c95ac557164f589ebbec02ee
Author: Caolán McNamara caol...@redhat.com
Date:   Thu May 8 16:31:41 2014 +0100

update help ids for table selection page .ui conversion

Change-Id: I6a0332245506adb74aabbe52d520a889c76e4783

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6f2fe9c..286807f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5254,9 +5254,6 @@ 
extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374,
 
extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_TABLE_LB_SELECTTABLE,859753989,
 extensions_ListBox_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS,859704835,
 extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220,
-extensions_ListBox_RID_PAGE_TABLESELECTION_AB_LB_TABLELIST,860655105,
-extensions_ListBox_RID_PAGE_TABLESELECTION_LB_DATASOURCE,859655681,
-extensions_ListBox_RID_PAGE_TABLESELECTION_LB_TABLE,859655682,
 extensions_ListBox_RID_SANE_DIALOG_RID_DEVICE_BOX,1090129414,
 extensions_ListBox_RID_SANE_DIALOG_RID_SCAN_QUANTUM_RANGE_BOX,1090129433,
 extensions_ListBox_RID_SANE_DIALOG_RID_SCAN_STRING_RANGE_BOX,1090129434,
@@ -5288,7 +5285,6 @@ 
extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT,859804166,
 extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSRIGHT,859804164,
 extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_FIELDLEFT,859804165,
 extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_FIELDRIGHT,859804163,
-extensions_PushButton_RID_PAGE_TABLESELECTION_PB_FORMDATASOURCE,859656711,
 extensions_PushButton_RID_SANE_DIALOG_RID_DEVICEINFO_BTN,1090130435,
 extensions_PushButton_RID_SANE_DIALOG_RID_PREVIEW_BTN,1090130450,
 extensions_PushButton_RID_SANE_DIALOG_RID_SCAN_BUTTON_OPTION_BTN,1090130460,
@@ -5309,8 +5305,6 @@ extensions_TabPage_RID_PAGE_LCW_FIELDLINK,859783168,
 extensions_TabPage_RID_PAGE_OPTIONS_FINAL,859734016,
 extensions_TabPage_RID_PAGE_OPTIONVALUES,859701248,
 extensions_TabPage_RID_PAGE_OPTION_DBFIELD,859717632,
-extensions_TabPage_RID_PAGE_TABLESELECTION,859652096,
-extensions_TabPage_RID_PAGE_TABLESELECTION_AB,860651520,
 extensions_TabPage_RID_TP_LICENSE,553664512,
 extensions_TabPage_RID_TP_WELCOME,553697280,
 filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_ALL,1090520065,
diff --git a/source/text/shared/autopi/01170300.xhp 
b/source/text/shared/autopi/01170300.xhp
index 229805e..dd6244f 100644
--- a/source/text/shared/autopi/01170300.xhp
+++ b/source/text/shared/autopi/01170300.xhp
@@ -28,6 +28,7 @@
 /meta
 body
 section id=tabauswahl
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/selecttablepage/SelectTablePage 
id=bm_id3147400 localize=false/
 paragraph role=heading id=hd_id3149748 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/autopi/01170300.xhp name=Select 
TableSelect Table/link/paragraph
 paragraph role=paragraph id=par_id3156211 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=.Specifies a table from the Seamonkey / Netscape 
address book source that is used as the address book in 
$[officename]./ahelp/paragraph
 /section
@@ -35,9 +36,9 @@
   embed href=text/shared/00/0401.xhp#addressimport3/
 /section
 paragraph role=paragraph id=par_id3155150 xml-lang=en-US l10n=U 
oldref=3All tables from the first user profile will be registered for this 
data source in $[officename]. You must specify one as the table that will be 
used in the $[officename] templates./paragraph
-bookmark xml-lang=en-US 
branch=hid/extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLELIST 
id=bm_id3147399 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/selecttablepage/table id=bm_id3147399 
localize=false/
 paragraph role=heading id=hd_id3154927 xml-lang=en-US level=2 
l10n=U oldref=4List box/paragraph
-paragraph role=paragraph id=par_id3147043 xml-lang=en-US l10n=U 
oldref=5ahelp 
hid=extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLELISTSpecifies the 
table that is to serve as the address book for the $[officename] 
templates./ahelp/paragraph
+paragraph role=paragraph id=par_id3147043 xml-lang=en-US l10n=U 
oldref=5ahelp hid=modules/sabpilot/ui/selecttablepage/tableSpecifies the 
table that is to serve as the address book for the $[officename] 
templates./ahelp/paragraph
 paragraph role=tip id=par_id3152801 xml-lang=en-US l10n=U 
oldref=6You can make changes to the templates and documents at a later time 
by choosing emphEdit - Exchange Database/emph./paragraph
 /body
 /helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |5 -
 source/text/shared/autopi/01170400.xhp |9 +
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit be223a7183d020358306a15426789c263e96151d
Author: Caolán McNamara caol...@redhat.com
Date:   Thu May 8 17:27:22 2014 +0100

update help ids for final addressbook tabpage

Change-Id: I4c616b96d91bef3e5ab05c5b19bca7155531cbeb

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 286807f..31c223c 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5199,14 +5199,11 @@ 
desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER,586088966,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW,586088965,
 extensions_CheckBox_RID_DLG_SELECTLABELCONTROL_1,1090126849,
-extensions_CheckBox_RID_PAGE_FINAL_CB_REGISTER_DS,860685313,
 extensions_CheckBox_RID_SANE_DIALOG_RID_SCAN_ADVANCED_BOX,1090126881,
 extensions_CheckBox_RID_SANE_DIALOG_RID_SCAN_BOOL_OPTION_BOX,1090126870,
 extensions_CheckBox_RID_TP_LICENSE_CB_ACCEPT,55366,
-extensions_ComboBox_RID_PAGE_FINAL_CBB_LOCATION,860688385,
 extensions_ComboBox_RID_PAGE_LCW_FIELDLINK_CMB_TABLEFIELD,859787266,
 extensions_ComboBox_RID_PAGE_LCW_FIELDLINK_CMB_VALUELISTFIELD,859787265,
-extensions_Edit_RID_PAGE_FINAL_ET_DATASOURCENAME,860686337,
 extensions_Edit_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS,859670529,
 
extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836,
 extensions_Edit_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT,859736067,
@@ -5278,7 +5275,6 @@ 
extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649,
 
extensions_PushButton_RID_PAGE_ADMININVOKATION_PB_INVOKE_ADMIN_DIALOG,860639745,
-extensions_PushButton_RID_PAGE_FINAL_PB_BROWSE,860688899,
 extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETOLEFT,859673090,
 extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETORIGHT,859673089,
 extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT,859804166,
@@ -5295,7 +5291,6 @@ 
extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148,
 extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES,859718147,
 extensions_TabPage_RID_PAGE_ADMININVOKATION,860635136,
 extensions_TabPage_RID_PAGE_DEFAULTFIELDSELECTION,859684864,
-extensions_TabPage_RID_PAGE_FINAL,860684288,
 extensions_TabPage_RID_PAGE_FORM_DATASOURCE_STATUS,859815936,
 extensions_TabPage_RID_PAGE_GROUPRADIOSELECTION,859668480,
 extensions_TabPage_RID_PAGE_GW_FIELDSELECTION,859799552,
diff --git a/source/text/shared/autopi/01170400.xhp 
b/source/text/shared/autopi/01170400.xhp
index 4785343..470c6fa 100644
--- a/source/text/shared/autopi/01170400.xhp
+++ b/source/text/shared/autopi/01170400.xhp
@@ -30,6 +30,7 @@
 /meta
 body
 section id=datquetitel
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/datasourcepage/DataSourcePage 
id=bm_id3865170 localize=false/
 paragraph role=heading id=hd_id3147000 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/autopi/01170400.xhp name=Data 
Source NameData Source Name/link/paragraph
 paragraph role=paragraph id=par_id3144740 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=.Specifies a location for the address book file and a 
name under which the data source will be listed in the data source 
explorer./ahelp/paragraph
 /section
@@ -38,12 +39,12 @@
 /section
 paragraph role=heading id=par_idN105B7 xml-lang=en-US level=2 
l10n=NEWLocation/paragraph
 paragraph role=paragraph id=par_idN105BB xml-lang=en-US 
l10n=NEWahelp hid=.Specifies the location of the database 
file./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/extensions:PushButton:RID_PAGE_FINAL:PB_BROWSE id=bm_id3865169 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/datasourcepage/browse id=bm_id3865169 
localize=false/
 bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DSADMIN_BROWSECONN 
id=bm_id1817072 localize=false/paragraph role=heading id=par_idN105BE 
xml-lang=en-US level=2 l10n=NEWBrowse/paragraph
 paragraph role=paragraph id=par_idN105C2 xml-lang=en-US 
l10n=NEWahelp hid=.Specifies the location using a file 
dialog./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/extensions:CheckBox:RID_PAGE_FINAL:CB_REGISTER_DS 
id=bm_id1906186 localize=false/paragraph role=heading id=par_idN105C5 
xml-lang=en-US level=2 l10n=NEWMake this address book available to all 
modules in %PRODUCTNAME/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/datasourcepage/available id=bm_id1906186 
localize=false/paragraph role=heading id=par_idN105C5 xml-lang=en-US 
level=2 l10n=NEWMake this address book available to all modules in 
%PRODUCTNAME/paragraph
 paragraph role=paragraph id=par_idN105C9 xml-lang=en-US 
l10n=NEWahelp hid=.Registers the newly created database file in 
%PRODUCTNAME. The 

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

[Caolán McNamara]

 helpers/help_hid.lst   |2 --
 source/text/shared/autopi/01170500.xhp |5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 373b6920afc9b78dc1af8859f20ac3b7a03eae17
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 22 09:36:14 2014 +0100

update help ids for field assign type page .ui conversion

Change-Id: Id57c657f7c810f3a32f509bef35dcb54bb677989

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 3b3c16e..7c64e53 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5552,7 +5552,6 @@ 
extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649,
 
extensions_PushButton_RID_PAGE_ADMININVOKATION_PB_INVOKE_ADMIN_DIALOG,860639745,
-extensions_PushButton_RID_PAGE_FIELDMAPPING_PB_INVOKE_FIELDS_DIALOG,860672514,
 extensions_PushButton_RID_PAGE_FINAL_PB_BROWSE,860688899,
 extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETOLEFT,859673090,
 extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETORIGHT,859673089,
@@ -5571,7 +5570,6 @@ 
extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148,
 extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES,859718147,
 extensions_TabPage_RID_PAGE_ADMININVOKATION,860635136,
 extensions_TabPage_RID_PAGE_DEFAULTFIELDSELECTION,859684864,
-extensions_TabPage_RID_PAGE_FIELDMAPPING,860667904,
 extensions_TabPage_RID_PAGE_FINAL,860684288,
 extensions_TabPage_RID_PAGE_FORM_DATASOURCE_STATUS,859815936,
 extensions_TabPage_RID_PAGE_GROUPRADIOSELECTION,859668480,
diff --git a/source/text/shared/autopi/01170500.xhp 
b/source/text/shared/autopi/01170500.xhp
index 5ff0f1c..046b43d 100644
--- a/source/text/shared/autopi/01170500.xhp
+++ b/source/text/shared/autopi/01170500.xhp
@@ -32,14 +32,15 @@
 /meta
 body
 section id=feldzuordnung
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/fieldassignpage/FieldAssignPage 
id=bm_id3152593 localize=false/
 paragraph role=heading id=hd_id3147588 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/autopi/01170500.xhp name=Field 
AssignmentField Assignment/link/paragraph
 paragraph role=paragraph id=par_id3143284 xml-lang=en-US l10n=U 
oldref=2ahelp hid=Opens a dialog that allows you to specify the field 
assignment./ahelp/paragraph
 /section
 section id=howtoget
   embed href=text/shared/00/0401.xhp#addressimport5/
 /section
-bookmark xml-lang=en-US 
branch=hid/extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOG
 id=bm_id3152594 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/fieldassignpage/assign id=bm_id3152594 
localize=false/
 paragraph role=heading id=hd_id3152372 xml-lang=en-US level=2 
l10n=U oldref=3Field Assignment/paragraph
-paragraph role=paragraph id=par_id3149549 xml-lang=en-US l10n=U 
oldref=4ahelp 
hid=extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOGOpens 
the link href=text/shared/01/01110101.xhp name=Templates: Address Book 
AssignmentTemplates: Address Book Assignment/link 
dialog./ahelp/paragraph
+paragraph role=paragraph id=par_id3149549 xml-lang=en-US l10n=U 
oldref=4ahelp hid=modules/sabpilot/ui/fieldassignpage/assignOpens the 
link href=text/shared/01/01110101.xhp name=Templates: Address Book 
AssignmentTemplates: Address Book Assignment/link 
dialog./ahelp/paragraph
 /body
 /helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |   12 -
 source/text/shared/autopi/0117.xhp |   40 -
 2 files changed, 20 insertions(+), 32 deletions(-)

New commits:
commit 715548464de91abebe16c2574252121528a38e80
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 20 21:49:42 2014 +0100

update help ids for select address book type page .ui conversion

Change-Id: I9633f2f848bb10f5f9b1a5a1d3fe71c987ae20cf

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 92fdd20..3b3c16e 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5569,17 +5569,6 @@ 
extensions_RadioButton_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO,8596853
 
extensions_RadioButton_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES,859685377,
 extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148,
 extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES,859718147,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION,860619267,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_GROUPWISE,860619274,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_LDAP,860619275,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_KAB,860619268,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_LDAP,860619270,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_MACAB,860619269,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_MORK,860619265,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OTHER,860619273,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOK,860619271,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOKEXPRESS,860619272,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_THUNDERBIRD,860619266,
 extensions_TabPage_RID_PAGE_ADMININVOKATION,860635136,
 extensions_TabPage_RID_PAGE_DEFAULTFIELDSELECTION,859684864,
 extensions_TabPage_RID_PAGE_FIELDMAPPING,860667904,
@@ -5593,7 +5582,6 @@ extensions_TabPage_RID_PAGE_LCW_FIELDLINK,859783168,
 extensions_TabPage_RID_PAGE_OPTIONS_FINAL,859734016,
 extensions_TabPage_RID_PAGE_OPTIONVALUES,859701248,
 extensions_TabPage_RID_PAGE_OPTION_DBFIELD,859717632,
-extensions_TabPage_RID_PAGE_SELECTABTYPE,860618752,
 extensions_TabPage_RID_PAGE_TABLESELECTION,859652096,
 extensions_TabPage_RID_PAGE_TABLESELECTION_AB,860651520,
 extensions_TabPage_RID_TP_LICENSE,553664512,
diff --git a/source/text/shared/autopi/0117.xhp 
b/source/text/shared/autopi/0117.xhp
index acc6616..6919296 100644
--- a/source/text/shared/autopi/0117.xhp
+++ b/source/text/shared/autopi/0117.xhp
@@ -28,7 +28,7 @@
 /meta
 body
 section id=adressdatenquelle
-bookmark xml-lang=en-US 
branch=hid/extensions:TabPage:RID_PAGE_SELECTABTYPE id=bm_id2237617 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/selecttypepage/SelectTypePage 
id=bm_id2237617 localize=false/
 bookmark xml-lang=en-US branch=hid/slot:10934 id=bm_id3581347 
localize=false/
 bookmark xml-lang=en-US branch=hid/EXTENSIONS_HID_ABSPILOT 
id=bm_id3581348 localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:AutoPilotAddressDataSource 
id=bm_id6961272 localize=false/
@@ -42,39 +42,39 @@
 embed href=text/shared/guide/data_addressbook.xhp#data_addressbook/
 paragraph role=heading id=hd_id3153527 xml-lang=en-US level=2 
l10n=U oldref=9Please select the type of your external address 
book/paragraph
 paragraph role=paragraph id=par_id5782036 xml-lang=en-US l10n=NEWNot 
all types are available on all systems./paragraph
-bookmark xml-lang=en-US 
branch=hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK 
id=bm_id3149096 localize=false/
-paragraph role=heading id=hd_id3154288 xml-lang=en-US level=3 
l10n=U oldref=10Seamonkey / Netscape/paragraph
-paragraph role=paragraph id=par_id3145071 xml-lang=en-US l10n=U 
oldref=11ahelp 
hid=extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORKSelect this option 
if you already use an address book in Seamonkey or Netscape./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD 
id=bm_id611896 localize=false/
-paragraph role=heading id=hd_id3895382 xml-lang=en-US level=3 
l10n=NEWThunderbird/paragraph
-paragraph role=paragraph id=par_id6709494 xml-lang=en-US 
l10n=NEWahelp hid=.Select this option if you already use an address book 
in Thunderbird./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP 
id=bm_id3147654 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/selecttypepage/firefox id=bm_id3149096 
localize=false/
+paragraph role=heading id=hd_id3154288 xml-lang=en-US level=3 
l10n=U oldref=10Firefox / Iceweasel/paragraph
+paragraph role=paragraph id=par_id3145071 xml-lang=en-US l10n=U 
oldref=11ahelp hid=modules/sabpilot/ui/selecttypepage/firefoxSelect this 
option if you already use an address book in Firefox or 
Iceweasel./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/sabpilot/ui/selecttypepage/thunderbird 

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

[Caolán McNamara]

 helpers/help_hid.lst  |9 
 source/text/scalc/01/12120100.xhp |   39 ++
 2 files changed, 19 insertions(+), 29 deletions(-)

New commits:
commit 9ab507d3f5fd419d7b1c88d6d43758e8361ae71d
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 9 10:53:18 2014 +0100

update help ids for validation criteria .ui page conversion

Change-Id: I9565aec027204fa9e2ce4480936468915177ab58

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f2109e6..92fdd20 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5650,17 +5650,12 @@ sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_LOOKUP,957252627,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_MATCH,957252626,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_REGEX,957252628,
-sc_CheckBox_TP_VALIDATION_VALUES_CB_SHOWLIST,548275227,
-sc_CheckBox_TP_VALIDATION_VALUES_CB_SORTLIST,548275228,
-sc_CheckBox_TP_VALIDATION_VALUES_TSB_ALLOW_BLANKS,548275203,
 sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_NAME,1495336973,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_PASSWD,1495336977,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_SOURCE,1495336971,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_USER,1495336975,
 sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637,
-sc_Edit_TP_VALIDATION_VALUES_EDT_MAX,548276233,
-sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231,
 sc_FloatingWindow_RID_SCDLG_TEAM,231304704,
 sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481,
 sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304,
@@ -5674,11 +5669,8 @@ sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
-sc_ListBox_TP_VALIDATION_VALUES_LB_ALLOW,548277762,
-sc_ListBox_TP_VALIDATION_VALUES_LB_VALUE,548277765,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
-sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
@@ -5700,7 +5692,6 @@ sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP1,956432903,
 sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP2,956432904,
 sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP3,956432905,
 sc_TabPage_RID_SCPAGE_STAT,957628416,
-sc_TabPage_TP_VALIDATION_VALUES,548274176,
 sc_TriStateBox_RID_SCPAGE_PROTECTION_BTN_HIDE_ALL,956384771,
 sc_TriStateBox_RID_SCPAGE_PROTECTION_BTN_HIDE_FORMULAR,956384770,
 sc_TriStateBox_RID_SCPAGE_PROTECTION_BTN_HIDE_PRINT,956384774,
diff --git a/source/text/scalc/01/12120100.xhp 
b/source/text/scalc/01/12120100.xhp
index 52376f2..9a2a012 100644
--- a/source/text/scalc/01/12120100.xhp
+++ b/source/text/scalc/01/12120100.xhp
@@ -35,17 +35,17 @@ YJ: checked/lastedited
 section id=werte
 bookmark xml-lang=en-US branch=index 
id=bm_id1464278bookmark_valueselection lists;validity/bookmark_value
 /bookmarkcommentUFI added index entry for new list feature. Guide needed. 
MW changed index entry/comment
-bookmark xml-lang=en-US branch=hid/sc:TabPage:TP_VALIDATION_VALUES 
id=bm_id3145673 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/validationcriteriapage/ValidationCriteriaPage 
id=bm_id3145673 localize=false/
 paragraph role=heading id=hd_id3153032 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/scalc/01/12120100.xhp 
name=CriteriaCriteria/link/paragraph
-paragraph role=paragraph id=par_id3156327 xml-lang=en-US l10n=U 
oldref=2ahelp hid=SC:TABPAGE:TP_VALIDATION_VALUESSpecify the validation 
rules for the selected cell(s)./ahelp/paragraph
+paragraph role=paragraph id=par_id3156327 xml-lang=en-US l10n=U 
oldref=2ahelp 
hid=modules/scalc/ui/validationcriteriapage/ValidationCriteriaPageSpecify 
the validation rules for the selected cell(s)./ahelp/paragraph
 /section
 section id=howtoget
   embed href=text/scalc/00/0412.xhp#datengueltigwerte/
 /section
 paragraph role=paragraph id=par_id3155923 xml-lang=en-US l10n=U 
oldref=4For example, you can define criteria such as: Numbers between 1 and 
10 or Texts that are no more than 20 characters./paragraph
-bookmark xml-lang=en-US 
branch=hid/sc:ListBox:TP_VALIDATION_VALUES:LB_ALLOW id=bm_id3148663 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/validationcriteriapage/allow id=bm_id3148663 
localize=false/
 paragraph role=heading id=hd_id3153896 xml-lang=en-US level=2 
l10n=U oldref=5Allow/paragraph
-paragraph role=paragraph id=par_id3150400 xml-lang=en-US l10n=U 
oldref=6ahelp hid=SC:LISTBOX:TP_VALIDATION_VALUES:LB_ALLOWClick a 
validation option for the selected cell(s)./ahelp/paragraph
+paragraph role=paragraph id=par_id3150400 xml-lang=en-US l10n=U 
oldref=6ahelp hid=modules/scalc/ui/validationcriteriapage/allowClick a 
validation option for the selected cell(s)./ahelp/paragraph
 paragraph role=paragraph 

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

[Caolán McNamara]

 helpers/help_hid.lst   |3 ---
 source/text/shared/01/06040700.xhp |5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 1aa90a58fe65e3232beec56ccd08f60a2371ff69
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Apr 4 13:04:39 2014 +0100

update help ids for smart tags tabpage .ui conversion

Change-Id: I81dd180b5ca8b744fe9813131acdca86f4b7b108

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 5444c95..f2109e6 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2443,7 +2443,6 @@ HID_OFADLG_OPTIONS_TREE,35097,
 HID_OFADLG_TREELISTBOX,35098,
 HID_OFAPAGE_AUTOCORR_OPTIONS,35029,
 HID_OFAPAGE_AUTOFORMAT_CLB,35075,
-HID_OFAPAGE_SMARTTAG_OPTIONS,35155,
 HID_OFA_FONT_SUBST_CLB,35084,
 HID_OFA_HYPERLINK_NAME,35079,
 HID_OFA_HYPERLINK_TARGET,35053,
@@ -5897,7 +5896,6 @@ svx_CheckBox_OFA_TP_VIEW_CB_SELECTION,810517575,
 svx_CheckBox_OFA_TP_VIEW_CB_SYSTEM_FONT,810517561,
 svx_CheckBox_OFA_TP_VIEW_CB_USE_ANTIALIASE,810517573,
 svx_CheckBox_OFA_TP_VIEW_CB_USE_HARDACCELL,810517572,
-svx_CheckBox_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS,809256156,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709,
 svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_1,339194,
@@ -6214,7 +6212,6 @@ 
svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_RENAME,1241813511,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_RUN,1241813507,
 svx_PushButton_RID_OFADLG_OPTIONS_TREE_PB_BACK,1345966596,
 svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT,809013821,
-svx_PushButton_RID_OFAPAGE_SMARTTAG_OPTIONS_PB_SMARTTAGS,809259743,
 svx_PushButton_RID_SFXPAGE_PATH_BTN_PATH,733581837,
 svx_PushButton_RID_SFXPAGE_PATH_BTN_STANDARD,733581838,
 svx_PushButton_RID_SVXDLG_ADD_SUBMISSION_PB_SUBMIT_REF,1368920595,
diff --git a/source/text/shared/01/06040700.xhp 
b/source/text/shared/01/06040700.xhp
index 7880f45..ad246c1 100644
--- a/source/text/shared/01/06040700.xhp
+++ b/source/text/shared/01/06040700.xhp
@@ -30,6 +30,7 @@
 /meta
 body
 section id=smarttags
+bookmark xml-lang=en-US 
branch=hid/cui/ui/smarttagoptionspage/SmartTagOptionsPage id=bm_id8832055 
localize=false/
 bookmark xml-lang=en-US branch=index 
id=bm_id9057588bookmark_valuesmart tag configuration/bookmark_value
 /bookmarkcommentMW moved 2 index entries to the Writer guide smarttags.xhp 
and added a new one/commentparagraph role=heading id=hd_id3563951 
xml-lang=en-US level=1 l10n=NEWSmart Tags/paragraph
 paragraph role=paragraph id=par_id1827448 xml-lang=en-US 
l10n=NEWahelp hid=.When you have installed at least one Smart Tag 
extension, you see the Smart Tags page./ahelp/paragraph
@@ -38,11 +39,11 @@
   embed href=text/shared/00/0406.xhp#autokosmarttags/
 /section
 embed href=text/swriter/guide/smarttags.xhp#smarttags/
-bookmark xml-lang=en-US 
branch=hid/SVX_CHECKBOX_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS 
id=bm_id8832056 localize=false/paragraph role=heading id=hd_id68 
xml-lang=en-US level=2 l10n=NEWLabel text with smart tags/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/smarttagoptionspage/main 
id=bm_id8832056 localize=false/paragraph role=heading id=hd_id68 
xml-lang=en-US level=2 l10n=NEWLabel text with smart tags/paragraph
 paragraph role=paragraph id=par_id3259376 xml-lang=en-US 
l10n=NEWahelp hid=.Enables Smart Tags to be evaluated and shown in your 
text document./ahelp/paragraph
 paragraph role=heading id=hd_id4024170 xml-lang=en-US level=2 
l10n=NEWCurrently installed smart tags/paragraph
 paragraph role=paragraph id=par_id2847071 xml-lang=en-US 
l10n=NEWahelp hid=.Displays all installed Smart Tags. To configure a 
Smart Tag, select the name of the Smart Tag, then click Properties. Not all 
Smart Tags can be configured./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/SVX_PUSHBUTTON_RID_OFAPAGE_SMARTTAG_OPTIONS_PB_SMARTTAGS 
id=bm_id9547410 localize=false/paragraph role=heading id=hd_id8424329 
xml-lang=en-US level=2 l10n=NEWProperties/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/smarttagoptionspage/properties 
id=bm_id9547410 localize=false/paragraph role=heading id=hd_id8424329 
xml-lang=en-US level=2 l10n=NEWProperties/paragraph
 paragraph role=paragraph id=par_id3912167 xml-lang=en-US 
l10n=NEWahelp hid=.To configure a Smart Tag, select the name of the 
Smart Tag, then click Properties. Not all Smart Tags can be 
configured./ahelp/paragraph
 /body
 /helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |   24 
 source/text/swriter/01/mailmerge08.xhp |   47 -
 2 files changed, 24 insertions(+), 47 deletions(-)

New commits:
commit c719458fbdafdb833a17874de420876a54e6ded3
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Apr 3 20:32:39 2014 +0100

update help ids for mail merge output page .ui conversion

Change-Id: I840fc424c2e04bda2b2f54effa3c95b7692cd1ba

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1f3f951..5444c95 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2305,7 +2305,6 @@ HID_MM_HEADER_9,55044,
 HID_MM_MAILBODY,54982,
 HID_MM_MAILSTATUS_TLB,54988,
 HID_MM_NEXT_PAGE,55016,
-HID_MM_OUTPUTPAGE,54961,
 HID_MM_PREV_PAGE,55017,
 HID_MM_SELECTDBTABLEDDIALOG,54963,
 HID_MM_SELECTDBTABLEDDIALOG_LISTBOX,54964,
@@ -6341,8 +6340,6 @@ sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698,
 sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977,
 sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969,
 sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960,
-sw_Edit_DLG_MM_OUTPUT_PAGE_ED_ATTACHMENT,898304052,
-sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT,898304035,
 sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
 sw_Edit_TP_LINENUMBERING_ED_DIVISOR,87975,
 sw_FT_BODY_DLG_MM_MAILBODY,1435402240,
@@ -6356,9 +6353,6 @@ sw_ListBox_DLG_MAILMERGE_LB_ADDRESSFLD,1446612494,
 sw_ListBox_DLG_MAILMERGE_LB_COLUMN,1446612510,
 sw_ListBox_DLG_MAILMERGE_LB_FILTER,1446612524,
 sw_ListBox_DLG_MM_ASSIGNFIELDS_CT_FIELDS_LB_FIELDS,1074908678,
-sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_MAILTO,898305568,
-sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_PRINT,898305558,
-sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_SENDAS,898305573,
 sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINEPOS,877956631,
 sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINETYPE,877956629,
 sw_ListBox_TP_FORMAT_TABLE_LB_TEXTORIENTATION,878218796,
@@ -6409,8 +6403,6 @@ sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395,
 sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045,
 sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047,
 sw_NumericField_DLG_MM_CREATEADDRESSLIST_NF_SETNO,1435244554,
-sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_FROM,898308112,
-sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_TO,898308114,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139,
 sw_NumericField_TP_LINENUMBERING_NF_DIV_INTERVAL,878893073,
@@ -6440,13 +6432,6 @@ sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEW,1435243011,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEXT,1435243019,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_PREV,1435243017,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_START,1435243016,
-sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_COPYTO,898306593,
-sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTERSETTINGS,898306583,
-sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTNOW,898306586,
-sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVENOW,898306579,
-sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVESTARTDOC,898306568,
-sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDAS,898306598,
-sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDDOCUMENTS,898306600,
 sw_PushButton_DLG_MM_SELECTDBTABLEDDIALOG_PB_PREVIEW,1435210243,
 sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
 sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820,
@@ -6460,15 +6445,6 @@ sw_RadioButton_DLG_MAILMERGE_RB_MARKED,1446609411,
 sw_RadioButton_DLG_MAILMERGE_RB_PRINTER,1446609419,
 sw_RadioButton_DLG_MAILMERGE_RB_SAVE_INDIVIDUAL,1446609448,
 sw_RadioButton_DLG_MAILMERGE_RB_SAVE_SINGLE_DOC,1446609447,
-sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_FROM,898302479,
-sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_PRINT,898302469,
-sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_PRINTALL,898302488,
-sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEASONE,898302476,
-sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEINDIVIDUAL,898302477,
-sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEMERGEDDOC,898302468,
-sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVESTARTDOC,898302467,
-sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SENDALL,898302503,
-sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SENDMAIL,898302470,
 sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_LANDSCAPE,1411285528,
 sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_PORTRAIT,1411285529,
 sw_RadioButton_TP_FOOTNOTE_PAGE_RB_MAXHEIGHT,877953538,
diff --git a/source/text/swriter/01/mailmerge08.xhp 
b/source/text/swriter/01/mailmerge08.xhp
index 41e6ec9..6f89b62 100644
--- a/source/text/swriter/01/mailmerge08.xhp
+++ b/source/text/swriter/01/mailmerge08.xhp
@@ -32,78 +32,79 @@
 /meta
 body
 section id=saveprintsend
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/mmoutputpage/MMOutputPage id=bm_id3743096 
localize=false/
 paragraph role=heading id=par_idN1054C xml-lang=en-US level=1 
l10n=NEWlink href=text/swriter/01/mailmerge08.xhpMail Merge Wizard - 
Save, Print or Send/link/paragraph
 paragraph role=paragraph id=par_idN1055C xml-lang=en-US 
l10n=NEWSpecifies the output options for mail merge documents./paragraph
 /section
 paragraph role=paragraph id=par_idN1055F xml-lang=en-US l10n=NEWThe 
appearance 

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

[Caolán McNamara]

 helpers/help_hid.lst  |7 ---
 source/text/shared/explorer/database/0503.xhp |   12 ++--
 2 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 9bcb26d23cbda4a893b9e5550fc70cc39de2c91f
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 1 12:28:57 2014 +0100

update help ids for database admin user password dialog .ui conversion

Change-Id: Ic18d9fc64253bc0e8c4b6dcb4c7b6daf6b7a1e52

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ed967fb..ca8ef16 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1428,7 +1428,6 @@ HID_DLG_MAPPING,34842,
 HID_DLG_NAME,33818,
 HID_DLG_NEWERVERSIONWARNING,35848,
 HID_DLG_PASSWD_SECTION,53440,
-HID_DLG_PASSWORD,38964,
 HID_DLG_TEXT,38843,
 HID_DLG_WORDCOUNT,54987,
 HID_DOCINFO_EDT,33070,
@@ -5378,9 +5377,6 @@ dbaccess_Edit_DLG_ADABASSTAT_ET_TRANSACTIONLOG,1388611586,
 dbaccess_Edit_DLG_COLLECTION_VIEW_ED_EXPLORERFILE_FILENAME,1388759041,
 dbaccess_Edit_DLG_DOMAINPASSWORD_ET_PASSWORD,1388709890,
 dbaccess_Edit_DLG_PARAMETERS_ET_PARAM,1388398596,
-dbaccess_Edit_DLG_PASSWORD_ED_OLDPASSWORD,1388693523,
-dbaccess_Edit_DLG_PASSWORD_ED_PASSWORD,1388693525,
-dbaccess_Edit_DLG_PASSWORD_ED_PASSWORD_REPEAT,1388693527,
 dbaccess_Edit_PAGE_ADABAS_ET_CTRLPASSWORD,851527681,
 dbaccess_Edit_PAGE_ADABAS_ET_CTRLUSERNAME,851527682,
 dbaccess_Edit_PAGE_ADABAS_ET_HOSTNAME,851527685,
@@ -5968,9 +5964,6 @@ 
svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_NAME,1368918028,
 svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_REF,1368918034,
 svx_Edit_RID_SVXDLG_ASSIGNCOMPONENT_EDIT_METHOD,1242449965,
 svx_Edit_RID_SVXDLG_IMAP_EDT_TEXT,2318698497,
-svx_Edit_RID_SVXDLG_PASSWORD_ED_NEW_PASSWD,1239894037,
-svx_Edit_RID_SVXDLG_PASSWORD_ED_OLD_PASSWD,1239894027,
-svx_Edit_RID_SVXDLG_PASSWORD_ED_REPEAT_PASSWD,1239894039,
 svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_1,2315372554,
 svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_2,2315372555,
 svx_Edit_RID_SVXDLG_RUBY_ED_LEFT_3,2315372556,
diff --git a/source/text/shared/explorer/database/0503.xhp 
b/source/text/shared/explorer/database/0503.xhp
index e0eb5fd..2cb3864 100644
--- a/source/text/shared/explorer/database/0503.xhp
+++ b/source/text/shared/explorer/database/0503.xhp
@@ -36,14 +36,14 @@
 bookmark xml-lang=en-US branch=hid/sfx/ui/password/usered 
id=bm_id3149283 localize=false/
 paragraph role=heading id=hd_id3157898 xml-lang=en-US level=2 
l10n=U oldref=3User/paragraph
 paragraph role=paragraph id=par_id3149346 xml-lang=en-US l10n=U 
oldref=4ahelp hid=sfx/ui/password/useredSpecifies the name of the new 
user./ahelp This field is only visible if you have defined a new 
user./paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD id=bm_id3145346 
localize=false/
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/password/oldpassword 
id=bm_id3145346 localize=false/
 paragraph role=heading id=hd_id3153681 xml-lang=en-US level=2 
l10n=U oldref=9Old password/paragraph
-paragraph role=paragraph id=par_id3147576 xml-lang=en-US l10n=U 
oldref=10ahelp hid=DBACCESS_EDIT_DLG_PASSWORD_ED_OLDPASSWORDEnter the 
old password./ahelp This field is visible when you have started the dialog 
via emphChange password/emph./paragraph
-bookmark xml-lang=en-US branch=hid/dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD 
id=bm_id3166411 localize=false/
+paragraph role=paragraph id=par_id3147576 xml-lang=en-US l10n=U 
oldref=10ahelp hid=dbaccess/ui/password/oldpasswordEnter the old 
password./ahelp This field is visible when you have started the dialog via 
emphChange password/emph./paragraph
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/password/newpassword 
id=bm_id3166411 localize=false/
 paragraph role=heading id=hd_id3153311 xml-lang=en-US level=2 
l10n=U oldref=5Password/paragraph
-paragraph role=paragraph id=par_id3147243 xml-lang=en-US l10n=U 
oldref=6ahelp hid=DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORDEnter the new 
password./ahelp/paragraphcommentUFI: removed help id/comment
-bookmark xml-lang=en-US 
branch=hid/dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD_REPEAT id=bm_id3163802 
localize=false/
+paragraph role=paragraph id=par_id3147243 xml-lang=en-US l10n=U 
oldref=6ahelp hid=dbaccess/ui/password/newpasswordEnter the new 
password./ahelp/paragraphcommentUFI: removed help id/comment
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/password/confirmpassword 
id=bm_id3163802 localize=false/
 paragraph role=heading id=hd_id3147275 xml-lang=en-US level=2 
l10n=U oldref=7Confirm (password)/paragraph
-paragraph role=paragraph id=par_id3153541 xml-lang=en-US l10n=U 
oldref=8ahelp hid=DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD_REPEATEnter the 
new password again./ahelp/paragraph
+paragraph role=paragraph id=par_id3153541 xml-lang=en-US l10n=U 
oldref=8ahelp hid=dbaccess/ui/password/confirmpasswordEnter the new 
password again./ahelp/paragraph
 /body
 /helpdocument
___
Libreoffice-commits mailing list

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

[Caolán McNamara]

 helpers/help_hid.lst  |   11 -
 source/text/smath/01/06010100.xhp |   44 +++---
 2 files changed, 22 insertions(+), 33 deletions(-)

New commits:
commit ada2b43cf78b9cd4e69bd4d6bc4a5185def85295
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 1 16:29:53 2014 +0100

update help ids for math define symbol dialog .ui conversion

Change-Id: Ia58d81494f02a92497577bb8002c9992ef4fc5f7

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ba2d0d0..1f3f951 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5830,17 +5830,6 @@ sfx2_ModalDialog_RID_URLOPEN,1112571904,
 sfx2_ModalDialog_RID_WARN_PRINTTRANSPARENCY,1113047040,
 sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
 sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
-starmath_ComboBox_RID_SYMDEFINEDIALOG_1,1401573377,
-starmath_ComboBox_RID_SYMDEFINEDIALOG_2,1401573378,
-starmath_ComboBox_RID_SYMDEFINEDIALOG_3,1401573379,
-starmath_ComboBox_RID_SYMDEFINEDIALOG_4,1401573380,
-starmath_ComboBox_RID_SYMDEFINEDIALOG_5,1401573381,
-starmath_ListBox_RID_SYMDEFINEDIALOG_1,1401572865,
-starmath_ListBox_RID_SYMDEFINEDIALOG_LB_FONTS_SUBSET,1401572975,
-starmath_ModalDialog_RID_SYMDEFINEDIALOG,1401569280,
-starmath_PushButton_RID_SYMDEFINEDIALOG_1,1401573889,
-starmath_PushButton_RID_SYMDEFINEDIALOG_2,1401573890,
-starmath_PushButton_RID_SYMDEFINEDIALOG_3,1401573891,
 svtools_CheckBox_DLG_LOGIN_CB_LOGIN_SAVEPASSWORD,1336427552,
 svtools_CheckBox_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE,1338786859,
 svtools_CheckBox_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT,1338786829,
diff --git a/source/text/smath/01/06010100.xhp 
b/source/text/smath/01/06010100.xhp
index 6772fd3..9d482da 100644
--- a/source/text/smath/01/06010100.xhp
+++ b/source/text/smath/01/06010100.xhp
@@ -31,53 +31,53 @@
 /history
 /meta
 body
-bookmark xml-lang=en-US 
branch=hid/starmath:ModalDialog:RID_SYMDEFINEDIALOG id=bm_id3149379 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/smath/ui/symdefinedialog/EditSymbols id=bm_id3149379 
localize=false/
 bookmark xml-lang=en-US branch=index 
id=bm_id2123477bookmark_valuenew symbols in %PRODUCTNAME 
Math/bookmark_value
 bookmark_valuesymbols; adding in %PRODUCTNAME Math/bookmark_value
 /bookmark
 paragraph role=heading id=hd_id3151075 xml-lang=en-US level=1 
l10n=CHG oldref=1Edit Symbols/paragraph
-paragraph role=paragraph id=par_id3154513 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=STARMATH_MODALDIALOG_RID_SYMDEFINEDIALOGUse this 
dialog to add symbols to a symbol set, to edit symbol sets, or to modify symbol 
notations./ahelp You can also define new symbol sets, assign names to 
symbols, or to modify existing symbol sets./paragraph
+paragraph role=paragraph id=par_id3154513 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=modules/smath/ui/symdefinedialog/EditSymbolsUse this 
dialog to add symbols to a symbol set, to edit symbol sets, or to modify symbol 
notations./ahelp You can also define new symbol sets, assign names to 
symbols, or to modify existing symbol sets./paragraph
 section id=howtoget
   embed href=text/smath/00/0004.xhp#etssba/
 /section
-bookmark xml-lang=en-US 
branch=hid/starmath:ComboBox:RID_SYMDEFINEDIALOG:1 id=bm_id3154253 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/smath/ui/symdefinedialog/oldSymbols id=bm_id3154253 
localize=false/
 paragraph role=heading id=hd_id3146066 xml-lang=en-US level=2 
l10n=CHG oldref=3Old Symbol/paragraph
-paragraph role=paragraph id=par_id3153965 xml-lang=en-US l10n=CHG 
oldref=4ahelp hid=STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_1Select the name 
of the current symbol./ahelp The symbol, the name of the symbol, and the set 
that the symbol belongs to are displayed in the left preview pane at the bottom 
of the dialog box./paragraph
-bookmark xml-lang=en-US 
branch=hid/starmath:ComboBox:RID_SYMDEFINEDIALOG:2 id=bm_id3145791 
localize=false/
+paragraph role=paragraph id=par_id3153965 xml-lang=en-US l10n=CHG 
oldref=4ahelp hid=modules/smath/ui/symdefinedialog/oldSymbolsSelect the 
name of the current symbol./ahelp The symbol, the name of the symbol, and the 
set that the symbol belongs to are displayed in the left preview pane at the 
bottom of the dialog box./paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/smath/ui/symdefinedialog/oldSymbolSets id=bm_id3145791 
localize=false/
 paragraph role=heading id=hd_id3154020 xml-lang=en-US level=2 
l10n=CHG oldref=7Old Symbol Set/paragraph
-paragraph role=paragraph id=par_id3150209 xml-lang=en-US l10n=CHG 
oldref=8ahelp hid=STARMATH_COMBOBOX_RID_SYMDEFINEDIALOG_2This list box 
contains the name of the current symbol set. If you want, you can also select a 
different symbol set./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/starmath:ComboBox:RID_SYMDEFINEDIALOG:4 id=bm_id3153816 
localize=false/
+paragraph role=paragraph id=par_id3150209 xml-lang=en-US l10n=CHG 
oldref=8ahelp 

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

[Caolán McNamara]

 helpers/help_hid.lst   |7 ---
 source/text/swriter/01/mailmerge07.xhp |   13 +++--
 2 files changed, 7 insertions(+), 13 deletions(-)

New commits:
commit 2b799e21a07d93f7b997bb1f3fa85e8cffb19356
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 25 16:11:34 2014 +

update help ids for mail merge wizard page .ui conversion

Change-Id: Icb1525679914ef214ed5eccf451accc6e2885e76

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6542891..ed967fb 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2305,7 +2305,6 @@ HID_MM_HEADER_8,55043,
 HID_MM_HEADER_9,55044,
 HID_MM_MAILBODY,54982,
 HID_MM_MAILSTATUS_TLB,54988,
-HID_MM_MERGEPAGE,54960,
 HID_MM_NEXT_PAGE,55016,
 HID_MM_OUTPUTPAGE,54961,
 HID_MM_PREV_PAGE,55017,
@@ -6332,9 +6331,6 @@ sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940,
 sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938,
 sw_CheckBox_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE,1446609961,
 sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279,
-sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS,898286601,
-sw_CheckBox_DLG_MM_MERGE_PAGE_CB_MATCHCASE,898286602,
-sw_CheckBox_DLG_MM_MERGE_PAGE_CB_WHOLEWORDS,898286600,
 sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186,
 sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196,
 sw_CheckBox_TP_LAB_LAB_BOX_ADDR,909689858,
@@ -6366,7 +6362,6 @@ sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698,
 sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977,
 sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969,
 sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960,
-sw_Edit_DLG_MM_MERGE_PAGE_ED_FIND,898287622,
 sw_Edit_DLG_MM_OUTPUT_PAGE_ED_ATTACHMENT,898304052,
 sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT,898304035,
 sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
@@ -6466,8 +6461,6 @@ sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEW,1435243011,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEXT,1435243019,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_PREV,1435243017,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_START,1435243016,
-sw_PushButton_DLG_MM_MERGE_PAGE_PB_EDIT,898290179,
-sw_PushButton_DLG_MM_MERGE_PAGE_PB_FIND,898290183,
 sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_COPYTO,898306593,
 sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTERSETTINGS,898306583,
 sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTNOW,898306586,
diff --git a/source/text/swriter/01/mailmerge07.xhp 
b/source/text/swriter/01/mailmerge07.xhp
index 3294ac4..55d594f 100644
--- a/source/text/swriter/01/mailmerge07.xhp
+++ b/source/text/swriter/01/mailmerge07.xhp
@@ -32,26 +32,27 @@
 /meta
 body
 section id=personalize
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/mmmergepage/MMMergePage id=bm_id664083 
localize=false/
 paragraph role=heading id=par_idN10543 xml-lang=en-US level=1 
l10n=NEWlink href=text/swriter/01/mailmerge07.xhpMail Merge Wizard - 
Personalize Document/link/paragraph
 paragraph role=paragraph id=par_idN10553 xml-lang=en-US l10n=NEWEdit 
documents for each recipient./paragraph
 /section
 paragraph role=paragraph id=par_idN10556 xml-lang=en-US l10n=NEWThe 
Mail Merge Wizard creates a single merged document with page breaks between 
each recipient. When you reach this page of the wizard, the names and the 
addresses of the recipients are contained in the document./paragraph
-bookmark xml-lang=en-US 
branch=hid/sw:PushButton:DLG_MM_MERGE_PAGE:PB_EDIT id=bm_id664082 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmergepage/edit 
id=bm_id664082 localize=false/
 paragraph role=heading id=par_idN10559 xml-lang=en-US level=2 
l10n=NEWEdit individual document/paragraph
 paragraph role=paragraph id=par_idN1055D xml-lang=en-US 
l10n=CHGahelp hid=.Minimizes the wizard so that you can edit the mail 
merge document for a single recipient./ahelp After you made your changes, 
click the emphReturn to Mail Merge Wizard/emph button./paragraph
-bookmark xml-lang=en-US branch=hid/sw:Edit:DLG_MM_MERGE_PAGE:ED_FIND 
id=bm_id2794885 localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmergepage/entry 
id=bm_id2794885 localize=false/
 paragraph role=heading id=par_idN105FA xml-lang=en-US level=2 
l10n=NEWSearch for/paragraph
 paragraph role=paragraph id=par_idN105FE xml-lang=en-US 
l10n=NEWahelp hid=.Enter the text that you want to search for in the 
merged document, for example, the name of a recipient./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sw:PushButton:DLG_MM_MERGE_PAGE:PB_FIND id=bm_id2486342 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmergepage/find 
id=bm_id2486342 localize=false/
 paragraph role=heading id=par_idN10564 xml-lang=en-US level=2 
l10n=NEWFind/paragraph
 paragraph role=paragraph id=par_idN10568 xml-lang=en-US 
l10n=NEWahelp hid=.Click to start the search./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sw:CheckBox:DLG_MM_MERGE_PAGE:CB_WHOLEWORDS id=bm_id823999 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/mmmergepage/wholewords id=bm_id823999 

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

[Caolán McNamara]

 helpers/help_hid.lst   |8 
 source/text/swriter/01/mailmerge06.xhp |   15 ---
 2 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit 2dad7542c215024cd26ae42030e01ab772f2f9d5
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Mar 24 14:19:15 2014 +

update help ids for prepare mail merge wizard page .ui conversion

Change-Id: Ib775fa668793296796a568280289004a4ffd0988

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 4784745..6542891 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2308,7 +2308,6 @@ HID_MM_MAILSTATUS_TLB,54988,
 HID_MM_MERGEPAGE,54960,
 HID_MM_NEXT_PAGE,55016,
 HID_MM_OUTPUTPAGE,54961,
-HID_MM_PREPAREMERGEPAGE,54959,
 HID_MM_PREV_PAGE,55017,
 HID_MM_SELECTDBTABLEDDIALOG,54963,
 HID_MM_SELECTDBTABLEDDIALOG_LISTBOX,54964,
@@ -6336,7 +6335,6 @@ sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279,
 sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS,898286601,
 sw_CheckBox_DLG_MM_MERGE_PAGE_CB_MATCHCASE,898286602,
 sw_CheckBox_DLG_MM_MERGE_PAGE_CB_WHOLEWORDS,898286600,
-sw_CheckBox_DLG_MM_PREPAREMERGE_PAGE_CB_EXCLUDE,898270216,
 sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186,
 sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196,
 sw_CheckBox_TP_LAB_LAB_BOX_ADDR,909689858,
@@ -6439,7 +6437,6 @@ sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047,
 sw_NumericField_DLG_MM_CREATEADDRESSLIST_NF_SETNO,1435244554,
 sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_FROM,898308112,
 sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_TO,898308114,
-sw_NumericField_DLG_MM_PREPAREMERGE_PAGE_ED_RECORD,898275333,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139,
 sw_NumericField_TP_LINENUMBERING_NF_DIV_INTERVAL,878893073,
@@ -6478,11 +6475,6 @@ sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVENOW,898306579,
 sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVESTARTDOC,898306568,
 sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDAS,898306598,
 sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDDOCUMENTS,898306600,
-sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_EDIT,898273802,
-sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_FIRST,898273795,
-sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_LAST,898273799,
-sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_NEXT,898273798,
-sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_PREV,898273796,
 sw_PushButton_DLG_MM_SELECTDBTABLEDDIALOG_PB_PREVIEW,1435210243,
 sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
 sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820,
diff --git a/source/text/swriter/01/mailmerge06.xhp 
b/source/text/swriter/01/mailmerge06.xhp
index 2d6ddd4..0f06afa 100644
--- a/source/text/swriter/01/mailmerge06.xhp
+++ b/source/text/swriter/01/mailmerge06.xhp
@@ -32,21 +32,22 @@
 /meta
 body
 section id=preparemerge
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/mmpreparepage/MMPreparePage id=bm_id9046601 
localize=false/
 paragraph role=heading id=par_idN10543 xml-lang=en-US level=1 
l10n=NEWlink href=text/swriter/01/mailmerge06.xhpMail Merge Wizard - 
Edit Document/link/paragraph
 paragraph role=paragraph id=par_idN10553 xml-lang=en-US 
l10n=NEWBrowse through the document previews, exclude single recipients, and 
edit the main document./paragraph
 /section
-bookmark xml-lang=en-US 
branch=hid/sw:NumericField:DLG_MM_PREPAREMERGE_PAGE:ED_RECORD 
id=bm_id9046601 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/mmpreparepage/record-nospin id=bm_id9046601 
localize=false/
 paragraph role=heading id=par_idN10556 xml-lang=en-US level=2 
l10n=NEWRecipient/paragraph
 paragraph role=paragraph id=par_idN1055A xml-lang=en-US 
l10n=NEWahelp hid=.Enter the address record number of a recipient to 
preview the mail merge document for the recipient./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_FIRST id=bm_id735801 
localize=false/
-bookmark xml-lang=en-US 
branch=hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_PREV id=bm_id290536 
localize=false/
-bookmark xml-lang=en-US 
branch=hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_NEXT id=bm_id2619708 
localize=false/
-bookmark xml-lang=en-US 
branch=hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_LAST id=bm_id1293679 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmpreparepage/first 
id=bm_id735801 localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmpreparepage/prev 
id=bm_id290536 localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmpreparepage/next 
id=bm_id2619708 localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmpreparepage/last 
id=bm_id1293679 localize=false/
 paragraph role=paragraph id=par_idN10604 xml-lang=en-US 
l10n=NEWahelp hid=.Use the browse buttons to scroll through the address 
records./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sw:CheckBox:DLG_MM_PREPAREMERGE_PAGE:CB_EXCLUDE id=bm_id108340 
localize=false/
+bookmark xml-lang=en-US 

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

[Caolán McNamara]

 helpers/help_hid.lst   |   22 ---
 source/text/shared/01/0210.xhp |6 +--
 source/text/shared/01/02100100.xhp |4 +-
 source/text/shared/02/12100200.xhp |   68 ++---
 4 files changed, 39 insertions(+), 61 deletions(-)

New commits:
commit f73beaa903965e771f3cbaf50325743ced641ab1
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Mar 23 21:09:02 2014 +

update help ids for record search dialog .ui conversion

Change-Id: I047e565fa6943e2fd6b39bf6d8c67f22fef48dab

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a0a6ea3..4784745 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1651,7 +1651,6 @@ HID_FIRSTSTART_NEXT,42780,
 HID_FIRSTSTART_PREV,42779,
 HID_FLD_DROPDOWN,54954,
 HID_FM_CTL_SELECTION,59884,
-HID_FM_DLG_SEARCH,38177,
 HID_FM_PROPDLG_TABCTR,38173,
 HID_FM_PROPDLG_TAB_DATA,38175,
 HID_FM_PROPDLG_TAB_EVT,38176,
@@ -3091,19 +3090,6 @@ HID_SD_UNDODELETEWARNING_CBX,59894,
 HID_SD_UNDODELETEWARNING_DLG,59893,
 HID_SD_WIN_DOCUMENT,59787,
 HID_SD_WIN_PRESENTATION,59836,
-HID_SEARCH_ALLFIELDS,38179,
-HID_SEARCH_BACKWARD,38185,
-HID_SEARCH_BTN_CLOSE,38192,
-HID_SEARCH_BTN_SEARCH,38191,
-HID_SEARCH_CASE,38184,
-HID_SEARCH_DLG_TABLB,33136,
-HID_SEARCH_FIELDSELECTION,38181,
-HID_SEARCH_FORMATTER,38183,
-HID_SEARCH_POSITION,38182,
-HID_SEARCH_REGULAR,38188,
-HID_SEARCH_STARTOVER,38186,
-HID_SEARCH_TEXT,38178,
-HID_SEARCH_WILDCARD,38187,
 HID_SECTION_FTNENDNOTES_PAGE,53249,
 HID_SELECTTABLES,59000,
 HID_SELECT_TEMPLATE,54848,
@@ -5942,8 +5928,6 @@ svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_4,3391947778,
 svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_TRANS,3391947781,
 svx_CheckBox_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE_CB_JSCPT_DISABLE,1241269470,
 svx_CheckBox_RID_SVXDLG_RUBY_CB_AUTO_DETECT,2315371521,
-svx_CheckBox_RID_SVXDLG_SEARCHFORM_CB_HALFFULLFORMS,1368769544,
-svx_CheckBox_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK,1368769545,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_EXPAND,703775795,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_SNAP,703775782,
 svx_CheckBox_RID_SVXPAGE_BACKGROUND_BTN_LINK,700728342,
@@ -6117,7 +6101,6 @@ 
svx_ListBox_RID_SVXDLG_FONTWORK_CLB_SHADOW_COLOR,3386592769,
 svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103,
 svx_ListBox_RID_SVXDLG_RUBY_LB_CHAR_STYLE,2315374083,
 svx_ListBox_RID_SVXDLG_RUBY_LB_POSITION,2315374105,
-svx_ListBox_RID_SVXDLG_SEARCHFORM_LB_FORM,1368772097,
 svx_ListBox_RID_SVXFLOAT_3D_LB_AMBIENTLIGHT,3388493390,
 svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_1,3388493380,
 svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_2,3388493381,
@@ -6262,7 +6245,6 @@ 
svx_PushButton_RID_SVXDLG_ADD_SUBMISSION_PB_SUBMIT_REF,1368920595,
 svx_PushButton_RID_SVXDLG_BMPMASK_BTN_EXEC,3391951361,
 svx_PushButton_RID_SVXDLG_RUBY_PB_CLOSE,2315375112,
 svx_PushButton_RID_SVXDLG_RUBY_PB_STYLIST,2315375108,
-svx_PushButton_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS,1368773123,
 svx_PushButton_RID_SVXPAGE_BACKGROUND_BTN_BROWSE,700731924,
 svx_PushButton_RID_SVXPAGE_BITMAP_BTN_ADD,701665793,
 svx_PushButton_RID_SVXPAGE_BITMAP_BTN_DELETE,701665796,
@@ -6304,10 +6286,6 @@ 
svx_RadioButton_MD_UPDATE_BASELINKS_RB_AUTOMATIC,1598063146,
 svx_RadioButton_MD_UPDATE_BASELINKS_RB_MANUAL,1598063147,
 svx_RadioButton_RID_OFA_TP_INTERNATIONAL_RB_TXTDIR_LEFT2RIGHT,811336194,
 svx_RadioButton_RID_OFA_TP_INTERNATIONAL_RB_TXTDIR_RIGHT2LEFT,811336195,
-svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNOTNULL,1368769029,
-svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNULL,1368769028,
-svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT,1368769027,
-svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD,1368769026,
 svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_CENTERALIGN,703775264,
 svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_JUSTIFYALIGN,703775265,
 svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_LEFTALIGN,703775262,
diff --git a/source/text/shared/01/0210.xhp 
b/source/text/shared/01/0210.xhp
index 94226f9..ada1725 100644
--- a/source/text/shared/01/0210.xhp
+++ b/source/text/shared/01/0210.xhp
@@ -122,21 +122,21 @@ Ext help text not found within switches. Solution: Keep 
switched text for normal
 /default
 /switchembed href=text/shared/01/02100100.xhp#aehnlichkeit/
 bookmark xml-lang=en-US 
branch=hid/svx/ui/findreplacedialog/matchcharwidth id=bm_id3149807 
localize=false/
-bookmark xml-lang=en-US 
branch=hid/cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_HALFFULLFORMS 
id=bm_id3153655 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/fmsearchdialog/HalfFullFormsCJK 
id=bm_id3153655 localize=false/
 paragraph xml-lang=en-US id=hd_id3149167 role=heading level=2 l10n=U
  oldref=204variable id=halbnormaltitelMatch character 
width (only if Asian languages are enabled)
 /variable/paragraph
   paragraph xml-lang=en-US id=par_id3145744 role=paragraph l10n=U 
oldref=208variable id=halbnormaltextahelp 
hid=svx/ui/findreplacedialog/matchcharwidthDistinguishes between half-width 
and full-width 

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

[Caolán McNamara]

 helpers/help_hid.lst  |2 --
 source/text/shared/guide/fontwork.xhp |7 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 440af54dcae5a9380810ba81b68bdf198730423b
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Mar 21 12:02:25 2014 +

update help ids for fontwork gallery .ui conversion

Change-Id: Ie708d0c5558d954afc7204f6e14b4fdde1dfa284

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2e733bb..a0a6ea3 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1083,7 +1083,6 @@ HID_CONTDLG_WORKPLACE,33919,
 HID_CONTROLS_DATE_N_TIME,38194,
 HID_CTL_ACTION_DLG_1,59870,
 HID_CTL_ACTION_DLG_2,59871,
-HID_CTL_FONTWORK_FAVORITES,33862,
 HID_CTL_QRYDGNCRIT,38861,
 HID_CTL_QRYDGNTAB,38854,
 HID_CTL_QRYSQLEDIT,38839,
@@ -6224,7 +6223,6 @@ svx_ModalDialog_RID_OFADLG_OPTIONS_TREE_HINT,1346011136,
 svx_ModalDialog_RID_SVXDLG_ASSIGNCOMPONENT,1242447872,
 svx_ModalDialog_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE,1241268224,
 svx_ModalDialog_RID_SVXDLG_SETFORM,1368735744,
-svx_ModalDialog_RID_SVX_MDLG_FONTWORK_GALLERY,1237614592,
 svx_ModalDialog_RID_SVX_SPLITCELLDLG,1238286336,
 svx_ModelessDialog_RID_SVXDLG_IMAP,2318696448,
 svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701,
diff --git a/source/text/shared/guide/fontwork.xhp 
b/source/text/shared/guide/fontwork.xhp
index 470c191..d7b4be6 100644
--- a/source/text/shared/guide/fontwork.xhp
+++ b/source/text/shared/guide/fontwork.xhp
@@ -39,7 +39,8 @@
   bookmark_valuerotating;3D text/bookmark_value
   bookmark_valueediting;Fontwork objects/bookmark_value
   bookmark_valueinserting;Fontwork objects/bookmark_value
-/bookmarkcommentMW changed adding; to inserting;/comment
+/bookmark
+bookmark xml-lang=en-US 
branch=hid/svx/ui/fontworkgallerydialog/FontworkGalleryDialog 
id=bm_id3156416 localize=false/
 paragraph xml-lang=en-US id=par_idN1066D role=heading level=1 
l10n=NEWvariable id=fontworklink 
href=text/shared/guide/fontwork.xhpFontwork For Graphical Text Art/link
 /variable/paragraph
   paragraph xml-lang=en-US id=par_idN1068B role=paragraph 
l10n=NEWYou can use Fontwork to create graphical text art 
objects./paragraph
@@ -55,7 +56,7 @@
  /listitem
  listitem
 
-bookmark xml-lang=en-US branch=hid/SVX_HID_CTL_FONTWORK_FAVORITES 
id=bm_id3156415 localize=false/
+bookmark xml-lang=en-US 
branch=hid/svx/ui/fontworkgallerydialog/ctlFavorites id=bm_id3156415 
localize=false/
 paragraph role=paragraph id=par_id3149761 xml-lang=en-US l10n=U 
oldref=55ahelp hid=. visibility=hiddenSelect a Fontwork style and 
click OK to insert the Fontwork into your document. Double-click or 
Ctrl+double-click the Fontwork in your document to enter text edit mode and 
change the text./ahelp/paragraph
 
 paragraph xml-lang=en-US id=par_idN106A0 role=paragraph 
l10n=NEWIn the emphFontwork Gallery/emph dialog, select a Fontwork style 
and click OK./paragraph
@@ -113,4 +114,4 @@
  embed href=text/shared/01/0528.xhp#fntwrk/
   /section
/body
-/helpdocument
\ No newline at end of file
+/helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst |4 
 source/text/shared/00/0001.xhp   |3 ++-
 source/text/shared/optionen/01010301.xhp |   10 ++
 3 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit cd4b7f63690d27a8319c1942e5aa865241640525
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 18 10:30:09 2014 +

update help ids for multipath dialog

Change-Id: I788da651af8648455808a549a2c0ec9fe38b79c3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 54c1833..00dabe5 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2389,7 +2389,6 @@ HID_MN_XFORMS_MODELS_EDIT,38117,
 HID_MN_XFORMS_MODELS_REMOVE,38118,
 HID_MN_XFORMS_SHOW_DETAILS,38122,
 HID_MODULE_TOOLBOX,54952,
-HID_MULTIPATH,33825,
 HID_NAVIGATION_IMGBTN,54822,
 HID_NAVIGATION_PI,54424,
 HID_NAVIGATOR_GLOBAL_TOOLBOX,53019,
@@ -6128,7 +6127,6 @@ svx_ListBox_RID_SVXDLG_BMPMASK_LB_3,3391950339,
 svx_ListBox_RID_SVXDLG_BMPMASK_LB_4,3391950340,
 svx_ListBox_RID_SVXDLG_BMPMASK_LB_TRANS,3391950341,
 svx_ListBox_RID_SVXDLG_FONTWORK_CLB_SHADOW_COLOR,3386592769,
-svx_ListBox_RID_SVXDLG_MULTIPATH_LB_MULTIPATH,1240878603,
 svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103,
 svx_ListBox_RID_SVXDLG_RUBY_LB_CHAR_STYLE,2315374083,
 svx_ListBox_RID_SVXDLG_RUBY_LB_POSITION,2315374105,
@@ -6276,8 +6274,6 @@ svx_PushButton_RID_SFXPAGE_PATH_BTN_PATH,733581837,
 svx_PushButton_RID_SFXPAGE_PATH_BTN_STANDARD,733581838,
 svx_PushButton_RID_SVXDLG_ADD_SUBMISSION_PB_SUBMIT_REF,1368920595,
 svx_PushButton_RID_SVXDLG_BMPMASK_BTN_EXEC,3391951361,
-svx_PushButton_RID_SVXDLG_MULTIPATH_BTN_ADD_MULTIPATH,1240879630,
-svx_PushButton_RID_SVXDLG_MULTIPATH_BTN_DEL_MULTIPATH,1240879631,
 svx_PushButton_RID_SVXDLG_RUBY_PB_CLOSE,2315375112,
 svx_PushButton_RID_SVXDLG_RUBY_PB_STYLIST,2315375108,
 svx_PushButton_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS,1368773123,
diff --git a/source/text/shared/00/0001.xhp 
b/source/text/shared/00/0001.xhp
index 0a94158..27542be 100644
--- a/source/text/shared/00/0001.xhp
+++ b/source/text/shared/00/0001.xhp
@@ -108,7 +108,8 @@
 bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/consolidatedialog/delete id=bm_id3146916 
localize=false/
 bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/customslideshows/delete id=bm_id3147296 
localize=false/
 bookmark xml-lang=en-US branch=hid/sw:PushButton:DLG_BIB_BASE:PB_DELETE 
id=bm_id6168401 localize=false/
-bookmark xml-lang=en-US 
branch=hid/cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH 
id=bm_id3154686 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/selectpathdialog/delete 
id=bm_id3154687 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/multipathdialog/delete 
id=bm_id3154686 localize=false/
 bookmark xml-lang=en-US branch=hid/cui/ui/acorreplacepage/delete 
id=bm_id7878353 localize=false/
 bookmark xml-lang=en-US branch=hid/cui/ui/acorexceptpage/delabbrev 
id=bm_id5413373 localize=false/
 bookmark xml-lang=en-US branch=hid/cui/ui/acorexceptpage/deldouble 
id=bm_id2580950 localize=false/
diff --git a/source/text/shared/optionen/01010301.xhp 
b/source/text/shared/optionen/01010301.xhp
index 5b7e967..185a8a3 100644
--- a/source/text/shared/optionen/01010301.xhp
+++ b/source/text/shared/optionen/01010301.xhp
@@ -32,12 +32,14 @@
 section id=howtoget
 embed href=text/shared/00/0406.xhp#pfade/
 /section
-bookmark xml-lang=en-US 
branch=hid/cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH id=bm_id3154938 
localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/selectpathdialog/paths 
id=bm_id3154938 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/multipathdialog/paths 
id=bm_id3154938 localize=false/
 paragraph role=heading id=hd_id3147559 xml-lang=en-US level=2 
l10n=CHG oldref=3Paths/paragraph
-paragraph role=paragraph id=par_id3153524 xml-lang=en-US l10n=CHG 
oldref=4ahelp hid=SVX:LISTBOX:RID_SVXDLG_MULTIPATH:LB_MULTIPATHContains 
a list of the paths that have already been added. Mark the default path for new 
files./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH 
id=bm_id3150768 localize=false/
+paragraph role=paragraph id=par_id3153524 xml-lang=en-US l10n=CHG 
oldref=4ahelp hid=cui/ui/selectpathdialog/pathsContains a list of the 
paths that have already been added. Mark the default path for new 
files./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/selectpathdialog/add 
id=bm_id3150768 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/multipathdialog/add 
id=bm_id3150768 localize=false/
 paragraph role=heading id=hd_id3148798 xml-lang=en-US level=2 
l10n=U oldref=5Add/paragraph
-paragraph role=paragraph id=par_id3153106 xml-lang=en-US l10n=CHG 
oldref=6ahelp 
hid=SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATHOpens the 
emphSelect Path/emph dialog to select another folder or the 
emphOpen/emph dialog to select another file./ahelp/paragraph
+paragraph role=paragraph 

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

[Caolán McNamara]

 helpers/help_hid.lst   |8 
 source/text/swriter/01/mailmerge03.xhp |   15 ---
 2 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit f1ae027567ebac03056d15dd5ffb3975165895bd
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 18 14:08:46 2014 +

update help ids for addressblock wizard page .ui conversion

Change-Id: I670c1aa5debf5810b47be9a767232828ffa85933

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 00dabe5..77206d6 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2278,7 +2278,6 @@ HID_MEMO_PAGE3,53291,
 HID_MEMO_PAGE4,53292,
 HID_MEMO_PAGE5,53293,
 HID_MERGE_PRINTMONITOR,52773,
-HID_MM_ADDRESSBLOCKPAGE,54957,
 HID_MM_ASSIGNFIELDS,54972,
 HID_MM_ASSIGN_FIELDS,55034,
 HID_MM_BODY_CB_FEMALEFIELD,55032,
@@ -6368,8 +6367,6 @@ sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_RTF,1446609942,
 sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940,
 sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938,
 sw_CheckBox_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE,1446609961,
-sw_CheckBox_DLG_MM_ADDRESSBLOCK_PAGE_CB_ADDRESS,898237446,
-sw_CheckBox_DLG_MM_ADDRESSBLOCK_PAGE_CB_HIDE_EMPTY_PARA,898237515,
 sw_CheckBox_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE,898253839,
 sw_CheckBox_DLG_MM_LAYOUT_PAGE_CB_ALIGN,898499596,
 sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279,
@@ -6415,8 +6412,6 @@ sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
 sw_Edit_TP_LINENUMBERING_ED_DIVISOR,87975,
 sw_FI_PREVIEW_DLG_MM_GREETINGS_PAGE,898252800,
 sw_FT_BODY_DLG_MM_MAILBODY,1435402240,
-sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_NEXTSET,898248204,
-sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_PREVSET,898248203,
 sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_NEXTSET,898264597,
 sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_PREVSET,898264596,
 sw_ImageButton_TP_LAB_LAB_BTN_INSERT,909700627,
@@ -6509,9 +6504,6 @@ 
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_DETAILS,1972294210,
 sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_STOP,1972294213,
 sw_PushButton_DLG_MAILMERGE_PB_ATTACH,1446613538,
 sw_PushButton_DLG_MAILMERGE_PB_PATH,1446613530,
-sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_ADDRESSLIST,898241026,
-sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_ASSIGN,898241033,
-sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_SETTINGS,898241029,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_CUSTOMIZE,1435243014,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_DELETE,1435243012,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_END,1435243020,
diff --git a/source/text/swriter/01/mailmerge03.xhp 
b/source/text/swriter/01/mailmerge03.xhp
index efebfc1..0bb5ea2 100644
--- a/source/text/swriter/01/mailmerge03.xhp
+++ b/source/text/swriter/01/mailmerge03.xhp
@@ -32,30 +32,31 @@
 /meta
 body
 section id=addresses
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/mmaddressblockpage/MMAddressBlockPage 
id=bm_id8489027 localize=false/
 paragraph role=heading id=par_idN10543 xml-lang=en-US level=1 
l10n=NEWlink href=text/swriter/01/mailmerge03.xhpMail Merge Wizard - 
Addresses/link/paragraph
 paragraph role=paragraph id=par_idN10553 xml-lang=en-US 
l10n=NEWSpecify the recipients for the mail merge document as well as the 
layout of the address block./paragraph
 /section
 paragraph role=note id=par_idN10561 xml-lang=en-US l10n=NEWThe Mail 
Merge wizard opens to this page if you start the wizard in a text document that 
already contains address database fields. If the wizard opens directly to this 
page, the emphSelect address list/emph button is called emphSelect 
different address list/emph./paragraph
 paragraph role=note id=par_idN10556 xml-lang=en-US l10n=NEWThe title 
of this page is emphAddress block/emph for letters and emphAddress 
list/emph for e-mail messages./paragraph
-bookmark xml-lang=en-US 
branch=hid/sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ADDRESSLIST 
id=bm_id8489028 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/mmaddressblockpage/addresslist 
id=bm_id8489028 localize=false/
 paragraph role=heading id=par_idN10568 xml-lang=en-US level=2 
l10n=NEWSelect address list/paragraph
 paragraph role=paragraph id=par_idN1056C xml-lang=en-US 
l10n=NEWahelp hid=.Opens the link 
href=text/swriter/01/mm_seladdlis.xhpSelect Address List/link dialog, 
where you can choose a data source for the addresses, add new addresses, or 
type in a new address list./ahelp/paragraph
 paragraph role=warning id=par_id7805413 xml-lang=en-US l10n=NEWWhen 
you edit some records in a Calc spreadsheet data source that is currently in 
use for a mail merge, those changes are not visible in the mail 
merge.commentufi: see i9899/comment/paragraph
-bookmark xml-lang=en-US 
branch=hid/sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_ADDRESS id=bm_id934476 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/mmaddressblockpage/address id=bm_id934476 
localize=false/
 paragraph role=heading id=par_idN1057D xml-lang=en-US level=2 
l10n=NEWThis document shall 

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

[Caolán McNamara]

 helpers/help_hid.lst   |   14 --
 source/text/swriter/01/mailmerge04.xhp |8 
 2 files changed, 4 insertions(+), 18 deletions(-)

New commits:
commit ad42cdf53bef64fb7385bc1c4c1d9092bb759cc7
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 18 15:35:53 2014 +

update help ids for salutation wizard page .ui conversion

Change-Id: I5078dcb4ec1949558a33f48bf6003d009ced5561

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 77206d6..8fe7150 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2291,15 +2291,6 @@ HID_MM_BODY_PB_MALE,55030,
 HID_MM_CREATEADDRESSLIST,54966,
 HID_MM_CUSTOMFIELDS,54986,
 HID_MM_DBTABLEPREVIEWDIALOG,54965,
-HID_MM_GREETINGSPAGE,54958,
-HID_MM_GREETINGS_CB_FEMALEFIELD,55024,
-HID_MM_GREETINGS_CB_NEUTRAL,55025,
-HID_MM_GREETINGS_CB_PERSONALIZED,55018,
-HID_MM_GREETINGS_LB_FEMALE,55019,
-HID_MM_GREETINGS_LB_FEMALECOLUMN,55023,
-HID_MM_GREETINGS_LB_MALE,55021,
-HID_MM_GREETINGS_PB_FEMALE,55020,
-HID_MM_GREETINGS_PB_MALE,55022,
 HID_MM_HEADER_0,55035,
 HID_MM_HEADER_1,55036,
 HID_MM_HEADER_10,55045,
@@ -6367,7 +6358,6 @@ sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_RTF,1446609942,
 sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940,
 sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938,
 sw_CheckBox_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE,1446609961,
-sw_CheckBox_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE,898253839,
 sw_CheckBox_DLG_MM_LAYOUT_PAGE_CB_ALIGN,898499596,
 sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279,
 sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS,898286601,
@@ -6410,10 +6400,7 @@ sw_Edit_DLG_MM_OUTPUT_PAGE_ED_ATTACHMENT,898304052,
 sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT,898304035,
 sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
 sw_Edit_TP_LINENUMBERING_ED_DIVISOR,87975,
-sw_FI_PREVIEW_DLG_MM_GREETINGS_PAGE,898252800,
 sw_FT_BODY_DLG_MM_MAILBODY,1435402240,
-sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_NEXTSET,898264597,
-sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_PREVSET,898264596,
 sw_ImageButton_TP_LAB_LAB_BTN_INSERT,909700627,
 sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_DOWN,888499833,
 sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_UP,888499832,
@@ -6512,7 +6499,6 @@ sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEW,1435243011,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEXT,1435243019,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_PREV,1435243017,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_START,1435243016,
-sw_PushButton_DLG_MM_GREETINGS_PAGE_PB_ASSIGN,898257426,
 sw_PushButton_DLG_MM_LAYOUT_PAGE_MF_UP,898503177,
 sw_PushButton_DLG_MM_LAYOUT_PAGE_PB_DOWN,898503179,
 sw_PushButton_DLG_MM_MERGE_PAGE_PB_EDIT,898290179,
diff --git a/source/text/swriter/01/mailmerge04.xhp 
b/source/text/swriter/01/mailmerge04.xhp
index f71167d..bc408fa 100644
--- a/source/text/swriter/01/mailmerge04.xhp
+++ b/source/text/swriter/01/mailmerge04.xhp
@@ -35,7 +35,7 @@
 paragraph role=heading id=par_idN10543 xml-lang=en-US level=1 
l10n=NEWlink href=text/swriter/01/mailmerge04.xhpMail Merge Wizard - 
Create a Salutation/link/paragraph
 paragraph role=paragraph id=par_idN10553 xml-lang=en-US 
l10n=NEWSpecify the properties for the salutation. If the mail merge 
database contains gender information, you can specify different salutations 
based on the gender of the recipient./paragraph
 /section
-bookmark xml-lang=en-US 
branch=hid/SW_CHECKBOX_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE id=bm_id274666 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/mmsalutationpage/greeting id=bm_id274666 
localize=false/
 paragraph role=heading id=par_idN10556 xml-lang=en-US level=2 
l10n=NEWThis document should contain a salutation/paragraph
 paragraph role=paragraph id=par_idN1055A xml-lang=en-US 
l10n=NEWahelp hid=.Adds a salutation./ahelp/paragraph
 !-- removed HID 898253826 --
@@ -64,11 +64,11 @@
 paragraph role=paragraph id=par_idN105AE xml-lang=en-US 
l10n=NEWahelp hid=.Select the default salutation that is used when you 
do not specify a personalized salutation./ahelp/paragraph
 paragraph role=heading id=par_idN105B1 xml-lang=en-US level=3 
l10n=NEWPreview/paragraph
 paragraph role=paragraph id=par_idN105B5 xml-lang=en-US 
l10n=NEWahelp hid=.Displays a preview of the 
salutation./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/SW_PUSHBUTTON_DLG_MM_GREETINGS_PAGE_PB_ASSIGN id=bm_id9288918 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/mmsalutationpage/assign id=bm_id9288918 
localize=false/
 paragraph role=heading id=par_idN105B8 xml-lang=en-US level=4 
l10n=NEWMatch fields/paragraph
 paragraph role=paragraph id=par_idN105BC xml-lang=en-US 
l10n=NEWahelp hid=.Opens the link 
href=text/swriter/01/mm_matfie.xhpMatch Fields/link 
dialog./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/SW_IMAGEBUTTON_DLG_MM_GREETINGS_PAGE_IB_PREVSET id=bm_id3859675 
localize=false/
-bookmark xml-lang=en-US 
branch=hid/SW_IMAGEBUTTON_DLG_MM_GREETINGS_PAGE_IB_NEXTSET id=bm_id991546 
localize=false/
+bookmark 

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

[Caolán McNamara]

 helpers/help_hid.lst   |7 ---
 source/text/swriter/01/mailmerge05.xhp |   12 ++--
 2 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 606dd47bed30f5ae77352f497323108df4550bf2
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 18 16:19:22 2014 +

update help ids for wizard layout page .ui conversion

Change-Id: Ib31da1cd8a961f89330a06df31214a7fb561ea45

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 8fe7150..c22036f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2305,7 +2305,6 @@ HID_MM_HEADER_6,55041,
 HID_MM_HEADER_7,55042,
 HID_MM_HEADER_8,55043,
 HID_MM_HEADER_9,55044,
-HID_MM_LAYOUT_PAGE,54974,
 HID_MM_MAILBODY,54982,
 HID_MM_MAILSTATUS_TLB,54988,
 HID_MM_MERGEPAGE,54960,
@@ -6358,7 +6357,6 @@ sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_RTF,1446609942,
 sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940,
 sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938,
 sw_CheckBox_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE,1446609961,
-sw_CheckBox_DLG_MM_LAYOUT_PAGE_CB_ALIGN,898499596,
 sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279,
 sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS,898286601,
 sw_CheckBox_DLG_MM_MERGE_PAGE_CB_MATCHCASE,898286602,
@@ -6411,7 +6409,6 @@ sw_ListBox_DLG_MAILMERGE_LB_ADDRESSFLD,1446612494,
 sw_ListBox_DLG_MAILMERGE_LB_COLUMN,1446612510,
 sw_ListBox_DLG_MAILMERGE_LB_FILTER,1446612524,
 sw_ListBox_DLG_MM_ASSIGNFIELDS_CT_FIELDS_LB_FIELDS,1074908678,
-sw_ListBox_DLG_MM_LAYOUT_PAGE_LB_ZOOM,898502159,
 sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_MAILTO,898305568,
 sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_PRINT,898305558,
 sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_SENDAS,898305573,
@@ -6433,8 +6430,6 @@ sw_ListBox_TP_TABLE_TEXTFLOW_LB_PAGECOLL,878513801,
 sw_ListBox_TP_TABLE_TEXTFLOW_LB_TEXTORIENTATION,878513708,
 sw_ListBox_TP_TABLE_TEXTFLOW_LB_VERTORIENT,878513815,
 sw_MenuButton_DLG_GLOSSARY_PB_EDIT,1428647988,
-sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_LEFT,898505220,
-sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_TOP,898505222,
 sw_MetricField_DLG_PAGEPREVIEW_PRINTOPTIONS_MF_BMARGIN,1411291667,
 sw_MetricField_DLG_PAGEPREVIEW_PRINTOPTIONS_MF_HMARGIN,1411291669,
 sw_MetricField_DLG_PAGEPREVIEW_PRINTOPTIONS_MF_LMARGIN,1411291661,
@@ -6499,8 +6494,6 @@ sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEW,1435243011,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEXT,1435243019,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_PREV,1435243017,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_START,1435243016,
-sw_PushButton_DLG_MM_LAYOUT_PAGE_MF_UP,898503177,
-sw_PushButton_DLG_MM_LAYOUT_PAGE_PB_DOWN,898503179,
 sw_PushButton_DLG_MM_MERGE_PAGE_PB_EDIT,898290179,
 sw_PushButton_DLG_MM_MERGE_PAGE_PB_FIND,898290183,
 sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_COPYTO,898306593,
diff --git a/source/text/swriter/01/mailmerge05.xhp 
b/source/text/swriter/01/mailmerge05.xhp
index 595298b..65c8cfb 100644
--- a/source/text/swriter/01/mailmerge05.xhp
+++ b/source/text/swriter/01/mailmerge05.xhp
@@ -35,22 +35,22 @@
 paragraph role=heading id=par_idN10543 xml-lang=en-US level=1 
l10n=NEWlink href=text/swriter/01/mailmerge05.xhpMail Merge Wizard - 
Adjust Layout/link/paragraph
 paragraph role=paragraph id=par_idN10553 xml-lang=en-US 
l10n=NEWSpecify the position of the address blocks and salutations on the 
documents./paragraph
 /section
-bookmark xml-lang=en-US 
branch=hid/sw:CheckBox:DLG_MM_LAYOUT_PAGE:CB_ALIGN id=bm_id7631458 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmlayoutpage/align 
id=bm_id7631458 localize=false/
 paragraph role=heading id=par_idN10556 xml-lang=en-US level=2 
l10n=NEWAlign to text body/paragraph
 paragraph role=paragraph id=par_idN1055A xml-lang=en-US 
l10n=NEWahelp hid=.Aligns the frame that contains the address block to 
the left page margin./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_LEFT id=bm_id7862483 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmlayoutpage/left 
id=bm_id7862483 localize=false/
 paragraph role=heading id=par_idN1055D xml-lang=en-US level=2 
l10n=NEWFrom left/paragraph
 paragraph role=paragraph id=par_idN10561 xml-lang=en-US 
l10n=NEWahelp hid=.Enter the amount of space to leave between the left 
edge of the page and the left edge of the address block./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_TOP id=bm_id1113010 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmlayoutpage/top 
id=bm_id1113010 localize=false/
 paragraph role=heading id=par_idN10564 xml-lang=en-US level=2 
l10n=NEWFrom top/paragraph
 paragraph role=paragraph id=par_idN10568 xml-lang=en-US 
l10n=NEWahelp hid=.Enter the amount of space to leave between the top 
edge of the page and the top edge of the address block./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/sw:PushButton:DLG_MM_LAYOUT_PAGE:MF_UP 
id=bm_id656758 localize=false/
+bookmark xml-lang=en-US 

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

[Caolán McNamara]

 helpers/help_hid.lst  |9 -
 source/text/shared/explorer/database/02010101.xhp |   21 ++---
 source/text/shared/explorer/database/05020100.xhp |6 ++
 3 files changed, 12 insertions(+), 24 deletions(-)

New commits:
commit 02fac10d462f6c3a7a17535e8902d5cccb065d98
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 13 15:11:37 2014 +

update help ids for join query .ui conversion

Change-Id: I2185a45d4f799bf631f78d0d35da5e9e23672cb2

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 30ab995..b8e0dc9 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1430,13 +1430,6 @@ HID_DLG_NAME,33818,
 HID_DLG_NEWERVERSIONWARNING,35848,
 HID_DLG_PASSWD_SECTION,53440,
 HID_DLG_PASSWORD,38964,
-HID_DLG_QRY_HELPTEXT,38860,
-HID_DLG_QRY_JOIN,38855,
-HID_DLG_QRY_JOINTYPE,38856,
-HID_DLG_QRY_JOIN_CONTROL,39150,
-HID_DLG_QRY_LEFT_TABLE,38981,
-HID_DLG_QRY_RIGHT_TABLE,38982,
-HID_DLG_QRY_WINDOW_CONTROL,38980,
 HID_DLG_REL_CASC_DEL,38983,
 HID_DLG_REL_CASC_DEL_DEFAULT,38986,
 HID_DLG_REL_CASC_DEL_NULL,38985,
@@ -2855,7 +2848,6 @@ HID_REDLINE_AUTOFMT_ACCEPT,53072,
 HID_REDLINE_CTRL,53226,
 HID_RELATIONDIALOG_LEFTFIELDCELL,38922,
 HID_RELATIONDIALOG_RIGHTFIELDCELL,38923,
-HID_RELDLG_KEYFIELDS,38924,
 HID_REPORTSECTION,64457,
 HID_REPORT_NAVIGATOR_TREE,64521,
 HID_RETURN_TO_MAILMERGE,54989,
@@ -5412,7 +5404,6 @@ chart2_TabPage_TP_LOCATION,551829504,
 chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120,
 chart2_TabPage_TP_YERRORBAR,551927808,
 dbaccess_CheckBox_DLG_INDEXDESIGN_CB_UNIQUE,1388626945,
-dbaccess_CheckBox_DLG_QRY_JOIN_WND_JOIN_CONTROL_CB_NATURAL,1073759233,
 dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657,
 dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
 dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
diff --git a/source/text/shared/explorer/database/02010101.xhp 
b/source/text/shared/explorer/database/02010101.xhp
index 27686fb..b3c881e 100644
--- a/source/text/shared/explorer/database/02010101.xhp
+++ b/source/text/shared/explorer/database/02010101.xhp
@@ -40,30 +40,29 @@
   section id=howtoget
  embed href=text/shared/00/0450.xhp#Joins/
   /section
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLG_QRY_LEFT_TABLE 
id=bm_id3150749 localize=false/
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLG_QRY_RIGHT_TABLE 
id=bm_id3150752 localize=false/
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/joindialog/table1 
id=bm_id3150749 localize=false/
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/joindialog/table2 
id=bm_id3150752 localize=false/
 paragraph xml-lang=en-US id=hd_id3155066 role=heading level=2 l10n=U
  oldref=17Tables involved/paragraph
-  paragraph xml-lang=en-US id=par_id3153924 role=paragraph l10n=U 
oldref=16ahelp hid=HID_DLG_QRY_RIGHT_TABLESpecifies two different tables 
that you want to join./ahelp/paragraph
+  paragraph xml-lang=en-US id=par_id3153924 role=paragraph l10n=U 
oldref=16ahelp hid=dbaccess/ui/joindialog/table2Specifies two different 
tables that you want to join./ahelp/paragraph
   paragraph xml-lang=en-US id=hd_id3155766 role=heading level=2 
l10n=U
  oldref=15Fields involved/paragraph
   paragraph xml-lang=en-US id=par_id3148994 role=paragraph 
l10n=CHG oldref=14ahelp hid=.Specifies two data fields that will be 
joined by a relation./ahelp/paragraph
   paragraph xml-lang=en-US id=hd_id3159267 role=heading level=2 
l10n=U oldref=3Options/paragraph
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLG_QRY_JOINTYPE 
id=bm_id3147321 localize=false/
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/joindialog/type 
id=bm_id3147321 localize=false/
 paragraph xml-lang=en-US id=hd_id3147340 role=heading level=3 l10n=U
  oldref=13Type/paragraph
-  paragraph xml-lang=en-US id=par_id3152482 role=paragraph 
l10n=CHG oldref=4ahelp hid=HID_DLG_QRY_JOINTYPESpecifies the link type 
of the selected link./ahelp Some databases support only a subset of the 
possible types./paragraph
+  paragraph xml-lang=en-US id=par_id3152482 role=paragraph 
l10n=CHG oldref=4ahelp hid=dbaccess/ui/joindialog/typeSpecifies the 
link type of the selected link./ahelp Some databases support only a subset of 
the possible types./paragraph
   paragraph xml-lang=en-US id=hd_id3155334 role=heading level=3 
l10n=U oldref=5Inner Join/paragraph
-  paragraph xml-lang=en-US id=par_id3155936 role=paragraph l10n=U 
oldref=6ahelp hid=HID_DLG_QRY_JOINTYPEWith the internal join, the 
results table contains only the records for which the content of the linked 
fields is the same./ahelp In $[officename] SQL this type of link is created 
by a corresponding WHERE clause./paragraph
+  paragraph xml-lang=en-US id=par_id3155936 role=paragraph l10n=U 
oldref=6ahelp hid=dbaccess/ui/joindialog/typeWith the internal join, the 
results table contains only the records for which the content of the 

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

[Caolán McNamara]

 helpers/help_hid.lst  |9 --
 source/text/shared/explorer/database/05020100.xhp |   32 --
 2 files changed, 12 insertions(+), 29 deletions(-)

New commits:
commit fb92360ede9c82c8534fcbdf625ffa6c2879
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 13 16:18:53 2014 +

update help ids for relations dialog .ui conversion

Change-Id: I391d50c8ec9257a30c05a059ff3a4db7a9137548

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b8e0dc9..a8190ff 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1430,14 +1430,6 @@ HID_DLG_NAME,33818,
 HID_DLG_NEWERVERSIONWARNING,35848,
 HID_DLG_PASSWD_SECTION,53440,
 HID_DLG_PASSWORD,38964,
-HID_DLG_REL_CASC_DEL,38983,
-HID_DLG_REL_CASC_DEL_DEFAULT,38986,
-HID_DLG_REL_CASC_DEL_NULL,38985,
-HID_DLG_REL_CASC_UPD,38987,
-HID_DLG_REL_CASC_UPD_DEFAULT,38990,
-HID_DLG_REL_CASC_UPD_NULL,38989,
-HID_DLG_REL_NO_CASC_DEL,38984,
-HID_DLG_REL_NO_CASC_UPD,38988,
 HID_DLG_TEXT,38843,
 HID_DLG_WORDCOUNT,54987,
 HID_DOCINFO_EDT,33070,
@@ -5451,7 +5443,6 @@ dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840,
 dbaccess_ModalDialog_DLG_INDEXDESIGN,1388625920,
 dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624,
 dbaccess_ModalDialog_DLG_PARAMETERS,1388396544,
-dbaccess_ModalDialog_DLG_REL_PROPERTIES,1388593152,
 dbaccess_ModalDialog_DLG_SQLEXCEPTIONCHAIN,1388363776,
 dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528,
 dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768,
diff --git a/source/text/shared/explorer/database/05020100.xhp 
b/source/text/shared/explorer/database/05020100.xhp
index 976b129..fc8d2a0 100644
--- a/source/text/shared/explorer/database/05020100.xhp
+++ b/source/text/shared/explorer/database/05020100.xhp
@@ -33,6 +33,7 @@
 /meta
 body
 bookmark xml-lang=en-US branch=hid/.uno:DBAddRelation id=bm_id3155150 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/dbaccess/ui/relationdialog/RelationDialog id=bm_id3155151 
localize=false/
 bookmark xml-lang=en-US branch=index 
id=bm_id3150499bookmark_valuerelations; properties (Base)/bookmark_value
 bookmark_valuekey fields for relations (Base)/bookmark_value
 bookmark_valuecascading update (Base)/bookmark_value
@@ -44,42 +45,33 @@
 /section
 paragraph role=note id=par_id3155136 xml-lang=en-US l10n=U 
oldref=3The update and delete options are only available if they are 
supported by the database used./paragraph
 paragraph role=heading id=hd_id3155341 xml-lang=en-US level=2 
l10n=U oldref=27Tables/paragraph
-paragraph role=paragraph id=par_id3153880 xml-lang=en-US l10n=U 
oldref=28ahelp hid=DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE 
visibility=hiddenThis is where the two related tables are listed./ahelp If 
you create a new relation, you can select one table from each of the combo 
boxes in the top part of the dialog./paragraph
+paragraph role=paragraph id=par_id3153880 xml-lang=en-US l10n=U 
oldref=28ahelp hid=dbaccess/ui/relationdialog/table2 
visibility=hiddenThis is where the two related tables are listed./ahelp If 
you create a new relation, you can select one table from each of the combo 
boxes in the top part of the dialog./paragraph
 paragraph role=paragraph id=par_id3154047 xml-lang=en-US l10n=U 
oldref=29If you opened the emphRelations/emph dialog for an existing 
relation by double-clicking the connection lines in the Relation window, then 
the tables involved in the relation cannot be modified./paragraph
 bookmark xml-lang=en-US branch=hid/dbaccess/ui/joindialog/relations 
id=bm_id3153716 localize=false/
 paragraph role=heading id=hd_id3153822 xml-lang=en-US level=2 
l10n=U oldref=4Key fields/paragraph
 paragraph role=paragraph id=par_id3159157 xml-lang=en-US l10n=U 
oldref=5ahelp hid=dbaccess/ui/joindialog/relationsDefines the key fields 
for the relation./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL id=bm_id3153561 
localize=false/
-bookmark xml-lang=en-US 
branch=hid/DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL id=bm_id3153543 
localize=false/
-paragraph role=paragraph id=par_id3149235 xml-lang=en-US l10n=U 
oldref=30ahelp hid=HID_RELATIONDIALOG_RIGHTFIELDCELLThe names of the 
tables selected for the link appear here as column names./ahelp If you click 
a field, you can use the arrow buttons to select a field from the table. Each 
relation is written in a row./paragraph
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/relationdialog/relations 
id=bm_id3153543 localize=false/
+paragraph role=paragraph id=par_id3149235 xml-lang=en-US l10n=U 
oldref=30ahelp hid=dbaccess/ui/relationdialog/table2The names of the 
tables selected for the link appear here as column names./ahelp If you click 
a field, you can use the arrow buttons to select a field from the table. Each 
relation is written in a row./paragraph
 paragraph role=heading id=hd_id3145609 xml-lang=en-US level=2 
l10n=U oldref=6Update options/paragraph
 paragraph role=paragraph id=par_id3153061 

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

[Caolán McNamara]

 helpers/help_hid.lst|9 -
 source/text/shared/01/gallery_files.xhp |   25 +
 2 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit e06c21fee256f13bbb41592da7d1f4a81df6b533
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Mar 12 12:01:46 2014 +

update help ids for gallery files page .ui conversion

Change-Id: I026df2f079b4c6236109ae60fe81a8e2c604439e

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a0fb3dd..e072e91 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2009,7 +2009,6 @@ HID_FUNC_ZUFALLSZAHL,58229,
 HID_FUNC_ZW,57950,
 HID_FUNC_ZZR,57951,
 HID_GALLERY_APPLY,33773,
-HID_GALLERY_BROWSER,33768,
 HID_GALLERY_ICONVIEW,34193,
 HID_GALLERY_LISTVIEW,34194,
 HID_GALLERY_MN_ADD,33956,
@@ -6004,7 +6003,6 @@ 
svx_CheckBox_RID_SVXPAGE_LINE_DEF_CBX_SYNCHRONIZE,701563905,
 svx_CheckBox_RID_SVXPAGE_OPTIONS_JAVA_CB_JAVA_ENABLE,704857099,
 svx_CheckBox_RID_SVXPAGE_STD_PARAGRAPH_CB_AUTO,700810288,
 svx_CheckBox_RID_SVXPAGE_STD_PARAGRAPH_CB_REGISTER,700810324,
-svx_CheckBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_CBX_PREVIEW,706675715,
 svx_CheckBox_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP,701006873,
 svx_CheckBox_RID_SVX_FONT_SUBSTITUTION_CB_USETABLE,701006869,
 svx_CheckBox_RID_SVX_MDLG_HANGULHANJA_CB_HANGUL_ONLY,1237599234,
@@ -6016,7 +6014,6 @@ 
svx_ComboBox_RID_SVXPAGE_HYPERLINK_DOCUMENT_CB_FRAME,704483360,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_INTERNET_CB_FRAME,704450592,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_MAIL_CB_FRAME,704466976,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_NEWDOCUMENT_CB_FRAME,704499744,
-svx_ComboBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_CBB_FILETYPE,706678785,
 svx_ComboBox_RID_SVX_FONT_SUBSTITUTION_CB_FONT1,701009923,
 svx_ComboBox_RID_SVX_FONT_SUBSTITUTION_CB_FONT2,701009925,
 svx_ComboBox_RID_SVX_MDLG_HANGULHANJA_EDIT_LB_ORIGINAL,1237667842,
@@ -6276,7 +6273,6 @@ svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701,
 svx_MultiLineEdit_MD_INSERT_OBJECT_APPLET_ED_APPLET_OPTIONS,1598179860,
 svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719,
 
svx_MultiLineEdit_RID_SVX_MDLG_ERR_REP_PREVIEW_ML_ERRPREVIEW_CONTENT,1237813761,
-svx_MultiListBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_LBX_FOUND,706677761,
 svx_NumericField_DLG_INS_ROW_COL_ED_COUNT,1240143874,
 svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINHEIGHT,1598216200,
 svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINWIDTH,1598216202,
@@ -6339,11 +6335,6 @@ svx_PushButton_RID_SVXPAGE_LINE_DEF_BTN_MODIFY,701567490,
 svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_ADD,704860692,
 svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_CLASSPATH,704860694,
 svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_PARAMETER,704860693,
-svx_PushButton_RID_SVXTABPAGE_GALLERYTHEME_FILES_BTN_MADDIN1,706679304,
-svx_PushButton_RID_SVXTABPAGE_GALLERYTHEME_FILES_BTN_MADDIN2,706679305,
-svx_PushButton_RID_SVXTABPAGE_GALLERYTHEME_FILES_BTN_SEARCH,706679300,
-svx_PushButton_RID_SVXTABPAGE_GALLERYTHEME_FILES_BTN_TAKE,706679301,
-svx_PushButton_RID_SVXTABPAGE_GALLERYTHEME_FILES_BTN_TAKEALL,706679297,
 svx_PushButton_RID_SVX_MDLG_DOCRECOVERY_BROKEN_BTN_BROKEN_SAVEDIR,1237783046,
 svx_PushButton_RID_SVX_MDLG_HANGULHANJA_EDIT_PB_HHE_DELETE,1237668354,
 svx_PushButton_RID_SVX_MDLG_HANGULHANJA_EDIT_PB_HHE_NEW,1237668353,
diff --git a/source/text/shared/01/gallery_files.xhp 
b/source/text/shared/01/gallery_files.xhp
index ea1c73e..c8970fd 100644
--- a/source/text/shared/01/gallery_files.xhp
+++ b/source/text/shared/01/gallery_files.xhp
@@ -31,30 +31,31 @@
 /history
 /meta
 body
+bookmark xml-lang=en-US 
branch=hid/cui/ui/galleryfilespage/GalleryFilesPage id=bm_id3151331 
localize=false/
 paragraph role=heading id=hd_id3150756 xml-lang=en-US level=1 
l10n=U oldref=1Files/paragraph
 paragraph role=paragraph id=par_id3153882 xml-lang=en-US l10n=U 
oldref=2variable id=stargallerymanagerAdds new files to the selected 
theme. 
 /variable/paragraph
 section id=howtoget
   embed href=text/shared/00/0406.xhp#galleryregisterdateien/
 /section
-bookmark xml-lang=en-US 
branch=hid/cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE 
id=bm_id3151330 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/galleryfilespage/filetype 
id=bm_id3151330 localize=false/
 paragraph role=heading id=hd_id3153089 xml-lang=en-US level=3 
l10n=U oldref=5File Type/paragraph
-paragraph role=paragraph id=par_id3154497 xml-lang=en-US l10n=U 
oldref=6ahelp 
hid=SVX:COMBOBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPESelect the 
type of file that you want to add./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND 
id=bm_id3150902 localize=false/
+paragraph role=paragraph id=par_id3154497 xml-lang=en-US l10n=U 
oldref=6ahelp hid=cui/ui/galleryfilespage/filetypeSelect the type of 
file that you want to add./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/galleryfilespage/files 
id=bm_id3150902 localize=false/
 

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

[Caolán McNamara]

 helpers/help_hid.lst   |   15 --
 source/text/shared/01/0601.xhp |   53 -
 2 files changed, 23 insertions(+), 45 deletions(-)

New commits:
commit 3635fef59b1d3dfe275558b5922ed23cbf8958f2
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 11 09:31:30 2014 +

update helpds for spell check dialog .ui conversion

Change-Id: I35c7cc500e0637f843059a0c8c730f418ea4a1a1

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index fcfec62..b1b24ad 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6004,7 +6004,6 @@ 
svx_CheckBox_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE_CB_JSCPT_DISABLE,1241269470,
 svx_CheckBox_RID_SVXDLG_RUBY_CB_AUTO_DETECT,2315371521,
 svx_CheckBox_RID_SVXDLG_SEARCHFORM_CB_HALFFULLFORMS,1368769544,
 svx_CheckBox_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK,1368769545,
-svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR,2311849014,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_EXPAND,703775795,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_SNAP,703775782,
 svx_CheckBox_RID_SVXPAGE_BACKGROUND_BTN_LINK,700728342,
@@ -6183,8 +6182,6 @@ svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103,
 svx_ListBox_RID_SVXDLG_RUBY_LB_CHAR_STYLE,2315374083,
 svx_ListBox_RID_SVXDLG_RUBY_LB_POSITION,2315374105,
 svx_ListBox_RID_SVXDLG_SEARCHFORM_LB_FORM,1368772097,
-svx_ListBox_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE,2311851556,
-svx_ListBox_RID_SVXDLG_SPELLCHECK_LB_SUGGESTION,2311851552,
 svx_ListBox_RID_SVXFLOAT_3D_LB_AMBIENTLIGHT,3388493390,
 svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_1,3388493380,
 svx_ListBox_RID_SVXFLOAT_3D_LB_LIGHT_2,3388493381,
@@ -6232,7 +6229,6 @@ 
svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT,701009435,
 svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME,701009432,
 svx_ListBox_RID_SVX_MDLG_DOCRECOVERY_BROKEN_LB_BROKEN_FILELIST,1237782019,
 svx_ListBox_RID_SVX_MDLG_HANGULHANJA_EDIT_LB_BOOK,1237667329,
-svx_MenuButton_RID_SVXDLG_SPELLCHECK_MB_ADDTODICT,2311860263,
 svx_MetricField_OFA_TP_VIEW_MF_SELECTION,810523208,
 svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE,810523158,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_1,3391953410,
@@ -6296,7 +6292,6 @@ svx_ModalDialog_RID_SVX_SPLITCELLDLG,1238286336,
 svx_ModelessDialog_RID_SVXDLG_IMAP,2318696448,
 svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701,
 svx_MultiLineEdit_MD_INSERT_OBJECT_APPLET_ED_APPLET_OPTIONS,1598179860,
-svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD,2311850530,
 svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719,
 
svx_MultiLineEdit_RID_SVX_MDLG_ERR_REP_PREVIEW_ML_ERRPREVIEW_CONTENT,1237813761,
 svx_MultiListBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_LBX_FOUND,706677761,
@@ -6336,16 +6331,6 @@ 
svx_PushButton_RID_SVXDLG_MULTIPATH_BTN_DEL_MULTIPATH,1240879631,
 svx_PushButton_RID_SVXDLG_RUBY_PB_CLOSE,2315375112,
 svx_PushButton_RID_SVXDLG_RUBY_PB_STYLIST,2315375108,
 svx_PushButton_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS,1368773123,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_AUTOCORR,2311852586,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_CHANGE,2311852584,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_CHANGEALL,2311852585,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_CLOSE,2311852591,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_EXPLAIN,2311852599,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_IGNORE,2311852581,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_IGNOREALL,2311852582,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_IGNORERULE,2311852603,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_OPTIONS,2311852588,
-svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_UNDO,2311852590,
 svx_PushButton_RID_SVXPAGE_BACKGROUND_BTN_BROWSE,700731924,
 svx_PushButton_RID_SVXPAGE_BITMAP_BTN_ADD,701665793,
 svx_PushButton_RID_SVXPAGE_BITMAP_BTN_DELETE,701665796,
diff --git a/source/text/shared/01/0601.xhp 
b/source/text/shared/01/0601.xhp
index 65122d5..d62b643 100644
--- a/source/text/shared/01/0601.xhp
+++ b/source/text/shared/01/0601.xhp
@@ -34,6 +34,7 @@
 /bookmarkcommentmw changes spellcheck;languages/comment
 bookmark xml-lang=en-US branch=hid/.uno:Spelling id=bm_id3150702 
localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:SpellingAndGrammarDialog 
id=bm_id1022200801253693 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/spellingdialog/SpellingDialog 
id=bm_id1022200801253694 localize=false/
 paragraph xml-lang=en-US id=hd_id3153882 role=heading level=1 
l10n=U oldref=1link href=text/shared/01/0601.xhp 
name=SpellcheckSpelling and Grammar/link/paragraph
  paragraph xml-lang=en-US id=par_id3154682 role=paragraph 
l10n=CHG oldref=2variable id=rechtahelp hid=.uno:SpellingChecks 
the document or the current selection for spelling errors. If a grammar 
checking extension is installed, the dialog also checks for grammar 
errors./ahelp
 /variable/paragraph
@@ -45,63 +46,55 @@
   paragraph xml-lang=en-US id=par_idN1064B role=paragraph 
l10n=NEWThe spellcheck starts at the current cursor position and advances to 
the end of the document or 

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

[Caolán McNamara]

 helpers/help_hid.lst |   14 
 source/text/simpress/01/05120100.xhp |   33 ++---
 source/text/swriter/01/0517.xhp  |   39 +++
 3 files changed, 24 insertions(+), 62 deletions(-)

New commits:
commit 968185360c4b6b71289c6ea9ad6fbddf06ed
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 11 12:17:42 2014 +

update help ids for load templates dialog .ui conversion

Change-Id: I25e745cccbf997f47d73e4661716beb87ec8a293

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b1b24ad..ac2508e 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5882,34 +5882,20 @@ sd_TimeField_DLG_ASS_TMF_PAGE3_BREAK,1088495668,
 sd_TimeField_DLG_ASS_TMF_PAGE3_TIME,1088495666,
 sd_TimeField_DLG_PUBLISHING_PAGE2_DURATION_TMF,1085857829,
 sd_TimeField_FLT_WIN_ANIMATION_TIME_FIELD,3231375361,
-sfx2_CheckBox_DLG_NEW_FILE_BTN_PREVIEW,1107379251,
-sfx2_CheckBox_DLG_NEW_FILE_CB_FRAME_STYLE,1107379234,
-sfx2_CheckBox_DLG_NEW_FILE_CB_MERGE_STYLE,1107379237,
-sfx2_CheckBox_DLG_NEW_FILE_CB_NUM_STYLE,1107379236,
-sfx2_CheckBox_DLG_NEW_FILE_CB_PAGE_STYLE,1107379235,
-sfx2_CheckBox_DLG_NEW_FILE_CB_TEXT_STYLE,1107379233,
 sfx2_CheckBox_RID_WARN_PRINTTRANSPARENCY_CBX_NOPRINTTRANSWARN,1113048129,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO2,1078102023,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO3,1078102025,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO4,1078102027,
-sfx2_Edit_DLG_NEW_FILE_ED_KEYWORDS,1107380285,
-sfx2_Edit_DLG_NEW_FILE_ED_THEMA,1107380279,
-sfx2_Edit_DLG_NEW_FILE_ED_TITLE,1107380280,
 sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_APP,1082214450,
 sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_ITEM,1082214452,
 sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_TOPIC,1082214451,
 sfx2_Edit_RID_URLOPEN_RID_URLOPEN_URL,1112573955,
 sfx2_FT_DOCNAME_DLG_PRINTMONITOR,2218852352,
 sfx2_FloatingWindow_SID_RECORDING_FLOATWINDOW,1705639936,
-sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781,
-sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812,
 sfx2_ModalDialog_MD_DDE_LINKEDIT,1082212352,
 sfx2_ModalDialog_RID_URLOPEN,1112571904,
 sfx2_ModalDialog_RID_WARN_PRINTTRANSPARENCY,1113047040,
-sfx2_MoreButton_DLG_NEW_FILE_BT_MORE,1107391008,
-sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807,
-sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
 sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
 sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_1,1401573377,
diff --git a/source/text/simpress/01/05120100.xhp 
b/source/text/simpress/01/05120100.xhp
index 3fe3c8c..75e809a 100644
--- a/source/text/simpress/01/05120100.xhp
+++ b/source/text/simpress/01/05120100.xhp
@@ -31,38 +31,19 @@
 /history
 /meta
 body
+bookmark xml-lang=en-US 
branch=hid/sfx/ui/loadtemplatedialog/LoadTemplateDialog id=bm_id3154756 
localize=false/
 paragraph role=heading id=hd_id3153728 xml-lang=en-US level=1 
l10n=U oldref=1Load Slide Design/paragraph
 paragraph role=paragraph id=par_id3150717 xml-lang=en-US l10n=U 
oldref=2Load additional slide designs for your presentation./paragraph
 paragraph role=paragraph id=par_id3154016 xml-lang=en-US l10n=U 
oldref=4Select a design category, and then a template you want to 
apply./paragraph
-bookmark xml-lang=en-US branch=hid/sfx2:ListBox:DLG_NEW_FILE:LB_REGION 
id=bm_id3154756 localize=false/
+bookmark xml-lang=en-US branch=hid/sfx/ui/loadtemplatedialog/categories 
id=bm_id3154756 localize=false/
 paragraph role=heading id=hd_id3150327 xml-lang=en-US level=2 
l10n=U oldref=27Categories/paragraph
-paragraph role=paragraph id=par_id3147338 xml-lang=en-US l10n=U 
oldref=28ahelp hid=SFX2_LISTBOX_DLG_NEW_FILE_LB_REGIONDisplays the 
available slide design categories./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE 
id=bm_id3154703 localize=false/
+paragraph role=paragraph id=par_id3147338 xml-lang=en-US l10n=U 
oldref=28ahelp hid=sfx/ui/loadtemplatedialog/categoriesDisplays the 
available slide design categories./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/sfx/ui/loadtemplatedialog/templates 
id=bm_id3154703 localize=false/
 paragraph role=heading id=hd_id3155962 xml-lang=en-US level=2 
l10n=U oldref=5Templates/paragraph
-paragraph role=paragraph id=par_id3155337 xml-lang=en-US l10n=U 
oldref=6ahelp hid=SFX2_LISTBOX_DLG_NEW_FILE_LB_TEMPLATEDisplays the 
templates for the selected design category./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/sfx2:MoreButton:DLG_NEW_FILE:BT_MORE 
id=bm_id3159237 localize=false/
+paragraph role=paragraph id=par_id3155337 xml-lang=en-US l10n=U 
oldref=6ahelp hid=sfx/ui/loadtemplatedialog/templatesDisplays the 
templates for the selected design category./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/sfx/ui/loadtemplatedialog/expander 
id=bm_id3159237 localize=false/
 paragraph role=heading id=hd_id3145791 xml-lang=en-US level=2 
l10n=U oldref=7Moregt;gt;/paragraph
-paragraph 

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

[Caolán McNamara]

 helpers/help_hid.lst   |3 ---
 source/text/shared/00/0105.xhp |5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit d985ce5cab0ac92aeb08d7754de089baeb6b97f5
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 11 16:32:35 2014 +

update help ids for gallery general page .ui conversion

Change-Id: Iaf7b6d030c9fc2e53ce3ae4e0e49d054afab4a3b

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ac2508e..2f11212 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2011,7 +2011,6 @@ HID_FUNC_ZZR,57951,
 HID_GALLERY_ACTUALIZE,33774,
 HID_GALLERY_APPLY,33773,
 HID_GALLERY_BROWSER,33768,
-HID_GALLERY_EDIT_MSNAME,39989,
 HID_GALLERY_ICONVIEW,34193,
 HID_GALLERY_LISTVIEW,34194,
 HID_GALLERY_MN_ADD,33956,
@@ -2027,7 +2026,6 @@ HID_GALLERY_NEWTHEME_ADDFILES,39878,
 HID_GALLERY_NEWTHEME_FINDFILES,39877,
 HID_GALLERY_PREVIEW,34192,
 HID_GALLERY_PROPERTIES,33777,
-HID_GALLERY_PROPERTIES_GENERAL,33826,
 HID_GALLERY_RENAME,33776,
 HID_GALLERY_SEARCH,33772,
 HID_GALLERY_THEMELIST,34179,
@@ -6074,7 +6072,6 @@ svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_POSTFIX,703334447,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEARCH_NAME,703334441,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEPARATOR,703334448,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_URL,703334446,
-svx_Edit_RID_SVXTABPAGE_GALLERY_GENERAL_EDT_MS_NAME,706627585,
 svx_Edit_RID_SVX_MDLG_DOCRECOVERY_BROKEN_ED_BROKEN_SAVEDIR,1237780485,
 svx_Edit_RID_SVX_MDLG_ERR_REP_OPTIONS_ED_ERROPT_PROXYPORT,1237796872,
 svx_Edit_RID_SVX_MDLG_ERR_REP_OPTIONS_ED_ERROPT_PROXYSERVER,1237796870,
diff --git a/source/text/shared/00/0105.xhp 
b/source/text/shared/00/0105.xhp
index 68aee9b..0f0e36d 100644
--- a/source/text/shared/00/0105.xhp
+++ b/source/text/shared/00/0105.xhp
@@ -28,13 +28,12 @@
 /meta
 body
 section id=allgemein
-!-- removed HID SVX_TABPAGE_RID_SVXTABPAGE_GALLERY_GENERAL --
 paragraph role=heading id=hd_id3158397 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/00/0105.xhp 
name=GeneralGeneral/linkcommentUFI: this is a tab page of the Gallery. 
Deleted everything else/comment/paragraph
 paragraph role=paragraph id=par_id3159242 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=.Theemph General /emphtab page lists the general 
properties of the current theme./ahelp/paragraph
 /section
-bookmark xml-lang=en-US branch=hid/CUI_HID_GALLERY_PROPERTIES_GENERAL 
id=bm_id3152895 localize=false/
+bookmark xml-lang=en-US 
branch=hid/cui/ui/gallerygeneralpage/GalleryGeneralPage id=bm_id3152895 
localize=false/
 paragraph role=heading id=hd_id3150264 xml-lang=en-US level=2 
l10n=U oldref=3Name/paragraph
-paragraph role=paragraph id=par_id3154094 xml-lang=en-US l10n=CHG 
oldref=4ahelp 
hid=SVX_EDIT_RID_SVXTABPAGE_GALLERY_GENERAL_EDT_MS_NAMEDisplays the name of 
the theme./ahelp If no name has been assigned, you can type a new name in the 
text box./paragraph
+paragraph role=paragraph id=par_id3154094 xml-lang=en-US l10n=CHG 
oldref=4ahelp hid=cui/ui/gallerygeneralpage/nameDisplays the name of the 
theme./ahelp If no name has been assigned, you can type a new name in the 
text box./paragraph
 paragraph role=heading id=hd_id3147089 xml-lang=en-US level=3 
l10n=U oldref=5Type/paragraph
 paragraph role=paragraph id=par_id3145071 xml-lang=en-US l10n=CHG 
oldref=6Specifies the object type. /paragraph
 paragraph role=heading id=hd_id3147576 xml-lang=en-US level=3 
l10n=U oldref=7Location/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |1 -
 source/text/shared/00/0010.xhp |4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 04811c484e936a03c27385492ca8baaa1498ed5d
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 11 17:11:15 2014 +

update help ids for gallery update progress .ui conversion

Change-Id: I7e1bd7a56a2ac93712b41c415382dd640169eb7e

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2f11212..a0fb3dd 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2008,7 +2008,6 @@ HID_FUNC_ZINSZ,57954,
 HID_FUNC_ZUFALLSZAHL,58229,
 HID_FUNC_ZW,57950,
 HID_FUNC_ZZR,57951,
-HID_GALLERY_ACTUALIZE,33774,
 HID_GALLERY_APPLY,33773,
 HID_GALLERY_BROWSER,33768,
 HID_GALLERY_ICONVIEW,34193,
diff --git a/source/text/shared/00/0010.xhp 
b/source/text/shared/00/0010.xhp
index 2d193d0..b5b847a 100644
--- a/source/text/shared/00/0010.xhp
+++ b/source/text/shared/00/0010.xhp
@@ -69,8 +69,8 @@
   paragraph l10n=U xml-lang=en-US role=paragraph id=par_id3149797 
oldref=166ahelp hid=SID_EXPLORERCONTENT_RENAME 
visibility=visibleEnables a selected object to be renamed./ahelp After 
selecting emphRename/emph the name is selected and a new one can be entered 
directly. Use the arrow keys to set the cursor at the beginning or end of the 
name to delete or add to part of the name or to reposition the 
cursor./paragraph
   /section
   section id=aktualisieren
-  bookmark branch=hid/SVX_HID_GALLERY_ACTUALIZE xml-lang=en-US 
id=bm_id3150275 localize=false/paragraph role=heading level=2 
id=hd_id3155434 l10n=U xml-lang=en-US oldref=317Update/paragraph
-  paragraph l10n=U role=paragraph id=par_id3154898 xml-lang=en-US 
oldref=318ahelp hid=HID_GALLERY_ACTUALIZE visibility=visibleUpdates 
the view in the window or in the selected object./ahelp/paragraph
+  bookmark branch=hid/cui/ui/galleryupdateprogress/GalleryUpdateProgress 
xml-lang=en-US id=bm_id3150275 localize=false/paragraph role=heading 
level=2 id=hd_id3155434 l10n=U xml-lang=en-US 
oldref=317Update/paragraph
+  paragraph l10n=U role=paragraph id=par_id3154898 xml-lang=en-US 
oldref=318ahelp hid=cui/ui/galleryupdateprogress/GalleryUpdateProgress 
visibility=visibleUpdates the view in the window or in the selected 
object./ahelp/paragraph
   /section
   section id=vorschau
   paragraph role=heading level=2 id=hd_id3147573 l10n=U 
xml-lang=en-US oldref=172Preview/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst  |   16 
 source/text/scalc/01/12090103.xhp |   20 ++--
 source/text/scalc/01/12090104.xhp |6 +++---
 3 files changed, 13 insertions(+), 29 deletions(-)

New commits:
commit c0f068348420e4ef59842aaa4a9786aefabb3a83
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Mar 10 20:49:57 2014 +

update help ids for pivot filter dialog .ui conversion

Change-Id: I2b2a55a4cca7fbfffa7a2d1f9659faea2149fd3c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 68e550d..fcfec62 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3010,7 +3010,6 @@ HID_SC_NAVIPI_SCEN,58862,
 HID_SC_NAVIPI_TOOLBOX,58867,
 HID_SC_NAVIPI_UP,58858,
 HID_SC_NAVIPI_ZOOM,58860,
-HID_SC_PIVOTFILTER,58869,
 HID_SC_REDLIN_CTR,58934,
 HID_SC_RENAME_AUTOFMT,58943,
 HID_SC_RENAME_NAME,58913,
@@ -5715,9 +5714,6 @@ 
reportdesign_ListBox_RID_GROUPS_SORTING_LST_KEEPTOGETHERLST,2114719242,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_ORDER,2114719249,
 reportdesign_NumericField_RID_GROUPS_SORTING_ED_GROUPINTERVALLST,2114721800,
 sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781,
-sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_CASE,1493746690,
-sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_REGEXP,1493746691,
-sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_UNIQUE,1493746689,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CALC,957252625,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CASE,957252623,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609,
@@ -5727,9 +5723,6 @@ sc_CheckBox_RID_SCPAGE_CALC_BTN_REGEX,957252628,
 sc_CheckBox_TP_VALIDATION_VALUES_CB_SHOWLIST,548275227,
 sc_CheckBox_TP_VALIDATION_VALUES_CB_SORTLIST,548275228,
 sc_CheckBox_TP_VALIDATION_VALUES_TSB_ALLOW_BLANKS,548275203,
-sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL1,1493749792,
-sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL2,1493749793,
-sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794,
 sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_NAME,1495336973,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_PASSWD,1495336977,
@@ -5748,14 +5741,6 @@ sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505,
 sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS,1495453194,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND1,1493749277,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND2,1493749278,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND3,1493749279,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_FIELD1,1493749272,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_FIELD2,1493749273,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_FIELD3,1493749274,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP1,1493749275,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP2,1493749276,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
@@ -5763,7 +5748,6 @@ sc_ListBox_TP_VALIDATION_VALUES_LB_ALLOW,548277762,
 sc_ListBox_TP_VALIDATION_VALUES_LB_VALUE,548277765,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
-sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
 sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
diff --git a/source/text/scalc/01/12090103.xhp 
b/source/text/scalc/01/12090103.xhp
index 5b17e88..44818bb 100644
--- a/source/text/scalc/01/12090103.xhp
+++ b/source/text/scalc/01/12090103.xhp
@@ -32,17 +32,17 @@
 /meta
 body
   
-  
+  bookmark branch=hid/modules/scalc/ui/pivotfilterdialog/PivotFilterDialog 
xml-lang=en-US id=bm_id3153143 localize=false/
   paragraph role=heading level=1 id=hd_id3153970 l10n=U 
xml-lang=en-US oldref=1Filter/paragraph
   paragraph role=paragraph id=par_id3150448 l10n=U xml-lang=en-US 
oldref=2Set the filtering options for the data./paragraph
   paragraph role=heading level=2 id=hd_id3151043 l10n=U 
xml-lang=en-US oldref=3Filter Criteria/paragraph
   paragraph role=paragraph id=par_id3150440 l10n=U xml-lang=en-US 
oldref=4You can define a default filter for the data by filtering, for 
example, field names, using a combination of logical expressions 
arguments./paragraph
-  bookmark branch=hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP1 
xml-lang=en-US id=bm_id3153142 localize=false/bookmark 
branch=hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP2 xml-lang=en-US 
id=bm_id3155412 localize=false/paragraph role=heading level=3 
id=hd_id3159153 l10n=U xml-lang=en-US oldref=5Operator/paragraph
-  paragraph l10n=U role=paragraph id=par_id3153093 xml-lang=en-US 
oldref=6ahelp hid=SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_OP2 
visibility=visibleSelect a logical operator for the 
filter./ahelp/paragraph
-  bookmark branch=hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD1 
xml-lang=en-US id=bm_id3147317 localize=false/bookmark 
branch=hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD2 xml-lang=en-US 
id=bm_id3148646 localize=false/bookmark 

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

[Caolán McNamara]

 helpers/help_hid.lst   |   11 
 source/text/shared/01/06140200.xhp |   50 +++--
 2 files changed, 21 insertions(+), 40 deletions(-)

New commits:
commit f8aab22755a2e15062977bcf2bf8172f79cc0f92
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Mar 7 10:21:36 2014 +

update help ids for accel config tab page .ui conversion

Change-Id: Ia5a07697391981f40e6588ce54b2e6a6454c3345

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 441c098..6cfa3f9 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -662,7 +662,6 @@ HID_ABSPILOT_CANCEL,34833,
 HID_ABSPILOT_FINISH,34834,
 HID_ABSPILOT_NEXT,34832,
 HID_ABSPILOT_PREVIOUS,34831,
-HID_ACCELCONFIG_LISTBOX,40078,
 HID_ADD_STYLES_TLB,53244,
 HID_AGENDA_PAGE1,53299,
 HID_AGENDA_PAGE2,53300,
@@ -1062,9 +1061,6 @@ HID_COLORPAGE_WRITERTEXTGRID_LB,39907,
 HID_COLOR_CTL_COLORS,33887,
 HID_COLROWNAMERANGES,58931,
 HID_COMPATIBILITY_OPTIONS_BOX,53252,
-HID_CONFIGFUNCTION_ACC_LISTBOX,40080,
-HID_CONFIGGROUP_ACC_LISTBOX,40079,
-HID_CONFIG_ACCEL,40077,
 HID_CONFIG_EVENT_DOCUMENT_BASED,33167,
 HID_CONFIG_EVENT_OFFICE_BASED,33166,
 HID_CONFIRM_DROP_BUTTON_ALL,38937,
@@ -6400,11 +6396,6 @@ svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_ADD,703337015,
 svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_CHANGE,703337013,
 svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_DELETE,703337014,
 svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_NEW,703337016,
-svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_ACC_CHANGE,705516035,
-svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_ACC_REMOVE,705516036,
-svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_LOAD,705516072,
-svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_RESET,705516052,
-svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_SAVE,705516073,
 svx_PushButton_RID_SVXPAGE_LINE_DEF_BTN_ADD,701567489,
 svx_PushButton_RID_SVXPAGE_LINE_DEF_BTN_DELETE,701567491,
 svx_PushButton_RID_SVXPAGE_LINE_DEF_BTN_MODIFY,701567490,
@@ -6457,8 +6448,6 @@ 
svx_RadioButton_RID_SVXPAGE_INET_PROXY_RB_DNS_MANUAL,703283819,
 svx_RadioButton_RID_SVXPAGE_INET_SEARCH_RB_AND,703332907,
 svx_RadioButton_RID_SVXPAGE_INET_SEARCH_RB_EXACT,703332909,
 svx_RadioButton_RID_SVXPAGE_INET_SEARCH_RB_OR,703332908,
-svx_RadioButton_RID_SVXPAGE_KEYBOARD_RB_MODULE,705511981,
-svx_RadioButton_RID_SVXPAGE_KEYBOARD_RB_OFFICE,705511980,
 svx_RadioButton_RID_SVX_MDLG_ERR_REP_OPTIONS_BTN_ERROPT_DIRECT,1237795331,
 svx_RadioButton_RID_SVX_MDLG_ERR_REP_OPTIONS_BTN_ERROPT_MANUAL,1237795332,
 svx_RadioButton_RID_SVX_MDLG_ERR_REP_OPTIONS_BTN_ERROPT_SYSTEM,1237795330,
diff --git a/source/text/shared/01/06140200.xhp 
b/source/text/shared/01/06140200.xhp
index 90e99b7..eff3eff 100644
--- a/source/text/shared/01/06140200.xhp
+++ b/source/text/shared/01/06140200.xhp
@@ -33,9 +33,9 @@
 bookmark_valueediting;shortcut keys/bookmark_value
 bookmark_valuestyles;keyboard shortcuts/bookmark_value
 /bookmarkcommentMW deleted modifying;.../comment
-bookmark xml-lang=en-US branch=hid/CUI_HID_CONFIG_ACCEL id=bm_id3154183 
localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/accelconfigpage/AccelConfigPage 
id=bm_id3154183 localize=false/
 paragraph role=heading id=hd_id3148882 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/01/06140200.xhp 
name=KeyboardKeyboard/link/paragraph
-paragraph role=paragraph id=par_id3159411 xml-lang=en-US l10n=U 
oldref=2ahelp hid=HID_CONFIG_ACCELAssigns or edits the shortcut keys for 
$[officename] commands, or $[officename] Basic macros./ahelp/paragraph
+paragraph role=paragraph id=par_id3159411 xml-lang=en-US l10n=U 
oldref=2ahelp hid=cui/ui/accelconfigpage/AccelConfigPageAssigns or edits 
the shortcut keys for $[officename] commands, or $[officename] Basic 
macros./ahelp/paragraph
 /section
 section id=howtoget
 embed href=text/shared/00/0406.xhp#tastatur/
@@ -44,51 +44,43 @@
 section id=operatinghint
 paragraph role=note id=par_id3150144 xml-lang=en-US l10n=U 
oldref=29Avoid assigning shortcut keys that are currently used by your 
operating system./paragraph
 /section
-!-- removed HID SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE --
-bookmark xml-lang=en-US 
branch=hid/cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE id=bm_id393425 
localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/accelconfigpage/office 
id=bm_id393425 localize=false/
 paragraph role=heading id=hd_id3147250 xml-lang=en-US level=2 
l10n=U oldref=27$[officename]/paragraph
-paragraph role=paragraph id=par_id3152425 xml-lang=en-US l10n=U 
oldref=26ahelp hid=SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICEDisplays 
shortcut keys that are common to all $[officename] 
applications./ahelp/paragraph
-!-- removed HID SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE --
-bookmark xml-lang=en-US 
branch=hid/cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE id=bm_id315425 
localize=false/
+paragraph role=paragraph id=par_id3152425 xml-lang=en-US l10n=U 
oldref=26ahelp hid=cui/ui/accelconfigpage/officeDisplays shortcut keys 
that are common to all $[officename] 

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

[Caolán McNamara]

 helpers/help_hid.lst   |3 ---
 source/text/shared/01/06140500.xhp |8 
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 2772c59c848df42ad1064399fa13da119ead6f84
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Mar 7 11:03:04 2014 +

update help ids for event page .ui conversion

Change-Id: I35ef07027bef027b612843eb6ab7de995934044d

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6cfa3f9..168d633 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6236,7 +6236,6 @@ svx_ListBox_RID_SVXPAGE_BORDER_LB_SHADOWCOLOR,700796452,
 svx_ListBox_RID_SVXPAGE_COLOR_LB_COLOR,701697537,
 svx_ListBox_RID_SVXPAGE_COLOR_LB_COLORMODEL,701697538,
 svx_ListBox_RID_SVXPAGE_DOCRECOVERY_SAVE_LB_SAVE_FILELIST,700845574,
-svx_ListBox_RID_SVXPAGE_EVENTS_LB_SAVEIN,705547787,
 svx_ListBox_RID_SVXPAGE_HYPERLINK_DOCUMENT_LB_FORM,704482850,
 svx_ListBox_RID_SVXPAGE_HYPERLINK_INTERNET_LB_FORM,704450082,
 svx_ListBox_RID_SVXPAGE_HYPERLINK_MAIL_LB_FORM,704466466,
@@ -6388,8 +6387,6 @@ 
svx_PushButton_RID_SVXPAGE_ERR_REP_SEND_BTN_ERRSEND_OPT,700895769,
 svx_PushButton_RID_SVXPAGE_ERR_REP_SEND_BTN_ERRSEND_SHOWREP,700895768,
 svx_PushButton_RID_SVXPAGE_ERR_REP_SEND_BTN_RECOV_PREV,700895754,
 svx_PushButton_RID_SVXPAGE_ERR_REP_WELCOME_BTN_RECOV_PREV,700879370,
-svx_PushButton_RID_SVXPAGE_EVENTS_PB_ASSIGN,705548802,
-svx_PushButton_RID_SVXPAGE_EVENTS_PB_DELETE,705548803,
 svx_PushButton_RID_SVXPAGE_FOOTER_BTN_EXTRAS,701141544,
 svx_PushButton_RID_SVXPAGE_IMPROVEMENT_PB_SHOWDATA,705663507,
 svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_ADD,703337015,
diff --git a/source/text/shared/01/06140500.xhp 
b/source/text/shared/01/06140500.xhp
index 30d51c6..12cec77 100644
--- a/source/text/shared/01/06140500.xhp
+++ b/source/text/shared/01/06140500.xhp
@@ -49,18 +49,18 @@
 /switch
 
 
-bookmark xml-lang=en-US 
branch=hid/cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN id=bm_id1163975 
localize=false/paragraph role=heading id=par_idN1060A xml-lang=en-US 
level=2 l10n=NEWSave In/paragraph
+bookmark xml-lang=en-US branch=hid/cui/ui/eventsconfigpage/savein 
id=bm_id1163975 localize=false/paragraph role=heading id=par_idN1060A 
xml-lang=en-US level=2 l10n=NEWSave In/paragraph
 paragraph role=paragraph id=par_idN1060E xml-lang=en-US 
l10n=NEWahelp hid=705547787Select first where to save the event binding, 
in the current document or in %PRODUCTNAME./ahelp/paragraph
 paragraph role=note id=par_id3153662 xml-lang=en-US l10n=U 
oldref=36A macro that is saved with a document can only be run when that 
document is opened./paragraph
-bookmark xml-lang=en-US branch=hid/CUI_HID_SVX_MACRO_LB_EVENT 
id=bm_id1800286 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/eventsconfigpage/events 
id=bm_id1800286 localize=false/
 bookmark xml-lang=en-US branch=hid/cui/ui/macroassignpage/assignments 
id=bm_id1800286 localize=false/
 paragraph role=paragraph id=par_idN1061A xml-lang=en-US 
l10n=NEWahelp hid=4The big list box lists the events and the 
assigned macros. After you selected the location in the emphSave In/emph 
list box, select an event in the big list box. Then click emphAssign 
Macro/emph./ahelp/paragraph
 
 bookmark xml-lang=en-US branch=hid/cui/ui/macroassignpage/assign 
id=bm_id755672891 localize=false/
-bookmark xml-lang=en-US 
branch=hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN id=bm_id752891 
localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/eventsconfigpage/macro 
id=bm_id752891 localize=false/
 paragraph role=heading id=hd_id3159258 xml-lang=en-US level=2 
l10n=CHG oldref=22Assign Macro/paragraph
 paragraph role=paragraph id=par_id3156152 xml-lang=en-US l10n=CHG 
oldref=23ahelp hid=SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGNOpens the 
link href=text/shared/01/0613.xhpMacro Selector/link to assign a 
macro to the selected event./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE 
id=bm_id9109164.0001 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/eventsconfigpage/delete 
id=bm_id9109164.0001 localize=false/
 bookmark xml-lang=en-US branch=hid/cui/ui/macroassignpage/delete 
id=bm_id9109164341 localize=false/
 paragraph role=heading id=hd_id3154046 xml-lang=en-US level=2 
l10n=CHG oldref=24Remove Macro/paragraph
 paragraph role=paragraph id=par_id3152349 xml-lang=en-US l10n=U 
oldref=35ahelp hid=SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETEDeletes the 
macro assignment for the selected event./ahelp/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |   13 -
 source/text/shared/01/06140100.xhp |   37 +
 source/text/shared/01/06140400.xhp |4 ++--
 3 files changed, 19 insertions(+), 35 deletions(-)

New commits:
commit 43dc63d9850e04adee3fac707e35576e0e7f4539
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Mar 7 16:14:39 2014 +

update helpids for menu assign page .ui conversion

Change-Id: I53ac668e4206d4455fb219e76139361605bfe54c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 168d633..68e550d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3422,15 +3422,11 @@ HID_SVXTBX_UNDO_REDO_CTRL,34189,
 HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS,40019,
 HID_SVX_CONFIG_EVENT,40001,
 HID_SVX_CONFIG_ICON_SELECTOR,40044,
-HID_SVX_CONFIG_MENU,40007,
-HID_SVX_CONFIG_MENU_CONTENTS,40008,
 HID_SVX_CONFIG_NAME_SUBMENU,40045,
 HID_SVX_CONFIG_RENAME_MENU,40046,
 HID_SVX_CONFIG_RENAME_MENU_ITEM,40047,
 HID_SVX_CONFIG_RENAME_TOOLBAR,40048,
 HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM,40049,
-HID_SVX_CONFIG_TOOLBAR,40009,
-HID_SVX_CONFIG_TOOLBAR_CONTENTS,40010,
 HID_SVX_MDLG_DOCRECOVERY_BROKEN,40033,
 HID_SVX_MDLG_DOCRECOVERY_PROGR,40031,
 HID_SVX_MDLG_ERR_REP_OPTIONS,40036,
@@ -6182,8 +6178,6 @@ 
svx_ImageButton_RID_SVXPAGE_HYPERLINK_NEWDOCUMENT_BTN_CREATE,704507400,
 svx_ImageButton_RID_SVXPAGE_HYPERLINK_NEWDOCUMENT_BTN_SCRIPT,704507431,
 svx_ImageButton_RID_SVXPAGE_LINE_DEF_BTN_LOAD,701574661,
 svx_ImageButton_RID_SVXPAGE_LINE_DEF_BTN_SAVE,701574662,
-svx_ImageButton_RID_SVXPAGE_MENUS_BTN_DOWN,705507136,
-svx_ImageButton_RID_SVXPAGE_MENUS_BTN_UP,705507135,
 svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_HORZ,1238295050,
 svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_VERT,1238295052,
 svx_ListBox_OFA_TP_VIEW_LB_ICONSIZE,810520118,
@@ -6247,8 +6241,6 @@ svx_ListBox_RID_SVXPAGE_INET_SEARCH_LB_SEARCH,703335976,
 svx_ListBox_RID_SVXPAGE_LINE_DEF_LB_LINESTYLES,701566466,
 svx_ListBox_RID_SVXPAGE_LINE_DEF_LB_TYPE_1,701566467,
 svx_ListBox_RID_SVXPAGE_LINE_DEF_LB_TYPE_2,701566465,
-svx_ListBox_RID_SVXPAGE_MENUS_LB_MENUS,705498935,
-svx_ListBox_RID_SVXPAGE_MENUS_LB_SAVEIN,705498948,
 svx_ListBox_RID_SVXPAGE_SHADOW_LB_SHADOW_COLOR,701713930,
 svx_ListBox_RID_SVXPAGE_STD_PARAGRAPH_LB_LINEDIST,700812840,
 svx_ListBox_RID_SVXTBX_UNDO_REDO_CTRL_LB_SVXTBX_UNDO_REDO_CTRL,1788300811,
@@ -6257,8 +6249,6 @@ 
svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME,701009432,
 svx_ListBox_RID_SVX_MDLG_DOCRECOVERY_BROKEN_LB_BROKEN_FILELIST,1237782019,
 svx_ListBox_RID_SVX_MDLG_HANGULHANJA_EDIT_LB_BOOK,1237667329,
 svx_MenuButton_RID_SVXDLG_SPELLCHECK_MB_ADDTODICT,2311860263,
-svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE,705507642,
-svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE_ENTRY,705507646,
 svx_MetricField_OFA_TP_VIEW_MF_SELECTION,810523208,
 svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE,810523158,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_1,3391953410,
@@ -6324,7 +6314,6 @@ svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701,
 svx_MultiLineEdit_MD_INSERT_OBJECT_APPLET_ED_APPLET_OPTIONS,1598179860,
 svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD,2311850530,
 svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719,
-svx_MultiLineEdit_RID_SVXPAGE_MENUS_ED_DESCRIPTION,705497925,
 
svx_MultiLineEdit_RID_SVX_MDLG_ERR_REP_PREVIEW_ML_ERRPREVIEW_CONTENT,1237813761,
 svx_MultiListBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_LBX_FOUND,706677761,
 svx_NumericField_DLG_INS_ROW_COL_ED_COUNT,1240143874,
@@ -6396,8 +6385,6 @@ svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_NEW,703337016,
 svx_PushButton_RID_SVXPAGE_LINE_DEF_BTN_ADD,701567489,
 svx_PushButton_RID_SVXPAGE_LINE_DEF_BTN_DELETE,701567491,
 svx_PushButton_RID_SVXPAGE_LINE_DEF_BTN_MODIFY,701567490,
-svx_PushButton_RID_SVXPAGE_MENUS_BTN_ADD_COMMANDS,705499974,
-svx_PushButton_RID_SVXPAGE_MENUS_BTN_NEW,705499960,
 svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_ADD,704860692,
 svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_CLASSPATH,704860694,
 svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_PARAMETER,704860693,
diff --git a/source/text/shared/01/06140100.xhp 
b/source/text/shared/01/06140100.xhp
index 2e5b83d..7319c23 100644
--- a/source/text/shared/01/06140100.xhp
+++ b/source/text/shared/01/06140100.xhp
@@ -35,18 +35,18 @@
 bookmark_valuemenus;customizing/bookmark_value
 /bookmarkcommentmw deleted modifying;... entry/commentcommentMw 
deleted changing;/comment
 !-- removed HID HID_CONFIG_MENU --paragraph role=heading 
id=hd_id3153008 xml-lang=en-US level=1 l10n=U oldref=1link 
href=text/shared/01/06140100.xhp name=MenuMenu/link/paragraph
-paragraph role=paragraph id=par_id3152952 xml-lang=en-US l10n=U 
oldref=2ahelp hid=HID_CONFIG_MENUCustomizes and saves current menu 
layouts as well as creates new menus. You cannot customize context 
menus./ahelp/paragraph
+paragraph role=paragraph id=par_id3152952 xml-lang=en-US l10n=U 
oldref=2ahelp hid=cui/ui/menuassignpage/MenuAssignPageCustomizes and 
saves current menu layouts as well as 

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

[Caolán McNamara]

 helpers/help_hid.lst   |   10 --
 source/text/scalc/01/0511.xhp  |   37 +
 source/text/shared/00/0001.xhp |2 +-
 3 files changed, 18 insertions(+), 31 deletions(-)

New commits:
commit d3f2d4de7630cf42bb6328c9da22e1c9f552d742
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 6 11:20:48 2014 +

update help ids for autoformat table dialog .ui conversion

Change-Id: I8f197c728eec19654b58c230712663fac29d0c3c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f557f87..592a65c 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5723,12 +5723,6 @@ 
reportdesign_ListBox_RID_GROUPS_SORTING_LST_HEADERLST,2114719234,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_KEEPTOGETHERLST,2114719242,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_ORDER,2114719249,
 reportdesign_NumericField_RID_GROUPS_SORTING_ED_GROUPINTERVALLST,2114721800,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_ADJUST,1493533722,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_ALIGNMENT,1493533721,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_BORDER,1493533717,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_FONT,1493533719,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_NUMFORMAT,1493533716,
-sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_PATTERN,1493533720,
 sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_CASE,1493746690,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_REGEXP,1493746691,
@@ -5759,7 +5753,6 @@ sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304,
 sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289,
 sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291,
 sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290,
-sc_ListBox_RID_SCDLG_AUTOFORMAT_LB_FORMAT,1493536257,
 sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505,
 sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS,1495453194,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
@@ -5779,13 +5772,10 @@ sc_ListBox_TP_VALIDATION_VALUES_LB_ALLOW,548277762,
 sc_ListBox_TP_VALIDATION_VALUES_LB_VALUE,548277765,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
-sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576,
 sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
 sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
-sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_ADD,1493537385,
-sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_REMOVE,1493537386,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283,
diff --git a/source/text/scalc/01/0511.xhp 
b/source/text/scalc/01/0511.xhp
index 71f1544..d5e4b87 100644
--- a/source/text/scalc/01/0511.xhp
+++ b/source/text/scalc/01/0511.xhp
@@ -28,7 +28,7 @@
 /meta
 body
 bookmark xml-lang=en-US branch=hid/.uno:AutoFormat id=bm_id9247611 
localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:AutoFormat id=bm_id2998138 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/autoformattable/AutoFormatTableDialog 
id=bm_id2998138 localize=false/
 paragraph role=heading id=hd_id3149666 xml-lang=en-US level=1 
l10n=U oldref=1variable id=autoformatlink 
href=text/scalc/01/0511.xhp name=AutoFormatAutoFormat/link
 /variable/paragraph
 paragraph role=paragraph id=par_id3145367 xml-lang=en-US l10n=U 
oldref=2variable id=autoformattextahelp hid=.Use this command to 
apply an AutoFormat to a selected sheet area or to define your own 
AutoFormats./ahelp
@@ -36,39 +36,36 @@
 section id=howtoget
 embed href=text/scalc/00/0405.xhp#foatfo/
 /section
-bookmark xml-lang=en-US 
branch=hid/sc:ListBox:RID_SCDLG_AUTOFORMAT:LB_FORMAT id=bm_id3145645 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/autoformattable/formatlb id=bm_id3145645 
localize=false/
 paragraph role=heading id=hd_id3148455 xml-lang=en-US level=2 
l10n=U oldref=3Format/paragraph
-paragraph role=paragraph id=par_id3145799 xml-lang=en-US l10n=U 
oldref=4ahelp hid=SC:LISTBOX:RID_SCDLG_AUTOFORMAT:LB_FORMATChoose a 
predefined AutoFormat to apply to a selected area in your 
sheet./ahelp/paragraph
+paragraph role=paragraph id=par_id3145799 xml-lang=en-US l10n=U 
oldref=4ahelp hid=modules/scalc/ui/autoformattable/formatlbChoose a 
predefined AutoFormat to apply to a selected area in your 
sheet./ahelp/paragraph
 embed href=text/shared/00/0001.xhp#vorschau/
-bookmark xml-lang=en-US 
branch=hid/sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_ADD id=bm_id3155600 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/scalc/ui/autoformattable/add 
id=bm_id3155600 localize=false/
 paragraph role=heading id=hd_id3149410 xml-lang=en-US level=2 
l10n=U oldref=5Add/paragraph
-paragraph role=paragraph id=par_id3154017 xml-lang=en-US l10n=U 
oldref=6ahelp hid=SC:PUSHBUTTON:RID_SCDLG_AUTOFORMAT:BTN_ADDAllows you 
to add 

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

[Caolán McNamara]

 helpers/help_hid.lst   |3 ---
 source/text/shared/05/0150.xhp |2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit fd4b247481040463a7037ed0d96e78256ad2c32d
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Mar 5 10:17:24 2014 +

update help ids for help bookmarks .ui conversion

Change-Id: I4d264d6e53bffa652d58ccd99fb0d2279a77218e

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 71736aa..b2d5a85 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2106,7 +2106,6 @@ HID_HELP_LISTBOX,33347,
 HID_HELP_ONHELP,68245,
 HID_HELP_ONSTARTUP_BOX,33389,
 HID_HELP_TABCONTROL,33348,
-HID_HELP_TABPAGE_BOOKMARKS,33359,
 HID_HELP_TABPAGE_CONTENTS,33356,
 HID_HELP_TABPAGE_INDEX,33357,
 HID_HELP_TABPAGE_SEARCH,33358,
@@ -5967,7 +5966,6 @@ sfx2_FT_DOCNAME_DLG_PRINTMONITOR,2218852352,
 sfx2_FloatingWindow_SID_RECORDING_FLOATWINDOW,1705639936,
 sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781,
 sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812,
-sfx2_ListBox_TP_HELP_BOOKMARKS_LB_BOOKMARKS,547016203,
 sfx2_ListBox_TP_HELP_SEARCH_LB_RESULT,546999824,
 sfx2_ModalDialog_MD_DDE_LINKEDIT,1082212352,
 sfx2_ModalDialog_RID_URLOPEN,1112571904,
@@ -5977,7 +5975,6 @@ sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807,
 sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
 sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
 sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
-sfx2_PushButton_TP_HELP_BOOKMARKS_PB_BOOKMARKS,547017228,
 sfx2_PushButton_TP_HELP_INDEX_PB_OPEN_INDEX,546984460,
 sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849,
 sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844,
diff --git a/source/text/shared/05/0150.xhp 
b/source/text/shared/05/0150.xhp
index e1b584d..9f659e5 100644
--- a/source/text/shared/05/0150.xhp
+++ b/source/text/shared/05/0150.xhp
@@ -51,7 +51,7 @@
   paragraph xml-lang=en-US role=paragraph id=par_id3149827 l10n=U 
oldref=3You can find the bookmarks on the emphBookmarks/emph tab 
page./paragraph
   list type=unordered
listitem
-bookmark branch=hid/sfx2:ListBox:TP_HELP_BOOKMARKS:LB_BOOKMARKS 
xml-lang=en-US id=bm_id3156410 localize=false/paragraph l10n=U 
role=listitem id=par_id3145345 xml-lang=en-US oldref=4ahelp 
hid=SFX2_LISTBOX_TP_HELP_BOOKMARKS_LB_BOOKMARKS 
visibility=visibleDouble-clicking a bookmark or pressing the Return key 
opens the assigned page in Help. A right-click opens the context 
menu./ahelp/paragraph
+bookmark branch=hid/sfx/ui/helpbookmarkpage/HelpBookmarkPage 
xml-lang=en-US id=bm_id3156410 localize=false/paragraph l10n=U 
role=listitem id=par_id3145345 xml-lang=en-US oldref=4ahelp 
hid=sfx/ui/helpbookmarkpage/HelpBookmarkPage 
visibility=visibleDouble-clicking a bookmark or pressing the Return key 
opens the assigned page in Help. A right-click opens the context 
menu./ahelp/paragraph
/listitem
listitem
 paragraph role=listitem id=par_id3166410 l10n=U xml-lang=en-US 
oldref=5Use the Del key to delete a selected bookmark./paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |3 ---
 source/text/shared/05/0130.xhp |8 
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit d17b89d10487e87000998056c30f9ecfa8b1a86a
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Mar 5 10:56:47 2014 +

update help ids for help index page .ui conversion

Change-Id: I13210a5173f28ecd111bfd9c2809c36b1fedfe6c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b2d5a85..f1da63d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2107,7 +2107,6 @@ HID_HELP_ONHELP,68245,
 HID_HELP_ONSTARTUP_BOX,33389,
 HID_HELP_TABCONTROL,33348,
 HID_HELP_TABPAGE_CONTENTS,33356,
-HID_HELP_TABPAGE_INDEX,33357,
 HID_HELP_TABPAGE_SEARCH,33358,
 HID_HELP_TEXT_SELECTION_MODE,33373,
 HID_HELP_TOOLBOX,33349,
@@ -5949,7 +5948,6 @@ sfx2_CheckBox_DLG_NEW_FILE_CB_TEXT_STYLE,1107379233,
 sfx2_CheckBox_RID_WARN_PRINTTRANSPARENCY_CBX_NOPRINTTRANSWARN,1113048129,
 sfx2_CheckBox_TP_HELP_SEARCH_CB_FULLWORDS,546997262,
 sfx2_CheckBox_TP_HELP_SEARCH_CB_SCOPE,546997263,
-sfx2_ComboBox_TP_HELP_INDEX_CB_INDEX,546983947,
 sfx2_ComboBox_TP_HELP_SEARCH_ED_SEARCH,547000331,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO2,1078102023,
@@ -5975,7 +5973,6 @@ sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807,
 sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
 sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
 sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
-sfx2_PushButton_TP_HELP_INDEX_PB_OPEN_INDEX,546984460,
 sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849,
 sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_1,1401573377,
diff --git a/source/text/shared/05/0130.xhp 
b/source/text/shared/05/0130.xhp
index 0af617d..dfdc578 100644
--- a/source/text/shared/05/0130.xhp
+++ b/source/text/shared/05/0130.xhp
@@ -39,10 +39,10 @@
 paragraph role=paragraph id=par_id3149428 xml-lang=en-US l10n=E 
oldref=2 localize=false/
 paragraph role=heading id=hd_id3153884 xml-lang=en-US level=1 
l10n=U oldref=5variable id=0130link 
href=text/shared/05/0130.xhp name=Index - Keyword Search in the 
HelpIndex - Keyword Search in the Help/link
 /variable/paragraph
-bookmark xml-lang=en-US branch=hid/sfx2:ComboBox:TP_HELP_INDEX:CB_INDEX 
id=bm_id3149662 localize=false/
-paragraph role=paragraph id=par_id3150960 xml-lang=en-US l10n=U 
oldref=3ahelp hid=SFX2_COMBOBOX_TP_HELP_INDEX_CB_INDEX 
visibility=hiddenDouble-click an entry or type the word you want to find in 
the index./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sfx2:PushButton:TP_HELP_INDEX:PB_OPEN_INDEX id=bm_id3150476 
localize=false/
-paragraph role=paragraph id=par_id3148668 xml-lang=en-US l10n=U 
oldref=8ahelp hid=SFX2_PUSHBUTTON_TP_HELP_INDEX_PB_OPEN_INDEX 
visibility=hiddenClick to display the selected topic./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/sfx/ui/helpindexpage/HelpIndexPage 
id=bm_id3149662 localize=false/
+paragraph role=paragraph id=par_id3150960 xml-lang=en-US l10n=U 
oldref=3ahelp hid=sfx/ui/helpindexpage/HelpIndexPage 
visibility=hiddenDouble-click an entry or type the word you want to find in 
the index./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/sfx/ui/helpindexpage/display 
id=bm_id3150476 localize=false/
+paragraph role=paragraph id=par_id3148668 xml-lang=en-US l10n=U 
oldref=8ahelp hid=sfx/ui/helpindexpage/display visibility=hiddenClick 
to display the selected topic./ahelp/paragraph
 paragraph role=paragraph id=par_id3155934 xml-lang=en-US l10n=U 
oldref=1You can search for a specific topic by typing a word into the 
emphSearch term/emph text box. The window contains an alphabetical list of 
index terms./paragraph
 paragraph role=paragraph id=par_id3145669 xml-lang=en-US l10n=U 
oldref=6If the cursor is in the index list when you type the search term, 
the display will jump directly to the next match. When you type a word in the 
emphSearch term/emph text box, the focus will jump to the best match in the 
index list./paragraph
 paragraph role=tip id=par_id3147653 xml-lang=en-US l10n=CHG 
oldref=7The index and full-text searches always apply to the currently 
selected item type=productname%PRODUCTNAME/item application. Select the 
appropriate application using the list box on the help viewer's 
toolbar./paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |7 ---
 source/text/shared/05/0140.xhp |   24 
 2 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit a1500f2d2d62db355abf42dbd136b26baecf8abc
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Mar 5 11:31:01 2014 +

update help ids for help search page .ui conversion

Change-Id: I34d65b1d4f4929ae69bea4e2a47bef21f5e9a958

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f1da63d..53cd13c 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2107,7 +2107,6 @@ HID_HELP_ONHELP,68245,
 HID_HELP_ONSTARTUP_BOX,33389,
 HID_HELP_TABCONTROL,33348,
 HID_HELP_TABPAGE_CONTENTS,33356,
-HID_HELP_TABPAGE_SEARCH,33358,
 HID_HELP_TEXT_SELECTION_MODE,33373,
 HID_HELP_TOOLBOX,33349,
 HID_HELP_TOOLBOXITEM_BACKWARD,33352,
@@ -5946,9 +5945,6 @@ sfx2_CheckBox_DLG_NEW_FILE_CB_NUM_STYLE,1107379236,
 sfx2_CheckBox_DLG_NEW_FILE_CB_PAGE_STYLE,1107379235,
 sfx2_CheckBox_DLG_NEW_FILE_CB_TEXT_STYLE,1107379233,
 sfx2_CheckBox_RID_WARN_PRINTTRANSPARENCY_CBX_NOPRINTTRANSWARN,1113048129,
-sfx2_CheckBox_TP_HELP_SEARCH_CB_FULLWORDS,546997262,
-sfx2_CheckBox_TP_HELP_SEARCH_CB_SCOPE,546997263,
-sfx2_ComboBox_TP_HELP_SEARCH_ED_SEARCH,547000331,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO2,1078102023,
 sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO3,1078102025,
@@ -5964,7 +5960,6 @@ sfx2_FT_DOCNAME_DLG_PRINTMONITOR,2218852352,
 sfx2_FloatingWindow_SID_RECORDING_FLOATWINDOW,1705639936,
 sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781,
 sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812,
-sfx2_ListBox_TP_HELP_SEARCH_LB_RESULT,546999824,
 sfx2_ModalDialog_MD_DDE_LINKEDIT,1082212352,
 sfx2_ModalDialog_RID_URLOPEN,1112571904,
 sfx2_ModalDialog_RID_WARN_PRINTTRANSPARENCY,1113047040,
@@ -5973,8 +5968,6 @@ sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807,
 sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
 sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
 sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
-sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849,
-sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_1,1401573377,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_2,1401573378,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_3,1401573379,
diff --git a/source/text/shared/05/0140.xhp 
b/source/text/shared/05/0140.xhp
index 3d79bec..ffb02dc 100644
--- a/source/text/shared/05/0140.xhp
+++ b/source/text/shared/05/0140.xhp
@@ -38,18 +38,18 @@
 paragraph role=paragraph id=par_id3148532 xml-lang=en-US l10n=E 
oldref=1 localize=false/
 paragraph role=heading id=hd_id3148523 xml-lang=en-US level=1 
l10n=U oldref=7variable id=0140link 
href=text/shared/05/0140.xhp name=Find - The Full-Text SearchFind - 
The Full-Text Search/link
 /variable/paragraph
-bookmark xml-lang=en-US branch=hid/sfx2:ComboBox:TP_HELP_SEARCH:ED_SEARCH 
id=bm_id3151100 localize=false/
-paragraph role=paragraph id=par_id3155599 xml-lang=en-US l10n=U 
oldref=2ahelp hid=SFX2_COMBOBOX_TP_HELP_SEARCH_ED_SEARCH 
visibility=hiddenEnter the search term here. The search is not 
case-sensitive./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sfx2:PushButton:TP_HELP_SEARCH:PB_SEARCH id=bm_id3109850 
localize=false/
-paragraph role=paragraph id=par_id3153323 xml-lang=en-US l10n=U 
oldref=3ahelp hid=SFX2_PUSHBUTTON_TP_HELP_SEARCH_PB_SEARCH 
visibility=hiddenClick to start a full-text search for the term you 
entered./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/sfx2:ListBox:TP_HELP_SEARCH:LB_RESULT 
id=bm_id3149140 localize=false/
-paragraph role=paragraph id=par_id3150499 xml-lang=en-US l10n=CHG 
oldref=4ahelp hid=SFX2_LISTBOX_TP_HELP_SEARCH_LB_RESULT 
visibility=hiddenLists the headings of the pages found in your full-text 
search. To display a page, double-click its entry./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sfx2:CheckBox:TP_HELP_SEARCH:CB_FULLWORDS id=bm_id3154673 
localize=false/
-paragraph role=paragraph id=par_id3156027 xml-lang=en-US l10n=U 
oldref=14ahelp hid=SFX2_CHECKBOX_TP_HELP_SEARCH_CB_FULLWORDS 
visibility=hiddenSpecifies whether to carry out an exact search for the word 
you entered. Incomplete words will not be found./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/sfx2:CheckBox:TP_HELP_SEARCH:CB_SCOPE 
id=bm_id3147835 localize=false/
-paragraph role=paragraph id=par_id312 xml-lang=en-US l10n=U 
oldref=5ahelp hid=SFX2_CHECKBOX_TP_HELP_SEARCH_CB_SCOPE 
visibility=hiddenSpecifies whether to only search in document headings for 
the search term./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sfx2:PushButton:TP_HELP_SEARCH:PB_OPEN_SEARCH id=bm_id3145346 
localize=false/
-paragraph role=paragraph id=par_id315 xml-lang=en-US l10n=U 
oldref=6ahelp hid=SFX2_PUSHBUTTON_TP_HELP_SEARCH_PB_OPEN_SEARCH 
visibility=hiddenDisplays the entry selected in the list./ahelp/paragraph
+bookmark xml-lang=en-US 

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

[Caolán McNamara]

 helpers/help_hid.lst   |2 --
 source/text/shared/05/0160.xhp |4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit b7b2120b6b279ed678c9fc8dbd5ee02e184064bc
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Mar 5 11:48:05 2014 +

update help ids for help contents page .ui conversion

Change-Id: I11701c2b795fde45d671762951046ea3e459e5b0

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 53cd13c..a0e43a2 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2106,7 +2106,6 @@ HID_HELP_LISTBOX,33347,
 HID_HELP_ONHELP,68245,
 HID_HELP_ONSTARTUP_BOX,33389,
 HID_HELP_TABCONTROL,33348,
-HID_HELP_TABPAGE_CONTENTS,33356,
 HID_HELP_TEXT_SELECTION_MODE,33373,
 HID_HELP_TOOLBOX,33349,
 HID_HELP_TOOLBOXITEM_BACKWARD,33352,
@@ -2116,7 +2115,6 @@ HID_HELP_TOOLBOXITEM_INDEX,33350,
 HID_HELP_TOOLBOXITEM_PRINT,33354,
 HID_HELP_TOOLBOXITEM_SEARCHDIALOG,33363,
 HID_HELP_TOOLBOXITEM_START,33351,
-HID_HELP_TREELISTBOX_CONTENTS,33369,
 HID_HELP_WINDOW,33346,
 HID_HYPERDLG_DOC_PATH,34092,
 HID_HYPERDLG_INET_PATH,34090,
diff --git a/source/text/shared/05/0160.xhp 
b/source/text/shared/05/0160.xhp
index e18ba5a..0b3fa89 100644
--- a/source/text/shared/05/0160.xhp
+++ b/source/text/shared/05/0160.xhp
@@ -35,10 +35,10 @@
 bookmark_valuetree view of Help/bookmark_value
 /bookmark
 paragraph role=paragraph id=par_id3147090 xml-lang=en-US l10n=E 
oldref=1 localize=false/
-bookmark xml-lang=en-US branch=hid/SFX2_HID_HELP_TABPAGE_CONTENTS 
id=bm_id3155354 localize=false/
+bookmark xml-lang=en-US branch=hid/sfx/ui/helpcontentpage/HelpContentPage 
id=bm_id3155354 localize=false/
 paragraph role=heading id=hd_id3146856 xml-lang=en-US level=1 
l10n=U oldref=2variable id=doc_titlelink 
href=text/shared/05/0160.xhp name=Contents - The Main Help 
TopicsContents - The Main Help Topics/link
 /variable/paragraph
-paragraph role=paragraph id=par_id3147000 xml-lang=en-US l10n=U 
oldref=3ahelp hid=HID_HELP_TABPAGE_CONTENTSDisplays the main help 
themes, arranged in a similar way to folders in a file 
manager./ahelp/paragraph
+paragraph role=paragraph id=par_id3147000 xml-lang=en-US l10n=U 
oldref=3ahelp hid=sfx/ui/helpcontentpage/HelpContentPageDisplays the 
main help themes, arranged in a similar way to folders in a file 
manager./ahelp/paragraph
 table id=tbl_id3150476
 tablerow
 tablecell colspan= rowspan=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst |   14 --
 source/text/schart/01/wiz_chart_type.xhp |   25 +
 2 files changed, 13 insertions(+), 26 deletions(-)

New commits:
commit a36b1693703d797899abba717525f2a058e78b58
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Mar 3 13:20:45 2014 +

update helpids for chart type page .ui conversion

Change-Id: I1aa0df7726282a8bdff3079546d048fbef6fe782

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1c347d5..0ecf07f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2948,17 +2948,13 @@ HID_RPT_VERT_SCROLLBAR,64459,
 HID_RUBY_DIALOG,34187,
 HID_SCDLG_CONFLICTS,59023,
 HID_SCH_CHART_AUTO_FORMAT,63324,
-HID_SCH_CTL_TYPE,63293,
-HID_SCH_CTL_VARIANT,63294,
 HID_SCH_CT_INDICATE,63291,
 HID_SCH_DATA_SERIES_LABEL,63367,
-HID_SCH_LB_BAR_GEOMETRY,63325,
 HID_SCH_LEGEND_POS_BOTTOM,63343,
 HID_SCH_LEGEND_POS_LEFT,63340,
 HID_SCH_LEGEND_POS_RIGHT,63342,
 HID_SCH_LEGEND_POS_TOP,63341,
 HID_SCH_LEGEND_SHOW,63366,
-HID_SCH_NUM_OF_LINES,63323,
 HID_SCH_STATISTIK_BIGERROR,63349,
 HID_SCH_STATISTIK_BIGERROR_VALUE,63352,
 HID_SCH_STATISTIK_MEANVALUE,63344,
@@ -5433,18 +5429,8 @@ basic_TabPage_RID_TP_GENERIC,602603520,
 basic_TabPage_RID_TP_MISC,602570752,
 basic_TabPage_RID_TP_PROFILE,602537984,
 basic_TimeField_RID_TP_MISC_SERVER_TIMEOUT,602579014,
-chart2_CheckBox_TP_CHARTTYPE_CB_3D_LOOK,551781378,
-chart2_CheckBox_TP_CHARTTYPE_CB_SPLINES,551781380,
-chart2_CheckBox_TP_CHARTTYPE_CB_STACKED,551781379,
-chart2_CheckBox_TP_CHARTTYPE_CB_XVALUE_SORTING,551781381,
-chart2_CheckBox_TP_CHARTTYPE_CB_X_AXIS_CATEGORIES,551781377,
 chart2_FL_GRIDS_TP_WIZARD_TITLEANDOBJECTS,551813120,
-chart2_ListBox_TP_CHARTTYPE_LB_3D_SCHEME,551783937,
 chart2_ListBox_TP_LOCATION_LB_TABLE,551833089,
-chart2_PushButton_TP_CHARTTYPE_PB_SPLINE_DIALOG,551784961,
-chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y,551780866,
-chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y_PERCENT,551780867,
-chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Z,551780868,
 chart2_TabPage_TP_LAYOUT,551731200,
 chart2_TabPage_TP_LOCATION,551829504,
 chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120,
diff --git a/source/text/schart/01/wiz_chart_type.xhp 
b/source/text/schart/01/wiz_chart_type.xhp
index 78cd742..cee8d5a 100644
--- a/source/text/schart/01/wiz_chart_type.xhp
+++ b/source/text/schart/01/wiz_chart_type.xhp
@@ -33,6 +33,7 @@
 body
 bookmark xml-lang=en-US branch=index 
id=bm_id4266792bookmark_valuecharts;choosing chart types/bookmark_value
 /bookmark
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_ChartType/tp_ChartType id=bm_id863980 
localize=false/
 paragraph role=heading id=hd_id1536606 xml-lang=en-US level=1 
l10n=NEWvariable id=wiz_chart_typelink 
href=text/schart/01/wiz_chart_type.xhpChart Wizard - Chart Type/link
 /variable/paragraph
 paragraph role=paragraph id=par_id6006958 xml-lang=en-US l10n=CHGOn 
the first page of the Chart Wizard you can link 
href=text/schart/01/choose_chart_type.xhpchoose a chart 
type/link./paragraph
@@ -57,29 +58,29 @@
 paragraph role=paragraph id=par_id8420056 xml-lang=en-US 
l10n=NEWClick emphCancel/emph to close the wizard without creating a 
chart./paragraphcomment63365 roadmap/comment
 bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_WIZARD_ROADMAP 
id=bm_id2511368 localize=false/
 paragraph role=paragraph id=par_id2284920 xml-lang=en-US 
l10n=NEWahelp hid=. visibility=hiddenClick to go to the named wizard 
page./ahelp/paragraphcomment63293 basic chart types/comment
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_CTL_TYPE 
id=bm_id8073976 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_ChartType/charttype id=bm_id8073976 
localize=false/
 paragraph role=paragraph id=par_id3184301 xml-lang=en-US 
l10n=NEWahelp hid=. visibility=hiddenSelect a basic chart 
type./ahelp/paragraphcomment63294 options/comment
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_CTL_VARIANT 
id=bm_id3088473 localize=false/
+bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ChartType/subtype 
id=bm_id3088473 localize=false/
 paragraph role=paragraph id=par_id2129276 xml-lang=en-US 
l10n=NEWahelp hid=. visibility=hiddenSelect a sub type of the basic 
chart type./ahelp/paragraphcomment551781378 3D look checkbox/comment
-bookmark xml-lang=en-US 
branch=hid/chart2:CheckBox:TP_CHARTTYPE:CB_3D_LOOK id=bm_id8226569 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ChartType/3dlook 
id=bm_id8226569 localize=false/
 paragraph role=paragraph id=par_id9719229 xml-lang=en-US 
l10n=NEWahelp hid=. visibility=hiddenEnables a 3D look for the data 
values./ahelp/paragraphcomment551783937 3D dropdown/comment
-bookmark xml-lang=en-US 
branch=hid/chart2:ListBox:TP_CHARTTYPE:LB_3D_SCHEME id=bm_id678731 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_ChartType/3dscheme id=bm_id678731 
localize=false/
 paragraph role=paragraph id=par_id3860896 xml-lang=en-US 
l10n=NEWahelp 

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

[Caolán McNamara]

 helpers/help_hid.lst   |   11 ---
 source/text/shared/01/06040600.xhp |   54 +++--
 2 files changed, 22 insertions(+), 43 deletions(-)

New commits:
commit bf4bd6b7a918771621956a90f13213e8fc777507
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Mar 3 14:47:33 2014 +

update help ids for word completion page .ui conversion

Change-Id: I838444f2488b3fe0e31b67731b405e81453508e3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 0ecf07f..71736aa 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2491,7 +2491,6 @@ HID_NUM_TOOLBOX,54836,
 HID_OFACTL_AUTOCORR_REPLACE,35032,
 HID_OFADLG_OPTIONS_TREE,35097,
 HID_OFADLG_TREELISTBOX,35098,
-HID_OFAPAGE_AUTOCOMPLETE_OPTIONS,35141,
 HID_OFAPAGE_AUTOCORR_OPTIONS,35029,
 HID_OFAPAGE_AUTOFORMAT_CLB,35075,
 HID_OFAPAGE_SMARTTAG_OPTIONS,35155,
@@ -6062,11 +6061,6 @@ svx_CheckBox_OFA_TP_VIEW_CB_SELECTION,810517575,
 svx_CheckBox_OFA_TP_VIEW_CB_SYSTEM_FONT,810517561,
 svx_CheckBox_OFA_TP_VIEW_CB_USE_ANTIALIASE,810517573,
 svx_CheckBox_OFA_TP_VIEW_CB_USE_HARDACCELL,810517572,
-svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_ACTIV,809157753,
-svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE,809157755,
-svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_AS_TIP,809157757,
-svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_COLLECT,809157754,
-svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_REMOVE_LIST,809157756,
 svx_CheckBox_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS,809256156,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709,
@@ -6246,7 +6240,6 @@ svx_ListBox_OFA_TP_VIEW_LB_ICONSTYLE,810520120,
 svx_ListBox_OFA_TP_VIEW_LB_MENU_ICONS,810520105,
 svx_ListBox_OFA_TP_VIEW_LB_MOUSEMIDDLE,810520098,
 svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS,810520095,
-svx_ListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_DCB_EXPAND_KEY,809160323,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_BIND,1368919573,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_METHOD,1368919568,
 svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_REPLACE,1368919575,
@@ -6383,14 +6376,11 @@ 
svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD,2311850530,
 svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719,
 svx_MultiLineEdit_RID_SVXPAGE_MENUS_ED_DESCRIPTION,705497925,
 
svx_MultiLineEdit_RID_SVX_MDLG_ERR_REP_PREVIEW_ML_ERRPREVIEW_CONTENT,1237813761,
-svx_MultiListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_LB_ENTRIES,809159812,
 svx_MultiListBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_LBX_FOUND,706677761,
 svx_NumericField_DLG_INS_ROW_COL_ED_COUNT,1240143874,
 svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINHEIGHT,1598216200,
 svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINWIDTH,1598216202,
 svx_NumericField_OFA_TP_VIEW_NF_AA_POINTLIMIT,810522688,
-svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MAX_ENTRIES,809162881,
-svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MIN_WORDLEN,809162880,
 svx_NumericField_RID_SVXFLOAT_3D_NUM_HORIZONTAL,3388495897,
 svx_NumericField_RID_SVXFLOAT_3D_NUM_VERTICAL,3388495899,
 svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_1,701569025,
@@ -6412,7 +6402,6 @@ 
svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_EDIT,1241813510,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_RENAME,1241813511,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_RUN,1241813507,
 svx_PushButton_RID_OFADLG_OPTIONS_TREE_PB_BACK,1345966596,
-svx_PushButton_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_PB_ENTRIES,809161349,
 svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT,809013821,
 svx_PushButton_RID_OFAPAGE_SMARTTAG_OPTIONS_PB_SMARTTAGS,809259743,
 svx_PushButton_RID_SFXPAGE_PATH_BTN_PATH,733581837,
diff --git a/source/text/shared/01/06040600.xhp 
b/source/text/shared/01/06040600.xhp
index 22a073e..9fb2c22 100644
--- a/source/text/shared/01/06040600.xhp
+++ b/source/text/shared/01/06040600.xhp
@@ -39,59 +39,49 @@
 case select=WRITERembed 
href=text/swriter/guide/word_completion.xhp#word_completion/
 /case
 /switch
-!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV --
-bookmark xml-lang=en-US 
branch=hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV 
id=bm_id4897915 localize=false/
+bookmark xml-lang=en-US 
branch=hid/cui/ui/wordcompletionpage/WordCompletionPage id=bm_id4897916 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/cui/ui/wordcompletionpage/enablewordcomplete id=bm_id4897915 
localize=false/
 paragraph xml-lang=en-US id=hd_id3154514 role=heading level=2 l10n=U
  oldref=94Enable word completion/paragraph
-  paragraph xml-lang=en-US id=par_id3156153 role=paragraph l10n=U 
oldref=95ahelp 
hid=OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIVStores 
frequently used words, and automatically completes a word after you type three 
letters that match the first three letters of a stored word./ahelp/paragraph
-!-- removed HID 

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

[Caolán McNamara]

 helpers/help_hid.lst   |   10 +-
 source/text/schart/01/0301.xhp |   21 ++---
 2 files changed, 11 insertions(+), 20 deletions(-)

New commits:
commit b789fc2c930c10d8a9ac60e7b92680fde990209c
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Feb 20 13:37:15 2014 +

update help ids for chart data source dialog .ui conversion

Change-Id: I6e51547a0e2496ea073609d729a5ccff2bfc0479

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 4af0655..1c347d5 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2948,7 +2948,6 @@ HID_RPT_VERT_SCROLLBAR,64459,
 HID_RUBY_DIALOG,34187,
 HID_SCDLG_CONFLICTS,59023,
 HID_SCH_CHART_AUTO_FORMAT,63324,
-HID_SCH_CTL_DATA,63290,
 HID_SCH_CTL_TYPE,63293,
 HID_SCH_CTL_VARIANT,63294,
 HID_SCH_CT_INDICATE,63291,
@@ -2964,14 +2963,7 @@ HID_SCH_STATISTIK_BIGERROR,63349,
 HID_SCH_STATISTIK_BIGERROR_VALUE,63352,
 HID_SCH_STATISTIK_MEANVALUE,63344,
 HID_SCH_STATISTIK_PERCENT_VALUE,63351,
-HID_SCH_TBI_DATA_DELETE_COL,63306,
-HID_SCH_TBI_DATA_DELETE_ROW,63305,
-HID_SCH_TBI_DATA_INSERT_COL,63304,
-HID_SCH_TBI_DATA_INSERT_ROW,63303,
-HID_SCH_TBI_DATA_SWAP_COL,63307,
-HID_SCH_TBI_DATA_SWAP_ROW,63308,
-HID_SCH_TBX_DATA,63314,
-HID_SCH_TEXTDIRECTION_EQUATION,63397,
+eID_SCH_TEXTDIRECTION_EQUATION,63397,
 HID_SCH_TITLE_X,63362,
 HID_SCH_TITLE_Y,63363,
 HID_SCH_TITLE_Z,63364,
diff --git a/source/text/schart/01/0301.xhp 
b/source/text/schart/01/0301.xhp
index 0ce5328..5831faa 100644
--- a/source/text/schart/01/0301.xhp
+++ b/source/text/schart/01/0301.xhp
@@ -30,7 +30,9 @@
 /meta
 body
 section id=diagrammdaten
-bookmark xml-lang=en-US branch=hid/.uno:DiagramData id=bm_id3153771 
localize=false/paragraph role=heading id=hd_id3150869 xml-lang=en-US 
level=1 l10n=CHG oldref=1link href=text/schart/01/0301.xhp 
name=Data TableData Table/link/paragraph
+bookmark xml-lang=en-US branch=hid/.uno:DiagramData id=bm_id3153771 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/chartdatadialog/ChartDataDialog 
id=bm_id3153772 localize=false/
+paragraph role=heading id=hd_id3150869 xml-lang=en-US level=1 
l10n=CHG oldref=1link href=text/schart/01/0301.xhp name=Data 
TableData Table/link/paragraph
 paragraph role=paragraph id=par_id3151115 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=.uno:DiagramDataOpens theemph Data Table 
/emphdialog where you can edit the chart data./ahelp/paragraph
 /section
 paragraph role=paragraph id=par_id3149667 xml-lang=en-US l10n=CHG 
oldref=51Theemph Data Table /emphdialog is not available if you insert a 
chart that is based on a Calc sheet or on a Writer table.commentUFI: fixes 
#i31208#/comment/paragraph
@@ -69,16 +71,13 @@
 paragraph role=paragraph id=par_id9116794 xml-lang=en-US l10n=CHGThe 
order of the categories or data points in the chart is the same as in the data 
table. Use the emphMove Row Down/emph icon to switch the current row with 
its neighbor below./paragraph
 /listitem
 /list
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_INSERT_ROW 
id=bm_id3154022 localize=false/commentinsert row/commentparagraph 
role=paragraph id=par_id3150297 xml-lang=en-US l10n=U 
oldref=20ahelp hid=. visibility=hiddenInserts a new row below the 
current row./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_INSERT_COL 
id=bm_id3152988 localize=false/commentinsert series/commentparagraph 
role=paragraph id=par_id3145384 xml-lang=en-US l10n=U 
oldref=23ahelp hid=. visibility=hiddenInserts a new data series after 
the current column./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL id=bm_id3156022 
localize=false/commentinsert text column/commentparagraph 
role=paragraph id=par_id3152297 xml-lang=en-USahelp hid=. 
visibility=hiddenInserts a new text column after the current column for 
hierarchical axes descriptions./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_DELETE_ROW 
id=bm_id3150215 localize=false/commentdelete row/commentparagraph 
role=paragraph id=par_id3159231 xml-lang=en-US l10n=U 
oldref=26ahelp hid=. visibility=hiddenDeletes the current row. It is 
not possible to delete the label row./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_DELETE_COL 
id=bm_id3153959 localize=false/commentdelete series/commentparagraph 
role=paragraph id=par_id3153336 xml-lang=en-US l10n=U 
oldref=29ahelp hid=. visibility=hiddenDeletes the current series or 
text column. It is not possible to delete the first text 
column./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_SWAP_COL 
id=bm_id8501846 localize=false/commentmove series 
right/commentparagraph role=paragraph id=par_id4089175 xml-lang=en-US 
l10n=CHGahelp hid=. visibility=hiddenSwitches the current column with 
its neighbor at the right./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_SWAP_ROW 
id=bm_id4469130 

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

[Caolán McNamara]

 helpers/help_hid.lst  |8 --
 source/text/shared/explorer/database/11030100.xhp |   29 +++---
 2 files changed, 15 insertions(+), 22 deletions(-)

New commits:
commit 45ca39c87e40aee0d370737d0c6eb148777bcc65
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 17 11:24:57 2014 +

update help ids for dbase index dialog .ui conversion

Change-Id: I3d1afde2143a94fe456cda55677178016950283e

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b0863c7..4af0655 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5464,7 +5464,6 @@ 
dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
 dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
 dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN,851641349,
 dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_USEHEADERLINE,851641350,
-dbaccess_ComboBox_DLG_DBASE_INDEXES_CB_TABLES,1388335105,
 dbaccess_ComboBox_TP_SAVE_DBDOC_AS_ED_SAVE_AS_LOCATION,851464193,
 dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589,
 dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588,
@@ -5491,10 +5490,6 @@ dbaccess_FT_JDBCDRIVERCLASS_PAGE_MYSQL_JDBC,851771392,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_ORACLE_JDBC,851886080,
 dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_NEWFOLDER,1388768769,
 dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_UP,1388768770,
-dbaccess_ImageButton_DLG_DBASE_INDEXES_IB_ADD,1388342785,
-dbaccess_ImageButton_DLG_DBASE_INDEXES_IB_ADDALL,1388342787,
-dbaccess_ImageButton_DLG_DBASE_INDEXES_IB_REMOVE,1388342786,
-dbaccess_ImageButton_DLG_DBASE_INDEXES_IB_REMOVEALL,1388342788,
 dbaccess_ImageButton_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_LH,851602948,
 dbaccess_ImageButton_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_RH,851602947,
 dbaccess_ImageButton_TAB_WIZ_COLUMN_SELECT_IB_COLUMN_LH,851602946,
@@ -5504,12 +5499,9 @@ 
dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT,851635727,
 dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP,851635724,
 dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT,851635726,
 dbaccess_ListBox_DLG_ADABASSTAT_LB_DATADEVS,1388613121,
-dbaccess_ListBox_DLG_DBASE_INDEXES_LB_FREEINDEXES,1388334594,
-dbaccess_ListBox_DLG_DBASE_INDEXES_LB_TABLEINDEXES,1388334593,
 dbaccess_ListBox_DLG_PARAMETERS_LB_ALLPARAMS,1388400129,
 dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST,851447299,
 dbaccess_ModalDialog_DLG_ADABASSTAT,1388609536,
-dbaccess_ModalDialog_DLG_DBASE_INDEXES,1388331008,
 dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840,
 dbaccess_ModalDialog_DLG_INDEXDESIGN,1388625920,
 dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624,
diff --git a/source/text/shared/explorer/database/11030100.xhp 
b/source/text/shared/explorer/database/11030100.xhp
index b910b71..35a0f35 100644
--- a/source/text/shared/explorer/database/11030100.xhp
+++ b/source/text/shared/explorer/database/11030100.xhp
@@ -29,24 +29,25 @@
 /topic
 /meta
 body
+bookmark xml-lang=en-US 
branch=hid/dbaccess/ui/dbaseindexdialog/DBaseIndexDialog id=bm_id3146959 
localize=false/
 paragraph role=heading id=hd_id3148983 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/explorer/database/11030100.xhp 
name=IndexesIndexes/link/paragraph
 paragraph role=paragraph id=par_id3150247 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=.Lets you organize dBASE database indexes./ahelp An 
index allows you to access a database quickly, provided that you query the data 
in the selection that was defined through the index. When you design a table, 
you can define the indexes on the emphIndexes /emphtab page./paragraph
 section id=howtoget
   embed href=text/shared/00/0450.xhp#dBasein/
 /section
-bookmark xml-lang=en-US 
branch=hid/dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES id=bm_id3146958 
localize=false/paragraph role=heading id=hd_id3155339 xml-lang=en-US 
level=2 l10n=U oldref=3Table/paragraph
-paragraph role=paragraph id=par_id3152551 xml-lang=en-US l10n=U 
oldref=10ahelp hid=DBACCESS_COMBOBOX_DLG_DBASE_INDEXES_CB_TABLESSelect 
the database table that you want to index./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES 
id=bm_id3153312 localize=false/paragraph role=heading id=hd_id3159233 
xml-lang=en-US level=2 l10n=U oldref=4Table Indexes/paragraph
-paragraph role=paragraph id=par_id3143267 xml-lang=en-US l10n=U 
oldref=11ahelp 
hid=DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_TABLEINDEXESLists the current 
indexes for the selected database table./ahelp To remove an index from the 
list, click the index, and then click the right arrow./paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES 
id=bm_id3147276 localize=false/paragraph role=heading id=hd_id3148538 
xml-lang=en-US level=2 l10n=U oldref=5Free Indexes/paragraph
-paragraph role=paragraph id=par_id3151110 xml-lang=en-US l10n=U 
oldref=12ahelp 
hid=DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_FREEINDEXESLists the 

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

[Caolán McNamara]

 helpers/help_hid.lst  |   13 -
 source/text/scalc/01/12090106.xhp |   24 
 2 files changed, 12 insertions(+), 25 deletions(-)

New commits:
commit a8efc0b9d4754b92e8e05309bbcdb335b74aad19
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Feb 14 20:16:34 2014 +

update help ids for data field options dialog .ui conversion

Change-Id: I69c495129b08e77b304d7abe9f6ca67f547d1720

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e49e346..2e81019 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3007,8 +3007,6 @@ HID_SC_DPDATEGROUP,59012,
 HID_SC_DPDATEGROUP_LB,59013,
 HID_SC_DPNUMGROUP,59011,
 HID_SC_DPSHOWDETAIL,59014,
-HID_SC_DPSUBT_HIDE,59010,
-HID_SC_DPSUBT_OPT,59009,
 HID_SC_DRAW_RENAME,59007,
 HID_SC_DROPMODE_COPY,58924,
 HID_SC_DROPMODE_LINK,58923,
@@ -5776,8 +5774,6 @@ sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_BORDER,1493533717,
 sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_FONT,1493533719,
 sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_NUMFORMAT,1493533716,
 sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_PATTERN,1493533720,
-sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_LAYOUT_EMPTY,1495401474,
-sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_SHOW,1495401475,
 sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_CASE,1493746690,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_REGEXP,1493746691,
@@ -5816,11 +5812,6 @@ sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290,
 sc_ListBox_RID_SCDLG_AUTOFORMAT_LB_FORMAT,1493536257,
 sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505,
 sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS,1495453194,
-sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_HIERARCHY,1495404041,
-sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_LAYOUT,1495404038,
-sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SHOW_FROM,1495404039,
-sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SHOW_USING,1495404040,
-sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SORT_BY,1495404037,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND1,1493749277,
@@ -5842,7 +5833,6 @@ sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576,
 sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
 sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
 sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364,
-sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW,1495406593,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
 sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_ADD,1493537385,
@@ -5866,9 +5856,6 @@ sc_RadioButton_RID_SCDLG_DPNUMGROUP_RB_AUTOEND,1495417347,
 sc_RadioButton_RID_SCDLG_DPNUMGROUP_RB_AUTOSTART,1495417345,
 sc_RadioButton_RID_SCDLG_DPNUMGROUP_RB_MANEND,1495417348,
 sc_RadioButton_RID_SCDLG_DPNUMGROUP_RB_MANSTART,1495417346,
-sc_RadioButton_RID_SCDLG_DPSUBTOTAL_OPT_RB_SORT_ASC,1495400964,
-sc_RadioButton_RID_SCDLG_DPSUBTOTAL_OPT_RB_SORT_DESC,1495400965,
-sc_RadioButton_RID_SCDLG_DPSUBTOTAL_OPT_RB_SORT_MAN,1495400966,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATE1904,957252107,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESC10,957252106,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESTD,957252105,
diff --git a/source/text/scalc/01/12090106.xhp 
b/source/text/scalc/01/12090106.xhp
index 46c0f81..91ce434 100644
--- a/source/text/scalc/01/12090106.xhp
+++ b/source/text/scalc/01/12090106.xhp
@@ -35,33 +35,33 @@
 bookmark_valuedata field options for pivot table/bookmark_value
 /bookmarkcommentmw changed hiding... entry/commentparagraph 
role=heading id=par_idN10542 xml-lang=en-US level=1 l10n=NEWData 
Field Options/paragraph
 paragraph role=paragraph id=par_idN10546 xml-lang=en-US l10n=NEWYou 
can specify additional options for column, row, and page data fields in the 
link href=text/scalc/01/12090105.xhppivot table/link./paragraph
-bookmark xml-lang=en-US 
branch=hid/sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SORT_BY id=bm_id6588335 
localize=false/paragraph role=heading id=par_idN10557 xml-lang=en-US 
level=2 l10n=NEWSort by/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/datafieldoptionsdialog/sortby id=bm_id6588335 
localize=false/paragraph role=heading id=par_idN10557 xml-lang=en-US 
level=2 l10n=NEWSort by/paragraph
 paragraph role=paragraph id=par_idN1055B xml-lang=en-US 
l10n=NEWahelp hid=1495387653Select the data field that you want to sort 
columns or rows by./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_ASC 
id=bm_id6422009 localize=false/paragraph role=heading id=par_idN1055E 
xml-lang=en-US level=3 l10n=NEWAscending/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/datafieldoptionsdialog/ascending 
id=bm_id6422009 localize=false/paragraph role=heading id=par_idN1055E 
xml-lang=en-US level=3 l10n=NEWAscending/paragraph
 paragraph role=paragraph id=par_idN10562 xml-lang=en-US 
l10n=CHGahelp hid=1495384580Sorts the values from the lowest value to 
the highest value. 

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

[Caolán McNamara]

 helpers/help_hid.lst   |   19 
 source/text/scalc/01/12090102.xhp  |   57 ++---
 source/text/shared/00/0001.xhp |2 -
 3 files changed, 30 insertions(+), 48 deletions(-)

New commits:
commit d5e02baa76eadb781a08d4cc9108288a055829d6
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Feb 13 10:09:39 2014 +

update help ids for pivot table .ui conversion

Change-Id: I0e7a61ed69a1ab0573148be5ca4a679926d79aa6

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 0f14f18..e49e346 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3005,11 +3005,6 @@ HID_SC_AUTOFMT_NAME,58921,
 HID_SC_CHANGES_COMMENT,58990,
 HID_SC_DPDATEGROUP,59012,
 HID_SC_DPDATEGROUP_LB,59013,
-HID_SC_DPLAY_COLUMN,59003,
-HID_SC_DPLAY_DATA,59005,
-HID_SC_DPLAY_PAGE,59002,
-HID_SC_DPLAY_ROW,59004,
-HID_SC_DPLAY_SELECT,59006,
 HID_SC_DPNUMGROUP,59011,
 HID_SC_DPSHOWDETAIL,59014,
 HID_SC_DPSUBT_HIDE,59010,
@@ -5787,12 +5782,6 @@ sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_CASE,1493746690,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_REGEXP,1493746691,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_UNIQUE,1493746689,
-sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DETECTCAT,2567504922,
-sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DRILLDOWN,2567504926,
-sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_FILTER,2567504925,
-sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_IGNEMPTYROWS,2567504921,
-sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALCOL,2567504923,
-sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALROW,2567504924,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CALC,957252625,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CASE,957252623,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609,
@@ -5815,16 +5804,12 @@ sc_Edit_RID_SCDLG_DAPISERVICE_ED_USER,1495336975,
 sc_Edit_RID_SCDLG_DPNUMGROUP_ED_BY,1495418883,
 sc_Edit_RID_SCDLG_DPNUMGROUP_ED_END,1495418882,
 sc_Edit_RID_SCDLG_DPNUMGROUP_ED_START,1495418881,
-sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_INAREA,2567505962,
-sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA,2567505943,
 sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637,
 sc_Edit_TP_VALIDATION_VALUES_EDT_MAX,548276233,
 sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231,
 sc_FloatingWindow_RID_SCDLG_TEAM,231304704,
 sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481,
 sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304,
-sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689,
-sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672,
 sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289,
 sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291,
 sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290,
@@ -5846,7 +5831,6 @@ sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_FIELD2,1493749273,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_FIELD3,1493749274,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP1,1493749275,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP2,1493749276,
-sc_ListBox_RID_SCDLG_PIVOT_LAYOUT_LB_OUTAREA,2567507478,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
@@ -5856,7 +5840,6 @@ sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
 sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576,
 sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
-sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE,2567516676,
 sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
 sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364,
 sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW,1495406593,
@@ -5868,8 +5851,6 @@ 
sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPOTHER,1495585284,
-sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS,2567508486,
-sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE,2567508485,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_DOC,1495667213,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET1,1495667315,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET2,1495667318,
diff --git a/source/text/scalc/01/12090102.xhp 
b/source/text/scalc/01/12090102.xhp
index cfb90ef..396b16c 100644
--- a/source/text/scalc/01/12090102.xhp
+++ b/source/text/scalc/01/12090102.xhp
@@ -31,6 +31,7 @@
 bookmark_valuepivot table function;drill down/bookmark_value
 /bookmark
 bookmark xml-lang=en-US branch=hid/.uno:DataPilotExec id=bm_id3154514 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/pivottablelayout/PivotTableLayout 
id=bm_id3154514 localize=false/
 paragraph xml-lang=en-US id=hd_id3149165 role=heading level=1 
l10n=U oldref=1Pivot Table/paragraph
   paragraph xml-lang=en-US id=par_id3155922 role=paragraph 
l10n=CHG oldref=13ahelp hid=.uno:DataPilotExecSpecify the layout of 
the table that is generated by the pivot table./ahelp/paragraph
   section id=howtoget
@@ 

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

[Caolán McNamara]

 helpers/help_hid.lst |5 -
 source/text/sbasic/guide/translation.xhp |9 +
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit d331784b77abd32c9a2b9de883bb480519b84dfc
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Feb 11 11:30:46 2014 +

update help ids for manage languages dialog

Change-Id: I7975c7ee7ccce9e6563cb0181441deeae08ee109

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f021fd2..76ef4f8 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -812,7 +812,6 @@ HID_BASICIDE_BRKPROPS,63558,
 HID_BASICIDE_DIALOGWINDOW,63562,
 HID_BASICIDE_EDITORWINDOW,63563,
 HID_BASICIDE_LIBS,63545,
-HID_BASICIDE_MANAGE_LANGUAGE,63571,
 HID_BASICIDE_MODULWINDOW,63561,
 HID_BASICIDE_OBJCAT_SHOW,63553,
 HID_BASICIDE_OBJECTCAT,63550,
@@ -5375,15 +5374,11 @@ WID_SIMPLE_REF,25728,.uno:SimpleReferenz
 basctl_Edit_RID_MACROCHOOSER_RID_ED_MACRONAME,1317865477,
 basctl_Edit_RID_MACROOPTIONS_RID_ED_HELPNAME,1317947404,
 basctl_FloatingWindow_RID_BASICIDE_OBJCAT,1855062016,
-basctl_ListBox_RID_DLG_MANAGE_LANGUAGE_LB_LANGUAGE,1343589890,
 basctl_ModalDialog_RID_MACROCHOOSER,1317863424,
 basctl_ModalDialog_RID_MACROOPTIONS,1317945344,
 basctl_MultiLineEdit_RID_MACROCHOOSER_RID_ML_DESCRIPTION,1317866000,
 basctl_MultiLineEdit_RID_MACROOPTIONS_RID_ME_DESCR,1317947911,
 basctl_NumericField_RID_MACROOPTIONS_RID_NF_HELPID,1317951498,
-basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_ADD_LANG,1343590915,
-basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_DEL_LANG,1343590916,
-basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_MAKE_DEFAULT,1343590917,
 basctl_PushButton_RID_MACROCHOOSER_RID_PB_ASSIGN,1317868045,
 basctl_PushButton_RID_MACROCHOOSER_RID_PB_DEL,1317868044,
 basctl_PushButton_RID_MACROCHOOSER_RID_PB_EDIT,1317868042,
diff --git a/source/text/sbasic/guide/translation.xhp 
b/source/text/sbasic/guide/translation.xhp
index a0d5370..4b871b9 100644
--- a/source/text/sbasic/guide/translation.xhp
+++ b/source/text/sbasic/guide/translation.xhp
@@ -38,10 +38,11 @@
 paragraph role=paragraph id=par_id4601940 xml-lang=en-US 
l10n=NEWahelp hid=.The Language toolbar in the Basic IDE dialog editor 
shows controls to enable and manage localizable dialogs./ahelp/paragraph
 paragraph role=paragraph id=par_id9538560 xml-lang=en-US l10n=NEWBy 
default, any dialog that you create only contains string resources for one 
language. You may want to create dialogs that automatically show localized 
strings according to the user's language settings./paragraph
 bookmark xml-lang=en-US branch=hid/.uno:CurrentLanguage id=bm_id9421979 
localize=false/paragraph role=paragraph id=par_id6998809 
xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenSelect the 
language for the strings that you want to edit. Click the Manage Languages icon 
to add languages./ahelp/paragraphcommentManage Language icon is in 
sbasic/shared/02/2000.xhp/comment
-bookmark xml-lang=en-US 
branch=hid/basctl:ListBox:RID_DLG_MANAGE_LANGUAGE:LB_LANGUAGE 
id=bm_id1646778 localize=false/paragraph role=paragraph 
id=par_id71413 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenClick a language, then click Default to set the language as 
default, or click Delete to remove the language from the 
list./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_ADD_LANG 
id=bm_id1228370 localize=false/paragraph role=paragraph 
id=par_id2924283 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenOpens a dialog where you can add a language to the 
list./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_DEL_LANG 
id=bm_id1601611 localize=false/paragraph role=paragraph 
id=par_id5781731 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenSelect a language in the list and click Delete to remove 
that language. When you remove all languages, the string resources for 
localizable dialogs are removed from all dialogs in the current 
library./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/BASCTL_PUSHBUTTON_RID_DLG_MANAGE_LANGUAGE_PB_MAKE_DEFAULT 
id=bm_id733359 localize=false/paragraph role=paragraph 
id=par_id6942045 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenSelect a language in the list and click Default to set the 
language as default language./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/BasicIDE/ui/managelanguages/ManageLanguagesDialog 
id=bm_id1646778 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/BasicIDE/ui/managelanguages/treeview id=bm_id1646778 
localize=false/paragraph role=paragraph id=par_id71413 xml-lang=en-US 
l10n=NEWahelp hid=. visibility=hiddenClick a language, then click 
Default to set the language as default, or click Delete to remove the language 
from the list./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/BasicIDE/ui/managelanguages/add id=bm_id1228370 
localize=false/paragraph role=paragraph id=par_id2924283 
xml-lang=en-US 

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

[Caolán McNamara]

 helpers/help_hid.lst   |5 -
 source/text/shared/01/02230200.xhp |   17 -
 2 files changed, 8 insertions(+), 14 deletions(-)

New commits:
commit b25ad898a35fc268897622a3068179da5f8d819b
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Feb 11 14:14:08 2014 +

update help ids for show changes dialog

Change-Id: I650a32f7b782ccc1233cfe2a304d475a442c8a3f

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 76ef4f8..b34d859 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5785,9 +5785,6 @@ sc_CheckBox_RID_SCDLG_CHARTCOLROW_1,1494516737,
 sc_CheckBox_RID_SCDLG_CHARTCOLROW_2,1494516738,
 sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_LAYOUT_EMPTY,1495401474,
 sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_SHOW,1495401475,
-sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT,2568963085,
-sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT_ACCEPT,2568963078,
-sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT_REJECT,2568963079,
 sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_CASE,1493746690,
 sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_REGEXP,1493746691,
@@ -5820,7 +5817,6 @@ sc_Edit_RID_SCDLG_DAPISERVICE_ED_USER,1495336975,
 sc_Edit_RID_SCDLG_DPNUMGROUP_ED_BY,1495418883,
 sc_Edit_RID_SCDLG_DPNUMGROUP_ED_END,1495418882,
 sc_Edit_RID_SCDLG_DPNUMGROUP_ED_START,1495418881,
-sc_Edit_RID_SCDLG_HIGHLIGHT_CHANGES_ED_ASSIGN,2568964111,
 sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_INAREA,2567505962,
 sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA,2567505943,
 sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637,
@@ -5829,7 +5825,6 @@ sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231,
 sc_FloatingWindow_RID_SCDLG_TEAM,231304704,
 sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481,
 sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304,
-sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672,
 sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289,
diff --git a/source/text/shared/01/02230200.xhp 
b/source/text/shared/01/02230200.xhp
index 36fd5a4..7c4dff7 100644
--- a/source/text/shared/01/02230200.xhp
+++ b/source/text/shared/01/02230200.xhp
@@ -35,9 +35,8 @@
 bookmark_valuehiding;changes/bookmark_value
 bookmark_valueshowing; changes/bookmark_value
 /bookmark
-bookmark xml-lang=en-US branch=hid/.uno:ShowTrackedChanges 
id=bm_id9726954 localize=false/!-- HID added by script --
-bookmark xml-lang=en-US branch=hid/.uno:ShowTrackedChanges 
id=bm_id3154349 localize=false/
-bookmark xml-lang=en-US branch=hid/.uno:ShowChanges id=bm_id3459113 
localize=false/!-- HID added by script --
+bookmark xml-lang=en-US branch=hid/.uno:ShowTrackedChanges 
id=bm_id9726954 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/showchangesdialog/ShowChangesDialog 
id=bm_id3154349 localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:ShowChanges id=bm_id3147240 
localize=false/
 paragraph role=heading id=hd_id3149988 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/01/02230200.xhp name=Show 
ChangesShow Changes/link/paragraph
 paragraph role=paragraph id=par_id3153323 xml-lang=en-US l10n=U 
oldref=2variable id=textahelp hid=.uno:ShowChangesShows or hides 
recorded changes./ahelp
@@ -47,21 +46,21 @@
 /section
 paragraph role=paragraph id=par_id3152425 xml-lang=en-US l10n=U 
oldref=7You can change the display properties of the markup elements by 
choosing switchinline select=applcaseinline select=WRITERlink 
href=text/shared/optionen/01060600.xhp name=Writer - 
Changesemph%PRODUCTNAME Writer - Changes/emph/link in the Options 
dialog box./caseinline/switchinlineswitchinline select=applcaseinline 
select=CALClink href=text/shared/optionen/01060600.xhp name=Calc - 
Changesemph%PRODUCTNAME Calc - Changes/emph/link in the Options dialog 
box./caseinline/switchinline/paragraph
 paragraph role=paragraph id=par_id3155356 xml-lang=en-US l10n=U 
oldref=6When you rest the mouse pointer over a change markup in the 
document, a emphTip/emph displays the author and the date and time that the 
change was made.switchinline select=applcaseinline select=CALC If the 
emphExtended Tips/emph are activated, the type of change and any attached 
comments are also displayed./caseinline/switchinline/paragraph
-bookmark xml-lang=en-US 
branch=hid/sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT 
id=bm_id3152551 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/showchangesdialog/showchanges id=bm_id3152551 
localize=false/
 paragraph role=heading id=hd_id3153681 xml-lang=en-US level=2 
l10n=U oldref=8switchinline select=applcaseinline select=CALCShow 
changes in spreadsheet/caseinline/switchinline/paragraph
-paragraph role=paragraph id=par_id3149150 xml-lang=en-US l10n=U 
oldref=9switchinline select=applcaseinline select=CALCahelp 
hid=SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHTShows or hides 
recorded 

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

[Caolán McNamara]

 helpers/help_hid.lst  |5 -
 source/text/shared/explorer/database/02010100.xhp |8 
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 7fd16de83847334bfb1fb80d89230f6cf34f74cb
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Feb 4 12:00:39 2014 +

update help ids for database save as dialog .ui conversion

Change-Id: I8bfff057e8a744dbd980b8bbae9e36e09e00fbb0

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2ef4096..80da13e 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1453,8 +1453,6 @@ HID_DLG_REL_CASC_UPD_DEFAULT,38990,
 HID_DLG_REL_CASC_UPD_NULL,38989,
 HID_DLG_REL_NO_CASC_DEL,38984,
 HID_DLG_REL_NO_CASC_UPD,38988,
-HID_DLG_RENAME,39005,
-HID_DLG_SAVE_AS,38845,
 HID_DLG_TEXT,38843,
 HID_DLG_WORDCOUNT,54987,
 HID_DOCINFO_EDT,33070,
@@ -5485,8 +5483,6 @@ 
dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
 dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN,851641349,
 dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_USEHEADERLINE,851641350,
 dbaccess_ComboBox_DLG_DBASE_INDEXES_CB_TABLES,1388335105,
-dbaccess_ComboBox_DLG_SAVE_AS_ET_CATALOG,1388498945,
-dbaccess_ComboBox_DLG_SAVE_AS_ET_SCHEMA,1388498946,
 dbaccess_ComboBox_TP_SAVE_DBDOC_AS_ED_SAVE_AS_LOCATION,851464193,
 dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589,
 dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588,
@@ -5498,7 +5494,6 @@ dbaccess_Edit_DLG_PARAMETERS_ET_PARAM,1388398596,
 dbaccess_Edit_DLG_PASSWORD_ED_OLDPASSWORD,1388693523,
 dbaccess_Edit_DLG_PASSWORD_ED_PASSWORD,1388693525,
 dbaccess_Edit_DLG_PASSWORD_ED_PASSWORD_REPEAT,1388693527,
-dbaccess_Edit_DLG_SAVE_AS_ET_TITLE,1388496899,
 dbaccess_Edit_PAGE_ADABAS_ET_CTRLPASSWORD,851527681,
 dbaccess_Edit_PAGE_ADABAS_ET_CTRLUSERNAME,851527682,
 dbaccess_Edit_PAGE_ADABAS_ET_HOSTNAME,851527685,
diff --git a/source/text/shared/explorer/database/02010100.xhp 
b/source/text/shared/explorer/database/02010100.xhp
index 2a832d1..a317ab7 100644
--- a/source/text/shared/explorer/database/02010100.xhp
+++ b/source/text/shared/explorer/database/02010100.xhp
@@ -125,10 +125,10 @@
 paragraph role=paragraph id=par_id3154479 xml-lang=en-US l10n=U 
oldref=22To remove a field name from the query, click the column header of 
the field and choose the emphDelete/emph command on the context menu for 
the column./paragraph
 paragraph role=heading id=hd_id3155764 xml-lang=en-US level=3 
l10n=U oldref=277Save query/paragraph
 paragraph role=paragraph id=par_id3148481 xml-lang=en-US l10n=U 
oldref=278Use the emphSave/emph icon on the Standard Bar to save the 
query. You see a dialog that asks you to enter a name for the query. If the 
database supports schemas, you can also enter a schema./paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:ComboBox:DLG_SAVE_AS:ET_SCHEMA id=bm_id3156378 
localize=false/paragraph role=heading id=hd_id3154362 xml-lang=en-US 
level=4 l10n=U oldref=279Schema/paragraph
-paragraph role=paragraph id=par_id3154754 xml-lang=en-US l10n=U 
oldref=280ahelp hid=DBACCESS_COMBOBOX_DLG_SAVE_AS_ET_SCHEMAEnter the 
name of the schema that is assigned to the query or table 
view./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/dbaccess:Edit:DLG_SAVE_AS:ET_TITLE 
id=bm_id3147340 localize=false/paragraph role=heading id=hd_id3156717 
xml-lang=en-US level=4 l10n=U oldref=281Query name or table view 
name/paragraph
-paragraph role=paragraph id=par_id3154253 xml-lang=en-US l10n=U 
oldref=282ahelp hid=DBACCESS_EDIT_DLG_SAVE_AS_ET_TITLEEnter the name of 
the query or table view./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/savedialog/schema 
id=bm_id3156378 localize=false/paragraph role=heading id=hd_id3154362 
xml-lang=en-US level=4 l10n=U oldref=279Schema/paragraph
+paragraph role=paragraph id=par_id3154754 xml-lang=en-US l10n=U 
oldref=280ahelp hid=dbaccess/ui/savedialog/schemaEnter the name of the 
schema that is assigned to the query or table view./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/savedialog/title 
id=bm_id3147340 localize=false/paragraph role=heading id=hd_id3156717 
xml-lang=en-US level=4 l10n=U oldref=281Query name or table view 
name/paragraph
+paragraph role=paragraph id=par_id3154253 xml-lang=en-US l10n=U 
oldref=282ahelp hid=dbaccess/ui/savedialog/titleEnter the name of the 
query or table view./ahelp/paragraph
 paragraph role=heading id=hd_id3163805 xml-lang=en-US level=3 
l10n=U oldref=23Filtering data/paragraph
 paragraph role=paragraph id=par_id3154964 xml-lang=en-US l10n=U 
oldref=24To filter data for the query, set the desired preferences in the 
lower area of the Design View. The following lines are available:/paragraph
 bookmark xml-lang=en-US branch=hid/DBACCESS_HID_QRYDGN_ROW_FIELD 
id=bm_id3148536 localize=false/paragraph role=heading id=hd_id3146916 
xml-lang=en-US level=4 l10n=U oldref=25Field/paragraph
___
Libreoffice-commits mailing list