core.git: 2 commits - sc/source sw/source

[Caolán McNamara (via logerrit)]

 sc/source/core/data/validat.cxx |    2 +-
 sw/source/core/text/porfld.cxx  |   10 ++++++++--
 sw/source/core/text/porfld.hxx  |    3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 5db33f380b1f163ee39f345ac0c289b766a431fd
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Jan 19 20:47:24 2025 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Jan 20 09:28:49 2025 +0100

    tidy lambda captures
    
    Change-Id: Ifb0a815cdf93e18a5ad10ef4cfb2b772f5032df2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180488
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index fa47d68c63b7..5bedbb6a8c6c 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -426,7 +426,7 @@ void ScValidationData::DoError(weld::Window* pParent, const 
OUString& rInput, co
             break;
     }
 
-    xBox->runAsync(xBox, [&, callback](sal_uInt32 result)
+    xBox->runAsync(xBox, [this, callback](sal_Int32 result)
                    { callback(eErrorStyle == SC_VALERR_STOP || result == 
RET_CANCEL); });
 }
 
commit f107b0fac3f4b4ba5c573aac68cb459c347af3f9
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Jan 19 20:44:21 2025 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Jan 20 09:28:42 2025 +0100

    cid#1399255 Uncaught exception
    
    and
    
    cid#1399255 Uncaught exception
    
    Change-Id: I4a8d416ad5acd8bac747cc764ebd3d4cc749ce0a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180487
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 98efbd700c3e..a32f9acbae5d 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -24,8 +24,9 @@
 #include <utility>
 
 #include <comphelper/string.hxx>
-#include <vcl/graph.hxx>
 #include <editeng/brushitem.hxx>
+#include <o3tl/deleter.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
@@ -844,7 +845,7 @@ SwGrfNumPortion::SwGrfNumPortion(
     m_bNoPaint = false;
 }
 
-SwGrfNumPortion::~SwGrfNumPortion()
+void SwGrfNumPortion::ImplDestroy()
 {
     if ( IsAnimated() )
     {
@@ -855,6 +856,11 @@ SwGrfNumPortion::~SwGrfNumPortion()
     m_pBrush.reset();
 }
 
+SwGrfNumPortion::~SwGrfNumPortion()
+{
+    suppress_fun_call_w_exception(ImplDestroy());
+}
+
 void SwGrfNumPortion::StopAnimation( const OutputDevice* pOut )
 {
     if ( IsAnimated() )
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 02bd073eccf8..697f54dce330 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -34,6 +34,7 @@ class SwFormatVertOrient;
 class SwFieldPortion : public SwExpandPortion
 {
     friend class SwTextFormatter;
+
 protected:
     OUString  m_aExpand;          // The expanded field
     std::unique_ptr<SwFont> m_pFont;  // For multi-line fields
@@ -197,6 +198,8 @@ public:
     SwTwips GetRelPos() const { return m_nYPos; }
     SwTwips GetGrfHeight() const { return m_nGrfHeight; }
     sal_Int16 GetOrient() const { return m_eOrient; }
+private:
+    void ImplDestroy();
 };
 
 /**