From c28f19ed966fb82a25707d6fcfe60cfbb6164386 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Fri, 24 Jun 2022 10:20:43 +0200 Subject: Fix (BIN|OCT|DEC|HEX)2(BIN|OCT|DEC|HEX) to mention string arguments ... and return types, and also fix the conceptually incorrect examples Change-Id: I9953d546c0c6ee8f224b866643f6975e538f44f5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136378 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit 7a93d6a4ae5adb871cbd7cd54f4cc71fed63e27e) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136420 Reviewed-by: Adolfo Jayme Barrientos --- source/text/scalc/01/04060115.xhp | 68 +++++++++++++++++++-------------------- source/text/scalc/01/04060116.xhp | 18 +++++------ 2 files changed, 43 insertions(+), 43 deletions(-) (limited to 'source/text') diff --git a/source/text/scalc/01/04060115.xhp b/source/text/scalc/01/04060115.xhp index 2629e93d02..aefa271d73 100644 --- a/source/text/scalc/01/04060115.xhp +++ b/source/text/scalc/01/04060115.xhp @@ -130,14 +130,14 @@

BIN2DEC

-The result is the decimal number for the binary number entered. +The result is the number for the binary (base-2) number string entered. BIN2DEC(Number) - Number is a binary number. The number can have a maximum of 10 places (bits). The most significant bit is the sign bit. Negative numbers are entered as two's complement. + Number is a string representing a binary (base-2) number. It can have a maximum of 10 places (bits). The most significant bit is the sign bit. Negative numbers are entered as two's complement. - =BIN2DEC(1100100) returns 100. +=BIN2DEC("1100100") returns 100.
@@ -149,15 +149,15 @@

BIN2HEX

-The result is the hexadecimal number for the binary number entered. +The result is the string representing the number in hexadecimal form for the binary (base-2) number string entered. BIN2HEX(Number [; Places]) - Number is a binary number. The number can have a maximum of 10 places (bits). The most significant bit is the sign bit. Negative numbers are entered as two's complement. -Places means the number of places to be output. +Number is a string representing a binary (base-2) number. It can have a maximum of 10 places (bits). The most significant bit is the sign bit. Negative numbers are entered as two's complement. +Places means the number of places to be output. - =BIN2HEX(1100100;6) returns 000064. +=BIN2HEX("1100100";6) returns "000064".
@@ -169,15 +169,15 @@

BIN2OCT

- The result is the octal number for the binary number entered. +The result is the string representing the number in octal form for the binary (base-2) number string entered. BIN2OCT(Number [; Places]) - Number is a binary number. The number can have a maximum of 10 places (bits). The most significant bit is the sign bit. Negative numbers are entered as two's complement. - Places means the number of places to be output. +Number is a string representing a binary (base-2) number. It can have a maximum of 10 places (bits). The most significant bit is the sign bit. Negative numbers are entered as two's complement. +Places means the number of places to be output. - =BIN2OCT(1100100;4) returns 0144. +=BIN2OCT("1100100";4) returns "0144".
@@ -207,15 +207,15 @@

DEC2BIN

- The result is the binary number for the decimal number entered between -512 and 511. +The result is the string representing the number in binary (base-2) form for the number entered. DEC2BIN(Number [; Places]) - Number is a decimal number. If Number is negative, the function returns a binary number with 10 characters. The most significant bit is the sign bit, the other 9 bits return the value. - Places means the number of places to be output. +Number is a number between -512 and 511. If Number is negative, the function returns a binary number string with 10 characters. The most significant bit is the sign bit, the other 9 bits return the value. +Places means the number of places to be output. - =DEC2BIN(100;8) returns 01100100. +=DEC2BIN(100;8) returns "01100100".
@@ -227,15 +227,15 @@

DEC2HEX

-The result is the hexadecimal number for the decimal number entered. +The result is the string representing the number in hexadecimal form for the number entered. DEC2HEX(Number [; Places]) - Number is a decimal number. If Number is negative, the function returns a hexadecimal number with 10 characters (40 bits). The most significant bit is the sign bit, the other 39 bits return the value. - Places means the number of places to be output. +Number is a number. If Number is negative, the function returns a hexadecimal number string with 10 characters (40 bits). The most significant bit is the sign bit, the other 39 bits return the value. +Places means the number of places to be output. - =DEC2HEX(100;4) returns 0064. +=DEC2HEX(100;4) returns "0064".
@@ -247,15 +247,15 @@

DEC2OCT

-The result is the octal number for the decimal number entered. +The result is the string representing the number in octal form for the number entered. DEC2OCT(Number [; Places]) - Number is a decimal number. If Number is negative, the function returns an octal number with 10 characters (30 bits). The most significant bit is the sign bit, the other 29 bits return the value. - Places means the number of places to be output. +Number is a number. If Number is negative, the function returns an octal number string with 10 characters (30 bits). The most significant bit is the sign bit, the other 29 bits return the value. +Places means the number of places to be output. - =DEC2OCT(100;4) returns 0144. +=DEC2OCT(100;4) returns "0144".
@@ -366,15 +366,15 @@

HEX2BIN

-The result is the binary number for the hexadecimal number entered. +The result is the the string representing the number in binary (base-2) form for the hexadecimal number string entered. HEX2BIN(Number [; Places]) - Number is a hexadecimal number or a string that represents a hexadecimal number. It can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. - Places is the number of places to be output. +Number is a string that represents a hexadecimal number. It can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. +Places is the number of places to be output. - =HEX2BIN("6a";8) returns 01101010. +=HEX2BIN("6a";8) returns "01101010".
@@ -386,14 +386,14 @@

HEX2DEC

-The result is the decimal number for the hexadecimal number entered. +The result is the number for the hexadecimal number string entered. HEX2DEC(Number) - Number is a hexadecimal number or a string that represents a hexadecimal number. It can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. +Number is a string that represents a hexadecimal number. It can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. - =HEX2DEC("6a") returns 106. +=HEX2DEC("6a") returns 106.
@@ -405,15 +405,15 @@

HEX2OCT

-The result is the octal number for the hexadecimal number entered. +The result is the string representing the number in octal form for the hexadecimal number string entered. HEX2OCT(Number [; Places]) - Number is a hexadecimal number or a string that represents a hexadecimal number. It can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. - Places is the number of places to be output. +Number is a string that represents a hexadecimal number. It can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. +Places is the number of places to be output. - =HEX2OCT("6a";4) returns 0152. +=HEX2OCT("6a";4) returns "0152".
diff --git a/source/text/scalc/01/04060116.xhp b/source/text/scalc/01/04060116.xhp index 751af61fbb..ad42560a01 100644 --- a/source/text/scalc/01/04060116.xhp +++ b/source/text/scalc/01/04060116.xhp @@ -340,16 +340,16 @@
mw added one entry

OCT2BIN

- The result is the binary number for the octal number entered. + The result is the string representing the number in binary (base-2) form for the octal number string entered. OCT2BIN(Number [; Places]) - Number is the octal number. The number can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. + Number is a string that represents an octal number. It can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. Places is the number of places to be output. - =OCT2BIN(3;3) returns 011. + =OCT2BIN("3";3) returns "011".
OCT2DEC function @@ -357,14 +357,14 @@ mw added one entry

OCT2DEC

- The result is the decimal number for the octal number entered. + The result is the number for the octal number string entered. OCT2DEC(Number) - Number is the octal number. The number can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. + Number is a string that represents an octal number. It can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. - =OCT2DEC(144) returns 100. + =OCT2DEC("144") returns 100.
OCT2HEX function @@ -372,16 +372,16 @@ mw added one entry

OCT2HEX

- The result is the hexadecimal number for the octal number entered. + The result is the string representing the number in hexadecimal form for the octal number string entered. OCT2HEX(Number [; Places]) - Number is the octal number. The number can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. + Number is a string that represents an octal number. It can have a maximum of 10 places. The most significant bit is the sign bit, the following bits return the value. Negative numbers are entered as two's complement. Places is the number of places to be output. - =OCT2HEX(144;4) returns 0064. + =OCT2HEX("144";4) returns "0064".
-- cgit