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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/wrtww8.cxx |   10 +++++++---
 sw/source/filter/ww8/wrtww8.hxx |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 08e660bead770e4e6ed04215401e26342e413926
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Feb 5 19:25:04 2025 +0000
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Feb 7 14:42:13 2025 +0100

    defer creating SwMSConvertControls until its needed
    
    which might be never
    
    Change-Id: I9b1baf2098e092020aa8d10b55622c645e15e745
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181195
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index d8f742ab9684..c13dcca8bd02 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3431,9 +3431,6 @@ ErrCode MSWordExportBase::ExportDocument( bool bWriteAll )
     m_pRedlAuthors = nullptr;
     m_aTOXArr.clear();
 
-    if ( !m_pOCXExp && m_rDoc.GetDocShell() )
-        m_pOCXExp.reset(new SwMSConvertControls(m_rDoc.GetDocShell(), 
m_pCurPam.get()));
-
     // #i81405# - Collect anchored objects before changing the redline mode.
     m_aFrames = GetFrames( m_rDoc, bWriteAll? nullptr : m_pOrigPam );
 
@@ -4016,6 +4013,13 @@ MSWordSections& WW8Export::Sections() const
     return *m_pSepx;
 }
 
+SwMSConvertControls& WW8Export::GetOCXExp()
+{
+    if (!m_pOCXExp)
+        m_pOCXExp.reset(new SwMSConvertControls(m_rDoc.GetDocShell(), 
GetWriter().m_pCurrentPam.get()));
+    return *m_pOCXExp;
+}
+
 SwWW8Writer::SwWW8Writer(std::u16string_view rFltName, const OUString& 
rBaseURL)
     : m_pExport( nullptr ),
       mpMedium( nullptr )
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index fcc39c44aab4..2ac5c5cf17dd 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1063,7 +1063,7 @@ public:
 
     bool MiserableFormFieldExportHack(const SwFrameFormat& rFrameFormat);
 
-    SwMSConvertControls& GetOCXExp()        { return *m_pOCXExp; }
+    SwMSConvertControls& GetOCXExp();
     void ExportDopTypography(WW8DopTypography &rTypo);
 
     sal_uInt16 AddRedlineAuthor( std::size_t nId );