[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source

[Markus Mohrhard]

 sc/source/filter/excel/xetable.cxx |    2 +-
 sc/source/filter/inc/xltable.hxx   |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 74da8ee082dd4a7c2073a6174589174ec42ce9b1
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jul 28 23:22:03 2016 +0200

    write the customWidth property also to XLS
    
    Change-Id: I3d12e141e1cf6c70c3fbae7b6fb25a2fabeed77b
    (cherry picked from commit 776544f5e9b58a3fa05a9559c0fe9f678b2076c2)
    Reviewed-on: https://gerrit.libreoffice.org/31660
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index bb553a4..239c9a6 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1620,9 +1620,9 @@ XclExpColinfo::XclExpColinfo( const XclExpRoot& rRoot,
     // column flags
     ::set_flag( mnFlags, EXC_COLINFO_HIDDEN, rDoc.ColHidden(nScCol, nScTab) );
 
-    // TODO Do we need to save customWidth information also for .xls (with mnFlags)?
     XclExpDefcolwidth defColWidth = XclExpDefcolwidth( rRoot );
     mbCustomWidth = !defColWidth.IsDefWidth( mnWidth );
+    set_flag(mnFlags, EXC_COLINFO_CUSTOMWIDTH, mbCustomWidth);
 
     // outline data
     rOutlineBfr.Update( nScCol );
diff --git a/sc/source/filter/inc/xltable.hxx b/sc/source/filter/inc/xltable.hxx
index c3beff0..4d06dd2 100644
--- a/sc/source/filter/inc/xltable.hxx
+++ b/sc/source/filter/inc/xltable.hxx
@@ -141,6 +141,7 @@ const sal_uInt16 EXC_DEFCOLWIDTH_DEF        = 10;
 const sal_uInt16 EXC_ID_COLINFO             = 0x007D;
 
 const sal_uInt16 EXC_COLINFO_HIDDEN         = 0x0001;
+const sal_uInt16 EXC_COLINFO_CUSTOMWIDTH    = 0x0002;
 const sal_uInt16 EXC_COLINFO_COLLAPSED      = 0x1000;
 
 // (0x0080) GUTS --------------------------------------------------------------