[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - sc/source

[Kohei Yoshida]

 sc/source/core/data/table2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aeebb0d20c6163ecbea47bb84fc83dd34b1438fa
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Jul 22 21:15:37 2012 +0200

    use correct source table for cond format paste, fdo#52340
    
    (cherry picked from commit 669784c6653732fd2ad43024332957d5df5652bb)
    
    Change-Id: I7c4cb1a5f31ba9e37a280af2243a13c57914cb2f
    Signed-off-by: Eike Rathke <erack at redhat.com>
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 18dfda4..9dd2afb 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -658,7 +658,7 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO
     ScConditionalFormatList* pOldCondFormatList = pTable->mpCondFormatList.get();
     for(SCCOL i = nCol1; i <= nCol2; ++i)
     {
-        ScAttrIterator* pIter = aCol[i-nDx].CreateAttrIterator( nRow1-nDy, nRow2-nDy );
+        ScAttrIterator* pIter = pTable->aCol[i-nDx].CreateAttrIterator( nRow1-nDy, nRow2-nDy );
         SCROW nStartRow = 0, nEndRow = 0;
         const ScPatternAttr* pPattern = pIter->Next( nStartRow, nEndRow );
         sal_uInt32 nId = ((SfxUInt32Item&)pPattern->GetItem(ATTR_CONDITIONAL)).GetValue();