AllLangHelp_shared.mk | 1
source/text/sbasic/shared/01020100.xhp | 205 ++------------------------------
source/text/shared/02/01170000.xhp | 20 ---
source/text/shared/02/more_controls.xhp | 60 ---------
4 files changed, 20 insertions(+), 266 deletions(-)
New commits:
commit 7eab913ccdb60bfaa2e1fd46b940957773b17825
Author: Gabor Kelemen <kelem...@gnome.hu>
AuthorDate: Sat Jun 8 16:52:17 2019 +0200
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Tue Jun 11 14:24:06 2019 +0200
tdf#112411 (related) No more More Controls toolbar
Show its content as part of the Form Controls toolbar page
Change-Id: I473d095b64a46cf3a7d45a73045215174223931f
Reviewed-on: https://gerrit.libreoffice.org/73712
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 4f51523b5..e1d6e1288 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -499,7 +499,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/02/flowcharts \
helpcontent2/source/text/shared/02/fontwork \
helpcontent2/source/text/shared/02/limit \
- helpcontent2/source/text/shared/02/more_controls \
helpcontent2/source/text/shared/02/paintbrush \
helpcontent2/source/text/shared/02/querypropdlg \
helpcontent2/source/text/shared/02/stars \
diff --git a/source/text/shared/02/01170000.xhp
b/source/text/shared/02/01170000.xhp
index da6f4778a..fca657909 100644
--- a/source/text/shared/02/01170000.xhp
+++ b/source/text/shared/02/01170000.xhp
@@ -46,7 +46,6 @@
<bookmark_value>controls; select mode</bookmark_value>
</bookmark><comment>MW deleted "option field creation", changed "option
button" to "push button" and "selections;" to "selecting;"</comment>
<bookmark xml-lang="en-US" branch="hid/.uno:Config" id="bm_id4029443"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Config" id="bm_id3153252"
localize="false"/>
<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="1"><link
href="text/shared/02/01170000.xhp" name="Form Controls">Form
Controls</link></paragraph>
<paragraph role="paragraph" id="par_id3151378" xml-lang="en-US"><variable
id="formulartext"><ahelp hid=".uno:Config">The <emph>Form Controls</emph>
toolbar contains tools that you need to create an interactive form.</ahelp>
</variable> You can use the toolbar to add controls to a form in a text,
spreadsheet, presentation, or HTML document, for example a button that runs a
macro.</paragraph>
@@ -235,10 +234,6 @@
</tablerow>
</table>
</section>
-<bookmark xml-lang="en-US" branch="hid/.uno:MoreControls" id="bm_id1433643"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:MoreControls" id="bm_id4851832"
localize="false"/>
-<paragraph role="heading" id="par_idN10CC6" xml-lang="en-US" level="2">More
Controls<comment>Controls bar</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10CDC" xml-lang="en-US"><ahelp
hid=".">Opens the <link href="text/shared/02/more_controls.xhp"><emph>More
Controls</emph></link> toolbar.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FormDesignTools" id="bm_id6078501"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:FormDesignTools" id="bm_id3258766"
localize="false"/>
<paragraph role="heading" id="par_idN10CF7" xml-lang="en-US" level="2">Form
Design<comment>Controls bar</comment></paragraph>
@@ -257,10 +252,7 @@
</tablerow>
</table>
</section>
-<paragraph role="heading" id="hd_id3149436" xml-lang="en-US" level="2"><link
href="text/shared/02/01170001.xhp" name="Context Menu Commands">Context Menu
Commands</link></paragraph><comment>end of visible part of FORM CONTROLS
file</comment>
-<switch select="sys">
-<case select="HIDE_HERE"><comment>now the MORE CONTROLS</comment>
-<section id="more_controls">
+<paragraph role="heading" id="hd_id3149436" xml-lang="en-US" level="2"><link
href="text/shared/02/01170001.xhp" name="Context Menu Commands">Context Menu
Commands</link></paragraph>
<section id="Section22">
<bookmark xml-lang="en-US" branch="hid/.uno:Spinbutton" id="bm_id8342120"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SpinButton" id="bm_id5568102"
localize="false"/>
@@ -547,17 +539,13 @@
<paragraph role="paragraph" id="par_idN11B2C" xml-lang="en-US"><image
id="img_id5074922" src="cmd/sc_navigationbar.png" width="0.2228in"
height="0.2228in"><alt id="alt_id5074922"
xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
- <paragraph role="paragraph" id="par_idN11B3D" xml-lang="en-US"><ahelp
hid="SID_FM_NAVIGATIONBAR">Creates a <emph>Navigation</emph>
bar.</ahelp></paragraph>
+ <paragraph role="paragraph" id="par_idN11B3D" xml-lang="en-US"><ahelp
hid=".">Creates a <emph>Navigation</emph> bar.</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
<paragraph role="paragraph" id="par_idN11DB1" xml-lang="en-US">The
<emph>Navigation</emph> bar allows you to move through the records of a
database or a database form. The controls on this <emph>Navigation</emph> bar
work the same way as the controls on the default <link
href="text/shared/main0213.xhp"><emph>Navigation</emph> bar</link> in
$[officename].</paragraph>
</section>
-</section><comment>end of MORE CONTROLS bar</comment>
-</case>
-</switch>
-<switch select="sys">
-<case select="HIDE_HERE"><comment>now the Form Design bar</comment>
+<comment>now the Form Design bar</comment>
<section id="Section1">
<bookmark xml-lang="en-US" branch="hid/.uno:AutoControlFocus"
id="bm_id8170669" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoControlFocus"
id="bm_id3149198" localize="false"/>
@@ -573,7 +561,5 @@
</tablerow>
</table>
</section><comment>end of FORM DESIGN bar</comment>
-</case>
-</switch>
</body>
</helpdocument>
diff --git a/source/text/shared/02/more_controls.xhp
b/source/text/shared/02/more_controls.xhp
deleted file mode 100644
index 21e6569b9..000000000
--- a/source/text/shared/02/more_controls.xhp
+++ /dev/null
@@ -1,60 +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="textshared02more_controlsxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">More Controls</title>
-<filename>/text/shared/02/more_controls.xhp</filename>
-</topic>
-<history>
-<created date="2006-05-19T14:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<section id="more_controls">
-<bookmark xml-lang="en-US" branch="index"
id="bm_id5941343"><bookmark_value>more controls</bookmark_value>
-<bookmark_value>group box creation</bookmark_value>
-<bookmark_value>image button creation</bookmark_value>
-<bookmark_value>image control creation</bookmark_value>
-<bookmark_value>file selection button</bookmark_value>
-<bookmark_value>date fields; creating</bookmark_value>
-<bookmark_value>time fields; form functions</bookmark_value>
-<bookmark_value>numerical fields in forms</bookmark_value>
-<bookmark_value>formatted fields; form functions</bookmark_value>
-<bookmark_value>currency field creation</bookmark_value>
-<bookmark_value>pattern fields; form functions</bookmark_value>
-<bookmark_value>table controls; form functions</bookmark_value>
-<bookmark_value>grid controls; form functions</bookmark_value>
-<bookmark_value>controls; focus</bookmark_value>
-<bookmark_value>focus of controls</bookmark_value>
-<bookmark_value>forms; focus after opening</bookmark_value>
-<bookmark_value>automatic control focus</bookmark_value>
-<bookmark_value>spin button creation</bookmark_value>
-<bookmark_value>scrollbars;controls</bookmark_value>
-<bookmark_value>Navigation bar;controls</bookmark_value>
-</bookmark><comment>MW deleted "option field creation"</comment>
-<paragraph role="heading" id="hd_id8389233" xml-lang="en-US" level="1"><link
href="text/shared/02/more_controls.xhp">More Controls</link></paragraph>
-<paragraph role="paragraph" id="par_id1146275" xml-lang="en-US"><ahelp
hid=".">The More Controls toolbar opens when you click the More Controls icon
on the <link href="text/shared/02/01170000.xhp">Form Controls</link>
toolbar.</ahelp></paragraph>
-</section>
-<embed href="text/shared/02/01170000.xhp#more_controls"/>
-</body>
-</helpdocument>
commit d884a65408c8d477292c8dab2d17258f25f1322b
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Fri Jun 7 12:10:38 2019 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Tue Jun 11 14:23:40 2019 +0200
tdf#125763 Remove confusing remark on Variable declarations
Plus, refactor the page layout, eliminating the tables.
Change-Id: I47bf8c479a073ea087923d9952ca586d85392ea0
Reviewed-on: https://gerrit.libreoffice.org/73668
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/sbasic/shared/01020100.xhp
b/source/text/sbasic/shared/01020100.xhp
index 54f685dca..8c68531a6 100644
--- a/source/text/sbasic/shared/01020100.xhp
+++ b/source/text/sbasic/shared/01020100.xhp
@@ -49,161 +49,27 @@
<paragraph id="par_id3148797" role="paragraph" xml-lang="en-US">A variable
name can consist of a maximum of 255 characters. The first character of a
variable name <emph>must</emph> be a letter A-Z or a-z. Numbers can also be
used in a variable name, but punctuation symbols and special characters are not
permitted, with exception of the underscore character ("_"). In $[officename]
Basic variable identifiers are not case-sensitive. Variable names may contain
spaces but must be enclosed in square brackets if they do.</paragraph>
<paragraph id="par_id3156422" role="paragraph" xml-lang="en-US">Examples for
variable identifiers:</paragraph>
-<table id="tbl_id3154685">
- <tablerow>
- <tablecell>
<bascode>
- <paragraph id="par_idm1341272896" role="bascode" localize="false"
xml-lang="en-US">MyNumber=5</paragraph>
+ <paragraph id="par_idm1341272896" role="bascode">MyNumber=5
'Correct'</paragraph>
+ <paragraph id="par_idm1341267456" role="bascode">MyNumber5=15
'Correct'</paragraph>
+ <paragraph id="par_idm1341262016" role="bascode">MyNumber_5=20
'Correct'</paragraph>
+ <paragraph id="par_idm1341256576" role="bascode">My Number=20 'Not
valid, variable with space must be enclosed in square brackets'</paragraph>
+ <paragraph id="par_idm1341251088" role="bascode">[My Number]=12
'Correct'</paragraph>
+ <paragraph id="par_idm1341245648" role="bascode">DéjàVu=25 'Not
valid, special characters are not allowed'</paragraph>
+ <paragraph id="par_idm1341240176" role="bascode">5MyNumber=12 'Not
valid, variable may not begin with a number'</paragraph>
+ <paragraph id="par_idm1341234704" role="bascode">Number,Mine=12 'Not
valid, punctuation marks are not allowed'</paragraph>
</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3156441" role="paragraph"
xml-lang="en-US">Correct</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341267456" role="bascode" localize="false"
xml-lang="en-US">MyNumber5=15</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3149664" role="paragraph"
xml-lang="en-US">Correct</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341262016" role="bascode" localize="false"
xml-lang="en-US">MyNumber_5=20</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3146119" role="paragraph"
xml-lang="en-US">Correct</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341256576" role="bascode" localize="false"
xml-lang="en-US">My Number=20</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3153876" role="paragraph" xml-lang="en-US">Not
valid, variable with space must be enclosed in square brackets</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341251088" role="bascode" localize="false"
xml-lang="en-US">[My Number]=12</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3154510" role="paragraph"
xml-lang="en-US">Correct</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341245648" role="bascode" localize="false"
xml-lang="en-US">DéjàVu=25</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3150330" role="paragraph" xml-lang="en-US">Not
valid, special characters are not allowed</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341240176" role="bascode" localize="false"
xml-lang="en-US">5MyNumber=12</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3154254" role="paragraph" xml-lang="en-US">Not
valid, variable may not begin with a number</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341234704" role="bascode" localize="false"
xml-lang="en-US">Number,Mine=12</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3149256" role="paragraph" xml-lang="en-US">Not
valid, punctuation marks are not allowed</paragraph>
- </tablecell>
- </tablerow>
-</table>
-
<paragraph id="hd_id3146317" role="heading" level="2"
xml-lang="en-US">Declaring Variables</paragraph>
<paragraph id="par_id3150299" role="paragraph" xml-lang="en-US">In
$[officename] Basic you don't need to declare variables explicitly. A variable
declaration can be performed with the <emph>Dim</emph> statement. You can
declare more than one variable at a time by separating the names with a comma.
To define the variable type, use either a type-declaration sign after the name,
or the appropriate key word. </paragraph>
<paragraph id="par_id3154118" role="paragraph" xml-lang="en-US">Examples for
variable declarations:</paragraph>
-<table id="tbl_id3154658">
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341222320" role="bascode" localize="false"
xml-lang="en-US">Dim a$</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3150982" role="paragraph" xml-lang="en-US">Declares
the variable "a" as a String</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341216864" role="bascode" localize="false"
xml-lang="en-US">Dim a As String</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3150343" role="paragraph" xml-lang="en-US">Declares
the variable "a" as a String</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341211408" role="bascode" localize="false"
xml-lang="en-US">Dim a$, b As Integer</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3155507" role="paragraph" xml-lang="en-US">Declares
one variable as a String and one as an Integer</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341205936" role="bascode" localize="false"
xml-lang="en-US">Dim c As Boolean</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_idN10859" role="paragraph" xml-lang="en-US">Declares
c as a Boolean variable that can be TRUE or FALSE</paragraph>
- </tablecell>
- </tablerow>
-</table>
-
-<paragraph id="par_id3150519" role="paragraph" xml-lang="en-US">It is very
important when declaring variables that you use the type-declaration character
each time, even if it was used in the declaration instead of a keyword. Thus
the following statements are invalid:</paragraph>
-
-<table id="tbl_id3155529">
- <tablerow>
- <tablecell>
<bascode>
- <paragraph id="par_idm1341198080" role="bascode" localize="false"
xml-lang="en-US">Dim a$</paragraph>
+ <paragraph id="par_idm1341222320" role="bascode">Dim a$
'Declares the variable "a" as a String'</paragraph>
+ <paragraph id="par_idm1341216864" role="bascode">Dim a As String
'Declares the variable "a" as a String'</paragraph>
+ <paragraph id="par_idm1341211408" role="bascode">Dim a$, b As Integer
'Declares one variable as a String and one as an Integer'</paragraph>
+ <paragraph id="par_idm1341205936" role="bascode">Dim c As Boolean
'Declares c as a Boolean variable that can be TRUE or FALSE'</paragraph>
</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3154527" role="paragraph" xml-lang="en-US">Declares
"a" as a String</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341192624" role="bascode" localize="false"
xml-lang="en-US">a="TestString"</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3153064" role="paragraph"
xml-lang="en-US">Type-declaration missing: "a$="</paragraph>
- </tablecell>
- </tablerow>
-</table>
<paragraph id="par_id3144770" role="warning" xml-lang="en-US">Once you have
declared a variable as a certain type, you cannot declare the variable under
the same name again as a different type!</paragraph>
@@ -300,48 +166,12 @@
<paragraph id="par_id3148736" role="paragraph" xml-lang="en-US">$[officename]
Basic knows one- or multi-dimensional arrays, defined by a specified variable
type. Arrays are suitable for editing lists and tables in programs. Individual
elements of an array can be addressed through a numeric index.</paragraph>
<paragraph id="par_id3149546" role="paragraph" xml-lang="en-US">Arrays
<emph>must</emph> be declared with the <emph>Dim</emph> statement. There are
several ways to define the index range of an array:</paragraph>
-<table id="tbl_id3155829">
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341065280" role="bascode" localize="false"
xml-lang="en-US">Dim Text$(20)</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3154567" role="paragraph" xml-lang="en-US">21
elements numbered from 0 to 20</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341059776" role="bascode" localize="false"
xml-lang="en-US">Dim Text$(5,4)</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3154397" role="paragraph" xml-lang="en-US">30
elements (a matrix of 6 x 5 elements)</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
-<bascode>
- <paragraph id="par_idm1341054256" role="bascode" localize="false"
xml-lang="en-US">Dim Text$(5 To 25)</paragraph>
-</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3149690" role="paragraph" xml-lang="en-US">21
elements numbered from 5 to 25</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
<bascode>
- <paragraph id="par_idm1341048752" role="bascode" localize="false"
xml-lang="en-US">Dim Text$(-15 To 5)</paragraph>
+ <paragraph id="par_idm1341065280" role="bascode">Dim Text$(20) '21
elements numbered from 0 to 20'</paragraph>
+ <paragraph id="par_idm1341059776" role="bascode">Dim Text$(5,4) '30
elements (a matrix of 6 x 5 elements)'</paragraph>
+ <paragraph id="par_idm1341054256" role="bascode">Dim Text$(5 To 25) '21
elements numbered from 5 to 25'</paragraph>
+ <paragraph id="par_idm1341048752" role="bascode">Dim Text$(-15 To 5) '21
elements (including 0), numbered from -15 to 5'</paragraph>
</bascode>
- </tablecell>
- <tablecell>
- <paragraph id="par_id3153113" role="paragraph" xml-lang="en-US">21
elements (including 0), numbered from -15 to 5</paragraph>
- </tablecell>
- </tablerow>
-</table>
<paragraph id="par_id3153005" role="paragraph" xml-lang="en-US">The index
range can include positive as well as negative numbers.
<comment>i36558</comment></paragraph>
@@ -351,5 +181,4 @@
<paragraph id="par_idm1341038256" role="bascode" localize="false"
xml-lang="en-US">Const ConstName=Expression</paragraph>
</bascode>
</body>
-
-</helpdocument>
\ No newline at end of file
+</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
