diff options
Diffstat (limited to 'sc/source/ui/Accessibility')
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocument.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleText.cxx | 21 |
2 files changed, 8 insertions, 16 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index b367101ea151..fd501a44030b 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1204,8 +1204,7 @@ void ScChildrenShapes::SetAnchor(const uno::Reference<drawing::XShape>& xShape, if ((pAddress && pData->pRelationCell && (*pAddress != *(pData->pRelationCell))) || (!pAddress && pData->pRelationCell) || (pAddress && !pData->pRelationCell)) { - if (pData->pRelationCell) - delete pData->pRelationCell; + delete pData->pRelationCell; pData->pRelationCell = pAddress; if (pData->pAccShape.is()) pData->pAccShape->SetRelationSet(GetRelationSet(pData)); diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 5b6f8df55add..7e80fd96571a 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -672,10 +672,8 @@ ScAccessibleCellTextData::~ScAccessibleCellTextData() { if (pEditEngine) pEditEngine->SetNotifyHdl(Link<EENotify&,void>()); - if (mpViewForwarder) - delete mpViewForwarder; - if (mpEditViewForwarder) - delete mpEditViewForwarder; + delete mpViewForwarder; + delete mpEditViewForwarder; } void ScAccessibleCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) @@ -897,12 +895,9 @@ ScAccessibleEditObjectTextData::~ScAccessibleEditObjectTextData() // If the object is cloned, do NOT set notify hdl. if (mpEditEngine && !mbIsCloned) mpEditEngine->SetNotifyHdl(Link<EENotify&,void>()); - if (mpViewForwarder) - delete mpViewForwarder; - if (mpEditViewForwarder) - delete mpEditViewForwarder; - if (mpForwarder) - delete mpForwarder; + delete mpViewForwarder; + delete mpEditViewForwarder; + delete mpForwarder; } void ScAccessibleEditObjectTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) @@ -1159,8 +1154,7 @@ ScAccessiblePreviewCellTextData::~ScAccessiblePreviewCellTextData() { if (pEditEngine) pEditEngine->SetNotifyHdl(Link<EENotify&,void>()); - if (mpViewForwarder) - delete mpViewForwarder; + delete mpViewForwarder; } void ScAccessiblePreviewCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) @@ -1232,8 +1226,7 @@ ScAccessiblePreviewHeaderCellTextData::~ScAccessiblePreviewHeaderCellTextData() { if (pEditEngine) pEditEngine->SetNotifyHdl(Link<EENotify&,void>()); - if (mpViewForwarder) - delete mpViewForwarder; + delete mpViewForwarder; } void ScAccessiblePreviewHeaderCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) |