dr78: rebase to DEV300_m101

2 files changed, 28 insertions, 26 deletions

diff --git a/oox/source/dump/biffdumper.cxx b/oox/source/dump/biffdumper.cxx
index 54e1fad7febc..7974a66ba250 100644
--- a/oox/source/dump/biffdumper.cxx
+++ b/oox/source/dump/biffdumper.cxx
@@ -1755,6 +1755,18 @@ void WorkbookStreamObject::implDumpRecordBody()
             if( eBiff >= BIFF5 ) dumpHex< sal_uInt16 >( "flags", "CHDATAFORMAT-FLAGS" );
         break;
 
+        case BIFF_ID_CHDATERANGE:
+            dumpDec< sal_uInt16 >( "minimum-date" );
+            dumpDec< sal_uInt16 >( "maximum-date" );
+            dumpDec< sal_uInt16 >( "major-unit-value" );
+            dumpDec< sal_uInt16 >( "major-unit", "CHDATERANGE-UNIT" );
+            dumpDec< sal_uInt16 >( "minor-unit-value" );
+            dumpDec< sal_uInt16 >( "minor-unit", "CHDATERANGE-UNIT" );
+            dumpDec< sal_uInt16 >( "base-unit", "CHDATERANGE-UNIT" );
+            dumpDec< sal_uInt16 >( "axis-crossing-date" );
+            dumpHex< sal_uInt16 >( "flags", "CHDATERANGE-FLAGS" );
+        break;
+
         case BIFF_ID_CHECKCOMPAT:
             dumpFrHeader( true, true );
             dumpBool< sal_uInt32 >( "check-compatibility" );
@@ -1884,18 +1896,6 @@ void WorkbookStreamObject::implDumpRecordBody()
             dumpHex< sal_uInt16 >( "flags", "CHLABELRANGE-FLAGS" );
         break;
 
-        case BIFF_ID_CHLABELRANGE2:
-            dumpDec< sal_uInt16 >( "minimum-categ" );
-            dumpDec< sal_uInt16 >( "maximum-categ" );
-            dumpDec< sal_uInt16 >( "major-unit-value" );
-            dumpDec< sal_uInt16 >( "major-unit" );
-            dumpDec< sal_uInt16 >( "minor-unit-value" );
-            dumpDec< sal_uInt16 >( "minor-unit" );
-            dumpDec< sal_uInt16 >( "base-unit" );
-            dumpDec< sal_uInt16 >( "axis-crossing-date" );
-            dumpHex< sal_uInt16 >( "flags", "CHLABELRANGE2-FLAGS" );
-        break;
-
         case BIFF_ID_CHLEGEND:
             dumpRect< sal_Int32 >( "position", (eBiff <= BIFF4) ? "CONV-TWIP-TO-CM" : "" );
             dumpDec< sal_uInt8 >( "docked-pos", "CHLEGEND-DOCKPOS" );
diff --git a/oox/source/dump/biffdumper.ini b/oox/source/dump/biffdumper.ini
index c4bbe79a2612..02f70261ee0d 100644
--- a/oox/source/dump/biffdumper.ini
+++ b/oox/source/dump/biffdumper.ini
@@ -397,7 +397,7 @@ multilist=RECORD-NAMES-BIFF8
   0x08A0=,,,FORCEFULLCALC,CHFRSHAPEPROPS,CHFRTEXTPROPS,,CHFRPLOTAREALAYOUT
   # chart records
   0x1058=,,,,,,,CH3DDATAFORMAT
-  0x1060=CHFONTBASE,CHPIEEXT,CHLABELRANGE2,CHDATATABLE,CHPLOTGROWTH,CHSERINDEX,CHESCHERFORMAT,CHPIEEXTSETT
+  0x1060=CHFONTBASE,CHPIEEXT,CHDATERANGE,CHDATATABLE,CHPLOTGROWTH,CHSERINDEX,CHESCHERFORMAT,CHPIEEXTSETT
 end
 
 # simple records -------------------------------------------------------------
@@ -821,6 +821,21 @@ flagslist=CHDATAFORMAT-FLAGS
   0x0001=excel4-colors
 end
 
+# CHDATERANGE ----------------------------------------------------------------
+
+shortlist=CHDATERANGE-UNIT,0,days,months,years
+
+flagslist=CHDATERANGE-FLAGS
+  0x0001=auto-minimum
+  0x0002=auto-maximum
+  0x0004=auto-major
+  0x0008=auto-minor
+  0x0010=date-axis
+  0x0020=auto-base
+  0x0040=auto-axis-cross
+  0x0080=auto-date
+end
+
 # CHFRAME --------------------------------------------------------------------
 
 shortlist=CHFRAME-FORMAT,0,standard,,,,shadow
@@ -977,19 +992,6 @@ flagslist=CHLABELRANGE-FLAGS
   0x0004=reverse-order
 end
 
-# CHLABELRANGE2 --------------------------------------------------------------
-
-flagslist=CHLABELRANGE2-FLAGS
-  0x0001=auto-minimum
-  0x0002=auto-maximum
-  0x0004=auto-major
-  0x0008=auto-minor
-  0x0010=date-axis
-  0x0020=auto-base
-  0x0040=auto-axis-cross
-  0x0080=auto-date
-end
-
 # CHLEGEND -------------------------------------------------------------------
 
 shortlist=CHLEGEND-DOCKPOS,0,bottom,top-right,top,right,left,,,manual