source/text/scalc/01/func_aggregate.xhp  |    4 ++--
 source/text/shared/optionen/01011000.xhp |   11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit f8d42fe73a9a27a17ee421ef63340ac41eeb2539
Author: Gabor Kelemen <kelem...@gnome.hu>
Date:   Thu Sep 15 22:13:44 2016 +0200

    tdf#99885 Fix example on using the AGGREGATE function
    
    Change-Id: I27b783c937c7ad44839803f3fd7810a4d03a3d87
    Reviewed-on: https://gerrit.libreoffice.org/28936
    Reviewed-by: jan iversen <j...@documentfoundation.org>
    Tested-by: jan iversen <j...@documentfoundation.org>

diff --git a/source/text/scalc/01/func_aggregate.xhp 
b/source/text/scalc/01/func_aggregate.xhp
index a846bee..2520607 100644
--- a/source/text/scalc/01/func_aggregate.xhp
+++ b/source/text/scalc/01/func_aggregate.xhp
@@ -427,7 +427,7 @@
   </tablerow>
 </table>
 
-<paragraph id="par_id230920152006414" role="paragraph" xml-lang="en-US"><item 
type="input">=AGGREGATE(4;1;A2:A9)</item><br/>Returns maximum value for the 
range A2:A9 =34, whereas <item type="input">=MAX(A2:A9)</item> returns the 
error Err:511.</paragraph>
+<paragraph id="par_id230920152006414" role="paragraph" xml-lang="en-US"><item 
type="input">=AGGREGATE(4;2;A2:A9)</item><br/>Returns maximum value for the 
range A2:A9 =34, whereas <item type="input">=MAX(A2:A9)</item> returns the 
error Err:511.</paragraph>
 <paragraph id="par_id2309201520064180" role="paragraph" xml-lang="en-US"><item 
type="input">=AGGREGATE(9;5;A5:C5)</item><br/>Returns sum for the range A5:C5 
=29, even if some of the columns are hidden.</paragraph>
 <paragraph id="par_id2309201520064118" role="paragraph" xml-lang="en-US"><item 
type="input">=AGGREGATE(9;5;B2:B9)</item><br/>Returns sum of the column B =115. 
If any row is hidden, the function omit its value, for example if the 7th row 
is hidden, the function returns 95.</paragraph>
 <paragraph id="par_id196152404026557" role="paragraph" xml-lang="en-US">If you 
need to apply the function with a 3-D range, this example shows how to do 
it.</paragraph>
@@ -441,4 +441,4 @@
 </section>
 </body>
 
-</helpdocument>
\ No newline at end of file
+</helpdocument>
commit 25ddb95121b787fc523c60b838eee35f3c25b814
Author: Stanislav Horacek <stanislav.hora...@gmail.com>
Date:   Fri Sep 16 18:19:29 2016 +0200

    rename "Graphics cache" to "Image cache"
    
    Change-Id: I4fa5fdfc352a352c56972c9784422703a231579d
    Reviewed-on: https://gerrit.libreoffice.org/28968
    Reviewed-by: jan iversen <j...@documentfoundation.org>
    Tested-by: jan iversen <j...@documentfoundation.org>

diff --git a/source/text/shared/optionen/01011000.xhp 
b/source/text/shared/optionen/01011000.xhp
index e529076..21fafa9 100644
--- a/source/text/shared/optionen/01011000.xhp
+++ b/source/text/shared/optionen/01011000.xhp
@@ -32,25 +32,26 @@
 <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" 
l10n="U" oldref="25"><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 graphics 
cache.</ahelp></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" 
l10n="U" oldref="10">Graphics cache</paragraph>
-<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" 
oldref="11">The graphics cache saves the graphics contained in a document in 
your computer's main memory. This means that the attributes of a graphic stored 
in the cache do not have to be re-calculated if you return to the page 
containing the graphic after scrolling through a document.</paragraph>
+<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" l10n="U" oldref="12">Use for $[officename] 
(MB)</paragraph>
-<paragraph role="paragraph" id="par_id3152813" xml-lang="en-US" l10n="U" 
oldref="13"><ahelp hid="cui/ui/optmemorypage/graphiccache">Specifies the total 
cache size for all graphics.</ahelp></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" l10n="U" oldref="14">Memory per object 
(MB)</paragraph>
 <paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" 
oldref="15"><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" l10n="U" oldref="16">Remove from memory after 
(hh:mm)</paragraph>
-<paragraph role="paragraph" id="par_id3148674" xml-lang="en-US" l10n="U" 
oldref="17"><ahelp hid="cui/ui/optmemorypage/objecttime">Specifies the time 
that each graphic remains in the cache in hours and minutes.</ahelp></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" 
l10n="U" oldref="18">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" l10n="U" oldref="19">Number of objects</paragraph>
 <paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" 
oldref="20"><ahelp hid="cui/ui/optmemorypage/olecache">Choose the maximum 
number of OLE objects that are pooled in the cache.</ahelp></paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to