sw/source/uibase/uiview/viewling.cxx | 11 +++++++++++ 1 file changed, 11 insertions(+)
New commits: commit 9a64d067ce12e9f8cead8415e71716e776d1446d Author: Tamás Zolnai <[email protected]> AuthorDate: Thu Feb 14 13:15:41 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sun Feb 17 11:05:52 2019 +0100 MSForms: Don't show popup dialog of drop-down field when there is no item list Change-Id: Ife361e0ee18437da6f188e77713ea51403b70dbc Reviewed-on: https://gerrit.libreoffice.org/67910 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <[email protected]> (cherry picked from commit 575438b0b68baeee3d37d887d8645757a4505971) Reviewed-on: https://gerrit.libreoffice.org/67925 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index a6844d6bbe2a..a3b719efe928 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -920,6 +920,17 @@ IMPL_LINK_NOARG(SwView, FieldPopupModeEndHdl, FloatingWindow*, void) void SwView::ExecFieldPopup( const Point& rPt, IFieldmark *fieldBM ) { + // Don't show popup if there is no list item + auto pListEntries = fieldBM->GetParameters()->find( ODF_FORMDROPDOWN_LISTENTRY ); + Sequence< OUString > vListEntries; + if(pListEntries != fieldBM->GetParameters()->end()) + { + pListEntries->second >>= vListEntries; + } + + if(vListEntries.getLength() == 0) + return; + const Point aPixPos = GetEditWin().LogicToPixel( rPt ); m_pFieldPopup = VclPtr<SwFieldDialog>::Create( m_pEditWin, fieldBM ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
