[Libreoffice-commits] .: vcl/unx
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Feb 19 10:44:09 PST 2011
vcl/unx/inc/saldata.hxx | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 0652ae4bd471a14df87394794fc1bd37eb372a53
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Feb 19 10:43:48 2011 -0800
Remove DECLARE_LIST( SalDisplays, SalDisplay* )
It's always easy when they aren't used.
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx
index 3b5c791..27f8cc1 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/unx/inc/saldata.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -45,8 +45,6 @@ class SalPrinter;
// -=-= typedefs -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-DECLARE_LIST( SalDisplays, SalDisplay* )
-
#if defined LINUX || defined NETBSD || defined AIX || \
defined FREEBSD || defined OPENBSD || defined DRAGONFLY
#include <pthread.h>
@@ -67,27 +65,27 @@ protected:
public:
X11SalData();
virtual ~X11SalData();
-
+
virtual void Init();
virtual void initNWF();
virtual void deInitNWF();
-
+
inline void XError( Display *pDisplay, XErrorEvent *pEvent ) const;
- SalDisplay* GetDisplay() const
+ SalDisplay* GetDisplay() const
{ return m_pSalDisplay; }
void SetSalDisplay( SalDisplay* pDisplay )
{ m_pSalDisplay = pDisplay; }
void DeleteDisplay(); // for shutdown
-
+
inline SalXLib* GetLib() const { return pXLib_; }
inline pthread_t GetMainThread() const { return hMainThread_; }
void StartTimer( ULONG nMS );
inline void StopTimer();
void Timeout() const;
-
+
const rtl::OUString& GetLocalHostName() const
{ return maLocalHostName; }
More information about the Libreoffice-commits
mailing list