summaryrefslogtreecommitdiff
path: root/vcl/unx/inc
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 18:46:55 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 18:46:55 +0000
commit6add65d65333a73d3e11ca8ba3df95b58674fd5b (patch)
tree6112990f53eef2d4f619ee567a306ffeaa4b0497 /vcl/unx/inc
parent61735e76aa909cc3bbb0a4e442b67a28c5c82565 (diff)
INTEGRATION: CWS warnings01 (1.33.2); FILE MERGED
2005/11/11 14:31:19 pl 1.33.2.1: #i55991# removed warnings
Diffstat (limited to 'vcl/unx/inc')
-rw-r--r--vcl/unx/inc/saldisp.hxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx
index b6ea095518dc..11f04410d8d6 100644
--- a/vcl/unx/inc/saldisp.hxx
+++ b/vcl/unx/inc/saldisp.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: saldisp.hxx,v $
*
- * $Revision: 1.33 $
+ * $Revision: 1.34 $
*
- * last change: $Author: kz $ $Date: 2005-11-02 14:35:47 $
+ * last change: $Author: hr $ $Date: 2006-06-19 19:46:55 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -288,7 +288,7 @@ DECLARE_LIST( SalFontCache, ExtendedFontStruct* )
extern "C" {
struct SnDisplay;
struct SnLauncheeContext;
-};
+}
class VCL_DLLPUBLIC SalDisplay
{
@@ -404,7 +404,6 @@ public:
void PrintEvent( const ByteString &rComment,
XEvent *pEvent ) const;
- void AddFontPath( const ByteString &rPath ) const;
XlfdStorage* GetXlfdList();
ExtendedFontStruct*
GetFont( const ExtendedXlfd *pFont,
@@ -514,7 +513,7 @@ public:
virtual ~SalX11Display();
virtual long Dispatch( XEvent *pEvent );
- virtual void Yield( BOOL bWait );
+ virtual void Yield();
BOOL IsEvent();
};