diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:23:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:38 +0100 |
commit | 92c697c0e3e4bde88424322875c993c161696b1e (patch) | |
tree | ea1be62a0cb8fd7f7e63dd03a52441cedd8e96eb /sd/source/ui/view/sdview3.cxx | |
parent | 65464ed0985802edb96dbcbd1c3eed996f3778bd (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: If1b80da64ba575f07b31dce9bc0e34b7eb9f11a4
Diffstat (limited to 'sd/source/ui/view/sdview3.cxx')
-rw-r--r-- | sd/source/ui/view/sdview3.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 4e32d934ca00..2dc792a7b644 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -110,7 +110,7 @@ SdrObject* ImpGetClone(std::vector<ImpRememberOrigAndClone*>& aConnectorContaine if(pConnObj == aConnectorContainer[a]->pOrig) return aConnectorContainer[a]->pClone; } - return 0L; + return nullptr; } // restrict movement to WorkArea @@ -251,7 +251,7 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo aGraphic.SetPrefMapMode( aMtf.GetPrefMapMode() ); aGraphic.SetPrefSize( aMtf.GetPrefSize() ); - InsertGraphic( aGraphic, mnAction, aInsertPos, NULL, pImageMap ); + InsertGraphic( aGraphic, mnAction, aInsertPos, nullptr, pImageMap ); return true; } @@ -265,39 +265,39 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, mbIsDropAllowed = false; TransferableDataHelper aDataHelper( rDataHelper ); - SdrObject* pPickObj = NULL; - SdPage* pPage = NULL; + SdrObject* pPickObj = nullptr; + SdPage* pPage = nullptr; std::unique_ptr<ImageMap> pImageMap; bool bReturn = false; bool bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 ); bool bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink ); SdrInsertFlags nPasteOptions = SdrInsertFlags::SETDEFLAYER; - if (mpViewSh != NULL) + if (mpViewSh != nullptr) { - OSL_ASSERT (mpViewSh->GetViewShell()!=NULL); + OSL_ASSERT (mpViewSh->GetViewShell()!=nullptr); SfxInPlaceClient* pIpClient = mpViewSh->GetViewShell()->GetIPClient(); if( dynamic_cast< ::sd::slidesorter::SlideSorterViewShell *>( mpViewSh ) != nullptr - || (pIpClient!=NULL && pIpClient->IsObjectInPlaceActive())) + || (pIpClient!=nullptr && pIpClient->IsObjectInPlaceActive())) nPasteOptions |= SdrInsertFlags::DONTMARK; } if( bDrag ) { - SdrPageView* pPV = NULL; + SdrPageView* pPV = nullptr; PickObj( rPos, getHitTolLog(), pPickObj, pPV ); } if( nPage != SDRPAGE_NOTFOUND ) pPage = static_cast<SdPage*>( mrDoc.GetPage( nPage ) ); - SdTransferable* pOwnData = NULL; + SdTransferable* pOwnData = nullptr; SdTransferable* pImplementation = SdTransferable::getImplementation( aDataHelper.GetTransferable() ); if(pImplementation && (rDnDAction & DND_ACTION_LINK)) { // suppress own data when it's intention is to use it as fill information - pImplementation = 0; + pImplementation = nullptr; } // try to get own transfer data @@ -615,7 +615,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if (nPos != -1) aLayout = aLayout.copy(0, nPos); pPage->SetPresentationLayout( aLayout, false, false ); - pSourceDoc->CreatingDataObj( NULL ); + pSourceDoc->CreatingDataObj( nullptr ); } else { @@ -691,8 +691,8 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, { // only one object SdrObject* pObj = pModel->GetSdPage( 0, PK_STANDARD )->GetObj( 0 ); - SdrObject* pPickObj2 = NULL; - SdrPageView* pPV = NULL; + SdrObject* pPickObj2 = nullptr; + SdrPageView* pPV = nullptr; PickObj( rPos, getHitTolLog(), pPickObj2, pPV ); if( ( mnAction & DND_ACTION_MOVE ) && pPickObj2 && pObj ) @@ -983,12 +983,12 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, SdrPageView* pPV = GetSdrPageView(); SdrInsertFlags nOptions = SdrInsertFlags::SETDEFLAYER; - if (mpViewSh!=NULL) + if (mpViewSh!=nullptr) { - OSL_ASSERT (mpViewSh->GetViewShell()!=NULL); + OSL_ASSERT (mpViewSh->GetViewShell()!=nullptr); SfxInPlaceClient* pIpClient = mpViewSh->GetViewShell()->GetIPClient(); - if (pIpClient!=NULL && pIpClient->IsObjectInPlaceActive()) + if (pIpClient!=nullptr && pIpClient->IsObjectInPlaceActive()) nOptions |= SdrInsertFlags::DONTMARK; } @@ -1153,12 +1153,12 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, SdrPageView* pPV = GetSdrPageView(); SdrInsertFlags nOptions = SdrInsertFlags::SETDEFLAYER; - if (mpViewSh!=NULL) + if (mpViewSh!=nullptr) { - OSL_ASSERT (mpViewSh->GetViewShell()!=NULL); + OSL_ASSERT (mpViewSh->GetViewShell()!=nullptr); SfxInPlaceClient* pIpClient = mpViewSh->GetViewShell()->GetIPClient(); - if (pIpClient!=NULL && pIpClient->IsObjectInPlaceActive()) + if (pIpClient!=nullptr && pIpClient->IsObjectInPlaceActive()) nOptions |= SdrInsertFlags::DONTMARK; } @@ -1215,7 +1215,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, ImpCheckInsertPos(aInsertPos, aImageMapSize, GetWorkArea()); - InsertGraphic( aGraphic, mnAction, aInsertPos, NULL, pImageMap.get() ); + InsertGraphic( aGraphic, mnAction, aInsertPos, nullptr, pImageMap.get() ); bReturn = true; } } @@ -1294,7 +1294,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, Size aImageMapSize(aBmpEx.GetPrefSize()); ImpCheckInsertPos(aInsertPos, aImageMapSize, GetWorkArea()); - InsertGraphic( aBmpEx, mnAction, aInsertPos, NULL, pImageMap.get() ); + InsertGraphic( aBmpEx, mnAction, aInsertPos, nullptr, pImageMap.get() ); bReturn = true; } } |