diff options
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 6 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 6 | ||||
| -rw-r--r-- | vcl/inc/vcl/fixedhyper.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/fixedhyper.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 2 |
6 files changed, 11 insertions, 11 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; } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 41774812a48e..aa69a69c7458 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2955,8 +2955,8 @@ void VCLXFixedHyperlink::setText( const ::rtl::OUString& Text ) throw(::com::sun SolarMutexGuard aGuard; FixedHyperlink* pBase = (FixedHyperlink*)GetWindow(); - if ( pBase ) - pBase->SetDescription( Text ); + if (pBase) + pBase->SetText(Text); } ::rtl::OUString VCLXFixedHyperlink::getText() throw(::com::sun::star::uno::RuntimeException) @@ -3084,7 +3084,7 @@ void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const { ::rtl::OUString sNewLabel; if ( Value >>= sNewLabel ) - pBase->SetDescription( sNewLabel ); + pBase->SetText(sNewLabel); break; } diff --git a/vcl/inc/vcl/fixedhyper.hxx b/vcl/inc/vcl/fixedhyper.hxx index 2f53ba2e34cf..1d609f006641 100644 --- a/vcl/inc/vcl/fixedhyper.hxx +++ b/vcl/inc/vcl/fixedhyper.hxx @@ -119,7 +119,7 @@ OUString GetURL() const; /** sets new text and recalculates the text length. */ - void SetDescription(const OUString& rNewDescription); + virtual void SetText(const String& rNewDescription); }; #endif 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); |