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

sw lok comments: fix sidebar width with custom zoom

Browse Source 
Change-Id: I6772cce10d157421d983d6b93efb52bf8b95f5b8
This commit is contained in:
Miklos Vajna
2015-11-16 16:30:21 +01:00
parent d8fc06d233
commit dc65f048fd
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sw/source/uibase/docvw/PostItMgr.cxx
View File

@@ -1865,19 +1865,19 @@ bool SwPostItMgr::HasNotes() const
unsigned long SwPostItMgr::GetSidebarWidth(bool bPx) const
{
unsigned long aWidth = (unsigned long)(mpWrtShell->GetViewOptions()->GetZoom() * 1.8);
sal_uInt16 nZoom = mpWrtShell->GetViewOptions()->GetZoom();
if (comphelper::LibreOfficeKit::isActive())
{
// The output device contains the real wanted scale factor.
double fScaleX = mpWrtShell->GetOut()->GetMapMode().GetScaleX();
nZoom = fScaleX * 100;
}
unsigned long aWidth = (unsigned long)(nZoom * 1.8);
if (bPx)
return aWidth;
else
{
bool bEnableMapMode = comphelper::LibreOfficeKit::isActive() && !mpEditWin->IsMapModeEnabled();
if (bEnableMapMode)
mpEditWin->EnableMapMode();
long nRet = mpEditWin->PixelToLogic(Size(aWidth, 0)).Width();
if (bEnableMapMode)
mpEditWin->EnableMapMode(false);
return nRet;
}
return mpWrtShell->GetOut()->PixelToLogic(Size(aWidth, 0)).Width();
}
unsigned long SwPostItMgr::GetSidebarBorderWidth(bool bPx) const
@@ -1885,7 +1885,7 @@ unsigned long SwPostItMgr::GetSidebarBorderWidth(bool bPx) const
if (bPx)
return 2;
else
return mpEditWin->PixelToLogic(Size(2,0)).Width();
return mpWrtShell->GetOut()->PixelToLogic(Size(2,0)).Width();
}
unsigned long SwPostItMgr::GetNoteWidth()