From a3de6b662444bafd3b102b6991866ed4c7206965 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 8 Sep 2014 15:49:24 +0100 Subject: Resolves: fdo#83501 STR_QUERY_* populate the join dialog (cherry picked from commit 3fc1e691c5e14f3b7a2579b563188e814f731cf6) Change-Id: Id4cff969297009c9f9cd3323ac01c743b29ca6c4 Reviewed-on: https://gerrit.libreoffice.org/11340 Reviewed-by: David Tardon Tested-by: David Tardon --- dbaccess/source/ui/querydesign/querydlg.cxx | 5 +++++ dbaccess/uiconfig/ui/joindialog.ui | 1 + 2 files changed, 6 insertions(+) diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index b655a9b72ae4..23db605d8501 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -55,6 +55,11 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, , m_xConnection(_xConnection) { get(m_pML_HelpText, "helptext"); + Size aSize(LogicToPixel(Size(179, 49), MAP_APPFONT)); + //alternatively loop through the STR_QUERY_* strings with their STR_JOIN_TYPE_HINT + //suffix to find the longest entry at runtime + m_pML_HelpText->set_height_request(aSize.Height()); + m_pML_HelpText->set_width_request(aSize.Width()); get(m_pLB_JoinType, "type"); get(m_pCBNatural, "natural"); get(m_pPB_OK, "ok"); diff --git a/dbaccess/uiconfig/ui/joindialog.ui b/dbaccess/uiconfig/ui/joindialog.ui index 650fc44c9950..7be228310859 100644 --- a/dbaccess/uiconfig/ui/joindialog.ui +++ b/dbaccess/uiconfig/ui/joindialog.ui @@ -167,6 +167,7 @@ True False 0 + 0 True 48 -- cgit v1.2.3