From d97ac904b7a6e77cc46daf08a9b5f9628ff02ee5 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 13 Jun 2018 16:31:39 +0100
Subject: weld SvxCharTwoLinesPage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I54a8963cd8b12f5fd51bf6b3bb791a4a15fbd13d
Reviewed-on: https://gerrit.libreoffice.org/55762
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 vcl/source/window/builder.cxx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'vcl/source')

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 677bd646b6c9..4f070fcb5e77 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -3682,8 +3682,16 @@ void VclBuilder::mungeModel(ListBox &rTarget, const ListStore &rStore, sal_uInt1
         sal_uInt16 nEntry = rTarget.InsertEntry(rRow[0]);
         if (rRow.size() > 1)
         {
-            sal_IntPtr nValue = rRow[1].toInt32();
-            rTarget.SetEntryData(nEntry, reinterpret_cast<void*>(nValue));
+            if (m_bLegacy)
+            {
+                sal_IntPtr nValue = rRow[1].toInt32();
+                rTarget.SetEntryData(nEntry, reinterpret_cast<void*>(nValue));
+            }
+            else
+            {
+                if (!rRow[1].isEmpty())
+                    rTarget.SetEntryData(nEntry, new OUString(rRow[1]));
+            }
         }
     }
     if (nActiveId < rStore.m_aEntries.size())
-- 
cgit