Skip to content

C
core
Kaydet (Commit) 3e102013 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Simplify ToolBox::GetQuickHelpText 

Change-Id: I2801f54cecf9c8b7d43f8e1c1699cfd7fdd918e3
üst c491f941
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
include/vcl/toolbox.hxx
Dosyayı görüntüle @ 3e102013
...@@ -437,7 +437,7 @@ public: ...@@ -437,7 +437,7 @@ public:
using Window::SetQuickHelpText; using Window::SetQuickHelpText;
void SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText ); void SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText );
using Window::GetQuickHelpText; using Window::GetQuickHelpText;
const OUString& GetQuickHelpText( sal_uInt16 nItemId ) const; OUString GetQuickHelpText( sal_uInt16 nItemId ) const;
void SetHelpText( sal_uInt16 nItemId, const OUString& rText ); void SetHelpText( sal_uInt16 nItemId, const OUString& rText );
const OUString& GetHelpText( sal_uInt16 nItemId ) const; const OUString& GetHelpText( sal_uInt16 nItemId ) const;
......
vcl/source/window/toolbox2.cxx
Dosyayı görüntüle @ 3e102013
...@@ -1577,16 +1577,14 @@ void ToolBox::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText ) ...@@ -1577,16 +1577,14 @@ void ToolBox::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText )
pItem->maQuickHelpText = rText; pItem->maQuickHelpText = rText;
} }
const OUString& ToolBox::GetQuickHelpText( sal_uInt16 nItemId ) const OUString ToolBox::GetQuickHelpText( sal_uInt16 nItemId ) const
{ {
static const OUString sEmpty;
ImplToolItem* pItem = ImplGetItem( nItemId ); ImplToolItem* pItem = ImplGetItem( nItemId );
if ( pItem ) if ( pItem )
return pItem->maQuickHelpText; return pItem->maQuickHelpText;
else else
return sEmpty; return "";
} }
void ToolBox::SetHelpText( sal_uInt16 nItemId, const OUString& rText ) void ToolBox::SetHelpText( sal_uInt16 nItemId, const OUString& rText )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment