summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-09-08 15:49:24 +0100
committerDavid Tardon <dtardon@redhat.com>2014-09-09 08:31:32 +0000
commita3de6b662444bafd3b102b6991866ed4c7206965 (patch)
tree3bd6c29cab4a7beea9560930996411289bf10929
parentc6b46c2c23ba883a83bc8a6fdf3a37d2a9ffbf95 (diff)
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 <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.cxx5
-rw-r--r--dbaccess/uiconfig/ui/joindialog.ui1
2 files changed, 6 insertions, 0 deletions
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 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
+ <property name="yalign">0</property>
<property name="wrap">True</property>
<property name="max_width_chars">48</property>
</object>