diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-03-10 16:19:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-11 01:16:33 +0000 |
| commit | ffe060e954d172f8603a4e9f625445e49132c7bf (patch) | |
| tree | 4a939673cd597c0812261fe28da2103526ac51a2 /sc/source/ui | |
| parent | d59358ee28f0cd3e1eb56a0a923f165304fc17c9 (diff) | |
V668 no sense in testing the result of new against null
Change-Id: I7783d96e40de7a8df794f143d2c7830bf3314218
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocument.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index fb17833245ae..b671c795d584 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1195,7 +1195,7 @@ uno::Reference<XAccessibleRelationSet> ScChildrenShapes::GetRelationSet(const Sc { utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper(); - if(pData && pRelationSet && mpAccessibleDocument) + if (pData && mpAccessibleDocument) { uno::Reference<XAccessible> xAccessible = mpAccessibleDocument->GetAccessibleSpreadsheet(); // should be the current table if (pData->pRelationCell && xAccessible.is()) diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index f57792315988..c366349add68 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -140,20 +140,15 @@ ScNotesChildren::~ScNotesChildren() ::accessibility::AccessibleTextHelper* ScNotesChildren::CreateTextHelper(const OUString& rString, const Rectangle& rVisRect, const ScAddress& aCellPos, bool bMarkNote, sal_Int32 nChildOffset) const { - ::accessibility::AccessibleTextHelper* pTextHelper = NULL; - ::std::unique_ptr < ScAccessibleTextData > pAccessiblePreviewHeaderCellTextData (new ScAccessibleNoteTextData(mpViewShell, rString, aCellPos, bMarkNote)); ::std::unique_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(std::move(pAccessiblePreviewHeaderCellTextData))); - pTextHelper = new ::accessibility::AccessibleTextHelper(std::move(pEditSource)); + ::accessibility::AccessibleTextHelper* pTextHelper = new ::accessibility::AccessibleTextHelper(std::move(pEditSource)); - if (pTextHelper) - { - pTextHelper->SetEventSource(mpAccDoc); - pTextHelper->SetStartIndex(nChildOffset); - pTextHelper->SetOffset(rVisRect.TopLeft()); - } + pTextHelper->SetEventSource(mpAccDoc); + pTextHelper->SetStartIndex(nChildOffset); + pTextHelper->SetOffset(rVisRect.TopLeft()); return pTextHelper; } |