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

[Justin Luth]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    6 ------
 writerfilter/source/dmapper/PropertyMap.hxx       |    3 ---
 2 files changed, 9 deletions(-)

New commits:
commit fcbdef309cde7d5eefa77e1e3c902447519a34f9
Author: Justin Luth <justin_luth at sil.org>
Date:   Tue May 30 16:59:08 2017 +0300

    writerfilter : remove dead code with m_sFootnoteFontName
    
    The string variable is never initialized or set,
    and the only use is if it is not empty.
    
    In 2007, author Oliver Specht 2007-06-12 04:41:16 in
    range fe8e4e774087465a10ecd8f366b7f0c272d8319a
    introduced m_sFootnoteFontName in a pair of commits.
    
    The call to SetFootnoteFontname() was removed in 2008
    with commit 009e3f4841378f13a2764a2c84e147e401b70525
    
    The SetFootnoteFontName() function was removed as unused in
    commit 6ea66657ebca5b3ec63f93b496b812888e0d53c9
    
    Since the footnote name is never set, it is always
    empty, and thus this code is useless.
    
    Change-Id: I64898ce9fa6673fbef0106054b5aa5a817c145d5
    Reviewed-on: https://gerrit.libreoffice.org/38257
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 38633e688552..3963cdcb8ca2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1693,12 +1693,6 @@ void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote )
         pTopContext->SetFootnote( xFootnote );
         FontTablePtr pFontTable = GetFontTable();
         uno::Sequence< beans::PropertyValue > aFontProperties;
-        if(!pTopContext->GetFootnoteFontName().isEmpty())
-        {
-            PropertyMapPtr aFontProps( new PropertyMap );
-            aFontProps->Insert(PROP_CHAR_FONT_NAME, uno::makeAny( pTopContext->GetFootnoteFontName()  ));
-            aFontProperties = aFontProps->GetPropertyValues();
-        }
         appendTextContent( uno::Reference< text::XTextContent >( xFootnoteText, uno::UNO_QUERY_THROW ), aFontProperties );
         m_aTextAppendStack.push(TextAppendContext(uno::Reference< text::XTextAppend >( xFootnoteText, uno::UNO_QUERY_THROW ),
                     xFootnoteText->createTextCursorByRange(xFootnoteText->getStart())));
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 96883755159f..16358d1a5650 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -122,7 +122,6 @@ private:
 
     // marks context as footnote context - ::text( ) events contain either the footnote character or can be ignored
     // depending on sprmCSymbol
-    OUString                                    m_sFootnoteFontName;
     css::uno::Reference< css::text::XFootnote > m_xFootnote;
     std::map< PropertyIds, PropValue >          m_vMap;
     std::vector< RedlineParamsPtr >             m_aRedlines;
@@ -156,8 +155,6 @@ public:
 
     void SetFootnote( const css::uno::Reference< css::text::XFootnote >& xF ) { m_xFootnote = xF; }
 
-    const OUString& GetFootnoteFontName() const { return m_sFootnoteFontName; }
-
     virtual void insertTableProperties( const PropertyMap* );
 
     const std::vector< RedlineParamsPtr >& Redlines() const { return m_aRedlines; }