diff options
| author | Palenik Mihály <palenik.mihaly@gmail.com> | 2014-06-09 15:37:25 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-11 13:27:30 +0000 |
| commit | f188c982d5b8456fadb27ca5b88ece1c6ac1e719 (patch) | |
| tree | b4b4bbd5769e5161a295b44b9312b9bb0b80cb7e /vcl | |
| parent | a533f986f95560aadb16d6edcff77312d9329e3c (diff) | |
Convert RID_SANE_DIALOG to .ui
Change-Id: I1f08493cdc18f4c0691a8436368432fe4e94dec3
Reviewed-on: https://gerrit.libreoffice.org/9696
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/builder.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 97271e86a1f5..98055fc65d09 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1420,11 +1420,15 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri } else if (name == "GtkLabel") { + WinBits nWinStyle = WB_CENTER|WB_VCENTER|WB_3DLOOK; + OString sBorder = extractCustomProperty(rMap); + if (!sBorder.isEmpty()) + nWinStyle |= WB_BORDER; extractMnemonicWidget(id, rMap); if (extractSelectable(rMap)) - pWindow = new SelectableFixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); + pWindow = new SelectableFixedText(pParent, nWinStyle); else - pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); + pWindow = new FixedText(pParent, nWinStyle); } else if (name == "GtkImage") { |