Skip to content

C
core
Kaydet (Commit) 5f904b26 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

DocxSdrExport::Impl: use std::unique_ptr for m_pDashLineStyleAttr 

Change-Id: Ie99327cf20cf0106aa9f35f959639597fa3ccd30
üst 62820766
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
sw/source/filter/ww8/docxsdrexport.cxx
Dosyayı görüntüle @ 5f904b26
...@@ -143,7 +143,7 @@ struct DocxSdrExport::Impl ...@@ -143,7 +143,7 @@ struct DocxSdrExport::Impl
std::unique_ptr<sax_fastparser::FastAttributeList> m_pFlyFillAttrList; std::unique_ptr<sax_fastparser::FastAttributeList> m_pFlyFillAttrList;
sax_fastparser::FastAttributeList* m_pFlyWrapAttrList; sax_fastparser::FastAttributeList* m_pFlyWrapAttrList;
sax_fastparser::FastAttributeList* m_pBodyPrAttrList; sax_fastparser::FastAttributeList* m_pBodyPrAttrList;
sax_fastparser::FastAttributeList* m_pDashLineStyleAttr; std::unique_ptr<sax_fastparser::FastAttributeList> m_pDashLineStyleAttr;
sal_Int32 m_nId ; sal_Int32 m_nId ;
sal_Int32 m_nSeq ; sal_Int32 m_nSeq ;
bool m_bDMLAndVMLDrawingOpen; bool m_bDMLAndVMLDrawingOpen;
...@@ -168,7 +168,6 @@ struct DocxSdrExport::Impl ...@@ -168,7 +168,6 @@ struct DocxSdrExport::Impl
m_bFlyFrameGraphic(false), m_bFlyFrameGraphic(false),
m_pFlyWrapAttrList(0), m_pFlyWrapAttrList(0),
m_pBodyPrAttrList(0), m_pBodyPrAttrList(0),
m_pDashLineStyleAttr(0),
m_nId(0), m_nId(0),
m_nSeq(0), m_nSeq(0),
m_bDMLAndVMLDrawingOpen(false), m_bDMLAndVMLDrawingOpen(false),
...@@ -277,7 +276,7 @@ sax_fastparser::FastAttributeList* DocxSdrExport::getBodyPrAttrList() ...@@ -277,7 +276,7 @@ sax_fastparser::FastAttributeList* DocxSdrExport::getBodyPrAttrList()
return m_pImpl->m_pBodyPrAttrList; return m_pImpl->m_pBodyPrAttrList;
} }
sax_fastparser::FastAttributeList*& DocxSdrExport::getDashLineStyle() std::unique_ptr<sax_fastparser::FastAttributeList>& DocxSdrExport::getDashLineStyle()
{ {
return m_pImpl->m_pDashLineStyleAttr; return m_pImpl->m_pDashLineStyleAttr;
} }
...@@ -1622,8 +1621,7 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame* pParentFrame, bool bTextBoxOnly ...@@ -1622,8 +1621,7 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame* pParentFrame, bool bTextBoxOnly
} }
if (m_pImpl->m_pDashLineStyleAttr) if (m_pImpl->m_pDashLineStyleAttr)
{ {
sax_fastparser::XFastAttributeListRef xDashLineStyleAttr(m_pImpl->m_pDashLineStyleAttr); sax_fastparser::XFastAttributeListRef xDashLineStyleAttr(m_pImpl->m_pDashLineStyleAttr.release());
m_pImpl->m_pDashLineStyleAttr = NULL;
pFS->singleElementNS(XML_v, XML_stroke, xDashLineStyleAttr); pFS->singleElementNS(XML_v, XML_stroke, xDashLineStyleAttr);
} }
pFS->startElementNS(XML_v, XML_textbox, xTextboxAttrList); pFS->startElementNS(XML_v, XML_textbox, xTextboxAttrList);
......
sw/source/filter/ww8/docxsdrexport.hxx
Dosyayı görüntüle @ 5f904b26
...@@ -81,7 +81,7 @@ public: ...@@ -81,7 +81,7 @@ public:
void setFlyWrapAttrList(sax_fastparser::FastAttributeList* pAttrList); void setFlyWrapAttrList(sax_fastparser::FastAttributeList* pAttrList);
/// Attributes of <wps:bodyPr>, used during DML export of text frames. /// Attributes of <wps:bodyPr>, used during DML export of text frames.
sax_fastparser::FastAttributeList* getBodyPrAttrList(); sax_fastparser::FastAttributeList* getBodyPrAttrList();
sax_fastparser::FastAttributeList*& getDashLineStyle(); std::unique_ptr<sax_fastparser::FastAttributeList>& getDashLineStyle();
void startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rSize); void startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rSize);
void endDMLAnchorInline(const SwFrmFmt* pFrmFmt); void endDMLAnchorInline(const SwFrmFmt* pFrmFmt);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment