#i12587# dump more DFF records

4 files changed, 45 insertions, 4 deletions

diff --git a/oox/inc/oox/dump/dffdumper.hxx b/oox/inc/oox/dump/dffdumper.hxx
index f986df19fa23..45d4879cc1c6 100644
--- a/oox/inc/oox/dump/dffdumper.hxx
+++ b/oox/inc/oox/dump/dffdumper.hxx
@@ -62,6 +62,8 @@ protected:
 private:
     void                constructDffObj();
 
+    sal_uInt32          dumpDffColor( const String& rName );
+
     sal_uInt16          dumpDffOptPropHeader();
     void                dumpDffOptPropValue( sal_uInt16 nPropId, sal_uInt32 nValue );
 
diff --git a/oox/source/dump/biffdumper.ini b/oox/source/dump/biffdumper.ini
index 6c5bbb00df07..a6273cad1b22 100644
--- a/oox/source/dump/biffdumper.ini
+++ b/oox/source/dump/biffdumper.ini
@@ -317,7 +317,7 @@ multilist=RECORD-NAMES-BIFF5
   # chart records
   exclude=0x1004,0x102D,0x102F,0x1036,0x1037,0x1038,0x103B
   0x1040=CHRADARAREA,CHAXESSET,,CHLEGENDENTRY,CHPROPERTIES,CHSERGROUP,CHUSEDAXESSETS,
-  0x1048=CHPIVOTREF,,CHSERPARENT,CHSERTRENDLINE,,,CHFORMAT,CHPOS
+  0x1048=CHPIVOTREF,,CHSERPARENT,CHSERTRENDLINE,,,CHFORMAT,CHFRAMEPOS
   0x1050=CHFORMATRUNS,CHSOURCELINK,,,,,,
   0x1058=,,,CHSERERRORBAR,,CHSERIESFORMAT,,
 end
@@ -827,10 +827,11 @@ end
 shortlist=CHPROPERTIES-EMPTYCELLS,0,do-not-plot,as-zero,interpolated
 
 flagslist=CHPROPERTIES-FLAGS
-  0x0001=manual-format
+  0x0001=manual-series
   0x0002=plot-visible-only
   0x0004=fixed-size
   0x0008=manual-plotarea
+  0x0010=apply-plotarea-pos
 end
 
 # CHSCATTER ------------------------------------------------------------------
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index d536bb35fbb9..d1cc719577d9 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -43,12 +43,14 @@ namespace {
 
 const sal_uInt16 DFF_ID_BSE                 = 0xF007;   /// BLIP store entry.
 const sal_uInt16 DFF_ID_BSTORECONTAINER     = 0xF001;   /// BLIP store container.
+const sal_uInt16 DFF_ID_CHILDANCHOR         = 0xF00F;   /// Child anchor (in groups).
 const sal_uInt16 DFF_ID_CLIENTANCHOR        = 0xF010;   /// Client anchor.
 const sal_uInt16 DFF_ID_DG                  = 0xF008;   /// Drawing.
 const sal_uInt16 DFF_ID_DGG                 = 0xF006;   /// Drawing group.
 const sal_uInt16 DFF_ID_OPT                 = 0xF00B;   /// Property set.
 const sal_uInt16 DFF_ID_SP                  = 0xF00A;   /// Shape.
 const sal_uInt16 DFF_ID_SPGR                = 0xF009;   /// Shape group.
+const sal_uInt16 DFF_ID_SPLITMENUCOLORS     = 0xF11E;   /// Current toolbar colors.
 
 } // namespace
 
@@ -85,6 +87,7 @@ void DffStreamObject::implWriteExtHeader()
         case DFF_ID_DG:                 pcListName = "DFFDG-RECORD-INST";           break;  // drawing ID
         case DFF_ID_OPT:                pcListName = "DFFOPT-RECORD-INST";          break;  // property count
         case DFF_ID_SP:                 pcListName = "DFFSP-RECORD-INST";           break;  // shape type
+        case DFF_ID_SPLITMENUCOLORS:    pcListName = "DFFSPLITMENUC-RECORD-INST";   break;  // number of colors
     }
     MultiItemsGuard aMultiGuard( out() );
     writeHexItem( "instance", mnInstVer, pcListName );
@@ -108,6 +111,13 @@ void DffStreamObject::implDumpRecordBody()
             dumpUnused( 2 );
         break;
 
+        case DFF_ID_CHILDANCHOR:
+            dumpDec< sal_uInt32 >( "left" );
+            dumpDec< sal_uInt32 >( "top" );
+            dumpDec< sal_uInt32 >( "right" );
+            dumpDec< sal_uInt32 >( "bottom" );
+        break;
+
         case DFF_ID_CLIENTANCHOR:
             implDumpClientAnchor();
         break;
@@ -130,7 +140,7 @@ void DffStreamObject::implDumpRecordBody()
                 MultiItemsGuard aMultiGuard( out() );
                 writeEmptyItem( "#cluster" );
                 dumpDec< sal_uInt32 >( "drawing-id" );
-                dumpHex< sal_uInt32 >( "max-shape-id", "CONV-DEC" );
+                dumpHex< sal_uInt32 >( "next-free-id", "CONV-DEC" );
             }
         }
         break;
@@ -159,6 +169,13 @@ void DffStreamObject::implDumpRecordBody()
             dumpDec< sal_uInt32 >( "right" );
             dumpDec< sal_uInt32 >( "bottom" );
         break;
+
+        case DFF_ID_SPLITMENUCOLORS:
+            dumpDffColor( "fill-color" );
+            dumpDffColor( "line-color" );
+            dumpDffColor( "shadow-color" );
+            dumpDffColor( "3d-color" );
+        break;
     }
 }
 
@@ -172,6 +189,11 @@ void DffStreamObject::constructDffObj()
     mnRealSize = 0;
 }
 
+sal_uInt32 DffStreamObject::dumpDffColor( const String& rName )
+{
+    return dumpHex< sal_uInt32 >( rName, "DFF-COLOR" );
+}
+
 sal_uInt16 DffStreamObject::dumpDffOptPropHeader()
 {
     MultiItemsGuard aMultiGuard( out() );
diff --git a/oox/source/dump/dffdumper.ini b/oox/source/dump/dffdumper.ini
index 5a7714a8c220..b38aabc2bc4f 100644
--- a/oox/source/dump/dffdumper.ini
+++ b/oox/source/dump/dffdumper.ini
@@ -25,6 +25,14 @@ constlist=DFF-RECORD-VERSION
   15=container
 end
 
+combilist=DFF-COLOR
+  0x000000FF=uint8,dec,red
+  0x0000FF00=uint8,dec,green
+  0x00FF0000=uint8,dec,blue
+  0x08000000=!rgb!scheme
+  ignore=0x10000000
+end
+
 # DFFBSE ---------------------------------------------------------------------
 
 combilist=DFFBSE-RECORD-INST
@@ -120,7 +128,7 @@ multilist=DFFOPT-PROPERTY-NAMES
   0x02D8=3dstyle-fill-light-y,3dstyle-fill-light-z,3dstyle-fill-light-intensity
   0x02FF=3dstyle-flags
   # shape 1
-  0x0301=,shape-master,,shape-connect-style,shape-bw-mod,shape-bw-mode-pure-bw,shape-bw-mode-bw
+  0x0300=,shape-master,,shape-connect-style,shape-bw-mod,shape-bw-mode-pure-bw,shape-bw-mode-bw
   0x033F=shape1-flags
   # callout
   0x0340=callout-type,callout-box-distance,callout-angle,callout-drop-type,callout-drop-distance,callout-length
@@ -314,5 +322,13 @@ flagslist=DFFSP-FLAGS
   0x00000800=has-shape-type
 end
 
+# DFFSPLITMENUCOLORS ---------------------------------------------------------
+
+
+combilist=DFFSPLITMENUC-RECORD-INST
+  include=DFF-RECORD-INST
+  0xFFF0=uint16,dec,color-count
+end
+
 # ============================================================================