[Libreoffice-commits] core.git: basic/source

[Caolán McNamara (via logerrit)]

 basic/source/runtime/methods1.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 70591eb5efb9f4e5596b32d1e3c9368b9e9726a4
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Dec 10 16:32:33 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Dec 10 20:50:56 2021 +0100

    ofz#42182 oss-build failure
    
    since...
    
    commit 47aabde053a1472dc32770da29d68c8de5bd7919
    Date:   Thu Dec 2 12:37:07 2021 +0200
    
        Make the tdf#97983 changes to BASIC optional
    
    where LibreOffice6FloatingPointMode is called from
    code not inside !HAVE_FEATURE_SCRIPTING
    
    [LNK] Executable/pptfuzzer
    basic/source/sbx/sbxvalue.cxx:1343: error: undefined reference to 
'LibreOffice6FloatingPointMode()'
    basic/source/sbx/sbxvalue.cxx:1328: error: undefined reference to 
'LibreOffice6FloatingPointMode()'
    basic/source/sbx/sbxvar.cxx:456: error: undefined reference to 
'LibreOffice6FloatingPointMode()'
    basic/source/sbx/sbxvar.cxx:441: error: undefined reference to 
'LibreOffice6FloatingPointMode()'
    clang-14: error: linker command failed with exit code 1 (use -v to see 
invocation)
    make[1]: *** [/src/libreoffice/vcl/Executable_pptfuzzer.mk:13: 
instdir/program/pptfuzzer] Error 1
    make: *** [Makefile:170: Executable_pptfuzzer] Error 2
    
    Change-Id: I8e635df26f30edf8acd9c148590d034e8b13c056
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126646
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/basic/source/runtime/methods1.cxx 
b/basic/source/runtime/methods1.cxx
index 8e78776bc7f8..e1f68b950262 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -2973,13 +2973,6 @@ void SbRtl_CompatibilityMode(StarBASIC *, SbxArray & 
rPar, bool)
     rPar.Get(0)->PutBool(bEnabled);
 }
 
-bool LibreOffice6FloatingPointMode()
-{
-    static bool bMode = std::getenv("LIBREOFFICE6FLOATINGPOINTMODE") != 
nullptr;
-
-    return bMode || 
officecfg::Office::Scripting::Basic::Compatibility::UseLibreOffice6FloatingPointConversion::get();
-}
-
 void SbRtl_Input(StarBASIC *, SbxArray & rPar, bool)
 {
     // 2 parameters needed
@@ -3032,6 +3025,13 @@ void SbRtl_Me(StarBASIC *, SbxArray & rPar, bool)
 
 #endif
 
+bool LibreOffice6FloatingPointMode()
+{
+    static bool bMode = std::getenv("LIBREOFFICE6FLOATINGPOINTMODE") != 
nullptr;
+
+    return bMode || 
officecfg::Office::Scripting::Basic::Compatibility::UseLibreOffice6FloatingPointConversion::get();
+}
+
 sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam, sal_Int16 
nFirstDay )
 {
     Date aRefDate( 1,1,1900 );