ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

lok: calc: fix needed when position caching is disabled

Browse Source 
In case it would be needed to disable position caching we can't
retrieve the nTotalPixels value from the LOKHeight/WidthHelper.

The new code works in both cases.

Change-Id: I65562dd4458eee40c5db958067fc91af6b3eb79e
Reviewed-on: https://gerrit.libreoffice.org/63039
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
This commit is contained in:
Marco Cecchetti
2018-11-08 14:39:14 +01:00
committed by Jan Holesovsky
parent b0fb5acd04
commit 4cee8ccc2c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dictionaries
+1 -1
Submodule dictionaries updated: 86921a78c4...6c85a19c88
sc/source/ui/view/tabview.cxx
+4 -4
View File
@@ -2479,8 +2479,10 @@ OUString ScTabView::getRowColumnHeaders(const tools::Rectangle& rRectangle)
SCTAB nTab = aViewData.GetTabNo();
SCROW nStartRow = -1;
SCROW nEndRow = -1;
long nStartHeightPx = 0;
SCCOL nStartCol = -1;
SCCOL nEndCol = -1;
long nStartWidthPx = 0;
tools::Rectangle aOldVisArea(
mnLOKStartHeaderCol + 1, mnLOKStartHeaderRow + 1,
@@ -2493,7 +2495,6 @@ OUString ScTabView::getRowColumnHeaders(const tools::Rectangle& rRectangle)
if (rRectangle.Top() < rRectangle.Bottom())
{
SAL_INFO("sc.lok.header", "Row Header: compute start/end rows.");
long nStartHeightPx = 0;
long nEndHeightPx = 0;
long nRectTopPx = rRectangle.Top() / TWIPS_PER_PIXEL;
long nRectBottomPx = rRectangle.Bottom() / TWIPS_PER_PIXEL;
@@ -2582,7 +2583,7 @@ OUString ScTabView::getRowColumnHeaders(const tools::Rectangle& rRectangle)
aBuffer.append("\"rows\": [\n");
long nTotalPixels = aViewData.GetLOKHeightHelper().getPosition(nStartRow);
long nTotalPixels = nStartHeightPx;
SAL_INFO("sc.lok.header", "Row Header: [create string data for rows]: start row: "
<< nStartRow << " start height: " << nTotalPixels);
@@ -2637,7 +2638,6 @@ OUString ScTabView::getRowColumnHeaders(const tools::Rectangle& rRectangle)
if (rRectangle.Left() < rRectangle.Right())
{
SAL_INFO("sc.lok.header", "Column Header: compute start/end columns.");
long nStartWidthPx = 0;
long nEndWidthPx = 0;
long nRectLeftPx = rRectangle.Left() / TWIPS_PER_PIXEL;
long nRectRightPx = rRectangle.Right() / TWIPS_PER_PIXEL;
@@ -2723,7 +2723,7 @@ OUString ScTabView::getRowColumnHeaders(const tools::Rectangle& rRectangle)
aBuffer.append("\"columns\": [\n");
nTotalPixels = aViewData.GetLOKWidthHelper().getPosition(nStartCol);
nTotalPixels = nStartWidthPx;
SAL_INFO("sc.lok.header", "Col Header: [create string data for cols]: start col: "
<< nStartRow << " start width: " << nTotalPixels);