diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-10 11:31:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-10 16:16:11 +0000 |
| commit | 735f3a94b92ac93d11f66c3a86edc42e1915b337 (patch) | |
| tree | 32f255b658d2785d8c1edc4c67f38aea86a762fa /sw | |
| parent | 7546afda22e2af40e45b533f17bd8aeaacaa100a (diff) | |
Related: fdo#85111 put a box around xml filter settings control
and writer->insert->table->autoformat
and calc->data->consolidate
and calc->insert->sheet
Change-Id: I7c89d9f01747a00b906afe3c762b747df6872869
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 14 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/autoformattable.ui | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index fc85c65822b4..0c1a1a1d17bf 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -47,7 +47,7 @@ using namespace com::sun::star; class AutoFmtPreview : public vcl::Window { public: - AutoFmtPreview(vcl::Window* pParent); + AutoFmtPreview(vcl::Window* pParent, WinBits nStyle); virtual ~AutoFmtPreview(); void NotifyChange( const SwTableAutoFmt& rNewData ); @@ -486,8 +486,8 @@ IMPL_LINK_NOARG_INLINE_START(SwAutoFormatDlg, OkHdl) } IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl) -AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent) : - Window ( pParent ), +AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent, WinBits nStyle) : + Window ( pParent, nStyle ), aCurData ( OUString() ), aVD ( *this ), aScriptedText ( aVD ), @@ -508,9 +508,13 @@ AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent) : Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoFmtPreview(vcl::Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoFmtPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { - return new AutoFmtPreview(pParent); + WinBits nWinStyle = 0; + OString sBorder = VclBuilder::extractCustomProperty(rMap); + if (!sBorder.isEmpty()) + nWinStyle |= WB_BORDER; + return new AutoFmtPreview(pParent, nWinStyle); } void AutoFmtPreview::Resize() diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui index dcfc1bd6cbbe..9855f081e9be 100644 --- a/sw/uiconfig/swriter/ui/autoformattable.ui +++ b/sw/uiconfig/swriter/ui/autoformattable.ui @@ -158,7 +158,7 @@ <property name="can_focus">True</property> <property name="shadow_type">in</property> <child> - <object class="GtkTreeView" id="formatlb"> + <object class="GtkTreeView" id="formatlb:border"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="vexpand">True</property> |