Kaydet (Commit) 048a32d9 authored tarafından Noel Grandin's avatar Noel Grandin

use unique_ptr for pImpl in tools/

Change-Id: I7ac7eca32a67524f6c87696c16b16128e6d8518b
üst 81ff7cfd
......@@ -26,6 +26,7 @@
#include <rtl/ustring.hxx>
#include <tools/errcode.hxx>
#include <tools/toolsdllapi.h>
#include <memory>
// FIXME: horrible legacy dependency on VCL from tools.
namespace vcl { class Window; }
......@@ -54,7 +55,7 @@ class TOOLS_DLLPUBLIC DynamicErrorInfo : public ErrorInfo
friend class EDcr_Impl;
private:
EDcr_Impl* pImpl;
std::unique_ptr<EDcr_Impl> pImpl;
public:
......@@ -117,7 +118,7 @@ class TOOLS_DLLPUBLIC ErrorContext
friend class ErrorHandler;
private:
ErrorContextImpl *pImpl;
std::unique_ptr<ErrorContextImpl> pImpl;
public:
ErrorContext(vcl::Window *pWin=nullptr);
......@@ -140,7 +141,7 @@ class TOOLS_DLLPUBLIC ErrorHandler
friend class ErrHdl_Impl;
private:
ErrHdl_Impl* pImpl;
std::unique_ptr<ErrHdl_Impl> pImpl;
static sal_uInt16 HandleError_Impl( sal_uIntPtr lId,
sal_uInt16 nFlags,
......
......@@ -21,6 +21,7 @@
#include <sal/types.h>
#include <tools/toolsdllapi.h>
#include <memory>
class SvStream;
......@@ -30,7 +31,7 @@ class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Fraction
{
struct Impl;
Impl* mpImpl;
std::unique_ptr<Impl> mpImpl;
bool HasOverflowValue();
......
......@@ -21,6 +21,7 @@
#include <tools/toolsdllapi.h>
#include <rtl/ustring.hxx>
#include <memory>
#define RESARRAY_INDEX_NOTFOUND (0xffffffff)
......@@ -29,7 +30,7 @@ class ResId;
class TOOLS_DLLPUBLIC ResStringArray
{
struct Impl;
Impl* mpImpl;
std::unique_ptr<Impl> mpImpl;
ResStringArray( const ResStringArray& ) = delete;
ResStringArray& operator=( const ResStringArray& ) = delete;
......
......@@ -90,7 +90,6 @@ Fraction::Fraction( double dVal ) : mpImpl(new Impl)
Fraction::~Fraction()
{
delete mpImpl;
}
bool Fraction::HasOverflowValue()
......
......@@ -70,7 +70,6 @@ ResStringArray::ResStringArray( const ResId& rResId ) :
ResStringArray::~ResStringArray()
{
delete mpImpl;
}
OUString ResStringArray::GetString( sal_uInt32 nIndex ) const
......
......@@ -116,9 +116,9 @@ DynamicErrorInfo::operator sal_uIntPtr() const
}
DynamicErrorInfo::DynamicErrorInfo(sal_uIntPtr lArgUserId, sal_uInt16 nMask)
: ErrorInfo(lArgUserId)
: ErrorInfo(lArgUserId),
pImpl(new EDcr_Impl)
{
pImpl=new EDcr_Impl;
pImpl->RegisterEDcr(this);
pImpl->nMask=nMask;
}
......@@ -126,7 +126,6 @@ DynamicErrorInfo::DynamicErrorInfo(sal_uIntPtr lArgUserId, sal_uInt16 nMask)
DynamicErrorInfo::~DynamicErrorInfo()
{
EDcr_Impl::UnRegisterEDcr(this);
delete pImpl;
}
ErrorInfo* EDcr_Impl::GetDynamicErrorInfo(sal_uIntPtr lId)
......@@ -175,8 +174,8 @@ struct ErrorContextImpl
};
ErrorContext::ErrorContext(vcl::Window *pWinP)
: pImpl( new ErrorContextImpl )
{
pImpl = new ErrorContextImpl();
ErrorContext *&pHdl = TheEDcrData::get().pFirstCtx;
pImpl->pWin = pWinP;
pImpl->pNext = pHdl;
......@@ -190,7 +189,6 @@ ErrorContext::~ErrorContext()
ppCtx=&((*ppCtx)->pImpl->pNext);
if(*ppCtx)
*ppCtx=(*ppCtx)->pImpl->pNext;
delete pImpl;
}
ErrorContext *ErrorContext::GetContext()
......@@ -199,8 +197,8 @@ ErrorContext *ErrorContext::GetContext()
}
ErrorHandler::ErrorHandler()
: pImpl(new ErrHdl_Impl)
{
pImpl=new ErrHdl_Impl;
EDcrData &pData=TheEDcrData::get();
ErrorHandler *&pHdl=pData.pFirstHdl;
pImpl->pNext=pHdl;
......@@ -216,7 +214,6 @@ ErrorHandler::~ErrorHandler()
ppHdl=&((*ppHdl)->pImpl->pNext);
if(*ppHdl)
*ppHdl=(*ppHdl)->pImpl->pNext;
delete pImpl;
}
vcl::Window* ErrorContext::GetParent()
......
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