[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/source

[Caolán McNamara]

 sw/source/ui/index/swuiidxmrk.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 513a21c1d635ea5b830f6b075b2a951ca1c94eff
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 8 12:20:11 2018 +0000

    Resolves: tdf#114728 wrong entries in bibliographic entry dialog
    
    Change-Id: I15f889c108805075c716d21af84c13f98f4e7226
    Reviewed-on: https://gerrit.libreoffice.org/47594
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 61249f585796..6c2561065cff 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1502,7 +1502,8 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
         {
             pTypeListBox = VclPtr<ListBox>::Create(bLeft ? pLeft : pRight, WB_DROPDOWN|WB_BORDER|WB_VCENTER);
             for (int j = 0; j < AUTH_TYPE_END; j++)
-                pTypeListBox->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[j]));
+                pTypeListBox->InsertEntry(SwAuthorityFieldType::GetAuthTypeName(static_cast<ToxAuthorityType>(j)));
+            pTypeListBox->EnableAutoSize(true);
             if(!pFields[aCurInfo.nToxField].isEmpty())
             {
                 pTypeListBox->SelectEntryPos(pFields[aCurInfo.nToxField].toInt32());