commit c763002727049752879dd81daf6ee59a8a9d0da9
author Caolán McNamara <caolanm@redhat.com> Mon Nov 19 14:21:10 2018 +0000
committer Caolán McNamara <caolanm@redhat.com> Mon Nov 19 22:05:55 2018 +0100
tree cee61c27bfd6fac14a47e72436072a1ef4dc0217
parent 63496a57b408ae18558208e4179c7b4624d5a44e

tdf#121232 set a size request that will result in a 0 m_nXGap by default

Change-Id: I25ce389bd46beff2dd9b0507581736f2f9511383
Reviewed-on: https://gerrit.libreoffice.org/63575
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

svx/source/dialog/charmap.cxx

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 1b78839..0d8a869 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -82,8 +82,16 @@ SvxShowCharSet::SvxShowCharSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWi
void SvxShowCharSet::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{
    CustomWidgetController::SetDrawingArea(pDrawingArea);
    mxScrollArea->set_size_request(COLUMN_COUNT * pDrawingArea->get_approximate_digit_width() * 4,
                                   ROW_COUNT * pDrawingArea->get_text_height() * 2);

    Size aSize(COLUMN_COUNT * pDrawingArea->get_approximate_digit_width() * 5.25,
               ROW_COUNT * pDrawingArea->get_text_height() * 2);

    nX = aSize.Width() / COLUMN_COUNT;
    nY = aSize.Height() / ROW_COUNT;

    // tdf#121232 set a size request that will result in a 0 m_nXGap by default
    mxScrollArea->set_size_request(COLUMN_COUNT * nX + mxScrollArea->get_vscroll_width() + 2,
                                   ROW_COUNT * nY);
}

void SvxShowCharSet::init()