From 273a15e4903e6ea21de77c238ab769361f2fc84f Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 26 Oct 2011 12:54:24 +0200
Subject: 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.
---
 vcl/inc/aqua/saldata.hxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'vcl/inc/aqua')

diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx
index 5c6fb32acb9d..5b75b92903b7 100644
--- a/vcl/inc/aqua/saldata.hxx
+++ b/vcl/inc/aqua/saldata.hxx
@@ -127,9 +127,9 @@ struct SalData
     static NSStatusItem* getStatusItem();
 };
 
-inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = (void*)pData; }
-inline SalData *GetSalData() { return (SalData*)ImplGetSVData()->mpSalData; }
-inline SalData *GetAppSalData() { return (SalData*)ImplGetAppSVData()->mpSalData; }
+inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; }
+inline SalData *GetSalData() { return ImplGetSVData()->mpSalData; }
+inline SalData *GetAppSalData() { return ImplGetAppSVData()->mpSalData; }
 
 // --- Prototypes ---
 
-- 
cgit