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/3273

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/3273/1

Resolves fdo#62673 Table cells non-editable on cell merge

Previously the area calculation for returning SDRTABLEHIT_CELL is
done only using the first(origin) cell in the range of merged cells.
Now changed to calculate the area of the remaining merged cells also.

Change-Id: I2d9244115d08e31b46dbe1a4998e6a763ee38361
---
M svx/source/table/svdotable.cxx
1 file changed, 11 insertions(+), 0 deletions(-)



diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 7c368f5..ab860f7 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1145,6 +1145,17 @@
     if( xCell.is() )
     {
         nX += mpImpl->mpLayouter->getColumnWidth( rnX );
+
+        //Fix for fdo#62673 : non-editable cell in table on cell merge
+        sal_Int32 i=1;
+        xCell=mpImpl->getCell( CellPos( rnX+i, rnY) );
+        while(xCell.is() && xCell->isMerged())
+        {
+            nX += mpImpl->mpLayouter->getColumnWidth( rnX+i );
+            i++;
+            xCell=mpImpl->getCell( CellPos( rnX+i, rnY) );
+        }
+
         if( nX < xCell->GetTextLeftDistance() )
             return SDRTABLEHIT_CELL;
     }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d9244115d08e31b46dbe1a4998e6a763ee38361
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Karthikeyan Krishnamurthi <karthikeyan@kacst.edu.sa>


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.