[Libreoffice-commits] core.git: 3 commits - helpcontent2 sc/source wizards/source

[Andrea Gelmini (via logerrit)]

 helpcontent2                                   |    2 +-
 sc/source/core/tool/interpr1.cxx               |    4 ++--
 wizards/source/sfdialogs/SF_DialogListener.xba |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c673f0f04a2c1697e96c7fc228e1de33e112aa83
Author:     Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Tue Mar 14 14:19:07 2023 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Tue Mar 14 14:02:19 2023 +0000

    Fix typo
    
    Change-Id: Ie08c4c4b6997b13eea7b29f987f994d8a894a331
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148875
    Tested-by: Julien Nabet <serval2...@yahoo.fr>
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/wizards/source/sfdialogs/SF_DialogListener.xba 
b/wizards/source/sfdialogs/SF_DialogListener.xba
index 805a43d8c358..e2c62236a22b 100644
--- a/wizards/source/sfdialogs/SF_DialogListener.xba
+++ b/wizards/source/sfdialogs/SF_DialogListener.xba
@@ -408,7 +408,7 @@ Public Function _SetOnProperty(ByRef poInstance As Object _
 &apos;&apos;&apos;             poInstance: a SF_Dialog or a SF_DialogControl 
instance
 &apos;&apos;&apos;             psProperty: one of the applicable On properties 
(&quot;OnFocusGained&quot;, &quot;OnMouseMoved&quot;, ...)
 &apos;&apos;&apos;             psScript: the script to run when the event is 
triggered
-&apos;&apos;&apos;                                     When the zero-length 
strng, the trigger is deactivated
+&apos;&apos;&apos;                                     When the zero-length 
string, the trigger is deactivated
 
 Dim bSet As Boolean                                                    &apos;  
Return value
 Dim oModel As Object                                           &apos;  
com.sun.star.awt.XControlModel
@@ -630,4 +630,4 @@ Catch:
 End Sub                        &apos;  
SFDialogs.SF_Dialoglistener._TriggerEvent
 
 REM ============================================ END OF 
SFDIALOGS.SF_DIALOGLISTENER
-</script:module>
\ No newline at end of file
+</script:module>
commit 248f63cee242bc21451bfa0b6c54f2c9da0b8e99
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Tue Mar 14 15:02:18 2023 +0100
Commit:     Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Tue Mar 14 14:02:18 2023 +0000

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      to c3a560d632327fea245b60b7a40e7950974f3cd7
      - Related: tdf#154167 ERROR.TYPE(#NULL) is for Err:521
    
        Change-Id: Id30b59e13feac935fb5307f67bd5a5423b1e9fb0
        Reviewed-on: https://gerrit.libreoffice.org/c/help/+/148881
        Reviewed-by: Eike Rathke <er...@redhat.com>
        Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index f3a16adcb018..c3a560d63232 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f3a16adcb0187df5cf9c01ae6b4550785c03375b
+Subproject commit c3a560d632327fea245b60b7a40e7950974f3cd7
commit 8dc4bea8323783b4abbf8010c492bf8d8de76481
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Tue Mar 14 00:41:02 2023 +0100
Commit:     Eike Rathke <er...@redhat.com>
CommitDate: Tue Mar 14 14:02:08 2023 +0000

    Resolves: tdf#154167 ERROR.TYPE(#NULL!) must return 1
    
    Error #NULL! is an alias of FormularError::NoCode Err:521 that is also
    mapped to import/export Excel docs. ParameterExpected Err:511 was wrong.
    
    Change-Id: I08dc4e5747cb6c6ab7c2b309b02b942340ed4484
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148820
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Jenkins

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 94dd9446ab4b..a73be313a8e7 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -10036,7 +10036,7 @@ void ScInterpreter::ScErrorType_ODF()
 
     switch ( nErr )
     {
-        case FormulaError::ParameterExpected :  // #NULL!
+        case FormulaError::NoCode :             // #NULL!
             nErrType = 1;
             break;
         case FormulaError::DivisionByZero :     // #DIV/0!
@@ -10054,7 +10054,7 @@ void ScInterpreter::ScErrorType_ODF()
         case FormulaError::IllegalFPOperation : // #NUM!
             nErrType = 6;
             break;
-        case FormulaError::NotAvailable :          // #N/A
+        case FormulaError::NotAvailable :       // #N/A
             nErrType = 7;
             break;
         /*