diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index 20686d0ec157..122e5911fd15 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -130,6 +130,8 @@ for d in definitionSet:
          "include/svtools/htmltokn.h",
          "include/sfx2/sidebar/Theme.hxx", # ThemeItem
          "sc/source/ui/docshell/impex.cxx", # SylkVersion
+         "include/rsc/rsc-vcl-shared-types.hxx", # KeyFuncType
+         "include/i18nutil/paper.hxx", # Paper
         # Windows or OSX only
          "include/canvas/rendering/icolorbuffer.hxx",
          "include/vcl/commandevent.hxx",
diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx
index 3603cde25c76..3e238872ece7 100644
--- a/include/rsc/rsc-vcl-shared-types.hxx
+++ b/include/rsc/rsc-vcl-shared-types.hxx
@@ -94,20 +94,12 @@ enum class SymbolType : sal_uInt16
     PAGEUP           = 14,
     PAGEDOWN         = 15,
     PLAY             = 16,
-    REVERSEPLAY      = 17,
-    RECORD           = 18,
     STOP             = 19,
-    PAUSE            = 20,
-    WINDSTART        = 21,
-    WINDEND          = 22,
-    WINDBACKWARD     = 23,
-    WINDFORWARD      = 24,
     CLOSE            = 25,
     ROLLUP           = 26,
     ROLLDOWN         = 27,
     CHECKMARK        = 28,
     RADIOCHECKMARK   = 29,
-    SPIN_UPDOWN      = 30,
     FLOAT            = 31,
     DOCK             = 32,
     HIDE             = 33,
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 46b8d78adbb6..70589e9f05dc 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -145,7 +145,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
         case SymbolType::SPIN_LEFT:
         case SymbolType::FIRST:
         case SymbolType::PREV:
-        case SymbolType::REVERSEPLAY:
             nRect.Left() += n4;
             if ( eType==SymbolType::FIRST )
             {
@@ -209,7 +208,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
             break;
 
         case SymbolType::RADIOCHECKMARK:
-        case SymbolType::RECORD:
             {
                 // Midpoint circle algorithm
                 long x = 0;
@@ -245,49 +243,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
             pDev->DrawRect( nRect );
             break;
 
-        case SymbolType::PAUSE:
-            pDev->DrawRect( Rectangle ( nRect.Left(), nRect.Top(),
-                                        aCenter.X()-n8, nRect.Bottom() ) );
-            pDev->DrawRect( Rectangle ( aCenter.X()+n8, nRect.Top(),
-                                        nRect.Right(), nRect.Bottom() ) );
-            break;
-
-        case SymbolType::WINDSTART:
-            pDev->DrawLine( Point( nRect.Left(), aCenter.Y()-n2+1 ),
-                            Point( nRect.Left(), aCenter.Y()+n2-1 ) );
-            ++nRect.Left();
-            SAL_FALLTHROUGH;
-        case SymbolType::WINDBACKWARD:
-            pDev->DrawPixel( Point( nRect.Left(), aCenter.Y() ) );
-            pDev->DrawPixel( Point( nRect.Left()+n2, aCenter.Y() ) );
-            for ( long i=1; i < n2; ++i )
-            {
-                ++nRect.Left();
-                pDev->DrawLine( Point( nRect.Left(), aCenter.Y()-i ),
-                                Point( nRect.Left(), aCenter.Y()+i ) );
-                pDev->DrawLine( Point( nRect.Left()+n2, aCenter.Y()-i ),
-                                Point( nRect.Left()+n2, aCenter.Y()+i ) );
-            }
-            break;
-
-        case SymbolType::WINDEND:
-            pDev->DrawLine( Point( nRect.Right(), aCenter.Y()-n2+1 ),
-                            Point( nRect.Right(), aCenter.Y()+n2-1 ) );
-            --nRect.Right();
-            SAL_FALLTHROUGH;
-        case SymbolType::WINDFORWARD:
-            pDev->DrawPixel( Point( nRect.Right(), aCenter.Y() ) );
-            pDev->DrawPixel( Point( nRect.Right()-n2, aCenter.Y() ) );
-            for ( long i=1; i < n2; ++i )
-            {
-                --nRect.Right();
-                pDev->DrawLine( Point( nRect.Right(), aCenter.Y()-i ),
-                                Point( nRect.Right(), aCenter.Y()+i ) );
-                pDev->DrawLine( Point( nRect.Right()-n2, aCenter.Y()-i ),
-                                Point( nRect.Right()-n2, aCenter.Y()+i ) );
-            }
-            break;
-
         case SymbolType::CLOSE:
             pDev->DrawLine( Point( nRect.Left(), nRect.Top() ),
                             Point( nRect.Right(), nRect.Bottom() ) );
@@ -356,20 +311,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
             }
             break;
 
-        case SymbolType::SPIN_UPDOWN:
-            pDev->DrawPixel( Point( aCenter.X(), nRect.Top() ) );
-            pDev->DrawPixel( Point( aCenter.X(), nRect.Bottom() ) );
-            for ( long i=1; i < n2; ++i )
-            {
-                ++nRect.Top();
-                --nRect.Bottom();
-                pDev->DrawLine( Point( aCenter.X()-i, nRect.Top() ),
-                                Point( aCenter.X()+i, nRect.Top() ) );
-                pDev->DrawLine( Point( aCenter.X()-i, nRect.Bottom() ),
-                                Point( aCenter.X()+i, nRect.Bottom() ) );
-            }
-            break;
-
         case SymbolType::FLOAT:
             nRect.Right() -= n4;
             nRect.Top() += n4+1;