[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Nov 17 07:11:11 UTC 2017
sw/inc/PostItMgr.hxx | 3 +
sw/source/uibase/dochdl/swdtflvr.cxx | 62 +++++++++++++++--------------------
sw/source/uibase/docvw/PostItMgr.cxx | 5 --
sw/source/uibase/inc/swdtflvr.hxx | 11 +++---
4 files changed, 38 insertions(+), 43 deletions(-)
New commits:
commit 49e1d1f0482969520f8ac64d5ff5fbba5f7c00bf
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Nov 16 11:05:11 2017 +0200
loplugin:useuniqueptr in SwPostItMgr
Change-Id: I567ec14112ee8d5224c19c7616fd8ed06619c228
Reviewed-on: https://gerrit.libreoffice.org/44822
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 1bb0ff09bf23..8e60929ca4b7 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -25,6 +25,7 @@
#include <cstddef>
#include <list>
+#include <memory>
#include <vector>
#include <editeng/outlobj.hxx>
#include <rtl/ustring.hxx>
@@ -163,7 +164,7 @@ class SwPostItMgr: public SfxListener
bool mbIsShowAnchor;
// data structure to collect the <SwAnnotationWin> instances for certain <SwFrame> instances.
- sw::sidebarwindows::SwFrameSidebarWinContainer* mpFrameSidebarWinContainer;
+ std::unique_ptr<sw::sidebarwindows::SwFrameSidebarWinContainer> mpFrameSidebarWinContainer;
void AddPostIts(bool bCheckExistence = true,bool bFocus = true);
void RemoveSidebarWin();
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 8e39efa3726c..145659405482 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -238,9 +238,6 @@ SwPostItMgr::~SwPostItMgr()
for (auto const& page : mPages)
delete page;
mPages.clear();
-
- delete mpFrameSidebarWinContainer;
- mpFrameSidebarWinContainer = nullptr;
}
void SwPostItMgr::CheckForRemovedPostIts()
@@ -2313,7 +2310,7 @@ void SwPostItMgr::ConnectSidebarWinToFrame( const SwFrame& rFrame,
{
if ( mpFrameSidebarWinContainer == nullptr )
{
- mpFrameSidebarWinContainer = new SwFrameSidebarWinContainer();
+ mpFrameSidebarWinContainer.reset(new SwFrameSidebarWinContainer());
}
const bool bInserted = mpFrameSidebarWinContainer->insert( rFrame, rFormatField, rSidebarWin );
commit a9f6478561a65b97f28de2ee3a428a3f99e87f16
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Nov 16 10:47:00 2017 +0200
loplugin:useuniqueptr in SwTransferable
Change-Id: I803eef7270f8f1a13b253d5ac9ba4d7e41b5adef
Reviewed-on: https://gerrit.libreoffice.org/44821
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 0c5493e41331..00c42f143d4b 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -265,12 +265,6 @@ SwTransferable::~SwTransferable()
pMod->m_pXSelection = nullptr;
}
- delete m_pClpGraphic;
- delete m_pClpBitmap;
- delete m_pImageMap;
- delete m_pTargetURL;
- delete m_pBookmark;
-
m_eBufferType = TransferBufferType::NONE;
}
@@ -418,19 +412,19 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
// SEL_GRF is from ContentType of editsh
if(bPending || ((SelectionType::Graphic | SelectionType::DbForm) & nSelectionType))
{
- m_pClpGraphic = new Graphic;
+ m_pClpGraphic.reset(new Graphic);
if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::GDIMETAFILE, *m_pClpGraphic ))
- m_pOrigGraphic = m_pClpGraphic;
- m_pClpBitmap = new Graphic;
+ m_pOrigGraphic = m_pClpGraphic.get();
+ m_pClpBitmap.reset(new Graphic);
if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::BITMAP, *m_pClpBitmap ))
- m_pOrigGraphic = m_pClpBitmap;
+ m_pOrigGraphic = m_pClpBitmap.get();
// is it an URL-Button ?
OUString sURL;
OUString sDesc;
if( m_pWrtShell->GetURLFromButton( sURL, sDesc ) )
{
- m_pBookmark = new INetBookmark( sURL, sDesc );
+ m_pBookmark.reset(new INetBookmark( sURL, sDesc ));
m_eBufferType = TransferBufferType::InetField;
}
}
@@ -458,9 +452,9 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
!m_pWrtShell->GetView().GetDocShell()->IsReadOnly();
if( m_pWrtShell->GetContentAtPos( aPos, aContentAtPos, bSelect ) )
{
- m_pBookmark = new INetBookmark(
+ m_pBookmark.reset(new INetBookmark(
static_cast<const SwFormatINetFormat*>(aContentAtPos.aFnd.pAttr)->GetValue(),
- aContentAtPos.sStr );
+ aContentAtPos.sStr ));
m_eBufferType = TransferBufferType::InetField;
if( bSelect )
m_pWrtShell->SelectTextAttr( RES_TXTATR_INETFMT );
@@ -472,10 +466,10 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
m_pWrtShell->GetFlyFrameAttr( aSet );
const SwFormatURL& rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL ));
if( rURL.GetMap() )
- m_pImageMap = new ImageMap( *rURL.GetMap() );
+ m_pImageMap.reset(new ImageMap( *rURL.GetMap() ));
else if( !rURL.GetURL().isEmpty() )
- m_pTargetURL = new INetImage( aEmptyOUStr, rURL.GetURL(),
- rURL.GetTargetFrameName() );
+ m_pTargetURL.reset(new INetImage( aEmptyOUStr, rURL.GetURL(),
+ rURL.GetTargetFrameName() ));
}
}
@@ -792,12 +786,12 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
const SelectionType nSelection = m_pWrtShell->GetSelectionType();
if( nSelection == SelectionType::Graphic )
{
- m_pClpGraphic = new Graphic;
+ m_pClpGraphic.reset(new Graphic);
if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::GDIMETAFILE, *m_pClpGraphic ))
- m_pOrigGraphic = m_pClpGraphic;
- m_pClpBitmap = new Graphic;
+ m_pOrigGraphic = m_pClpGraphic.get();
+ m_pClpBitmap.reset(new Graphic);
if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::BITMAP, *m_pClpBitmap ))
- m_pOrigGraphic = m_pClpBitmap;
+ m_pOrigGraphic = m_pClpBitmap.get();
m_pClpDocFac = new SwDocFac;
SwDoc *const pDoc = lcl_GetDoc(*m_pClpDocFac);
@@ -942,12 +936,12 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
}
m_eBufferType = (TransferBufferType)( TransferBufferType::Graphic | m_eBufferType );
- m_pClpGraphic = new Graphic;
+ m_pClpGraphic.reset(new Graphic);
if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::GDIMETAFILE, *m_pClpGraphic ))
- m_pOrigGraphic = m_pClpGraphic;
- m_pClpBitmap = new Graphic;
+ m_pOrigGraphic = m_pClpGraphic.get();
+ m_pClpBitmap.reset(new Graphic);
if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::BITMAP, *m_pClpBitmap ))
- m_pOrigGraphic = m_pClpBitmap;
+ m_pOrigGraphic = m_pClpBitmap.get();
// is it an URL-Button ?
OUString sURL;
@@ -994,13 +988,13 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
const SwFormatURL& rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL ));
if( rURL.GetMap() )
{
- m_pImageMap = new ImageMap( *rURL.GetMap() );
+ m_pImageMap.reset( new ImageMap( *rURL.GetMap() ) );
AddFormat( SotClipboardFormatId::SVIM );
}
else if( !rURL.GetURL().isEmpty() )
{
- m_pTargetURL = new INetImage( sGrfNm, rURL.GetURL(),
- rURL.GetTargetFrameName() );
+ m_pTargetURL.reset(new INetImage( sGrfNm, rURL.GetURL(),
+ rURL.GetTargetFrameName() ));
AddFormat( SotClipboardFormatId::INET_IMAGE );
}
}
@@ -3074,12 +3068,12 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
}
m_eBufferType = TransferBufferType::Graphic | m_eBufferType;
- m_pClpGraphic = new Graphic;
+ m_pClpGraphic.reset(new Graphic);
if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::GDIMETAFILE, *m_pClpGraphic ))
- m_pOrigGraphic = m_pClpGraphic;
- m_pClpBitmap = new Graphic;
+ m_pOrigGraphic = m_pClpGraphic.get();
+ m_pClpBitmap.reset(new Graphic);
if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::BITMAP, *m_pClpBitmap ))
- m_pOrigGraphic = m_pClpBitmap;
+ m_pOrigGraphic = m_pClpBitmap.get();
// is it an URL-Button ?
OUString sURL;
@@ -3130,13 +3124,13 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
const SwFormatURL& rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL ));
if( rURL.GetMap() )
{
- m_pImageMap = new ImageMap( *rURL.GetMap() );
+ m_pImageMap.reset( new ImageMap( *rURL.GetMap() ) );
AddFormat( SotClipboardFormatId::SVIM );
}
else if( !rURL.GetURL().isEmpty() )
{
- m_pTargetURL = new INetImage( sGrfNm, rURL.GetURL(),
- rURL.GetTargetFrameName() );
+ m_pTargetURL.reset(new INetImage( sGrfNm, rURL.GetURL(),
+ rURL.GetTargetFrameName() ));
AddFormat( SotClipboardFormatId::INET_IMAGE );
}
}
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index 6f9248551c92..2ecbd2c2f9d6 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -26,6 +26,7 @@
#include <sfx2/lnkbase.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <o3tl/typed_flags_set.hxx>
+#include <memory>
class Graphic;
class ImageMap;
@@ -67,10 +68,12 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
SwWrtShell. */
const SwFrameShell *m_pCreatorView;
SwDocFac *m_pClpDocFac;
- Graphic *m_pClpGraphic, *m_pClpBitmap, *m_pOrigGraphic;
- INetBookmark *m_pBookmark; // URL and description!
- ImageMap *m_pImageMap;
- INetImage *m_pTargetURL;
+ std::unique_ptr<Graphic> m_pClpGraphic;
+ std::unique_ptr<Graphic> m_pClpBitmap;
+ Graphic *m_pOrigGraphic;
+ std::unique_ptr<INetBookmark> m_pBookmark; // URL and description!
+ std::unique_ptr<ImageMap> m_pImageMap;
+ std::unique_ptr<INetImage> m_pTargetURL;
TransferBufferType m_eBufferType;
More information about the Libreoffice-commits
mailing list