Index: xfa/fwl/cfwl_edit.cpp |
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp |
index f51249eaca9d800c0955ec265f0b4563009e793c..ecf012e0a09a1ae1900d39fe18f2968b8b6490b1 100644 |
--- a/xfa/fwl/cfwl_edit.cpp |
+++ b/xfa/fwl/cfwl_edit.cpp |
@@ -662,8 +662,7 @@ void CFWL_Edit::UpdateEditParams() { |
} |
if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine) { |
params.dwMode |= FDE_TEXTEDITMODE_MultiLines; |
- if ((m_pProperties->m_dwStyles & FWL_WGTSTYLE_HScroll) == 0 && |
- (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_AutoHScroll) == 0) { |
+ if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_AutoHScroll) == 0) { |
params.dwMode |= |
FDE_TEXTEDITMODE_AutoLineWrap | FDE_TEXTEDITMODE_LimitArea_Horz; |
} |
@@ -925,8 +924,7 @@ bool CFWL_Edit::IsShowScrollBar(bool bVert) { |
(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine) && |
IsContentHeightOverflow(); |
} |
- return bShow && (m_pProperties->m_dwStyles & FWL_WGTSTYLE_HScroll) && |
- (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine); |
+ return false; |
} |
bool CFWL_Edit::IsContentHeightOverflow() { |