Index: xfa/fde/fde_iterator.cpp |
diff --git a/xfa/fde/fde_iterator.cpp b/xfa/fde/fde_iterator.cpp |
index 097be1d01f7e9b977198d80d55523620c292e262..b22311e148095792511e443f58acfec9aa1d1398 100644 |
--- a/xfa/fde/fde_iterator.cpp |
+++ b/xfa/fde/fde_iterator.cpp |
@@ -34,10 +34,7 @@ FX_BOOL CFDE_VisualSetIterator::FilterObjects(uint32_t dwObjects) { |
while (m_CanvasStack.GetSize() > 1) { |
m_CanvasStack.Pop(); |
} |
- m_dwFilter = dwObjects & ~(uint32_t)FDE_VISUALOBJ_Widget; |
- if (dwObjects & FDE_VISUALOBJ_Widget) { |
- m_dwFilter |= 0xFF00; |
- } |
+ |
FDE_CANVASITEM* pCanvas = m_CanvasStack.GetTopElement(); |
FXSYS_assert(pCanvas != NULL && pCanvas->pCanvas != NULL); |
pCanvas->hPos = pCanvas->pCanvas->GetFirstPosition(NULL); |
@@ -72,10 +69,7 @@ FDE_HVISUALOBJ CFDE_VisualSetIterator::GetNext(IFDE_VisualSet*& pVisualSet, |
m_CanvasStack.Push(canvas); |
break; |
} |
- uint32_t dwObj = |
- (eType == FDE_VISUALOBJ_Widget) |
dsinclair
2016/04/07 14:35:27
eType was set from pVisualSet->GetType of which th
|
- ? (uint32_t)((IFDE_WidgetSet*)pVisualSet)->GetWidgetType(hObj) |
- : (uint32_t)eType; |
+ uint32_t dwObj = (uint32_t)eType; |
if ((m_dwFilter & dwObj) != 0) { |
if (ppCanvasSet) { |
*ppCanvasSet = pCanvas->pCanvas; |