cui/source/dialogs/colorpicker.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 6b6c23d4ef283c3df8f97c5cc2d97e49de57e076
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jun 21 10:48:34 2018 +0100
use Application::GetFrameWeld to tunnel weld::Window through XWindow
Change-Id: I137afe61acfb71337a45bedbe539b0096080e6cc
Reviewed-on: https://gerrit.libreoffice.org/56246
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index 3b182cde641a..c928c0493e45 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1301,8 +1301,7 @@ void SAL_CALL ColorPicker::setTitle( const OUString&
sTitle )
sal_Int16 SAL_CALL ColorPicker::execute()
{
- VclPtr<vcl::Window> xWin(VCLUnoHelper::GetWindow(mxParent));
- std::unique_ptr<ColorPickerDialog> xDlg(new ColorPickerDialog(xWin ?
xWin->GetFrameWeld() : nullptr, mnColor, mnMode));
+ std::unique_ptr<ColorPickerDialog> xDlg(new
ColorPickerDialog(Application::GetFrameWeld(mxParent), mnColor, mnMode));
sal_Int16 ret = xDlg->run();
if (ret)
mnColor = xDlg->GetColor();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
