|
 |
135360 |
From ee7c4fb2c32e306342099896c0e367c9f2d33e75 Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: David Tardon <dtardon@redhat.com>
|
|
|
135360 |
Date: Mon, 20 Mar 2017 17:51:53 +0100
|
|
|
135360 |
Subject: [PATCH 308/398] fix build
|
|
|
135360 |
|
|
|
135360 |
Change-Id: I8770c05d39e5574212461d2e48e72ed2fff6a74d
|
|
|
135360 |
---
|
|
|
135360 |
sw/source/uibase/docvw/SidebarWin.cxx | 10 +++++-----
|
|
|
135360 |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
135360 |
index 87a86fbc9dc8..575be80c0ae0 100644
|
|
|
135360 |
--- a/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
135360 |
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
135360 |
@@ -282,7 +282,7 @@ void SwSidebarWin::PaintTile(vcl::RenderContext& rRenderContext, const Rectangle
|
|
|
135360 |
|
|
|
135360 |
vcl::Window* SwSidebarWin::IsHitWindow(const Point& rPointLogic)
|
|
|
135360 |
{
|
|
|
135360 |
- Rectangle aRectangleLogic(EditWin().PixelToLogic(GetPosPixel()), EditWin().PixelToLogic(GetSizePixel()));
|
|
|
135360 |
+ Rectangle aRectangleLogic(EditWin()->PixelToLogic(GetPosPixel()), EditWin()->PixelToLogic(GetSizePixel()));
|
|
|
135360 |
if (aRectangleLogic.IsInside(rPointLogic))
|
|
|
135360 |
return mpSidebarTextControl;
|
|
|
135360 |
return 0;
|
|
|
135360 |
@@ -616,14 +616,14 @@ void SwSidebarWin::SetPosAndSize()
|
|
|
135360 |
|
|
|
135360 |
// LOK has map mode disabled, and we still want to perform pixel ->
|
|
|
135360 |
// twips conversion for the size of the line above the note.
|
|
|
135360 |
- if (comphelper::LibreOfficeKit::isActive() && !EditWin().IsMapModeEnabled())
|
|
|
135360 |
+ if (comphelper::LibreOfficeKit::isActive() && !EditWin()->IsMapModeEnabled())
|
|
|
135360 |
{
|
|
|
135360 |
- EditWin().EnableMapMode();
|
|
|
135360 |
+ EditWin()->EnableMapMode();
|
|
|
135360 |
Size aSize(aLineEnd.getX() - aLineStart.getX(), aLineEnd.getY() - aLineStart.getY());
|
|
|
135360 |
- aSize = EditWin().PixelToLogic(aSize);
|
|
|
135360 |
+ aSize = EditWin()->PixelToLogic(aSize);
|
|
|
135360 |
aLineEnd = aLineStart;
|
|
|
135360 |
aLineEnd.Move(aSize.getWidth(), aSize.getHeight());
|
|
|
135360 |
- EditWin().EnableMapMode(false);
|
|
|
135360 |
+ EditWin()->EnableMapMode(false);
|
|
|
135360 |
}
|
|
|
135360 |
|
|
|
135360 |
if (!IsPreview())
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|