diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-11-12 21:12:31 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-13 09:49:18 +0000 |
commit | b1cf29092494e59a59b4f8f5786a7617ed270073 (patch) | |
tree | 39c7a9effde843776411c1ee35dca3920757dcb1 /vcl/source | |
parent | f88473c56a718574e3cf45725f568cb4e1397aa4 (diff) |
merge SetDescription into SetText
that way the display text always matches the link text
Change-Id: I3f4901803bd9354d2cd0fc29d7d91ccd8e3def54
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/control/fixedhyper.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/builder.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx index 18de8a6fb41d..87aa06fddbad 100644 --- a/vcl/source/control/fixedhyper.cxx +++ b/vcl/source/control/fixedhyper.cxx @@ -115,9 +115,9 @@ OUString FixedHyperlink::GetURL() const return m_sURL; } -void FixedHyperlink::SetDescription(const OUString& rNewDescription) +void FixedHyperlink::SetText(const String& rNewDescription) { - SetText(rNewDescription); + FixedText::SetText(rNewDescription); m_nTextLen = GetCtrlTextWidth(GetText()); } diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index aa33c16f7143..76ee4ad0c202 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -705,7 +705,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri } } else if (name == "GtkLinkButton") - pWindow = new FixedHyperlink(pParent); + pWindow = new FixedHyperlink(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK|WB_NOLABEL); else if (name == "GtkComboBox") { extractModel(id, rMap); |