diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-22 09:50:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-22 10:23:53 +0100 |
| commit | b66dc3cd84c7031a0df75e9d782edebbaca6fdf1 (patch) | |
| tree | a7c9c24b54a4c1ce16cda886c96001edefc81d03 | |
| parent | 32b46b74f2c45e1dff3530162ddb207527574026 (diff) | |
WaE: -Wodr, two different ScVisAreaChanged classes
Change-Id: I036632dcc7a91eb43aac2bdc2dee7e3355227f24
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocument.cxx | 19 | ||||
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 19 |
2 files changed, 22 insertions, 16 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 17fee2ad72d3..4c66e032611b 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1377,18 +1377,21 @@ sal_Int8 ScChildrenShapes::Compare(const ScAccessibleShapeData* pData1, return nResult; } -struct ScVisAreaChanged +namespace { - ScAccessibleDocument* mpAccDoc; - ScVisAreaChanged(ScAccessibleDocument* pAccDoc) : mpAccDoc(pAccDoc) {} - void operator() (const ScAccessibleShapeData* pAccShapeData) const + struct ScVisAreaChanged { - if (pAccShapeData && pAccShapeData->pAccShape) + ScAccessibleDocument* mpAccDoc; + ScVisAreaChanged(ScAccessibleDocument* pAccDoc) : mpAccDoc(pAccDoc) {} + void operator() (const ScAccessibleShapeData* pAccShapeData) const { - pAccShapeData->pAccShape->ViewForwarderChanged(::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, mpAccDoc); + if (pAccShapeData && pAccShapeData->pAccShape) + { + pAccShapeData->pAccShape->ViewForwarderChanged(::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, mpAccDoc); + } } - } -}; + }; +} void ScChildrenShapes::VisAreaChanged() const { diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index d4d7251a45d5..bd2c99cda1ff 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -846,18 +846,21 @@ void ScShapeChildren::DataChanged() } } -struct ScVisAreaChanged +namespace { - const ScIAccessibleViewForwarder* mpViewForwarder; - ScVisAreaChanged(const ScIAccessibleViewForwarder* pViewForwarder) : mpViewForwarder(pViewForwarder) {} - void operator() (const ScShapeChild& rAccShapeData) const + struct ScVisAreaChanged { - if (rAccShapeData.mpAccShape) + const ScIAccessibleViewForwarder* mpViewForwarder; + ScVisAreaChanged(const ScIAccessibleViewForwarder* pViewForwarder) : mpViewForwarder(pViewForwarder) {} + void operator() (const ScShapeChild& rAccShapeData) const { - rAccShapeData.mpAccShape->ViewForwarderChanged(::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, mpViewForwarder); + if (rAccShapeData.mpAccShape) + { + rAccShapeData.mpAccShape->ViewForwarderChanged(::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, mpViewForwarder); + } } - } -}; + }; +} void ScShapeChildren::VisAreaChanged() const { |