diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-13 08:17:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-13 08:17:42 +0200 |
| commit | b8d977c0178f8ac4ee299722d50c1481a15b45c8 (patch) | |
| tree | 6cd8560661bb8b713e4373379052e85ab30598dd /svx | |
| parent | 80d2fa87fdaf67615d7b8128f3c05b239a1f1c05 (diff) | |
convert CharCompressType to scoped enum
and move it to svl, where it belongs
Change-Id: Ic4d846419dfe2dd85de5ade8ed1a041867bbf1dc
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index cb3ed8642545..c95c018cd86d 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -35,6 +35,7 @@ #include <unotools/configmgr.hxx> #include <svl/whiter.hxx> +#include <svl/asiancfg.hxx> #include <svx/xit.hxx> #include <svx/xbtmpit.hxx> #include <svx/xlndsit.hxx> @@ -165,11 +166,11 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe mbDisableTextEditUsesCommonUndoManager = false; if (!utl::ConfigManager::IsAvoidConfig()) - mnCharCompressType = + mnCharCompressType = (CharCompressType) officecfg::Office::Common::AsianLayout::CompressCharacterDistance:: get(); else - mnCharCompressType = 0; + mnCharCompressType = CharCompressType::NONE; #ifdef OSL_LITENDIAN nStreamNumberFormat=SvStreamEndian::LITTLE; @@ -1865,7 +1866,7 @@ void SdrModel::SetForbiddenCharsTable( const rtl::Reference<SvxForbiddenCharacte } -void SdrModel::SetCharCompressType( sal_uInt16 nType ) +void SdrModel::SetCharCompressType( CharCompressType nType ) { if( nType != mnCharCompressType ) { |