[Libreoffice-commits] core.git: compilerplugins/clang oox/source

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.readonly.results |    6 ----
 oox/source/dump/dffdumper.cxx                              |   16 +++----------
 2 files changed, 4 insertions(+), 18 deletions(-)

New commits:
commit 52f0aaa9c600dbe8c078fb1d2212e8cea675cd40
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Nov 23 12:25:37 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Nov 25 12:09:20 2018 +0100

    convert PropType to scoped enum
    
    and drop unused values
    
    Change-Id: Ied5a5aa9c98417b873eeea28fb126f815e742159
    Reviewed-on: https://gerrit.libreoffice.org/63947
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index d736f3a52147..1a957e060883 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1138,12 +1138,6 @@ o3tl/qa/test-enumarray.cxx:30
     enum MyEnum TWO
 o3tl/qa/test-typed_flags.cxx:19
     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
     enum rptui::ComparisonOperation eNotBetween
 reportdesign/inc/conditionalexpression.hxx:79
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index f3d760f23a02..9fe67ca16671 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -154,7 +154,7 @@ sal_uInt32 DffStreamObject::dumpDffSimpleColor( const String& rName )
 
 namespace {
 
-enum PropType { PROPTYPE_BINARY, PROPTYPE_STRING, PROPTYPE_BLIP, PROPTYPE_COLORARRAY };
+enum class PropType { Binary };
 
 struct PropInfo
 {
@@ -185,7 +185,7 @@ void DffStreamObject::dumpDffOpt()
         if( getFlag( nPropId, DFF_OPT_COMPLEX ) )
         {
             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
         {
@@ -205,18 +205,10 @@ void DffStreamObject::dumpDffOpt()
         IndentGuard aIndent( mxOut );
         switch(propInfo.meType)
         {
-            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:
+            case PropType::Binary:
                 dumpBinary( propInfo.maName, propInfo.mnSize );
             break;
+            default: assert(false && "missing implementation?");
         }
     }
 }