diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-10-14 20:06:13 -0400 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-11-09 18:42:31 +0100 |
| commit | 23a5a45ee4a8a097192e3c137910a1c81d3604a2 (patch) | |
| tree | 3b57e04f4d971fcc59ebddf0260e5891a652f1b7 | |
| parent | 86dcf8e1527d81d1da7f130a59068ef02a6f7cbd (diff) | |
custom widgets: correct focus colors and render button-up in listboxes
Change-Id: I70f46f94747f468a2bb79f8baa4576e4460bef31
| -rw-r--r-- | vcl/headless/CustomWidgetDraw.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/vcl/headless/CustomWidgetDraw.cxx b/vcl/headless/CustomWidgetDraw.cxx index 5698f0ac34d8..bdae8cea8ade 100644 --- a/vcl/headless/CustomWidgetDraw.cxx +++ b/vcl/headless/CustomWidgetDraw.cxx @@ -53,9 +53,8 @@ CustomWidgetDraw::~CustomWidgetDraw() {} bool CustomWidgetDraw::isNativeControlSupported(ControlType eType, ControlPart ePart) { - if (!s_pWidgetImplementation) - return false; - return s_pWidgetImplementation->isNativeControlSupported(eType, ePart); + return s_pWidgetImplementation + && s_pWidgetImplementation->isNativeControlSupported(eType, ePart); } bool CustomWidgetDraw::hitTestNativeControl(ControlType /*eType*/, ControlPart /*ePart*/, @@ -302,11 +301,9 @@ bool CustomWidgetDraw::getNativeControlRegion( ControlState eState, const ImplControlValue& /*aValue*/, const OUString& /*aCaption*/, tools::Rectangle& rNativeBoundingRegion, tools::Rectangle& rNativeContentRegion) { - if (!s_pWidgetImplementation) - return false; - - return s_pWidgetImplementation->getRegion(eType, ePart, eState, rBoundingControlRegion, - rNativeBoundingRegion, rNativeContentRegion); + return s_pWidgetImplementation + && s_pWidgetImplementation->getRegion(eType, ePart, eState, rBoundingControlRegion, + rNativeBoundingRegion, rNativeContentRegion); } bool CustomWidgetDraw::updateSettings(AllSettings& rSettings) |