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 /desktop | |
| parent | f88473c56a718574e3cf45725f568cb4e1397aa4 (diff) | |
merge SetDescription into SetText
that way the display text always matches the link text
Change-Id: I3f4901803bd9354d2cd0fc29d7d91ccd8e3def54
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index b25150673315..2d6c30df63e9 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -573,7 +573,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr pEntry->m_pPublisher->SetBackground(); pEntry->m_pPublisher->SetPaintTransparent( true ); pEntry->m_pPublisher->SetURL( pEntry->m_sPublisherURL ); - pEntry->m_pPublisher->SetDescription( pEntry->m_sPublisher ); + pEntry->m_pPublisher->SetText( pEntry->m_sPublisher ); Size aSize = FixedText::CalcMinimumTextSize( pEntry->m_pPublisher ); pEntry->m_pPublisher->SetSizePixel( aSize ); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index c9b5c4ff2042..8762accef22e 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -966,7 +966,7 @@ void UpdateDialog::clearDescription() String sEmpty; m_PublisherLabel.Hide(); m_PublisherLink.Hide(); - m_PublisherLink.SetDescription( sEmpty ); + m_PublisherLink.SetText( sEmpty ); m_PublisherLink.SetURL( sEmpty ); m_ReleaseNotesLabel.Hide(); m_ReleaseNotesLink.Hide(); @@ -1015,7 +1015,7 @@ bool UpdateDialog::showDescription(std::pair< rtl::OUString, rtl::OUString > con { m_PublisherLabel.Show(); m_PublisherLink.Show(); - m_PublisherLink.SetDescription( sPub ); + m_PublisherLink.SetText( sPub ); m_PublisherLink.SetURL( sURL ); bPublisher = true; } @@ -1054,7 +1054,7 @@ bool UpdateDialog::showDescription( const String& rDescription, bool bWithPublis m_descriptions.SetPosSizePixel( aNewPos, aNewSize ); } m_descriptions.Show(); - m_descriptions.SetDescription( rDescription ); + m_descriptions.SetText( rDescription ); return true; } |