diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-04 13:06:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-09 13:28:35 +0100 |
| commit | 1efeb17837c22499f00299c033ae59ba3910f7d7 (patch) | |
| tree | a8db0b758e942b3b14fba26129dc51a95ff5c10c /svtools | |
| parent | 4da3e0a0e5b2260c26186890724978bfd00f796c (diff) | |
weld Property Browser
Replaced the odd HyperlinkField Edit whose text can be clicked on to activate
listeners, with an ordinary Edit and a Button beside it which can be clicked
instead to do that. I couldn't find a real world use of this HyperlinkField in
the forms or control properties, nor in casual experimentation in the sidebar
in the basicide dialog editor.
Also replaced the other strange Edit-alike TextView with a real Edit entry and
a dropdown which can be used to support entry of multi-line labels
Change-Id: Iad5265e404f6de14c8e760d617dbad49cd6ddead
Reviewed-on: https://gerrit.libreoffice.org/82213
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/control/inettbc.cxx | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index f186d39785f5..42919c8a3bde 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1756,6 +1756,7 @@ void SvtCalendarBox::set_label_from_date() IMPL_LINK_NOARG(SvtCalendarBox, SelectHdl, weld::Calendar&, void) { set_label_from_date(); + m_aSelectHdl.Call(*this); } IMPL_LINK_NOARG(SvtCalendarBox, ActivateHdl, weld::Calendar&, void) diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 1bf5619b0199..60a827d172f4 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -2071,6 +2071,8 @@ OUString URLBox::GetURL() ::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() ); OUString aText(m_xWidget->get_active_text()); + if (MatchesPlaceHolder(aText)) + return aPlaceHolder; // try to get the right case preserving URL from the list of URLs for(std::vector<OUString>::iterator i = pImpl->aCompletions.begin(), j = pImpl->aURLs.begin(); i != pImpl->aCompletions.end() && j != pImpl->aURLs.end(); ++i, ++j) |