1 files changed, 16 insertions, 18 deletions
diff --git a/oox/source/dump/oledumper.ini b/oox/source/dump/oledumper.ini
index 96433d63c7fa..c398b0c01e51 100644
--- a/oox/source/dump/oledumper.ini
+++ b/oox/source/dump/oledumper.ini
@@ -115,8 +115,12 @@ end
 {0713E8D2-850A-101B-AFC0-4210102A8DA7}=COMCTL.ProgCtrl.1
 
 combilist=OCX-COLOR
+  0x0000FFFF=uint32,dec,palette-index,,filter=0xFF000000~0x01000000
+  0x000000FF=uint32,dec,red,,filter=0xFF000000~0x00000000,filter=0xFF000000~0x02000000
+  0x0000FF00=uint32,dec,green,,filter=0xFF000000~0x00000000,filter=0xFF000000~0x02000000
+  0x00FF0000=uint32,dec,blue,,filter=0xFF000000~0x00000000,filter=0xFF000000~0x02000000
+  0x0000FFFF=uint32,dec,system-color,SYSTEMCOLOR,filter=0xFF000000~0x80000000
   0xFF000000=uint8,dec,type,OCX-COLORTYPE
-  0x00FFFFFF=uint32,hex,value
 end
 
 constlist=OCX-COLORTYPE
@@ -126,13 +130,6 @@ constlist=OCX-COLORTYPE
   0x80=system-color
 end
 
-multilist=OCX-SYSTEMCOLOR
-  0x00=scrollbar,desktop,active-title,inactive-title,menubar,window-back,window-frame,menu-text
-  0x08=window-text,active-title-text,active-border,inactive-border,app-workspace,highlight,highlight-text,button-face
-  0x10=button-shadow,disabled-text,button-text,inactive-title-text,button-highlight,button-dark-shadow,button-light-shadow,tooltip-text
-  0x18=tooltip-back
-end
-
 combilist=OCX-STRINGLEN
   0x80000000=!unicode!compressed
   0x7FFFFFFF=int32,dec,buffer-size
@@ -543,16 +540,6 @@ flagslist=OCX-FORMSITE-FLAGS
   0x00040000=container
 end
 
-combilist=OCX-FORMSITE-CLASSIDCACHE
-  0x7FFF=uint16,dec,cache-idx,OCX-FORMSITE-CLASSIDCACHEINDEX
-  0x8000=!predefined-class-id!class-table-index
-end
-
-constlist=OCX-FORMSITE-CLASSIDCACHEINDEX
-  default=
-  0x7FFF=invalid
-end
-
 constlist=OCX-FORMSITE-CLASSNAMES
   7=Forms.Form.1
   12=Forms.Image.1
@@ -572,6 +559,17 @@ constlist=OCX-FORMSITE-CLASSNAMES
   57=Forms.MultiPage.1
 end
 
+constlist=OCX-FORMSITE-CLASSIDCACHEINDEX
+  include=OCX-FORMSITE-CLASSNAMES
+  0x7FFF=invalid
+end
+
+combilist=OCX-FORMSITE-CLASSIDCACHE
+  0x7FFF=uint16,dec,cache-idx,OCX-FORMSITE-CLASSIDCACHEINDEX,filter=0x8000~0x0000
+  0x7FFF=uint16,dec,class-table-idx,,filter=0x8000~0x8000
+  0x8000=!predefined-class-id!class-table-index
+end
+
 # form design extender  ------------------------------------------------------
 
 flagslist=OCX-FORMDESIGNEXT-PROPERTIES