diff options
| author | Noel Grandin <noel@peralex.com> | 2015-02-27 11:05:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-02 08:59:18 +0200 |
| commit | c9c1caa4f9ad955ae864aa2681f890c7706daad1 (patch) | |
| tree | 2813ecae7c8a4ecd1362fa1d258c76443694f909 /svl | |
| parent | 10bc10dd20520a72d030be429798d0cc19466fb5 (diff) | |
convert SVX_SEARCHAPP_ constants to enum class
Change-Id: I2b9d379e56e0af655aa06afb5391140de952b9d6
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/srchitem.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 9e9a045d851e..87a55d7575fb 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -114,7 +114,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : eFamily ( SFX_STYLE_FAMILY_PARA ), nCommand ( SvxSearchCmd::FIND ), nCellType ( SVX_SEARCHIN_FORMULA ), - nAppFlag ( SVX_SEARCHAPP_WRITER ), + nAppFlag ( SvxSearchApp::WRITER ), bRowDirection ( true ), bAllTables ( false ), bSearchFiltered ( false ), @@ -377,7 +377,7 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe aSeq[3].Name = SRCH_PARA_CELLTYPE; aSeq[3].Value <<= nCellType; aSeq[4].Name = SRCH_PARA_APPFLAG; - aSeq[4].Value <<= nAppFlag; + aSeq[4].Value <<= static_cast<sal_uInt16>(nAppFlag); aSeq[5].Name = SRCH_PARA_ROWDIR; aSeq[5].Value <<= bRowDirection; aSeq[6].Name = SRCH_PARA_ALLTABLES; @@ -497,8 +497,12 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM } else if ( aSeq[i].Name == SRCH_PARA_APPFLAG ) { - if ( aSeq[i].Value >>= nAppFlag ) + sal_uInt16 nTmp; + if ( aSeq[i].Value >>= nTmp ) + { + nAppFlag = static_cast<SvxSearchApp>(nTmp); ++nConvertedCount; + } } else if ( aSeq[i].Name == SRCH_PARA_ROWDIR ) { |