diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-01-21 14:09:37 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2014-01-21 14:09:37 +0000 |
| commit | 1ceda390389a3e7bf4b7bb72b533a355a0fa060d (patch) | |
| tree | 417f4c4999f04efcff3ebc8a5454bafbabce770b /sd | |
| parent | 275a1d7a011e79a7f9c44c51e947d2cb50197051 (diff) | |
#i123817# boost::shared_ptr doesn't have an implicit conversion to bool
Constructs that expect it fail at least in XCode4's clang in C++11 mode.
An implicit conversion from pointer to bool is already suspicious enough
and a shared_ptr->pointer->bool conversion is even worse. Cleaning up
the code fixes the build breaker seen in boost/libc++/clang environments.
Notes
Notes:
prefer: d4bab97023e3569571a92551040574b20aceca7c
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index ff088bf4675a..003e3b66f398 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -469,7 +469,7 @@ void ButtonBar::Paint ( bool ButtonBar::IsMouseOverButton (void) const { - return mpButtonUnderMouse; + return (mpButtonUnderMouse.get() != NULL); } |