[Libreoffice-commits] core.git: vcl/source

[Chris Sherlock]

 vcl/source/window/window.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7e122c54f588f56d45e7c09a3327fecb0f8dbef8
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Mon Feb 3 21:13:10 2014 +1100

    fdo#74424 Use Window::GetOutDev() to access ImplInitFontList()
    
    Part of the decoupling of Window from OutputDevice. We now get
    the Window's OutputDevice instance and manipulate this. Do not rely
    on the inherited function.
    
    Change-Id: I18a2688d85ed23a4773e6527bd4923f7d6c83a28
    Reviewed-on: https://gerrit.libreoffice.org/7799
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index bc7acff..6aa8d7b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -465,7 +465,8 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
 
     if ( !bUseSystemFont )
     {
-        ImplInitFontList();
+        OutputDevice *pOutDev = GetOutDev();
+        pOutDev->ImplInitFontList();
         OUString aConfigFont = utl::DefaultFontConfiguration::get().getUserInterfaceFont( rSettings.GetUILanguageTag() );
         sal_Int32 nIndex = 0;
         while( nIndex != -1 )