vcl/osx/salnativewidgets.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f8ba7ff1e57bc769a4437c10b11200a6c0b122d9
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Aug 18 12:16:27 2016 +0100
cppcheck: nullPointerRedundantCheck
Change-Id: I2f8e3b4315cf63335ec4ab0c51bbf81f9c8a06f7
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index b05860d..8189d37 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -539,7 +539,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
aPushInfo.kind = kThemePushButtonMini;
nPaintHeight = PB_Mini_Height;
}
- else if( pPBVal->mbSingleLine || rc.size.height < (PB_Norm_Height
+ PB_Norm_Height/2) )
+ else if( (pPBVal && pPBVal->mbSingleLine) || rc.size.height <
(PB_Norm_Height + PB_Norm_Height/2) )
{
aPushInfo.kind = kThemePushButtonNormal;
nPaintHeight = PB_Norm_Height;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
