mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert PropType to scoped enum

Browse Source 
and drop unused values

Change-Id: Ied5a5aa9c98417b873eeea28fb126f815e742159
Reviewed-on: https://gerrit.libreoffice.org/63947
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-11-23 12:25:37 +02:00
parent d82349e3fc
commit 52f0aaa9c6
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compilerplugins/clang/unusedenumconstants.readonly.results
View File

@@ -1138,12 +1138,6 @@ o3tl/qa/test-enumarray.cxx:30
enum MyEnum TWO enum MyEnum TWO
o3tl/qa/test-typed_flags.cxx:19 o3tl/qa/test-typed_flags.cxx:19
enum ConfigurationChangedHint TWO enum ConfigurationChangedHint TWO
oox/source/dump/dffdumper.cxx:157
enum oox::dump::(anonymous namespace)::PropType PROPTYPE_COLORARRAY
oox/source/dump/dffdumper.cxx:157
enum oox::dump::(anonymous namespace)::PropType PROPTYPE_STRING
oox/source/dump/dffdumper.cxx:157
enum oox::dump::(anonymous namespace)::PropType PROPTYPE_BLIP
reportdesign/inc/conditionalexpression.hxx:78 reportdesign/inc/conditionalexpression.hxx:78
enum rptui::ComparisonOperation eNotBetween enum rptui::ComparisonOperation eNotBetween
reportdesign/inc/conditionalexpression.hxx:79 reportdesign/inc/conditionalexpression.hxx:79

16
oox/source/dump/dffdumper.cxx
View File

@@ -154,7 +154,7 @@ sal_uInt32 DffStreamObject::dumpDffSimpleColor( const String& rName )
namespace { namespace {
enum PropType { PROPTYPE_BINARY, PROPTYPE_STRING, PROPTYPE_BLIP, PROPTYPE_COLORARRAY }; enum class PropType { Binary };
struct PropInfo struct PropInfo
{ {
@@ -185,7 +185,7 @@ void DffStreamObject::dumpDffOpt()
if( getFlag( nPropId, DFF_OPT_COMPLEX ) ) if( getFlag( nPropId, DFF_OPT_COMPLEX ) )
{ {
writeHexItem( "complex-size", nValue, "CONV-DEC" ); writeHexItem( "complex-size", nValue, "CONV-DEC" );
aPropInfos.emplace_back( String( "property-data" ), PROPTYPE_BINARY, nBaseId, nValue ); aPropInfos.emplace_back( String( "property-data" ), PropType::Binary, nBaseId, nValue );
} }
else else
{ {
@@ -205,18 +205,10 @@ void DffStreamObject::dumpDffOpt()
IndentGuard aIndent( mxOut ); IndentGuard aIndent( mxOut );
switch(propInfo.meType) switch(propInfo.meType)
{ {
case PROPTYPE_BINARY: case PropType::Binary:
dumpBinary( propInfo.maName, propInfo.mnSize );
break;
case PROPTYPE_STRING:
dumpUnicodeArray( propInfo.maName, propInfo.mnSize / 2, true );
break;
case PROPTYPE_BLIP:
dumpBinary( propInfo.maName, propInfo.mnSize );
break;
case PROPTYPE_COLORARRAY:
dumpBinary( propInfo.maName, propInfo.mnSize ); dumpBinary( propInfo.maName, propInfo.mnSize );
break; break;
default: assert(false && "missing implementation?");
} }
} }
} }