summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-11-18 14:10:31 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-11-18 14:10:31 +0000
commitbd79eebd63807c29ef7509516291635efecd246a (patch)
tree65b7172ba1260aa743eeb64505400562c007ca7a
parentf3a5452927181f245084721c7ed0fc6047bf70e7 (diff)
update help ids for alien warn dialog .ui conversion
Change-Id: If0a55a3048f66afb4b8faf9f09f0a1841d75ec3f
-rw-r--r--helpers/help_hid.lst2
-rw-r--r--source/text/shared/optionen/01010200.xhp2
2 files changed, 1 insertions, 3 deletions
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 27e7096258..a3bf5c8e7b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3709,7 +3709,6 @@ HID_VS_BULLET,52982,
HID_VS_NUM,52981,
HID_VS_NUMBMP,52983,
HID_VS_RULER,52984,
-HID_WARNING_ALIENFORMAT,33388,
HID_WARNING_SECURITY_HYPERLINK,33374,
HID_WIZARD_NEXT,33022,
HID_WIZARD_PREVIOUS,33023,
@@ -6431,7 +6430,6 @@ 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_DLG_ALIEN_WARNING_CB_WARNING_OFF,1111557136,
sfx2_CheckBox_RID_DLG_SEARCH_CB_BACKWARDS,2187084816,
sfx2_CheckBox_RID_DLG_SEARCH_CB_MATCHCASE,2187084814,
sfx2_CheckBox_RID_DLG_SEARCH_CB_WHOLEWORDS,2187084813,
diff --git a/source/text/shared/optionen/01010200.xhp b/source/text/shared/optionen/01010200.xhp
index c4ac9957dc..0745f0bcf4 100644
--- a/source/text/shared/optionen/01010200.xhp
+++ b/source/text/shared/optionen/01010200.xhp
@@ -157,7 +157,7 @@
<paragraph xml-lang="en-US" id="par_id7198400" role="paragraph" l10n="CHG"><ahelp hid=".">Some companies or organizations may require ODF documents in the ODF 1.0/1.1 format. You can select that format to save in the listbox. This older format cannot store all new features, so the new format ODF 1.2 (Extended) is recommended where possible.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id7198401" role="paragraph">The ODF 1.2 Extended (compat) mode is a more backward-compatible ODF 1.2 extended mode. It uses features that are deprecated in ODF1.2 and/or it is 'bug-compatible' to older OpenOffice.org versions. It may be useful, if you need to interchange ODF documents with users, who use pre-ODF1.2 or ODF1.2-only legacy applications.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/warnalienformat" id="bm_id6262092" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF" id="bm_id7885982" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/alienwarndialog/ask" id="bm_id7885982" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1091E" role="heading" level="3" l10n="CHG">Warn when not saving in ODF or default format</paragraph>
<paragraph xml-lang="en-US" id="par_idN10922" role="paragraph" l10n="CHG"><ahelp hid=".">You can choose to get a warning message when you save a document in a format that is not OpenDocument or which you did not set as default format in <emph>Load/Save - General</emph> in the Options dialog box.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3158444" role="paragraph" l10n="U" oldref="62">You can choose which file format will be applied as the default when saving documents of various document types. If you always exchange your documents with other persons who use Microsoft Office, for example, you may specify here that %PRODUCTNAME only uses the Microsoft Office file formats as a default.</paragraph>