desktop/source/lib/init.cxx | 3 ++-
sc/source/ui/view/gridwin4.cxx | 20 ++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit b16ba7314ef93b657dea4d6dd676b2dfd265bcaa
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Sat Oct 1 21:25:42 2016 -0400
Calc LOK: clear cell background when editing in parallel
Change-Id: Id8eccf00ec6555d62c49e06130e3aa3a0eaaddea
Reviewed-on: https://gerrit.libreoffice.org/29450
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3ebbf06..6d571f7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -268,7 +268,8 @@ static OUString getAbsoluteURL(const char* pURL)
if (!aWorkingDir.endsWith("/"))
aWorkingDir += "/";
- try {
+ try
+ {
return rtl::Uri::convertRelToAbs(aWorkingDir, aURL);
}
catch (const rtl::MalformedUriException &)
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a3a171c..53d46db 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -936,15 +936,16 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice,
const ScTableInfo& rTableI
Rectangle aBackground(aStart, aEnd);
if (bIsTiledRendering)
{
- aBackground += Point(nScrX, nScrY);
+ // Need to draw the background in absolute coords.
+ auto aOrigin = aOriginalMode.GetOrigin();
+ aOrigin.setX(aOrigin.getX() / TWIPS_PER_PIXEL + nScrX);
+ aOrigin.setY(aOrigin.getY() / TWIPS_PER_PIXEL + nScrY);
+ aBackground += aOrigin;
rDevice.SetMapMode(aDrawMode);
}
else
rDevice.SetMapMode(pViewData->GetLogicMode());
- // paint the background
- rDevice.DrawRect(rDevice.PixelToLogic(aBackground));
-
if (bIsTiledRendering)
{
auto aOrigin = aOriginalMode.GetOrigin();
@@ -958,8 +959,12 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice,
const ScTableInfo& rTableI
rDevice.SetMapMode(aNew);
}
+ // paint the background
+ rDevice.DrawRect(rDevice.PixelToLogic(aBackground));
+
// paint the editeng text
- pEditView->Paint(rDevice.PixelToLogic(Rectangle(Point(nScrX, nScrY),
Size(aOutputData.GetScrW(), aOutputData.GetScrH()))), &rDevice);
+ Rectangle aEditRect(Point(nScrX, nScrY), Size(aOutputData.GetScrW(),
aOutputData.GetScrH()));
+ pEditView->Paint(rDevice.PixelToLogic(aEditRect), &rDevice);
rDevice.SetMapMode(MAP_PIXEL);
// restore the cursor it was originally visible
@@ -967,7 +972,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const
ScTableInfo& rTableI
pCrsr->Show();
}
-
if (comphelper::LibreOfficeKit::isActive())
{
ScTabViewShell* pThisViewShell = pViewData->GetViewShell();
@@ -1052,10 +1056,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice,
const ScTableInfo& rTableI
}
-
-
-
-
if (pViewData->HasEditView(eWhich))
{
// flush OverlayManager before changing the MapMode
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
