[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source

[Markus Mohrhard]

 sc/source/filter/oox/sheetdatabuffer.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8c4f9aff76e931613c3e6a99879c2b5353231853
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Nov 2 17:04:34 2013 +0100

    remember column style during XLSX import, fdo#70315
    
    WE overwrote the column style that was set earlier with the default
    style.
    
    Change-Id: I4c02e1cdd3e72f27d75b8153e2af45b5658ff456
    (cherry picked from commit 512a14438c4098ca2e30d0b10b6e18506c8475f1)
    Reviewed-on: https://gerrit.libreoffice.org/6528
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 174842a..2b9f4ce 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -50,6 +50,7 @@
 #include "document.hxx"
 #include "scitems.hxx"
 #include "formulacell.hxx"
+#include "docpool.hxx"
 
 namespace oox {
 namespace xls {
@@ -468,7 +469,8 @@ void SheetDataBuffer::finalizeImport()
         {
             ScAttrEntry aEntry;
             aEntry.nRow = MAXROW;
-            aEntry.pPattern = rDoc.GetDefPattern();
+            aEntry.pPattern = rDoc.GetPattern(nScCol, 0, getSheetIndex());
+            rDoc.GetPool()->Put(*aEntry.pPattern);
             aAttrs.push_back(aEntry);
         }