mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WeldEditView: Just pass new Size object as param

Browse Source 
Just pass `aOutputSize` as parameter instead
of assigning that to `aSize` again and then
passing that one as parameter in
`WeldEditView::SetDrawingArea` and
overrides in derived classes.

`aSize.setHeight(aSize.Height())` can just be dropped
as an overly complicated way of keeping the
height as it is.

In `SidebarTextControl::SetDrawingArea`, `aOutputSize`
was already passed as param, so the new value of `aSize`
was ignored anyway.

Change-Id: I23192d3c5c85e4371a48774b3b8f854beb751b82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131741
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2022-03-18 14:17:28 +01:00
parent 8a4f58bcd7
commit cfa5489982
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sd/source/ui/annotations/annotationwindow.cxx
View File

@@ -188,14 +188,12 @@ void AnnotationTextWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
rDevice.SetBackground(aBgColor);
Size aOutputSize(rDevice.PixelToLogic(aSize));
aSize = aOutputSize;
aSize.setHeight(aSize.Height());
EditView* pEditView = GetEditView();
pEditView->setEditViewCallbacks(this);
EditEngine* pEditEngine = GetEditEngine();
pEditEngine->SetPaperSize(aSize);
pEditEngine->SetPaperSize(aOutputSize);
pEditEngine->SetRefDevice(&rDevice);
pEditView->SetOutputArea(::tools::Rectangle(Point(0, 0), aOutputSize));

4
svx/source/dialog/weldeditview.cxx
View File

@@ -1554,11 +1554,9 @@ void WeldEditView::SetDrawingArea(weld::DrawingArea* pDrawingArea)
rDevice.SetBackground(aBgColor);
Size aOutputSize(rDevice.PixelToLogic(aSize));
aSize = aOutputSize;
aSize.setHeight(aSize.Height());
makeEditEngine();
m_xEditEngine->SetPaperSize(aSize);
m_xEditEngine->SetPaperSize(aOutputSize);
m_xEditEngine->SetRefDevice(&rDevice);
m_xEditEngine->SetControlWord(m_xEditEngine->GetControlWord() | EEControlBits::MARKFIELDS);

2
sw/source/uibase/docvw/SidebarTxtControl.cxx
View File

@@ -107,8 +107,6 @@ void SidebarTextControl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
rDevice.SetBackground(aBgColor);
Size aOutputSize(rDevice.PixelToLogic(aSize));
aSize = aOutputSize;
aSize.setHeight(aSize.Height());
EditView* pEditView = GetEditView();
pEditView->setEditViewCallbacks(this);