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/unx/generic/app | |
| 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/unx/generic/app')
| -rw-r--r-- | vcl/unx/generic/app/saldata.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index 1164a4e9fe67..8eb660202483 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -91,9 +91,13 @@ #endif #endif -inline X11SalData* GetX11SalData() +X11SalData* GetX11SalData() { - return (X11SalData*)ImplGetSVData()->mpSalData; + SalData * p1 = ImplGetSVData()->mpSalData; + OSL_ASSERT(p1 != 0); + X11SalData * p2 = dynamic_cast< X11SalData * >(p1); + OSL_ASSERT(p2 != 0); + return p2; } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 004b3fc4f914..515f43381c60 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -113,11 +113,6 @@ using ::rtl::OUString; #define SALCOLOR_WHITE MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF ) #define SALCOLOR_BLACK MAKE_SALCOLOR( 0x00, 0x00, 0x00 ) -inline X11SalData* GetX11SalData() -{ - return (X11SalData*)ImplGetSVData()->mpSalData; -} - // -=-= Prototyps =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // -=-= static variables -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -504,7 +499,7 @@ SalDisplay::SalDisplay( Display *display ) : DBG_ASSERT( ! pData->GetDisplay(), "Second SalDisplay created !!!\n" ); pData->SetDisplay( this ); - pXLib_ = ((X11SalData *)ImplGetSVData()->mpSalData)->GetLib(); + pXLib_ = GetX11SalData()->GetLib(); m_nDefaultScreen = DefaultScreen( pDisp_ ); } |