diff options
| author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-12-02 19:15:45 +0100 |
|---|---|---|
| committer | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-12-02 19:15:45 +0100 |
| commit | fa8c84eb5613359b47fd324b749e7a516d5e8316 (patch) | |
| tree | 0761ce8e93e3ae0486ab822d2f1a2542260a0830 /oox/inc | |
| parent | 9c16b686c71855df1bbcbf1bcc4b175c48abb49c (diff) | |
chart46: #i85310# support for chart date axes in Excel filters: BIFF8 import/export, OOXML import
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/drawingml/chart/axismodel.hxx | 4 | ||||
| -rw-r--r-- | oox/inc/oox/xls/biffhelper.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/oox/inc/oox/drawingml/chart/axismodel.hxx b/oox/inc/oox/drawingml/chart/axismodel.hxx index 8bab84257eee..e70223854f3c 100644 --- a/oox/inc/oox/drawingml/chart/axismodel.hxx +++ b/oox/inc/oox/drawingml/chart/axismodel.hxx @@ -77,9 +77,9 @@ struct AxisModel OptValue< double > mofLogBase; /// Logarithmic base for logarithmic axes. OptValue< double > mofMax; /// Maximum axis value. OptValue< double > mofMin; /// Minimum axis value. + OptValue< sal_Int32 > monBaseTimeUnit; /// Base time unit shown on a date axis. sal_Int32 mnAxisId; /// Unique axis identifier. sal_Int32 mnAxisPos; /// Position of the axis (top/bottom/left/right). - sal_Int32 mnBaseTimeUnit; /// Base time unit shown on a date axis. sal_Int32 mnCrossAxisId; /// Identifier of a crossing axis. sal_Int32 mnCrossBetween; /// This value axis crosses between or inside category. sal_Int32 mnCrossMode; /// Mode this axis crosses another axis (min, max, auto). @@ -94,7 +94,7 @@ struct AxisModel sal_Int32 mnTickLabelSkip; /// Number of tick mark labels to skip. sal_Int32 mnTickMarkSkip; /// Number of tick marks to skip. sal_Int32 mnTypeId; /// Type identifier of this axis. - bool mbAuto; /// True = automatic axis settings. + bool mbAuto; /// True = automatic selection of text/date axis type. bool mbDeleted; /// True = axis has been deleted manually. bool mbNoMultiLevel; /// True = no multi-level categories supported. diff --git a/oox/inc/oox/xls/biffhelper.hxx b/oox/inc/oox/xls/biffhelper.hxx index ce43e44fb613..6e4952095d75 100644 --- a/oox/inc/oox/xls/biffhelper.hxx +++ b/oox/inc/oox/xls/biffhelper.hxx @@ -290,6 +290,7 @@ const sal_uInt16 BIFF_ID_CHCHART = 0x1002; const sal_uInt16 BIFF_ID_CHCHART3D = 0x103A; const sal_uInt16 BIFF_ID_CHCHARTLINE = 0x101C; const sal_uInt16 BIFF_ID_CHDATAFORMAT = 0x1006; +const sal_uInt16 BIFF_ID_CHDATERANGE = 0x1062; const sal_uInt16 BIFF_ID_CHDEFAULTTEXT = 0x1024; const sal_uInt16 BIFF_ID_CHDROPBAR = 0x103D; const sal_uInt16 BIFF_ID_CHECKCOMPAT = 0x088C; @@ -314,7 +315,6 @@ const sal_uInt16 BIFF_ID_CHFRTEXTPROPS = 0x08A5; const sal_uInt16 BIFF_ID_CHFRUNITPROPS = 0x0857; const sal_uInt16 BIFF_ID_CHFRWRAPPER = 0x0851; const sal_uInt16 BIFF_ID_CHLABELRANGE = 0x1020; -const sal_uInt16 BIFF_ID_CHLABELRANGE2 = 0x1062; const sal_uInt16 BIFF_ID_CHLEGEND = 0x1015; const sal_uInt16 BIFF_ID_CHLINE = 0x1018; const sal_uInt16 BIFF_ID_CHLINEFORMAT = 0x1007; |