diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-08-10 12:36:04 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-10 21:51:42 +0100 |
commit | ce6b095ce310c1bd6c9b3120497a3af511186d2b (patch) | |
tree | 9f1c9cc16e0dbbf3e66f0d75091954cc1076fe14 | |
parent | 068d43071385a0a08dacdd5232e0778be2154778 (diff) |
Button::GetStandardHelpText returns empty string, its all a noop
Change-Id: I651b19840aabf67b3083cd855c2851ac4c96741e
-rw-r--r-- | include/vcl/button.hxx | 1 | ||||
-rw-r--r-- | vcl/source/control/button.cxx | 12 | ||||
-rw-r--r-- | vcl/source/control/morebtn.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/btndlg.cxx | 1 |
4 files changed, 0 insertions, 16 deletions
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index fae8240efe0d..4869d1ca54ca 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -72,7 +72,6 @@ public: const Link& GetClickHdl() const { return maClickHdl; } static OUString GetStandardText( StandardButtonType eButton ); - static XubString GetStandardHelpText( StandardButtonType eButton ); sal_Bool SetModeImage( const Image& rImage ); const Image GetModeImage( ) const; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 8b89cd6bee8a..fb2e982537f4 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -156,14 +156,6 @@ OUString Button::GetStandardText( StandardButtonType eButton ) } // ----------------------------------------------------------------------- - -XubString Button::GetStandardHelpText( StandardButtonType /* eButton */ ) -{ - XubString aHelpText; - return aHelpText; -} - -// ----------------------------------------------------------------------- sal_Bool Button::SetModeImage( const Image& rImage ) { if ( rImage != mpButtonData->maImage ) @@ -1753,7 +1745,6 @@ void OKButton::ImplInit( Window* pParent, WinBits nStyle ) PushButton::ImplInit( pParent, nStyle ); SetText( Button::GetStandardText( BUTTON_OK ) ); - SetHelpText( Button::GetStandardHelpText( BUTTON_OK ) ); } // ----------------------------------------------------------------------- @@ -1819,7 +1810,6 @@ void CancelButton::ImplInit( Window* pParent, WinBits nStyle ) PushButton::ImplInit( pParent, nStyle ); SetText( Button::GetStandardText( BUTTON_CANCEL ) ); - SetHelpText( Button::GetStandardHelpText( BUTTON_CANCEL ) ); } // ----------------------------------------------------------------------- @@ -1882,7 +1872,6 @@ CloseButton::CloseButton( Window* pParent, WinBits nStyle ) : CancelButton(pParent, nStyle) { SetText( Button::GetStandardText( BUTTON_CLOSE ) ); - SetHelpText( Button::GetStandardHelpText( BUTTON_CLOSE ) ); } // ======================================================================= @@ -1892,7 +1881,6 @@ void HelpButton::ImplInit( Window* pParent, WinBits nStyle ) PushButton::ImplInit( pParent, nStyle | WB_NOPOINTERFOCUS ); SetText( Button::GetStandardText( BUTTON_HELP ) ); - SetHelpText( Button::GetStandardHelpText( BUTTON_HELP ) ); } // ----------------------------------------------------------------------- diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx index 82c4193ca577..0e697769cd7b 100644 --- a/vcl/source/control/morebtn.cxx +++ b/vcl/source/control/morebtn.cxx @@ -45,8 +45,6 @@ void MoreButton::ImplInit( Window* pParent, WinBits nStyle ) mpMBData->maMoreText = Button::GetStandardText( BUTTON_MORE ); mpMBData->maLessText = Button::GetStandardText( BUTTON_LESS ); - SetHelpText( Button::GetStandardHelpText( BUTTON_MORE ) ); - ShowState(); SetSymbolAlign(SYMBOLALIGN_RIGHT); diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 02e338f236b5..84694beac4c3 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -306,7 +306,6 @@ void ButtonDialog::AddButton( StandardButtonType eType, sal_uInt16 nId, !((eType == BUTTON_HELP) && (pItem->mpPushButton->GetType() == WINDOW_HELPBUTTON)) ) { pItem->mpPushButton->SetText( Button::GetStandardText( eType ) ); - pItem->mpPushButton->SetHelpText( Button::GetStandardHelpText( eType ) ); } if ( nBtnFlags & BUTTONDIALOG_FOCUSBUTTON ) |