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

[Caolán McNamara (via logerrit)]

 basic/source/sbx/sbxscan.cxx |    3 ++-
 sfx2/source/appl/appbas.cxx  |    8 ++++----
 sfx2/source/doc/objxtor.cxx  |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit a69ad67504b32dd644902d8acf4c2a0fef86d3c7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 30 15:40:08 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Mar 30 21:23:28 2021 +0200

    fix some --disable-scripting warnings
    
    Change-Id: I0fa5ec5e0fc7a08f5558f013ec75fd7d4fe5c1a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113379
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index de3d50dbed38..0a7be60432a7 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -606,6 +606,8 @@ enum class VbaFormatType
     Null
 };
 
+#if HAVE_FEATURE_SCRIPTING
+
 struct VbaFormatInfo
 {
     VbaFormatType meType;
@@ -614,7 +616,6 @@ struct VbaFormatInfo
     const char* mpOOoFormat;     // if meType = VbaFormatType::UserDefined
 };
 
-#if HAVE_FEATURE_SCRIPTING
 const VbaFormatInfo pFormatInfoTable[] =
 {
     { VbaFormatType::Offset,      std::u16string_view(u"Long Date"),   NF_DATE_SYSTEM_LONG,    nullptr },
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 1dec99095687..482b93692200 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -62,7 +62,7 @@ void SfxApplication::SaveBasicAndDialogContainer() const
 BasicManager* SfxApplication::GetBasicManager()
 {
 #if !HAVE_FEATURE_SCRIPTING
-    return 0;
+    return nullptr;
 #else
     if (utl::ConfigManager::IsFuzzing())
         return nullptr;
@@ -73,7 +73,7 @@ BasicManager* SfxApplication::GetBasicManager()
 XLibraryContainer * SfxApplication::GetDialogContainer()
 {
 #if !HAVE_FEATURE_SCRIPTING
-    return NULL;
+    return nullptr;
 #else
     if (utl::ConfigManager::IsFuzzing())
         return nullptr;
@@ -87,7 +87,7 @@ XLibraryContainer * SfxApplication::GetDialogContainer()
 XLibraryContainer * SfxApplication::GetBasicContainer()
 {
 #if !HAVE_FEATURE_SCRIPTING
-    return NULL;
+    return nullptr;
 #else
     if (utl::ConfigManager::IsFuzzing())
         return nullptr;
@@ -100,7 +100,7 @@ XLibraryContainer * SfxApplication::GetBasicContainer()
 StarBASIC* SfxApplication::GetBasic()
 {
 #if !HAVE_FEATURE_SCRIPTING
-    return 0;
+    return nullptr;
 #else
     if (utl::ConfigManager::IsFuzzing())
         return nullptr;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index e5de957a4202..6c33cc54e325 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -747,7 +747,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
 StarBASIC* SfxObjectShell::GetBasic() const
 {
 #if !HAVE_FEATURE_SCRIPTING
-    return NULL;
+    return nullptr;
 #else
     BasicManager * pMan = GetBasicManager();
     return pMan ? pMan->GetLib(0) : nullptr;