[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/source
Marco Cecchetti
marco.cecchetti at collabora.com
Fri Dec 15 12:58:53 UTC 2017
sc/source/ui/view/gridwin.cxx | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 5651eb34534db14851d4107435ca75e8f414124a
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date: Wed Dec 13 18:02:01 2017 +0100
lok: sc: append the col, row position to the cell cursor message
Change-Id: I7f8c0e3685c57ff20520ee068b215037f6137389
Reviewed-on: https://gerrit.libreoffice.org/46543
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 9cd3f117118e..d0710fd96777 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5761,11 +5761,14 @@ OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction& rZoo
if (nSizeYPix == 0)
nSizeYPix = 1;
+ long nPosXTw = rtl::math::round(aScrPos.getX() / fPPTX);
+ long nPosYTw = rtl::math::round(aScrPos.getY() / fPPTY);
long nSizeXTw = rtl::math::round(nSizeXPix / fPPTX);
long nSizeYTw = rtl::math::round(nSizeYPix / fPPTY);
- Rectangle aRect(Point(rtl::math::round(aScrPos.getX() / fPPTX), rtl::math::round(aScrPos.getY() / fPPTY)),
- Size(nSizeXTw, nSizeYTw));
+ std::stringstream ss;
+ ss << nPosXTw << ", " << nPosYTw << ", " << nSizeXTw << ", " << nSizeYTw << ", "
+ << nX << ", " << nY;
pViewData->SetZoom(defaultZoomX, defaultZoomY, true);
@@ -5776,7 +5779,7 @@ OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction& rZoo
pViewData->GetLOKHeightHelper().insert(nY - 1, aScrPos.getY());
pViewData->SetLOKOldCurY(nY);
- return aRect.toString();
+ return ss.str().c_str();
}
void ScGridWindow::updateLibreOfficeKitCellCursor(SfxViewShell* pOtherShell) const
More information about the Libreoffice-commits
mailing list