vcl/source/window/builder.cxx | 12 +++--------- vcl/uiconfig/ui/printdialog.ui | 1 - 2 files changed, 3 insertions(+), 10 deletions(-)
New commits: commit 9c427991d9658a870ee0eb1bdc4cd3b393c93fd5 Author: Caolán McNamara <[email protected]> Date: Fri Feb 8 14:49:12 2013 +0000 janitorial tidying Change-Id: I4f37cb4bcde935bfbf6d412f4c81ef0451245f00 diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 7ea7a85..ba42b99 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1031,16 +1031,10 @@ 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; + WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; 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; - } + if (!sBorder.isEmpty()) + nWinStyle |= 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 731d4c0..227063e 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -362,7 +362,6 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">6</property> <property name="label" translatable="yes">Printer</property> <attributes> <attribute name="weight" value="bold"/>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
