diff options
| author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-12-17 12:09:17 +0100 |
|---|---|---|
| committer | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-12-17 12:09:17 +0100 |
| commit | a25f4715687671a2cdeb1c7e07df02e21bd46758 (patch) | |
| tree | 54f618019256d07bed67be8565f153b081fe6a6a /oox/inc | |
| parent | 70ec19ae3cbf881388c0011e0c4aa132bece311c (diff) | |
dr78: #i71453# BIFF2: use formatting information from cell records if XF records are missing
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/xls/sheetdatacontext.hxx | 1 | ||||
| -rw-r--r-- | oox/inc/oox/xls/stylesbuffer.hxx | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/oox/inc/oox/xls/sheetdatacontext.hxx b/oox/inc/oox/xls/sheetdatacontext.hxx index a77f4b285fa4..fec8b7db89cb 100644 --- a/oox/inc/oox/xls/sheetdatacontext.hxx +++ b/oox/inc/oox/xls/sheetdatacontext.hxx @@ -163,6 +163,7 @@ private: sal_uInt32 mnFormulaIgnoreSize; /// Number of bytes to be ignored in FORMULA record. sal_uInt32 mnArrayIgnoreSize; /// Number of bytes to be ignored in ARRAY record. sal_uInt16 mnBiff2XfId; /// Current XF identifier from IXFE record. + OptValue< bool > mobBiff2HasXfs; /// Select XF formatting or direct formatting in BIFF2. }; // ============================================================================ diff --git a/oox/inc/oox/xls/stylesbuffer.hxx b/oox/inc/oox/xls/stylesbuffer.hxx index 4fa9c964108e..b597546f8484 100644 --- a/oox/inc/oox/xls/stylesbuffer.hxx +++ b/oox/inc/oox/xls/stylesbuffer.hxx @@ -787,6 +787,11 @@ public: /** Writes all formatting attributes to the passed property set. */ void writeToPropertySet( PropertySet& rPropSet ) const; + /** Converts formatting information from BIFF2 cell record data directly. */ + static void writeBiff2CellFormatToPropertySet( + const WorkbookHelper& rHelper, PropertySet& rPropSet, + sal_uInt8 nFlags1, sal_uInt8 nFlags2, sal_uInt8 nFlags3 ); + private: /** Sets 'attribute used' flags from the passed BIFF bit field. */ void setBiffUsedFlags( sal_uInt8 nUsedFlags ); |