From f10ba07935951e6c74663a35de9a79b7d66beb37 Mon Sep 17 00:00:00 2001 From: Joren De Cuyper Date: Fri, 8 Feb 2013 14:34:02 +0100 Subject: resolve fdo#60450 - Printer list is missing its border in Print dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5 Reviewed-on: https://gerrit.libreoffice.org/2043 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/source/window/builder.cxx | 11 ++++++++++- vcl/uiconfig/ui/printdialog.ui | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'vcl') diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 98091a347a51..7ea7a85314b0 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1031,7 +1031,16 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri // everything over to SvTreeViewBox //d) remove the users of makeSvTreeViewBox extractModel(id, rMap); - WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; + WinBits nWinStyle; + OString sBorder = extractCustomProperty(rMap); + if (sBorder.isEmpty()) + { + nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; + } + else + { + nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_BORDER; + } //ListBox manages its own scrolling, Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle); pWindow = new ListBox(pRealParent, nWinStyle); diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 22e759c1213a..731d4c0cb2c2 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -339,7 +339,7 @@ - + 100 True True @@ -362,6 +362,7 @@ True False + 6 Printer -- cgit labora/co-24.04.5'>distro/collabora/co-24.04.5 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/configmgr
AgeCommit message (Expand)Author
2016-11-21Kill the AutoPilotPresentations UNO commandGabor Kelemen