From 06f78d9927f3d8bd56583fce3181eae19568e3e0 Mon Sep 17 00:00:00 2001 From: Laurent Balland-Poirier Date: Wed, 17 May 2017 22:25:57 +0200 Subject: Basic: merge identical def and example Defxxx Change-Id: I64abb89958c823d636c402ad4fee1f008742b491 Reviewed-on: https://gerrit.libreoffice.org/37789 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot (cherry picked from commit fc04019be5ce20fe8acd95e1cc41ba099dd51cb0) Reviewed-on: https://gerrit.libreoffice.org/37828 --- source/text/sbasic/shared/03101100.xhp | 10 +++++++--- source/text/sbasic/shared/03101110.xhp | 27 +++++---------------------- source/text/sbasic/shared/03101120.xhp | 24 +++--------------------- source/text/sbasic/shared/03101130.xhp | 24 +++--------------------- source/text/sbasic/shared/03101140.xhp | 24 +++--------------------- source/text/sbasic/shared/03101300.xhp | 24 +++--------------------- source/text/sbasic/shared/03101400.xhp | 24 +++--------------------- source/text/sbasic/shared/03101500.xhp | 24 +++--------------------- source/text/sbasic/shared/03101600.xhp | 24 +++--------------------- source/text/sbasic/shared/03101700.xhp | 27 +++++---------------------- 10 files changed, 38 insertions(+), 194 deletions(-) diff --git a/source/text/sbasic/shared/03101100.xhp b/source/text/sbasic/shared/03101100.xhp index 4559a5ed82..75d19629b4 100644 --- a/source/text/sbasic/shared/03101100.xhp +++ b/source/text/sbasic/shared/03101100.xhp @@ -27,17 +27,16 @@ -

DefBool statement - DefBool Statement [Runtime] If no type-declaration character or keyword is specified, the DefBool statement sets the default data type for variables, according to a letter range.

Syntax: Defxxx Characterrange1[, Characterrange2[,...]] @@ -47,8 +46,10 @@ Characterrange: Letters that specify the range of variables that you want to set the default data type for. xxx: Keyword that defines the default variable type: Keyword: Default variable type +

DefBool: Boolean +

Example: ' Prefix definition for variable types: @@ -59,10 +60,13 @@ DefLng l DefObj o DefVar v + +

+ Sub ExampleDefBool bOK=TRUE ' bOK is an implicit boolean variable End Sub - \ No newline at end of file + diff --git a/source/text/sbasic/shared/03101110.xhp b/source/text/sbasic/shared/03101110.xhp index 71248ee41f..184787d8a8 100644 --- a/source/text/sbasic/shared/03101110.xhp +++ b/source/text/sbasic/shared/03101110.xhp @@ -35,34 +35,17 @@ DefCur Statement [Runtime] If no type-declaration character or keyword is specified, the DefCur statement sets the default variable type, according to a letter range. -Syntax: - -Defxxx Characterrange1[, Characterrange2[,...]] - -Parameters: - -Characterrange: Letters that specify the range of variables that you want to set a default data type for. - -xxx: Keyword that defines the default variable type: - -Keyword: Default variable type + +

DefCur: Currency -Example: + +

-REM Prefix definitions for variable types: -DefBool b -DefDate t -DefDbL d -DefInt i -DefLng l -DefObj o -DefVar v DefCur c Sub ExampleDefCur - cCur=Currency REM cCur is an implicit currency variable + cCur=Currency ' cCur is an implicit currency variable End Sub - diff --git a/source/text/sbasic/shared/03101120.xhp b/source/text/sbasic/shared/03101120.xhp index fcaf086f82..cc1060d71b 100644 --- a/source/text/sbasic/shared/03101120.xhp +++ b/source/text/sbasic/shared/03101120.xhp @@ -27,38 +27,20 @@ -

DefErr statement - DefErr Statement [Runtime] If no type-declaration character or keyword is specified, the DefErr statement sets the default variable type, according to a letter range.

-Syntax: - -Defxxx Characterrange1[, Characterrange2[,...]] - - -Parameters: - Characterrange: Letters that specify the range of variables that you want to set a default data type for. - xxx: Keyword that defines the default variable type: - Keyword: Default variable type +

DefErr: Error -Example: +

-' Prefix definitions for variable types: -DefBool b -DefDate t -DefDbl d -DefInt i -DefLng l -DefObj o -DefVar v DefErr e Sub ExampleDefErr eErr=Error ' eErr is an implicit error variable @@ -66,4 +48,4 @@ - \ No newline at end of file + diff --git a/source/text/sbasic/shared/03101130.xhp b/source/text/sbasic/shared/03101130.xhp index 15f52373a6..3e8991e8a1 100644 --- a/source/text/sbasic/shared/03101130.xhp +++ b/source/text/sbasic/shared/03101130.xhp @@ -27,38 +27,20 @@ -

DefSng statement - DefSng Statement [Runtime] If no type-declaration character or keyword is specified, the DefSng statement sets the default variable type, according to a letter range.

DefSng: Single -Example: +

-' Prefix definitions for variable types: -DefBool b -DefDate t -DefDbl d -DefInt i -DefLng l -DefObj o -DefVar v DefSng s Sub ExampleDefSng sSng=Single ' sSng is an implicit single variable @@ -66,4 +48,4 @@ - \ No newline at end of file + diff --git a/source/text/sbasic/shared/03101140.xhp b/source/text/sbasic/shared/03101140.xhp index df1548d683..508def62f2 100644 --- a/source/text/sbasic/shared/03101140.xhp +++ b/source/text/sbasic/shared/03101140.xhp @@ -27,38 +27,20 @@ -

DefStr statement - DefStr Statement [Runtime] If no type-declaration character or keyword is specified, the DefStr statement sets the default variable type, according to a letter range.

DefStr: String -Example: +

-' Prefix definitions for variable types: -DefBool b -DefDate t -DefDbl d -DefInt i -DefLng l -DefObj o -DefVar v DefStr s Sub ExampleDefStr sStr=String ' sStr is an implicit string variable @@ -66,4 +48,4 @@ - \ No newline at end of file + diff --git a/source/text/sbasic/shared/03101300.xhp b/source/text/sbasic/shared/03101300.xhp index 72eb853a04..409ff581f4 100644 --- a/source/text/sbasic/shared/03101300.xhp +++ b/source/text/sbasic/shared/03101300.xhp @@ -27,42 +27,24 @@ -

DefDate statement - DefDate Statement [Runtime] If no type-declaration character or keyword is specified, the DefDate statement sets the default variable type, according to a letter range.

DefDate: Date -Example: +

-' Prefix definitions for variable types: -DefBool b -DefDate t -DefDbl d -DefInt i -DefLng l -DefObj o -DefVar v Sub ExampleDefDate tDate=Date ' tDate is an implicit date variable End Sub - \ No newline at end of file + diff --git a/source/text/sbasic/shared/03101400.xhp b/source/text/sbasic/shared/03101400.xhp index 8976d13479..f033c5f60d 100644 --- a/source/text/sbasic/shared/03101400.xhp +++ b/source/text/sbasic/shared/03101400.xhp @@ -27,42 +27,24 @@ -

DefDbl statement - DefDbl Statement [Runtime] Sets the default variable type, according to a letter range, if no type-declaration character or keyword is specified.

-Syntax: - -Defxxx Characterrange1[, Characterrange2[,...]] - - -Parameters: - Characterrange: Letters that specify the range of variables that you want to set the default data type for. - xxx: Keyword that defines the default variable type: - Keyword: Default variable type +

DefDbl: Double -Example: +

-' Prefix definitions for variable types: -DefBool b -DefDate t -DefDbl d -DefInt i -DefLng l -DefObj o -DefVar v Sub ExampleDefDBL dValue=1.23e43 ' dValue is an implicit double variable type End Sub - \ No newline at end of file + diff --git a/source/text/sbasic/shared/03101500.xhp b/source/text/sbasic/shared/03101500.xhp index 557f1235a0..edbc54aefc 100644 --- a/source/text/sbasic/shared/03101500.xhp +++ b/source/text/sbasic/shared/03101500.xhp @@ -27,42 +27,24 @@ -

DefInt statement - DefInt Statement [Runtime] Sets the default variable type, according to a letter range, if no type-declaration character or keyword is specified.

DefInt: Integer -Example: +

-' Prefix definitions for variable types -DefBool b -DefDate t -DefDbl d -DefInt i -DefLng l -DefObj o -DefVar v Sub ExampleDefInt iCount=200 ' iCount is an implicit integer variable End Sub - \ No newline at end of file + diff --git a/source/text/sbasic/shared/03101600.xhp b/source/text/sbasic/shared/03101600.xhp index 4e3dec3f58..c75bb56351 100644 --- a/source/text/sbasic/shared/03101600.xhp +++ b/source/text/sbasic/shared/03101600.xhp @@ -27,42 +27,24 @@ -

DefLng statement - DefLng Statement [Runtime] Sets the default variable type, according to a letter range, if no type-declaration character or keyword is specified.

DefLng: Long -Example: +

-' Prefix definitions for variable types: -DefBool b -DefDate t -DefDbl d -DefInt i -DefLng l -DefObj o -DefVar v Sub ExampleDefLng lCount=123456789 ' lCount is an implicit long integer variable End Sub - \ No newline at end of file + diff --git a/source/text/sbasic/shared/03101700.xhp b/source/text/sbasic/shared/03101700.xhp index aa55a51881..4eba9e0787 100644 --- a/source/text/sbasic/shared/03101700.xhp +++ b/source/text/sbasic/shared/03101700.xhp @@ -1,6 +1,5 @@ - - + @@ -36,27 +35,11 @@ DefObj Statement [Runtime] Sets the default variable type, according to a letter range, if no type-declaration character or keyword is specified. -Syntax: - -Defxxx Characterrange1[, Characterrange2[,...]] - -Parameters: - -Characterrange: Letters that specify the range of variables that you want to set the default data type for. - -xxx: Keyword that defines the default variable type: - -Keyword: Default variable type + +

DefObj: Object -Example: -REM Prefix definitions for variable types: -DefBool b -DefDate t -DefDbL d -DefInt i -DefLng l -DefObj o -DefVar v + +

-- cgit