sw/source/ui/index/swuiidxmrk.cxx | 127 ++++++++++++++++++++------------------
1 file changed, 68 insertions(+), 59 deletions(-)
New commits:
commit b0299c4141f80dfd9989f1f376a960a9590f7a07
Author: Vojtěch Doležal <dolez...@cvut.cz>
AuthorDate: Sat Dec 14 12:29:28 2024 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Dec 20 18:25:00 2024 +0100
tdf#164179 - Fix crash on BibEntry ComboBox select
One change in 7b99871635cd48c2a8a1d0afbd7afc60a45cc2ff (to
ToxAuthorityField) caused crashing bug in IdentifierHdl due to it
trying to call unsupported method on an input field to set its
value. This patch not only fixes the crash, but also moves the
volatile code into the SetFields method, which is also called in
the constructor of the Dialog, meaning if similar change were made
in the future, the crash would manifest immediately and hopefully
not pass to production.
Change-Id: I93abef0cdaa5c533523fbefd9514d1a287fd368b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178448
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/index/swuiidxmrk.cxx
b/sw/source/ui/index/swuiidxmrk.cxx
index cc9b7bc1068e..71c6622032a4 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1108,6 +1108,8 @@ class SwCreateAuthEntryDlg_Impl : public
weld::GenericDialogController
DECL_LINK(PageNumHdl, weld::Toggleable&, void);
DECL_LINK(TargetTypeHdl, weld::ComboBox&, void);
+ void SetFields(const OUString pFields[], bool bNewEntry, bool
bSetIdentifier);
+
public:
SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
const OUString pFields[],
@@ -1627,10 +1629,7 @@
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
m_xTypeListBox->append_text(
SwAuthorityFieldType::GetAuthTypeName(static_cast<ToxAuthorityType>(j)));
}
- if(!pFields[aCurInfo.nToxField].isEmpty())
- {
-
m_xTypeListBox->set_active(pFields[aCurInfo.nToxField].toInt32());
- }
+
pTargetGrid->set_child_left_attach(*m_xTypeListBox, 1);
pTargetGrid->set_child_top_attach(*m_xTypeListBox, bLeft ?
nLeftRow : nRightRow);
m_xTypeListBox->set_hexpand(true);
@@ -1656,7 +1655,7 @@
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
for (const OUString& a : aIds)
m_xIdentifierBox->append_text(a);
}
- m_xIdentifierBox->set_entry_text(pFields[aCurInfo.nToxField]);
+
pTargetGrid->set_child_left_attach(*m_xIdentifierBox, 1);
pTargetGrid->set_child_top_attach(*m_xIdentifierBox, bLeft ?
nLeftRow : nRightRow);
m_xIdentifierBox->set_hexpand(true);
@@ -1669,15 +1668,6 @@
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
m_xTargetTypeListBox =
m_aBuilders.back()->weld_combo_box(u"listbox-target-type"_ustr);
m_aOrigContainers.back()->move(m_xTargetTypeListBox.get(),
pTargetGrid);
- if(!pFields[aCurInfo.nToxField].isEmpty())
- {
-
m_xTargetTypeListBox->set_active(pFields[aCurInfo.nToxField].toInt32());
- }
- else if(m_bNewEntryMode)
- {
- // For new documents, set value to "BibliographyTableRow"
-
m_xTargetTypeListBox->set_active(SwAuthorityField::TargetType::BibliographyTableRow);
- }
pTargetGrid->set_child_left_attach(*m_xTargetTypeListBox, 1);
pTargetGrid->set_child_top_attach(*m_xTargetTypeListBox, bLeft ?
nLeftRow : nRightRow);
m_xTargetTypeListBox->set_hexpand(true);
@@ -1691,16 +1681,7 @@
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
m_pBoxes[nIndex] = m_aBuilders.back()->weld_box(u"vbox"_ustr);
m_pEdits[nIndex] = m_aBuilders.back()->weld_entry(u"entry"_ustr);
- if (AUTH_FIELD_TARGET_URL == aCurInfo.nToxField)
- {
- m_pTargetURLField = m_pEdits[nIndex].get();
- assert(m_xTargetTypeListBox);
- m_pTargetURLField->set_sensitive(
- m_xTargetTypeListBox->get_active() ==
SwAuthorityField::TargetType::UseTargetURL);
- }
-
m_aOrigContainers.back()->move(m_pBoxes[nIndex].get(),
pTargetGrid);
-
pTargetGrid->set_child_left_attach(*m_pBoxes[nIndex], 1);
pTargetGrid->set_child_top_attach(*m_pBoxes[nIndex], bLeft ?
nLeftRow : nRightRow);
m_pBoxes[nIndex]->set_hexpand(true);
@@ -1715,29 +1696,6 @@
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
+ "-local-visible");
m_xLocalPageSB =
m_aBuilders.back()->weld_spin_button(u"pagesb"_ustr);
}
-
- // Now that both pEdits[nIndex] and m_xPageSB is initialized, set
their values.
- OUString aText = pFields[aCurInfo.nToxField];
- if (aCurInfo.nToxField == AUTH_FIELD_LOCAL_URL)
- {
- OUString aUrl;
- int nPageNumber;
- if (SplitUrlAndPage(aText, aUrl, nPageNumber))
- {
- m_pEdits[nIndex]->set_text(aUrl);
- m_xLocalPageCB->set_active(true);
- m_xLocalPageSB->set_sensitive(true);
- m_xLocalPageSB->set_value(nPageNumber);
- }
- else
- {
- m_pEdits[nIndex]->set_text(aText);
- }
- }
- else
- {
- m_pEdits[nIndex]->set_text(aText);
- }
m_pEdits[nIndex]->show();
m_pEdits[nIndex]->set_help_id(aCurInfo.pHelpId);
@@ -1766,11 +1724,70 @@
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
++nRightRow;
bLeft = !bLeft;
}
+ SetFields(pFields, bNewEntry, !bNewEntry);
assert(m_xTypeListBox && "this will exist after the loop");
EnableHdl(*m_xTypeListBox);
}
-OUString SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField)
const
+void SwCreateAuthEntryDlg_Impl::SetFields(const OUString pFields[], bool
bNewEntry, bool bSetIdentifier) {
+ for (int nIndex = 0; nIndex < AUTH_FIELD_END; ++nIndex)
+ {
+ switch (const TextInfo aCurInfo = aTextInfoArr[nIndex];
aCurInfo.nToxField)
+ {
+ case AUTH_FIELD_IDENTIFIER:
+ if (!bNewEntry && bSetIdentifier)
+ {
+ assert(m_xIdentifierBox);
+ m_xIdentifierBox->set_entry_text(pFields[aCurInfo.nToxField]);
+ }
+ break;
+ case AUTH_FIELD_AUTHORITY_TYPE:
+ if (!pFields[aCurInfo.nToxField].isEmpty())
+ {
+
m_xTypeListBox->set_active(pFields[aCurInfo.nToxField].toInt32());
+ }
+ else
+ {
+ m_xTypeListBox->clear();
+ }
+ break;
+ case AUTH_FIELD_TARGET_TYPE:
+ if (!pFields[aCurInfo.nToxField].isEmpty())
+ {
+
m_xTargetTypeListBox->set_active(pFields[aCurInfo.nToxField].toInt32());
+ }
+ else
+ {
+ // For new entries, set value to "BibliographyTableRow", for
legacy ones set it to "UseDisplayURL"
+ m_xTargetTypeListBox->set_active(bNewEntry ?
SwAuthorityField::TargetType::BibliographyTableRow :
SwAuthorityField::TargetType::UseDisplayURL);
+ }
+ break;
+ default:
+ if (AUTH_FIELD_TARGET_URL == aCurInfo.nToxField)
+ {
+ m_pTargetURLField = m_pEdits[nIndex].get();
+ assert(m_xTargetTypeListBox);
+ m_pTargetURLField->set_sensitive(
+ m_xTargetTypeListBox->get_active() ==
SwAuthorityField::TargetType::UseTargetURL);
+ }
+
+ OUString aText = pFields[aCurInfo.nToxField], aUrl;
+ if (int nPageNumber; AUTH_FIELD_LOCAL_URL == aCurInfo.nToxField &&
SplitUrlAndPage(aText, aUrl, nPageNumber))
+ {
+ m_pEdits[nIndex]->set_text(aUrl);
+ m_xLocalPageCB->set_active(true);
+ m_xLocalPageSB->set_sensitive(true);
+ m_xLocalPageSB->set_value(nPageNumber);
+ }
+ else
+ {
+ m_pEdits[nIndex]->set_text(aText);
+ }
+ }
+ }
+}
+
+OUString SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField)
const
{
if( AUTH_FIELD_AUTHORITY_TYPE == eField )
{
@@ -1821,18 +1838,10 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl,
weld::ComboBox&, rBox, void)
if(!pEntry)
return;
- for(int i = 0; i < AUTH_FIELD_END; i++)
- {
- const TextInfo aCurInfo = aTextInfoArr[i];
- if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField)
- continue;
- if(AUTH_FIELD_AUTHORITY_TYPE == aCurInfo.nToxField)
- m_xTypeListBox->set_active_text(
- pEntry->GetAuthorField(aCurInfo.nToxField));
- else
- m_pEdits[i]->set_text(
- pEntry->GetAuthorField(aCurInfo.nToxField));
- }
+ OUString sFields[AUTH_FIELD_END];
+ for(int ii = 0; ii < AUTH_FIELD_END; ++ii)
+ sFields[ii] = pEntry->GetAuthorField(ToxAuthorityField(ii));
+ SetFields(sFields, false, false);
}
IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, weld::Entry&, rEdit, void)
