1 files changed, 7 insertions, 9 deletions
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index e595aa0c905d..ded121daf3a5 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -109,6 +109,13 @@ public:
 static VisualStylesAPI vsAPI;
 
 VisualStylesAPI::VisualStylesAPI()
+    : lpfnOpenThemeData( NULL ),
+      lpfnCloseThemeData( NULL ),
+      lpfnGetThemeBackgroundContentRect( NULL ),
+      lpfnDrawThemeBackground( NULL ),
+      lpfnDrawThemeText( NULL ),
+      lpfnGetThemePartSize( NULL ),
+      lpfnIsThemeActive( NULL )
 {
     OUString aLibraryName( RTL_CONSTASCII_USTRINGPARAM( "uxtheme.dll" ) );
     mhModule = osl_loadModule( aLibraryName.pData, SAL_LOADMODULE_DEFAULT );
@@ -123,15 +130,6 @@ VisualStylesAPI::VisualStylesAPI()
         lpfnGetThemePartSize = (GetThemePartSize_Proc_T)osl_getAsciiFunctionSymbol( mhModule, "GetThemePartSize" );
         lpfnIsThemeActive = (IsThemeActive_Proc_T)osl_getAsciiFunctionSymbol( mhModule, "IsThemeActive" );
     }
-    else
-    {
-        lpfnOpenThemeData = NULL;
-        lpfnCloseThemeData = NULL;
-        lpfnGetThemeBackgroundContentRect = NULL;
-        lpfnDrawThemeBackground = NULL;
-        lpfnDrawThemeText = NULL;
-        lpfnGetThemePartSize = NULL;
-    }
 }
 
 VisualStylesAPI::~VisualStylesAPI()