source/media/screenshots/cui/ui/charnamepage/CharNamePage.png                  
        |binary
 source/media/screenshots/cui/ui/pageformatpage/PageFormatPage.png              
        |binary
 source/media/screenshots/modules/scalc/ui/deletecells/DeleteCellsDialog.png    
        |binary
 source/media/screenshots/modules/sdraw/ui/dlgsnap/SnapObjectDialog.png         
        |binary
 
source/media/screenshots/modules/simpress/ui/headerfooterdialog/HeaderFooterDialog.png
 |binary
 source/text/scalc/01/02160000.xhp                                              
        |    1 +
 source/text/scalc/01/04060109.xhp                                              
        |    8 ++++----
 source/text/shared/01/05020100.xhp                                             
        |    1 +
 source/text/shared/01/05040200.xhp                                             
        |    2 ++
 source/text/simpress/01/03152000.xhp                                           
        |    1 +
 source/text/simpress/01/04030000.xhp                                           
        |    1 +
 11 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 939edb112114cf3e740012a429d1f69a0d1d9bdb
Author: Gabor Kelemen <kelem...@gnome.hu>
Date:   Mon Sep 19 09:58:08 2016 +0200

    tdf#97823 Change VLOOKUP parameter SortOrder to Sorted
    
    Sync with HLOOKUP's Sorted parameter. This is a boolean
    indicating if the data is sorted or not, not the order
    like ascending or descending.
    
    Change-Id: Ic48de6597c6b1997502c4dffb4a5bb15cbe49d74
    Reviewed-on: https://gerrit.libreoffice.org/29013
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Eike Rathke <er...@redhat.com>

diff --git a/source/text/scalc/01/04060109.xhp 
b/source/text/scalc/01/04060109.xhp
index a9061fc..f1af725 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -296,11 +296,11 @@
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_SVERWEIS" id="bm_id3152809" 
localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153152" role="heading" level="2" l10n="U"
                     oldref="87">VLOOKUP</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3149984" role="paragraph" 
l10n="CHG" oldref="88"><ahelp hid="HID_FUNC_SVERWEIS">Vertical search with 
reference to adjacent cells to the right.</ahelp> This function checks if a 
specific value is contained in the first column of an array. The function then 
returns the value in the same row of the column named by <item 
type="literal">Index</item>. If the <item type="literal">SortOrder</item> 
parameter is omitted or set to TRUE or one, it is assumed that the data is 
sorted in ascending order. In this case, if the exact <item 
type="literal">SearchCriterion</item> is not found, the last value that is 
smaller than the criterion will be returned. If <item 
type="literal">SortOrder</item> is set to FALSE or zero, an exact match must be 
found, otherwise the error <emph>Error: Value Not Available</emph> will be the 
result. Thus with a value of zero the data does not need to be sorted in 
ascending order.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149984" role="paragraph" 
l10n="CHG" oldref="88"><ahelp hid="HID_FUNC_SVERWEIS">Vertical search with 
reference to adjacent cells to the right.</ahelp> This function checks if a 
specific value is contained in the first column of an array. The function then 
returns the value in the same row of the column named by <item 
type="literal">Index</item>. If the <item type="literal">Sorted</item> 
parameter is omitted or set to TRUE or one, it is assumed that the data is 
sorted in ascending order. In this case, if the exact <item 
type="literal">SearchCriterion</item> is not found, the last value that is 
smaller than the criterion will be returned. If <item 
type="literal">Sorted</item> is set to FALSE or zero, an exact match must be 
found, otherwise the error <emph>Error: Value Not Available</emph> will be the 
result. Thus with a value of zero the data does not need to be sorted in 
ascending order.</paragraph>
          <embed href="text/shared/00/00000001.xhp#regulaer"/>
          <paragraph xml-lang="en-US" id="hd_id3146898" role="heading" 
level="3" l10n="U"
                     oldref="89">Syntax</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3150156" role="code" l10n="U" 
oldref="90">=VLOOKUP(SearchCriterion; Array; Index; SortOrder)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150156" role="code" l10n="U" 
oldref="90">=VLOOKUP(SearchCriterion; Array; Index; Sorted)</paragraph>
          <paragraph xml-lang="en-US" id="par_id3149289" role="paragraph" 
l10n="U" oldref="91">
             <emph>SearchCriterion</emph> is the value searched for in the 
first column of the array.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153884" role="paragraph" 
l10n="U" oldref="92">
@@ -308,11 +308,11 @@
          <paragraph xml-lang="en-US" id="par_id3156005" role="paragraph" 
l10n="U" oldref="93">
             <emph>Index</emph> is the number of the column in the array that 
contains the value to be returned. The first column has the number 
1.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3151208" role="paragraph" 
l10n="U" oldref="94">
-            <emph>SortOrder</emph> is an optional parameter that indicates 
whether the first column in the array is sorted in ascending order. Enter the 
Boolean value FALSE or zero if the first column is not sorted in ascending 
order. Sorted columns can be searched much faster and the function always 
returns a value, even if the search value was not matched exactly, if it is 
between the lowest and highest value of the sorted list. In unsorted lists, the 
search value must be matched exactly. Otherwise the function will return this 
message: <emph>Error: Value Not Available</emph>.</paragraph>
+            <emph>Sorted</emph> is an optional parameter that indicates 
whether the first column in the array is sorted in ascending order. Enter the 
Boolean value FALSE or zero if the first column is not sorted in ascending 
order. Sorted columns can be searched much faster and the function always 
returns a value, even if the search value was not matched exactly, if it is 
between the lowest and highest value of the sorted list. In unsorted lists, the 
search value must be matched exactly. Otherwise the function will return this 
message: <emph>Error: Value Not Available</emph>.</paragraph>
          <embed href="text/scalc/05/empty_cells.xhp#empty_cells"/>
          <paragraph xml-lang="en-US" id="hd_id3147487" role="heading" 
level="3" l10n="U"
                     oldref="95">Example</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3154129" role="paragraph" 
l10n="U" oldref="96">You want to enter the number of a dish on the menu in cell 
A1, and the name of the dish is to appear as text in the neighboring cell (B1) 
immediately. The Number to Name assignment is contained in the D1:E100 array. 
D1 contains <item type="input">100</item>, E1 contains the name <item 
type="input">Vegetable Soup</item>, and so forth, for 100 menu items. The 
numbers in column D are sorted in ascending order; thus, the optional <item 
type="literal">SortOrder</item> parameter is not necessary.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154129" role="paragraph" 
l10n="U" oldref="96">You want to enter the number of a dish on the menu in cell 
A1, and the name of the dish is to appear as text in the neighboring cell (B1) 
immediately. The Number to Name assignment is contained in the D1:E100 array. 
D1 contains <item type="input">100</item>, E1 contains the name <item 
type="input">Vegetable Soup</item>, and so forth, for 100 menu items. The 
numbers in column D are sorted in ascending order; thus, the optional <item 
type="literal">Sorted</item> parameter is not necessary.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3145663" role="paragraph" 
l10n="U" oldref="97">Enter the following formula in B1:</paragraph>
          <paragraph xml-lang="en-US" id="par_id3151172" role="paragraph" 
l10n="U" oldref="98">
             <item type="input">=VLOOKUP(A1;D1:E100;2)</item>
commit da9f009d25a28d75b0c8dabdf57c0e72e505941e
Author: Katarina Behrens <katarina.behr...@cib.de>
Date:   Fri Sep 2 11:27:36 2016 +0200

    Add couple of screenshots to help files
    
    Change-Id: I5cfe4c7bb48c588aaecb1e9299e8e2b59c680fda
    Reviewed-on: https://gerrit.libreoffice.org/28613
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Eike Rathke <er...@redhat.com>

diff --git a/source/media/screenshots/cui/ui/charnamepage/CharNamePage.png 
b/source/media/screenshots/cui/ui/charnamepage/CharNamePage.png
new file mode 100644
index 0000000..51d9972
Binary files /dev/null and 
b/source/media/screenshots/cui/ui/charnamepage/CharNamePage.png differ
diff --git a/source/media/screenshots/cui/ui/pageformatpage/PageFormatPage.png 
b/source/media/screenshots/cui/ui/pageformatpage/PageFormatPage.png
new file mode 100644
index 0000000..f2fded7
Binary files /dev/null and 
b/source/media/screenshots/cui/ui/pageformatpage/PageFormatPage.png differ
diff --git 
a/source/media/screenshots/modules/scalc/ui/deletecells/DeleteCellsDialog.png 
b/source/media/screenshots/modules/scalc/ui/deletecells/DeleteCellsDialog.png
new file mode 100644
index 0000000..159c99b
Binary files /dev/null and 
b/source/media/screenshots/modules/scalc/ui/deletecells/DeleteCellsDialog.png 
differ
diff --git 
a/source/media/screenshots/modules/sdraw/ui/dlgsnap/SnapObjectDialog.png 
b/source/media/screenshots/modules/sdraw/ui/dlgsnap/SnapObjectDialog.png
new file mode 100644
index 0000000..dadbfd1
Binary files /dev/null and 
b/source/media/screenshots/modules/sdraw/ui/dlgsnap/SnapObjectDialog.png differ
diff --git 
a/source/media/screenshots/modules/simpress/ui/headerfooterdialog/HeaderFooterDialog.png
 
b/source/media/screenshots/modules/simpress/ui/headerfooterdialog/HeaderFooterDialog.png
new file mode 100644
index 0000000..38afa5b
Binary files /dev/null and 
b/source/media/screenshots/modules/simpress/ui/headerfooterdialog/HeaderFooterDialog.png
 differ
diff --git a/source/text/scalc/01/02160000.xhp 
b/source/text/scalc/01/02160000.xhp
index db7c945..7b13670 100644
--- a/source/text/scalc/01/02160000.xhp
+++ b/source/text/scalc/01/02160000.xhp
@@ -51,6 +51,7 @@
    <embed href="text/scalc/00/00000402.xhp#bzelo"/>
 
   </section>
+  <paragraph id="par_id082520160232335032" role="paragraph" 
xml-lang="en-US"><image id="img_id083120161149318932" 
src="media/screenshots/modules/scalc/ui/deletecells/DeleteCellsDialog.png" 
width="3.3126in" height="1.5209in"><alt xml-lang="en-US" 
id="alt_id083120161149318932">Delete cells dialog</alt></image></paragraph>
   <paragraph xml-lang="en-US" id="hd_id3149121" role="heading" level="2" 
l10n="U" oldref="3">Selection</paragraph>
   <paragraph xml-lang="en-US" id="par_id3150751" role="paragraph" l10n="U" 
oldref="4">This area contains options for specifying how sheets are displayed 
after deleting cells.</paragraph>
 
diff --git a/source/text/shared/01/05020100.xhp 
b/source/text/shared/01/05020100.xhp
index 1557a50..07e343c 100644
--- a/source/text/shared/01/05020100.xhp
+++ b/source/text/shared/01/05020100.xhp
@@ -71,6 +71,7 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/eastfontnamelb" 
id="bm_id3159158" localize="false"/>
 <bookmark xml-lang="en-US" 
branch="hid/cui/ui/charnamepage/westfontnamelb-nocjk" id="bm_id3149795" 
localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/ctlfontnamelb" 
id="bm_id3155419" localize="false"/>
+<paragraph id="par_id083120160609088310" role="paragraph" 
xml-lang="en-US"><image id="img_id083120160608495768" 
src="media/screenshots/cui/ui/charnamepage/CharNamePage.png" width="9.0417in" 
height="6.9791in"><alt xml-lang="en-US" id="alt_id083120160608495768">Font 
dialog</alt></image></paragraph>
 <paragraph role="heading" id="hd_id3148686" xml-lang="en-US" level="2" 
l10n="U" oldref="4">Font</paragraph>
 <paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" 
oldref="7"><ahelp hid="cui/ui/charnamepage/ctlfontnamelb">Enter the name of an 
installed font that you want to use, or select a font from the 
list.</ahelp></paragraph>
 <embed href="text/shared/02/02020000.xhp#vorschautext"/>
diff --git a/source/text/shared/01/05040200.xhp 
b/source/text/shared/01/05040200.xhp
index 6f081c7..4bde240 100644
--- a/source/text/shared/01/05040200.xhp
+++ b/source/text/shared/01/05040200.xhp
@@ -46,6 +46,8 @@
 <section id="howtoget">
 <embed href="text/shared/00/00040500.xhp#seite"/>
 </section>
+<paragraph id="par_id090120160133439102" role="paragraph" 
xml-lang="en-US"><image id="img_id090120160131201466" 
src="media/screenshots/cui/ui/pageformatpage/PageFormatPage.png" 
+width="8.6457in" height="5.9063in"><alt xml-lang="en-US" 
id="alt_id090120160131201466">Page format tab page</alt></image></paragraph>
 <embed href="text/shared/guide/pageformat_max.xhp#pageformat_max"/>
 <paragraph role="heading" id="hd_id3149549" xml-lang="en-US" level="2" 
l10n="U" oldref="31">Paper format</paragraph>
 <paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" 
oldref="32">Select from a list of predefined paper sizes, or define a custom 
paper format.</paragraph>
diff --git a/source/text/simpress/01/03152000.xhp 
b/source/text/simpress/01/03152000.xhp
index cf5fa5a..2ab7178 100644
--- a/source/text/simpress/01/03152000.xhp
+++ b/source/text/simpress/01/03152000.xhp
@@ -60,6 +60,7 @@
 <paragraph role="paragraph" id="par_idN106AF" xml-lang="en-US" l10n="NEW" 
localize="false">
        <embedvar href="text/simpress/guide/masterpage.xhp#masterpage"/>
 </paragraph>
+<paragraph id="par_id083120160418133174" role="paragraph" 
xml-lang="en-US"><image id="img_id083120160418043590" 
src="media/screenshots/modules/simpress/ui/headerfooterdialog/HeaderFooterDialog.png"
 width="6.5835in" height="5.5102in"><alt xml-lang="en-US" 
id="alt_id083120160418043590">Header and footer dialog</alt></image></paragraph>
 <paragraph role="heading" id="par_idN106B7" xml-lang="en-US" level="2" 
l10n="NEW">Include on slide</paragraph>
 <paragraph role="paragraph" id="par_idN106BA" xml-lang="en-US" 
l10n="NEW">Specify the elements to include on your slides.</paragraph>
 <paragraph role="heading" id="par_idN106BD" xml-lang="en-US" level="3" 
l10n="NEW">Footer</paragraph>
diff --git a/source/text/simpress/01/04030000.xhp 
b/source/text/simpress/01/04030000.xhp
index f6b398e..72d1db5 100644
--- a/source/text/simpress/01/04030000.xhp
+++ b/source/text/simpress/01/04030000.xhp
@@ -45,6 +45,7 @@
 <paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" 
oldref="3">Draw or move an object near a snap point or snap line to snap it in 
place.</paragraph>
 <paragraph role="paragraph" id="par_id3157978" xml-lang="en-US" l10n="U" 
oldref="4">To set the snap range, choose <switchinline 
select="appl"><caseinline select="DRAW"><link 
href="text/shared/optionen/01070300.xhp" name="Drawing - 
Grid"><emph>%PRODUCTNAME Draw - Grid</emph></link>
 </caseinline><defaultinline><link href="text/shared/optionen/01070300.xhp" 
name="Presentation - Grid"><emph>%PRODUCTNAME Impress - 
Grid</emph></link></defaultinline></switchinline> in the Options dialog 
box.</paragraph>
+<paragraph id="par_id083120160555409190" role="paragraph" 
xml-lang="en-US"><image id="img_id083120160554511738" 
src="media/screenshots/modules/sdraw/ui/dlgsnap/SnapObjectDialog.png" 
width="3.0728in" height="2.6354in"><alt xml-lang="en-US" 
id="alt_id083120160554511738">Snap points dialog</alt></image></paragraph>
 <paragraph role="heading" id="hd_id3147402" xml-lang="en-US" level="2" 
l10n="U" oldref="5">Position</paragraph>
 <paragraph role="paragraph" id="par_id3150533" xml-lang="en-US" l10n="U" 
oldref="6">Sets the position of a selected snap point or line relative to the 
top left corner of the page. </paragraph>
 <paragraph role="note" id="par_id3153040" xml-lang="en-US" l10n="U" 
oldref="24">You can also drag a snap point or snap line to a new 
position.</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to