Kaydet (Commit) d32b2863 authored tarafından Chris Sherlock's avatar Chris Sherlock Kaydeden (comit) Tor Lillqvist

Handle non-initialized pImplSVData in InitAppFontData

If pSVData->maWinData.mpFirstFrame is null in
Application::InitAppFontData() then we need to create a new WorkWindow.

Change-Id: I6665ff6525321554c8fd4943ec623978ce35f168
Reviewed-on: https://gerrit.libreoffice.org/9272Reviewed-by: 's avatarTor Lillqvist <tml@collabora.com>
Tested-by: 's avatarTor Lillqvist <tml@collabora.com>
üst 09555ce0
...@@ -1659,6 +1659,9 @@ void Application::InitAppFontData() ...@@ -1659,6 +1659,9 @@ void Application::InitAppFontData()
Window *pWindow = pSVData->mpDefaultWin; Window *pWindow = pSVData->mpDefaultWin;
if (!pWindow)
pWindow = new WorkWindow( NULL, 0 );
long nTextHeight = pWindow->GetTextHeight(); long nTextHeight = pWindow->GetTextHeight();
long nTextWidth = pWindow->approximate_char_width() * 8; long nTextWidth = pWindow->approximate_char_width() * 8;
long nSymHeight = nTextHeight*4; long nSymHeight = nTextHeight*4;
...@@ -1698,6 +1701,10 @@ void Application::InitAppFontData() ...@@ -1698,6 +1701,10 @@ void Application::InitAppFontData()
pSVData->maGDIData.mnRealAppFontX = pSVData->maGDIData.mnAppFontX; pSVData->maGDIData.mnRealAppFontX = pSVData->maGDIData.mnAppFontX;
if ( pSVData->maAppData.mnDialogScaleX ) if ( pSVData->maAppData.mnDialogScaleX )
pSVData->maGDIData.mnAppFontX += (pSVData->maGDIData.mnAppFontX*pSVData->maAppData.mnDialogScaleX)/100; pSVData->maGDIData.mnAppFontX += (pSVData->maGDIData.mnAppFontX*pSVData->maAppData.mnDialogScaleX)/100;
// a temporary WorkWindow was created, we need to delete it
if (!pSVData->mpDefaultWin && pWindow)
delete pWindow;
} }
......
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