diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-06-13 16:31:39 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-06-13 21:52:32 +0200 |
| commit | d97ac904b7a6e77cc46daf08a9b5f9628ff02ee5 (patch) | |
| tree | c446b9bfc0877bf0f5f743095a8c4ea0a449aa7d /vcl/source | |
| parent | 65c324f9022a20acb4f549ef103720683ab11593 (diff) | |
weld SvxCharTwoLinesPage
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>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/builder.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
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()) |