diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-17 21:37:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-21 22:08:04 +0100 |
| commit | 47897fdd936d9b6e9ac8cb6110c79352ab080df7 (patch) | |
| tree | c657b53080caa94590d1e9b1fd4383d6dc795728 /filter | |
| parent | cfa76f538a44d4396574ece59e8a3953c22c6eb7 (diff) | |
weld SwCondCollPage
and put back original SvTreeListBox a11y factory use
Change-Id: I4ad8ce29d8fed6ec5d44e9a1d641919a89226b79
Reviewed-on: https://gerrit.libreoffice.org/63501
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2 | ||||
| -rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 2 | ||||
| -rw-r--r-- | filter/uiconfig/ui/warnpdfdialog.ui | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 0caa32ec5cd2..f1d82327ca75 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <unotools/resmgr.hxx> #include <tools/urlobj.hxx> -#include <svtools/headbar.hxx> +#include <vcl/headbar.hxx> #include <unotools/streamwrap.hxx> #include <unotools/pathoptions.hxx> #include <osl/file.hxx> diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 428f503971d1..816e75ac72bb 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -26,7 +26,7 @@ #include <vcl/button.hxx> #include <vcl/dialog.hxx> #include <vcl/layout.hxx> -#include <svtools/svtabbx.hxx> +#include <vcl/svtabbx.hxx> #include <svl/poolitem.hxx> #include <unotools/moduleoptions.hxx> diff --git a/filter/uiconfig/ui/warnpdfdialog.ui b/filter/uiconfig/ui/warnpdfdialog.ui index ef3c80eb25d3..6a26ff71add0 100644 --- a/filter/uiconfig/ui/warnpdfdialog.ui +++ b/filter/uiconfig/ui/warnpdfdialog.ui @@ -6,10 +6,10 @@ <columns> <!-- column-name text --> <column type="gchararray"/> - <!-- column-name id --> - <column type="gchararray"/> <!-- column-name image --> <column type="GdkPixbuf"/> + <!-- column-name id --> + <column type="gchararray"/> </columns> </object> <object class="GtkMessageDialog" id="WarnPDFDialog"> @@ -82,7 +82,7 @@ <property name="model">liststore1</property> <property name="headers_visible">False</property> <property name="headers_clickable">False</property> - <property name="search_column">0</property> + <property name="search_column">1</property> <property name="show_expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> @@ -92,7 +92,7 @@ <child> <object class="GtkCellRendererPixbuf" id="cellrenderertext1"/> <attributes> - <attribute name="pixbuf">2</attribute> + <attribute name="pixbuf">0</attribute> </attributes> </child> </object> @@ -102,7 +102,7 @@ <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> <attributes> - <attribute name="text">0</attribute> + <attribute name="text">1</attribute> </attributes> </child> </object> |