diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-26 12:54:24 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-26 12:58:29 +0200 |
commit | 273a15e4903e6ea21de77c238ab769361f2fc84f (patch) | |
tree | fbb4342bac0d0db0323a10d35ab3751b0bb14011 /vcl/inc/svdata.hxx | |
parent | ec059f87f4b214a9e7590eb913abda6ad491c2e1 (diff) |
Clean up ImplSVData::mpSalData.
soffice currently fails upon start up at least in GTK case due to
vcl/unx/generic/app/saldisp.cxx SalDisplay ctor calling GetX11SalData()
when the data is actually of type SalGenericData instead.
Diffstat (limited to 'vcl/inc/svdata.hxx')
-rw-r--r-- | vcl/inc/svdata.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index c27636c2a5fd..e0a17d0aa705 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -114,6 +114,7 @@ class SalTimer; class SalI18NImeStatus; class DockingManager; class VclEventListeners2; +class SalData; namespace vcl { class DisplayConnection; class SettingsConfigItem; class DeleteOnDeinitBase; } namespace utl { class DefaultFontConfiguration; class FontSubstConfiguration; } @@ -332,7 +333,7 @@ struct ImplSVNWFData struct ImplSVData { - void* mpSalData; // SalData + SalData* mpSalData; SalInstance* mpDefInst; // Default SalInstance Application* mpApp; // pApp WorkWindow* mpDefaultWin; // Default-Window |