diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 14:03:13 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 14:03:13 +0000 |
| commit | f2ccdb145f607b0568a45fd42416db4a02d4f855 (patch) | |
| tree | 9dfc87317cb506254a4bc9cfefa2b2a62b21425a /extensions/source/scanner | |
| parent | f34d41ab11f9e6d872971c55eb7025c37cd01473 (diff) | |
INTEGRATION: CWS wae4extensions (1.5.388); FILE MERGED
2007/10/01 13:24:31 fs 1.5.388.2: #i81612# warning-free code (unxsoli4)
2007/10/01 11:44:12 fs 1.5.388.1: #i81612# warning-free code (unxsoli4)
Diffstat (limited to 'extensions/source/scanner')
| -rw-r--r-- | extensions/source/scanner/sane.hxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx index d2140e1eb5b0..70b9bf70181f 100644 --- a/extensions/source/scanner/sane.hxx +++ b/extensions/source/scanner/sane.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sane.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 20:37:12 $ + * last change: $Author: ihi $ $Date: 2008-01-14 15:03:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,6 +36,7 @@ #define _SANE_HXX #include <osl/thread.h> +#include <osl/module.h> #include <tools/string.hxx> #include <vcl/bitmap.hxx> #include <sane/sane.h> @@ -79,7 +80,7 @@ class Sane { private: static int nRefCount; - static void* pSaneLib; + static oslModule pSaneLib; static SANE_Status (*p_init)( SANE_Int*, SANE_Auth_Callback ); @@ -114,7 +115,8 @@ private: Link maReloadOptionsLink; - inline void* LoadSymbol( char* ); + inline oslGenericFunction + LoadSymbol( const char* ); void Init(); void DeInit(); void Stop(); |