Kaydet (Commit) 1ec988ed authored tarafından Miklos Vajna's avatar Miklos Vajna

This PixelToLogic() call can be conditional in SwSidebarWin::SetPosAndSize()

It is only needed when tiled rendering.

(cherry picked from commit 88f48668)

Conflicts:
	sw/source/uibase/docvw/SidebarWin.cxx

Change-Id: Ie1668f5f3d4d17abc212e2262a6c155dcb855d2e
üst 155c57d4
......@@ -607,15 +607,15 @@ void SwSidebarWin::SetPosAndSize()
// LOK has map mode disabled, and we still want to perform pixel ->
// twips conversion for the size of the line above the note.
bool bEnableMapMode = comphelper::LibreOfficeKit::isActive() && !EditWin()->IsMapModeEnabled();
if (bEnableMapMode)
if (comphelper::LibreOfficeKit::isActive() && !EditWin()->IsMapModeEnabled())
{
EditWin()->EnableMapMode();
Size aSize(aLineEnd.getX() - aLineStart.getX(), aLineEnd.getY() - aLineStart.getY());
aSize = EditWin()->PixelToLogic(aSize);
aLineEnd = aLineStart;
aLineEnd.Move(aSize.getWidth(), aSize.getHeight());
if (bEnableMapMode)
Size aSize(aLineEnd.getX() - aLineStart.getX(), aLineEnd.getY() - aLineStart.getY());
aSize = EditWin()->PixelToLogic(aSize);
aLineEnd = aLineStart;
aLineEnd.Move(aSize.getWidth(), aSize.getHeight());
EditWin()->EnableMapMode(false);
}
if (!IsPreview())
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment