summaryrefslogtreecommitdiff
path: root/sc/source/ui/drawfunc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/drawfunc')
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx10
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh4.cxx6
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx4
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx10
-rw-r--r--sc/source/ui/drawfunc/drtxtob2.cxx6
-rw-r--r--sc/source/ui/drawfunc/fuconarc.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconcustomshape.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconpol.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconrec.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconstr.cxx4
-rw-r--r--sc/source/ui/drawfunc/fuconuno.cxx2
-rw-r--r--sc/source/ui/drawfunc/fudraw.cxx20
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx2
-rw-r--r--sc/source/ui/drawfunc/fupoor.cxx8
-rw-r--r--sc/source/ui/drawfunc/fusel.cxx24
-rw-r--r--sc/source/ui/drawfunc/fusel2.cxx4
-rw-r--r--sc/source/ui/drawfunc/futext.cxx14
-rw-r--r--sc/source/ui/drawfunc/futext3.cxx10
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx4
-rw-r--r--sc/source/ui/drawfunc/mediash.cxx2
21 files changed, 70 insertions, 70 deletions
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 2a302f4c4864..49069086436e 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -107,7 +107,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
const size_t nMarkCount = rMarkList.GetMarkCount();
- SdrObject* pSingleSelectedObj = NULL;
+ SdrObject* pSingleSelectedObj = nullptr;
if ( nMarkCount > 0 )
pSingleSelectedObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
@@ -228,8 +228,8 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
if ( pObj->IsGroupObject() )
{
- SdrPageView* pPV = 0;
- SdrObject* pHit = 0;
+ SdrPageView* pPV = nullptr;
+ SdrObject* pHit = nullptr;
if ( pView->PickObj( pWin->PixelToLogic( pViewData->GetMousePosPixel() ), pView->getHitTolLog(), pHit, pPV, SdrSearchOptions::DEEP ) )
pObj = pHit;
}
@@ -249,7 +249,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
if( !pArgs )
{
- if( rMarkList.GetMark(0) != 0 )
+ if( rMarkList.GetMark(0) != nullptr )
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
if( pObj->GetObjIdentifier() == OBJ_CAPTION )
@@ -379,7 +379,7 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
{
ScDrawView* pView = pViewData->GetScDrawView();
bool bHasMarked = pView->AreObjectsMarked();
- const SdrObject* pObj = NULL;
+ const SdrObject* pObj = nullptr;
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
if( rMarkList.GetMarkCount() == 1 )
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 67382ca32c01..6ee0f37ae564 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -382,7 +382,7 @@ void ScDrawShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet )
ScDrawView* pView = pViewData->GetScDrawView();
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
- if( rMarkList.GetMark(0) != 0 )
+ if( rMarkList.GetMark(0) != nullptr )
{
SfxItemSet aNewAttr(pView->GetGeoAttrFromMarked());
rSet.Put(aNewAttr, false);
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index b9fbb88e13d3..9e620e5099b4 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -33,8 +33,8 @@
void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
{
- const SdrObject* pObj = NULL;
- SvxFontWorkDialog* pDlg = NULL;
+ const SdrObject* pObj = nullptr;
+ SvxFontWorkDialog* pDlg = nullptr;
ScDrawView* pDrView = pViewData->GetScDrawView();
const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
@@ -43,7 +43,7 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
if (pViewFrm->HasChildWindow(nId))
{
SfxChildWindow* pWnd = pViewFrm->GetChildWindow(nId);
- pDlg = pWnd ? static_cast<SvxFontWorkDialog*>(pWnd->GetWindow()) : NULL;
+ pDlg = pWnd ? static_cast<SvxFontWorkDialog*>(pWnd->GetWindow()) : nullptr;
}
if ( rMarkList.GetMarkCount() == 1 )
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 65bae265db17..bdef1063be5f 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -487,7 +487,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName));
+ std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(nullptr, aName));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetCheckNameHdl(LINK(this, ScDrawShell, NameObjectHdl));
@@ -556,7 +556,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription));
+ std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(nullptr, aTitle, aDescription));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(RET_OK == pDlg->Execute())
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 80462cddc245..a6b69ebde95e 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -114,7 +114,7 @@ void ScDrawTextObjectBar::StateDisableItems( SfxItemSet &rSet )
ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) :
SfxShell(pData->GetViewShell()),
pViewData(pData),
- pClipEvtLstnr(NULL),
+ pClipEvtLstnr(nullptr),
bPastePossible(false)
{
SetPool( pViewData->GetScDrawView()->GetDefaultAttr().GetPool() );
@@ -218,14 +218,14 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
SvxFontItem aNewItem( EE_CHAR_FONTINFO );
const SfxItemSet *pArgs = rReq.GetArgs();
- const SfxPoolItem* pItem = 0;
+ const SfxPoolItem* pItem = nullptr;
if( pArgs )
pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), false, &pItem);
if ( pItem )
{
aString = static_cast<const SfxStringItem*>(pItem)->GetValue();
- const SfxPoolItem* pFtItem = NULL;
+ const SfxPoolItem* pFtItem = nullptr;
pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem);
const SfxStringItem* pFontItem = dynamic_cast<const SfxStringItem*>( pFtItem );
if ( pFontItem )
@@ -787,7 +787,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
}
bool bDone = true;
- bool bArgsInReq = ( pArgs != NULL );
+ bool bArgsInReq = ( pArgs != nullptr );
if ( !bArgsInReq )
{
@@ -796,7 +796,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
case SID_TEXT_STANDARD: // Harte Textattributierung loeschen
{
OutlinerView* pOutView = pView->IsTextEdit() ?
- pView->GetTextEditOutlinerView() : NULL;
+ pView->GetTextEditOutlinerView() : nullptr;
if ( pOutView )
pOutView->Paint( Rectangle() );
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 7942caf032d6..9a97a6aed7af 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -201,8 +201,8 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq)
void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
{
- const SdrObject* pObj = NULL;
- SvxFontWorkDialog* pDlg = NULL;
+ const SdrObject* pObj = nullptr;
+ SvxFontWorkDialog* pDlg = nullptr;
ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
@@ -211,7 +211,7 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
if (pViewFrm->HasChildWindow(nId))
{
SfxChildWindow* pWnd = pViewFrm->GetChildWindow(nId);
- pDlg = pWnd ? static_cast<SvxFontWorkDialog*>(pWnd->GetWindow()) : NULL;
+ pDlg = pWnd ? static_cast<SvxFontWorkDialog*>(pWnd->GetWindow()) : nullptr;
}
if ( rMarkList.GetMarkCount() == 1 )
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index dcfaa8281380..780af9e0ba1d 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -185,7 +185,7 @@ SdrObject* FuConstArc::CreateDefaultObject(const sal_uInt16 nID, const Rectangle
SdrObject* pObj = SdrObjFactory::MakeNewObject(
pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier(),
- 0L, pDrDoc);
+ nullptr, pDrDoc);
if(pObj)
{
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 6e3272a33ffe..b53cf0f4948c 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -188,7 +188,7 @@ SdrObject* FuConstCustomShape::CreateDefaultObject(const sal_uInt16 /* nID */, c
{
SdrObject* pObj = SdrObjFactory::MakeNewObject(
pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier(),
- 0L, pDrDoc);
+ nullptr, pDrDoc);
if( pObj )
{
Rectangle aRectangle( rRectangle );
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index aa8ff4fc65b0..0e0e9bfd0b6f 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -238,7 +238,7 @@ SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const Recta
SdrObject* pObj = SdrObjFactory::MakeNewObject(
pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier(),
- 0L, pDrDoc);
+ nullptr, pDrDoc);
if(pObj)
{
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index 5698732d94c8..c9ff32fd1aa8 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -220,7 +220,7 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const sal_uInt16 nID, const Rec
{
SdrObject* pObj = SdrObjFactory::MakeNewObject(
pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier(),
- 0L, pDrDoc);
+ nullptr, pDrDoc);
if(pObj)
{
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index b8cc232ca08e..5318084771a1 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -133,7 +133,7 @@ bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
SdrHdl* pHdl = pView->PickHandle(aMDPos);
- if ( pHdl != NULL || pView->IsMarkedHit(aMDPos) )
+ if ( pHdl != nullptr || pView->IsMarkedHit(aMDPos) )
{
pView->BegDragObj(aMDPos, nullptr, pHdl, 1);
bReturn = true;
@@ -187,7 +187,7 @@ bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
{
SdrHdl* pHdl=pView->PickHandle(aPnt);
- if ( pHdl != NULL )
+ if ( pHdl != nullptr )
{
pViewShell->SetActivePointer(pHdl->GetPointer());
}
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 518f2548385c..d6bb3d58d402 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -173,7 +173,7 @@ SdrObject* FuConstUnoControl::CreateDefaultObject(const sal_uInt16 /* nID */, co
SdrObject* pObj = SdrObjFactory::MakeNewObject(
pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier(),
- 0L, pDrDoc);
+ nullptr, pDrDoc);
if(pObj)
{
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 073508bb4aaf..56c519e2f85b 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -208,7 +208,7 @@ static bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const
if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // no RTTI
{
FuText* pText = static_cast<FuText*>(pPoor);
- pText->SetInEditMode( pObj, NULL, true, pInitialKey );
+ pText->SetInEditMode( pObj, nullptr, true, pInitialKey );
//! set cursor to end of text
}
bReturn = true;
@@ -276,7 +276,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
// consumed
bReturn = true;
}
- else if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object
+ else if ( lcl_KeyEditMode( pObj, pViewShell, nullptr ) ) // start text edit for suitable object
bReturn = true;
}
}
@@ -293,7 +293,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
if( !pView->IsTextEdit() && 1 == rMarkList.GetMarkCount() )
{
SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
- if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object
+ if ( lcl_KeyEditMode( pObj, pViewShell, nullptr ) ) // start text edit for suitable object
bReturn = true;
}
}
@@ -483,7 +483,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
const SdrHdlList& rHdlList = pView->GetHdlList();
SdrHdl* pHdl = rHdlList.GetFocusHdl();
- if(0L == pHdl)
+ if(nullptr == pHdl)
{
// only take action when move is allowed
if(pView->IsMoveAllowed())
@@ -540,7 +540,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
const SdrDragStat& rDragStat = pView->GetDragStat();
// start dragging
- pView->BegDragObj(aStartPoint, 0, pHdl, 0);
+ pView->BegDragObj(aStartPoint, nullptr, pHdl, 0);
if(pView->IsDragObj())
{
@@ -609,10 +609,10 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
pView->MarkPoint(*pHdl);
}
- if(0L == rHdlList.GetFocusHdl())
+ if(nullptr == rHdlList.GetFocusHdl())
{
// restore point with focus
- SdrHdl* pNewOne = 0L;
+ SdrHdl* pNewOne = nullptr;
for(size_t a = 0; !pNewOne && a < rHdlList.GetHdlCount(); ++a)
{
@@ -698,7 +698,7 @@ static bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, vcl::Window* pWi
MouseEvent aMEvt( rPosPixel, 1, MouseEventModifiers::NONE, MOUSE_LEFT );
SdrHitKind eHit = pView->PickAnything( aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt );
- if ( eHit != SDRHIT_NONE && aVEvt.pObj != NULL )
+ if ( eHit != SDRHIT_NONE && aVEvt.pObj != nullptr )
{
if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) && ScDrawLayer::GetHitIMapObject(
aVEvt.pObj, pWindow->PixelToLogic(rPosPixel), *pWindow ) )
@@ -722,12 +722,12 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
SdrObject* pObj;
SdrPageView* pPV;
- ScMacroInfo* pInfo = 0;
+ ScMacroInfo* pInfo = nullptr;
if ( pView->PickObj(aPnt, pView->getHitTolLog(), pObj, pPV, SdrSearchOptions::ALSOONMASTER) )
{
if ( pObj->IsGroupObject() )
{
- SdrObject* pHit = 0;
+ SdrObject* pHit = nullptr;
if ( pView->PickObj(aMDPos, pView->getHitTolLog(), pHit, pPV, SdrSearchOptions::DEEP ) )
pObj = pHit;
}
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index f79472cbb53c..05bbdd21479e 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -663,7 +663,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV
uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY );
if( xChartModel.is() && xInit.is() )
{
- uno::Reference< awt::XWindow > xDialogParentWindow(0);
+ uno::Reference< awt::XWindow > xDialogParentWindow(nullptr);
// initialize dialog
uno::Sequence<uno::Any> aSeq(2);
uno::Any* pArray = aSeq.getArray();
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index d0e5d0c76a60..2b09d57c0779 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -37,7 +37,7 @@ FuPoor::FuPoor(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
pWindow(pWin),
pDrDoc(pDoc),
aSfxRequest(rReq),
- pDialog(NULL),
+ pDialog(nullptr),
bIsInDragMode(false),
// remember MouseButton state
mnCode(0)
@@ -215,7 +215,7 @@ IMPL_LINK_NOARG_TYPED(FuPoor, DragHdl, void*, void)
{
SdrHdl* pHdl = pView->PickHandle(aMDPos);
- if ( pHdl==NULL && pView->IsMarkedHit(aMDPos) )
+ if ( pHdl==nullptr && pView->IsMarkedHit(aMDPos) )
{
pWindow->ReleaseMouse();
bIsInDragMode = true;
@@ -240,7 +240,7 @@ bool FuPoor::IsDetectiveHit( const Point& rLogicPos )
{
sal_uInt16 nHitLog = (sal_uInt16) pWindow->PixelToLogic(
Size(pView->GetHitTolerancePixel(),0)).Width();
- if(SdrObjectPrimitiveHit(*pObject, rLogicPos, nHitLog, *pPV, 0, false))
+ if(SdrObjectPrimitiveHit(*pObject, rLogicPos, nHitLog, *pPV, nullptr, false))
{
bFound = true;
}
@@ -266,7 +266,7 @@ void FuPoor::StopDragTimer()
SdrObject* FuPoor::CreateDefaultObject(const sal_uInt16 /* nID */, const Rectangle& /* rRectangle */)
{
// empty base implementation
- return 0L;
+ return nullptr;
}
void FuPoor::ImpForceQuadratic(Rectangle& rRect)
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 86885ac16f3b..8626daa97364 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -114,7 +114,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
SdrHdl* pHdl = pView->PickHandle(aMDPos);
- if ( pHdl!=NULL || pView->IsMarkedHit(aMDPos) )
+ if ( pHdl!=nullptr || pView->IsMarkedHit(aMDPos) )
{
// Determine if this is the tail of a SdrCaptionObj i.e.
// we need to disable the drag option on the tail of a note
@@ -183,7 +183,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
ScMacroInfo* pTmpInfo = ScDrawLayer::GetMacroInfo( pObj );
if ( !pTmpInfo || pTmpInfo->GetMacro().isEmpty() )
{
- SdrObject* pHit = NULL;
+ SdrObject* pHit = nullptr;
if ( pView->PickObj(aMDPos, pView->getHitTolLog(), pHit, pPV, SdrSearchOptions::DEEP ) )
pObj = pHit;
}
@@ -229,7 +229,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
if ( !bAlt &&
pView->PickAnything( rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt ) != SDRHIT_NONE &&
- aVEvt.pObj != NULL )
+ aVEvt.pObj != nullptr )
{
if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) ) // ImageMap
{
@@ -379,7 +379,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
bool bReturn = FuDraw::MouseButtonUp(rMEvt);
bool bOle = pViewShell && pViewShell->GetViewFrame()->GetFrame().IsInPlace();
- SdrObject* pObj = NULL;
+ SdrObject* pObj = nullptr;
if (aDragTimer.IsActive() )
{
aDragTimer.Stop();
@@ -389,10 +389,10 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
bool bCopy = false;
- ScViewData* pViewData = ( pViewShell ? &pViewShell->GetViewData() : NULL );
- ScDocument* pDocument = ( pViewData ? pViewData->GetDocument() : NULL );
- SdrPageView* pPageView = ( pView ? pView->GetSdrPageView() : NULL );
- SdrPage* pPage = ( pPageView ? pPageView->GetPage() : NULL );
+ ScViewData* pViewData = ( pViewShell ? &pViewShell->GetViewData() : nullptr );
+ ScDocument* pDocument = ( pViewData ? pViewData->GetDocument() : nullptr );
+ SdrPageView* pPageView = ( pView ? pView->GetSdrPageView() : nullptr );
+ SdrPage* pPage = ( pPageView ? pPageView->GetPage() : nullptr );
::std::vector< OUString > aExcludedChartNames;
ScRangeListVector aProtectedChartRangesVector;
@@ -416,7 +416,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
for ( size_t i = 0; i < nMarkCount; ++i )
{
SdrMark* pMark = rSdrMarkList.GetMark( i );
- pObj = ( pMark ? pMark->GetMarkedSdrObj() : NULL );
+ pObj = ( pMark ? pMark->GetMarkedSdrObj() : nullptr );
if ( pObj )
{
ScChartHelper::AddRangesIfProtectedChart( aProtectedChartRangesVector, pDocument, pObj );
@@ -434,7 +434,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
* If a user wants to click on an object in front of a marked
* one, he releases the mouse button immediately
**************************************************************/
- SdrPageView* pPV = NULL;
+ SdrPageView* pPV = nullptr;
if (pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::BEFOREMARK))
{
pView->UnmarkAllObj();
@@ -487,7 +487,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
/**************************************************************************
* Ggf. OLE-Objekt beruecksichtigen
**************************************************************************/
- SfxInPlaceClient* pIPClient = pViewShell ? pViewShell->GetIPClient() : NULL;
+ SfxInPlaceClient* pIPClient = pViewShell ? pViewShell->GetIPClient() : nullptr;
if (pIPClient)
{
@@ -583,7 +583,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
if ( bCopy && pViewData && pDocument && pPage )
{
ScDocShell* pDocShell = pViewData->GetDocShell();
- ScModelObj* pModelObj = ( pDocShell ? ScModelObj::getImplementation( pDocShell->GetModel() ) : NULL );
+ ScModelObj* pModelObj = ( pDocShell ? ScModelObj::getImplementation( pDocShell->GetModel() ) : nullptr );
if ( pModelObj )
{
SCTAB nTab = pViewData->GetTabNo();
diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx
index 82cb880c0ab9..6894c81cd528 100644
--- a/sc/source/ui/drawfunc/fusel2.cxx
+++ b/sc/source/ui/drawfunc/fusel2.cxx
@@ -60,7 +60,7 @@ bool FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos )
{
sal_uInt16 nHitLog = (sal_uInt16) pWindow->PixelToLogic(
Size(pView->GetHitTolerancePixel(),0)).Width();
- if (SdrObjectPrimitiveHit(*pObject, rPos, nHitLog, *pPV, 0, false))
+ if (SdrObjectPrimitiveHit(*pObject, rPos, nHitLog, *pPV, nullptr, false))
{
ScViewData& rViewData = pViewShell->GetViewData();
ScSplitPos ePos = pViewShell->FindWindow( pWindow );
@@ -121,7 +121,7 @@ bool FuSelection::IsNoteCaptionMarked() const
bool FuSelection::IsNoteCaptionClicked( const Point& rPos ) const
{
- SdrPageView* pPageView = pView ? pView->GetSdrPageView() : 0;
+ SdrPageView* pPageView = pView ? pView->GetSdrPageView() : nullptr;
if( pPageView )
{
const ScViewData& rViewData = pViewShell->GetViewData();
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 8f00c253d26c..64c2d79c368f 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -110,7 +110,7 @@ static void lcl_UpdateHyphenator( Outliner& rOutliner, SdrObject* pObj )
FuText::FuText(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest& rReq) :
FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq),
- pTextObj(NULL)
+ pTextObj(nullptr)
{
}
@@ -167,7 +167,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
const size_t nHdlNum = pView->GetHdlNum(pHdl);
- if (pHdl != NULL)
+ if (pHdl != nullptr)
{
if (pView->HasMarkablePoints() && pView->IsPointMarkable(*pHdl))
{
@@ -199,9 +199,9 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
SdrObject* pObj;
SdrPageView* pPV;
- if ( pHdl != NULL || pView->IsMarkedHit(aMDPos) )
+ if ( pHdl != nullptr || pView->IsMarkedHit(aMDPos) )
{
- if (pHdl == NULL &&
+ if (pHdl == nullptr &&
// pView->TakeTextEditObject(aMDPos, pObj, pPV) )
pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SdrSearchOptions::PICKTEXTEDIT) )
{
@@ -284,7 +284,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
pHdl=pView->PickHandle(aMDPos);
- if (pHdl!=NULL)
+ if (pHdl!=nullptr)
{
pView->MarkPoint(*pHdl);
pHdl=pView->GetHdl(nHdlNum);
@@ -643,7 +643,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
}
}
- pTextObj = NULL;
+ pTextObj = nullptr;
if ( pObj )
{
@@ -725,7 +725,7 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR
SdrObject* pObj = SdrObjFactory::MakeNewObject(
pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier(),
- 0L, pDrDoc);
+ nullptr, pDrDoc);
if(pObj)
{
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index 2c4e8ed7ffc4..f59e88955310 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -63,7 +63,7 @@ void FuText::StopEditMode(bool /*bTextDirection*/)
OSL_ENSURE( pDrawLayer && (pDrawLayer == pDrDoc), "FuText::StopEditMode - missing or different drawing layers" );
ScAddress aNotePos;
- ScPostIt* pNote = 0;
+ ScPostIt* pNote = nullptr;
if( const ScDrawObjData* pCaptData = ScDrawLayer::GetNoteCaptionData( pObject, rViewData.GetTabNo() ) )
{
aNotePos = pCaptData->maStart;
@@ -72,7 +72,7 @@ void FuText::StopEditMode(bool /*bTextDirection*/)
}
ScDocShell* pDocShell = rViewData.GetDocShell();
- ::svl::IUndoManager* pUndoMgr = rDoc.IsUndoEnabled() ? pDocShell->GetUndoManager() : 0;
+ ::svl::IUndoManager* pUndoMgr = rDoc.IsUndoEnabled() ? pDocShell->GetUndoManager() : nullptr;
bool bNewNote = false;
if( pNote && pUndoMgr )
{
@@ -109,10 +109,10 @@ void FuText::StopEditMode(bool /*bTextDirection*/)
deletion by passing sal_True to this function. The return value changes
from SDRENDTEXTEDIT_DELETED to SDRENDTEXTEDIT_SHOULDBEDELETED in this
case. */
- /*SdrEndTextEditKind eResult =*/ pView->SdrEndTextEdit( pNote != 0 );
+ /*SdrEndTextEditKind eResult =*/ pView->SdrEndTextEdit( pNote != nullptr );
// or ScEndTextEdit (with drawview.hxx)
- pViewShell->SetDrawTextUndo( 0 );
+ pViewShell->SetDrawTextUndo( nullptr );
vcl::Cursor* pCur = pWindow->GetCursor();
if( pCur && pCur->IsVisible() )
@@ -148,7 +148,7 @@ void FuText::StopEditMode(bool /*bTextDirection*/)
rDoc.ReleaseNote(aNotePos);
}
// ScDocument::DeleteNote has deleted the note that pNote points to
- pNote = 0;
+ pNote = nullptr;
}
// finalize the undo list action
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 48bde978398b..6f28525abc73 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -228,7 +228,7 @@ void ScGraphicShell::GetCropGraphicState( SfxItemSet& rSet )
{
SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
- if( pObj && 0 != dynamic_cast<const SdrGrafObj*>( pObj) && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) )
+ if( pObj && nullptr != dynamic_cast<const SdrGrafObj*>( pObj) && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) )
bEnable = true;
}
@@ -300,7 +300,7 @@ void ScGraphicShell::ExecuteChangePicture(SfxRequest& /*rReq*/)
{
SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
- if( pObj && 0 != dynamic_cast<const SdrGrafObj*>( pObj) && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP )
+ if( pObj && nullptr != dynamic_cast<const SdrGrafObj*>( pObj) && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP )
{
SdrGrafObj* pGraphicObj = static_cast<SdrGrafObj*>(pObj);
SvxOpenGraphicDialog aDlg(ScResId(STR_INSERTGRAPHIC));
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index a7281ad77115..d04cd4eb1c17 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -107,7 +107,7 @@ void ScMediaShell::ExecuteMedia( SfxRequest& rReq )
const SfxPoolItem* pItem;
if( !pArgs || ( SfxItemState::SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, false, &pItem ) ) )
- pItem = NULL;
+ pItem = nullptr;
if( pItem )
{
generated by cgit (git 2.34.1) at 2024-07-19 00:20:09 +0000