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 /dbaccess | |
| 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 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/browser/sbagrid.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/sbagrid.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/sqlexception.ui | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 041bfc66b550..47cc3d5d61c4 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1460,10 +1460,10 @@ IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent, void*, void) m_aDataDescriptor.clear(); } -OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const +OUString SbaGridControl::GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const { OUString sRet; - if ( ::svt::BBTYPE_BROWSEBOX == eObjType ) + if ( ::vcl::BBTYPE_BROWSEBOX == eObjType ) { SolarMutexGuard aGuard; sRet = DBA_RES(STR_DATASOURCE_GRIDCONTROL_DESC); diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index c1e920ba2533..1629fbdb1463 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -239,7 +239,7 @@ namespace dbaui @return The description of the specified object. */ - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override; + virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override; using FmGridControl::DeleteSelectedRows; /** copies the currently selected rows to the clipboard diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 87754ae9da5c..e611e5977c1c 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2559,12 +2559,12 @@ OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const return aLabel.getToken(nToken, ';'); } -OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const +OUString OSelectionBrowseBox::GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const { OUString sRetText; switch( _eObjType ) { - case ::svt::BBTYPE_ROWHEADERCELL: + case ::vcl::BBTYPE_ROWHEADERCELL: sRetText = GetRowDescription(_nPosition); break; default: diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 7d570742348a..42c418e7ff29 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -170,7 +170,7 @@ namespace dbaui @return The name of the specified object. */ - virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override; + virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override; // IAccessibleTableProvider /** Creates the accessible object of a data table cell. diff --git a/dbaccess/uiconfig/ui/sqlexception.ui b/dbaccess/uiconfig/ui/sqlexception.ui index 488f78edcaa1..86521e0a9102 100644 --- a/dbaccess/uiconfig/ui/sqlexception.ui +++ b/dbaccess/uiconfig/ui/sqlexception.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="GtkDialog" id="SQLExceptionDialog"> @@ -137,7 +137,7 @@ <child> <object class="GtkCellRendererPixbuf" id="cellrenderertext1"/> <attributes> - <attribute name="pixbuf">2</attribute> + <attribute name="pixbuf">0</attribute> </attributes> </child> </object> @@ -147,7 +147,7 @@ <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> <attributes> - <attribute name="text">0</attribute> + <attribute name="text">1</attribute> </attributes> </child> </object> |