diff options
| -rw-r--r-- | include/svtools/svparser.hxx | 5 | ||||
| -rw-r--r-- | svtools/source/svrtf/svparser.cxx | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index cfbd1152a625..527c192fc35f 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -27,6 +27,7 @@ #include <rtl/textenc.h> #include <rtl/ustring.hxx> #include <vector> +#include <memory> struct SvParser_Impl; class SvStream; @@ -51,7 +52,7 @@ protected: sal_uLong nlLineNr; // current line number sal_uLong nlLinePos; // current column number - SvParser_Impl *pImplData; // internal data + std::unique_ptr<SvParser_Impl> pImplData; // internal data long nTokenValue; // additional value (RTF) bool bTokenHasValue; // indicates whether nTokenValue is valid SvParserState eState; // status also in derived classes @@ -230,7 +231,7 @@ public: class SVT_DLLPUBLIC SvKeyValueIterator : public SvRefBase { struct Impl; - Impl* mpImpl; + std::unique_ptr<Impl> mpImpl; public: /** Construction/Destruction. diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 33504923a684..a17ca8a8fc66 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -94,8 +94,6 @@ SvParser::~SvParser() rtl_destroyTextToUnicodeConverter( pImplData->hConv ); } - delete pImplData; - delete [] pTokenStack; } @@ -124,7 +122,7 @@ void SvParser::SetSrcEncoding( rtl_TextEncoding eEnc ) { eSrcEnc = eEnc; if( !pImplData ) - pImplData = new SvParser_Impl; + pImplData.reset(new SvParser_Impl); pImplData->hConv = rtl_createTextToUnicodeConverter( eSrcEnc ); DBG_ASSERT( pImplData->hConv, "SvParser::SetSrcEncoding: no converter for source encoding" ); @@ -523,7 +521,7 @@ void SvParser::SaveState( int nToken ) // save actual status if( !pImplData ) { - pImplData = new SvParser_Impl; + pImplData.reset(new SvParser_Impl); pImplData->nSaveToken = 0; } @@ -672,10 +670,7 @@ struct SvKeyValueIterator::Impl SvKeyValueIterator::SvKeyValueIterator() : mpImpl(new Impl) {} -SvKeyValueIterator::~SvKeyValueIterator() -{ - delete mpImpl; -} +SvKeyValueIterator::~SvKeyValueIterator() = default; bool SvKeyValueIterator::GetFirst (SvKeyValue &rKeyVal) { |