summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@gnome.hu>2017-12-11 00:01:22 +0100
committerGabor Kelemen <kelemeng@ubuntu.com>2017-12-12 14:08:04 +0100
commitf7c555e40d979db2916a9e22be5b1782967904f3 (patch)
treeee19b4bea11be5e9753a651643afc0c95cec679a
parente0eed8146dd91534623b315e4066f344a6626dbb (diff)
Remove unnecessary page from Gallery context menus explanation
The confirmation window is a simple Yes/No now, no need to keep a whole page for this. Change-Id: I182d4937d049ae62e0b62180ed94115369aea2c7 Reviewed-on: https://gerrit.libreoffice.org/46268 Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com> Tested-by: Gabor Kelemen <kelemeng@ubuntu.com> (cherry picked from commit 83d2ccb8248fbe24ccb0206b60d6f15c439f07f6) Reviewed-on: https://gerrit.libreoffice.org/46298
-rw-r--r--AllLangHelp_shared.mk1
-rw-r--r--source/text/shared/00/00000010.xhp2
-rw-r--r--source/text/shared/01/03150100.xhp46
3 files changed, 1 insertions, 48 deletions
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index fe7a85d803..e1b0bfdca7 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -142,7 +142,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/01/03050000 \
helpcontent2/source/text/shared/01/03060000 \
helpcontent2/source/text/shared/01/03110000 \
- helpcontent2/source/text/shared/01/03150100 \
helpcontent2/source/text/shared/01/03170000 \
helpcontent2/source/text/shared/01/03990000 \
helpcontent2/source/text/shared/01/04050000 \
diff --git a/source/text/shared/00/00000010.xhp b/source/text/shared/00/00000010.xhp
index 1d13d1e6da..0e3e59413a 100644
--- a/source/text/shared/00/00000010.xhp
+++ b/source/text/shared/00/00000010.xhp
@@ -53,7 +53,7 @@
</section>
<section id="loeschen">
<bookmark branch="hid/SID_EXPLORERCONTENT_DESTROY" xml-lang="en-US" id="bm_id3155355" localize="false"/><paragraph role="heading" level="2" id="hd_id3148620" xml-lang="en-US">Delete</paragraph>
- <paragraph role="paragraph" id="par_id3154317" xml-lang="en-US"><ahelp visibility="visible" hid="SID_EXPLORERCONTENT_DESTROY">Deletes the current selection. If multiple objects are selected, all will be deleted. In most cases, a <link href="text/shared/01/03150100.xhp" name="security query">security query</link> appears before objects are deleted.</ahelp></paragraph>
+ <paragraph role="paragraph" id="par_id3154317" xml-lang="en-US"><ahelp visibility="visible" hid="SID_EXPLORERCONTENT_DESTROY">Deletes the current selection. If multiple objects are selected, all will be deleted. In most cases, a confirmation question appears before objects are deleted.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US">The object is either physically deleted from the data carrier or the object display is removed, depending on context.</paragraph>
</section>
<section id="loeschen2">
diff --git a/source/text/shared/01/03150100.xhp b/source/text/shared/01/03150100.xhp
deleted file mode 100644
index 241ca35ffc..0000000000
--- a/source/text/shared/01/03150100.xhp
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0103150100xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Confirm Delete</title>
-<filename>/text/shared/01/03150100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-
-
- <!-- removed HID SFX2:MODALDIALOG:DLG_SFX_QUERYDELETE --><paragraph role="heading" level="1" id="hd_id3150278" xml-lang="en-US">Confirm Delete</paragraph>
- <paragraph role="paragraph" id="par_id3148668" xml-lang="en-US"><ahelp hid="SFX2:MODALDIALOG:DLG_SFX_QUERYDELETE" visibility="visible">Confirms or cancels the deletion.</ahelp></paragraph>
- <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_YES --><paragraph role="heading" level="2" id="hd_id3152821" xml-lang="en-US">Delete</paragraph>
- <paragraph role="paragraph" id="par_id3150040" xml-lang="en-US"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_YES" visibility="visible">Performs the deletion in the current file.</ahelp></paragraph>
- <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_ALL --><paragraph role="heading" level="2" id="hd_id3149999" xml-lang="en-US">Delete All</paragraph>
- <paragraph role="paragraph" id="par_id3155616" xml-lang="en-US"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_ALL" visibility="visible">Performs the deletion in all selected files.</ahelp></paragraph>
- <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_NO --><paragraph role="heading" level="2" id="hd_id3157991" xml-lang="en-US">Do Not Delete</paragraph>
- <paragraph role="paragraph" id="par_id3147043" xml-lang="en-US"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_NO" visibility="visible">Rejects the deletion for the current file.</ahelp></paragraph>
- <paragraph role="heading" level="2" id="hd_id3149346" xml-lang="en-US">Cancel</paragraph>
- <paragraph role="paragraph" id="par_id3148620" xml-lang="en-US">Cancels the deletion in the current file and any other selected files.</paragraph>
- </body>
-</helpdocument>