summaryrefslogtreecommitdiff
path: root/sc/source/filter/excel/xestring.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-10-30 15:33:25 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-10-31 07:36:42 +0100
commit05fbb25379516f529dde9400104d402c51ec2f2c (patch)
treef3ea02826a8856fac2de66c08414ecd9d7a6924a /sc/source/filter/excel/xestring.cxx
parent7fed35ff43d6e8c1e838c6fe582edd308692bab0 (diff)
convert XclStrFlags to scoped enum
Change-Id: I1127e8231820d093cddc87762dc5d3735c3fce7b Reviewed-on: https://gerrit.libreoffice.org/44055 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/filter/excel/xestring.cxx')
-rw-r--r--sc/source/filter/excel/xestring.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index b7129b7e6e28..1b92cf17c905 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -115,7 +115,7 @@ void XclExpString::Assign( const OUString& rString, XclStrFlags nFlags, sal_uInt
void XclExpString::Assign( sal_Unicode cChar )
{
- Build( &cChar, 1, EXC_STR_DEFAULT, EXC_STR_MAXLEN );
+ Build( &cChar, 1, XclStrFlags::NONE, EXC_STR_MAXLEN );
}
void XclExpString::AssignByte(
@@ -496,12 +496,12 @@ void XclExpString::CharsToBuffer( const sal_Char* pcSource, sal_Int32 nBegin, sa
void XclExpString::Init( sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMaxLen, bool bBiff8 )
{
mbIsBiff8 = bBiff8;
- mbIsUnicode = bBiff8 && ::get_flag( nFlags, EXC_STR_FORCEUNICODE );
- mb8BitLen = ::get_flag( nFlags, EXC_STR_8BITLENGTH );
- mbSmartFlags = bBiff8 && ::get_flag( nFlags, EXC_STR_SMARTFLAGS );
- mbSkipFormats = ::get_flag( nFlags, EXC_STR_SEPARATEFORMATS );
+ mbIsUnicode = bBiff8 && ( nFlags & XclStrFlags::ForceUnicode );
+ mb8BitLen = bool( nFlags & XclStrFlags::EightBitLength );
+ mbSmartFlags = bBiff8 && ( nFlags & XclStrFlags::SmartFlags );
+ mbSkipFormats = bool( nFlags & XclStrFlags::SeparateFormats );
mbWrapped = false;
- mbSkipHeader = ::get_flag( nFlags, EXC_STR_NOHEADER );
+ mbSkipHeader = bool( nFlags & XclStrFlags::NoHeader );
mnMaxLen = nMaxLen;
SetStrLen( nCurrLen );