summaryrefslogtreecommitdiff
path: root/svx/source/sdr/contact
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/sdr/contact')
-rw-r--r--svx/source/sdr/contact/objectcontact.cxx14
-rw-r--r--svx/source/sdr/contact/objectcontactofobjlistpainter.cxx2
-rw-r--r--svx/source/sdr/contact/objectcontactofpageview.cxx6
-rw-r--r--svx/source/sdr/contact/viewcontact.cxx6
-rw-r--r--svx/source/sdr/contact/viewcontactofe3d.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dscene.cxx12
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofunocontrol.cxx4
-rw-r--r--svx/source/sdr/contact/viewobjectcontact.cxx6
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofgraphic.cxx6
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofpageobj.cxx8
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx6
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx38
14 files changed, 57 insertions, 57 deletions
diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index 9ae337ba3cb0..10b971b7329e 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -34,8 +34,8 @@ namespace sdr { namespace contact {
ObjectContact::ObjectContact()
: maViewObjectContactVector(),
maPrimitiveAnimator(),
- mpEventHandler(0),
- mpViewObjectContactRedirector(0),
+ mpEventHandler(nullptr),
+ mpViewObjectContactRedirector(nullptr),
maViewInformation2D(uno::Sequence< beans::PropertyValue >()),
mbIsPreviewRenderer(false)
{
@@ -115,7 +115,7 @@ bool ObjectContact::DoVisualizeEnteredGroup() const
const ViewContact* ObjectContact::getActiveViewContact() const
{
// default has no active VC
- return 0;
+ return nullptr;
}
// Invalidate given rectangle at the window/output which is represented by
@@ -167,14 +167,14 @@ void ObjectContact::DeleteEventHandler()
{
// If there are still Events registered, something has went wrong
delete mpEventHandler;
- mpEventHandler = 0L;
+ mpEventHandler = nullptr;
}
}
// test if there is an EventHandler without creating one on demand
bool ObjectContact::HasEventHandler() const
{
- return (0L != mpEventHandler);
+ return (nullptr != mpEventHandler);
}
// check if text animation is allowed. Default is sal_true.
@@ -254,13 +254,13 @@ bool ObjectContact::isDrawModeHighContrast() const
// access to SdrPageView. Default implementation returns NULL
SdrPageView* ObjectContact::TryToGetSdrPageView() const
{
- return 0;
+ return nullptr;
}
// access to OutputDevice. Default implementation returns NULL
OutputDevice* ObjectContact::TryToGetOutputDevice() const
{
- return 0;
+ return nullptr;
}
void ObjectContact::resetViewPort()
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 6f62f8e670ca..69d74b0862ad 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -145,7 +145,7 @@ bool ObjectContactOfObjListPainter::isOutputToRecordingMetaFile() const
// pdf export?
bool ObjectContactOfObjListPainter::isOutputToPDFFile() const
{
- return (0 != mrTargetOutputDevice.GetPDFWriter());
+ return (nullptr != mrTargetOutputDevice.GetPDFWriter());
}
OutputDevice* ObjectContactOfObjListPainter::TryToGetOutputDevice() const
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 4786c7a5b8d1..b30c904bb5f1 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -164,7 +164,7 @@ namespace sdr
// #114359# save old and set clip region
OutputDevice* pOutDev = TryToGetOutputDevice();
- OSL_ENSURE(0 != pOutDev, "ObjectContactOfPageView without OutDev, someone has overridden TryToGetOutputDevice wrong (!)");
+ OSL_ENSURE(nullptr != pOutDev, "ObjectContactOfPageView without OutDev, someone has overridden TryToGetOutputDevice wrong (!)");
bool bClipRegionPushed(false);
const vcl::Region& rRedrawArea(rDisplayInfo.GetRedrawArea());
@@ -347,7 +347,7 @@ namespace sdr
return &(GetSdrPage()->GetViewContact());
}
- return 0;
+ return nullptr;
}
// Invalidate given rectangle at the window/output which is represented by
@@ -446,7 +446,7 @@ namespace sdr
// pdf export?
bool ObjectContactOfPageView::isOutputToPDFFile() const
{
- return (0 != mrPageWindow.GetPaintWindow().GetOutputDevice().GetPDFWriter());
+ return (nullptr != mrPageWindow.GetPaintWindow().GetOutputDevice().GetPDFWriter());
}
// gray display mode
diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx
index e2aed54ec2ae..9e15adb3ad96 100644
--- a/svx/source/sdr/contact/viewcontact.cxx
+++ b/svx/source/sdr/contact/viewcontact.cxx
@@ -78,7 +78,7 @@ void ViewContact::deleteAllVOCs()
// ObjectContact (->View). Always needs to return something.
ViewObjectContact& ViewContact::GetViewObjectContact(ObjectContact& rObjectContact)
{
- ViewObjectContact* pRetval = 0L;
+ ViewObjectContact* pRetval = nullptr;
const sal_uInt32 nCount(maViewObjectContactVector.size());
// first search if there exists a VOC for the given OC
@@ -180,7 +180,7 @@ ViewContact& ViewContact::GetViewContact(sal_uInt32 /*nIndex*/) const
ViewContact* ViewContact::GetParentContact() const
{
// default has no parent
- return 0;
+ return nullptr;
}
void ViewContact::ActionChildInserted(ViewContact& rChild)
@@ -220,7 +220,7 @@ void ViewContact::ActionChanged()
// implementations do. Override as needed.
SdrObject* ViewContact::TryToGetSdrObject() const
{
- return 0L;
+ return nullptr;
}
// primitive stuff
diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx
index e5d9f689e5df..a07a7ec1cf4c 100644
--- a/svx/source/sdr/contact/viewcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3d.cxx
@@ -60,7 +60,7 @@ const sdr::contact::ViewContactOfE3dScene* tryToFindVCOfE3DScene(
}
// object hierarchy structure is incorrect; no result
- return 0;
+ return nullptr;
}
} // end of anonymous namespace
diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
index 7c32e153b4c3..383d09fd788c 100644
--- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
@@ -64,7 +64,7 @@ void createSubPrimitive3DVector(
createSubPrimitive3DVector(
rCandidate.GetViewContact(a),
aNewAllTarget,
- o_pVisibleTarget ? &aNewVisibleTarget : 0,
+ o_pVisibleTarget ? &aNewVisibleTarget : nullptr,
pVisibleLayerSet,
bTestSelectedVisibility);
}
@@ -279,7 +279,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createScen
// create 3d scene primitive with visible content tested against rLayerVisibility
drawinglayer::primitive3d::Primitive3DSequence aAllSequence;
drawinglayer::primitive3d::Primitive3DSequence aVisibleSequence;
- const bool bTestLayerVisibility(0 != pLayerVisibility);
+ const bool bTestLayerVisibility(nullptr != pLayerVisibility);
const bool bTestSelectedVisibility(GetE3dScene().GetDrawOnlySelected());
const bool bTestVisibility(bTestLayerVisibility || bTestSelectedVisibility);
@@ -292,8 +292,8 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createScen
createSubPrimitive3DVector(
GetViewContact(a),
aAllSequence,
- bTestLayerVisibility ? &aVisibleSequence : 0,
- bTestLayerVisibility ? pLayerVisibility : 0,
+ bTestLayerVisibility ? &aVisibleSequence : nullptr,
+ bTestLayerVisibility ? pLayerVisibility : nullptr,
bTestSelectedVisibility);
}
@@ -340,7 +340,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createView
if(GetObjectCount())
{
// create a default ScenePrimitive2D (without visibility test of members)
- xRetval = createScenePrimitive2DSequence(0);
+ xRetval = createScenePrimitive2DSequence(nullptr);
}
return xRetval;
@@ -433,7 +433,7 @@ drawinglayer::primitive3d::Primitive3DSequence ViewContactOfE3dScene::getAllPrim
// is seen as part of the ViewTransformation (see text in createViewInformation3D)
for(sal_uInt32 a(0L); a < nChildrenCount; a++)
{
- createSubPrimitive3DVector(GetViewContact(a), aAllPrimitive3DSequence, 0, 0, false);
+ createSubPrimitive3DVector(GetViewContact(a), aAllPrimitive3DSequence, nullptr, nullptr, false);
}
return aAllPrimitive3DSequence;
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 6ff5375ae927..1efd086f6f75 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -85,7 +85,7 @@ ViewContact& ViewContactOfSdrObj::GetViewContact(sal_uInt32 nIndex) const
ViewContact* ViewContactOfSdrObj::GetParentContact() const
{
- ViewContact* pRetval = 0L;
+ ViewContact* pRetval = nullptr;
SdrObjList* pObjList = GetSdrObject().GetObjList();
if(pObjList)
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 4f68e3bd29d8..fa92aed98b06 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -88,7 +88,7 @@ namespace sdr { namespace contact {
SdrUnoObj* pUnoObject = dynamic_cast< SdrUnoObj* >( TryToGetSdrObject() );
OSL_ENSURE( pUnoObject, "ViewContactOfUnoControl::getTemporaryControlForDevice: no SdrUnoObj!" );
if ( !pUnoObject )
- return NULL;
+ return nullptr;
return ViewObjectContactOfUnoControl::getTemporaryControlForWindow( _rWindow, _inout_ControlContainer, *pUnoObject );
}
@@ -100,7 +100,7 @@ namespace sdr { namespace contact {
ObjectContactOfPageView* const pPageViewContact = dynamic_cast< ObjectContactOfPageView* >( &_rObjectContact );
const bool bPrintOrPreview = pPageViewContact
- && ( ( ( pDevice != NULL ) && ( pDevice->GetOutDevType() == OUTDEV_PRINTER ) )
+ && ( ( ( pDevice != nullptr ) && ( pDevice->GetOutDevType() == OUTDEV_PRINTER ) )
|| pPageViewContact->GetPageWindow().GetPageView().GetView().IsPrintPreview()
)
;
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index 7ce2905c4809..8078349251fb 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -165,7 +165,7 @@ ViewObjectContact::ViewObjectContact(ObjectContact& rObjectContact, ViewContact&
mrViewContact(rViewContact),
maObjectRange(),
mxPrimitive2DSequence(),
- mpPrimitiveAnimation(0),
+ mpPrimitiveAnimation(nullptr),
mbLazyInvalidate(false)
{
// make the ViewContact remember me
@@ -187,7 +187,7 @@ ViewObjectContact::~ViewObjectContact()
if(mpPrimitiveAnimation)
{
delete mpPrimitiveAnimation;
- mpPrimitiveAnimation = 0;
+ mpPrimitiveAnimation = nullptr;
}
// take care of remembered ObjectContact. Remove from
@@ -297,7 +297,7 @@ void ViewObjectContact::checkForPrimitive2DAnimations()
if(mpPrimitiveAnimation)
{
delete mpPrimitiveAnimation;
- mpPrimitiveAnimation = 0;
+ mpPrimitiveAnimation = nullptr;
}
// check for animated primitives
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index a2a578e029b4..dd68629779e6 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -218,7 +218,7 @@ namespace sdr
// #i103720# forget event to avoid possible deletion by the following ActionChanged call
// which may use createPrimitive2DSequence/impPrepareGraphicWithAsynchroniousLoading again.
// Deletion is actually done by the scheduler who leaded to coming here
- mpAsynchLoadEvent = 0;
+ mpAsynchLoadEvent = nullptr;
// Invalidate all paint areas and check existing animation (which may have changed).
GetViewContact().ActionChanged();
@@ -237,7 +237,7 @@ namespace sdr
"ViewObjectContactOfGraphic::forgetAsynchGraphicLoadingEvent: Forced to forget another event then I have scheduled (?)");
// forget event
- mpAsynchLoadEvent = 0;
+ mpAsynchLoadEvent = nullptr;
}
}
@@ -307,7 +307,7 @@ namespace sdr
ViewObjectContactOfGraphic::ViewObjectContactOfGraphic(ObjectContact& rObjectContact, ViewContact& rViewContact)
: ViewObjectContactOfSdrObj(rObjectContact, rViewContact),
- mpAsynchLoadEvent(0)
+ mpAsynchLoadEvent(nullptr)
{
}
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 7cc66dcfc4ab..8a1b3ccbb4a4 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -77,7 +77,7 @@ public:
PagePrimitiveExtractor::PagePrimitiveExtractor(
ViewObjectContactOfPageObj& rVOC)
-: ObjectContactOfPagePainter(0, rVOC.GetObjectContact()),
+: ObjectContactOfPagePainter(nullptr, rVOC.GetObjectContact()),
mrViewObjectContactOfPageObj(rVOC)
{
// make this renderer a preview renderer
@@ -258,7 +258,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageObj::creat
// #i105548# reset VOCRedirector to not accidentally have a pointer to a
// temporary class, so calls to it are avoided safely
- mpExtractor->SetViewObjectContactRedirector(0);
+ mpExtractor->SetViewObjectContactRedirector(nullptr);
// reset recursion flag
bInCreatePrimitive2D = false;
@@ -314,11 +314,11 @@ ViewObjectContactOfPageObj::~ViewObjectContactOfPageObj()
// remember candidate and reset own pointer to avoid action when createPrimitive2DSequence()
// would be called for any reason
PagePrimitiveExtractor* pCandidate = mpExtractor;
- mpExtractor = 0;
+ mpExtractor = nullptr;
// also reset the StartPage to avoid ActionChanged() forwardings in the
// PagePrimitiveExtractor::InvalidatePartOfView() implementation
- pCandidate->SetStartPage(0);
+ pCandidate->SetStartPage(nullptr);
delete pCandidate;
}
}
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index a114927f360d..cdc5cc2a4112 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -36,7 +36,7 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r
ViewContact& rViewContact,
const ::avmedia::MediaItem& rMediaItem ) :
ViewObjectContactOfSdrObj( rObjectContact, rViewContact ),
- mpMediaWindow( NULL )
+ mpMediaWindow( nullptr )
{
#if HAVE_FEATURE_AVMEDIA
vcl::Window* pWindow = getWindow();
@@ -55,14 +55,14 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r
ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj()
{
delete mpMediaWindow;
- mpMediaWindow = NULL;
+ mpMediaWindow = nullptr;
}
vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow() const
{
- vcl::Window* pRetval = 0;
+ vcl::Window* pRetval = nullptr;
boost::optional<const OutputDevice&> oPageOutputDev = getPageViewOutputDevice();
if( oPageOutputDev )
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index 0c9afc62db49..836925c0f5e0 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
@@ -125,7 +125,7 @@ bool ViewObjectContactOfSdrObj::isPrimitiveVisible(const DisplayInfo& rDisplayIn
}
else
{
- const bool bIsFormControl = dynamic_cast< const FmFormObj * >( &rObject ) != 0;
+ const bool bIsFormControl = dynamic_cast< const FmFormObj * >( &rObject ) != nullptr;
if(bIsFormControl && bHideFormControl)
{
return false;
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 169b136f28bf..d3a46cb5feec 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -391,7 +391,7 @@ namespace sdr { namespace contact {
Reference< XControlContainer > SdrPageViewAccess::getControlContainer( const OutputDevice& _rDevice ) const
{
Reference< XControlContainer > xControlContainer = m_rPageView.GetControlContainer( _rDevice );
- DBG_ASSERT( xControlContainer.is() || NULL == m_rPageView.FindPageWindow( _rDevice ),
+ DBG_ASSERT( xControlContainer.is() || nullptr == m_rPageView.FindPageWindow( _rDevice ),
"SdrPageViewAccess::getControlContainer: the output device is known, but there is no control container for it?" );
return xControlContainer;
}
@@ -482,7 +482,7 @@ namespace sdr { namespace contact {
Reference< XControlContainer > DummyPageViewAccess::getControlContainer( const OutputDevice& /*_rDevice*/ ) const
{
- return NULL;
+ return nullptr;
}
@@ -757,7 +757,7 @@ namespace sdr { namespace contact {
/** determines whether the instance is disposed
@nofail
*/
- bool impl_isDisposed_nofail() const { return m_pAntiImpl == NULL; }
+ bool impl_isDisposed_nofail() const { return m_pAntiImpl == nullptr; }
/** determines whether our control is currently visible
@nofail
@@ -848,7 +848,7 @@ namespace sdr { namespace contact {
ViewObjectContactOfUnoControl_Impl::ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl )
:m_pAntiImpl( _pAntiImpl )
,m_bCreatingControl( false )
- ,m_pOutputDeviceForWindow( NULL )
+ ,m_pOutputDeviceForWindow( nullptr )
,m_bControlIsVisible( false )
,m_bIsDesignModeListening( false )
,m_eControlDesignMode( eUnknown )
@@ -905,10 +905,10 @@ namespace sdr { namespace contact {
m_aControl.clear();
m_xContainer.clear();
- m_pOutputDeviceForWindow = NULL;
+ m_pOutputDeviceForWindow = nullptr;
m_bControlIsVisible = false;
- m_pAntiImpl = NULL;
+ m_pAntiImpl = nullptr;
}
@@ -923,14 +923,14 @@ namespace sdr { namespace contact {
{
OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::getUnoObject: already disposed()" );
if ( impl_isDisposed_nofail() )
- _out_rpObject = NULL;
+ _out_rpObject = nullptr;
else
{
_out_rpObject = dynamic_cast< SdrUnoObj* >( m_pAntiImpl->GetViewContact().TryToGetSdrObject() );
DBG_ASSERT( _out_rpObject || !m_pAntiImpl->GetViewContact().TryToGetSdrObject(),
"ViewObjectContactOfUnoControl_Impl::getUnoObject: invalid SdrObject!" );
}
- return ( _out_rpObject != NULL );
+ return ( _out_rpObject != nullptr );
}
@@ -942,7 +942,7 @@ namespace sdr { namespace contact {
try
{
- SdrUnoObj* pUnoObject( NULL );
+ SdrUnoObj* pUnoObject( nullptr );
if ( getUnoObject( pUnoObject ) )
{
Point aGridOffset = pUnoObject->GetGridOffset();
@@ -1054,7 +1054,7 @@ namespace sdr { namespace contact {
UnoControlContactHelper::disposeAndClearControl_nothrow( m_aControl );
}
- SdrUnoObj* pUnoObject( NULL );
+ SdrUnoObj* pUnoObject( nullptr );
if ( !getUnoObject( pUnoObject ) )
return false;
@@ -1067,7 +1067,7 @@ namespace sdr { namespace contact {
m_xContainer.set(_rPageView.getControlContainer( _rDevice ), css::uno::UNO_QUERY);
DBG_ASSERT( ( m_xContainer.is() // either have a XControlContainer
|| ( ( !_rPageView.getControlContainer( _rDevice ).is() ) // or don't have any container,
- && ( dynamic_cast< const vcl::Window* >( &_rDevice ) == NULL ) // which is allowed for non-Window instances only
+ && ( dynamic_cast< const vcl::Window* >( &_rDevice ) == nullptr ) // which is allowed for non-Window instances only
)
),
"ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: no XContainer at the ControlContainer!" );
@@ -1163,7 +1163,7 @@ namespace sdr { namespace contact {
{
OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow: already disposed!" );
- _out_rpPageView = NULL;
+ _out_rpPageView = nullptr;
if ( impl_isDisposed_nofail() )
return false;
@@ -1171,8 +1171,8 @@ namespace sdr { namespace contact {
if ( pPageViewContact )
_out_rpPageView = &pPageViewContact->GetPageWindow().GetPageView();
- DBG_ASSERT( _out_rpPageView != NULL, "ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow: this method is expected to always have success!" );
- return ( _out_rpPageView != NULL );
+ DBG_ASSERT( _out_rpPageView != nullptr, "ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow: this method is expected to always have success!" );
+ return ( _out_rpPageView != nullptr );
}
@@ -1181,11 +1181,11 @@ namespace sdr { namespace contact {
OSL_PRECOND( m_aControl.is(),
"ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw: only valid if we have a control!" );
- SdrPageView* pPageView( NULL );
+ SdrPageView* pPageView( nullptr );
if ( !impl_getPageView_nothrow( pPageView ) )
return;
- SdrUnoObj* pUnoObject( NULL );
+ SdrUnoObj* pUnoObject( nullptr );
if ( !getUnoObject( pUnoObject ) )
return;
@@ -1299,7 +1299,7 @@ namespace sdr { namespace contact {
bool ViewObjectContactOfUnoControl_Impl::isPrintableControl() const
{
- SdrUnoObj* pUnoObject( NULL );
+ SdrUnoObj* pUnoObject( nullptr );
if ( !getUnoObject( pUnoObject ) )
return false;
@@ -1613,7 +1613,7 @@ namespace sdr { namespace contact {
ViewObjectContactOfUnoControl::~ViewObjectContactOfUnoControl()
{
m_pImpl->dispose();
- m_pImpl = NULL;
+ m_pImpl = nullptr;
}
@@ -1621,7 +1621,7 @@ namespace sdr { namespace contact {
Reference< XControl > ViewObjectContactOfUnoControl::getControl()
{
SolarMutexGuard aSolarGuard;
- m_pImpl->ensureControl( NULL );
+ m_pImpl->ensureControl( nullptr );
return m_pImpl->getExistentControl().getControl();
}