diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-04-06 16:25:25 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 16:27:38 +0200 |
| commit | 570200983a0eded4a4d3bfcefc6a4cfa3d388f1d (patch) | |
| tree | 3714a4e2aba7d18955b03801b570589bb319bb6f | |
| parent | ac6773e1e3e1382990c0f1942001b8b07cdc4682 (diff) | |
import dxf protection record from xls, related fdo#76209
Change-Id: Ic8b4cd30b383763b034942d5a80914340d416c28
| -rw-r--r-- | sc/source/filter/excel/xicontent.cxx | 9 | ||||
| -rw-r--r-- | sc/source/filter/inc/xlcontent.hxx | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 4016929e94dd..8e45697bfbf9 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -614,6 +614,15 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm ) aArea.FillToItemSet( rStyleItemSet, rPalette ); } + if( get_flag( nFlags, EXC_CF_BLOCK_PROTECTION ) ) + { + sal_uInt16 nCellProt; + rStrm >> nCellProt; + XclImpCellProt aCellProt; + aCellProt.FillFromXF3(nCellProt); + aCellProt.FillToItemSet( rStyleItemSet ); + } + // *** formulas *** const ScAddress& rPos = maRanges.front()->aStart; // assured above that maRanges is not empty diff --git a/sc/source/filter/inc/xlcontent.hxx b/sc/source/filter/inc/xlcontent.hxx index 3e0fefc6c5f7..2dfe0662fcfe 100644 --- a/sc/source/filter/inc/xlcontent.hxx +++ b/sc/source/filter/inc/xlcontent.hxx @@ -85,6 +85,7 @@ const sal_uInt32 EXC_CF_BLOCK_FONT = 0x04000000; /// Font block prese const sal_uInt32 EXC_CF_BLOCK_ALIGNMENT = 0x08000000; /// Alignment block present? const sal_uInt32 EXC_CF_BLOCK_BORDER = 0x10000000; /// Border block present? const sal_uInt32 EXC_CF_BLOCK_AREA = 0x20000000; /// Pattern block present? +const sal_uInt32 EXC_CF_BLOCK_PROTECTION = 0x20000000; /// Protection block present? const sal_uInt32 EXC_CF_IFMT_USER = 0x1; /// NumberFormat String or Id? const sal_uInt32 EXC_CF_FONT_STYLE = 0x00000002; /// Font posture or weight modified? |