core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 58b5c524e9869e797104efcf1ac835f26d753068 Author: Alain Romedenne AuthorDate: Fri Aug 23 10:35:44 2024 +0200 Commit: Gerrit Code Review CommitDate: Fri Aug 23 10:35:44 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 192db7f5be7cc894d444f043747b1fd0865e4efc - update to make file Change-Id: I282097ced36b0642bd6dc8debe19a41e29de538d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172269 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 2fed269e1f93..192db7f5be7c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2fed269e1f9315e50e277c54ffc1053d48385ca9 +Subproject commit 192db7f5be7cc894d444f043747b1fd0865e4efc
help.git: Package_html_media.mk
Package_html_media.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 192db7f5be7cc894d444f043747b1fd0865e4efc Author: Alain Romedenne AuthorDate: Fri Aug 23 10:15:42 2024 +0200 Commit: Alain Romedenne CommitDate: Fri Aug 23 10:35:44 2024 +0200 update to make file Change-Id: I282097ced36b0642bd6dc8debe19a41e29de538d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172269 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/Package_html_media.mk b/Package_html_media.mk index 357e38736f..75ca5fc6cf 100644 --- a/Package_html_media.mk +++ b/Package_html_media.mk @@ -143,7 +143,6 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE helpimg/sbasic/DimArray_function.svg \ helpimg/sbasic/Do_statement.svg \ helpimg/sbasic/Do-Loop_statement.svg \ -helpimg/sbasic/Else_fragment.svg \ helpimg/sbasic/Enum_statement.svg \ helpimg/sbasic/Erase_statement.svg \ helpimg/sbasic/For-Each_statement.svg \
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 90576177b0723b3e5fc7cada42e9e6e50ddeb60d Author: Alain Romedenne AuthorDate: Thu Aug 22 16:57:24 2024 +0200 Commit: Gerrit Code Review CommitDate: Thu Aug 22 16:57:24 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 2fed269e1f9315e50e277c54ffc1053d48385ca9 - tdf#162470 Fix to If statement syntax diagram Change-Id: Icafc95df09367a9e7401742630ae06d7ebcc89b0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172198 Tested-by: Jenkins Reviewed-by: Alain Romedenne Reviewed-by: Pierre F diff --git a/helpcontent2 b/helpcontent2 index aca0c0200340..2fed269e1f93 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit aca0c0200340e2e14528cf423e65224c5d3359fe +Subproject commit 2fed269e1f9315e50e277c54ffc1053d48385ca9
help.git: source/media source/text
source/media/helpimg/sbasic/Else_fragment.svg | 38 - source/media/helpimg/sbasic/If_statement.svg | 74 +++--- source/text/sbasic/shared/03090101.xhp| 46 3 files changed, 67 insertions(+), 91 deletions(-) New commits: commit 2fed269e1f9315e50e277c54ffc1053d48385ca9 Author: Alain Romedenne AuthorDate: Thu Aug 22 14:59:04 2024 +0200 Commit: Alain Romedenne CommitDate: Thu Aug 22 16:57:24 2024 +0200 tdf#162470 Fix to If statement syntax diagram Change-Id: Icafc95df09367a9e7401742630ae06d7ebcc89b0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172198 Tested-by: Jenkins Reviewed-by: Alain Romedenne Reviewed-by: Pierre F diff --git a/source/media/helpimg/sbasic/Else_fragment.svg b/source/media/helpimg/sbasic/Else_fragment.svg deleted file mode 100644 index beee1d4781..00 --- a/source/media/helpimg/sbasic/Else_fragment.svg +++ /dev/null @@ -1,38 +0,0 @@ -http://www.w3.org/2000/svg";> - -/* */ - - - - - -Else -condition -Then -statements \ No newline at end of file diff --git a/source/media/helpimg/sbasic/If_statement.svg b/source/media/helpimg/sbasic/If_statement.svg index c7a41b1bee..b9b69bc50f 100644 --- a/source/media/helpimg/sbasic/If_statement.svg +++ b/source/media/helpimg/sbasic/If_statement.svg @@ -1,4 +1,4 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> @@ -55,53 +55,65 @@ - + - + - + - + + + + - - -Else options + + +Else + + + + + + + +statements + - + - - - + + + - + - - + + - - - + + + - - - -EndIf + + + +EndIf - - + + - - - -End If + + + +End If - + - + - +
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6d137da1038a80736f7d60d62bf3eb947f3d34a7 Author: Alain Romedenne AuthorDate: Wed Aug 21 09:45:02 2024 +0200 Commit: Gerrit Code Review CommitDate: Wed Aug 21 09:45:02 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to d16cddc3602213ef22fc4f778f632d43c89d8304 - Apply english grammar Change-Id: Ibe65885931c5dca006a298eeef9b5b383137b2fc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172186 Reviewed-by: Alain Romedenne Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index 7e13a37beb1d..d16cddc36022 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7e13a37beb1d13ac072f88b0b85607677ab6d67e +Subproject commit d16cddc3602213ef22fc4f778f632d43c89d8304
help.git: source/text
source/text/sbasic/shared/conventions.xhp | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit d16cddc3602213ef22fc4f778f632d43c89d8304 Author: Alain Romedenne AuthorDate: Wed Aug 21 09:26:54 2024 +0200 Commit: Alain Romedenne CommitDate: Wed Aug 21 09:45:01 2024 +0200 Apply english grammar Change-Id: Ibe65885931c5dca006a298eeef9b5b383137b2fc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172186 Reviewed-by: Alain Romedenne Tested-by: Jenkins diff --git a/source/text/sbasic/shared/conventions.xhp b/source/text/sbasic/shared/conventions.xhp index 77598e251a..a9375fad45 100644 --- a/source/text/sbasic/shared/conventions.xhp +++ b/source/text/sbasic/shared/conventions.xhp @@ -21,9 +21,9 @@ Typographical conventions How to Read Syntax Diagrams and Statements -%PRODUCTNAME Basic statements use syntax diagrams and textual conventions that follow these typographical rules: +%PRODUCTNAME Basic statements use syntax diagrams and textual conventions that follow these notations: -%PRODUCTNAME Basic keywords or functions use proper casing: Call, DimArray, InputBox, Property. +%PRODUCTNAME Basic keywords or functions use camel casing: Call, DimArray, InputBox, Property. Lowercase characters indicate information to supply: end, expression, start, variable. The syntax of a %PRODUCTNAME Basic one line statement is illustrated herewith: @@ -44,7 +44,7 @@ [opt1|opt2|opt3] Items inside brackets are optional, alternatives are indicated with a vertical bar, case[[sep]…] An ellipsis indicates a possible repetition, an optional separator may be specified, -{choice1|choice2} Items inside curly braces are compulsory, alternatives are indicated with a vertical bar. +{choice1|choice2} Items inside curly braces are mandatory, alternatives are indicated with a vertical bar. @@ -55,8 +55,8 @@ Sub Main - GoTo there ' skip first statement - here: Print 1, : there: Print 2 REM explanatory text here + GoTo there ' skip first statement and display '2' + here: Print 1, : there: Print 2 REM multi-statement line End Sub
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b5701f5b3d2805c8b9fb7a21e1e3763ebc7314af Author: Alain Romedenne AuthorDate: Wed Aug 21 08:54:01 2024 +0200 Commit: Gerrit Code Review CommitDate: Wed Aug 21 08:54:01 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 7e13a37beb1d13ac072f88b0b85607677ab6d67e - Missing link to BASIC programming guide in wiki Change-Id: I7f552389440c2eb006197fefb54d1cee32d5f053 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172185 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 258bcb03c8a4..7e13a37beb1d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 258bcb03c8a488b14413b6fb7f8bdd88309d8c69 +Subproject commit 7e13a37beb1d13ac072f88b0b85607677ab6d67e
help.git: source/text
source/text/sbasic/shared/0102.xhp |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 7e13a37beb1d13ac072f88b0b85607677ab6d67e Author: Alain Romedenne AuthorDate: Wed Aug 21 08:46:56 2024 +0200 Commit: Alain Romedenne CommitDate: Wed Aug 21 08:54:01 2024 +0200 Missing link to BASIC programming guide in wiki Change-Id: I7f552389440c2eb006197fefb54d1cee32d5f053 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172185 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/0102.xhp b/source/text/sbasic/shared/0102.xhp index 8d7dc0eff9..de390ddffb 100644 --- a/source/text/sbasic/shared/0102.xhp +++ b/source/text/sbasic/shared/0102.xhp @@ -30,11 +30,9 @@ - - Syntax - This section describes the basic syntax elements of $[officename] Basic. For a detailed description please refer to the $[officename] Basic Guide which is available separately. + This section describes the basic syntax elements of $[officename] Basic. For a detailed description please refer to the https://wiki.documentfoundation.org/Documentation/BASIC_Guide";>$[officename] Basic Programming Guide which is available separately.
core.git: basic/qa
basic/qa/cppunit/test_vba.cxx |1 basic/qa/vba_tests/if.vb | 52 ++ 2 files changed, 53 insertions(+) New commits: commit 54b642f4b81ad3abb04b120f665b517a95288c74 Author: Alain Romedenne AuthorDate: Thu Aug 1 11:27:53 2024 +0200 Commit: Mike Kaganski CommitDate: Mon Aug 5 11:19:47 2024 +0200 VBA QA new unit test for IF THEN statement Intent is to cover: - EndIf / End If equivalence - repeating ElseIf blocks _ nested IF statements - IF THEN one liner Change-Id: I667f0381529afcc82fc44ae461081f7ba84b01d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171352 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index e3ed10138da4..7b0ca79ce887 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -92,6 +92,7 @@ void VBATest::testMiscVBAFunctions() "hour.vb", "formatnumber.vb", "formatpercent.vb", +"if.vb", "iif.vb", "instr.vb", "instrrev.vb", diff --git a/basic/qa/vba_tests/if.vb b/basic/qa/vba_tests/if.vb new file mode 100644 index ..387f5dbbc64e --- /dev/null +++ b/basic/qa/vba_tests/if.vb @@ -0,0 +1,52 @@ +Option VBASupport 1 +Option Explicit + +Function doUnitTest() As String + TestUtil.TestInit + TestUtil.AssertEqual(verify_ElseIf, "OK", "verify_ElseIf", "result") + TestUtil.AssertEqual(verify_nested_Ifs, "OK", "verify_nested_Ifs", "result") + TestUtil.AssertEqual(verify_oneline, "OK", "verify_oneline", "result") + doUnitTest = TestUtil.GetResult() +End Function + +Sub Main : MsgBox doUnitTest : End Sub + +Function verify_ElseIf As String + On Error GoTo catch + If False Then + verify_ElseIf = "Fail" + ElseIf False Then + verify_ElseIf = "Fail" + ElseIf False Then + verify_ElseIf = "Fail" + ElseIf False Then verify_ElseIf = "Fail" + Else + verify_ElseIf = "OK" + End If + Exit Function +catch: + TestUtil.ReportErrorHandler("verify_ElseIf", Err, Error$, Erl) +End Function + +Function verify_oneline As String + If False Then verify_oneline = "Fail" Else verify_oneline = "OK" +End Function + +Function verify_nested_Ifs + On Error GoTo catch + If False Then + verify_nested_Ifs = "Fail" + ElseIf True Then + If True Then + verify_nested_Ifs = "OK" + End If + ElseIf False Then + verify_nested_Ifs = "Fail" + ElseIf False Then verify_nested_Ifs = "Fail" + Else + verify_nested_Ifs = "Fail" + EndIf + Exit Function +catch: + TestUtil.ReportErrorHandler("verify_nested_Ifs", Err, Error$, Erl) +End Function
core.git: basic/qa
basic/qa/basic_coverage/test_If.bas | 59 1 file changed, 59 insertions(+) New commits: commit 0a9135e0d901d13422a7c17c6e00ba86b1cc1ae5 Author: Alain Romedenne AuthorDate: Wed Jul 31 09:33:45 2024 +0200 Commit: Mike Kaganski CommitDate: Thu Aug 1 10:04:02 2024 +0200 Basic QA new unit test for IF THEN statement Intent is to cover: - repeating ElseIf blocks _ nested IF statements - IF THEN one liner Change-Id: Iee37707e26a563f336438ce7ba17271a7f06e6fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171285 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/basic/qa/basic_coverage/test_If.bas b/basic/qa/basic_coverage/test_If.bas new file mode 100644 index ..71193108ab9f --- /dev/null +++ b/basic/qa/basic_coverage/test_If.bas @@ -0,0 +1,59 @@ +Option Explicit + +Function doUnitTest() As String + TestUtil.TestInit + + TestUtil.AssertEqual(verify_ElseIf, "OK", "verify_ElseIf", "result") + TestUtil.AssertEqual(verify_nested_Ifs, "OK", "verify_nested_Ifs", "result") + TestUtil.AssertEqual(verify_oneline, "OK", "verify_oneline", "result") + + doUnitTest = TestUtil.GetResult() +End Function + +Sub Main : MsgBox doUnitTest : End Sub + +Function verify_ElseIf As String + On Error GoTo catch + + If False Then + verify_ElseIf = "Fail" + ElseIf False Then + verify_ElseIf = "Fail" + ElseIf False Then + verify_ElseIf = "Fail" + ElseIf False Then verify_ElseIf = "Fail" + Else + verify_ElseIf = "OK" + End If + Exit Function + +catch: + TestUtil.ReportErrorHandler("verify_ElseIf", Err, Error$, Erl) +End Function + +Function verify_oneline As String + If False Then verify_oneline = "Fail" Else verify_oneline = "OK" +End Function + +Function verify_nested_Ifs + ' + On Error GoTo catch + + If False Then + verify_nested_Ifs = "Fail" + ElseIf True Then + If True Then + verify_nested_Ifs = "OK" + End If + ElseIf False Then + verify_nested_Ifs = "Fail" + ElseIf False Then verify_nested_Ifs = "Fail" + Else + verify_nested_Ifs = "Fail" + EndIf + Exit Function + +catch: + TestUtil.ReportErrorHandler("verify_nested_Ifs", Err, Error$, Erl) + +End Function
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 088635001acc15e7bba4f8d58874572e7487035e Author: Alain Romedenne AuthorDate: Mon Jul 29 10:17:33 2024 +0200 Commit: Gerrit Code Review CommitDate: Mon Jul 29 10:17:33 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 8f68a0232112cfa6a8b2baa298c0282442fc2db2 - VBA supported objects Change-Id: Ie2f51790fa25e589a05a8f9a0cf25cc4f891c4c7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171038 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 80cfa06de7bb..8f68a0232112 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 80cfa06de7bb382c30ead55837378dcd568d2e30 +Subproject commit 8f68a0232112cfa6a8b2baa298c0282442fc2db2
help.git: source/text
source/text/sbasic/shared/special_vba_func.xhp |8 source/text/sbasic/shared/vba_objects.xhp |6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) New commits: commit 8f68a0232112cfa6a8b2baa298c0282442fc2db2 Author: Alain Romedenne AuthorDate: Fri Jul 26 16:57:47 2024 +0200 Commit: Alain Romedenne CommitDate: Mon Jul 29 10:17:32 2024 +0200 VBA supported objects Change-Id: Ie2f51790fa25e589a05a8f9a0cf25cc4f891c4c7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171038 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/special_vba_func.xhp b/source/text/sbasic/shared/special_vba_func.xhp index 7e3a2060aa..a8de949ffc 100644 --- a/source/text/sbasic/shared/special_vba_func.xhp +++ b/source/text/sbasic/shared/special_vba_func.xhp @@ -119,5 +119,13 @@ Object Properties and Methods + + +VBA support in %PRODUCTNAME +VBA Properties + + + + diff --git a/source/text/sbasic/shared/vba_objects.xhp b/source/text/sbasic/shared/vba_objects.xhp index 02537694cc..b7895c1f81 100644 --- a/source/text/sbasic/shared/vba_objects.xhp +++ b/source/text/sbasic/shared/vba_objects.xhp @@ -29,10 +29,10 @@ These exclusive %PRODUCTNAME VBA objects properties and methods are enabled when: -• A Basic module is set with VBAModule special attribute. +A Basic module is set with VBAModule special attribute. -• Option VBASupport 1 compiler statement is placed before the first macro of the VBA Basic module. +Option VBASupport 1 compiler statement is placed before the first macro of the VBA Basic module. A few VBA objects are supported for Excel, Powerpoint and Word application files. Limited properties and methods are available for VBA objects. @@ -114,7 +114,7 @@ Methods -ExportAsFixedFormat(Optional Type : Integer = xlTypePDF, Optional FileName : String, Optional Quality : Integer = xlQualityStandard, Optional IncludeDocProperties : Boolean, Optional IgnorePrintAreas = Boolean, Optional OpenAfterPublish : Boolean) +ExportAsFixedFormat(Optional Type : Integer = xlTypePDF, Optional FileName : String, Optional Quality : Integer = xlQualityStandard, Optional IncludeDocProperties : Boolean, Optional IgnorePrintAreas = Boolean, Optional OpenAfterPublish : Boolean)
help.git: Package_html_media.mk source/media source/text
Package_html_media.mk |1 source/media/helpimg/sbasic/ElseIf_fragment.svg | 42 source/media/helpimg/sbasic/If_statement.svg| 126 source/text/sbasic/shared/03090101.xhp |7 - 4 files changed, 109 insertions(+), 67 deletions(-) New commits: commit 80cfa06de7bb382c30ead55837378dcd568d2e30 Author: Alain Romedenne AuthorDate: Thu Jul 25 17:13:26 2024 +0200 Commit: Olivier Hallot CommitDate: Fri Jul 26 15:38:22 2024 +0200 tdf#161883 Fix to IF Basic statement syntax diagram Change-Id: Idcd12d05cd424360cd29bbb7cd7ee73e766bef52 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171025 Reviewed-by: Olivier Hallot Tested-by: Jenkins diff --git a/Package_html_media.mk b/Package_html_media.mk index a9153bcd55..357e38736f 100644 --- a/Package_html_media.mk +++ b/Package_html_media.mk @@ -144,7 +144,6 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE helpimg/sbasic/Do_statement.svg \ helpimg/sbasic/Do-Loop_statement.svg \ helpimg/sbasic/Else_fragment.svg \ -helpimg/sbasic/ElseIf_fragment.svg \ helpimg/sbasic/Enum_statement.svg \ helpimg/sbasic/Erase_statement.svg \ helpimg/sbasic/For-Each_statement.svg \ diff --git a/source/media/helpimg/sbasic/ElseIf_fragment.svg b/source/media/helpimg/sbasic/ElseIf_fragment.svg deleted file mode 100644 index 49759d4412..00 --- a/source/media/helpimg/sbasic/ElseIf_fragment.svg +++ /dev/null @@ -1,42 +0,0 @@ -http://www.w3.org/2000/svg";> - -/* */ - - - - - - - -ElseIf -Else If -expression -Then -statements - \ No newline at end of file diff --git a/source/media/helpimg/sbasic/If_statement.svg b/source/media/helpimg/sbasic/If_statement.svg index cd37c12b5d..c7a41b1bee 100644 --- a/source/media/helpimg/sbasic/If_statement.svg +++ b/source/media/helpimg/sbasic/If_statement.svg @@ -1,6 +1,109 @@ -http://www.w3.org/2000/svg";> +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> -/* ++ + + + ++ + + If ++ + + ++ + + + ++ + + ++ + + condition ++ + + ++ + + Then ++ + + ++ + + statements ++ + + ++ + + ElseIf ++ + + ++ + + + ++ + + + ++ + + Else options ++ + + + + + ++ core.git: helpcontent2 helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0f12a330af9f317742238fe11d6cbc99bd270b07 Author: Alain Romedenne AuthorDate: Fri Jul 26 15:38:22 2024 +0200 Commit: Gerrit Code Review CommitDate: Fri Jul 26 15:38:22 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 80cfa06de7bb382c30ead55837378dcd568d2e30 - tdf#161883 Fix to IF Basic statement syntax diagram Change-Id: Idcd12d05cd424360cd29bbb7cd7ee73e766bef52 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171025 Reviewed-by: Olivier Hallot Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index 56220af4577d..80cfa06de7bb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 56220af4577d0f685ca40595f7f57254f92628c4 +Subproject commit 80cfa06de7bb382c30ead55837378dcd568d2e30
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 34f2a655f3dd2e6338cc577a0b9d6e1c146607ed Author: Alain Romedenne AuthorDate: Mon Jun 10 18:51:06 2024 +0200 Commit: Gerrit Code Review CommitDate: Mon Jun 10 18:51:06 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 1658fb55defb5a08d3adbd7637745f8a62c58f89 - Update Basic/Python TOC with Calc samples Change-Id: I1ce9b023b0e90dae868cc323af3e9d0296a66bdc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168534 Tested-by: Jean-Pierre Ledure Reviewed-by: Alain Romedenne Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index 95755ff59d2f..1658fb55defb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 95755ff59d2fc074796f341d2dc781660c52ce74 +Subproject commit 1658fb55defb5a08d3adbd7637745f8a62c58f89
help.git: source/auxiliary source/text
source/auxiliary/sbasic.tree |4 source/text/sbasic/python/python_examples.xhp | 13 ++--- 2 files changed, 14 insertions(+), 3 deletions(-) New commits: commit 1658fb55defb5a08d3adbd7637745f8a62c58f89 Author: Alain Romedenne AuthorDate: Fri Jun 7 17:31:35 2024 +0200 Commit: Alain Romedenne CommitDate: Mon Jun 10 18:51:06 2024 +0200 Update Basic/Python TOC with Calc samples Change-Id: I1ce9b023b0e90dae868cc323af3e9d0296a66bdc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168534 Tested-by: Jean-Pierre Ledure Reviewed-by: Alain Romedenne Tested-by: Jenkins diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index 4ae26d4b4b..295f3ab27f 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -354,6 +354,10 @@ Base service Basic service Calc service +Reading and Writing values to Ranges + Formatting Borders in Calc with Macros + Chart service Database service Dataset service diff --git a/source/text/sbasic/python/python_examples.xhp b/source/text/sbasic/python/python_examples.xhp index 6085266cd5..7f05ff127b 100644 --- a/source/text/sbasic/python/python_examples.xhp +++ b/source/text/sbasic/python/python_examples.xhp @@ -28,13 +28,20 @@ + + + +Event Handling, Listeners - - - + +Calc examples + + + +
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb8898579f828ea7f73c09614fca1fcfb1c427f8 Author: Alain Romedenne AuthorDate: Fri Jun 7 09:24:30 2024 +0200 Commit: Gerrit Code Review CommitDate: Fri Jun 7 09:24:30 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 842cf7acf0f77bbffdb61b42fc5b935773094dcb - Precision about Win environment variable Change-Id: I2105960d58fa0342dde9d7f762ecc1a18b3e9bb5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168448 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index ef98081ca946..842cf7acf0f7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ef98081ca946d506c0bc0198f508358ef6e3a9aa +Subproject commit 842cf7acf0f77bbffdb61b42fc5b935773094dcb
help.git: source/text
source/text/sbasic/python/python_platform.xhp |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 842cf7acf0f77bbffdb61b42fc5b935773094dcb Author: Alain Romedenne AuthorDate: Thu Jun 6 15:21:36 2024 +0200 Commit: Alain Romedenne CommitDate: Fri Jun 7 09:24:30 2024 +0200 Precision about Win environment variable Change-Id: I2105960d58fa0342dde9d7f762ecc1a18b3e9bb5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168448 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/python/python_platform.xhp b/source/text/sbasic/python/python_platform.xhp index d2b0d80e11..4e1a7da743 100644 --- a/source/text/sbasic/python/python_platform.xhp +++ b/source/text/sbasic/python/python_platform.xhp @@ -26,7 +26,6 @@ Identifying the operating system Identifying the operating system can be performed with Python or Basic language. -ComputerName property is solely available for Windows. Basic calls to Python macros help overcome %PRODUCTNAME Basic limitations. Using a Python class: """ the_module """ @@ -50,7 +49,8 @@ Using a Basic classmodule: %PRODUCTNAME Basic lacks MacOS X native recognition. Platform identification is possible using %PRODUCTNAME Application Programming Interface (API). -Option Compatible +''' Module name: Platform ''' +Option Compatible Option ClassModule Option Explicit @@ -92,6 +92,7 @@ End Select End Property ' Platform.PathDelimiter +ComputerName environment variable is solely available for Windows. Basic calls to Python macros help overcome %PRODUCTNAME Basic limitations. Examples: With Python >>> from < the_module > import Platform
core.git: pyuno/PythonTest_pyuno_pytests_testofficehelper.mk pyuno/qa
pyuno/PythonTest_pyuno_pytests_testofficehelper.mk | 13 + pyuno/qa/pytests/testofficehelper.py | 50 + 2 files changed, 63 insertions(+) New commits: commit 28a43d53b25c183a7997cc18819d6ee0c675df19 Author: Alain Romedenne AuthorDate: Fri Mar 1 16:33:05 2024 +0100 Commit: Hossein CommitDate: Sat May 11 11:25:44 2024 +0200 Unit tests for officehelper.py Depend upon previous patch d8978a8c4ffabd6b36a691fd3e2df68563808234 for officehelper.py which fixed some glitches. Change-Id: Icc5c717d7f0f5a0a08202b6b57e475e7afe6f5c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164195 Reviewed-by: Hossein Tested-by: Jenkins Tested-by: Hossein diff --git a/pyuno/PythonTest_pyuno_pytests_testofficehelper.mk b/pyuno/PythonTest_pyuno_pytests_testofficehelper.mk new file mode 100644 index ..77aac9d0f00b --- /dev/null +++ b/pyuno/PythonTest_pyuno_pytests_testofficehelper.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# +$(eval $(call gb_PythonTest_PythonTest,pyuno_pytests_testofficehelper)) +$(eval $(call gb_PythonTest_add_modules,pyuno_pytests_testofficehelper,$(SRCDIR)/pyuno/qa/pytests,\ +testofficehelper \ +)) +# vim: set noet sw=4 ts=4: \ No newline at end of file diff --git a/pyuno/qa/pytests/testofficehelper.py b/pyuno/qa/pytests/testofficehelper.py new file mode 100644 index ..be2c99d8daf8 --- /dev/null +++ b/pyuno/qa/pytests/testofficehelper.py @@ -0,0 +1,50 @@ +import unittest +from officehelper import bootstrap, BootstrapException + + +class OfficeHelperTest(unittest.TestCase): +"""officehelper.py must provide: +Support of Windows, Mac OS X & GNU/Linux distributions +Customizable connection with 'delays' **kwarg +Reporting to console with 'report' **kwarg +Memory cleanup from soffice service +extra features may be: +Python source documentation +""" +def test_default_config(self): +# Check default timeout and number of attempts +# Stop LibreOffice running service +ctx = bootstrap() # Default settings suffice to initialize the service +#time.sleep(10) # gve +if ctx: # stop soffice as a service +smgr = ctx.getServiceManager() +desktop = smgr.createInstanceWithContext("com.sun.star.frame.Desktop", ctx) +desktop.terminate() +self.assertTrue(ctx) # check for failure + +def test_kwargs(self): +# Wait differently for LO to start, request context 10 times +# Report processing in console +ctx = bootstrap(delays=[1,]*10, report=print) +if ctx: # stop soffice as a service +smgr = ctx.getServiceManager() +desktop = smgr.createInstanceWithContext("com.sun.star.frame.Desktop", ctx) +desktop.terminate() +self.assertTrue(ctx) + +def test_exception(self): +# Raise BootstrapException and stop ALL PRESENT LibreOffice running services +with self.assertRaises(BootstrapException): +bootstrap(delays=[0,], report=print) # delays=[0,] must raise BootstrapException + + +if __name__ == "__main__": + +unittest.main() + +# ~ dir(__name__) +# ~ help(__name__) +# ~ help(bootstrap) +# ~ exit() + +# vim: set shiftwidth=4 softtabstop=4 expandtab
core.git: pyuno/source
pyuno/source/officehelper.py |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 61337efb8c6a434a88a82dd2819edf600e867aa4 Author: Alain Romedenne AuthorDate: Wed Apr 3 14:01:55 2024 +0100 Commit: Noel Grandin CommitDate: Wed Apr 3 17:50:11 2024 +0200 minor fixes to officehelper.py - erroneous code sample in code comment -retry delays - fix when raising OSError exception - undefined variable Change-Id: I2cae4e8b6bbb3153e79f290ae1d316aa22a86b4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165714 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py index ccdd55590625..882d0f65531f 100644 --- a/pyuno/source/officehelper.py +++ b/pyuno/source/officehelper.py @@ -109,7 +109,7 @@ def bootstrap(soffice=None, delays=(1, 3, 5, 7), report=lambda *args: None): + Report processing in console import officehelper as oh -ctx = oh.bootstrap(delays=(5,10,15,20),report=print) # every 5 sec. +ctx = oh.bootstrap(delays=(5,10,15,20),report=print) # wait 5, 10, 15 and 20 sec. # your code goes here iii. Use a specific LibreOffice copy @@ -119,6 +119,7 @@ def bootstrap(soffice=None, delays=(1, 3, 5, 7), report=lambda *args: None): # your code goes here """ try: +process = None # used in except clause if soffice: # soffice fully qualified path as parm sOffice = soffice else: # soffice script used on *ix, Mac; soffice.exe used on Win
core.git: pyuno/source
pyuno/source/officehelper.py | 184 +++ 1 file changed, 66 insertions(+), 118 deletions(-) New commits: commit 2146e66d8df2b7b6a2dd868e886cae76aaf7f48b Author: Alain Romedenne AuthorDate: Thu Mar 14 14:05:23 2024 +0100 Commit: Noel Grandin CommitDate: Tue Mar 26 21:01:24 2024 +0100 officehelper.py memory cleanup - main program must stop subprocesses it initiates before it throws exceptions Change-Id: I6e87d79e2f21cd41f7cd8e470cc166f8d5282954 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164819 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py index 5c89ef7ea0bf..ccdd55590625 100644 --- a/pyuno/source/officehelper.py +++ b/pyuno/source/officehelper.py @@ -16,58 +16,42 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # - -""" Bootstrap OOo and PyUNO Runtime. - +""" Bootstrap PyUNO Runtime. The soffice process is started opening a named pipe of random name, then the local context is used to access the pipe. This function directly returns the remote component context, from whereon you can get the ServiceManager by calling getServiceManager() on the returned object. - This module supports the following environments: -- Windows +- Windows - GNU/Linux derivatives -- MacOS X - +- Mac OS X A configurable time-out allows to wait for LibO process to be completed. -Multiple attempts can be set in order to connect to LibO as a service. - +Multiple attempts can be set in order to connect to LibO as a service. Specific versions of the office suite can be started. - Instructions: - 1. Include one of the below examples in your Python macro 2. Run your LibreOffice script from your preferred IDE - Imports: os, random, subprocess, sys - `bootstrap` itertools, time - `retry` decorator - Exceptions: +OSError- in `bootstrap` BootstrapException - in `bootstrap` NoConnectException - in `bootstrap` - Functions: `bootstrap` `retry` decorator - Acknowledgments: - - Kim Kulak for original officehelper.py Python translation from bootstrap.java - ActiveState, for `retry` python decorator - -warning:: Tested platforms are Linux, MacOS X & Windows -AppImage, Flatpak, Snap and the like have not be validated - +warning:: Tested platforms are Linux, Mac OS X & Windows +AppImage, Flatpak, Snap and the like have not been validated :References: .. _ActiveState retry Python decorator: http://code.activestate.com/recipes/580745-retry-decorator-in-python/ - """ - -import os, random, subprocess # in bootstrap() +import os, random, signal, subprocess # in bootstrap() from sys import platform # in bootstrap() import itertools, time # in retry() decorator - import uno from com.sun.star.connection import NoConnectException from com.sun.star.uno import Exception as UnoException @@ -94,7 +78,7 @@ def retry(delays=(0, 1, 5, 30, 180, 600, 3600), problems.append(problem) if delay is None: report("retryable failed definitely:", problems) -# raise +raise else: report("retryable failed:", problem, "-- delaying for %ds" % delay) @@ -103,119 +87,83 @@ def retry(delays=(0, 1, 5, 30, 180, 600, 3600), return wrapped return wrapper -def bootstrap(soffice=None,delays=(1, 3, 5, 7), report=lambda *args: None): + +def bootstrap(soffice=None, delays=(1, 3, 5, 7), report=lambda *args: None): # 4 connection attempts; sleeping 1, 3, 5 and 7 seconds # no report to console -"""Bootstrap OOo and PyUNO Runtime. +"""Bootstrap PyUNO Runtime. The soffice process is started opening a named pipe of random name, then the local context is used to access the pipe. This function directly returns the remote component context, from whereon you can get the ServiceManager by calling getServiceManager() on the returned object. - -Examples: +Examples: i. Start LO as a service, get its remote component context - + import officehelper ctx = officehelper.bootstrap() # your code goes here - + ii. Wait longer for LO to start, request context multiples times + Report processing in console - + import officehelper as oh ctx = oh.bootstrap(delays=(5,10,15,20),report=print) # every 5 sec. # your code goes here - -iii. Use a specific LibreOffice copy - + +iii. Use a specific LibreOffice copy + from officehelper import bootstrap -ctx = bootstrap(soffice='USB:\PortableApps\libO-7.6\App\libreoffice\program\soffice.exe')) +ctx = bootstrap(soffice=r"USB:\Port
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4fa240bc5f235b3f4030d0d89e9482f02ca68b31 Author: Alain Romedenne AuthorDate: Wed Mar 6 15:11:07 2024 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 6 15:11:07 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 3eac551bbc02c2b4418b7a86eaa4f265d6854ee9 - Corrections/precisions in ScriptForge help pages - removing outdated comments - deprecation and omissions in sf_form, sf_formcontrol, sf_formdocument Change-Id: Id5b1abdb812edc13a1489f0b01fff7f34a17416c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163548 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index cd7186fc1b3f..3eac551bbc02 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit cd7186fc1b3f63bc941f61fe95116da060bdb5da +Subproject commit 3eac551bbc02c2b4418b7a86eaa4f265d6854ee9
help.git: source/text
source/text/sbasic/python/python_handler.xhp |2 source/text/sbasic/shared/03/sf_form.xhp | 12 +-- source/text/sbasic/shared/03/sf_formcontrol.xhp | 84 --- source/text/sbasic/shared/03/sf_formdocument.xhp | 13 +++ 4 files changed, 31 insertions(+), 80 deletions(-) New commits: commit 3eac551bbc02c2b4418b7a86eaa4f265d6854ee9 Author: Alain Romedenne AuthorDate: Mon Feb 19 18:08:21 2024 +0100 Commit: Alain Romedenne CommitDate: Wed Mar 6 15:11:06 2024 +0100 Corrections/precisions in ScriptForge help pages - removing outdated comments - deprecation and omissions in sf_form, sf_formcontrol, sf_formdocument Change-Id: Id5b1abdb812edc13a1489f0b01fff7f34a17416c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163548 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/python/python_handler.xhp b/source/text/sbasic/python/python_handler.xhp index 5bb294f6e3..42b079cb0c 100644 --- a/source/text/sbasic/python/python_handler.xhp +++ b/source/text/sbasic/python/python_handler.xhp @@ -92,8 +92,6 @@ dlg = dp.createDialogWithHandler("vnd.sun.star.script:"+libr_dlg+location, self) return dlg - # def getBasicScript() # see note def _msgbox(prompt='', title=''): diff --git a/source/text/sbasic/shared/03/sf_form.xhp b/source/text/sbasic/shared/03/sf_form.xhp index 163c32e390..cc33940bce 100644 --- a/source/text/sbasic/shared/03/sf_form.xhp +++ b/source/text/sbasic/shared/03/sf_form.xhp @@ -563,15 +563,14 @@ Activate - CloseFormDocument Controls GetDatabase + MoveFirst - MoveFirst MoveLast MoveNext - MoveNew + MoveNew MovePrevious @@ -622,10 +621,8 @@ CloseFormDocument -- - - Form service;CloseFormDocument - CloseFormDocument + This method is deprecated, use ScriptForge.FormDocument.CloseDocument method instead. Closes the form document containing the actual Form instance. The Form instance is disposed. svc.CloseFormDocument(): bool @@ -637,7 +634,6 @@ form.CloseFormDocument() # Python - This method only closes form documents located in Base documents. If the form is stored in a Writer or Calc document, calling CloseFormDocument will have no effect. Controls -- @@ -677,6 +673,7 @@ Form service;GetDatabase + GetDatabase Return a SFDatabases.Database instance giving access to the execution of SQL commands on the database the current form is connected to and/or that is stored in the current Base document. Each form has its own database connection, except in Base documents where they all share the same connection. @@ -693,6 +690,7 @@ db = form.GetDatabase() # SFDatabases.Database + MoveFirst -- diff --git a/source/text/sbasic/shared/03/sf_formcontrol.xhp b/source/text/sbasic/shared/03/sf_formcontrol.xhp index 32f2e16a14..d14af07115 100644 --- a/source/text/sbasic/shared/03/sf_formcontrol.xhp +++ b/source/text/sbasic/shared/03/sf_formcontrol.xhp @@ -92,74 +92,20 @@ Control types The FormControl service is available for the following control types: - - - Button - - - CheckBox - - - ComboBox - - - CurrencyField - - - DateField - - - FileControl - - - FixedText - - - FormattedField - - - GroupBox - - - HiddenControl - - - ImageButton - - - ImageControl - - - ListBox - - - NavigationBar - - - NumericField - - - PatternField - - - RadioButton - - - ScrollBar - - - SpinButton - - - TableControl - - - TextField - - - TimeField - - + + + + ButtonCheckBoxComboBoxCurrencyFieldDateFieldFileControlFixedTextFormattedField + + + GroupBoxHiddenControlImageButtonImageControlListBoxNavigationBarNumericField + + + PatternFieldRadioButtonScrollBarSpinButtonTableControlTextFieldTimeField + + + + Properties @@ -399,7 +345,7 @
core.git: pyuno/source
pyuno/source/officehelper.py | 234 +-- 1 file changed, 184 insertions(+), 50 deletions(-) New commits: commit d8978a8c4ffabd6b36a691fd3e2df68563808234 Author: Alain Romedenne AuthorDate: Thu Feb 29 10:23:55 2024 +0100 Commit: Noel Grandin CommitDate: Sat Mar 2 13:00:12 2024 +0100 tdf#116156 tdf#157162 tdf#159528 Fix glitches in officehelper.py - MacOs & GNU/Linux distributions are supported, next to Windows - Connection attempts are customisable - Reporting to console can be configured - Python source doc. added - service memory cleanup suggestion examples intended for QA as well as inclusion in wiki pages officehelper documentation: https://wiki.documentfoundation.org/Documentation/DevGuide/First_Steps#First_Contact Change-Id: I6a7c19429e78a1736e4a1479c4bbc1950228d93f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164118 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py index 53bd5943e3c0..5c89ef7ea0bf 100644 --- a/pyuno/source/officehelper.py +++ b/pyuno/source/officehelper.py @@ -17,14 +17,56 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# -# Translated to python from "Bootstrap.java" by Kim Kulak -# +""" Bootstrap OOo and PyUNO Runtime. + +The soffice process is started opening a named pipe of random name, then +the local context is used to access the pipe. This function directly +returns the remote component context, from whereon you can get the +ServiceManager by calling getServiceManager() on the returned object. + +This module supports the following environments: +- Windows +- GNU/Linux derivatives +- MacOS X + +A configurable time-out allows to wait for LibO process to be completed. +Multiple attempts can be set in order to connect to LibO as a service. + +Specific versions of the office suite can be started. + +Instructions: + +1. Include one of the below examples in your Python macro +2. Run your LibreOffice script from your preferred IDE + +Imports: +os, random, subprocess, sys - `bootstrap` +itertools, time - `retry` decorator + +Exceptions: +BootstrapException - in `bootstrap` +NoConnectException - in `bootstrap` -import os -import random -from sys import platform -from time import sleep +Functions: +`bootstrap` +`retry` decorator + +Acknowledgments: + + - Kim Kulak for original officehelper.py Python translation from bootstrap.java + - ActiveState, for `retry` python decorator + +warning:: Tested platforms are Linux, MacOS X & Windows +AppImage, Flatpak, Snap and the like have not be validated + +:References: +.. _ActiveState retry Python decorator: http://code.activestate.com/recipes/580745-retry-decorator-in-python/ + +""" + +import os, random, subprocess # in bootstrap() +from sys import platform # in bootstrap() +import itertools, time # in retry() decorator import uno from com.sun.star.connection import NoConnectException @@ -34,54 +76,146 @@ from com.sun.star.uno import Exception as UnoException class BootstrapException(UnoException): pass -def bootstrap(): + +def retry(delays=(0, 1, 5, 30, 180, 600, 3600), + exception=Exception, + report=lambda *args: None): +"""retry Python decorator +Credit: +http://code.activestate.com/recipes/580745-retry-decorator-in-python/ +""" +def wrapper(function): +def wrapped(*args, **kwargs): +problems = [] +for delay in itertools.chain(delays, [None]): +try: +return function(*args, **kwargs) +except exception as problem: +problems.append(problem) +if delay is None: +report("retryable failed definitely:", problems) +# raise +else: +report("retryable failed:", problem, + "-- delaying for %ds" % delay) +time.sleep(delay) +return None +return wrapped +return wrapper + +def bootstrap(soffice=None,delays=(1, 3, 5, 7), report=lambda *args: None): +# 4 connection attempts; sleeping 1, 3, 5 and 7 seconds +# no report to console """Bootstrap OOo and PyUNO Runtime. -The soffice process is started opening a named pipe of random name, then the local context is used - to access the pipe. This function directly returns the remote component context, from whereon you can - get the ServiceManager by calling getServiceManager() on the returned object. - """ -try: - # soffice script used on *ix, Mac; soffice.exe used on Win +The soffice process is started opening a named pipe of random name, +then the local context is used to access the pipe. This function +directly returns the remote component context, from whe
help.git: source/text
source/text/sbasic/shared/03/sf_calc.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit acb79818f17b823827ff39871ea53ae3be0a9f1d Author: Alain Romedenne AuthorDate: Mon Feb 26 18:02:57 2024 +0100 Commit: Alain Romedenne CommitDate: Mon Feb 26 18:33:28 2024 +0100 sf_calc documentation update Change-Id: I7646524df9ab75dd74d5e5ece0e3291f6f553ec9 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163971 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03/sf_calc.xhp b/source/text/sbasic/shared/03/sf_calc.xhp index 34040f40d1..88a5c7de90 100644 --- a/source/text/sbasic/shared/03/sf_calc.xhp +++ b/source/text/sbasic/shared/03/sf_calc.xhp @@ -1292,7 +1292,7 @@ svc.GetColumnName(columnnumber: int): str - columnnumber: The column number as an integer value in the interval 1 ... 1024. + columnnumber: The column number as an integer value in the interval 1 ... 16384. Displays a message box with the name of the third column, which by default is "C". @@ -1304,7 +1304,7 @@ bas = CreateScriptService("Basic") bas.MsgBox(myDoc.GetColumnName(3)) - The maximum number of columns allowed on a Calc sheet is 1024. + The maximum number of columns allowed on a Calc sheet is 16384.
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b0dc696c7de09a629107799207118282b912b8dd Author: Alain Romedenne AuthorDate: Mon Feb 26 18:33:29 2024 +0100 Commit: Gerrit Code Review CommitDate: Mon Feb 26 18:33:29 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to acb79818f17b823827ff39871ea53ae3be0a9f1d - sf_calc documentation update Change-Id: I7646524df9ab75dd74d5e5ece0e3291f6f553ec9 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163971 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 51f773f0ed63..acb79818f17b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 51f773f0ed635d026283ec010bbbd973813dbf4b +Subproject commit acb79818f17b823827ff39871ea53ae3be0a9f1d
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 97bd13cb5ee3889f1bbd7c2241adffa6b0192233 Author: Alain Romedenne AuthorDate: Fri Feb 23 19:09:49 2024 +0100 Commit: Gerrit Code Review CommitDate: Fri Feb 23 19:09:49 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ccaaa4f92689eb5d0de49bf4f47808fac6b63513 - ScriptForge help typos - ScriptForge.Document.FileSystem property applies to Base docs too - ScriptForge.Base.FormDocuments() method requires a precision Change-Id: Ifad3a6008e9fba37b9ca49ce144ac7b4421b5124 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163835 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index a7bbc45948d6..ccaaa4f92689 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a7bbc45948d6e0e6f5ba22aa38d2587e1f4053fe +Subproject commit ccaaa4f92689eb5d0de49bf4f47808fac6b63513
help.git: source/text
source/text/sbasic/shared/03/sf_base.xhp |2 +- source/text/sbasic/shared/03/sf_document.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ccaaa4f92689eb5d0de49bf4f47808fac6b63513 Author: Alain Romedenne AuthorDate: Fri Feb 23 17:46:40 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Fri Feb 23 19:09:49 2024 +0100 ScriptForge help typos - ScriptForge.Document.FileSystem property applies to Base docs too - ScriptForge.Base.FormDocuments() method requires a precision Change-Id: Ifad3a6008e9fba37b9ca49ce144ac7b4421b5124 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163835 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/sbasic/shared/03/sf_base.xhp b/source/text/sbasic/shared/03/sf_base.xhp index bbbdf1909f..f053344466 100644 --- a/source/text/sbasic/shared/03/sf_base.xhp +++ b/source/text/sbasic/shared/03/sf_base.xhp @@ -166,7 +166,7 @@ for formName in myForms: bas.MsgBox(formName) - To learn more about form documents, refer to the Form service help page. + To learn more about form documents, refer to ScriptForge.FormDocument service help page. diff --git a/source/text/sbasic/shared/03/sf_document.xhp b/source/text/sbasic/shared/03/sf_document.xhp index af0890305e..36bd4d36ab 100644 --- a/source/text/sbasic/shared/03/sf_document.xhp +++ b/source/text/sbasic/shared/03/sf_document.xhp @@ -215,7 +215,7 @@ -FileSystem (*) +FileSystem Yes
core.git: odk/examples odk/Package_examples.mk
odk/Package_examples.mk |1 odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/python/DualComponentLoader.py | 70 ++ 2 files changed, 71 insertions(+) New commits: commit 9fdf0913b6b7ac38e5ea9eff19945e127be89339 Author: Alain Romedenne AuthorDate: Thu Nov 23 17:34:04 2023 +0100 Commit: Hossein CommitDate: Thu Feb 22 09:10:33 2024 +0100 SDK - 1st Steps example code enhancement Python example extended in order to be equally callable from LibO client Change-Id: Ib2d733809e960971b98c30cbd6368ebc755dd7ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159767 Tested-by: Jenkins Reviewed-by: Hossein diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk index eb6c3563c5f5..9d84dc6620de 100644 --- a/odk/Package_examples.mk +++ b/odk/Package_examples.mk @@ -184,6 +184,7 @@ $(eval $(call gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples, DevelopersGuide/FirstSteps/FirstLoadComponent/java/Makefile \ DevelopersGuide/FirstSteps/FirstLoadComponent/basic/FirstLoadComponent.bas \ DevelopersGuide/FirstSteps/FirstLoadComponent/python/FirstLoadComponent.py \ + DevelopersGuide/FirstSteps/FirstLoadComponent/python/DualComponentLoader.py \ DevelopersGuide/FirstSteps/HelloTextTableShape/java/HelloTextTableShape.java \ DevelopersGuide/FirstSteps/HelloTextTableShape/java/Makefile \ DevelopersGuide/FirstSteps/HelloTextTableShape/basic/HelloTextTableShape.bas \ diff --git a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/python/DualComponentLoader.py b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/python/DualComponentLoader.py new file mode 100644 index ..b154ae306080 --- /dev/null +++ b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/python/DualComponentLoader.py @@ -0,0 +1,70 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- +# +# 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/. +# + +import uno +import officehelper +import sys +import traceback +from com.sun.star.sheet.CellFlags import FORMULA + +def main(ctx=None): +try: +if ctx is None: # Execution triggered via Office client +ctx = uno.getComponentContext() +if ctx is None: +print("ERROR: Python UNO runtime is absent.") +sys.exit(1) +srv_mgr = ctx.getServiceManager() +desktop = srv_mgr.createInstanceWithContext("com.sun.star.frame.Desktop", ctx) +spreadsheet_component = desktop.loadComponentFromURL("private:factory/scalc", "_blank", 0, tuple()) +spreadsheets = spreadsheet_component.getSheets() +spreadsheets.insertNewByName("MySheet", 0) +elem_type = spreadsheets.getElementType() +print(elem_type) +sheet = spreadsheets.getByName("MySheet") +cell = sheet.getCellByPosition(0, 0) +cell.setValue(21) +cell = sheet.getCellByPosition(0, 1) +cell.setValue(21) +cell = sheet.getCellByPosition(0, 2) +cell.setFormula("=sum(A1:A2)") + +cell.setPropertyValue("CellStyle", "Result") + +spreadsheet_controller = spreadsheet_component.getCurrentController() +spreadsheet_controller.setActiveSheet(sheet) +cell.setPropertyValue("VertJustify", "com.sun.star.table.CellVertJustify.TOP") +formula_cells = sheet.queryContentCells(FORMULA) +formulas = formula_cells.getCells() +formula_enum = formulas.createEnumeration() + +while formula_enum.hasMoreElements(): +formula_cell = formula_enum.nextElement() +print("Formula cell in column " + str(formula_cell.getCellAddress().Column) + + ", row " + str(formula_cell.getCellAddress().Row) + + " contains " + cell.getFormula()) + +except Exception as e: +print(e) +traceback.print_exc() +sys.exit(1) + +# Entry point for LO client via +# Tools - Macros - Run macro... menu +g_exportedScripts = (main,) + +# Entry point for Python console or Python IDEs +if __name__ == "__main__": +remote_context = officehelper.bootstrap() +if remote_context is None: +print("ERROR: Could not bootstrap default Office.") +sys.exit(1) +main(remote_context) + +# vim: set shiftwidth=4 softtabstop=4 expandtab:
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d0e501021dac1a16d93e0e17235b399072d0058c Author: Alain Romedenne AuthorDate: Tue Feb 20 19:42:14 2024 +0100 Commit: Gerrit Code Review CommitDate: Tue Feb 20 19:42:14 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 6dfa12485814931cf7161b53561940cb976116df - typo in sf_Document help Change-Id: I27eedb23bb03a38510df9338245725d323c168b7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163616 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 636cd8ca2952..6dfa12485814 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 636cd8ca2952a6a1a386549b38cecf2380a35241 +Subproject commit 6dfa12485814931cf7161b53561940cb976116df
help.git: source/text
source/text/sbasic/shared/03/sf_calc.xhp | 10 +++-- source/text/sbasic/shared/03/sf_document.xhp | 47 ++- source/text/sbasic/shared/03/sf_writer.xhp | 42 ++-- 3 files changed, 50 insertions(+), 49 deletions(-) New commits: commit 6dfa12485814931cf7161b53561940cb976116df Author: Alain Romedenne AuthorDate: Tue Feb 20 17:10:38 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Feb 20 19:42:13 2024 +0100 typo in sf_Document help Change-Id: I27eedb23bb03a38510df9338245725d323c168b7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163616 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/sbasic/shared/03/sf_calc.xhp b/source/text/sbasic/shared/03/sf_calc.xhp index cc2f274405..34040f40d1 100644 --- a/source/text/sbasic/shared/03/sf_calc.xhp +++ b/source/text/sbasic/shared/03/sf_calc.xhp @@ -558,11 +558,11 @@ CreateChart CreatePivotTable DAvg + DCount - DCount DMax DMin DSum @@ -573,15 +573,16 @@ GetValue ImportFromCSVFile ImportFromDatabase + ImportStylesFromFile InsertSheet MoveRange MoveSheet Offset + OpenRangeSelector - OpenRangeSelector PrintOut Printf RemoveDuplicates @@ -595,7 +596,7 @@ ShiftLeft ShiftRight ShiftUp - SortRange + SortRange @@ -1162,7 +1163,6 @@ To learn more about Pivot Tables in %PRODUCTNAME Calc, read the Pivot Table help page. - DAvg, DCount, DMax, DMin, DSum -- @@ -1443,6 +1443,8 @@ + + InsertSheet -- diff --git a/source/text/sbasic/shared/03/sf_document.xhp b/source/text/sbasic/shared/03/sf_document.xhp index 3f1776e72d..af0890305e 100644 --- a/source/text/sbasic/shared/03/sf_document.xhp +++ b/source/text/sbasic/shared/03/sf_document.xhp @@ -395,26 +395,25 @@ Activate CloseDocument CreateMenu - DeleteStyles + DeleteStyles Echo ExportAsPDF - ImportStylesFromFile PrintOut RemoveMenu RunCommand Save - SaveAs + SaveAs SaveCopyAs SetPrinter - Style + Style Toolbars XStyle @@ -534,13 +533,13 @@ Suppresses a single style or an array of styles given by their names within a specific styles family. Only user-defined styles may be deleted, built-in styles are ignored. It applies to all document types except Base and FormDocument. -svc.DeleteStyles(family: str, stylelist: str[1..*]) +svc.DeleteStyles(family: str, styleslist: str[1..*]) family: One of the style families present in the actual document, as a case-sensitive string. Valid family names can be retrieved using StyleFamilies property. - stylelist: A single style name as a string or an array of style names. The style names may be localized or not. The StylesList is typically the output of the execution of a Styles() method. + styleslist: A single style name as a string or an array of style names. The style names may be localized or not. The StylesList is typically the output of the execution of a Styles() method. @@ -638,42 +637,6 @@ - - ImportStylesFromFile - -Document service;ImportStylesFromFile - - ImportStylesFromFile - This method loads all the styles belonging to one or more style families from a closed file into the actual document. The actual document must be a Calc or a Writer document. - Are always imported together: - - -ParagraphStyles and CharacterStyles - - -NumberingStyles and ListStyles - - - Returns True if styles were successfully imported. - - -svc.ImportStylesFromFile(filename: str, families: str[1..*], overwrite = False): bool - - - filename: The file from which to load the styles in the FileSystem notation. The file is presumed to be of the same document type as the actual document. - families: One of the style families present in the actual document, as a case-sen
help.git: source/text
source/text/sbasic/python/python_shell.xhp | 42 ++--- 1 file changed, 27 insertions(+), 15 deletions(-) New commits: commit d4aff35aba0b2db8179b57b523a94762f55b993a Author: Alain Romedenne AuthorDate: Fri Feb 9 14:15:26 2024 +0100 Commit: Alain Romedenne CommitDate: Mon Feb 19 18:07:13 2024 +0100 Python Shell script update for macOS - Eases the identification of embedded Python with Basic - Launching Python console with Python remains to be improved Change-Id: I4b581770166701a664d0b5209ccbe8362282 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163172 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/python/python_shell.xhp b/source/text/sbasic/python/python_shell.xhp index 2734089c6d..b30444a67a 100644 --- a/source/text/sbasic/python/python_shell.xhp +++ b/source/text/sbasic/python/python_shell.xhp @@ -24,16 +24,37 @@ Running Python Interactive Console The Python interactive console, also known as Python interpreter or Python shell, provides programmers with a quick way to execute commands and try out and test code without creating a file. UNO objects introspection as well as %PRODUCTNAME Python modules documentation can be obtained from the terminal. + -From a full-featured %PRODUCTNAME installed package, use either Basic or Python: + + +Using the Terminal +From a %PRODUCTNAME copy included in a GNU/Linux platform, use the terminal as shown: +whereis or type terminal commands help locate Python interactive console: +user@computer:~$ type -p python3/usr/bin/python3 user@computer:~$ /usr/bin/python3 Python 3.7.5 (default, Nov 20 2019, 09:21:52)[GCC 9.2.1 20191008] on linuxType "help", "copyright", "credits" or "license" for more information.>>> import uno>>> dir(uno)['Any', 'Bool', 'ByteSequence', 'Char', 'Enum', 'PY2', 'Type', '_ConstantGroup', '__builtin__', '__builtins__', '__cached__', '__doc__', '__file__', '__loader__', '__name__', '__package__', '__spec__', '_builtin_import', '_component_context', '_impl_getConstantGroupByName', '_uno_extract_printable_stacktrace', '_uno_import', '_uno_struct__eq__', '_uno_struct__getattr__', '_uno_struct__init__', '_uno_struct__ne__', '_uno_struct__repr__', '_u no_struct__setattr__', '_uno_struct__str__', 'absolutize', 'createUnoStruct', 'fileUrlToSystemPath', 'generateUuid', 'getClass', 'getComponentContext', 'getConstantByName', 'getCurrentContext', 'getTypeByName', 'invoke', 'isInterface', 'os', 'pyuno', 'setCurrentContext', 'six_string_types', 'socket', 'sys', 'systemPathToFileUrl', 'traceback', 'warnings']>>> exit()user@computer:~$ + + + +From a full-featured %PRODUCTNAME installed package, a Basic or Python script locates the embedded copy of Python console. Using a Basic macro +This routine resorts to Plaftform class module in order to distinguish the actual operating system. Sub interpreter_console - Const UNIX = 4 + Set opsys = New Platform ps = CreateUnoService("com.sun.star.util.PathSettings") install_path = ConvertFromURL(ps.Module) - cmd = IIF(GetGuiType()=UNIX,"x-terminal-emulator -e ","") -Shell(cmd + install_path + GetPathSeparator() + "python" ) + If opsys.isMacOSX Then + cmd = "/System/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal " + pgm_path = Array( install_path,"..","Resources","python" ) + ElseIf opsys.isLinux Then + cmd = "x-terminal-emulator -e " + pgm_path = Array(install_path,"python") + ElseIf opsys.isWindows Then + cmd = "" + pgm_path = Array("python") + EndIf + python_interpreter = Join( pgm_path, GetPathSeparator() ) +Shell(cmd + python_interpreter) End Sub @@ -58,25 +79,16 @@ Python Interactive Console - - -Using the Terminal -From a %PRODUCTNAME copy included in a GNU/Linux platform, use the terminal as shown: -whereis or type terminal commands help locate Python interactive console: -user@computer:~$ type -p python3/usr/bin/python3 user@computer:~$ /usr/bin/python3 Python 3.7.5 (default, Nov 20 2019, 09:21:52)[GCC 9.2.1 20191008] on linuxType "help", "copyright", "credits" or "license" for more information.>>> import uno>>> dir(uno)['Any', 'Bool', 'ByteSequence', 'Char', 'Enum', 'PY2', 'Type', '_ConstantGroup', '__builtin__', '__builtins__', '__cached__', '__doc__', '__file__', '__loader__', '__name__', '__package__', '__spec__', '_builtin_import', '_component_context', '_impl_getConstantGroupByName', '_uno_extract_printable_stacktrace', '_uno_import', '_uno_struct__eq__', '_uno_struct__getattr__', '_uno_struct__init__', '_uno_struct__ne__', '_uno_struc
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f6f325d58d74e95c5c173a88a0a7a0de10bb0f8b Author: Alain Romedenne AuthorDate: Mon Feb 12 17:40:43 2024 +0100 Commit: Gerrit Code Review CommitDate: Mon Feb 12 17:40:43 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 9e7c3f2c9147f60b6b9ba0a328951c094e133097 - DataSheet help correction Change-Id: I3570ad7818df85f2dda3bbe81ecea59c9f16527f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163182 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 84b2341aeb07..9e7c3f2c9147 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 84b2341aeb073ecc7d29228d9ddedc1ee0677a32 +Subproject commit 9e7c3f2c9147f60b6b9ba0a328951c094e133097
help.git: source/text
source/text/sbasic/shared/03/sf_datasheet.xhp |1 - 1 file changed, 1 deletion(-) New commits: commit 9e7c3f2c9147f60b6b9ba0a328951c094e133097 Author: Alain Romedenne AuthorDate: Mon Feb 12 11:27:38 2024 +0100 Commit: Alain Romedenne CommitDate: Mon Feb 12 17:40:42 2024 +0100 DataSheet help correction Change-Id: I3570ad7818df85f2dda3bbe81ecea59c9f16527f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163182 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03/sf_datasheet.xhp b/source/text/sbasic/shared/03/sf_datasheet.xhp index 803c7e694b..c503d35a4b 100644 --- a/source/text/sbasic/shared/03/sf_datasheet.xhp +++ b/source/text/sbasic/shared/03/sf_datasheet.xhp @@ -449,7 +449,6 @@ GoToCell Moves the cursor to the specified row and column. -This method does not change the position of the cursor in the data view window. svc.GoToCell(opt row: int, opt column: any): bool
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3c39de6bdd46edd3e8ce1aeca7f15ed93cf34659 Author: Alain Romedenne AuthorDate: Fri Feb 2 16:19:32 2024 +0100 Commit: Gerrit Code Review CommitDate: Fri Feb 2 16:19:32 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to a9733f825b5a4d316227d1a275c59e1ab5327375 - SF_Toc correction Change-Id: I1abd145c121a623ed9c8f62bdfac07eb03a559ff Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162892 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 10c11a706ac0..a9733f825b5a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 10c11a706ac08e4324a9439e42c748417c0e7f47 +Subproject commit a9733f825b5a4d316227d1a275c59e1ab5327375
help.git: source/text
source/text/sbasic/shared/03/sf_toc.xhp|1 + source/text/sbasic/shared/03/sf_writer.xhp |2 ++ 2 files changed, 3 insertions(+) New commits: commit a9733f825b5a4d316227d1a275c59e1ab5327375 Author: Alain Romedenne AuthorDate: Thu Feb 1 16:12:37 2024 +0100 Commit: Alain Romedenne CommitDate: Fri Feb 2 16:19:32 2024 +0100 SF_Toc correction Change-Id: I1abd145c121a623ed9c8f62bdfac07eb03a559ff Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162892 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03/sf_toc.xhp b/source/text/sbasic/shared/03/sf_toc.xhp index 5485646d13..a194614005 100644 --- a/source/text/sbasic/shared/03/sf_toc.xhp +++ b/source/text/sbasic/shared/03/sf_toc.xhp @@ -940,6 +940,7 @@ + diff --git a/source/text/sbasic/shared/03/sf_writer.xhp b/source/text/sbasic/shared/03/sf_writer.xhp index 46de70179a..27b3a8f295 100644 --- a/source/text/sbasic/shared/03/sf_writer.xhp +++ b/source/text/sbasic/shared/03/sf_writer.xhp @@ -85,6 +85,7 @@ Properties Methods + List of Methods in the Writer Service @@ -107,6 +108,7 @@ + Forms -
help.git: source/text
source/text/sbasic/shared/03/sf_toc.xhp |9 +--- source/text/sbasic/shared/03/sf_ui.xhp | 71 ++-- 2 files changed, 45 insertions(+), 35 deletions(-) New commits: commit 4b6dc2bb6c67853f31c6059ca1b8fda32f00d751 Author: Alain Romedenne AuthorDate: Fri Jan 12 13:46:05 2024 +0100 Commit: Alain Romedenne CommitDate: Mon Jan 15 14:04:11 2024 +0100 Update SF_UI help page ui.Documents() must be defined as a method - instead of a property - in order for Python scripters not to be confused. Change-Id: Ic43c0bc212f914d2971d2366cb9b6c21e5fd6052 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161946 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03/sf_toc.xhp b/source/text/sbasic/shared/03/sf_toc.xhp index c622700c29..5485646d13 100644 --- a/source/text/sbasic/shared/03/sf_toc.xhp +++ b/source/text/sbasic/shared/03/sf_toc.xhp @@ -1050,22 +1050,21 @@ ActiveWindow -Documents Height - +MACROEXECALWAYS + -MACROEXECALWAYS MACROEXECNEVER MACROEXECNORMAL +Width -Width X -Y +Y diff --git a/source/text/sbasic/shared/03/sf_ui.xhp b/source/text/sbasic/shared/03/sf_ui.xhp index 4627c1165d..6090a39476 100644 --- a/source/text/sbasic/shared/03/sf_ui.xhp +++ b/source/text/sbasic/shared/03/sf_ui.xhp @@ -35,7 +35,7 @@ Statusbar settings - Display of a floating progress bar + Display of a floating progress bar Creation of new windows @@ -124,20 +124,6 @@ a valid and unique WindowName for the currently active window. When the window cannot be identified, a zero-length string is returned. - - - Documents - - - Yes - - - String array - - - The list of the currently open documents. Special windows are ignored. This list consists of a zero-based one dimensional array either of filenames (in SF_FileSystem.FileNaming notation) or of window titles for unsaved documents. - - Height @@ -251,10 +237,10 @@ The examples below show a MsgBox with the names of all currently open documents. - Dim openDocs as Object, strDocs as String + Dim openDocs As Object, strDocs As String Set openDocs = ui.Documents() strDocs = openDocs(0) - For i = 1 to UBound(openDocs) + For i = 1 To UBound(openDocs) strDocs = strDocs & Chr(10) & openDocs(i) Next i MsgBox strDocs @@ -280,14 +266,15 @@ Activate CreateBaseDocument CreateDocument (*) - GetDocument - Maximize + Documents + GetDocument + Maximize Minimize OpenBaseDocument OpenDocument (*) - Resize + Resize RunCommand @@ -336,7 +323,7 @@ svc.CreateBaseDocument(filename: str, embeddeddatabase: str = 'HSQLDB', registrationname: str = '', opt calcfilename: str): svc - filename : Identifies the file to create. It must follow the SF_FileSystem.FileNaming notation. If the file already exists, it is overwritten without warning + filename : Identifies the file to create. It must follow the SF_FileSystem.FileNaming notation. If the file already exists, it is overwritten without warning. embeddeddatabase : Either "HSQLDB" (default), "FIREBIRD" or "CALC". registrationname : The name used to store the new database in the databases register. When = "" (default), no registration takes place. If the name already exists it is overwritten without warning. calcfilename : Only when embeddeddatabase = "CALC", calcfilename represents the file containing the tables as Calc sheets. The file must exist or an error is raised. @@ -362,7 +349,7 @@ UI service;CreateDocument CreateDocument (*) - Create a new %PRODUCTNAME document of a given type or based on a given template. The method returns a document object. + Create a new %PRODUCTNAME document of a given type or based on a given template. The method returns an instance of the document class or one of its subclasses (Calc, Writer). svc.CreateDocument(documenttype: str = '', templatefile: str = '', hidden: bool = False): svc @@ -388,13 +375,37 @@ + +Documents -- + + UI service;Documents + + Documents + The list of the currently open documents. Special windows are ig
core.git: 2 commits - helpcontent2 svl/source
helpcontent2 |2 +- svl/source/items/itemset.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 8a48869ec1635a59237c244bea394eee2112daef Author: Alain Romedenne AuthorDate: Mon Jan 15 14:04:12 2024 +0100 Commit: Gerrit Code Review CommitDate: Mon Jan 15 14:04:12 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 4b6dc2bb6c67853f31c6059ca1b8fda32f00d751 - Update SF_UI help page ui.Documents() must be defined as a method - instead of a property - in order for Python scripters not to be confused. Change-Id: Ic43c0bc212f914d2971d2366cb9b6c21e5fd6052 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161946 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index d33c78198fbb..4b6dc2bb6c67 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d33c78198fbb0d56f08eb265d6ce432b1a7f66b1 +Subproject commit 4b6dc2bb6c67853f31c6059ca1b8fda32f00d751 commit 02923a0507f19aafc5f8a57fd540e8267c22481e Author: Andrea Gelmini AuthorDate: Fri Jan 12 15:05:50 2024 +0100 Commit: Julien Nabet CommitDate: Mon Jan 15 14:04:06 2024 +0100 Fix typo Change-Id: Ic65f4cff636d67d94cb0cafc4f75f3bb57190c99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161976 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index e734561558e1..c2ac95207f22 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -355,7 +355,7 @@ SfxPoolItem const* implCreateItemEntry(SfxItemPool& rPool, SfxPoolItem const* pS // } // else if (IsDefaultItem(pSource)) // { -// assert(!bPassingOwnership && "ITEM: PassingOwnership not possible combined with DynaimcDefault (!)"); +// assert(!bPassingOwnership && "ITEM: PassingOwnership not possible combined with DynamicDefault (!)"); // const SfxPoolItem* pDynamic(pTargetPool->GetPoolDefaultItem(nWhich)); // if (nullptr != pDynamic) // {
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 33925cfe33703b6b7b8979727f826c2b735f916c Author: Alain Romedenne AuthorDate: Thu Dec 21 15:17:40 2023 +0100 Commit: Gerrit Code Review CommitDate: Thu Dec 21 15:17:40 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 89b8eaffddb9e3cd462eed1090d00a3dbd3a1652 - SF_Datasheet table of methods layout correction Change-Id: I3574860ab19e8171e86b6e4417364ef34d68b54b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161098 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 1ba5e041e6e4..89b8eaffddb9 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1ba5e041e6e4e259a69160b90afed882c8c0f664 +Subproject commit 89b8eaffddb9e3cd462eed1090d00a3dbd3a1652
help.git: source/text
source/text/sbasic/shared/03/sf_datasheet.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 89b8eaffddb9e3cd462eed1090d00a3dbd3a1652 Author: Alain Romedenne AuthorDate: Thu Dec 21 13:36:41 2023 +0100 Commit: Alain Romedenne CommitDate: Thu Dec 21 15:17:40 2023 +0100 SF_Datasheet table of methods layout correction Change-Id: I3574860ab19e8171e86b6e4417364ef34d68b54b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161098 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03/sf_datasheet.xhp b/source/text/sbasic/shared/03/sf_datasheet.xhp index 80463a5e2a..803c7e694b 100644 --- a/source/text/sbasic/shared/03/sf_datasheet.xhp +++ b/source/text/sbasic/shared/03/sf_datasheet.xhp @@ -295,13 +295,13 @@ GetText GetValue - GoToCell + GoToCell RemoveMenu - Toolbars + Toolbars
core.git: Branch 'libreoffice-24-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 038e82c20ce50ca4d9005a1f6bc948bb73222fc0 Author: Alain Romedenne AuthorDate: Wed Dec 13 01:33:33 2023 +0100 Commit: Gerrit Code Review CommitDate: Wed Dec 13 01:33:33 2023 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-24-2' to 34d2d83e4d33982fa31a3b6ba0b4f6c51ca9255d - Add Toolbars() method in various SF services + toc Change-Id: I1109429a42d28f6be2eecabfe727bf146d1cd927 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160368 Tested-by: Jenkins Reviewed-by: Alain Romedenne (cherry picked from commit a47d92625a2921bcf56d72593bf33f5a8b87b768) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160635 Reviewed-by: Rafael Lima diff --git a/helpcontent2 b/helpcontent2 index b34d255751b2..34d2d83e4d33 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b34d255751b25b1de5b3c680336bd8e9bac31264 +Subproject commit 34d2d83e4d33982fa31a3b6ba0b4f6c51ca9255d
help.git: Branch 'libreoffice-24-2' - source/text
source/text/sbasic/shared/03/sf_datasheet.xhp | 15 +-- source/text/sbasic/shared/03/sf_document.xhp | 33 -- source/text/sbasic/shared/03/sf_toc.xhp |3 ++ source/text/sbasic/shared/03/sf_toolbar.xhp |2 - 4 files changed, 42 insertions(+), 11 deletions(-) New commits: commit 34d2d83e4d33982fa31a3b6ba0b4f6c51ca9255d Author: Alain Romedenne AuthorDate: Fri Dec 8 11:10:21 2023 +0100 Commit: Olivier Hallot CommitDate: Wed Dec 13 01:33:33 2023 +0100 Add Toolbars() method in various SF services + toc Change-Id: I1109429a42d28f6be2eecabfe727bf146d1cd927 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160368 Tested-by: Jenkins Reviewed-by: Alain Romedenne (cherry picked from commit a47d92625a2921bcf56d72593bf33f5a8b87b768) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160635 Reviewed-by: Rafael Lima diff --git a/source/text/sbasic/shared/03/sf_datasheet.xhp b/source/text/sbasic/shared/03/sf_datasheet.xhp index 44acdbed4d..80463a5e2a 100644 --- a/source/text/sbasic/shared/03/sf_datasheet.xhp +++ b/source/text/sbasic/shared/03/sf_datasheet.xhp @@ -294,13 +294,14 @@ GetText - GetValue + GetValue + GoToCell - GoToCell - RemoveMenu + RemoveMenu + Toolbars @@ -503,6 +504,14 @@ + + Toolbars -- + + Datasheet service;Toolbars + + + + diff --git a/source/text/sbasic/shared/03/sf_document.xhp b/source/text/sbasic/shared/03/sf_document.xhp index 4c9d927507..eb4893dfc1 100644 --- a/source/text/sbasic/shared/03/sf_document.xhp +++ b/source/text/sbasic/shared/03/sf_document.xhp @@ -421,7 +421,8 @@ - + + Activate @@ -477,6 +478,7 @@ # ... + CreateMenu - @@ -522,6 +524,7 @@ Refer to the SFWidgets.Menu help page to learn more about how to create/remove menus in %PRODUCTNAME document windows. + DeleteStyles - @@ -553,6 +556,7 @@ doc.Styles('ParagraphStyles', a_list) + Echo @@ -586,6 +590,7 @@ doc.Echo() + ExportAsPDF @@ -632,6 +637,7 @@ doc.ExportAsPDF(r"C:\User\Documents\myFile.pdf") + ImportStylesFromFile @@ -667,6 +673,7 @@ doc.ImportStylesFromFile('C:\User\Documents\myFile.ods', ("ParagraphStyles",), False) + PrintOut @@ -695,6 +702,7 @@ # ... + RemoveMenu - @@ -724,6 +732,7 @@ + RunCommand --- @@ -770,6 +779,7 @@ Each %PRODUCTNAME component has its own set of commands available. One easy way to learn commands is going to Tools - Customize - Keyboard. When you position your mouse over a function in the Function list, a tooltip will appear with the corresponding UNO command. + Save @@ -796,6 +806,7 @@ # ... + SaveAs --- @@ -825,6 +836,7 @@ doc.SaveAs(r"C:\Documents\NewCopy.odt", overwrite = True) + SaveCopyAs --- @@ -854,6 +866,7 @@ doc.SaveCopyAs(r"C:\Documents\Copy2.odt", overwrite = True) + SetPrinter --- @@ -882,6 +895,7 @@ doc.SetPrinter(paperformat='TABLOID') + Styles - @@ -927,20 +941,22 @@ vStyles = doc.Styles('ParagraphStyles', ParentStyle = 'Standard") # All styles derived from the "Default Paragraph Style" + XStyles - Document service;Toolbars + + Method definition is reused in various SF services --
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c1efe3f73c02b6759afdbe71ee815b503e82381b Author: Alain Romedenne AuthorDate: Tue Dec 12 19:49:44 2023 +0100 Commit: Gerrit Code Review CommitDate: Tue Dec 12 19:49:44 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to a47d92625a2921bcf56d72593bf33f5a8b87b768 - Add Toolbars() method in various SF services + toc Change-Id: I1109429a42d28f6be2eecabfe727bf146d1cd927 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160368 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 53a2884e42a1..a47d92625a29 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 53a2884e42a11e02e747aba28a57563a68e1c1c5 +Subproject commit a47d92625a2921bcf56d72593bf33f5a8b87b768
help.git: source/text
source/text/sbasic/shared/03/sf_datasheet.xhp | 15 +-- source/text/sbasic/shared/03/sf_document.xhp | 33 -- source/text/sbasic/shared/03/sf_toc.xhp |3 ++ source/text/sbasic/shared/03/sf_toolbar.xhp |2 - 4 files changed, 42 insertions(+), 11 deletions(-) New commits: commit a47d92625a2921bcf56d72593bf33f5a8b87b768 Author: Alain Romedenne AuthorDate: Fri Dec 8 11:10:21 2023 +0100 Commit: Alain Romedenne CommitDate: Tue Dec 12 19:49:44 2023 +0100 Add Toolbars() method in various SF services + toc Change-Id: I1109429a42d28f6be2eecabfe727bf146d1cd927 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160368 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03/sf_datasheet.xhp b/source/text/sbasic/shared/03/sf_datasheet.xhp index 44acdbed4d..80463a5e2a 100644 --- a/source/text/sbasic/shared/03/sf_datasheet.xhp +++ b/source/text/sbasic/shared/03/sf_datasheet.xhp @@ -294,13 +294,14 @@ GetText - GetValue + GetValue + GoToCell - GoToCell - RemoveMenu + RemoveMenu + Toolbars @@ -503,6 +504,14 @@ + + Toolbars -- + + Datasheet service;Toolbars + + + + diff --git a/source/text/sbasic/shared/03/sf_document.xhp b/source/text/sbasic/shared/03/sf_document.xhp index 4c9d927507..eb4893dfc1 100644 --- a/source/text/sbasic/shared/03/sf_document.xhp +++ b/source/text/sbasic/shared/03/sf_document.xhp @@ -421,7 +421,8 @@ - + + Activate @@ -477,6 +478,7 @@ # ... + CreateMenu - @@ -522,6 +524,7 @@ Refer to the SFWidgets.Menu help page to learn more about how to create/remove menus in %PRODUCTNAME document windows. + DeleteStyles - @@ -553,6 +556,7 @@ doc.Styles('ParagraphStyles', a_list) + Echo @@ -586,6 +590,7 @@ doc.Echo() + ExportAsPDF @@ -632,6 +637,7 @@ doc.ExportAsPDF(r"C:\User\Documents\myFile.pdf") + ImportStylesFromFile @@ -667,6 +673,7 @@ doc.ImportStylesFromFile('C:\User\Documents\myFile.ods', ("ParagraphStyles",), False) + PrintOut @@ -695,6 +702,7 @@ # ... + RemoveMenu - @@ -724,6 +732,7 @@ + RunCommand --- @@ -770,6 +779,7 @@ Each %PRODUCTNAME component has its own set of commands available. One easy way to learn commands is going to Tools - Customize - Keyboard. When you position your mouse over a function in the Function list, a tooltip will appear with the corresponding UNO command. + Save @@ -796,6 +806,7 @@ # ... + SaveAs --- @@ -825,6 +836,7 @@ doc.SaveAs(r"C:\Documents\NewCopy.odt", overwrite = True) + SaveCopyAs --- @@ -854,6 +866,7 @@ doc.SaveCopyAs(r"C:\Documents\Copy2.odt", overwrite = True) + SetPrinter --- @@ -882,6 +895,7 @@ doc.SetPrinter(paperformat='TABLOID') + Styles - @@ -927,20 +941,22 @@ vStyles = doc.Styles('ParagraphStyles', ParentStyle = 'Standard") # All styles derived from the "Default Paragraph Style" + XStyles - Document service;Toolbars + + Method definition is reused in various SF services -- Toolbars - This method returns either a list of the available toolbar names in the actual document or a Toolbar object instanc
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7af3df52876f7fd463aef744083242cce07c001 Author: Alain Romedenne AuthorDate: Thu Dec 7 15:53:19 2023 +0100 Commit: Gerrit Code Review CommitDate: Thu Dec 7 15:53:19 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to e14d56e82ecb749cbb965dfaca447c72d9a3ca04 - sf_toc updates - Old missing properties - New properties Change-Id: I7e95dcf99917bfddc7c478e7ff068f3adad190d3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160364 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 77f51afc9223..e14d56e82ecb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 77f51afc9223e752950b42306385cbbcbdf24473 +Subproject commit e14d56e82ecb749cbb965dfaca447c72d9a3ca04
help.git: source/text
source/text/sbasic/shared/03/sf_toc.xhp |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit e14d56e82ecb749cbb965dfaca447c72d9a3ca04 Author: Alain Romedenne AuthorDate: Thu Dec 7 15:47:49 2023 +0100 Commit: Alain Romedenne CommitDate: Thu Dec 7 15:53:18 2023 +0100 sf_toc updates - Old missing properties - New properties Change-Id: I7e95dcf99917bfddc7c478e7ff068f3adad190d3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160364 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03/sf_toc.xhp b/source/text/sbasic/shared/03/sf_toc.xhp index 084461928f..fb158cc0ac 100644 --- a/source/text/sbasic/shared/03/sf_toc.xhp +++ b/source/text/sbasic/shared/03/sf_toc.xhp @@ -425,26 +425,29 @@ DocumentType ExportFilters FileSystem +ImportFilters -ImportFilters IsBase IsCalc IsDraw +IsFormDocument IsImpress IsMath +IsWriter -IsWriter Keywords Readonly +StyleFamilies Subject Title XComponent +XDocumentSettings
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5935620f27276aa86fbc4886379bb9ca50431da7 Author: Alain Romedenne AuthorDate: Thu Dec 7 15:52:48 2023 +0100 Commit: Gerrit Code Review CommitDate: Thu Dec 7 15:52:48 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 77f51afc9223e752950b42306385cbbcbdf24473 - ScriptForge (SF_Document) new XDocumentSettings property + Styles management + Toolbars Change-Id: I3c9b979a26a44aadb8dff0ab18122e1fb32ccb2a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/158903 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index d20e738f1a2a..77f51afc9223 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d20e738f1a2ace6618ad217ad42b17aac69e5762 +Subproject commit 77f51afc9223e752950b42306385cbbcbdf24473
help.git: source/text
source/text/sbasic/shared/03/sf_document.xhp | 242 +++ 1 file changed, 209 insertions(+), 33 deletions(-) New commits: commit 77f51afc9223e752950b42306385cbbcbdf24473 Author: Alain Romedenne AuthorDate: Mon Nov 6 16:41:12 2023 +0100 Commit: Alain Romedenne CommitDate: Thu Dec 7 15:52:47 2023 +0100 ScriptForge (SF_Document) new XDocumentSettings property + Styles management + Toolbars Change-Id: I3c9b979a26a44aadb8dff0ab18122e1fb32ccb2a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/158903 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03/sf_document.xhp b/source/text/sbasic/shared/03/sf_document.xhp index fa59801c3f..4c9d927507 100644 --- a/source/text/sbasic/shared/03/sf_document.xhp +++ b/source/text/sbasic/shared/03/sf_document.xhp @@ -8,21 +8,18 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * --> - SFDocuments.Document service /text/sbasic/shared/03/sf_document.xhp - Document service - SFDocuments.Document service The SFDocuments library provides methods and properties to facilitate the management and manipulation of %PRODUCTNAME documents. @@ -36,15 +33,12 @@ - The properties, methods or arguments marked with (*) are NOT applicable to Base documents. Methods and properties that are specific to certain %PRODUCTNAME components are stored in separate services, such as SFDocuments.SF_Calc and SFDocuments.SF_Base. Although the Basic language does not offer inheritance between object classes, the latter services may be considered as subclasses of the SFDocuments.Document service. Such subclasses can invoke the properties and methods described below. - Service invocation Before using the Document service the ScriptForge library needs to be loaded or imported: - Below are three variants of how the Document service can be invoked. Using the getDocument method from the ScriptForge.UI service: @@ -106,7 +100,6 @@ # (...) The use of the prefix "SFDocuments." while calling the service is optional. - API;Duration API;XComponent @@ -121,13 +114,17 @@ Document service;IsBase property Document service;IsCalc property Document service;IsDraw property +Document service;IsFormDocument property Document service;IsImpress property Document service;IsMath property Document service;IsWriter property Document service;Keywords property Document service;Readonly property +Document service;StyleFamilies property Document service;Subject property Document service;Title property +Document service;XComponent property +Document service;XDocumentSettings property Properties @@ -204,7 +201,7 @@ -ExportFilters +ExportFilters (*) Yes @@ -218,7 +215,7 @@ -FileSystem +FileSystem (*) Yes @@ -233,7 +230,7 @@ -ImportFilters +ImportFilters (*) Yes @@ -291,13 +288,27 @@ -Subject (*) +StyleFamilies (*) + + +Yes + + +String array + + +List of available style families. Applicable to all document types except Base. + + + + +Subject (*) No -String +String Gives access to the Subject property of the document. @@ -319,7 +330,7 @@ -XComponent +XComponent Yes @@ -328,12 +339,25 @@ UNO Object -The UNO object https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XComponent.html";>com.sun.star.lang.XComponent or https://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1sdb_1_1OfficeDatabaseDocument.html";>com.sun.star.comp.dba.ODatabaseDocument representing the document +The UNO object https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XComponent.html";>com.sun.star.lang.XComponent or https://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1sdb_1_1OfficeDatabaseDocument.html";>com.sun.star.comp.dba.ODatabaseDocument representing the document. + + + + +XDocumentSettings (*) + + +Yes + + +UNO Object + + +A com.sun.star.XXX.DocumentSettings UNO object - where XXX is sheet, text, drawing or presentation - that gives access to UNO internal properties, that are sp
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3b354c2ee5944917c0603615b7738ef234059414 Author: Alain Romedenne AuthorDate: Sun Dec 3 10:09:40 2023 +0100 Commit: Gerrit Code Review CommitDate: Sun Dec 3 10:09:40 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 3b321caecd0c27ae01afb12924f4f2cb12593dd8 - Python example shared macros documentation Change-Id: If312091c487fd062ec7af24bc4c368bae7b0d748 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160172 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/helpcontent2 b/helpcontent2 index c1e282a84228..3b321caecd0c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c1e282a842285a55a3f42c62dc1d74c60a8fb3e6 +Subproject commit 3b321caecd0c27ae01afb12924f4f2cb12593dd8
[Libreoffice-commits] help.git: source/text
source/text/sbasic/python/python_programming.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3b321caecd0c27ae01afb12924f4f2cb12593dd8 Author: Alain Romedenne AuthorDate: Fri Dec 1 16:54:46 2023 +0100 Commit: Alain Romedenne CommitDate: Sun Dec 3 10:09:40 2023 +0100 Python example shared macros documentation Change-Id: If312091c487fd062ec7af24bc4c368bae7b0d748 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160172 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/source/text/sbasic/python/python_programming.xhp b/source/text/sbasic/python/python_programming.xhp index 92adbebfe6..127dcfec84 100644 --- a/source/text/sbasic/python/python_programming.xhp +++ b/source/text/sbasic/python/python_programming.xhp @@ -198,7 +198,7 @@ -LibreLogo and TableSample installation shared scripts use uno.py module. +LibreLogo, NamedRanges, SetCellColor and TableSample preinstalled scripts use uno.py module. More Python-Basic samples
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 544d8947965b682e24fe109654eee181e6c3b0fd Author: Alain Romedenne AuthorDate: Sun Nov 12 17:37:22 2023 +0200 Commit: Gerrit Code Review CommitDate: Sun Nov 12 16:37:22 2023 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 5cb2f51e2711b1ec587694021376f3169246631b - Typo Change-Id: I4c44f68af3e8c15b715fd103a42f1f77fdcd1dcd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/158815 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 72a81b01ebfa..5cb2f51e2711 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 72a81b01ebfa8e040433b6028b2177395d356a09 +Subproject commit 5cb2f51e2711b1ec587694021376f3169246631b
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_platform.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5cb2f51e2711b1ec587694021376f3169246631b Author: Alain Romedenne AuthorDate: Thu Nov 2 12:34:06 2023 +0200 Commit: Alain Romedenne CommitDate: Sun Nov 12 16:37:22 2023 +0100 Typo Change-Id: I4c44f68af3e8c15b715fd103a42f1f77fdcd1dcd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/158815 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03/sf_platform.xhp b/source/text/sbasic/shared/03/sf_platform.xhp index 2700abaeec..a149af1b8e 100644 --- a/source/text/sbasic/shared/03/sf_platform.xhp +++ b/source/text/sbasic/shared/03/sf_platform.xhp @@ -393,7 +393,7 @@ Dictionary - Returns a Dictionary instance containing key-value pairs with the information found in the Tools - Options - User Data dialog. + Returns a Dictionary instance containing key-value pairs in relation with Tools - Options - User Data dialog.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb68c77168db379d9d805a221a30581962040afb Author: Alain Romedenne AuthorDate: Sun Oct 1 11:05:00 2023 +0200 Commit: Gerrit Code Review CommitDate: Sun Oct 1 11:05:00 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 8313fdfe3877948b51781949448c6439ee08b734 - SF_Dialog help page updates: - missing literals - method signature review - mute Basic & Python Change-Id: I64ceaa4c90c2b4b9e684359a838e4bd0a299c81c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/154127 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/helpcontent2 b/helpcontent2 index 599b75ff934b..8313fdfe3877 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 599b75ff934b46337634daa80282d6a101788dea +Subproject commit 8313fdfe3877948b51781949448c6439ee08b734
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_dialog.xhp | 219 ++--- 1 file changed, 113 insertions(+), 106 deletions(-) New commits: commit 8313fdfe3877948b51781949448c6439ee08b734 Author: Alain Romedenne AuthorDate: Fri Jul 7 10:00:56 2023 +0200 Commit: Alain Romedenne CommitDate: Sun Oct 1 11:04:59 2023 +0200 SF_Dialog help page updates: - missing literals - method signature review - mute Basic & Python Change-Id: I64ceaa4c90c2b4b9e684359a838e4bd0a299c81c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/154127 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/source/text/sbasic/shared/03/sf_dialog.xhp b/source/text/sbasic/shared/03/sf_dialog.xhp index 145a6fc6f0..520e80f60d 100644 --- a/source/text/sbasic/shared/03/sf_dialog.xhp +++ b/source/text/sbasic/shared/03/sf_dialog.xhp @@ -22,7 +22,7 @@ SFDialogs.Dialog service - The Dialog service contributes to the management of dialogs created with the Basic Dialog Editor. Each instance of the current class represents a single dialog box displayed to the user. + The Dialog service contributes to the management of dialogs created with the Basic Dialog Editor or dialogs created on-the-fly. Each instance of the current class represents a single dialog box displayed to the user. A dialog box can be displayed in modal or in non-modal modes. In modal mode, the box is displayed and the execution of the macro process is suspended until one of the OK or Cancel buttons is pressed. In the meantime, user actions executed on the box can trigger specific actions. @@ -63,22 +63,27 @@ Use the string "GlobalScope" as the container argument when the dialog is stored either in My Macros & Dialogs or in Application Macros & Dialogs. The dialog service offers methods that create new controls dynamically in an existing dialog predefined with the Dialog Editor. A dialog is initialized with controls in the Dialog Editor and new controls can be added at run-time before or after the dialog Execute() statement. - - The Dialog service can equally be invoked - through the CreateScriptService method - when creating dialogs on-the-fly; It requires two supplemental positional arguments: + + The Dialog service can equally be invoked - through the CreateScriptService method - when creating dialogs on-the-fly. It requires two supplemental positional arguments after the name of the ad-hoc service "NewDialog": DialogName: A case-sensitive string designating the dialog. - Library: The case-sensitive name of the library where to store the dialog. Default value is "Standard". + Place: Window location of the dialog being either : + + a Basic Array or Python tuple with 4 elements: (X, Y, width, height) + a com.sun.star.awt.Rectangle [X, Y, Width, Height] object + + All elements are expressed in Map AppFont units. Sub newDialog() Dim oDlg As Object - oDlg = CreateScriptService("NewDialog", "myDialog1", "myLib") + oDlg = CreateScriptService("NewDialog", "myDialog1", Array(100,200, 40, 110)) ' ... End Sub Or using Python: def newDialog(): - dlg = CreateScriptService("NewDialog", "myDialog1") # "Standard" library is used -# ... Process controls and do what is needed + dlg = CreateScriptService('NewDialog', 'myDialog1', (100,200, 40, 110)) + # ... Process controls and do what is needed All properties and methods applicable to predefined dialogs are available for such new dialogs. In particular the series of CreateXXX() methods for the addition of new dialog controls. @@ -584,9 +589,11 @@ in the actual dialog. The duplicated control is left unchanged and can be reloca Left, Top: The coordinates of the new control expressed in Map AppFont units. + Set myButton2 = oDlg.CloneControl("Button1", "Button2", 30, 30) + dlg = dlg.CloneControl('Button1', 'Button2', 30, 30) @@ -632,9 +639,9 @@ in the actual dialog. The duplicated control is left unchanged and can be reloca Dialog service;CreateButton CreateButton - Create a new control of type Button in the current dialog. + Create a new control of type Button in the current dialog. - svc.CreateButton(opt ControlName: str, opt Place, Toggle = False, Push = ""): svc + svc.CreateButton(ControlName: str, Place: any, Toggle: bool = False, Push: str = ""): svc ControlName: the name of the new control. It must not exist yet. @@ -654,11 +661,11 @@ in the actual dialog. The duplicated control is left unchanged and can be reloca - Set myButton = oDlg.CreateButton("Button1", Array(20, 20, 60, 15)) + Set myButton = oDlg.CreateButton("Button1", Array(20, 20, 60, 15)) - myButton = dlg.CreateButton('Button1', (20, 20, 60, 15)) + myButton =
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 11419c34eb38b1d15bd83ca8c511346a7bc30537 Author: Alain Romedenne AuthorDate: Thu Jul 6 16:50:40 2023 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 6 16:50:40 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 8714d297f8bd8be89ca8e18a44777bab1e1b7cf0 - SF_Calc updates - sort ranges on more than 3 keys Change-Id: Iff58c0ba38fba93efe4e515702996352cc9d9733 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/154041 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/helpcontent2 b/helpcontent2 index d749df06bd33..8714d297f8bd 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d749df06bd33ae91361b49e456e44b9c8ba859d9 +Subproject commit 8714d297f8bd8be89ca8e18a44777bab1e1b7cf0
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_calc.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8714d297f8bd8be89ca8e18a44777bab1e1b7cf0 Author: Alain Romedenne AuthorDate: Wed Jul 5 17:13:09 2023 +0200 Commit: Alain Romedenne CommitDate: Thu Jul 6 16:50:39 2023 +0200 SF_Calc updates - sort ranges on more than 3 keys Change-Id: Iff58c0ba38fba93efe4e515702996352cc9d9733 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/154041 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/source/text/sbasic/shared/03/sf_calc.xhp b/source/text/sbasic/shared/03/sf_calc.xhp index 3207437689..cc2f274405 100644 --- a/source/text/sbasic/shared/03/sf_calc.xhp +++ b/source/text/sbasic/shared/03/sf_calc.xhp @@ -2087,7 +2087,7 @@ Calc service;SortRange SortRange - Sorts the given range based on a set of columns/rows that are considered as keys. The sorting order may vary by column/row. It returns a string representing the modified range of cells. The size of the modified area is fully determined by the size of the source area. + Sort the given range on any number of columns/rows. The sorting order may vary by column/row. If the number of sort keys is > 3 then the range is sorted several times, by groups of 3 keys, starting from the last key. It returns a string representing the modified range of cells. The size of the modified area is fully determined by the size of the source area. svc.SortRange(range: str, sortkeys: any, sortorder: any = "ASC", destinationcell: str = "", containsheader: bool = False, casesensitive: bool = False, sortcolumns: bool = False): str @@ -2095,7 +2095,7 @@ range: The range to be sorted, as a string. sortkeys: A scalar (if 1 column/row) or an array of column/row numbers starting from 1. - sortorder: A scalar or an array of strings containing the values "ASC" (ascending), "DESC" (descending) or "" (which defaults to ascending). Each item is paired with the corresponding item in sortkeys. If the sortorder array is shorter than sortkeys, the remaining keys are sorted in ascending order. + sortorder: A scalar or an array of strings containing the values "ASC" (ascending), "DESC" (descending). Each item is paired with the corresponding item in sortkeys. If the sortorder array is shorter than sortkeys, the remaining keys are sorted in ascending order. destinationcell: The destination cell of the sorted range of cells, as a string. If a range is given, only its top-left cell is considered. By default the source Range is overwritten. containsheader: When True, the first row/column is not sorted. casesensitive: Only for string comparisons. Default = False
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_dialog.xhp| 135 +- source/text/sbasic/shared/03/sf_dialogcontrol.xhp |4 2 files changed, 110 insertions(+), 29 deletions(-) New commits: commit cd0f9167653bee82301d8635ef5a6ea494739183 Author: Alain Romedenne AuthorDate: Wed Jul 5 11:11:41 2023 +0200 Commit: Alain Romedenne CommitDate: Wed Jul 5 12:23:10 2023 +0200 SFDialogs help pages (final) - new methods: cloneControl, createDialog, OrderTabs - dialog creation on-the-fly Change-Id: I672f6ae27f59efca6a7e4118ce4538cf011cd72d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/154005 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03/sf_dialog.xhp b/source/text/sbasic/shared/03/sf_dialog.xhp index 96d1bd40dc..145a6fc6f0 100644 --- a/source/text/sbasic/shared/03/sf_dialog.xhp +++ b/source/text/sbasic/shared/03/sf_dialog.xhp @@ -34,7 +34,7 @@ Before using the Dialog service the ScriptForge library needs to be loaded or imported: - The Dialog service is invoked through the CreateScriptService method. It requires three positional arguments to specify the dialog box to activate: + The Dialog service is invoked through the CreateScriptService method. It requires three supplemental positional arguments to specify the dialog box to activate: Container: "GlobalScope" for preinstalled libraries or a window name as defined by ScriptForge.UI service. Empty string "" default value stands for the current document. Library: The case-sensitive name of a library contained in the container. Default value is "Standard". DialogName: A case-sensitive string designating the dialog. @@ -62,7 +62,26 @@ dlg.Terminate() Use the string "GlobalScope" as the container argument when the dialog is stored either in My Macros & Dialogs or in Application Macros & Dialogs. - The dialog service offers methods that create new controls dynamically in an existing dialog predefined with the Dialog Editor. A dialog is initialized with controls in the Dialog Editor and new controls can be added at run-time before or after the dialog Execute() statement. + The dialog service offers methods that create new controls dynamically in an existing dialog predefined with the Dialog Editor. A dialog is initialized with controls in the Dialog Editor and new controls can be added at run-time before or after the dialog Execute() statement. + + The Dialog service can equally be invoked - through the CreateScriptService method - when creating dialogs on-the-fly; It requires two supplemental positional arguments: + DialogName: A case-sensitive string designating the dialog. + Library: The case-sensitive name of the library where to store the dialog. Default value is "Standard". + +Sub newDialog() + Dim oDlg As Object + oDlg = CreateScriptService("NewDialog", "myDialog1", "myLib") + ' ... +End Sub + +Or using Python: + +def newDialog(): + dlg = CreateScriptService("NewDialog", "myDialog1") # "Standard" library is used +# ... Process controls and do what is needed + + All properties and methods applicable to predefined dialogs are available for such new dialogs. In particular the series of CreateXXX() methods for the addition +of new dialog controls. Retrieving the Dialog instance that triggered a dialog event An instance of the Dialog service can be retrieved via the SFDialogs.DialogEvent service, provided that the dialog was initiated with the Dialog service. In the example below, oDlg contains the Dialog instance that triggered the dialog event. @@ -80,7 +99,8 @@ # ... Note that in the previous examples, the prefix "SFDialogs." may be omitted when deemed appropriate. - Handling exceptions in event handlers + + Handling exceptions in event handlers When creating an event handler for dialog events it is good practice to handle errors inside the subroutine itself. For instance, suppose the event handler below is called when the mouse button is pressed in the dialog window. Sub OnMouseButtonPressed(ByRef oEvent As Object) @@ -428,6 +448,7 @@ Activate Center Controls + CloneControl CreateButton CreateCheckBox CreateComboBox @@ -442,6 +463,7 @@ CreateFixedText CreateFormattedField CreateGroupBox + CreateHyperlink CreateImageControl CreateListBox CreateNumericField @@ -461,6 +483,7 @@ Execute GetTextsFromL10N Resize + OrderTabs SetPageManager Terminate @@ -545,6 +568,30 @@ + + CloneControl -- +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05c3a3e12e6424d13a777f863921193ab7fe172e Author: Alain Romedenne AuthorDate: Wed Jul 5 12:23:10 2023 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 5 12:23:10 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to cd0f9167653bee82301d8635ef5a6ea494739183 - SFDialogs help pages (final) - new methods: cloneControl, createDialog, OrderTabs - dialog creation on-the-fly Change-Id: I672f6ae27f59efca6a7e4118ce4538cf011cd72d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/154005 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index ccaa099da1de..cd0f9167653b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ccaa099da1def9e89347af3f1759f48f9fa538ba +Subproject commit cd0f9167653bee82301d8635ef5a6ea494739183
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 75f7501f1caae5177ad0ff562eb9f0392a06f9bc Author: Alain Romedenne AuthorDate: Mon Jul 3 17:54:54 2023 +0200 Commit: Gerrit Code Review CommitDate: Mon Jul 3 17:54:54 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 257fec6735fa0d0e57c0c2d0220bd71ce987b947 - SF Dialogs can be dynamic (WiP) cf. https://gerrit.libreoffice.org/c/core/+/151896 Change-Id: I383a2f96394ea69a09265645d63e6dbb730f4e88 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153697 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 00fdaa24ea0d..257fec6735fa 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 00fdaa24ea0de17c8036c3dd594890d6bf666d16 +Subproject commit 257fec6735fa0d0e57c0c2d0220bd71ce987b947
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_dialog.xhp| 599 +- source/text/sbasic/shared/03/sf_dialogcontrol.xhp | 41 + 2 files changed, 625 insertions(+), 15 deletions(-) New commits: commit 257fec6735fa0d0e57c0c2d0220bd71ce987b947 Author: Alain Romedenne AuthorDate: Wed Jun 28 17:17:45 2023 +0200 Commit: Alain Romedenne CommitDate: Mon Jul 3 17:54:53 2023 +0200 SF Dialogs can be dynamic (WiP) cf. https://gerrit.libreoffice.org/c/core/+/151896 Change-Id: I383a2f96394ea69a09265645d63e6dbb730f4e88 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153697 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03/sf_dialog.xhp b/source/text/sbasic/shared/03/sf_dialog.xhp index 9de39dbb4a..f3207c0434 100644 --- a/source/text/sbasic/shared/03/sf_dialog.xhp +++ b/source/text/sbasic/shared/03/sf_dialog.xhp @@ -62,6 +62,7 @@ dlg.Terminate() Use the string "GlobalScope" as the container argument when the dialog is stored either in My Macros & Dialogs or in Application Macros & Dialogs. + The dialog service offers methods that create new controls dynamically in an existing dialog predefined with the Dialog Editor. A dialog is initialized with controls in the Dialog Editor and new controls can be added at run-time before or after the dialog Execute() statement. Retrieving the Dialog instance that triggered a dialog event An instance of the Dialog service can be retrieved via the SFDialogs.DialogEvent service, provided that the dialog was initiated with the Dialog service. In the example below, oDlg contains the Dialog instance that triggered the dialog event. @@ -427,17 +428,38 @@ Activate Center Controls + CreateButton + CreateCheckBox + CreateComboBox + CreateCurrencyField + CreateDateField + CreateFileControl + CreateFixedLine - EndExecute - Execute - GetTextsFromL10N + CreateFixedText + CreateFormattedField + CreateGroupBox + CreateImageControl + CreateListBox + CreateNumericField + CreatePatternField + CreateProgressBar + CreateRadioButton + CreateScrollBar + CreateTableControl + CreateTextField + CreateTimeField + CreateTreeControl + EndExecute + Execute + GetTextsFromL10N Resize SetPageManager Terminate @@ -448,7 +470,7 @@ -Dimensioning a dialog is done by using Map AppFont units. A dialog or control model also uses AppFont units. While their views use pixels. +Dimensioning a dialog is done by using Map AppFont units. A dialog or control model also uses AppFont units. While their views use pixels. @@ -557,6 +579,561 @@ + + CreateButton- + + Dialog service;CreateButton + + CreateButton + Create a new control of type Button in the current dialog. + + svc.CreateButton(opt ControlName: str, opt Place, Toggle = False, Push = ""): svc + + + ControlName: the name of the new control. It must not exist yet. + Place: either … + + a Basic Array or Python tuple with 4 elements: (X, Y, width, height) + a com.sun.star.awt.Rectangle [X, Y, Width, Height] object + + All elements are expressed in Map AppFont units. + + Toggle: when True a Toggle button is created. Default = False + Push: "OK", "CANCEL" or "" (default) + + + An instance of SFDialogs.DialogControl service or Nothing. + + + + + Set myButton = oDlg.CreateButton("Button1", Array(20, 20, 60, 15)) + + + + myButton = dlg.CreateButton('Button1', (20, 20, 60, 15)) + + + + + CreateCheckBox - + + Dialog service;CreateCheckBox + + CreateCheckBox + Create a new control of type CheckBox in the current dialog. + + svc.CreateCheckBox(opt ControlName: str, opt Place, Multiline = False): svc + + MultiLine: When True (default = False), the caption may be displayed on more than one line. + + + + + Set myCheckBox = oDlg.CreateCheckBox("CheckBox1", Array(20, 20, 60, 15), MultiLine := True) + + + + myCheckBox = dlg.CreateCheckBox('CheckBox1', (20, 20, 60, 15), MultiLine = True) + + + + + CreateComboBox - + + Dialog service;CreateComboBox + + CreateComboBox + Create a new control of type ComboBox in the current di
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 52831bbdd39f37750ecb1bebb99d3cdfe4b3d315 Author: Alain Romedenne AuthorDate: Wed Jun 28 17:16:46 2023 +0200 Commit: Gerrit Code Review CommitDate: Wed Jun 28 17:16:46 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 114401853f335d1e85edee8229c4450c575f1f0c - New features of SF_Dialog and SF_DialogControl services (WiP) Change-Id: I5806e7c9cd014bd92e58b2f9aa739a610050ea76 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153598 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index d380411c947e..114401853f33 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d380411c947e8fcc3887889497349f45f01c28ac +Subproject commit 114401853f335d1e85edee8229c4450c575f1f0c
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/0002.xhp|6 source/text/sbasic/shared/03/sf_dialog.xhp| 39 +++-- source/text/sbasic/shared/03/sf_dialogcontrol.xhp | 147 +++--- 3 files changed, 106 insertions(+), 86 deletions(-) New commits: commit 114401853f335d1e85edee8229c4450c575f1f0c Author: Alain Romedenne AuthorDate: Mon Jun 26 13:27:08 2023 +0200 Commit: Alain Romedenne CommitDate: Wed Jun 28 17:16:45 2023 +0200 New features of SF_Dialog and SF_DialogControl services (WiP) Change-Id: I5806e7c9cd014bd92e58b2f9aa739a610050ea76 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153598 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/0002.xhp b/source/text/sbasic/shared/0002.xhp index 8bc58a475d..43b124e60a 100644 --- a/source/text/sbasic/shared/0002.xhp +++ b/source/text/sbasic/shared/0002.xhp @@ -47,7 +47,11 @@ twips; definition Twips -A twip is a screen-independent unit which is used to define the uniform position and size of screen elements on all display systems. A twip is 1/1440th of an inch or 1/20 of a printer's point. There are 1440 twips to an inch or about 567 twips to a centimeter. +A twip is a screen-independent unit which is used to define the uniform position and size of screen elements on all display systems. A twip is 1/1440th of an inch or 1/20 of a printer's point. There are 1440 twips to an inch or about 567 twips to a centimeter. + + +AppFont Units +Map AppFont units are device and resolution independent. One Map AppFont unit is equal to one eighth of the average character (Systemfont) height and one quarter of the average character width. URL Notation diff --git a/source/text/sbasic/shared/03/sf_dialog.xhp b/source/text/sbasic/shared/03/sf_dialog.xhp index 86a803c906..9de39dbb4a 100644 --- a/source/text/sbasic/shared/03/sf_dialog.xhp +++ b/source/text/sbasic/shared/03/sf_dialog.xhp @@ -284,14 +284,16 @@ Event properties - Returns a URI string with the reference to the script triggered by the event. Read its specification in the https://wiki.documentfoundation.org/Documentation/DevGuide/Scripting_Framework#Scripting_Framework_URI_Specification";>scripting framework URI specification. + + On… properties return a URI string with the reference to the script triggered by the event. On… properties can be set programmatically.Read its specification in the https://wiki.documentfoundation.org/Documentation/DevGuide/Scripting_Framework#Scripting_Framework_URI_Specification";>scripting framework URI specification. + Name -ReadOnly +Read/Write Basic IDE Description @@ -299,7 +301,7 @@ -OnFocusGained +OnFocusGained Yes @@ -310,7 +312,7 @@ -OnFocusLost +OnFocusLost Yes @@ -321,7 +323,7 @@ -OnKeyPressed +OnKeyPressed Yes @@ -332,7 +334,7 @@ -OnKeyReleased +OnKeyReleased Yes @@ -343,18 +345,18 @@ -OnMouseDragged +OnMouseDragged Yes -Mouse moved while key presses +Mouse moved while key presses -OnMouseEntered +OnMouseEntered Yes @@ -365,7 +367,7 @@ -OnMouseExited +OnMouseExited Yes @@ -376,7 +378,7 @@ -OnMouseMoved +OnMouseMoved Yes @@ -387,7 +389,7 @@ -OnMousePressed +OnMousePressed Yes @@ -398,7 +400,7 @@ -OnMouseReleased +OnMouseReleased Yes @@ -408,6 +410,9 @@ + + Assigning events via the Basic IDE and assigning events via macros are mutually exclusive. + @@ -442,6 +447,10 @@ + +Dimensioning a dialog is done by using Map AppFont units. A dialog or control model also uses AppFont units. While their views use pixels. + + Activate -- @@ -661,7 +670,7 @@ Dialog service;Resize Resize - Moves the topleft corner of a dialog to new coordinates and/or modify its dimensions. All distances are expressed
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 49045e094960e06a59286a7fb6412e501b49cd27 Author: Alain Romedenne AuthorDate: Mon Mar 13 17:49:10 2023 + Commit: Gerrit Code Review CommitDate: Mon Mar 13 17:49:10 2023 + Update git submodules * Update helpcontent2 from branch 'master' to f3a16adcb0187df5cf9c01ae6b4550785c03375b - tdf#141474 Incorrect parameter names for Basic functions in help Skipped items: Mid, MIRR, NPV, Shell: - MID statement is bugged, TDF#154166 refers, no need to change it yet. MID function operates fine - MIRR and NPV do not support named arguments in VBA despite MS documentation. No need to update those pages - Shell keyword arguments are correct Change-Id: I09dcc280edeec158eafaf87286966c36447ff71b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/148316 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index b119b5566164..f3a16adcb018 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b119b55661646266f6432addfa59f3de24925315 +Subproject commit f3a16adcb0187df5cf9c01ae6b4550785c03375b
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03020414.xhp | 40 ++ source/text/sbasic/shared/03120202.xhp | 22 source/text/sbasic/shared/03120303.xhp | 26 - source/text/sbasic/shared/03120307.xhp | 26 - source/text/sbasic/shared/03120314.xhp | 87 +++- source/text/sbasic/shared/03120403.xhp | 45 +++- source/text/sbasic/shared/partition.xhp | 26 - source/text/sbasic/shared/strconv.xhp |4 - 8 files changed, 133 insertions(+), 143 deletions(-) New commits: commit f3a16adcb0187df5cf9c01ae6b4550785c03375b Author: Alain Romedenne AuthorDate: Mon Mar 6 12:34:55 2023 + Commit: Alain Romedenne CommitDate: Mon Mar 13 17:49:09 2023 + tdf#141474 Incorrect parameter names for Basic functions in help Skipped items: Mid, MIRR, NPV, Shell: - MID statement is bugged, TDF#154166 refers, no need to change it yet. MID function operates fine - MIRR and NPV do not support named arguments in VBA despite MS documentation. No need to update those pages - Shell keyword arguments are correct Change-Id: I09dcc280edeec158eafaf87286966c36447ff71b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/148316 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03020414.xhp b/source/text/sbasic/shared/03020414.xhp index c476c7e4dc..633a7a856f 100644 --- a/source/text/sbasic/shared/03020414.xhp +++ b/source/text/sbasic/shared/03020414.xhp @@ -33,20 +33,17 @@ SetAttr statement - -SetAttr Statement +SetAttr Statement Sets the attribute information for a specified file. -Syntax: - -SetAttr FileName As String, Attribute As Integer + +SetAttr PathName As String, Attributes As Integer -Parameters: -FileName: Name of the file, including the path, that you want to test attributes of. If you do not enter a path, SetAttr searches for the file in the current directory. You can also use URL notation. - Attribute: Bit pattern defining the attributes that you want to set or to clear: - Value + + FileName: Name of the file, including the path, that you want to test attributes of. If you do not enter a path, SetAttr searches for the file in the current directory. You can also use URL notation. + Attributes: Bit pattern defining the attributes that you want to set or to clear: @@ -101,21 +98,20 @@ -Example: - + Sub ExampleSetGetAttr On Error GoTo ErrorHandler ' Define target for error handler - If Dir("C:\test",16)="" Then MkDir "C:\test" - If Dir("C:\test\autoexec.sav")="" Then FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav" - SetAttr "c:\test\autoexec.sav" ,0 - FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav" - SetAttr "c:\test\autoexec.sav" , ATTR_READONLY - Print GetAttr( "c:\test\autoexec.sav" ) - End -ErrorHandler: - Print Error - End -End Sub + If Dir("C:\test",16)="" Then MkDir "C:\test" + If Dir("C:\test\autoexec.sav")="" Then FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav" + SetAttr "c:\test\autoexec.sav" ,0 + FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav" + SetAttr "c:\test\autoexec.sav" , ATTR_READONLY + Print GetAttr( "c:\test\autoexec.sav" ) + End +ErrorHandler: + Print Error + End +End Sub diff --git a/source/text/sbasic/shared/03120202.xhp b/source/text/sbasic/shared/03120202.xhp index 6b4f6442c4..35a424d83f 100644 --- a/source/text/sbasic/shared/03120202.xhp +++ b/source/text/sbasic/shared/03120202.xhp @@ -40,28 +40,28 @@ -String (n As Long, {expression As Integer | character As String}) +String (number As Long, {expression As Integer | character As String}) As String String - n: Numeric expression that indicates the number of characters to return in the string. The maximum allowed value of n is 2,147,483,648. - Expression: Numeric expression that defines the ASCII code for the character. - Character: Any single character used to build the return string, or any string of which only the first character will be used. + number: Numeric expression that indicates the number of characters to return in the string. The maximum allowed value of n is 2,147,483,648. + Expression: Numeric expression that defines the ASCII code for the character. + Character: Any single character used to build the return string, or any string of which only the first character will be used. -Sub ExampleString -Dim sText As String -sText = String(10,"A") -MsgBox sText -sText = String(10,65) -MsgBox sText -End Sub +Sub ExampleString +Dim sText As String +sText = String(10,"A") +MsgBox sText +sText = String(10,65) +MsgBox sText +End Sub diff --git a/source/text/sbasic/shared/03120303.xhp b/source/text/sbasic/shared/03120303.xhp index da879b8d3c..7989d07cac 100644 --- a/source/text/sbasic/shared/03120303.xhp +++ b/source/text/sbasic/shared/03120303.xhp @@ -40,32 +40,32 @@ -Left (Text A
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit de236de7fded4b6d1eb5f4623d411e674125ebb9 Author: Alain Romedenne AuthorDate: Mon Mar 6 12:22:42 2023 + Commit: Gerrit Code Review CommitDate: Mon Mar 6 12:22:42 2023 + Update git submodules * Update helpcontent2 from branch 'master' to 6f339f367d1ee6aa8d13b41eaf3ca19bca9926e6 - tdf#141474 Incorrect parameter names for Basic functions in help Remaining pages up to included Join function Change-Id: Id6aad2fbdf3ace72fdaa33136fc71a6107abeadd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147986 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index c76109de2734..6f339f367d1e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c76109de27348a1b751ac398b978ebfa3a8825dc +Subproject commit 6f339f367d1ee6aa8d13b41eaf3ca19bca9926e6
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03020404.xhp | 10 --- source/text/sbasic/shared/03020405.xhp | 14 +-- source/text/sbasic/shared/03020406.xhp |8 +++--- source/text/sbasic/shared/03090103.xhp |8 +++--- source/text/sbasic/shared/03120315.xhp |6 ++-- source/text/sbasic/shared/03120401.xhp | 17 ++--- source/text/sbasic/shared/03120411.xhp | 10 +++ source/text/sbasic/shared/03132300.xhp | 42 + source/text/sbasic/shared/03140003.xhp | 28 +++--- source/text/sbasic/shared/0315.xhp |6 ++-- 10 files changed, 87 insertions(+), 62 deletions(-) New commits: commit 6f339f367d1ee6aa8d13b41eaf3ca19bca9926e6 Author: Alain Romedenne AuthorDate: Wed Mar 1 08:50:21 2023 + Commit: Alain Romedenne CommitDate: Mon Mar 6 12:22:42 2023 + tdf#141474 Incorrect parameter names for Basic functions in help Remaining pages up to included Join function Change-Id: Id6aad2fbdf3ace72fdaa33136fc71a6107abeadd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147986 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03020404.xhp b/source/text/sbasic/shared/03020404.xhp index dc18b5af80..6f1d84acc4 100644 --- a/source/text/sbasic/shared/03020404.xhp +++ b/source/text/sbasic/shared/03020404.xhp @@ -38,15 +38,15 @@ -Dir [(Text As String [, Attrib As Integer])] +Dir [(PathName As String [, Attributes As Integer])] -Return value: + String - Text: Any string expression that specifies the search path, directory or file. This argument can only be specified the first time that you call the Dir function. If you want, you can enter the path in URL notation. - Attrib: Any integer expression that specifies bitwise file attributes. The Dir function only returns files or directories that match the specified attributes. You can combine several attributes by adding the attribute values: + PathName: Any string expression that specifies the search path, directory or file. This argument can only be specified the first time that you call the Dir function. If you want, you can enter the path in URL notation. + Attributes:Any integer expression that specifies bitwise file attributes. The Dir function only returns files or directories that match the specified attributes. You can combine several attributes by adding the attribute values: 0 : Normal files. 16 : Returns the name of the directory only. Use this attribute to check if a file or directory exists, or to determine all files and folders in a specific directory. @@ -80,6 +80,8 @@ + + diff --git a/source/text/sbasic/shared/03020405.xhp b/source/text/sbasic/shared/03020405.xhp index f1ba3fb4d5..0a61715239 100644 --- a/source/text/sbasic/shared/03020405.xhp +++ b/source/text/sbasic/shared/03020405.xhp @@ -34,25 +34,25 @@ -FileAttr Function +FileAttr Function Returns the access mode or the file access number of a file that was opened with the Open statement. The file access number is dependent on the operating system (OSH = Operating System Handle). -If you use a 32-Bit operating system, you cannot use the FileAttr-Function to determine the file access number. +If you use a 32-Bit operating system, you cannot use the FileAttr function to determine the file access number. See also: Open -FileAttr (FileNumber As Integer, Attribute As Integer) + FileAttr (Channel As Integer, Attributes As Integer) Integer - FileNumber: The number of the file that was opened with the Open statement. - Attribute: Integer expression that indicates the type of file information that you want to return. The following values are possible: -1: The FileAttr-Function indicates the access mode of the file. -2: The FileAttr-Function returns the file access number of the operating system. + Channel: The number of the file that was opened with the Open statement. + Attributes: Integer expression that indicates the type of file information that you want to return. The following values are possible: +1: FileAttr indicates the access mode of the file. +2: FileAttr returns the file access number of the operating system. If you specify a parameter attribute with a value of 1, the following return values apply: 1 - INPUT (file open for input) 2 - OUTPUT (file open for output) diff --git a/source/text/sbasic/shared/03020406.xhp b/source/text/sbasic/shared/03020406.xhp index b7a762f9a7..04b32654dd 100644 --- a/source/text/sbasic/shared/03020406.xhp +++ b/source/text/sbasic/shared/03020406.xhp @@ -34,18 +34,18 @@ -FileCopy Statement +FileCopy Statement Copies a file. Syntax: -FileCopy TextFrom As String, TextTo As String +FileCopy Source As String, Destination As String Parameters: - TextFrom: Any string expression that specifies the name of the file that you want to copy. The expression can contain optional path and
[Libreoffice-commits] core.git: basic/qa basic/source
basic/qa/basic_coverage/string_left_01.bas | 26 - basic/qa/basic_coverage/string_right_01.bas| 26 - basic/qa/basic_coverage/test_join_method.bas | 30 +++ basic/qa/basic_coverage/test_left_method.bas | 28 ++ basic/qa/basic_coverage/test_mid_keyword_names.bas | 26 + basic/qa/basic_coverage/test_right_method.bas | 28 ++ basic/qa/basic_coverage/test_split_method.bas |6 +++ basic/qa/basic_coverage/test_string_method.bas | 28 ++ basic/qa/basic_coverage/test_typename_method.bas |2 + basic/qa/basic_coverage/test_vartype_method.bas|2 + basic/qa/vba_tests/instrrev.vb |7 +++ basic/qa/vba_tests/join.vb |5 ++ basic/qa/vba_tests/left.vb |3 + basic/qa/vba_tests/mid.vb |4 ++ basic/qa/vba_tests/right.vb|3 + basic/qa/vba_tests/split.vb|6 +++ basic/qa/vba_tests/string.vb | 10 +++-- basic/qa/vba_tests/typename.vb |2 + basic/qa/vba_tests/vartype.vb |2 + basic/source/runtime/stdobj.cxx| 42 ++--- 20 files changed, 195 insertions(+), 91 deletions(-) New commits: commit fd19bc83cfd49937da8585b9ab938b2086ecf74a Author: Alain Romedenne AuthorDate: Wed Jan 18 16:07:09 2023 + Commit: Andreas Heinisch CommitDate: Sun Feb 26 16:14:47 2023 + tdf#141474 tdf#151901 BASIC functions argument names do not match that of VBA Basic function argument names can be used either by position either by name, keyword arguments ae called 'named arguments' in VBA - VBA doc: https://learn.microsoft.com/en-us/office/vba/language/concepts/getting-started/understanding-named-arguments-and-optional-arguments - libO Basic function signatures: https://help.libreoffice.org/latest/en-US/text/sbasic/shared/03090401.html?DbPAR=BASIC#bm_id3154422 This patch attempts to correct - all in one - malformed keyword names in BASIC function signatures. It reflects keyword arguments usage inside QA BASIC unit tests. In the end Online help pages may incorporate such practice. Change-Id: Iab0c92b2c152d2564662e51e68f1f736b8deefd0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145720 Tested-by: Jenkins Reviewed-by: Andreas Heinisch diff --git a/basic/qa/basic_coverage/string_left_01.bas b/basic/qa/basic_coverage/string_left_01.bas deleted file mode 100644 index d2ae7ae45ff8.. --- a/basic/qa/basic_coverage/string_left_01.bas +++ /dev/null @@ -1,26 +0,0 @@ -' -' 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/. -' - -Option Explicit - -Function doUnitTest as String - -Dim s1 As String -Dim s2 As String - -s1 = "abc" - -s2 = Left(s1, 2) - -If s2 = "ab" Then -doUnitTest = "OK" -Else -doUnitTest = "FAIL" -End If - -End Function diff --git a/basic/qa/basic_coverage/string_right_01.bas b/basic/qa/basic_coverage/string_right_01.bas deleted file mode 100644 index a291d0704bf3.. --- a/basic/qa/basic_coverage/string_right_01.bas +++ /dev/null @@ -1,26 +0,0 @@ -' -' 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/. -' - -Option Explicit - -Function doUnitTest as String - -Dim s1 As String -Dim s2 As String - -s1 = "abc" - -s2 = Right(s1, 2) - -If s2 = "bc" Then -doUnitTest = "OK" -Else -doUnitTest = "FAIL" -End If - -End Function diff --git a/basic/qa/basic_coverage/test_join_method.bas b/basic/qa/basic_coverage/test_join_method.bas index 9076a0f8d83e..a3769ae188ff 100644 --- a/basic/qa/basic_coverage/test_join_method.bas +++ b/basic/qa/basic_coverage/test_join_method.bas @@ -7,14 +7,28 @@ Option Explicit -Function doUnitTest as String -' Join +Function doUnitTest() As String +TestUtil.TestInit +verify_Join_method +doUnitTest = TestUtil.GetResult() +End Function + +Sub verify_Join_method +On Error GoTo errorHandler + +' JOIN Dim aStrings(2) as String aStrings(0) = "Hello" aStrings(1) = "world" -If ( Join( aStrings, " " ) <> "Hello world " ) Then -doUnitTest = "FAIL" -Else -doUnitTest = "OK" -End If -End Function +TestUtil.AssertEqual(Join( aStrings, " " ), "Hello world ", "Join(aStrings, "" "" is not ""Hello world """) + +' tdf#141474 keyword names need to match that
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03170020.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ff28b2273c769b7085c031f135131724af25d2c7 Author: Alain Romedenne AuthorDate: Fri Feb 17 15:41:06 2023 + Commit: Alain Romedenne CommitDate: Fri Feb 17 15:43:21 2023 + typo Change-Id: I67540e5f1feec3baa6d585a508fc5b270c0981ae Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147241 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/03170020.xhp b/source/text/sbasic/shared/03170020.xhp index ea5d3972e5..567b9fb5bc 100644 --- a/source/text/sbasic/shared/03170020.xhp +++ b/source/text/sbasic/shared/03170020.xhp @@ -41,7 +41,7 @@ MsgBox FormatPercent("-,2", 2, IncludeLeadingDigit:=vbTrue) ' -20,00% if french user interface - MsgBox FormatPercent("-0.2", 2) ' -20.00% for en-US, -0.00 for fr-CA, de-AT or pt-BR + MsgBox FormatPercent("-0.2", 2) ' -20.00% for en-US, -0,00 for fr-CA, de-AT or pt-BR MsgBox FormatPercent(-0.2, UseComputerRegionalSettings, UseParensForNegativeNumbers:=vbTrue) ' (20,00)% if pt-BR
[Libreoffice-commits] core.git: 3 commits - helpcontent2 sw/inc sw/source
helpcontent2|2 +- sw/inc/swabstdlg.hxx|2 +- sw/source/ui/dialog/swdlgfact.cxx |4 ++-- sw/source/ui/dialog/swdlgfact.hxx |2 +- sw/source/ui/misc/glossary.cxx |4 ++-- sw/source/uibase/dochdl/gloshdl.cxx |6 +++--- sw/source/uibase/inc/gloshdl.hxx|4 ++-- sw/source/uibase/inc/glossary.hxx |2 +- sw/source/uibase/uiview/view.cxx|2 +- 9 files changed, 14 insertions(+), 14 deletions(-) New commits: commit 0ffa1607c57600930fb6494ab6642f5da0d5447e Author: Alain Romedenne AuthorDate: Fri Feb 17 15:43:21 2023 + Commit: Gerrit Code Review CommitDate: Fri Feb 17 15:43:21 2023 + Update git submodules * Update helpcontent2 from branch 'master' to ff28b2273c769b7085c031f135131724af25d2c7 - typo Change-Id: I67540e5f1feec3baa6d585a508fc5b270c0981ae Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147241 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index aeb4e62cc9ff..ff28b2273c76 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit aeb4e62cc9ffe7406cbe976c0dc59215c45b4bba +Subproject commit ff28b2273c769b7085c031f135131724af25d2c7 commit 2d3b13d6b803f4a58c0302f7d9b58ba9766836d8 Author: Caolán McNamara AuthorDate: Fri Feb 17 12:38:49 2023 + Commit: Caolán McNamara CommitDate: Fri Feb 17 15:43:16 2023 + use a reference here to flag its never null Change-Id: Ib57be7f076f4ec720d9d153034d00915a82e9ae7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147215 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index da48badefdd8..9c27f098eb29 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -502,7 +502,7 @@ public: const OString& sPage, SwWrtShell* pActShell, boolbNew) = 0; -virtual VclPtrCreateGlossaryDlg(SfxViewFrame* pViewFrame, +virtual VclPtrCreateGlossaryDlg(SfxViewFrame& rViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) = 0; virtual VclPtr CreateFieldInputDlg(weld::Widget *pParent, diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 9bcae1e2ef33..ecf45ec06109 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -1130,10 +1130,10 @@ VclPtr SwAbstractDialogFactory_Impl::CreateTemplateDi sPage, pActShell, bNew)); } -VclPtr SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, +VclPtr SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFrame& rViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) { -return VclPtr::Create(std::make_unique(pViewFrame, pGlosHdl, pWrtShell)); +return VclPtr::Create(std::make_unique(rViewFrame, pGlosHdl, pWrtShell)); } VclPtr SwAbstractDialogFactory_Impl::CreateFieldInputDlg(weld::Widget *pParent, diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 7ee78f4a5c05..d31e212accf4 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -794,7 +794,7 @@ public: const OString& sPage, SwWrtShell* pActShell, boolbNew) override; -virtual VclPtrCreateGlossaryDlg(SfxViewFrame* pViewFrame, +virtual VclPtrCreateGlossaryDlg(SfxViewFrame& rViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) override; virtual VclPtr CreateFieldInputDlg(weld::Widget *pParent, diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 33aefaa2ce39..a1b328e6a20e 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -288,9 +288,9 @@ public: } }; -SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame const * pViewFrame, +SwGlossaryDlg::SwGlossaryDlg(const SfxViewFrame& rViewFrame, SwGlossaryHdl * pGlosHdl, SwWrtShell *pWrtShell) -: SfxDialogController(pViewFrame->GetFrameWeld(), "modules/swriter/ui/autotext.ui", "AutoTextDialog") +: SfxDialogController(rViewFrame.GetFrameWeld(), "modules/swriter/ui/autotext.ui", "AutoTextDialog") , m_sReadonlyPat
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e411eeffad98f2344b9796aa80ba8d3f054a3d3a Author: Alain Romedenne AuthorDate: Mon Feb 13 09:57:34 2023 + Commit: Gerrit Code Review CommitDate: Mon Feb 13 09:57:34 2023 + Update git submodules * Update helpcontent2 from branch 'master' to 5b8658e58d02f8f3ec6a613f7c4edd32ca2e5d76 - FormatPercent New Basic function / VBA Change-Id: I0ad4022394632f0d49417bb56ecda641af3b0b42 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/146519 Tested-by: Olivier Hallot Reviewed-by: Olivier Hallot Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index 12f4174031af..5b8658e58d02 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 12f4174031afc80e9d6ac387336e0185646f6977 +Subproject commit 5b8658e58d02f8f3ec6a613f7c4edd32ca2e5d76
[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/auxiliary source/text
AllLangHelp_sbasic.mk |1 source/auxiliary/sbasic.tree |1 source/text/sbasic/shared/03170010.xhp | 19 +--- source/text/sbasic/shared/03170020.xhp | 58 + source/text/sbasic/shared/special_vba_func.xhp |1 5 files changed, 73 insertions(+), 7 deletions(-) New commits: commit 5b8658e58d02f8f3ec6a613f7c4edd32ca2e5d76 Author: Alain Romedenne AuthorDate: Fri Feb 3 13:05:07 2023 + Commit: Olivier Hallot CommitDate: Mon Feb 13 09:57:05 2023 + FormatPercent New Basic function / VBA Change-Id: I0ad4022394632f0d49417bb56ecda641af3b0b42 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/146519 Tested-by: Olivier Hallot Reviewed-by: Olivier Hallot Tested-by: Jenkins diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk index c864e3d0b9..a41510f962 100644 --- a/AllLangHelp_sbasic.mk +++ b/AllLangHelp_sbasic.mk @@ -394,6 +394,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\ helpcontent2/source/text/sbasic/shared/0316 \ helpcontent2/source/text/sbasic/shared/0317 \ helpcontent2/source/text/sbasic/shared/03170010 \ +helpcontent2/source/text/sbasic/shared/03170020 \ helpcontent2/source/text/sbasic/shared/05060700 \ helpcontent2/source/text/sbasic/shared/is_keyword \ helpcontent2/source/text/sbasic/shared/new_keyword \ diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index 6a97572f6a..e97c93b658 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -165,6 +165,7 @@ Format Function FormatDateTime Function [VBA] FormatNumber Function [VBA] + FormatPercent Function [VBA] Frac Function FreeFile Function FreeLibrary Function diff --git a/source/text/sbasic/shared/03170010.xhp b/source/text/sbasic/shared/03170010.xhp index c2e1a573c6..1f8767b040 100644 --- a/source/text/sbasic/shared/03170010.xhp +++ b/source/text/sbasic/shared/03170010.xhp @@ -21,18 +21,22 @@ FormatNumber function -FormatNumber [VBA] +FormatNumber [VBA] Returns a string with a number formatting applied to a numeric expression. -FormatNumber( expression, numDigitsAfterDecimal as Integer, includeLeadingDigit as Integer, useParensForNegativeNumbers as Integer, groupDigits as Integer ) + +FormatNumber( expression As Variant, [numDigitsAfterDecimal As Integer], [includeLeadingDigit As Integer], _ + [useParensForNegativeNumbers As Integer], [groupDigits As Integer] ) As String + + -String +String -expression: Required. The numeric expression to be formatted. +expression: Required. A numeric expression to be formatted. If expression is a string, then the decimal and thousands separator need to be localized. numDigitsAfterDecimal: Optional. A numeric value specifying the number of digits that should be displayed after the decimal. If omitted, it defaults to the value -1, meaning that the default settings for user interface locale should be used. @@ -46,7 +50,7 @@ vbFalse or 0: Do not display leading zeros. -vbUseDefaults or -2: Use the user interface locale settings. This is the default when omitted. +vbUseDefault or -2: Use the user interface locale settings. This is the default when omitted. useParensForNegativeNumbers: Optional. A vbTriState enumeration value specifying whether negative numbers should be encased in parenthesis. @@ -58,7 +62,7 @@ vbFalse or 0: Do not display parenthesis. -vbUseDefaults or -2: Same as vbFalse. This is the default when omitted. +vbUseDefault or -2: Same as vbFalse. This is the default when omitted. @@ -72,9 +76,10 @@ vbFalse or 0: Do not group digits. -vbUseDefaults or -2: Same as vbFalse. This is the default when omitted. +vbUseDefault or -2: Same as vbFalse. This is the default when omitted. + diff --git a/source/text/sbasic/shared/03170020.xhp b/source/text/sbasic/shared/03170020.xhp new file mode 100644 index 00..ea5d3972e5 --- /dev/null +++ b/source/text/sbasic/shared/03170020.xhp @@ -0,0 +1,58 @@ + + + + + +FormatPercent Function [VBA] +/text/sbasic/shared/03170020.xhp + + + + + + +FormatPercent function + +FormatPercent [VBA] +Returns a string with a number formatting applied to a numeric expression. A percent sign is appended to the returned string. + + + + + FormatPercent( expression, [numDigitsAfterDecimal As Integer], [includ
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d792eb7ba7b1b65964a950fd7b309b40ae8b8ad5 Author: Alain Romedenne AuthorDate: Fri Dec 16 16:28:06 2022 + Commit: Gerrit Code Review CommitDate: Fri Dec 16 16:28:06 2022 + Update git submodules * Update helpcontent2 from branch 'master' to 55f43cd2900eb670bce537a939ea0f435439d926 - tdf#134377 Help page not found when clicking 'Help' button targeting File/Open help page - on 'Help' button click - for the time being although this is far from a perfect solution, and while @@widget@@ bookmark does not operate properly. Change-Id: Id35bb8a6b707cb8376bac7c036aa47ba31aa8f58 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144356 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 63011fa12038..55f43cd2900e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 63011fa12038ecc796a66fb4fae4851f5b2647c3 +Subproject commit 55f43cd2900eb670bce537a939ea0f435439d926
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0102.xhp |1 + 1 file changed, 1 insertion(+) New commits: commit 55f43cd2900eb670bce537a939ea0f435439d926 Author: Alain Romedenne AuthorDate: Fri Dec 16 16:02:10 2022 + Commit: Alain Romedenne CommitDate: Fri Dec 16 16:28:05 2022 + tdf#134377 Help page not found when clicking 'Help' button targeting File/Open help page - on 'Help' button click - for the time being although this is far from a perfect solution, and while @@widget@@ bookmark does not operate properly. Change-Id: Id35bb8a6b707cb8376bac7c036aa47ba31aa8f58 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144356 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/shared/01/0102.xhp b/source/text/shared/01/0102.xhp index e5c0346a40..17bc73b18e 100644 --- a/source/text/shared/01/0102.xhp +++ b/source/text/shared/01/0102.xhp @@ -47,6 +47,7 @@ + Open, Insert text Opens a local or remote file, or inserts text from a file. Opening multiple files is possible.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d4222dddfc57688421d7521b693d095075658a56 Author: Alain Romedenne AuthorDate: Fri Dec 16 12:52:55 2022 + Commit: Gerrit Code Review CommitDate: Fri Dec 16 12:52:55 2022 + Update git submodules * Update helpcontent2 from branch 'master' to e90036912468f58be544b2f12dec0adc7ae8036e - tdf#134377 Refactoring more help pages for 'built-in' file dialogs … Change-Id: Ic128cc9d5d59bd80caa369257000b956bad9f437 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144182 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 53871c4cf5a7..e90036912468 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 53871c4cf5a7703275a2e425b08a4199e9989c46 +Subproject commit e90036912468f58be544b2f12dec0adc7ae8036e
[Libreoffice-commits] help.git: source/text
source/text/shared/01/mediaplayer.xhp | 16 source/text/shared/01/moviesound.xhp | 26 +++--- 2 files changed, 27 insertions(+), 15 deletions(-) New commits: commit e90036912468f58be544b2f12dec0adc7ae8036e Author: Alain Romedenne AuthorDate: Thu Dec 15 10:35:05 2022 + Commit: Alain Romedenne CommitDate: Fri Dec 16 12:52:55 2022 + tdf#134377 Refactoring more help pages for 'built-in' file dialogs … Change-Id: Ic128cc9d5d59bd80caa369257000b956bad9f437 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144182 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/shared/01/mediaplayer.xhp b/source/text/shared/01/mediaplayer.xhp index 80da648813..851a5c0124 100644 --- a/source/text/shared/01/mediaplayer.xhp +++ b/source/text/shared/01/mediaplayer.xhp @@ -25,7 +25,7 @@ Media Player /text/shared/01/mediaplayer.xhp - + Media Player window @@ -44,25 +44,25 @@ Open - Opens a movie file or a sound file that you want to preview. + Opens a movie file or a sound file that you want to preview. Apply - Inserts the current movie file or sound file as a media object into the current document. + Inserts the current movie file or sound file as a media object into the current document. Play - Plays the current file. + Plays the current file. Pause - Pauses or resumes the playback of the current file. + Pauses or resumes the playback of the current file. Stop - Stops the playback of the current file. + Stops the playback of the current file. Repeat - Plays the file repeatedly. + Plays the file repeatedly. Mute - Turns sound off and on. + Turns sound off and on. Volume slider Adjusts the volume. diff --git a/source/text/shared/01/moviesound.xhp b/source/text/shared/01/moviesound.xhp index 1e36a437cc..3e87229ea4 100644 --- a/source/text/shared/01/moviesound.xhp +++ b/source/text/shared/01/moviesound.xhp @@ -36,14 +36,24 @@ music UFI: added "music;inserting"MW made "sounds;", "audio;", "music;" one level entries and added "movies" -Audio or Video + +Audio or Video Inserts a video or audio file into your document. -To insert a movie or sound file into your document + + + + +File name + +File type + + +To insert a movie or sound file into your document Click where you want to insert the file. @@ -53,7 +63,7 @@ In the File Open dialog, select the file that you want to insert. -The file types that are listed in this dialog are not supported by all operating systems. +The file types that are listed in this dialog are not supported by all operating systems. Click the Link box if you want a link to the original file. If it is not checked, the media file will be embedded (not supported with all file formats). @@ -63,7 +73,8 @@ Alternatively, you can choose Tools - Media Player to open the Media Player. Use the Media Player to preview all supported media files. Click the Apply button in the Media Player window to insert the current media file into your document. -To play a movie or sound file + +To play a movie or sound file Click the object icon for the movie or sound file in your document. @@ -74,9 +85,10 @@ Click Play on the Media Playback toolbar. - When you show an Impress presentation, the embedded sound or video on the current slide plays automatically until it's over or until you leave the slide. + When you show an Impress presentation, the embedded sound or video on the current slide plays automatically until it's over or until you leave the slide. You can also use the Media Playback bar to pause, to stop, to loop, as well as to adjust the volume or to mute the playback of the file. The current playback position in the file is indicated on the left slider. Use the right slider to adjust the playback volume. For movie files, the bar also contains a list box where you can select the zoom factor for the playback. -Supported media formats + +Supported media formats %PRODUCTNAME relies on the operating system's installed media support. @@ -94,7 +106,7 @@ https://docs.microsoft.com/en-us/windows/win32/directshow/supported-formats-in-directshow";>List of default formats for Microsoft Windows DirectShow. https://gstreamer.freedesktop.org/documentation/plugin-development/advanced/media-types.html#list-of-defined-types";>List of defined types for gstreamer in GNU/Linux. https://help.apple.com/finalcutpro/mac/10.4.6/en.lproj/ver2833f855.html";>List of media formats for Apple macOS QuickTime. - https://ask.libreoffice.org/t/what-video-formats-does-libreoffice-impress-support/291";>“What video formats does Impress support?” on Ask + https://ask.libreoffice.org/t/what-video-formats
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 29d4bbd8e9e18222ddb65bf86f647eece49dcfd3 Author: Alain Romedenne AuthorDate: Tue Dec 13 13:43:12 2022 + Commit: Gerrit Code Review CommitDate: Tue Dec 13 13:43:12 2022 + Update git submodules * Update helpcontent2 from branch 'master' to 551e891308a664f5c17613d381044381e2d92bb0 - tdf#134377 Refactoring a few help pages for 'built-in' file dialogs … for the following use cases: - (Writer, Impress, Forms) Insert ▶ Image - (Impress) Insert ▶ Audio or Video - (Base Report) Insert ▶ Media ▶ Image Change-Id: I44c15e13d5fad60f30889d396b829784c09938d3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143973 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 77d02e65e9ac..551e891308a6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 77d02e65e9acae649867fe67cdba46f30e58a7e0 +Subproject commit 551e891308a664f5c17613d381044381e2d92bb0
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0414.xhp | 16 +--- source/text/swriter/01/0419.xhp | 14 +++--- 2 files changed, 24 insertions(+), 6 deletions(-) New commits: commit 551e891308a664f5c17613d381044381e2d92bb0 Author: Alain Romedenne AuthorDate: Mon Dec 12 14:40:35 2022 + Commit: Alain Romedenne CommitDate: Tue Dec 13 13:43:12 2022 + tdf#134377 Refactoring a few help pages for 'built-in' file dialogs … for the following use cases: - (Writer, Impress, Forms) Insert ▶ Image - (Impress) Insert ▶ Audio or Video - (Base Report) Insert ▶ Media ▶ Image Change-Id: I44c15e13d5fad60f30889d396b829784c09938d3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143973 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/shared/01/0414.xhp b/source/text/shared/01/0414.xhp index c5e9f3b6d4..d71aff0c66 100644 --- a/source/text/shared/01/0414.xhp +++ b/source/text/shared/01/0414.xhp @@ -37,10 +37,20 @@ + + + + +File name + +File type + + -Style -Select the frame style for the graphic. + Base-Form and Base-Report use cases too + Style + Select the frame style for the graphic. Anchor @@ -58,6 +68,6 @@ Preview Displays a preview of the selected graphic file. - + diff --git a/source/text/swriter/01/0419.xhp b/source/text/swriter/01/0419.xhp index 88e6e05ae9..997ec77992 100644 --- a/source/text/swriter/01/0419.xhp +++ b/source/text/swriter/01/0419.xhp @@ -29,13 +29,21 @@ -Insert (Text from File) +Insert (Text from File) Inserts the contents of another document into the current document at the cursor position. -To always have the latest version of the contents of a file, insert a section into your document, and then insert a link to the text file in the section. See insert a section for details. - +To always have the latest version of the contents of a file, insert a section into your document, and then insert a link to the text file in the section. See insert a section for details. + + + +File name + +File type + + + \ No newline at end of file
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-7-5-branch-point'
Tag 'libreoffice-7-5-branch-point' created by Christian Lohmaier at 2022-12-08 19:31 + Tag libreoffice-7-5-branch-point -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmOSO6IACgkQ9DSh76/u rqNZHg//dsZBhBgFlBERSyMktoB71K5R8L/6qpHV5ygxyCn2PAgpTXefZ7G+7vas wXqFASRpsLOc0W1HpR1mwx0K6OeNPd4nCI0UWkF6l/3H0jdlK/JBurgSY1gXv9NC 4MgJFbwDJ4UeCJj8/twR1yHANNcI7Sx0MfInDHQvztbsNFClkHu5UFWlvEuWt+QS Bi7Ar8c2i03u/fGJUpk88dAQSGmMinaQeRVn3FKFRXYN67s2vPxfsofhLJbRO++a WCTLpN1LPYnDgY0Ec8ctitUWdfPDKR01H8uKVl4NkEzQ0igIcCKAOOdBVSS7TiJz bLVKFQ9uDTBywClefMcfhZy4//zHWzpBV32zANq7RT8CqpaV5V81N7FkElMo5GV/ Z3iu86eAY07AGvK6UIAA+qFRzhb+S7aLyV8XuigGrh/l3HmG7l+Ie1yfIdtvEQOF Tz0GpoTu/om1mkvQM/5/y9pQi8ccpCVOAfiLE1SKS7mgXjMc7aaGo+6Te+w9V8zU Fezpt/MBvuI2eTCPIxGho4cKs3hf4vCtuqh6DT1pp8hWkFqpyRqkU8Zm2nfIZI5P 9mXsYbt9zOsuljwLfpHVQM7WMDXOC+zVSfzcM0rIIZnanEnQo9pPUNxHwyeDbKGu zYdAf9bZIKX0+DQlOyeY7z45bUs/I6NDmp5EqHK0BDDb6bBUmJ0= =JNKI -END PGP SIGNATURE- Changes since libreoffice-7-4-branch-point-226: --- 0 files changed ---
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1cafff12c38b2568e213a51d8061de7b4d8f15ca Author: Alain Romedenne AuthorDate: Thu Dec 8 15:24:32 2022 + Commit: Gerrit Code Review CommitDate: Thu Dec 8 15:24:32 2022 + Update git submodules * Update helpcontent2 from branch 'master' to 9cd78ba1f7b77ed8a062906f2e553a4dbfca6ea4 - tdf#134377 fix faulty embed tags in help Change-Id: I4895c9d9b05f05ffeeb6206fbe39d0ce4332d5f5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143726 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 0ae4510ed1ad..9cd78ba1f7b7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0ae4510ed1ad0cdaf9ec52ff6bd4423c436dceae +Subproject commit 9cd78ba1f7b77ed8a062906f2e553a4dbfca6ea4
[Libreoffice-commits] help.git: source/text
source/text/shared/01/01060002.xhp |6 +++--- source/text/shared/01/01070001.xhp |4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 9cd78ba1f7b77ed8a062906f2e553a4dbfca6ea4 Author: Alain Romedenne AuthorDate: Thu Dec 8 15:05:51 2022 + Commit: Alain Romedenne CommitDate: Thu Dec 8 15:24:32 2022 + tdf#134377 fix faulty embed tags in help Change-Id: I4895c9d9b05f05ffeeb6206fbe39d0ce4332d5f5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143726 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/shared/01/01060002.xhp b/source/text/shared/01/01060002.xhp index cb642c56db..e079da5682 100644 --- a/source/text/shared/01/01060002.xhp +++ b/source/text/shared/01/01060002.xhp @@ -41,9 +41,9 @@ Save with password - - - + + + Save diff --git a/source/text/shared/01/01070001.xhp b/source/text/shared/01/01070001.xhp index 62694619f4..4617503348 100644 --- a/source/text/shared/01/01070001.xhp +++ b/source/text/shared/01/01070001.xhp @@ -50,8 +50,8 @@ File format - - + + Export
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 42987658c4164a099dbeab50b8e2e42f3eda02bb Author: Alain Romedenne AuthorDate: Thu Dec 8 14:15:48 2022 + Commit: Gerrit Code Review CommitDate: Thu Dec 8 14:15:48 2022 + Update git submodules * Update helpcontent2 from branch 'master' to 0ae4510ed1ad0cdaf9ec52ff6bd4423c436dceae - Fix to python script sample Change-Id: I9e79c85aecde08225212fd7985d32bd55a5f7bf1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143724 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 18924c3c7275..0ae4510ed1ad 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 18924c3c7275e794703997e315910d99395dcd69 +Subproject commit 0ae4510ed1ad0cdaf9ec52ff6bd4423c436dceae
[Libreoffice-commits] help.git: source/text
source/text/sbasic/python/python_programming.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0ae4510ed1ad0cdaf9ec52ff6bd4423c436dceae Author: Alain Romedenne AuthorDate: Thu Dec 8 14:07:59 2022 + Commit: Alain Romedenne CommitDate: Thu Dec 8 14:15:48 2022 + Fix to python script sample Change-Id: I9e79c85aecde08225212fd7985d32bd55a5f7bf1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143724 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/python/python_programming.xhp b/source/text/sbasic/python/python_programming.xhp index 71ba96cbc1..1a85936012 100644 --- a/source/text/sbasic/python/python_programming.xhp +++ b/source/text/sbasic/python/python_programming.xhp @@ -306,7 +306,7 @@ Similarly to %PRODUCTNAME Basic that supports browsing and dynamic loading of libraries, Python libraries can be explored and imported on demand. For more information on library containers, visit https://api.libreoffice.org/";>%PRODUCTNAME Application Programming Interface (API) or download https://www.libreoffice.org/download/download/";>%PRODUCTNAME Software Development Kit (SDK). Importing a Python document embedded module is illustrated below, exception handling is not detailed: -import uno, sys +import uno, sys, zipimport def load_library(library_name: str, module_name=None): """ load library and import module
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8293fc346a7332fe66d78a918659376e494b7778 Author: Alain Romedenne AuthorDate: Fri Dec 2 16:24:23 2022 + Commit: Gerrit Code Review CommitDate: Fri Dec 2 16:24:23 2022 + Update git submodules * Update helpcontent2 from branch 'master' to d700f1fe9e6e265d0f0125a0fb734fb2c201ce1a - tdf#134377 Refactoring built-in file dialogs Following use cases are covered: File - Save A Copy File - Export Change-Id: Id32418e944dc968cbd16100083cb2b9835084fd5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143576 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 23d4609281bf..d700f1fe9e6e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 23d4609281bf48afe6b343897900ae0c5b3d3ff7 +Subproject commit d700f1fe9e6e265d0f0125a0fb734fb2c201ce1a
[Libreoffice-commits] help.git: source/text
source/text/shared/01/01060002.xhp | 21 + source/text/shared/01/0107.xhp | 24 source/text/shared/01/01070001.xhp | 20 +++- 3 files changed, 52 insertions(+), 13 deletions(-) New commits: commit d700f1fe9e6e265d0f0125a0fb734fb2c201ce1a Author: Alain Romedenne AuthorDate: Fri Dec 2 14:56:37 2022 + Commit: Alain Romedenne CommitDate: Fri Dec 2 16:24:23 2022 + tdf#134377 Refactoring built-in file dialogs Following use cases are covered: File - Save A Copy File - Export Change-Id: Id32418e944dc968cbd16100083cb2b9835084fd5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143576 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/shared/01/01060002.xhp b/source/text/shared/01/01060002.xhp index deac0208d8..e562f09264 100644 --- a/source/text/shared/01/01060002.xhp +++ b/source/text/shared/01/01060002.xhp @@ -28,10 +28,31 @@ Choose File - Save a Copy. Creates another file with same contents of the current file. The current file is kept open for editing. + + + + +File name + + +File type + + +Save with password + + + + + + +Save + + Save Save as Export + diff --git a/source/text/shared/01/0107.xhp b/source/text/shared/01/0107.xhp index 0f084ce1b6..31bf6aa909 100644 --- a/source/text/shared/01/0107.xhp +++ b/source/text/shared/01/0107.xhp @@ -50,6 +50,7 @@ + File type Select the file format for the document that you are saving. In the display area, only the documents with this file type are displayed. File types are described in Information on Import and Export Filters. @@ -70,27 +71,34 @@ Only documents using the %PRODUCTNAME XML-based format can be saved with a password. + Automatic file name extension Enforces the Open Document Format (ODF) when checked. + + Encrypt with GPG key Use OpenPGP public keys to encrypt documents. + - - -Edit filter settings -Allows you to set the spreadsheet saving options for some types of data files. -UFI: had to change text and remove Calc switch because switch did not work correctly - - + + + + Edit filter settings + Allows you to set the spreadsheet saving options for some types of data files. + + + + Selection Exports only the selected graphic objects in %PRODUCTNAME Draw and Impress to another format. If this box is not checked, the entire document is exported. If you are exporting to any document file type, the entire document is exported. -Save + +Save Saves the file. diff --git a/source/text/shared/01/01070001.xhp b/source/text/shared/01/01070001.xhp index 2064b7d47d..47d6924c68 100644 --- a/source/text/shared/01/01070001.xhp +++ b/source/text/shared/01/01070001.xhp @@ -38,13 +38,23 @@ -Unlike Save As, the Export command writes a copy of the current document in a new file with the chosen format, but keeps the current document and format open in your session. +Unlike Save As, the Export command writes a copy of the current document in a new file with the chosen format, but keeps the current document and format open in your session. The Export command opens the system file picker, where you can enter the name and format of the exported file. -File Name -Enter a file name or a path for the file. -File Type + + + + +File name + + +File format -Save + + + + +Export +
[Libreoffice-commits] help.git: source/auxiliary source/text
source/auxiliary/shared.tree |2 source/text/shared/01/0102.xhp | 91 ++--- source/text/shared/01/0107.xhp | 72 + 3 files changed, 98 insertions(+), 67 deletions(-) New commits: commit 23d4609281bf48afe6b343897900ae0c5b3d3ff7 Author: Alain Romedenne AuthorDate: Fri Nov 25 17:41:17 2022 +0100 Commit: Alain Romedenne CommitDate: Wed Nov 30 16:29:26 2022 +0100 tdf134377 Refactoring a few help pages for 'built-in' file dialogs … for the following use cases: - File - Open - File - Save As - (Writer) Insert - Text from file Change-Id: Ib838a88b367abbde13194e8f2f91f471e860de82 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143260 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree index 4c4354788b..8d13b42412 100644 --- a/source/auxiliary/shared.tree +++ b/source/auxiliary/shared.tree @@ -144,6 +144,7 @@ Opening documents saved in other formats Saving Documents Saving Documents Automatically + Opening and Saving files on remote servers Saving Documents in Other Formats Exporting Documents to PDF Importing and Exporting Data in Text Format @@ -195,7 +196,6 @@ Inserting Protected Spaces, Hyphens and Conditional Separators Inserting Special Characters Inserting and Editing Tab Stops - Opening and Saving files on remote servers Protecting Content in %PRODUCTNAME Protecting Records Selecting the Maximum Printable Area on a Page diff --git a/source/text/shared/01/0102.xhp b/source/text/shared/01/0102.xhp index 8d49beb7e3..11fe5e2dc2 100644 --- a/source/text/shared/01/0102.xhp +++ b/source/text/shared/01/0102.xhp @@ -21,7 +21,7 @@ -Open +Open, Insert text /text/shared/01/0102.xhp @@ -40,31 +40,48 @@ documents; styles changed styles; changed message -mw replaced "wildcards" by "regular expressions"mw deleted "regular expressions;" and "files;" - - - - - - - -Open -Opens a local or a remote file. +mw replaced "wildcards" by "regular expressions" +mw deleted " regular expressions;" and "files;" + + + + + + +Open, Insert text +Opens a local or remote file, or inserts text from a file. Opening multiple files is possible. - -%PRODUCTNAME uses the native file picker dialog of the window manager of your operating system for the Open command. + + +File dialogs - such as Open, Save As, Insert text and the like - are available in two different ways: + +As native file picker dialogs of the window manager of your operating system. +As built-in %PRODUCTNAME file picker dialogs. + +Use %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - General to shift from one to the other. + If the file that you want to open contains styles, special rules apply. -Display area -Displays the files and folders in the folder that you are in. To open a file, select the file, and then click Open. -To open more than one document at the same time, each in an own window, hold CommandCtrl while you click the files, and then click Open. - - + +Folder selection + Pick up your preferred folder from the pull-down list or type its path name. Autocomplete function can be used to ease typing. + Connect to a server using the File Services dialog. Select a parent folder from the folder path with Icon Open. + Add a subfolder to the current folder with create new folder. + + + Places and Files + Add current folder to your favorite places using +. Remove a selected place from the list with -. + Displays the files and folders in the folder that you are in. Click column headers to sort files names, types, sizes or dates in ascending or descending order. + To open more than one document at the same time, each in an own window, hold CommandCtrl while you click the files, and then click Open. + + + Modern system file dialogs present many features for file handling. Most allows you to rename, delete, create files, sort list of files, display files and folders in icons, tree or list views, traverse the file system folder tree and much more. Use the mouse right button to get a list of commands on the selected files in the display area. + Click to delete the file with the name shown in this dialog. @@ -80,35 +97,36 @@ The following features are available in the dialog: - +File type +Select the file type that you want to open, or select All Files (*) to display a
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c804273e9e72f5d0a52ea053b878dac11ec90ac Author: Alain Romedenne AuthorDate: Wed Nov 30 16:29:28 2022 +0100 Commit: Gerrit Code Review CommitDate: Wed Nov 30 16:29:28 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 23d4609281bf48afe6b343897900ae0c5b3d3ff7 - tdf134377 Refactoring a few help pages for 'built-in' file dialogs … for the following use cases: - File - Open - File - Save As - (Writer) Insert - Text from file Change-Id: Ib838a88b367abbde13194e8f2f91f471e860de82 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143260 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 339b99470318..23d4609281bf 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 339b994703189f93a1b4a1f861b2bfd71bf2afa7 +Subproject commit 23d4609281bf48afe6b343897900ae0c5b3d3ff7
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 625909a3eb9f48d2202773ac3df4cd14a3ef6a40 Author: Alain Romedenne AuthorDate: Mon Nov 28 16:30:06 2022 +0100 Commit: Gerrit Code Review CommitDate: Mon Nov 28 16:30:06 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 39cb68fb4d89fa5c4ee68ac5a5a0aade7e8421aa - help not found on 'File Services' dialog Change-Id: Ide8dfdea19f13d6978197bece825f70407fbb65b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143272 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index c4227d37acf1..39cb68fb4d89 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c4227d37acf1e07b49eea7ef7c955d919b18eabf +Subproject commit 39cb68fb4d89fa5c4ee68ac5a5a0aade7e8421aa
[Libreoffice-commits] help.git: source/text
source/text/shared/guide/cmis-remote-files-setup.xhp | 26 --- 1 file changed, 23 insertions(+), 3 deletions(-) New commits: commit 39cb68fb4d89fa5c4ee68ac5a5a0aade7e8421aa Author: Alain Romedenne AuthorDate: Mon Nov 28 15:50:13 2022 +0100 Commit: Alain Romedenne CommitDate: Mon Nov 28 16:30:04 2022 +0100 help not found on 'File Services' dialog Change-Id: Ide8dfdea19f13d6978197bece825f70407fbb65b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143272 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/shared/guide/cmis-remote-files-setup.xhp b/source/text/shared/guide/cmis-remote-files-setup.xhp index 88dbcc40aa..a2d8c0cd9e 100644 --- a/source/text/shared/guide/cmis-remote-files-setup.xhp +++ b/source/text/shared/guide/cmis-remote-files-setup.xhp @@ -18,8 +18,27 @@ - - + + + + + + + + + + + + + + + + + + + + + remote file service;setup @@ -40,13 +59,14 @@ Select File - Save Remote - Then press Add Service button in the dialog to open the File Services dialog. + Then press Manage Services button in the dialog to open the File Services dialog. WebDAV;remote file service setup remote file service setup;WebDAV + Connecting to a WebDAV server In the File Services dialog, set:
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9e134c17400f5c19f3dc2b93b1a76b3f3e56503d Author: Alain Romedenne AuthorDate: Mon Nov 14 12:29:26 2022 +0200 Commit: Gerrit Code Review CommitDate: Mon Nov 14 11:29:26 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 17faaf70b750aec109ffa3bd069731bf37fc06e5 - DoEvents extra indications Change-Id: I04da53ff9a7426a1698c880e26b4cdf01b7daf90 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142677 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index b87a0e224b4a..17faaf70b750 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b87a0e224b4a9150aeedc548de8c50d0276071b8 +Subproject commit 17faaf70b750aec109ffa3bd069731bf37fc06e5
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/doEvents.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 17faaf70b750aec109ffa3bd069731bf37fc06e5 Author: Alain Romedenne AuthorDate: Mon Nov 14 11:42:08 2022 +0200 Commit: Alain Romedenne CommitDate: Mon Nov 14 11:29:24 2022 +0100 DoEvents extra indications Change-Id: I04da53ff9a7426a1698c880e26b4cdf01b7daf90 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142677 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/doEvents.xhp b/source/text/sbasic/shared/doEvents.xhp index c95f18ec1e..4176a62c3e 100644 --- a/source/text/sbasic/shared/doEvents.xhp +++ b/source/text/sbasic/shared/doEvents.xhp @@ -30,6 +30,7 @@ [Call] DoEvents[()] As Integer +Both examples set a progressive counter on the first cell of a newly opened Calc document. Sub DoEventsExample Dim i As Long, sheet As Object, cell As Object @@ -58,4 +59,3 @@ -
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ba468f030e450511bcfd0c407506e023d7f512b7 Author: Alain Romedenne AuthorDate: Mon Nov 14 11:03:25 2022 +0200 Commit: Gerrit Code Review CommitDate: Mon Nov 14 10:03:25 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to b87a0e224b4a9150aeedc548de8c50d0276071b8 - CreateUnoServiceWithArguments supplemental method identification pattern Change-Id: I38e3938e9392558951c1cd64b2a669bd5e5c9093 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142676 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 6b64fc6ca64e..b87a0e224b4a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6b64fc6ca64e2096615dc3f85f079c9e00798060 +Subproject commit b87a0e224b4a9150aeedc548de8c50d0276071b8
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/CreateUnoSvcWithArgs.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b87a0e224b4a9150aeedc548de8c50d0276071b8 Author: Alain Romedenne AuthorDate: Mon Nov 14 10:42:51 2022 +0200 Commit: Alain Romedenne CommitDate: Mon Nov 14 10:03:22 2022 +0100 CreateUnoServiceWithArguments supplemental method identification pattern Change-Id: I38e3938e9392558951c1cd64b2a669bd5e5c9093 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142676 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/CreateUnoSvcWithArgs.xhp b/source/text/sbasic/shared/CreateUnoSvcWithArgs.xhp index 4aae8e8cef..c053307076 100644 --- a/source/text/sbasic/shared/CreateUnoSvcWithArgs.xhp +++ b/source/text/sbasic/shared/CreateUnoSvcWithArgs.xhp @@ -36,7 +36,7 @@ CreateUnoServiceWithArguments(ServiceName As String, Arguments() As Variant) As Object - UNO services that can be used with CreateUnoServiceWithArguments function are identifiable with method names that follow a createWith.. pattern. + UNO services that can be used with CreateUnoServiceWithArguments function are identifiable with method names that follow a createInstanceWith.. or createWith.. naming pattern. ServiceName: The UNO service name to be created. Arguments: One to many arguments that specify the instance of the service. Arguments are stored as a one dimensional array, according to their positions in the constructor method definition.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 23807af596937f32cd67c54557a0800759ad7a37 Author: Alain Romedenne AuthorDate: Fri Nov 11 12:02:27 2022 +0200 Commit: Gerrit Code Review CommitDate: Fri Nov 11 11:02:27 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ddd19fff68342bc96ebdc88df7be56e4ec64a859 - Basic typo Change-Id: I6890eea2de0b2e6e7d95c0289ef8810434a89df6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142517 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 3e98ce658dee..ddd19fff6834 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3e98ce658dee0b8b8d017d97da4a817b84156de0 +Subproject commit ddd19fff68342bc96ebdc88df7be56e4ec64a859
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/CreateUnoSvcWithArgs.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ddd19fff68342bc96ebdc88df7be56e4ec64a859 Author: Alain Romedenne AuthorDate: Thu Nov 10 20:09:54 2022 +0200 Commit: Olivier Hallot CommitDate: Fri Nov 11 11:02:24 2022 +0100 Basic typo Change-Id: I6890eea2de0b2e6e7d95c0289ef8810434a89df6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142517 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/sbasic/shared/CreateUnoSvcWithArgs.xhp b/source/text/sbasic/shared/CreateUnoSvcWithArgs.xhp index f3ecef8bb3..4aae8e8cef 100644 --- a/source/text/sbasic/shared/CreateUnoSvcWithArgs.xhp +++ b/source/text/sbasic/shared/CreateUnoSvcWithArgs.xhp @@ -66,7 +66,7 @@ pv(0).Name = "StorageFormat" pv(0).Value = "ZipFormat" mode = com.sun.star.embed.ElementModes - sf = CreateUnoService("com.sun.star.embed.StorageFactory + sf = CreateUnoService("com.sun.star.embed.StorageFactory") storage = sf.createInstanceWithArguments(Array(ThisComponent.URL, mode.WRITE, pv)) dds = CreateUnoServiceWithArguments( _ "com.sun.star.security.DocumentDigitalSignatures", _
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7f8b79c21c3af20e443d487af0d40a36e611bda0 Author: Alain Romedenne AuthorDate: Wed Nov 9 19:16:23 2022 +0200 Commit: Gerrit Code Review CommitDate: Wed Nov 9 18:16:23 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to b13eb126bfcc3ec1ececf01d5196d26fcc14e1c2 - Basic typo Change-Id: I8fb221c1af3a3be26cb30f85fcb9732b2e03bcd8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142446 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index cf59121b3e70..b13eb126bfcc 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit cf59121b3e70ffcc53436cb4d1071428d4daa391 +Subproject commit b13eb126bfcc3ec1ececf01d5196d26fcc14e1c2
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/doEvents.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b13eb126bfcc3ec1ececf01d5196d26fcc14e1c2 Author: Alain Romedenne AuthorDate: Wed Nov 9 19:14:28 2022 +0200 Commit: Alain Romedenne CommitDate: Wed Nov 9 18:16:22 2022 +0100 Basic typo Change-Id: I8fb221c1af3a3be26cb30f85fcb9732b2e03bcd8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142446 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/doEvents.xhp b/source/text/sbasic/shared/doEvents.xhp index 2900c44bf8..c95f18ec1e 100644 --- a/source/text/sbasic/shared/doEvents.xhp +++ b/source/text/sbasic/shared/doEvents.xhp @@ -43,7 +43,7 @@ Sub DoEvents_example - Dim i As Long, uiDoc As Object + Dim i As Long, ui As Object GlobalScope.BasicLibraries.LoadLibrary("ScriptForge") Set ui = CreateScriptService("SFDocuments.Calc", ThisComponent) For i = 1 To 2
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05f0dc93252b060fe5334ed6aa64f1f110336793 Author: Alain Romedenne AuthorDate: Wed Nov 9 19:12:14 2022 +0200 Commit: Gerrit Code Review CommitDate: Wed Nov 9 18:12:14 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to cf59121b3e70ffcc53436cb4d1071428d4daa391 - tdf114263 DoEvents new help page Change-Id: I4a031759aa48df9230e4019740a94ca167519792 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/141920 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 0e8131128326..cf59121b3e70 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0e8131128326f9a2f8476bf3b72f9a7b45476750 +Subproject commit cf59121b3e70ffcc53436cb4d1071428d4daa391
[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/auxiliary source/text
AllLangHelp_sbasic.mk |1 source/auxiliary/sbasic.tree |1 source/text/sbasic/shared/doEvents.xhp | 61 + 3 files changed, 63 insertions(+) New commits: commit cf59121b3e70ffcc53436cb4d1071428d4daa391 Author: Alain Romedenne AuthorDate: Fri Oct 28 19:21:16 2022 +0200 Commit: Alain Romedenne CommitDate: Wed Nov 9 18:12:11 2022 +0100 tdf114263 DoEvents new help page Change-Id: I4a031759aa48df9230e4019740a94ca167519792 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/141920 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk index deab5e7f97..42de90dc28 100644 --- a/AllLangHelp_sbasic.mk +++ b/AllLangHelp_sbasic.mk @@ -406,6 +406,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\ helpcontent2/source/text/sbasic/shared/CreateUnoSvcWithArgs \ helpcontent2/source/text/sbasic/shared/conventions \ helpcontent2/source/text/sbasic/shared/enum \ +helpcontent2/source/text/sbasic/shared/doEvents \ helpcontent2/source/text/sbasic/shared/ErrVBA \ helpcontent2/source/text/sbasic/shared/fragments \ helpcontent2/source/text/sbasic/shared/partition \ diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index 122ca55363..43f1b1eabf 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -137,6 +137,7 @@ Dim Statement Dir Function Do...Loop Statement + DoEvents Function End Statement Enum Statement [VBA] Environ Function diff --git a/source/text/sbasic/shared/doEvents.xhp b/source/text/sbasic/shared/doEvents.xhp new file mode 100644 index 00..2900c44bf8 --- /dev/null +++ b/source/text/sbasic/shared/doEvents.xhp @@ -0,0 +1,61 @@ + + + + + +DoEvents Function +/text/sbasic/shared/doEvents.xhp + + + + + + +DoEvents function + + +DoEvents Function +Transfers control to the operating system during macro execution, so that it can process the events in waiting. +DoEvents provides compatibility with VBA. It always returns 0. Using it in %PRODUCTNAME is not necessary. + + + +[Call] DoEvents[()] As Integer + + + + Sub DoEventsExample + Dim i As Long, sheet As Object, cell As Object + sheet = ThisComponent.Sheets.getByIndex(0) ' sheet 1 + cell = sheet.getCellByPosition(0,0) ' cell A1 + For i = 1 To 2 + cell.setString(Str(i)) + DoEvents + Next i + End Sub ' DoEventsExample + + + Sub DoEvents_example + Dim i As Long, uiDoc As Object + GlobalScope.BasicLibraries.LoadLibrary("ScriptForge") + Set ui = CreateScriptService("SFDocuments.Calc", ThisComponent) + For i = 1 To 2 + ui.SetValue("A1", i) + DoEvents + Next i + ui.Dispose() + End Sub ' DoEvents_example + + + + + + +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ad8b0ed7c004dd3b93545904f9081f69ae4ab738 Author: Alain Romedenne AuthorDate: Mon Nov 7 02:13:41 2022 +0200 Commit: Gerrit Code Review CommitDate: Mon Nov 7 01:13:41 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 3568ffd245094b1ee98eab3cb2e0be18646a7aa5 - tdf141474 Typename, Vartype functions accept keyword arguments - argument names updated to comply with VBA conventions Change-Id: I2166e62d6df4e0f72aaa494e96f9a515b03e3ac7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/141919 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 4f1d8245e409..3568ffd24509 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4f1d8245e409f5df7ca88c83a573cb07f181d0a5 +Subproject commit 3568ffd245094b1ee98eab3cb2e0be18646a7aa5
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03010101.xhp |2 source/text/sbasic/shared/0304.xhp |3 source/text/sbasic/shared/03100700.xhp |2 source/text/sbasic/shared/03103600.xhp | 298 - 4 files changed, 117 insertions(+), 188 deletions(-) New commits: commit 3568ffd245094b1ee98eab3cb2e0be18646a7aa5 Author: Alain Romedenne AuthorDate: Fri Oct 28 19:15:22 2022 +0200 Commit: Olivier Hallot CommitDate: Mon Nov 7 01:13:39 2022 +0100 tdf141474 Typename, Vartype functions accept keyword arguments - argument names updated to comply with VBA conventions Change-Id: I2166e62d6df4e0f72aaa494e96f9a515b03e3ac7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/141919 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03010101.xhp b/source/text/sbasic/shared/03010101.xhp index 9eed147d5b..8e5ae2946c 100644 --- a/source/text/sbasic/shared/03010101.xhp +++ b/source/text/sbasic/shared/03010101.xhp @@ -31,7 +31,7 @@ MsgBox statement -MsgBox Statement +MsgBox Statement Displays a dialog box containing a message. diff --git a/source/text/sbasic/shared/0304.xhp b/source/text/sbasic/shared/0304.xhp index 33dbd5af54..d577f9b6dc 100644 --- a/source/text/sbasic/shared/0304.xhp +++ b/source/text/sbasic/shared/0304.xhp @@ -214,7 +214,7 @@ GetAttr Named Constants -VarType Named Constants +Data Type Named Constants @@ -613,6 +613,5 @@ - diff --git a/source/text/sbasic/shared/03100700.xhp b/source/text/sbasic/shared/03100700.xhp index 14d00c83b1..7e8ceacd06 100644 --- a/source/text/sbasic/shared/03100700.xhp +++ b/source/text/sbasic/shared/03100700.xhp @@ -32,7 +32,7 @@ Const statement -Const Statement +Const Statement Defines one or more identifiers as constants. A constant is a variable that helps to improve the readability of a program. Constants are not defined as a specific type of variable, but rather are used as placeholders in the code. You can only define a constant once and it cannot be modified. diff --git a/source/text/sbasic/shared/03103600.xhp b/source/text/sbasic/shared/03103600.xhp index 6f4d3e3452..cea6827072 100644 --- a/source/text/sbasic/shared/03103600.xhp +++ b/source/text/sbasic/shared/03103600.xhp @@ -33,216 +33,129 @@ Basic Variable Type constants TypeName Function; VarType Function -Returns a string (TypeName) or a numeric value (VarType) that contains information for a variable. +Returns text or a numeric value that contain type information for a variable. -TypeName (Variable) / VarType (Variable) + TypeName (Varname As Variant) As String + VarType (Varname As Variant) As Integer -String; Integer + + +Text for TypeName suffixed with '()' for arrays. + + +Integer for VarType. 8192 is added to the returned value for arrays. + + - Variable: The variable that you want to determine the type of. You can use the following values: + Varname: The variable name that you want to determine the type of. +The following values are returned: - Keyword + TypeNamevalues - Named constant + Namedconstant - VarType + VarTypevalues Variable type - - Boolean - - - - - - 11 - - - Boolean variable - - - - Byte - - - - - - 17 - - - Byte variable - +…() +8192 +Array of variables - - Date - - - V_DATE - - - 7 - - - Date variable - +Boolean +11 +Boolean variable - - Currency - - - V_CURRENCY - - - 6 - - - Currency variable - +Byte +17 +Byte variable - - Double - - - V_DOUBLE - - - 5 - - - Double floating point variable - +Date +V_DATE +7 +Date variable - - Integer - - - V_INTEGER - - - 2 - - - Integer variable - +Currency +V_CURRENCY +6 +Currency variable - - Long - - - V_LONG - - - 3 - - - Long integer variable - +Double +V_DOUBLE +5 +Double-precision floating-point variable - - Object - - - - - - 9 - - - Object variable - +Error +11 +Error type variable + - - Single - - - V_SINGLE - - - 4 - - - Single floating-point variable - +Integer +V_INTEGER +2 +Integer variable - - String - - - V_STRING - - - 8 - - - String variable - +
1 2 3 4 >