diff options
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/options/optgenrl.cxx | 13 | ||||
| -rw-r--r-- | cui/source/options/treeopt.cxx | 5 |
2 files changed, 14 insertions, 4 deletions
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 1b160fb628d9..872001b2f233 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -302,7 +302,7 @@ void SvxGeneralTabPage::InitCryptography() { #if HAVE_FEATURE_GPGME m_pCryptoFrame->Show(); - // unused yet, I just wanted to see if this delivers the desired results + uno::Reference< xml::crypto::XSEInitializer > xSEInitializer; try { @@ -321,6 +321,17 @@ void SvxGeneralTabPage::InitCryptography() m_pEncryptionKeyLB->InsertEntry( xCert->getIssuerName()); } } + + //tdf#115015: wrap checkbox text and listboxes if necessary + Size aPrefSize(m_pEncryptToSelfCB->get_preferred_size()); + Size aSize(m_pEncryptToSelfCB->CalcMinimumSize(40*approximate_char_width())); + if (aPrefSize.Width() > aSize.Width()) + { + m_pSigningKeyLB->set_width_request(aSize.Width()); + m_pEncryptionKeyLB->set_width_request(aSize.Width()); + m_pEncryptToSelfCB->set_width_request(aSize.Width()); + } + } } catch ( uno::Exception const & ) diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index fb01bfeb1945..877f2cfa6a95 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -489,10 +489,9 @@ void OfaTreeOptionsDialog::InitWidgets() get(pTreeLB, "pages"); get(pTabBox, "box"); Size aSize(pTabBox->LogicToPixel(Size(278, 259), MapMode(MapUnit::MapAppFont))); - pTabBox->set_width_request(aSize.Width()); - pTabBox->set_height_request(aSize.Height() - get_action_area()->get_preferred_size().Height()); pTreeLB->set_width_request(pTreeLB->approximate_char_width() * 25); - pTreeLB->set_height_request(pTabBox->get_height_request()); + pTreeLB->set_height_request(pTreeLB->GetTextHeight() * 32); + pTabBox->set_width_request(aSize.Width()); } // Ctor() with Frame ----------------------------------------------------- |