diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-02-14 13:15:41 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-02-17 11:05:52 +0100 |
| commit | 9a64d067ce12e9f8cead8415e71716e776d1446d (patch) | |
| tree | edf446d0055215ad8719e802a5098b6fb3398bbd /sw/source | |
| parent | 7f8004ef1be04413ffe6cded00fc7535608f27fc (diff) | |
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 <tamas.zolnai@collabora.com>
(cherry picked from commit 575438b0b68baeee3d37d887d8645757a4505971)
Reviewed-on: https://gerrit.libreoffice.org/67925
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/uiview/viewling.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
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 ); |