Kaydet (Commit) 97d3624d authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Noel Grandin

vcl: avoid possible leaks in case of unexpected exceptions

Change-Id: I285fcd1ce10bb97b4541d09a9a242bbd95f5c730
Reviewed-on: https://gerrit.libreoffice.org/16255Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst b544b651
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "sgfbram.hxx" #include "sgfbram.hxx"
#include "sgvmain.hxx" #include "sgvmain.hxx"
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
#include <memory>
extern SgfFontLst* pSgfFonts; extern SgfFontLst* pSgfFonts;
...@@ -667,13 +668,13 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& ...@@ -667,13 +668,13 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType&
bool Border; // border of box reached ? bool Border; // border of box reached ?
bool Border0; bool Border0;
bool AbsEnd; // end of paragraph reached ? bool AbsEnd; // end of paragraph reached ?
ProcChrSta* R=new ProcChrSta; std::unique_ptr<ProcChrSta> R(new ProcChrSta);
ProcChrSta* R0=new ProcChrSta; std::unique_ptr<ProcChrSta> R0(new ProcChrSta);
ProcChrSta* WErec=new ProcChrSta; std::unique_ptr<ProcChrSta> WErec(new ProcChrSta);
sal_uInt16 WEnChar; sal_uInt16 WEnChar;
ProcChrSta* WErec0=new ProcChrSta; std::unique_ptr<ProcChrSta> WErec0(new ProcChrSta);
sal_uInt16 WEnChar0; sal_uInt16 WEnChar0;
ProcChrSta* TRrec=new ProcChrSta; std::unique_ptr<ProcChrSta> TRrec(new ProcChrSta);
sal_uInt16 TRnChar; sal_uInt16 TRnChar;
sal_uInt16 WordEndCnt; // justify and separate sal_uInt16 WordEndCnt; // justify and separate
...@@ -852,11 +853,6 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& ...@@ -852,11 +853,6 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType&
} }
Index=R->Index; Index=R->Index;
AktAtr=R->Attrib; AktAtr=R->Attrib;
delete R;
delete R0;
delete WErec;
delete WErec0;
delete TRrec;
} }
// End of Absatz.Pas // End of Absatz.Pas
......
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