[Libreoffice-commits] core.git: 2 commits - sw/source

[Noel Grandin (via logerrit)]

 sw/source/filter/ww8/ww8par.hxx  |    2 +-
 sw/source/filter/ww8/ww8par5.cxx |    5 ++---
 sw/source/filter/xml/xmlitem.cxx |    5 ++---
 sw/source/filter/xml/xmlitem.hxx |    3 ++-
 4 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 5cc3533a11837ee6e6a0f774eee61a9561aa7432
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Nov 7 15:45:01 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Nov 8 17:12:38 2023 +0100

    loplugin:fieldcast in SwWW8ImplReader
    
    Change-Id: If27ac0047d5f63164ea6b142b857077abf7b5a51
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159128
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index ccd1edd0d056..f98bcc2ff58e 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1291,7 +1291,7 @@ private:
     std::unique_ptr<EditEngine> m_pDrawEditEngine;
     std::unique_ptr<wwZOrderer> m_xWWZOrder;
 
-    SwFieldType* m_pNumFieldType;   // for number circle
+    SwSetExpFieldType* m_pNumFieldType;   // for number circle
 
     std::unique_ptr<SwMSDffManager> m_xMSDffManager;
 
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index b63438893617..c87c33dde0e1 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1474,10 +1474,9 @@ eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, 
OUString& rStr )
 {
     if( !m_pNumFieldType ){     // 1st time
         SwSetExpFieldType aT( &m_rDoc, "AutoNr", nsSwGetSetExpType::GSE_SEQ );
-        m_pNumFieldType = m_rDoc.getIDocumentFieldsAccess().InsertFieldType( 
aT );
+        m_pNumFieldType = 
static_cast<SwSetExpFieldType*>(m_rDoc.getIDocumentFieldsAccess().InsertFieldType(
 aT ));
     }
-    SwSetExpField aField( static_cast<SwSetExpFieldType*>(m_pNumFieldType), 
OUString(),
-                        GetNumberPara( rStr ) );
+    SwSetExpField aField( m_pNumFieldType, OUString(), GetNumberPara( rStr ) );
     aField.SetValue( ++m_nFieldNum, nullptr );
     m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, 
SwFormatField( aField ) );
     return eF_ResT::OK;
commit 08640728b2c3793816ec4366924e60ac291cfd8c
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Nov 7 15:43:31 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Nov 8 17:12:32 2023 +0100

    loplugin:fieldcast in SwXMLItemSetContext
    
    Change-Id: I9a3789d1ea28ddb0e21de73f1dafcaa9dcf68d09
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159127
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx
index 32c45bb5392e..ff98d2ff691b 100644
--- a/sw/source/filter/xml/xmlitem.cxx
+++ b/sw/source/filter/xml/xmlitem.cxx
@@ -45,8 +45,7 @@ SwXMLItemSetContext::~SwXMLItemSetContext()
 {
     if( m_xBackground.is() )
     {
-        const SvxBrushItem& rItem =
-            
static_cast<SwXMLBrushItemImportContext*>(m_xBackground.get())->GetItem();
+        const SvxBrushItem& rItem = m_xBackground->GetItem();
         m_rItemSet.Put( rItem );
     }
 }
@@ -75,7 +74,7 @@ SvXMLImportContextRef 
SwXMLItemSetContext::createFastChildContext( sal_Int32 nEl
                                    const uno::Reference< 
xml::sax::XFastAttributeList >& xAttrList,
                                    const SvXMLItemMapEntry& rEntry )
 {
-    SvXMLImportContextRef xContext;
+    rtl::Reference<SwXMLBrushItemImportContext> xContext;
 
     switch( rEntry.nWhichId )
     {
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index 4cff6aaafb79..cd6f9c8db62e 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -28,13 +28,14 @@ class SfxItemSet;
 class SvXMLImportItemMapper;
 class SvXMLUnitConverter;
 struct SvXMLItemMapEntry;
+class SwXMLBrushItemImportContext;
 
 class SwXMLItemSetContext final : public SvXMLImportContext
 {
     SfxItemSet                  &m_rItemSet;
     const SvXMLImportItemMapper &m_rIMapper;
     const SvXMLUnitConverter    &m_rUnitConv;
-    SvXMLImportContextRef m_xBackground;
+    rtl::Reference<SwXMLBrushItemImportContext> m_xBackground;
 
 public: