Index: fpdfsdk/src/formfiller/FFL_ListBox.cpp |
diff --git a/fpdfsdk/src/formfiller/FFL_ListBox.cpp b/fpdfsdk/src/formfiller/FFL_ListBox.cpp |
index c105cfcbdd91489481672f4b73f34fd23d7c8864..0735f48cf3afd795c0db54f6b53ef52dd4bb2b53 100644 |
--- a/fpdfsdk/src/formfiller/FFL_ListBox.cpp |
+++ b/fpdfsdk/src/formfiller/FFL_ListBox.cpp |
@@ -12,286 +12,237 @@ |
//#include "../../include/formfiller/FFL_Undo.h" |
#include "../../include/formfiller/FFL_CBA_Fontmap.h" |
+#define FFL_DEFAULTLISTBOXFONTSIZE 12.0f |
-#define FFL_DEFAULTLISTBOXFONTSIZE 12.0f |
+/* ------------------------------- CFFL_ListBox ------------------------------- |
+ */ |
+CFFL_ListBox::CFFL_ListBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget) |
+ : CFFL_FormFiller(pApp, pWidget), m_pFontMap(NULL) {} |
-/* ------------------------------- CFFL_ListBox ------------------------------- */ |
- |
-CFFL_ListBox::CFFL_ListBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget) : |
- CFFL_FormFiller(pApp, pWidget), |
- m_pFontMap(NULL) |
-{ |
+CFFL_ListBox::~CFFL_ListBox() { |
+ delete m_pFontMap; |
} |
-CFFL_ListBox::~CFFL_ListBox() |
-{ |
- delete m_pFontMap; |
+PWL_CREATEPARAM CFFL_ListBox::GetCreateParam() { |
+ PWL_CREATEPARAM cp = CFFL_FormFiller::GetCreateParam(); |
+ |
+ ASSERT(m_pWidget != NULL); |
+ FX_DWORD dwFieldFlag = m_pWidget->GetFieldFlags(); |
+ |
+ if (dwFieldFlag & FIELDFLAG_MULTISELECT) { |
+ cp.dwFlags |= PLBS_MULTIPLESEL; |
+ } |
+ |
+ cp.dwFlags |= PWS_VSCROLL; |
+ |
+ if (cp.dwFlags & PWS_AUTOFONTSIZE) |
+ cp.fFontSize = FFL_DEFAULTLISTBOXFONTSIZE; |
+ |
+ if (!m_pFontMap) { |
+ m_pFontMap = new CBA_FontMap(m_pWidget, m_pApp->GetSysHandler()); |
+ m_pFontMap->Initial(); |
+ } |
+ cp.pFontMap = m_pFontMap; |
+ |
+ return cp; |
} |
-PWL_CREATEPARAM CFFL_ListBox::GetCreateParam() |
-{ |
- PWL_CREATEPARAM cp = CFFL_FormFiller::GetCreateParam(); |
+CPWL_Wnd* CFFL_ListBox::NewPDFWindow(const PWL_CREATEPARAM& cp, |
+ CPDFSDK_PageView* pPageView) { |
+ CPWL_ListBox* pWnd = new CPWL_ListBox(); |
+ pWnd->AttachFFLData(this); |
+ pWnd->Create(cp); |
- ASSERT(m_pWidget != NULL); |
- FX_DWORD dwFieldFlag = m_pWidget->GetFieldFlags(); |
+ ASSERT(m_pApp != NULL); |
+ CFFL_IFormFiller* pIFormFiller = m_pApp->GetIFormFiller(); |
+ pWnd->SetFillerNotify(pIFormFiller); |
- if (dwFieldFlag & FIELDFLAG_MULTISELECT) |
- { |
- cp.dwFlags |= PLBS_MULTIPLESEL; |
- } |
+ for (int32_t i = 0, sz = m_pWidget->CountOptions(); i < sz; i++) |
+ pWnd->AddString(m_pWidget->GetOptionLabel(i).c_str()); |
- cp.dwFlags |= PWS_VSCROLL; |
+ if (pWnd->HasFlag(PLBS_MULTIPLESEL)) { |
+ m_OriginSelections.clear(); |
- if (cp.dwFlags & PWS_AUTOFONTSIZE) |
- cp.fFontSize = FFL_DEFAULTLISTBOXFONTSIZE; |
+ FX_BOOL bSetCaret = FALSE; |
+ for (int32_t i = 0, sz = m_pWidget->CountOptions(); i < sz; i++) { |
+ if (m_pWidget->IsOptionSelected(i)) { |
+ if (!bSetCaret) { |
+ pWnd->SetCaret(i); |
+ bSetCaret = TRUE; |
+ } |
+ pWnd->Select(i); |
+ m_OriginSelections.insert(i); |
+ } |
+ } |
+ } else { |
+ for (int i = 0, sz = m_pWidget->CountOptions(); i < sz; i++) { |
+ if (m_pWidget->IsOptionSelected(i)) { |
+ pWnd->Select(i); |
+ break; |
+ } |
+ } |
+ } |
- if (!m_pFontMap) |
- { |
- m_pFontMap = new CBA_FontMap(m_pWidget, m_pApp->GetSysHandler()); |
- m_pFontMap->Initial(); |
- } |
- cp.pFontMap = m_pFontMap; |
+ pWnd->SetTopVisibleIndex(m_pWidget->GetTopVisibleIndex()); |
- return cp; |
+ return pWnd; |
} |
-CPWL_Wnd* CFFL_ListBox::NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView) |
-{ |
- CPWL_ListBox* pWnd = new CPWL_ListBox(); |
- pWnd->AttachFFLData(this); |
- pWnd->Create(cp); |
- |
- ASSERT(m_pApp != NULL); |
- CFFL_IFormFiller* pIFormFiller = m_pApp->GetIFormFiller(); |
- pWnd->SetFillerNotify(pIFormFiller); |
- |
- for (int32_t i=0,sz=m_pWidget->CountOptions(); i<sz; i++) |
- pWnd->AddString(m_pWidget->GetOptionLabel(i).c_str()); |
- |
- if (pWnd->HasFlag(PLBS_MULTIPLESEL)) |
- { |
- m_OriginSelections.clear(); |
- |
- FX_BOOL bSetCaret = FALSE; |
- for (int32_t i=0,sz=m_pWidget->CountOptions(); i<sz; i++) |
- { |
- if (m_pWidget->IsOptionSelected(i)) |
- { |
- if (!bSetCaret) |
- { |
- pWnd->SetCaret(i); |
- bSetCaret = TRUE; |
- } |
- pWnd->Select(i); |
- m_OriginSelections.insert(i); |
- } |
- } |
- } |
- else |
- { |
- for (int i=0,sz=m_pWidget->CountOptions(); i<sz; i++) |
- { |
- if (m_pWidget->IsOptionSelected(i)) |
- { |
- pWnd->Select(i); |
- break; |
- } |
- } |
- } |
- |
- pWnd->SetTopVisibleIndex(m_pWidget->GetTopVisibleIndex()); |
- |
- return pWnd; |
+FX_BOOL CFFL_ListBox::OnChar(CPDFSDK_Annot* pAnnot, |
+ FX_UINT nChar, |
+ FX_UINT nFlags) { |
+ return CFFL_FormFiller::OnChar(pAnnot, nChar, nFlags); |
} |
+FX_BOOL CFFL_ListBox::IsDataChanged(CPDFSDK_PageView* pPageView) { |
+ CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE); |
+ if (!pListBox) |
+ return FALSE; |
-FX_BOOL CFFL_ListBox::OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags) |
-{ |
- return CFFL_FormFiller::OnChar(pAnnot, nChar, nFlags); |
+ if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) { |
+ int nSelCount = 0; |
+ for (int32_t i = 0, sz = pListBox->GetCount(); i < sz; ++i) { |
+ if (pListBox->IsItemSelected(i)) { |
+ if (m_OriginSelections.count(i) == 0) |
+ return TRUE; |
+ |
+ nSelCount++; |
+ } |
+ } |
+ |
+ return nSelCount != m_OriginSelections.size(); |
+ } |
+ return pListBox->GetCurSel() != m_pWidget->GetSelectedIndex(0); |
} |
-FX_BOOL CFFL_ListBox::IsDataChanged(CPDFSDK_PageView* pPageView) |
-{ |
- CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE); |
- if (!pListBox) |
- return FALSE; |
+void CFFL_ListBox::SaveData(CPDFSDK_PageView* pPageView) { |
+ ASSERT(m_pWidget != NULL); |
- if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) { |
- int nSelCount = 0; |
- for (int32_t i = 0, sz = pListBox->GetCount(); i < sz; ++i) { |
- if (pListBox->IsItemSelected(i)) { |
- if (m_OriginSelections.count(i) == 0) |
- return TRUE; |
- |
- nSelCount++; |
- } |
+ if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE)) { |
+ CFX_IntArray aOldSelect, aNewSelect; |
+ |
+ { |
+ for (int i = 0, sz = m_pWidget->CountOptions(); i < sz; i++) { |
+ if (m_pWidget->IsOptionSelected(i)) { |
+ aOldSelect.Add(i); |
} |
+ } |
+ } |
+ |
+ int32_t nNewTopIndex = pListBox->GetTopVisibleIndex(); |
- return nSelCount != m_OriginSelections.size(); |
+ m_pWidget->ClearSelection(FALSE); |
+ |
+ if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) { |
+ for (int32_t i = 0, sz = pListBox->GetCount(); i < sz; i++) { |
+ if (pListBox->IsItemSelected(i)) { |
+ m_pWidget->SetOptionSelection(i, TRUE, FALSE); |
+ aNewSelect.Add(i); |
+ } |
+ } |
+ } else { |
+ m_pWidget->SetOptionSelection(pListBox->GetCurSel(), TRUE, FALSE); |
+ aNewSelect.Add(pListBox->GetCurSel()); |
} |
- return pListBox->GetCurSel() != m_pWidget->GetSelectedIndex(0); |
-} |
-void CFFL_ListBox::SaveData(CPDFSDK_PageView* pPageView) |
-{ |
- ASSERT(m_pWidget != NULL); |
- |
- if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE)) |
- { |
- CFX_IntArray aOldSelect, aNewSelect; |
- |
- { |
- for (int i=0,sz=m_pWidget->CountOptions(); i<sz; i++) |
- { |
- if (m_pWidget->IsOptionSelected(i)) |
- { |
- aOldSelect.Add(i); |
- } |
- } |
- } |
- |
- |
- int32_t nNewTopIndex = pListBox->GetTopVisibleIndex(); |
- |
- m_pWidget->ClearSelection(FALSE); |
- |
- if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) |
- { |
- for (int32_t i=0,sz=pListBox->GetCount(); i<sz; i++) |
- { |
- if (pListBox->IsItemSelected(i)) |
- { |
- m_pWidget->SetOptionSelection(i, TRUE, FALSE); |
- aNewSelect.Add(i); |
- } |
- } |
- } |
- else |
- { |
- m_pWidget->SetOptionSelection(pListBox->GetCurSel(), TRUE, FALSE); |
- aNewSelect.Add(pListBox->GetCurSel()); |
- } |
- |
- m_pWidget->SetTopVisibleIndex(nNewTopIndex); |
- m_pWidget->ResetFieldAppearance(TRUE); |
- m_pWidget->UpdateField(); |
- SetChangeMark(); |
- } |
+ m_pWidget->SetTopVisibleIndex(nNewTopIndex); |
+ m_pWidget->ResetFieldAppearance(TRUE); |
+ m_pWidget->UpdateField(); |
+ SetChangeMark(); |
+ } |
} |
-void CFFL_ListBox::GetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, |
- PDFSDK_FieldAction& fa) |
-{ |
- switch (type) |
- { |
- case CPDF_AAction::Validate: |
- if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) |
- { |
- fa.sValue = L""; |
- } |
- else |
- { |
- if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE)) |
- { |
- ASSERT(m_pWidget != NULL); |
- int32_t nCurSel = pListBox->GetCurSel(); |
- if (nCurSel >= 0) |
- fa.sValue = m_pWidget->GetOptionLabel(nCurSel); |
- } |
- } |
- break; |
- case CPDF_AAction::LoseFocus: |
- case CPDF_AAction::GetFocus: |
- if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) |
- { |
- fa.sValue = L""; |
- } |
- else |
- { |
- ASSERT(m_pWidget != NULL); |
- int32_t nCurSel = m_pWidget->GetSelectedIndex(0); |
- if (nCurSel >= 0) |
- fa.sValue = m_pWidget->GetOptionLabel(nCurSel); |
- } |
- break; |
- default: |
- break; |
- } |
+void CFFL_ListBox::GetActionData(CPDFSDK_PageView* pPageView, |
+ CPDF_AAction::AActionType type, |
+ PDFSDK_FieldAction& fa) { |
+ switch (type) { |
+ case CPDF_AAction::Validate: |
+ if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) { |
+ fa.sValue = L""; |
+ } else { |
+ if (CPWL_ListBox* pListBox = |
+ (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE)) { |
+ ASSERT(m_pWidget != NULL); |
+ int32_t nCurSel = pListBox->GetCurSel(); |
+ if (nCurSel >= 0) |
+ fa.sValue = m_pWidget->GetOptionLabel(nCurSel); |
+ } |
+ } |
+ break; |
+ case CPDF_AAction::LoseFocus: |
+ case CPDF_AAction::GetFocus: |
+ if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) { |
+ fa.sValue = L""; |
+ } else { |
+ ASSERT(m_pWidget != NULL); |
+ int32_t nCurSel = m_pWidget->GetSelectedIndex(0); |
+ if (nCurSel >= 0) |
+ fa.sValue = m_pWidget->GetOptionLabel(nCurSel); |
+ } |
+ break; |
+ default: |
+ break; |
+ } |
} |
+void CFFL_ListBox::SetActionData(CPDFSDK_PageView* pPageView, |
+ CPDF_AAction::AActionType type, |
+ const PDFSDK_FieldAction& fa) {} |
-void CFFL_ListBox::SetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, |
- const PDFSDK_FieldAction& fa) |
-{ |
-} |
+void CFFL_ListBox::SaveState(CPDFSDK_PageView* pPageView) { |
+ ASSERT(pPageView != NULL); |
-void CFFL_ListBox::SaveState(CPDFSDK_PageView* pPageView) |
-{ |
- ASSERT(pPageView != NULL); |
- |
- if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE)) |
- { |
- for (int32_t i=0,sz=pListBox->GetCount(); i<sz; i++) |
- { |
- if (pListBox->IsItemSelected(i)) |
- { |
- m_State.Add(i); |
- } |
- } |
- } |
+ if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE)) { |
+ for (int32_t i = 0, sz = pListBox->GetCount(); i < sz; i++) { |
+ if (pListBox->IsItemSelected(i)) { |
+ m_State.Add(i); |
+ } |
+ } |
+ } |
} |
-void CFFL_ListBox::RestoreState(CPDFSDK_PageView* pPageView) |
-{ |
- if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE)) |
- { |
- for (int i=0,sz=m_State.GetSize(); i<sz; i++) |
- pListBox->Select(m_State[i]); |
- } |
+void CFFL_ListBox::RestoreState(CPDFSDK_PageView* pPageView) { |
+ if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE)) { |
+ for (int i = 0, sz = m_State.GetSize(); i < sz; i++) |
+ pListBox->Select(m_State[i]); |
+ } |
} |
-CPWL_Wnd* CFFL_ListBox::ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRestoreValue) |
-{ |
- if (bRestoreValue) |
- SaveState(pPageView); |
+CPWL_Wnd* CFFL_ListBox::ResetPDFWindow(CPDFSDK_PageView* pPageView, |
+ FX_BOOL bRestoreValue) { |
+ if (bRestoreValue) |
+ SaveState(pPageView); |
- DestroyPDFWindow(pPageView); |
+ DestroyPDFWindow(pPageView); |
- CPWL_Wnd* pRet = NULL; |
+ CPWL_Wnd* pRet = NULL; |
- if (bRestoreValue) |
- { |
- RestoreState(pPageView); |
- pRet = GetPDFWindow(pPageView, FALSE); |
- } |
- else |
- pRet = GetPDFWindow(pPageView, TRUE); |
+ if (bRestoreValue) { |
+ RestoreState(pPageView); |
+ pRet = GetPDFWindow(pPageView, FALSE); |
+ } else |
+ pRet = GetPDFWindow(pPageView, TRUE); |
- m_pWidget->UpdateField(); |
+ m_pWidget->UpdateField(); |
- return pRet; |
+ return pRet; |
} |
-void CFFL_ListBox::OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag) |
-{ |
- ASSERT(m_pWidget != NULL); |
- |
- int nFlags = m_pWidget->GetFieldFlags(); |
- |
- if (nFlags & FIELDFLAG_COMMITONSELCHANGE) |
- { |
- if (m_bValid) |
- { |
- CPDFSDK_PageView* pPageView = GetCurPageView(); |
- ASSERT(pPageView != NULL); |
- |
- if (CommitData(pPageView, nFlag)) |
- { |
- DestroyPDFWindow(pPageView); |
- m_bValid = FALSE; |
- } |
- } |
- } |
-} |
+void CFFL_ListBox::OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag) { |
+ ASSERT(m_pWidget != NULL); |
+ |
+ int nFlags = m_pWidget->GetFieldFlags(); |
+ if (nFlags & FIELDFLAG_COMMITONSELCHANGE) { |
+ if (m_bValid) { |
+ CPDFSDK_PageView* pPageView = GetCurPageView(); |
+ ASSERT(pPageView != NULL); |
+ |
+ if (CommitData(pPageView, nFlag)) { |
+ DestroyPDFWindow(pPageView); |
+ m_bValid = FALSE; |
+ } |
+ } |
+ } |
+} |