strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use boost::shared_ptr

Browse source 
Change-Id: I488accb1fb7588d6b91a8406d78f5897c12b3548
This commit is contained in:
Miklos Vajna 2014-09-09 10:58:35 +02:00
parent e2e2b03b18
commit ddeed05299
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
writerfilter/source/dmapper/DomainMapper_Impl.cxx
View file

@ -207,7 +207,6 @@ DomainMapper_Impl::DomainMapper_Impl(
m_xInsertTextRange(xInsertTextRange), m_xInsertTextRange(xInsertTextRange),
m_bIsNewDoc(bIsNewDoc), m_bIsNewDoc(bIsNewDoc),
m_bInTableStyleRunProps(false), m_bInTableStyleRunProps(false),
m_pSdtHelper(0),
m_nTableDepth(0), m_nTableDepth(0),
m_bHasFtnSep(false), m_bHasFtnSep(false),
m_bIgnoreNextPara(false), m_bIgnoreNextPara(false),
@ -233,7 +232,7 @@ DomainMapper_Impl::DomainMapper_Impl(
getTableManager( ).startLevel(); getTableManager( ).startLevel();
m_bUsingEnhancedFields = officecfg::Office::Common::Filter::Microsoft::Import::ImportWWFieldsAsEnhancedFields::get(m_xComponentContext); m_bUsingEnhancedFields = officecfg::Office::Common::Filter::Microsoft::Import::ImportWWFieldsAsEnhancedFields::get(m_xComponentContext);
m_pSdtHelper = new SdtHelper(*this); m_pSdtHelper.reset(new SdtHelper(*this));
m_aRedlines.push(std::vector<RedlineParamsPtr>()); m_aRedlines.push(std::vector<RedlineParamsPtr>());
} }
@ -245,7 +244,6 @@ DomainMapper_Impl::~DomainMapper_Impl()
RemoveLastParagraph( ); RemoveLastParagraph( );
getTableManager( ).endLevel(); getTableManager( ).endLevel();
popTableManager( ); popTableManager( );
delete m_pSdtHelper;
} }

2
writerfilter/source/dmapper/DomainMapper_Impl.hxx
View file

@ -771,7 +771,7 @@ public:
/// If we're inside <w:rPr>, inside <w:style w:type="table"> /// If we're inside <w:rPr>, inside <w:style w:type="table">
bool m_bInTableStyleRunProps; bool m_bInTableStyleRunProps;
SdtHelper* m_pSdtHelper; boost::shared_ptr<SdtHelper> m_pSdtHelper;
/// Document background color, applied to every page style. /// Document background color, applied to every page style.
boost::optional<sal_Int32> m_oBackgroundColor; boost::optional<sal_Int32> m_oBackgroundColor;