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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/inc/pch/precompiled_svxcore.hxx | 4 | ||||
| -rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 12 | ||||
| -rw-r--r-- | svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index e25009af9c64..486695b20009 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -425,10 +425,8 @@ #include <svl/style.hxx> #include <svl/svldllapi.h> #include <svl/whiter.hxx> -#include <svtools/AccessibleBrowseBoxObjType.hxx> #include <svtools/colorcfg.hxx> #include <svtools/ehdl.hxx> -#include <svtools/headbar.hxx> #include <svtools/svtdllapi.h> #include <svtools/svtresid.hxx> #include <svtools/toolboxcontroller.hxx> @@ -589,6 +587,8 @@ #include <svx/xpoly.hxx> #include <svx/xpool.hxx> #include <svx/xtable.hxx> +#include <vcl/AccessibleBrowseBoxObjType.hxx> +#include <vcl/headbar.hxx> #include <vcl/transfer.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 8ad74993d68c..8ab6df731009 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1898,12 +1898,12 @@ namespace } // Object data and state -OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const +OUString FmGridControl::GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const { OUString sRetText; switch( _eObjType ) { - case ::svt::BBTYPE_BROWSEBOX: + case ::vcl::BBTYPE_BROWSEBOX: if ( GetPeer() ) { Reference<XPropertySet> xProp(GetPeer()->getColumns(),UNO_QUERY); @@ -1911,7 +1911,7 @@ OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjTy xProp->getPropertyValue(FM_PROP_NAME) >>= sRetText; } break; - case ::svt::BBTYPE_COLUMNHEADERCELL: + case ::vcl::BBTYPE_COLUMNHEADERCELL: sRetText = getColumnPropertyFromPeer( GetPeer(), GetModelColumnPos( @@ -1924,12 +1924,12 @@ OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjTy return sRetText; } -OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const +OUString FmGridControl::GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const { OUString sRetText; switch( _eObjType ) { - case ::svt::BBTYPE_BROWSEBOX: + case ::vcl::BBTYPE_BROWSEBOX: if ( GetPeer() ) { Reference<XPropertySet> xProp(GetPeer()->getColumns(),UNO_QUERY); @@ -1941,7 +1941,7 @@ OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseB } } break; - case ::svt::BBTYPE_COLUMNHEADERCELL: + case ::vcl::BBTYPE_COLUMNHEADERCELL: sRetText = getColumnPropertyFromPeer( GetPeer(), GetModelColumnPos( diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index a465dd9fed83..9fb61c44587d 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/linguistic2/XConversionPropertyType.hpp> #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/lang/Locale.hpp> -#include <svtools/headbar.hxx> +#include <vcl/headbar.hxx> #include <vcl/svlbitm.hxx> #include <vcl/treelistentry.hxx> #include <vcl/settings.hxx> |