From e22baf0c41e430ea9e7f0f9dc1efb6002ea23444 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Fri, 11 Aug 2006 16:47:00 +0000
Subject: INTEGRATION: CWS svp01 (1.14.220); FILE MERGED 2006/05/22 16:35:29 pl
 1.14.220.1: #135265# free plugin abstraction of dependency on X11 specific
 SalData

---
 vcl/unx/inc/saldata.hxx | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

(limited to 'vcl')

diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx
index 8a3a290ec5b3..6e615bfcfd1e 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/unx/inc/saldata.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: saldata.hxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: rt $ $Date: 2005-11-11 11:56:19 $
+ *  last change: $Author: hr $ $Date: 2006-08-11 17:47:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -42,15 +42,15 @@
 #ifndef _SALSTD_HXX
 #include <salstd.hxx>
 #endif
-#ifndef _SV_SVDATA_HXX
-#include <svdata.hxx>
-#endif
 #ifndef _SV_SALFRAME_HXX
 #include <salframe.hxx>
 #endif
 #ifndef _SV_SALINST_H
 #include <salinst.h>
 #endif
+#ifndef _SV_SALDATABASIC_HXX
+#include <saldatabasic.hxx>
+#endif
 #ifndef _OSL_MODULE_H
 #include <osl/module.h>
 #endif
@@ -75,7 +75,7 @@ typedef unsigned int pthread_t;
 #endif
 
 // -=-= SalData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class VCL_DLLPUBLIC SalData
+class VCL_DLLPUBLIC X11SalData : public SalData
 {
 protected:
             BOOL                bNoExceptions_;
@@ -87,11 +87,8 @@ protected:
             pthread_t           hMainThread_;
 
 public:
-            SalInstance*        pInstance_;         // pointer to instance
-            oslModule           m_pPlugin; // plugin library handle
-public:
-    SalData();
-    virtual ~SalData();
+    X11SalData();
+    virtual ~X11SalData();
 
     virtual void            Init();
     virtual void            initNWF();
@@ -123,15 +120,12 @@ public:
 
 };
 
-// -=-= inlines =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-inline void SetSalData( SalData* pData )
-{ ImplGetSVData()->mpSalData = (void*)pData; }
+inline X11SalData* GetX11SalData()
+{ return (X11SalData*)ImplGetSVData()->mpSalData; }
 
-inline SalData* GetSalData()
-{ return (SalData*)ImplGetSVData()->mpSalData; }
 
 #ifdef _SV_SALDISP_HXX
-inline void SalData::XError( Display *pDisplay, XErrorEvent *pEvent ) const
+inline void X11SalData::XError( Display *pDisplay,  XErrorEvent *pEvent ) const
 { pXLib_->XError( pDisplay, pEvent ); }
 #endif
 
@@ -145,12 +139,12 @@ public:
 
 inline YieldMutexReleaser::YieldMutexReleaser()
 {
-    m_nYieldCount = GetSalData()->pInstance_->ReleaseYieldMutex();
+    m_nYieldCount = GetSalData()->m_pInstance->ReleaseYieldMutex();
 }
 
 inline YieldMutexReleaser::~YieldMutexReleaser()
 {
-    GetSalData()->pInstance_->AcquireYieldMutex( m_nYieldCount );
+    GetSalData()->m_pInstance->AcquireYieldMutex( m_nYieldCount );
 }
 
 #endif // _SV_SALDATA_HXX
-- 
cgit