[Libreoffice-commits] help.git: AllLangHelp_shared.mk source/auxiliary source/text
Olivier Hallot
olivier.hallot at libreoffice.org
Wed Sep 20 20:49:37 UTC 2017
AllLangHelp_shared.mk | 1
source/auxiliary/shared.tree | 1
source/text/shared/01/04150100.xhp | 1
source/text/shared/guide/undo_formatting.xhp | 3 -
source/text/shared/optionen/01010000.xhp | 1
source/text/shared/optionen/01011000.xhp | 65 ---------------------------
6 files changed, 72 deletions(-)
New commits:
commit 73f7d3200315ff913d5880d6cc6e392e730c82ef
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date: Wed Sep 20 16:51:39 2017 -0300
tdf#111083 Memory settings help page is gone too
Delete help pages related to memory settings in Options
Change-Id: Ifcb66ef4bf404b8e942bf44caa6072a01147ad22
Reviewed-on: https://gerrit.libreoffice.org/42563
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 09a07ef48..fe7a85d80 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -824,7 +824,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/optionen/01010700 \
helpcontent2/source/text/shared/optionen/01010800 \
helpcontent2/source/text/shared/optionen/01010900 \
- helpcontent2/source/text/shared/optionen/01011000 \
helpcontent2/source/text/shared/optionen/01012000 \
helpcontent2/source/text/shared/optionen/01013000 \
helpcontent2/source/text/shared/optionen/01020000 \
diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree
index a54954b9f..1d24b106f 100644
--- a/source/auxiliary/shared.tree
+++ b/source/auxiliary/shared.tree
@@ -48,7 +48,6 @@
<topic id="shared/text/shared/optionen/01010700.xhp">Fonts</topic>
<topic id="shared/text/shared/optionen/01010800.xhp">View</topic>
<topic id="shared/text/shared/optionen/01010900.xhp">Print Options</topic>
-<topic id="shared/text/shared/optionen/01011000.xhp">Memory</topic>
<topic id="shared/text/shared/optionen/01012000.xhp">Application Colors</topic>
<topic id="shared/text/shared/optionen/01013000.xhp">Accessibility</topic>
<topic id="shared/text/shared/optionen/java.xhp">Advanced</topic>
diff --git a/source/text/shared/01/04150100.xhp b/source/text/shared/01/04150100.xhp
index 647636f3d..07fa0f01f 100644
--- a/source/text/shared/01/04150100.xhp
+++ b/source/text/shared/01/04150100.xhp
@@ -40,7 +40,6 @@
<section id="howtoget">
<embed href="text/shared/00/00000404.xhp#objektole"/>
</section>
-<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US">To speed up the display of the document, OLE objects are kept in the program cache. If you want to change the cache settings, choose <link href="text/shared/optionen/01011000.xhp" name="Tools - Options - $[officename] - Memory"><emph>Tools - Options - $[officename] - Memory</emph></link>.</paragraph>
<paragraph role="note" id="par_id3145314" xml-lang="en-US">You cannot use the clipboard or drag and drop to move OLE objects to other files.</paragraph>
<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US">Empty and inactive OLE objects are transparent.</paragraph>
<paragraph role="heading" id="hd_id3149178" xml-lang="en-US" level="2">Create new</paragraph>
diff --git a/source/text/shared/guide/undo_formatting.xhp b/source/text/shared/guide/undo_formatting.xhp
index 4a37f3760..faea762d9 100644
--- a/source/text/shared/guide/undo_formatting.xhp
+++ b/source/text/shared/guide/undo_formatting.xhp
@@ -74,8 +74,5 @@
<paragraph role="paragraph" id="par_idN1075E" xml-lang="en-US">Choose <emph>Format - Clear Direct Formatting</emph>.</paragraph>
</listitem>
</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN107B0" xml-lang="en-US"><link href="text/shared/optionen/01011000.xhp">Undo Options</link></paragraph>
-</section>
</body>
</helpdocument>
diff --git a/source/text/shared/optionen/01010000.xhp b/source/text/shared/optionen/01010000.xhp
index 53c3cde48..996b5e149 100644
--- a/source/text/shared/optionen/01010000.xhp
+++ b/source/text/shared/optionen/01010000.xhp
@@ -36,7 +36,6 @@
</section>
<embed href="text/shared/optionen/01010100.xhp#allgemeines"/>
<embed href="text/shared/optionen/01010600.xhp#allg"/>
- <embed href="text/shared/optionen/01011000.xhp#arbeit"/>
<embed href="text/shared/optionen/01010800.xhp#ansicht"/>
<embed href="text/shared/optionen/01010900.xhp#drucken"/>
<embed href="text/shared/optionen/01010300.xhp#pfade"/>
diff --git a/source/text/shared/optionen/01011000.xhp b/source/text/shared/optionen/01011000.xhp
deleted file mode 100644
index 95436fa81..000000000
--- a/source/text/shared/optionen/01011000.xhp
+++ /dev/null
@@ -1,65 +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="textsharedoptionen01011000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Memory</title>
-<filename>/text/shared/optionen/01011000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="arbeit">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153881">
-<bookmark_value>graphics; cache</bookmark_value>
-<bookmark_value>images; cache</bookmark_value>
-<bookmark_value>cache for graphics</bookmark_value>
-<bookmark_value>Quickstarter</bookmark_value>
-<bookmark_value>undoing; number of steps</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/OptMemoryPage" id="bm_id8346202" localize="false"/>
-<paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="1"><link href="text/shared/optionen/01011000.xhp" name="Memory">Memory</link></paragraph>
-<paragraph role="paragraph" id="par_id3154307" xml-lang="en-US"><ahelp hid=".">This tab page lets you define various settings for the image cache.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#arbeit"/>
-</section>
-<paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="2">Image cache</paragraph>
-<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US">The image cache saves the images contained in a document in your computer's main memory. This means that the attributes of an image stored in the cache do not have to be re-calculated if you return to the page containing the image after scrolling through a document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/graphiccache" id="bm_id8346201" localize="false"/><paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3">Use for $[officename] (MB)</paragraph>
-<paragraph role="paragraph" id="par_id3152813" xml-lang="en-US"><ahelp hid="cui/ui/optmemorypage/graphiccache">Specifies the total cache size for all images.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/objectcache" id="bm_id3981749" localize="false"/><paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3">Memory per object (MB)</paragraph>
-<paragraph role="paragraph" id="par_id3148797" xml-lang="en-US"><ahelp hid="cui/ui/optmemorypage/objectcache">Specifies that objects which are larger than the selected megabytes will not be placed in the cache.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/objecttime" id="bm_id1587878" localize="false"/><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="3">Remove from memory after (hh:mm)</paragraph>
-<paragraph role="paragraph" id="par_id3148674" xml-lang="en-US"><ahelp hid="cui/ui/optmemorypage/objecttime">Specifies the time that each image remains in the cache in hours and minutes.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156212" xml-lang="en-US" level="2">Cache for inserted objects</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/olecache" id="bm_id5088045" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3">Number of objects</paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US"><ahelp hid="cui/ui/optmemorypage/olecache">Choose the maximum number of OLE objects that are pooled in the cache.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="2">$[officename] Quickstarter</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/systray" id="bm_id4756005" localize="false"/><bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/quicklaunch" id="bm_id4756004" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3"><switchinline select="sys"><caseinline select="WIN">Load $[officename] during system start-up
-</caseinline><defaultinline>Enable systray Quickstarter</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US"><ahelp hid="cui/ui/optmemorypage/objectcache">Mark this check box if you want $[officename] to enable quickstart. This option is available if the Quickstart module has been installed.</ahelp><comment>UFI: had to remove explanation because on Windows it is at start-up, while on Unix it is a user-systray feature only. Cannot have switches inside AHID text.</comment></paragraph>
-<paragraph role="heading" id="hd_id3155390" xml-lang="en-US" level="2">Number of undo steps</paragraph>
-<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US">The number of steps which can be undone can be changed in the <link href="text/shared/optionen/expertconfig.xhp">Expert configuration</link> by setting the property <emph>/org.openoffice.Office.Common/Undo Steps</emph>.</paragraph>
-</body>
-</helpdocument>
More information about the Libreoffice-commits
mailing list