diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-08-22 17:15:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-22 20:40:07 +0200 |
| commit | b5f2f32defd22c8ec0c47c0100836a8d5bb132ea (patch) | |
| tree | 49bf3d2671c6f8665438f090cd9078b6817c840a /sw/uiconfig | |
| parent | d5c7657c541c1f6d17bfe5e605594c235eecfcdb (diff) | |
weld SwMailMergeAddressBlockPage
Change-Id: Ib3383f1ae590766ecb1371cab2ccdb7c835c95a8
Reviewed-on: https://gerrit.libreoffice.org/77971
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/uiconfig')
| -rw-r--r-- | sw/uiconfig/swriter/ui/mmaddressblockpage.ui | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui index 643f5b737ec9..ebecf2aad090 100644 --- a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui +++ b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui @@ -319,11 +319,27 @@ </packing> </child> <child> - <object class="swlo-SwAddressPreview" id="settingspreview:border"> + <object class="GtkScrolledWindow" id="settingspreviewwin"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkDrawingArea" id="settingspreview"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + </child> + </object> + </child> </object> <packing> <property name="left_attach">0</property> @@ -397,11 +413,27 @@ <property name="vexpand">True</property> <property name="row_spacing">6</property> <child> - <object class="swlo-SwAddressPreview" id="addresspreview:border"> + <object class="GtkScrolledWindow" id="addresspreviewwin"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkDrawingArea" id="addresspreview"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + </child> + </object> + </child> </object> <packing> <property name="left_attach">0</property> |