Allow a common op. on a disposed toolbox.

Change-Id: I4da1f4daaf94456bc951b1d7a96cb28cb7fba0e9

Allow a common op. on a disposed toolbox.
Change-Id: I4da1f4daaf94456bc951b1d7a96cb28cb7fba0e9
ae5f75ab · Michael Meeks · 0a778c5e · ae5f75ab
Kaydet (Commit) ae5f75ab authored Nis 14, 2015 tarafından Michael Meeks
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

toolbox2.cxx vcl/source/window/toolbox2.cxx +3 -0

No files found.
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -937,6 +937,9 @@ sal_uInt16 ToolBox::GetItemId( const Point& rPos ) const

 sal_uInt16 ToolBox::GetItemId(const OUString &rCommand) const
 {
+    if (!mpData)
+        return TOOLBOX_ITEM_NOTFOUND;
+
    for (std::vector<ImplToolItem>::const_iterator it = mpData->m_aItems.begin(); it != mpData->m_aItems.end(); ++it)
    {
        if (it->maCommandStr == rCommand)