diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-08 14:49:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-08 14:56:04 +0000 |
| commit | 9c427991d9658a870ee0eb1bdc4cd3b393c93fd5 (patch) | |
| tree | 98f8897c2dac0edaa59945dbd56b40a7edc0810d /vcl | |
| parent | f10ba07935951e6c74663a35de9a79b7d66beb37 (diff) | |
janitorial tidying
Change-Id: I4f37cb4bcde935bfbf6d412f4c81ef0451245f00
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/builder.cxx | 12 | ||||
| -rw-r--r-- | vcl/uiconfig/ui/printdialog.ui | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 7ea7a85314b0..ba42b99ef6e7 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 731d4c0cb2c2..227063e502fb 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"/> |