vcl/osx/salnativewidgets.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5b76c5023faf345814a7dd874d2b7cfd3dd05096
Author: Noel Grandin <n...@peralex.com>
Date: Wed May 13 08:55:56 2015 +0200
fix OSX build
after my commit 7ac403aa7cb2bd531245280d88bdc9fe6553c711
"convert FRAME_DRAW constants to scoped enum"
Change-Id: Id76d76d5549cd09b35b1d9e8fb68c9549f9fd3a9
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 8ef6ed6..0e762ed 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -1013,7 +1013,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
case CTRL_FRAME:
{
- sal_uInt16 nStyle = aValue.getNumericVal();
+ DrawFrameFlags nStyle =
static_cast<DrawFrameFlags>(aValue.getNumericVal());
if( nPart == PART_BORDER ) {
if(!( nStyle & DrawFrameFlags::Menu ) && !(nStyle &
DrawFrameFlags::WindowBorder) )
{
@@ -1319,7 +1319,7 @@ bool AquaSalGraphics::getNativeControlRegion( ControlType
nType, ControlPart nPa
break;
case CTRL_FRAME:
{
- sal_uInt16 nStyle = aValue.getNumericVal();
+ DrawFrameFlags nStyle =
static_cast<DrawFrameFlags>(aValue.getNumericVal());
if( ( nPart == PART_BORDER ) &&
!( nStyle & (DrawFrameFlags::Menu |
DrawFrameFlags::WindowBorder | DrawFrameFlags::BorderWindowBorder) ) )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
