[Libreoffice-commits] core.git: writerfilter/source

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Thu Apr 15 14:06:25 UTC 2021


 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a93ed3aaab465056f345bba09206865ae7e2a609
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Apr 15 14:16:16 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Apr 15 16:05:46 2021 +0200

    We already have dynamic_casted the value
    
    Change-Id: If9303af8a75f3bb82ad34d66e6838f2dd0ac8e8f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114010
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b9dbda9f1677..914836944486 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1541,7 +1541,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
             {
                 pParaContext->Insert(PROP_PARA_RIGHT_MARGIN, aRightMargin, /*bOverwrite=*/false);
 
-                sal_Int32 nListId2(static_cast<ParagraphPropertyMap*>(pPropertyMap.get())->GetListId());
+                sal_Int32 nListId2(pParaContext->GetListId());
 
                 const sal_Int32 nFirstLineIndent = getNumberingProperty(nListId2, nListLevel, "FirstLineIndent");
                 const sal_Int32 nParaLeftMargin  = getNumberingProperty(nListId2, nListLevel, "IndentAt");
@@ -1840,12 +1840,12 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
                     if (m_xPreviousParagraph.is() && // null for SvxUnoTextBase
                         (isNumberingViaStyle || isNumberingViaRule))
                     {
-                        assert(dynamic_cast<ParagraphPropertyMap*>(pPropertyMap.get()));
+                        assert(pParaContext);
                         // Use lcl_getListId(), so we find the list ID in parent styles as well.
                         bool bNumberingFromBaseStyle = false;
                         sal_Int32 const nListId2( isNumberingViaStyle
                             ? lcl_getListId(pEntry, GetStyleSheetTable(), bNumberingFromBaseStyle)
-                            : static_cast<ParagraphPropertyMap*>(pPropertyMap.get())->GetListId());
+                            : pParaContext->GetListId());
                         if (ListDef::Pointer const& pList = m_pListTable->GetList(nListId2))
                         {   // styles could refer to non-existing lists...
                             AbstractListDef::Pointer const& pAbsList =


More information about the Libreoffice-commits mailing list