summaryrefslogtreecommitdiff
path: root/sd/source/ui/accessibility
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:23:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:38 +0100
commit92c697c0e3e4bde88424322875c993c161696b1e (patch)
treeea1be62a0cb8fd7f7e63dd03a52441cedd8e96eb /sd/source/ui/accessibility
parent65464ed0985802edb96dbcbd1c3eed996f3778bd (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: If1b80da64ba575f07b31dce9bc0e34b7eb9f11a4
Diffstat (limited to 'sd/source/ui/accessibility')
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx24
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx34
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx12
-rw-r--r--sd/source/ui/accessibility/AccessiblePageShape.cxx6
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx8
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx46
-rw-r--r--sd/source/ui/accessibility/AccessibleViewForwarder.cxx6
7 files changed, 68 insertions, 68 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 986bc4c19401..e055a70df1dd 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -68,7 +68,7 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase (
AccessibleRole::DOCUMENT),
mpWindow (pSdWindow),
mxController (rxController),
- mxModel (NULL),
+ mxModel (nullptr),
maViewForwarder (
static_cast<SdrPaintView*>(pViewShell->GetView()),
*static_cast<OutputDevice*>(pSdWindow))
@@ -135,7 +135,7 @@ void AccessibleDocumentViewBase::Init()
// Register at VCL Window to be informed of activated and deactivated
// OLE objects.
vcl::Window* pWindow = maShapeTreeInfo.GetWindow();
- if (pWindow != NULL)
+ if (pWindow != nullptr)
{
maWindowLink = LINK(
this, AccessibleDocumentViewBase, WindowChildEventListener);
@@ -172,7 +172,7 @@ IMPL_LINK_TYPED(AccessibleDocumentViewBase, WindowChildEventListener,
vcl::Window* pWindow = maShapeTreeInfo.GetWindow();
vcl::Window* pDyingWindow = static_cast<vcl::Window*>(
rEvent.GetWindow());
- if (pWindow==pDyingWindow && pWindow!=NULL && maWindowLink.IsSet())
+ if (pWindow==pDyingWindow && pWindow!=nullptr && maWindowLink.IsSet())
{
pWindow->RemoveChildEventListener (maWindowLink);
maWindowLink = Link<VclWindowEvent&,void>();
@@ -185,7 +185,7 @@ IMPL_LINK_TYPED(AccessibleDocumentViewBase, WindowChildEventListener,
// A new window has been created. Is it an OLE object?
vcl::Window* pChildWindow = static_cast<vcl::Window*>(
rEvent.GetData());
- if (pChildWindow!=NULL
+ if (pChildWindow!=nullptr
&& (pChildWindow->GetAccessibleRole()
== AccessibleRole::EMBEDDED_OBJECT))
{
@@ -200,11 +200,11 @@ IMPL_LINK_TYPED(AccessibleDocumentViewBase, WindowChildEventListener,
// object?
vcl::Window* pChildWindow = static_cast<vcl::Window*>(
rEvent.GetData());
- if (pChildWindow!=NULL
+ if (pChildWindow!=nullptr
&& (pChildWindow->GetAccessibleRole()
== AccessibleRole::EMBEDDED_OBJECT))
{
- SetAccessibleOLEObject (NULL);
+ SetAccessibleOLEObject (nullptr);
}
}
break;
@@ -491,7 +491,7 @@ void AccessibleDocumentViewBase::impl_dispose()
{
mxWindow->removeWindowListener (this);
mxWindow->removeFocusListener (this);
- mxWindow = NULL;
+ mxWindow = nullptr;
}
// Unregister form the model.
@@ -511,14 +511,14 @@ void AccessibleDocumentViewBase::impl_dispose()
}
// Propagate change of controller down the shape tree.
- maShapeTreeInfo.SetModelBroadcaster (NULL);
+ maShapeTreeInfo.SetModelBroadcaster (nullptr);
// Reset the model reference.
- mxModel = NULL;
+ mxModel = nullptr;
// Reset the model reference.
- mxController = NULL;
+ mxController = nullptr;
- maShapeTreeInfo.SetDocumentWindow (NULL);
+ maShapeTreeInfo.SetDocumentWindow (nullptr);
}
//===== XEventListener ======================================================
@@ -738,7 +738,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
uno::Any anyAtrribute;
OUString sValue;
- if (0 != dynamic_cast<const ::sd::DrawViewShell* > (mpViewShell))
+ if (nullptr != dynamic_cast<const ::sd::DrawViewShell* > (mpViewShell))
{
::sd::DrawViewShell* pDrViewSh = static_cast< ::sd::DrawViewShell*>(mpViewShell);
OUString sDisplay;
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index cecf847271aa..9706c33bc2f1 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -86,7 +86,7 @@ AccessibleDrawDocumentView::AccessibleDrawDocumentView (
const uno::Reference<XAccessible>& rxParent)
: AccessibleDocumentViewBase (pSdWindow, pViewShell, rxController, rxParent),
mpSdViewSh( pViewShell ),
- mpChildrenManager (NULL)
+ mpChildrenManager (nullptr)
{
OSL_TRACE ("AccessibleDrawDocumentView");
UpdateAccessibleName();
@@ -127,7 +127,7 @@ void AccessibleDrawDocumentView::ViewForwarderChanged (ChangeType aChangeType,
const IAccessibleViewForwarder* pViewForwarder)
{
AccessibleDocumentViewBase::ViewForwarderChanged (aChangeType, pViewForwarder);
- if (mpChildrenManager != NULL)
+ if (mpChildrenManager != nullptr)
mpChildrenManager->ViewForwarderChanged (aChangeType, pViewForwarder);
}
@@ -195,7 +195,7 @@ sal_Int32 SAL_CALL
long mpChildCount = AccessibleDocumentViewBase::getAccessibleChildCount();
// Forward request to children manager.
- if (mpChildrenManager != NULL)
+ if (mpChildrenManager != nullptr)
mpChildCount += mpChildrenManager->GetChildCount ();
return mpChildCount;
@@ -225,7 +225,7 @@ uno::Reference<XAccessible> SAL_CALL
aGuard.clear();
// Forward request to children manager.
- if (pChildrenManager != NULL)
+ if (pChildrenManager != nullptr)
{
return pChildrenManager->GetChild (nIndex);
}
@@ -284,7 +284,7 @@ void SAL_CALL
{
::osl::Guard< ::osl::Mutex> aGuard (::osl::Mutex::getGlobalMutex());
// maShapeTreeInfo has been modified in base class.
- if (mpChildrenManager != NULL)
+ if (mpChildrenManager != nullptr)
mpChildrenManager->SetInfo (maShapeTreeInfo);
}
}
@@ -311,7 +311,7 @@ void SAL_CALL
// The current page changed. Update the children manager accordingly.
uno::Reference<drawing::XDrawView> xView (mxController, uno::UNO_QUERY);
- if (xView.is() && mpChildrenManager!=NULL)
+ if (xView.is() && mpChildrenManager!=nullptr)
{
// Inform the children manager to forget all children and give
// him the new ones.
@@ -334,7 +334,7 @@ void SAL_CALL
else if ( rEventObject.PropertyName == "VisibleArea" )
{
OSL_TRACE (" visible area changed");
- if (mpChildrenManager != NULL)
+ if (mpChildrenManager != nullptr)
mpChildrenManager->ViewForwarderChanged (
IAccessibleViewForwarderListener::VISIBLE_AREA,
&maViewForwarder);
@@ -349,7 +349,7 @@ void SAL_CALL
// The current page changed. Update the children manager accordingly.
uno::Reference<drawing::XDrawView> xView (mxController, uno::UNO_QUERY);
- if (xView.is() && mpChildrenManager!=NULL)
+ if (xView.is() && mpChildrenManager!=nullptr)
{
// Inform the children manager to forget all children and give
// him the new ones.
@@ -472,15 +472,15 @@ uno::Sequence< sal_Int32 > SAL_CALL
return aRet;
}
//find all the child in the page, insert them into a vector and sort
- if ( mpChildrenManager == NULL )
+ if ( mpChildrenManager == nullptr )
{
return aRet;
}
std::vector< uno::Reference<drawing::XShape> > vXShapes;
sal_Int32 nCount = mpChildrenManager->GetChildCount();
//get pointer of SdView & SdrPageView for further use.
- SdrPageView* pPV = NULL;
- ::sd::View* pSdView = NULL;
+ SdrPageView* pPV = nullptr;
+ ::sd::View* pSdView = nullptr;
if ( mpSdViewSh )
{
pSdView = mpSdViewSh->GetView();
@@ -786,7 +786,7 @@ void
void AccessibleDrawDocumentView::Activated()
{
- if (mpChildrenManager != NULL)
+ if (mpChildrenManager != nullptr)
{
bool bChange = false;
// When none of the children has the focus then claim it for the
@@ -807,17 +807,17 @@ void AccessibleDrawDocumentView::Activated()
void AccessibleDrawDocumentView::Deactivated()
{
- if (mpChildrenManager != NULL)
+ if (mpChildrenManager != nullptr)
mpChildrenManager->RemoveFocus();
ResetState (AccessibleStateType::FOCUSED);
}
void AccessibleDrawDocumentView::impl_dispose()
{
- if (mpChildrenManager != NULL)
+ if (mpChildrenManager != nullptr)
{
delete mpChildrenManager;
- mpChildrenManager = NULL;
+ mpChildrenManager = nullptr;
}
AccessibleDocumentViewBase::impl_dispose();
@@ -830,10 +830,10 @@ void SAL_CALL AccessibleDrawDocumentView::disposing()
{
// Release resources.
- if (mpChildrenManager != NULL)
+ if (mpChildrenManager != nullptr)
{
delete mpChildrenManager;
- mpChildrenManager = NULL;
+ mpChildrenManager = nullptr;
}
// Forward call to base classes.
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index 0076ce93553f..f9e9d2ca56b3 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -68,7 +68,7 @@ namespace accessibility
return &mTextForwarder;
}
else
- return NULL;
+ return nullptr;
}
SvxViewForwarder* AccessibleOutlineEditSource::GetViewForwarder()
@@ -77,7 +77,7 @@ namespace accessibility
if( IsValid() )
return this;
else
- return NULL;
+ return nullptr;
}
SvxEditViewForwarder* AccessibleOutlineEditSource::GetEditViewForwarder( bool )
@@ -89,7 +89,7 @@ namespace accessibility
return &mViewForwarder;
}
else
- return NULL;
+ return nullptr;
}
void AccessibleOutlineEditSource::UpdateData()
@@ -179,7 +179,7 @@ namespace accessibility
if( pHint && (pHint->GetId() == SFX_HINT_DYING) )
{
bDispose = true;
- mpOutliner = NULL;
+ mpOutliner = nullptr;
}
}
else
@@ -197,8 +197,8 @@ namespace accessibility
{
if( mpOutliner )
mpOutliner->SetNotifyHdl( Link<EENotify&,void>() );
- mpOutliner = NULL;
- mpOutlinerView = NULL;
+ mpOutliner = nullptr;
+ mpOutlinerView = nullptr;
Broadcast( TextHint( SFX_HINT_DYING ) );
}
}
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index e5b74bfbcc55..5e490e068d69 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -43,7 +43,7 @@ AccessiblePageShape::AccessiblePageShape (
const uno::Reference<XAccessible>& rxParent,
const AccessibleShapeTreeInfo& rShapeTreeInfo,
long nIndex)
- : AccessibleShape (AccessibleShapeInfo (NULL, rxParent, nIndex), rShapeTreeInfo),
+ : AccessibleShape (AccessibleShapeInfo (nullptr, rxParent, nIndex), rShapeTreeInfo),
mxPage (rxPage)
{
// The main part of the initialization is done in the init method which
@@ -89,7 +89,7 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds()
awt::Rectangle aBoundingBox;
- if (maShapeTreeInfo.GetViewForwarder() != NULL)
+ if (maShapeTreeInfo.GetViewForwarder() != nullptr)
{
uno::Reference<beans::XPropertySet> xSet (mxPage, uno::UNO_QUERY);
if (xSet.is())
@@ -259,7 +259,7 @@ void AccessiblePageShape::dispose()
xComponent->removeEventListener (this);
// Cleanup.
- mxShape = NULL;
+ mxShape = nullptr;
// Call base classes.
AccessibleContextBase::dispose ();
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index dfe24a420012..282a6436ad06 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -178,7 +178,7 @@ OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName()
const SolarMutexGuard aSolarGuard;
SdPage* pPage = GetPage();
- if (pPage != NULL)
+ if (pPage != nullptr)
return pPage->GetName();
else
return OUString();
@@ -303,7 +303,7 @@ Reference<XAccessible> SAL_CALL
AccessibleSlideSorterObject::getAccessibleAtPoint(const awt::Point& )
throw (uno::RuntimeException, std::exception)
{
- return NULL;
+ return nullptr;
}
awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds()
@@ -449,10 +449,10 @@ SdPage* AccessibleSlideSorterObject::GetPage() const
{
::sd::slidesorter::model::SharedPageDescriptor pDescriptor(
mrSlideSorter.GetModel().GetPageDescriptor(mnPageNumber));
- if (pDescriptor.get() != NULL)
+ if (pDescriptor.get() != nullptr)
return pDescriptor->GetPage();
else
- return NULL;
+ return nullptr;
}
} // end of namespace ::accessibility
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 4db26b60b6b7..814230c5aad0 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -160,7 +160,7 @@ void SAL_CALL AccessibleSlideSorterView::disposing()
AccessibleSlideSorterObject* AccessibleSlideSorterView::GetAccessibleChildImplementation (
sal_Int32 nIndex)
{
- AccessibleSlideSorterObject* pResult = NULL;
+ AccessibleSlideSorterObject* pResult = nullptr;
::osl::MutexGuard aGuard (maMutex);
if (nIndex>=0 && nIndex<mpImpl->GetVisibleChildCount())
@@ -224,7 +224,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent(
if (mpContentWindow != nullptr)
{
vcl::Window* pParent = mpContentWindow->GetAccessibleParentWindow();
- if (pParent != NULL)
+ if (pParent != nullptr)
xParent = pParent->GetAccessible();
}
@@ -402,7 +402,7 @@ Reference<XAccessible> SAL_CALL
const Point aTestPoint (aPoint.X, aPoint.Y);
::sd::slidesorter::model::SharedPageDescriptor pHitDescriptor (
mrSlideSorter.GetController().GetPageAt(aTestPoint));
- if (pHitDescriptor.get() != NULL)
+ if (pHitDescriptor.get() != nullptr)
xAccessible = mpImpl->GetAccessibleChild(
(pHitDescriptor->GetPage()->GetPageNum()-1)/2);
@@ -525,7 +525,7 @@ void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChild
const SolarMutexGuard aSolarGuard;
AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex);
- if (pChild != NULL)
+ if (pChild != nullptr)
mrSlideSorter.GetController().GetPageSelector().SelectPage(pChild->GetPageNumber());
else
throw lang::IndexOutOfBoundsException();
@@ -540,7 +540,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int3
const SolarMutexGuard aSolarGuard;
AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex);
- if (pChild != NULL)
+ if (pChild != nullptr)
bIsSelected = mrSlideSorter.GetController().GetPageSelector().IsPageSelected(
pChild->GetPageNumber());
else
@@ -612,7 +612,7 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi
const SolarMutexGuard aSolarGuard;
AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex);
- if (pChild != NULL)
+ if (pChild != nullptr)
mrSlideSorter.GetController().GetPageSelector().DeselectPage(pChild->GetPageNumber());
else
throw lang::IndexOutOfBoundsException();
@@ -677,8 +677,8 @@ AccessibleSlideSorterView::Implementation::Implementation (
mpWindow(pWindow),
mnFocusedIndex(-1),
mbModelChangeLocked(false),
- mnUpdateChildrenUserEventId(0),
- mnSelectionChangeUserEventId(0)
+ mnUpdateChildrenUserEventId(nullptr),
+ mnSelectionChangeUserEventId(nullptr)
{
ConnectListeners();
UpdateChildren();
@@ -686,9 +686,9 @@ AccessibleSlideSorterView::Implementation::Implementation (
AccessibleSlideSorterView::Implementation::~Implementation()
{
- if (mnUpdateChildrenUserEventId != 0)
+ if (mnUpdateChildrenUserEventId != nullptr)
Application::RemoveUserEvent(mnUpdateChildrenUserEventId);
- if (mnSelectionChangeUserEventId != 0)
+ if (mnSelectionChangeUserEventId != nullptr)
Application::RemoveUserEvent(mnSelectionChangeUserEventId);
ReleaseListeners();
Clear();
@@ -696,7 +696,7 @@ AccessibleSlideSorterView::Implementation::~Implementation()
void AccessibleSlideSorterView::Implementation::RequestUpdateChildren()
{
- if (mnUpdateChildrenUserEventId == 0)
+ if (mnUpdateChildrenUserEventId == nullptr)
mnUpdateChildrenUserEventId = Application::PostUserEvent(
LINK(this, AccessibleSlideSorterView::Implementation,
UpdateChildrenCallback));
@@ -739,7 +739,7 @@ void AccessibleSlideSorterView::Implementation::Clear()
PageObjectList::iterator iPageObject;
PageObjectList::iterator iEnd = maPageObjects.end();
for (iPageObject=maPageObjects.begin(); iPageObject!=iEnd; ++iPageObject)
- if (*iPageObject != NULL)
+ if (*iPageObject != nullptr)
{
mrAccessibleSlideSorter.FireAccessibleEvent(
AccessibleEventId::CHILD,
@@ -749,7 +749,7 @@ void AccessibleSlideSorterView::Implementation::Clear()
Reference<XComponent> xComponent (Reference<XWeak>(iPageObject->get()), UNO_QUERY);
if (xComponent.is())
xComponent->dispose();
- *iPageObject = NULL;
+ *iPageObject = nullptr;
}
maPageObjects.clear();
}
@@ -773,15 +773,15 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetVisib
AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAccessibleChild (
sal_Int32 nIndex)
{
- AccessibleSlideSorterObject* pChild = NULL;
+ AccessibleSlideSorterObject* pChild = nullptr;
if (nIndex>=0 && (sal_uInt32)nIndex<maPageObjects.size())
{
- if (maPageObjects[nIndex] == NULL)
+ if (maPageObjects[nIndex] == nullptr)
{
::sd::slidesorter::model::SharedPageDescriptor pDescriptor(
mrSlideSorter.GetModel().GetPageDescriptor(nIndex));
- if (pDescriptor.get() != NULL)
+ if (pDescriptor.get() != nullptr)
{
maPageObjects[nIndex] = new AccessibleSlideSorterObject(
&mrAccessibleSlideSorter,
@@ -809,7 +809,7 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAcces
void AccessibleSlideSorterView::Implementation::ConnectListeners()
{
StartListening (*mrSlideSorter.GetModel().GetDocument());
- if (mrSlideSorter.GetViewShell() != NULL)
+ if (mrSlideSorter.GetViewShell() != nullptr)
StartListening (*mrSlideSorter.GetViewShell());
mbListeningToDocument = true;
@@ -840,7 +840,7 @@ void AccessibleSlideSorterView::Implementation::ReleaseListeners()
if (mbListeningToDocument)
{
- if (mrSlideSorter.GetViewShell() != NULL)
+ if (mrSlideSorter.GetViewShell() != nullptr)
StartListening(*mrSlideSorter.GetViewShell());
EndListening (*mrSlideSorter.GetModel().GetDocument());
mbListeningToDocument = false;
@@ -921,14 +921,14 @@ IMPL_LINK_TYPED(AccessibleSlideSorterView::Implementation, WindowEventListener,
IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, SelectionChangeListener, LinkParamNone*, void)
{
- if (mnSelectionChangeUserEventId == 0)
+ if (mnSelectionChangeUserEventId == nullptr)
mnSelectionChangeUserEventId = Application::PostUserEvent(
LINK(this, AccessibleSlideSorterView::Implementation, BroadcastSelectionChange));
}
IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange, void*, void)
{
- mnSelectionChangeUserEventId = 0;
+ mnSelectionChangeUserEventId = nullptr;
mrAccessibleSlideSorter.FireAccessibleEvent(
AccessibleEventId::SELECTION_CHANGED,
Any(),
@@ -951,7 +951,7 @@ IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, FocusChangeList
if (mnFocusedIndex >= 0)
{
AccessibleSlideSorterObject* pObject = GetAccessibleChild(mnFocusedIndex);
- if (pObject != NULL)
+ if (pObject != nullptr)
{
pObject->FireAccessibleEvent(
AccessibleEventId::STATE_CHANGED,
@@ -963,7 +963,7 @@ IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, FocusChangeList
if (nNewFocusedIndex >= 0)
{
AccessibleSlideSorterObject* pObject = GetAccessibleChild(nNewFocusedIndex);
- if (pObject != NULL)
+ if (pObject != nullptr)
{
pObject->FireAccessibleEvent(
AccessibleEventId::STATE_CHANGED,
@@ -979,7 +979,7 @@ IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, FocusChangeList
IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback, void*, void)
{
- mnUpdateChildrenUserEventId = 0;
+ mnUpdateChildrenUserEventId = nullptr;
UpdateChildren();
}
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 0a6ed2a76e0d..fa7338bf0ff9 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -74,12 +74,12 @@ Rectangle AccessibleViewForwarder::GetVisibleArea() const
*/
Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const
{
- OSL_ASSERT (mpView != NULL);
+ OSL_ASSERT (mpView != nullptr);
if((sal_uInt32)mnWindowId < mpView->PaintWindowCount())
{
SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId);
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
- Rectangle aBBox(static_cast<vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L));
+ Rectangle aBBox(static_cast<vcl::Window&>(rOutDev).GetWindowExtentsRelative(nullptr));
return rOutDev.LogicToPixel (rPoint) + aBBox.TopLeft();
}
else
@@ -88,7 +88,7 @@ Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const
Size AccessibleViewForwarder::LogicToPixel (const Size& rSize) const
{
- OSL_ASSERT (mpView != NULL);
+ OSL_ASSERT (mpView != nullptr);
if((sal_uInt32)mnWindowId < mpView->PaintWindowCount())
{
SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId);