strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "lok: respect zoom in calc tile rendering of EditView"

Browse source 
This reverts commit 7260b8724f.
lok: respect zoom in calc tile rendering of EditView

Which was causing chart artifacts. Original issue which was
fixed by above change is no longer valid. Probably different
fix was made.

Change-Id: I855be90b2736a2d1e95dc1cabef54a438644aa7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142570
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Gökay ŞATIR <gokaysatir@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142996
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
This commit is contained in:
Szymon Kłos 2022-11-10 21:27:36 +01:00
parent 7dd9790b89
commit 25245dba23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sc/source/ui/view/gridwin4.cxx
View file

@ -748,8 +748,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
// the same as editeng and drawinglayer), and get rid of all the
// SetMapMode's and other unnecessary fun we have with pixels
// See also ScGridWindow::GetDrawMapMode() for the rest of this hack
aDrawMode.SetOrigin(PixelToLogic(Point(tools::Long(nScrX / aOutputData.aZoomX),
tools::Long(nScrY / aOutputData.aZoomY)), aDrawMode));
aDrawMode.SetOrigin(PixelToLogic(Point(nScrX, nScrY), aDrawMode));
}
tools::Rectangle aDrawingRectLogic;
bool bLayoutRTL = rDoc.IsLayoutRTL( nTab );
@ -1057,9 +1056,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
if (bIsTiledRendering)
{
const double fZoomX = static_cast<double>(aOutputData.aZoomX);
const double fZoomY = static_cast<double>(aOutputData.aZoomY);
Point aOrigin = aOriginalMode.GetOrigin();
if (bLayoutRTL)
aOrigin.setX(-o3tl::convert(aOrigin.getX(), o3tl::Length::twip, o3tl::Length::px)
@ -1071,8 +1067,8 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
aOrigin.setY(o3tl::convert(aOrigin.getY(), o3tl::Length::twip, o3tl::Length::px)
+ aOutputData.nScrY);
const double twipFactor = 15 * 1.76388889; // 26.45833335
aOrigin = Point(aOrigin.getX() * twipFactor / fZoomX,
aOrigin.getY() * twipFactor / fZoomY);
aOrigin = Point(aOrigin.getX() * twipFactor,
aOrigin.getY() * twipFactor);
MapMode aNew = rDevice.GetMapMode();
aNew.SetOrigin(aOrigin);
rDevice.SetMapMode(aNew);
@ -1658,7 +1654,7 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
-nTopLeftTileRowOffset,
nTopLeftTileCol, nTopLeftTileRow,
nBottomRightTileCol, nBottomRightTileRow,
fPPTX, fPPTY, &aFracX, &aFracY);
fPPTX, fPPTY, nullptr, nullptr);
// setup the SdrPage so that drawinglayer works correctly
ScDrawLayer* pModel = rDoc.GetDrawLayer();