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

[Tamás Zolnai]

 sw/source/filter/ww8/docxattributeoutput.cxx |   21 ---------------------
 sw/source/filter/ww8/docxattributeoutput.hxx |    2 --
 2 files changed, 23 deletions(-)

New commits:
commit 50ce9e40148ad507e60e3deb4c1ac3b5b23cb5ff
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Fri Aug 11 02:47:09 2017 +0200

    m_pPostponedVMLDrawings is unused now
    
    Change-Id: Iec685588ef7a1d5284072ebc8fcadc07dae67364
    Reviewed-on: https://gerrit.libreoffice.org/40999
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index e6338d85ed7b..5d7490223eda 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1731,9 +1731,6 @@ void DocxAttributeOutput::StartRunProperties()
     assert( !m_pPostponedDiagrams );
     m_pPostponedDiagrams.reset(new std::list<PostponedDiagram>);
 
-    assert( !m_pPostponedVMLDrawings );
-    m_pPostponedVMLDrawings.reset(new std::list<PostponedDrawing>);
-
     assert(!m_pPostponedDMLDrawings);
     m_pPostponedDMLDrawings.reset(new std::list<PostponedDrawing>);
 
@@ -2042,7 +2039,6 @@ void DocxAttributeOutput::EndRunProperties( const SwRedlineData* pRedlineData )
     WritePostponedChart();
 
     //We need to write w:pict tag after the w:rPr.
-    WritePostponedVMLDrawing();
     WritePostponedDMLDrawing();
 
     WritePostponedOLE();
@@ -4905,23 +4901,6 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S
     m_pSerializer->endElementNS( XML_w, XML_object );
 }
 
-/*
- * Write w:pict hierarchy  end element of w:rPr tag.
- */
-void DocxAttributeOutput::WritePostponedVMLDrawing()
-{
-    if (!m_pPostponedVMLDrawings)
-        return;
-
-    for( std::list< PostponedDrawing >::iterator it = m_pPostponedVMLDrawings->begin();
-         it != m_pPostponedVMLDrawings->end();
-         ++it )
-    {
-        m_rExport.SdrExporter().writeVMLDrawing(it->object, *(it->frame), *(it->point));
-    }
-    m_pPostponedVMLDrawings.reset(nullptr);
-}
-
 void DocxAttributeOutput::WritePostponedCustomShape()
 {
     if (!m_pPostponedCustomShape)
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 49efe1d6c72d..8daa50aea34a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -700,7 +700,6 @@ private:
     void WritePostponedDiagram();
     void WritePostponedChart();
     void WritePostponedOLE();
-    void WritePostponedVMLDrawing();
     void WritePostponedDMLDrawing();
     void WritePostponedCustomShape();
 
@@ -856,7 +855,6 @@ private:
         const SwFrameFormat* frame;
         const Point* point;
     };
-    std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedVMLDrawings;
     std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedDMLDrawings;
     std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedCustomShape;