diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-03-21 22:41:51 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-22 07:01:44 +0000 |
| commit | a7ba6358eec442aaa28fdd952102dbd10ca2569e (patch) | |
| tree | 17ac873181eb64519a70201a0e82a0456801f65f /sc/source/filter/oox/workbookhelper.cxx | |
| parent | tdf#84323: Make osl::Condition::wait more readable (diff) | |
| download | core-a7ba6358eec442aaa28fdd952102dbd10ca2569e.tar.gz core-a7ba6358eec442aaa28fdd952102dbd10ca2569e.zip | |
tdf#84938 replace #define with scoped typed_flags
'RangeType' becomes 'Type', goes into ScRangeData
and is strongly typed now.
This revealed a misuse of RangeType in vbanames.cxx where
the uno equivalent was expected, but it had no impact because
both values were 0.
Change-Id: I0b4764d1411c709a1faa243ec70afeb160410990
Reviewed-on: https://gerrit.libreoffice.org/23415
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source/filter/oox/workbookhelper.cxx')
| -rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 05d904dde711..62bc87d0bc43 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -372,11 +372,11 @@ namespace { ScRangeData* lcl_addNewByNameAndTokens( ScDocument& rDoc, ScRangeName* pNames, const OUString& rName, const Sequence<FormulaToken>& rTokens, sal_Int16 nIndex, sal_Int32 nUnoType ) { bool bDone = false; - sal_uInt16 nNewType = RT_NAME; - if ( nUnoType & NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA; - if ( nUnoType & NamedRangeFlag::PRINT_AREA ) nNewType |= RT_PRINTAREA; - if ( nUnoType & NamedRangeFlag::COLUMN_HEADER ) nNewType |= RT_COLHEADER; - if ( nUnoType & NamedRangeFlag::ROW_HEADER ) nNewType |= RT_ROWHEADER; + ScRangeData::Type nNewType = ScRangeData::Type::Name; + if ( nUnoType & NamedRangeFlag::FILTER_CRITERIA ) nNewType |= ScRangeData::Type::Criteria; + if ( nUnoType & NamedRangeFlag::PRINT_AREA ) nNewType |= ScRangeData::Type::PrintArea; + if ( nUnoType & NamedRangeFlag::COLUMN_HEADER ) nNewType |= ScRangeData::Type::ColHeader; + if ( nUnoType & NamedRangeFlag::ROW_HEADER ) nNewType |= ScRangeData::Type::RowHeader; ScTokenArray aTokenArray; (void)ScTokenConversion::ConvertToTokenArray( rDoc, aTokenArray, rTokens ); ScRangeData* pNew = new ScRangeData( &rDoc, rName, aTokenArray, ScAddress(), nNewType ); |