core.git: Branch 'distro/collabora/co-24.04' - sfx2/source xmloff/source

[Aron Budea (via logerrit)]

 sfx2/source/sidebar/ResourceManager.cxx     |    6 +++---
 xmloff/source/core/ProgressBarHelper.cxx    |    4 ++--
 xmloff/source/core/SettingsExportHelper.cxx |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 1c18da88a91630eccd09d8b4fdd4cd0498ebcbef
Author:     Aron Budea <aron.bu...@collabora.com>
AuthorDate: Mon Jan 6 18:20:34 2025 +1030
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Jan 13 09:15:53 2025 +0100

    Slightly more informative logging
    
    Change-Id: Ia474a208d5a562e424df76ff389cfcc4e3f2b1fc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179817
    Tested-by: Jenkins
    Reviewed-by: Aron Budea <aron.bu...@collabora.com>
    (cherry picked from commit 899d87a844c2aa2990df4a9268008960d8489379)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180151
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/sfx2/source/sidebar/ResourceManager.cxx 
b/sfx2/source/sidebar/ResourceManager.cxx
index 9b8c6cc1229b..433cd5091f31 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -518,7 +518,7 @@ void ResourceManager::ReadContextList (
             }
             else
             {
-                OSL_FAIL("expecting three or four values per ContextList 
entry, separated by comma");
+                SAL_WARN("sfx.sidebar", "expecting three or four values per 
ContextList entry, separated by comma, entries: " << aValues);
                 continue;
             }
         }
@@ -526,7 +526,7 @@ void ResourceManager::ReadContextList (
         const OUString sContextName(o3tl::trim(o3tl::getToken(sValue, 0, ',', 
nCharacterIndex)));
         if (nCharacterIndex < 0)
         {
-            OSL_FAIL("expecting three or four values per ContextList entry, 
separated by comma");
+            SAL_WARN("sfx.sidebar", "expecting three or four values per 
ContextList entry, separated by comma");
             continue;
         }
 
@@ -617,7 +617,7 @@ void ResourceManager::ReadContextList (
             bIsInitiallyVisible = false;
         else
         {
-            OSL_FAIL("unrecognized state");
+            SAL_WARN("sfx.sidebar", "unrecognized state");
             continue;
         }
 
diff --git a/xmloff/source/core/ProgressBarHelper.cxx 
b/xmloff/source/core/ProgressBarHelper.cxx
index 3ff70fb0434d..9f2ddcd585c3 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -20,7 +20,7 @@
 #include <utility>
 #include <xmloff/ProgressBarHelper.hxx>
 
-#include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 
@@ -99,7 +99,7 @@ void ProgressBarHelper::SetValue(sal_Int32 nTempValue)
 #ifdef DBG_UTIL
     else if (!m_bFailure)
     {
-        OSL_FAIL("tried to set a wrong value on the progressbar");
+        SAL_WARN("xmloff", "tried to set a wrong value (" << nTempValue << ") 
on the progressbar");
         m_bFailure = true;
     }
 #endif
diff --git a/xmloff/source/core/SettingsExportHelper.cxx 
b/xmloff/source/core/SettingsExportHelper.cxx
index 8cd0519918a5..c3052b9251db 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -173,7 +173,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const 
uno::Any& rAny,
                 exportSymbolDescriptors(aProps, rName);
             }
             else {
-                OSL_FAIL("this type is not implemented now");
+                SAL_WARN("xmloff", "this type (" << aType.getTypeName() << ") 
is not implemented now");
             }
         }
         break;