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

Markus Mohrhard mmohrhard at kemper.freedesktop.org
Wed Jun 29 13:19:03 PDT 2011


 sc/source/core/data/dpobject.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 0292da5929768cb7324821947379aad625ed41e4
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Mon Jun 27 13:35:01 2011 +0200

    fdo#38456: Always set column offset to 0
    
    Setting it to anything else moves field indexes off-by-N and causes crash
    in some cases (the original code has been unused since 2004 at least)
    
    Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 472c451..93bfebb 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1860,9 +1860,6 @@ sal_Bool ScDPObject::FillOldParam(ScPivotParam& rParam) const
     // ppLabelArr / nLabels is not changed
 
     SCCOL nSrcColOffset = 0;
-    if (IsSheetData())
-        // source data column offset is only for internal sheet source.
-        nSrcColOffset = pSheetDesc->GetSourceRange().aStart.Col();
 
     bool bAddData = ( lcl_GetDataGetOrientation( xSource ) == sheet::DataPilotFieldOrientation_HIDDEN );
     lcl_FillOldFields(


More information about the Libreoffice-commits mailing list