Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2681

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/2681/1

fix for fdo#62111 - don't count non-default empty rows as rows to repeat

Change-Id: I075310ef63ab4eb666da2092d4be1c6f8d989b75
---
M sc/source/filter/excel/xetable.cxx
1 file changed, 7 insertions(+), 4 deletions(-)



diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index c44b32c..4f5d2e40 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2052,12 +2052,15 @@
         }
         if ( pPrev )
         {
-            sal_uInt32 nRpt =  rRow->GetXclRow() - pPrev->GetXclRow();
-            pPrev->SetXclRowRpt( nRpt );
-            if ( nRpt > 1 )
-                aRepeated.push_back( pPrev );
             if ( pPrev->IsDefaultable())
             {
+                // if the previous row we processed is not
+                // defaultable then afaict the rows inbetween are
+                // not used ( and not repeatable )
+                sal_uInt32 nRpt =  rRow->GetXclRow() - pPrev->GetXclRow();
+                if ( nRpt > 1 )
+                    aRepeated.push_back( pPrev );
+                pPrev->SetXclRowRpt( nRpt );
                 XclExpDefaultRowData aDefData( *pPrev );
                 size_t& rnDefCount = aDefRowMap[ aDefData ];
                 rnDefCount += ( pPrev->GetXclRowRpt() - 1 );

-- 
To view, visit https://gerrit.libreoffice.org/2681
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I075310ef63ab4eb666da2092d4be1c6f8d989b75
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Noel Power <noel.power@suse.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.