mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RtfExport: convert remaining two naked pointer members

Browse Source 
Change-Id: I2cafd91841801ef22272ba83de2ce6294ca61918
This commit is contained in:
Miklos Vajna
2014-04-04 21:49:54 +02:00
parent d4e4bcb2df
commit 8ed74dc19b
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sw/source/filter/ww8/rtfexport.cxx
View File

@@ -836,13 +836,13 @@ RtfExport::RtfExport( RtfExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCurren
{ {
mbExportModeRTF = true; mbExportModeRTF = true;
// the attribute output for the document // the attribute output for the document
m_pAttrOutput = new RtfAttributeOutput( *this ); m_pAttrOutput.reset(new RtfAttributeOutput(*this));
// that just causes problems for RTF // that just causes problems for RTF
bSubstituteBullets = false; bSubstituteBullets = false;
// needed to have a complete font table // needed to have a complete font table
maFontHelper.bLoadAllFonts = true; maFontHelper.bLoadAllFonts = true;
// the related SdrExport // the related SdrExport
m_pSdrExport = new RtfSdrExport( *this ); m_pSdrExport.reset(new RtfSdrExport(*this));
if (!m_pWriter) if (!m_pWriter)
m_pWriter = &m_pFilter->m_aWriter; m_pWriter = &m_pFilter->m_aWriter;
@@ -850,8 +850,6 @@ RtfExport::RtfExport( RtfExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCurren
RtfExport::~RtfExport() RtfExport::~RtfExport()
{ {
delete m_pAttrOutput, m_pAttrOutput = NULL;
delete m_pSdrExport, m_pSdrExport = NULL;
} }
SvStream& RtfExport::Strm() SvStream& RtfExport::Strm()

4
sw/source/filter/ww8/rtfexport.hxx
View File

@@ -41,12 +41,12 @@ class RtfExport : public MSWordExportBase
Writer* m_pWriter; Writer* m_pWriter;
/// Attribute output for document. /// Attribute output for document.
RtfAttributeOutput *m_pAttrOutput; boost::shared_ptr<RtfAttributeOutput> m_pAttrOutput;
/// Sections/headers/footers /// Sections/headers/footers
MSWordSections *m_pSections; MSWordSections *m_pSections;
RtfSdrExport *m_pSdrExport; boost::shared_ptr<RtfSdrExport> m_pSdrExport;
bool m_bOutOutlineOnly; bool m_bOutOutlineOnly;
public: public: