diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-20 15:36:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-20 15:36:39 +0200 |
| commit | f6101f6d3e14720317c4904cbafceb29ec753005 (patch) | |
| tree | ae166cd58e544933e45dae61938d2f0fd23365f1 | |
| parent | f9c242674094eba7ac19bd279f611dba0a8e5571 (diff) | |
Work around workaround for old MSVC 2012
...not allowing certain o3tl::is_typed_flags::Wrap conversion operators to be
explicit, thus causing ambiguities here.
Change-Id: I5108885229eb185ceac57042e67405b393cdcf3b
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 9517f07a56ad..fb42808e5ff0 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1072,7 +1072,7 @@ void ToolBox::SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits ) nBits &= ToolBoxItemBits::LEFT | ToolBoxItemBits::AUTOSIZE | ToolBoxItemBits::DROPDOWN; nOldBits &= ToolBoxItemBits::LEFT | ToolBoxItemBits::AUTOSIZE | ToolBoxItemBits::DROPDOWN; // trigger reformat when the item width has changed (dropdown arrow) - bool bFormat = (nBits & ToolBoxItemBits::DROPDOWN) != (nOldBits & ToolBoxItemBits::DROPDOWN); + bool bFormat = ToolBoxItemBits(nBits & ToolBoxItemBits::DROPDOWN) != ToolBoxItemBits(nOldBits & ToolBoxItemBits::DROPDOWN); if ( nBits != nOldBits ) ImplInvalidate( true, bFormat ); } |