sw/source/core/unocore/unoframe.cxx | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
New commits:
commit c7e0f494bfc7a663f07769b8ed5de0b59bdd11da
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Nov 21 23:28:44 2017 +0100
use std::unique_ptr
Change-Id: I28e3f253cc8d0d35275c6aa3bcf17a93e2f0c631
Reviewed-on: https://gerrit.libreoffice.org/45060
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index 789c24eb1903..e2e8a0232ef8 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <o3tl/any.hxx>
+#include <o3tl/make_unique.hxx>
#include <svx/svxids.hrc>
#include <svx/xfillit0.hxx>
#include <svx/xflgrit.hxx>
@@ -1576,7 +1577,7 @@ void SwXFrame::setPropertyValue(const OUString&
rPropertyName, const ::uno::Any&
{
OUString sGrfName;
OUString sFltName;
- GraphicObject *pGrfObj = nullptr;
+ std::unique_ptr<GraphicObject> pGrfObj;
SwDoc::GetGrfNms( *static_cast<SwFlyFrameFormat*>(pFormat),
&sGrfName, &sFltName );
OUString sTmp;
aValue >>= sTmp;
@@ -1585,7 +1586,7 @@ void SwXFrame::setPropertyValue(const OUString&
rPropertyName, const ::uno::Any&
{
if( sTmp.startsWith(sPackageProtocol) )
{
- pGrfObj = new GraphicObject;
+ pGrfObj = o3tl::make_unique<GraphicObject>();
pGrfObj->SetUserData( sTmp );
sGrfName.clear();
}
@@ -1594,7 +1595,7 @@ void SwXFrame::setPropertyValue(const OUString&
rPropertyName, const ::uno::Any&
const OString sId(OUStringToOString(
sTmp.copy(sizeof(sGraphicObjectProtocol)-1),
RTL_TEXTENCODING_ASCII_US));
- pGrfObj = new GraphicObject( sId );
+ pGrfObj = o3tl::make_unique<GraphicObject>( sId );
sGrfName.clear();
}
else
@@ -1614,14 +1615,12 @@ void SwXFrame::setPropertyValue(const OUString&
rPropertyName, const ::uno::Any&
SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
if(!pGrfNode)
{
- delete pGrfObj;
throw uno::RuntimeException();
}
SwPaM aGrfPaM(*pGrfNode);
pFormat->GetDoc()->getIDocumentContentOperations().ReRead(
aGrfPaM, sGrfName, sFltName, nullptr,
- pGrfObj );
+ pGrfObj.get() );
}
- delete pGrfObj;
}
else if( FN_UNO_GRAPHIC == pEntry->nWID )
{
@@ -1651,7 +1650,7 @@ void SwXFrame::setPropertyValue(const OUString&
rPropertyName, const ::uno::Any&
Graphic aGraphic;
if( bURL )
{
- GraphicObject *pGrfObj = nullptr;
+ std::unique_ptr<GraphicObject> pGrfObj;
OUString aGrfUrl;
aValue >>= aGrfUrl;
@@ -1663,11 +1662,10 @@ void SwXFrame::setPropertyValue(const OUString&
rPropertyName, const ::uno::Any&
OString sId(OUStringToOString(
aGrfUrl.copy(sizeof(sGraphicObjectProtocol)-1),
RTL_TEXTENCODING_ASCII_US));
- pGrfObj = new GraphicObject( sId );
+ pGrfObj = o3tl::make_unique<GraphicObject>( sId );
aGraphic = pGrfObj->GetGraphic();
bApply = true;
}
- delete pGrfObj;
}
else
{
@@ -2813,13 +2811,13 @@ void SwXFrame::attachToRange(const uno::Reference<
text::XTextRange > & xTextRan
UnoActionContext aCont(pDoc);
const ::uno::Any* pGraphicURL;
OUString sGraphicURL;
- GraphicObject *pGrfObj = nullptr;
+ std::unique_ptr<GraphicObject> pGrfObj;
if(pProps->GetProperty(FN_UNO_GRAPHIC_U_R_L, 0, pGraphicURL))
{
(*pGraphicURL) >>= sGraphicURL;
if( sGraphicURL.startsWith(sPackageProtocol) )
{
- pGrfObj = new GraphicObject;
+ pGrfObj = o3tl::make_unique<GraphicObject>();
pGrfObj->SetUserData( sGraphicURL );
sGraphicURL.clear();
}
@@ -2828,7 +2826,7 @@ void SwXFrame::attachToRange(const uno::Reference<
text::XTextRange > & xTextRan
OString sId(OUStringToOString(
sGraphicURL.copy( sizeof(sGraphicObjectProtocol)-1 ),
RTL_TEXTENCODING_ASCII_US));
- pGrfObj = new GraphicObject( sId );
+ pGrfObj = o3tl::make_unique<GraphicObject>( sId );
sGraphicURL.clear();
}
}
@@ -2851,12 +2849,11 @@ void SwXFrame::attachToRange(const uno::Reference<
text::XTextRange > & xTextRan
pFormat = pGrfObj
? pDoc->getIDocumentContentOperations().InsertGraphicObject(
- aPam, *pGrfObj, &aFrameSet, &aGrSet, pParentFrameFormat)
+ aPam, *pGrfObj.get(), &aFrameSet, &aGrSet,
pParentFrameFormat)
: pDoc->getIDocumentContentOperations().InsertGraphic(
aPam, sGraphicURL, sFltName,
(!bHasGraphic && !sGraphicURL.isEmpty()) ? nullptr :
&aGraphic,
&aFrameSet, &aGrSet, pParentFrameFormat);
- delete pGrfObj;
if(pFormat)
{
SwGrfNode *pGrfNd = pDoc->GetNodes()[
pFormat->GetContent().GetContentIdx()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
