[Libreoffice-commits] core.git: vcl/source
Caolán McNamara
caolanm at redhat.com
Tue Sep 17 07:35:48 PDT 2013
vcl/source/window/window.cxx | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 8ecda4405a1160ade824bfde72d10513cacb9b1a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 17 15:31:41 2013 +0100
pFontSubst is always NULL
Change-Id: Ied4eda5b29e2df3fa9260bcf456b8dd360ffafcc
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d027eaa..95c6f61 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4198,12 +4198,8 @@ void Window::ImplNewInputContext()
else
aSize.Height() = (12*pFocusWin->mnDPIY)/72;
}
- // TODO: No display device uses ImplDirectFontSubstitution thingy, right? => remove it
- ImplDirectFontSubstitution* pFontSubst = NULL;
- //if( pFocusWin->mpOutDevData )
- // pFontSubst = &pFocusWin->mpOutDevData->maDevFontSubst;
pFontEntry = pFocusWin->mpFontCache->GetFontEntry( pFocusWin->mpFontList,
- rFont, aSize, static_cast<float>(aSize.Height()), pFontSubst );
+ rFont, aSize, static_cast<float>(aSize.Height()), NULL );
if ( pFontEntry )
aNewContext.mpFont = &pFontEntry->maFontSelData;
}
More information about the Libreoffice-commits
mailing list