summaryrefslogtreecommitdiff
path: root/extensions/source/scanner
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/scanner')
-rw-r--r--extensions/source/scanner/grid.cxx10
-rw-r--r--extensions/source/scanner/grid.hrc22
-rw-r--r--extensions/source/scanner/grid.hxx68
-rw-r--r--extensions/source/scanner/grid.src18
-rw-r--r--extensions/source/scanner/sane.cxx108
-rw-r--r--extensions/source/scanner/sane.hxx140
-rw-r--r--extensions/source/scanner/sanedlg.cxx34
-rw-r--r--extensions/source/scanner/sanedlg.hrc92
-rw-r--r--extensions/source/scanner/sanedlg.hxx124
-rw-r--r--extensions/source/scanner/sanedlg.src2
-rw-r--r--extensions/source/scanner/scanner.cxx12
-rw-r--r--extensions/source/scanner/scanner.hxx56
-rw-r--r--extensions/source/scanner/scanunx.cxx34
-rw-r--r--extensions/source/scanner/scanwin.cxx214
-rw-r--r--extensions/source/scanner/scnserv.cxx14
-rw-r--r--extensions/source/scanner/twain.cxx76
-rw-r--r--extensions/source/scanner/twain.hxx60
17 files changed, 542 insertions, 542 deletions
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 61f52b916e5d..df48ec6cf155 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -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,14 +45,14 @@ ResId SaneResId( sal_uInt32 );
/***********************************************************************
*
- * GridWindow
+ * GridWindow
*
***********************************************************************/
// ---------------------------------------------------------------------
-GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, BOOL bCutValues )
-: ModalDialog( pParent, SaneResId( GRID_DIALOG ) ),
+GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, BOOL bCutValues )
+: ModalDialog( pParent, SaneResId( GRID_DIALOG ) ),
m_aGridArea( 50, 15, 100, 100 ),
m_pXValues( pXValues ),
m_pOrigYValues( pYValues ),
@@ -272,7 +272,7 @@ void GridWindow::computeNew()
std::sort(m_aHandles.begin(), m_aHandles.end());
const int nSorted = m_aHandles.size();
int i;
-
+
// get node arrays
double* nodex = new double[ nSorted ];
double* nodey = new double[ nSorted ];
diff --git a/extensions/source/scanner/grid.hrc b/extensions/source/scanner/grid.hrc
index 480598bf6c4f..fa364b909102 100644
--- a/extensions/source/scanner/grid.hrc
+++ b/extensions/source/scanner/grid.hrc
@@ -1,7 +1,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
@@ -27,16 +27,16 @@
#ifndef GRID_HRC
#define GRID_HRC
-#define GRID_DIALOG 1100
-#define GRID_DIALOG_OK_BTN 1
-#define GRID_DIALOG_CANCEL_BTN 2
-#define GRID_DIALOG_RESET_BTN 3
-#define GRID_DIALOG_TYPE_BOX 4
-#define GRID_DIALOG_HANDLE_BMP 5
+#define GRID_DIALOG 1100
+#define GRID_DIALOG_OK_BTN 1
+#define GRID_DIALOG_CANCEL_BTN 2
+#define GRID_DIALOG_RESET_BTN 3
+#define GRID_DIALOG_TYPE_BOX 4
+#define GRID_DIALOG_HANDLE_BMP 5
-#define RESET_TYPE_LINEAR_ASCENDING 10
-#define RESET_TYPE_LINEAR_DESCENDING 11
-#define RESET_TYPE_RESET 12
-#define RESET_TYPE_EXPONENTIAL 13
+#define RESET_TYPE_LINEAR_ASCENDING 10
+#define RESET_TYPE_LINEAR_DESCENDING 11
+#define RESET_TYPE_RESET 12
+#define RESET_TYPE_EXPONENTIAL 13
#endif
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 585f7913fbf4..d598b1a6a469 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.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
@@ -38,21 +38,21 @@ class GridWindow : public ModalDialog
// helper class for handles
struct impHandle
{
- Point maPos;
- sal_uInt16 mnOffX;
- sal_uInt16 mnOffY;
+ Point maPos;
+ sal_uInt16 mnOffX;
+ sal_uInt16 mnOffY;
- impHandle(const Point& rPos, sal_uInt16 nX, sal_uInt16 nY)
- : maPos(rPos), mnOffX(nX), mnOffY(nY)
+ impHandle(const Point& rPos, sal_uInt16 nX, sal_uInt16 nY)
+ : maPos(rPos), mnOffX(nX), mnOffY(nY)
{
}
-
- bool operator<(const impHandle& rComp) const
- {
- return (maPos.X() < rComp.maPos.X());
+
+ bool operator<(const impHandle& rComp) const
+ {
+ return (maPos.X() < rComp.maPos.X());
}
- void draw(Window& rWin, const BitmapEx& rBitmapEx)
+ void draw(Window& rWin, const BitmapEx& rBitmapEx)
{
const Point aOffset(rWin.PixelToLogic(Point(mnOffX, mnOffY)));
rWin.DrawBitmapEx(maPos - aOffset, rBitmapEx);
@@ -66,39 +66,39 @@ class GridWindow : public ModalDialog
}
};
- Rectangle m_aGridArea;
+ Rectangle m_aGridArea;
- double m_fMinX;
- double m_fMinY;
- double m_fMaxX;
- double m_fMaxY;
+ double m_fMinX;
+ double m_fMinY;
+ double m_fMaxX;
+ double m_fMaxY;
- double m_fChunkX;
- double m_fMinChunkX;
- double m_fChunkY;
- double m_fMinChunkY;
+ double m_fChunkX;
+ double m_fMinChunkX;
+ double m_fChunkY;
+ double m_fMinChunkY;
- double* m_pXValues;
- double* m_pOrigYValues;
- int m_nValues;
- double* m_pNewYValues;
+ double* m_pXValues;
+ double* m_pOrigYValues;
+ int m_nValues;
+ double* m_pNewYValues;
- sal_uInt16 m_BmOffX;
- sal_uInt16 m_BmOffY;
+ sal_uInt16 m_BmOffX;
+ sal_uInt16 m_BmOffY;
- BOOL m_bCutValues;
+ BOOL m_bCutValues;
// stuff for handles
- std::vector< impHandle > m_aHandles;
- sal_uInt32 m_nDragIndex;
+ std::vector< impHandle > m_aHandles;
+ sal_uInt32 m_nDragIndex;
- BitmapEx m_aMarkerBitmap;
+ BitmapEx m_aMarkerBitmap;
- OKButton m_aOKButton;
- CancelButton m_aCancelButton;
+ OKButton m_aOKButton;
+ CancelButton m_aCancelButton;
- ListBox m_aResetTypeBox;
- PushButton m_aResetButton;
+ ListBox m_aResetTypeBox;
+ PushButton m_aResetButton;
Point transform( double x, double y );
diff --git a/extensions/source/scanner/grid.src b/extensions/source/scanner/grid.src
index e7e8128cbc84..ddf593ef77ce 100644
--- a/extensions/source/scanner/grid.src
+++ b/extensions/source/scanner/grid.src
@@ -1,7 +1,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
@@ -28,10 +28,10 @@
ModalDialog GRID_DIALOG
{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 10 , 10 ) ;
- Size = MAP_APPFONT ( 300, 200 ) ;
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ Pos = MAP_APPFONT ( 10 , 10 ) ;
+ Size = MAP_APPFONT ( 300, 200 ) ;
Moveable = TRUE ;
Closeable = TRUE ;
@@ -43,13 +43,13 @@ ModalDialog GRID_DIALOG
};
CancelButton GRID_DIALOG_CANCEL_BTN
{
- Pos = MAP_APPFONT ( 245 , 25 ) ;
- Size = MAP_APPFONT ( 50 , 15 ) ;
+ Pos = MAP_APPFONT ( 245 , 25 ) ;
+ Size = MAP_APPFONT ( 50 , 15 ) ;
};
ListBox GRID_DIALOG_TYPE_BOX
{
- Border = TRUE ;
- Dropdown = TRUE ;
+ Border = TRUE ;
+ Dropdown = TRUE ;
Pos = MAP_APPFONT( 245, 45 );
Size = MAP_APPFONT( 50, 130 );
};
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index d6df2a30644a..717cf4c6140a 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -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
@@ -60,63 +60,63 @@ inline void dbg_msg( const char* pString, ... )
}
#define FAIL_SHUTDOWN_STATE( x, y, z ) \
- if( x != SANE_STATUS_GOOD ) \
- { \
- dump_state( "%s returned error %d (%s)\n", \
- y, x, p_strstatus( x ) ); \
- DeInit(); \
- return z; \
+ if( x != SANE_STATUS_GOOD ) \
+ { \
+ dump_state( "%s returned error %d (%s)\n", \
+ y, x, p_strstatus( x ) ); \
+ DeInit(); \
+ return z; \
}
#define FAIL_STATE( x, y, z ) \
- if( x != SANE_STATUS_GOOD ) \
- { \
- dump_state( "%s returned error %d (%s)\n", \
- y, x, p_strstatus( x ) ); \
- return z; \
+ if( x != SANE_STATUS_GOOD ) \
+ { \
+ dump_state( "%s returned error %d (%s)\n", \
+ y, x, p_strstatus( x ) ); \
+ return z; \
}
#define DUMP_STATE( x, y ) \
- if( x != SANE_STATUS_GOOD ) \
- { \
- dump_state( "%s returned error %d (%s)\n", \
- y, x, p_strstatus( x ) ); \
+ if( x != SANE_STATUS_GOOD ) \
+ { \
+ dump_state( "%s returned error %d (%s)\n", \
+ y, x, p_strstatus( x ) ); \
}
#define CHECK_STATE( x, y ) \
- if( x != SANE_STATUS_GOOD ) \
- { \
- dump_state( "%s returned error %d (%s)\n", \
- y, x, p_strstatus( x ) ); \
- } \
+ if( x != SANE_STATUS_GOOD ) \
+ { \
+ dump_state( "%s returned error %d (%s)\n", \
+ y, x, p_strstatus( x ) ); \
+ } \
else
-int Sane::nRefCount = 0;
+int Sane::nRefCount = 0;
oslModule Sane::pSaneLib = 0;
-SANE_Int Sane::nVersion = 0;
-SANE_Device** Sane::ppDevices = 0;
-int Sane::nDevices = 0;
+SANE_Int Sane::nVersion = 0;
+SANE_Device** Sane::ppDevices = 0;
+int Sane::nDevices = 0;
-SANE_Status (*Sane::p_init)( SANE_Int*,
+SANE_Status (*Sane::p_init)( SANE_Int*,
SANE_Auth_Callback ) = 0;
-void (*Sane::p_exit)() = 0;
-SANE_Status (*Sane::p_get_devices)( const SANE_Device***,
+void (*Sane::p_exit)() = 0;
+SANE_Status (*Sane::p_get_devices)( const SANE_Device***,
SANE_Bool ) = 0;
-SANE_Status (*Sane::p_open)( SANE_String_Const, SANE_Handle ) = 0;
-void (*Sane::p_close)( SANE_Handle ) = 0;
+SANE_Status (*Sane::p_open)( SANE_String_Const, SANE_Handle ) = 0;
+void (*Sane::p_close)( SANE_Handle ) = 0;
const SANE_Option_Descriptor* (*Sane::p_get_option_descriptor)(
SANE_Handle, SANE_Int ) = 0;
-SANE_Status (*Sane::p_control_option)( SANE_Handle, SANE_Int,
+SANE_Status (*Sane::p_control_option)( SANE_Handle, SANE_Int,
SANE_Action, void*,
SANE_Int* ) = 0;
-SANE_Status (*Sane::p_get_parameters)( SANE_Handle,
+SANE_Status (*Sane::p_get_parameters)( SANE_Handle,
SANE_Parameters* ) = 0;
-SANE_Status (*Sane::p_start)( SANE_Handle ) = 0;
-SANE_Status (*Sane::p_read)( SANE_Handle, SANE_Byte*, SANE_Int,
+SANE_Status (*Sane::p_start)( SANE_Handle ) = 0;
+SANE_Status (*Sane::p_read)( SANE_Handle, SANE_Byte*, SANE_Int,
SANE_Int* ) = 0;
-void (*Sane::p_cancel)( SANE_Handle ) = 0;
-SANE_Status (*Sane::p_set_io_mode)( SANE_Handle, SANE_Bool ) = 0;
-SANE_Status (*Sane::p_get_select_fd)( SANE_Handle, SANE_Int* ) = 0;
+void (*Sane::p_cancel)( SANE_Handle ) = 0;
+SANE_Status (*Sane::p_set_io_mode)( SANE_Handle, SANE_Bool ) = 0;
+SANE_Status (*Sane::p_get_select_fd)( SANE_Handle, SANE_Int* ) = 0;
SANE_String_Const (*Sane::p_strstatus)( SANE_Status ) = 0;
static BOOL bSaneSymbolLoadFailed = FALSE;
@@ -136,8 +136,8 @@ inline oslGenericFunction Sane::LoadSymbol( const char* pSymbolname )
SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction,
void* pData )
{
- SANE_Status nStatus = SANE_STATUS_GOOD;
- SANE_Int nInfo = 0;
+ SANE_Status nStatus = SANE_STATUS_GOOD;
+ SANE_Int nInfo = 0;
nStatus = p_control_option( maHandle, (SANE_Int)nOption,
nAction, pData, &nInfo );
@@ -160,7 +160,7 @@ SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction,
pAction );
}
#endif
-// if( nInfo & ( SANE_INFO_RELOAD_OPTIONS | SANE_INFO_RELOAD_PARAMS ) )
+// if( nInfo & ( SANE_INFO_RELOAD_OPTIONS | SANE_INFO_RELOAD_PARAMS ) )
if( nInfo & SANE_INFO_RELOAD_OPTIONS )
ReloadOptions();
return nStatus;
@@ -567,7 +567,7 @@ BOOL Sane::CheckConsistency( const char* pMes, BOOL bInit )
BOOL Sane::Start( BitmapTransporter& rBitmap )
{
int nStream = 0, nLine = 0, i = 0;
- SANE_Parameters aParams;
+ SANE_Parameters aParams;
FrameStyleType eType = FrameStyle_Gray;
BOOL bSuccess = TRUE;
BOOL bWidthSet = FALSE;
@@ -575,27 +575,27 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
if( ! maHandle )
return FALSE;
- int nWidthMM = 0;
- int nHeightMM = 0;
+ int nWidthMM = 0;
+ int nHeightMM = 0;
double fTLx, fTLy, fBRx, fBRy, fResl = 0.0;
int nOption;
- if( ( nOption = GetOptionByName( "tl-x" ) ) != -1 &&
- GetOptionValue( nOption, fTLx, 0 ) &&
+ if( ( nOption = GetOptionByName( "tl-x" ) ) != -1 &&
+ GetOptionValue( nOption, fTLx, 0 ) &&
GetOptionUnit( nOption ) == SANE_UNIT_MM )
{
- if( ( nOption = GetOptionByName( "br-x" ) ) != -1 &&
- GetOptionValue( nOption, fBRx, 0 ) &&
+ if( ( nOption = GetOptionByName( "br-x" ) ) != -1 &&
+ GetOptionValue( nOption, fBRx, 0 ) &&
GetOptionUnit( nOption ) == SANE_UNIT_MM )
{
nWidthMM = (int)fabs(fBRx - fTLx);
}
}
- if( ( nOption = GetOptionByName( "tl-y" ) ) != -1 &&
- GetOptionValue( nOption, fTLy, 0 ) &&
+ if( ( nOption = GetOptionByName( "tl-y" ) ) != -1 &&
+ GetOptionValue( nOption, fTLy, 0 ) &&
GetOptionUnit( nOption ) == SANE_UNIT_MM )
{
- if( ( nOption = GetOptionByName( "br-y" ) ) != -1 &&
- GetOptionValue( nOption, fBRy, 0 ) &&
+ if( ( nOption = GetOptionByName( "br-y" ) ) != -1 &&
+ GetOptionValue( nOption, fBRy, 0 ) &&
GetOptionUnit( nOption ) == SANE_UNIT_MM )
{
nHeightMM = (int)fabs(fBRy - fTLy);
@@ -836,9 +836,9 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
for( i = 0; i < (aParams.pixels_per_line); i++ )
{
UINT8 nRed, nGreen, nBlue;
- nRed = _ReadValue( pFrame, aParams.depth );
- nGreen = _ReadValue( pFrame, aParams.depth );
- nBlue = _ReadValue( pFrame, aParams.depth );
+ nRed = _ReadValue( pFrame, aParams.depth );
+ nGreen = _ReadValue( pFrame, aParams.depth );
+ nBlue = _ReadValue( pFrame, aParams.depth );
aConverter << nBlue;
aConverter << nGreen;
aConverter << nRed;
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index fdc5e5011534..7cf91a5b9fc5 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -41,28 +41,28 @@
class BitmapTransporter : public OWeakObject, AWT::XBitmap
{
- SvMemoryStream m_aStream;
+ SvMemoryStream m_aStream;
osl::Mutex m_aProtector;
public:
BitmapTransporter();
- virtual ~BitmapTransporter();
+ virtual ~BitmapTransporter();
// XInterface
- virtual ANY SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException );
- virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
- virtual void SAL_CALL release() throw() { OWeakObject::release(); }
+ virtual ANY SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException );
+ virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() { OWeakObject::release(); }
- virtual AWT::Size SAL_CALL getSize() throw();
- virtual SEQ( sal_Int8 ) SAL_CALL getDIB() throw();
- virtual SEQ( sal_Int8 ) SAL_CALL getMaskDIB() throw() { return SEQ( sal_Int8 )(); }
+ virtual AWT::Size SAL_CALL getSize() throw();
+ virtual SEQ( sal_Int8 ) SAL_CALL getDIB() throw();
+ virtual SEQ( sal_Int8 ) SAL_CALL getMaskDIB() throw() { return SEQ( sal_Int8 )(); }
// Misc
- void lock() { m_aProtector.acquire(); }
- void unlock() { m_aProtector.release(); }
- SvMemoryStream& getStream() { return m_aStream; }
+ void lock() { m_aProtector.acquire(); }
+ void unlock() { m_aProtector.release(); }
+ SvMemoryStream& getStream() { return m_aStream; }
};
// --------
@@ -72,46 +72,46 @@ public:
class Sane
{
private:
- static int nRefCount;
+ static int nRefCount;
static oslModule pSaneLib;
- static SANE_Status (*p_init)( SANE_Int*,
+ static SANE_Status (*p_init)( SANE_Int*,
SANE_Auth_Callback );
- static void (*p_exit)();
- static SANE_Status (*p_get_devices)( const SANE_Device***,
+ static void (*p_exit)();
+ static SANE_Status (*p_get_devices)( const SANE_Device***,
SANE_Bool );
- static SANE_Status (*p_open)( SANE_String_Const, SANE_Handle );
- static void (*p_close)( SANE_Handle );
+ static SANE_Status (*p_open)( SANE_String_Const, SANE_Handle );
+ static void (*p_close)( SANE_Handle );
static const SANE_Option_Descriptor* (*p_get_option_descriptor)(
SANE_Handle, SANE_Int );
- static SANE_Status (*p_control_option)( SANE_Handle, SANE_Int,
+ static SANE_Status (*p_control_option)( SANE_Handle, SANE_Int,
SANE_Action, void*,
SANE_Int* );
- static SANE_Status (*p_get_parameters)( SANE_Handle,
+ static SANE_Status (*p_get_parameters)( SANE_Handle,
SANE_Parameters* );
- static SANE_Status (*p_start)( SANE_Handle );
- static SANE_Status (*p_read)( SANE_Handle, SANE_Byte*, SANE_Int,
+ static SANE_Status (*p_start)( SANE_Handle );
+ static SANE_Status (*p_read)( SANE_Handle, SANE_Byte*, SANE_Int,
SANE_Int* );
- static void (*p_cancel)( SANE_Handle );
- static SANE_Status (*p_set_io_mode)( SANE_Handle, SANE_Bool );
- static SANE_Status (*p_get_select_fd)( SANE_Handle, SANE_Int* );
+ static void (*p_cancel)( SANE_Handle );
+ static SANE_Status (*p_set_io_mode)( SANE_Handle, SANE_Bool );
+ static SANE_Status (*p_get_select_fd)( SANE_Handle, SANE_Int* );
static SANE_String_Const (*p_strstatus)( SANE_Status );
- static SANE_Int nVersion;
- static SANE_Device** ppDevices;
- static int nDevices;
+ static SANE_Int nVersion;
+ static SANE_Device** ppDevices;
+ static int nDevices;
- const SANE_Option_Descriptor** mppOptions;
- int mnOptions;
- int mnDevice;
- SANE_Handle maHandle;
+ const SANE_Option_Descriptor** mppOptions;
+ int mnOptions;
+ int mnDevice;
+ SANE_Handle maHandle;
- Link maReloadOptionsLink;
+ Link maReloadOptionsLink;
inline oslGenericFunction
LoadSymbol( const char* );
- void Init();
- void DeInit();
+ void Init();
+ void DeInit();
SANE_Status ControlOption( int, SANE_Action, void* );
@@ -121,64 +121,64 @@ public:
Sane();
~Sane();
- static BOOL IsSane()
+ static BOOL IsSane()
{ return pSaneLib ? TRUE : FALSE; }
- BOOL IsOpen()
+ BOOL IsOpen()
{ return maHandle ? TRUE : FALSE; }
- static int CountDevices()
+ static int CountDevices()
{ return nDevices; }
- static String GetName( int n )
+ static String GetName( int n )
{ return String( ppDevices[n]->name ? ppDevices[n]->name : "", osl_getThreadTextEncoding() ); }
- static String GetVendor( int n )
+ static String GetVendor( int n )
{ return String( ppDevices[n]->vendor ? ppDevices[n]->vendor : "", osl_getThreadTextEncoding() ); }
- static String GetModel( int n )
+ static String GetModel( int n )
{ return String( ppDevices[n]->model ? ppDevices[n]->model : "", osl_getThreadTextEncoding() ); }
- static String GetType( int n )
+ static String GetType( int n )
{ return String( ppDevices[n]->type ? ppDevices[n]->type : "", osl_getThreadTextEncoding() ); }
- String GetOptionName( int n )
+ String GetOptionName( int n )
{ return String( mppOptions[n]->name ? (char*)mppOptions[n]->name : "", osl_getThreadTextEncoding() ); }
- String GetOptionTitle( int n )
+ String GetOptionTitle( int n )
{ return String( mppOptions[n]->title ? (char*)mppOptions[n]->title : "", osl_getThreadTextEncoding() ); }
- SANE_Value_Type GetOptionType( int n )
+ SANE_Value_Type GetOptionType( int n )
{ return mppOptions[n]->type; }
- SANE_Unit GetOptionUnit( int n )
+ SANE_Unit GetOptionUnit( int n )
{ return mppOptions[n]->unit; }
- String GetOptionUnitName( int n );
- SANE_Int GetOptionCap( int n )
+ String GetOptionUnitName( int n );
+ SANE_Int GetOptionCap( int n )
{ return mppOptions[n]->cap; }
SANE_Constraint_Type GetOptionConstraintType( int n )
{ return mppOptions[n]->constraint_type; }
- const char** GetStringConstraint( int n )
+ const char** GetStringConstraint( int n )
{ return (const char**)mppOptions[n]->constraint.string_list; }
- int GetRange( int, double*& );
+ int GetRange( int, double*& );
- inline int GetOptionElements( int n );
- int GetOptionByName( const char* );
- BOOL GetOptionValue( int, BOOL& );
- BOOL GetOptionValue( int, ByteString& );
- BOOL GetOptionValue( int, double&, int nElement = 0 );
- BOOL GetOptionValue( int, double* );
+ inline int GetOptionElements( int n );
+ int GetOptionByName( const char* );
+ BOOL GetOptionValue( int, BOOL& );
+ BOOL GetOptionValue( int, ByteString& );
+ BOOL GetOptionValue( int, double&, int nElement = 0 );
+ BOOL GetOptionValue( int, double* );
- BOOL SetOptionValue( int, BOOL );
- BOOL SetOptionValue( int, const String& );
- BOOL SetOptionValue( int, double, int nElement = 0 );
- BOOL SetOptionValue( int, double* );
+ BOOL SetOptionValue( int, BOOL );
+ BOOL SetOptionValue( int, const String& );
+ BOOL SetOptionValue( int, double, int nElement = 0 );
+ BOOL SetOptionValue( int, double* );
- BOOL ActivateButtonOption( int );
+ BOOL ActivateButtonOption( int );
- int CountOptions() { return mnOptions; }
- int GetDeviceNumber() { return mnDevice; }
+ int CountOptions() { return mnOptions; }
+ int GetDeviceNumber() { return mnDevice; }
- BOOL Open( const char* );
- BOOL Open( int );
- void Close();
- void ReloadDevices();
- void ReloadOptions();
+ BOOL Open( const char* );
+ BOOL Open( int );
+ void Close();
+ void ReloadDevices();
+ void ReloadOptions();
- BOOL Start( BitmapTransporter& );
+ BOOL Start( BitmapTransporter& );
- inline Link SetReloadOptionsHdl( const Link& rLink );
+ inline Link SetReloadOptionsHdl( const Link& rLink );
};
inline int Sane::GetOptionElements( int n )
@@ -191,7 +191,7 @@ inline int Sane::GetOptionElements( int n )
return 1;
}
-inline Link Sane::SetReloadOptionsHdl( const Link& rLink )
+inline Link Sane::SetReloadOptionsHdl( const Link& rLink )
{
Link aRet = maReloadOptionsLink;
maReloadOptionsLink = rLink;
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index d1e8ed07ad58..98c654695ee4 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -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
@@ -122,10 +122,10 @@ SaneDlg::SaneDlg( Window* pParent, Sane& rSane ) :
Bitmap( SaneResId( RID_SCAN_BITMAP_PLUS ) ),
Bitmap( SaneResId( RID_SCAN_BITMAP_MINUS ) )
);
- maOptionBox.SetWindowBits( WB_HASLINES |
- WB_HASBUTTONS |
- WB_NOINITIALSELECTION |
- WB_HASBUTTONSATROOT |
+ maOptionBox.SetWindowBits( WB_HASLINES |
+ WB_HASBUTTONS |
+ WB_NOINITIALSELECTION |
+ WB_HASBUTTONSATROOT |
WB_HASLINESATROOT
);
FreeResource();
@@ -225,9 +225,9 @@ void SaneDlg::InitFields()
maReslBox.SetMax( (long)pDouble[1] );
maReslBox.InsertValue( (long)pDouble[0] );
// mh@openoffice.org: issue 68557: Can only select 75 and 2400 dpi in Scanner dialogue
- // scanner allows random setting of dpi resolution, a slider might be useful
+ // scanner allows random setting of dpi resolution, a slider might be useful
// support that
- // workaround: offer at least some more standard dpi resolution between
+ // workaround: offer at least some more standard dpi resolution between
// min and max value
int bGot300 = 0;
for ( int nRes = (long) pDouble[0] * 2; nRes < (long) pDouble[1]; nRes = nRes * 2 )
@@ -291,8 +291,8 @@ void SaneDlg::InitFields()
}
switch( i ) {
case 0: maTopLeft.X() = (int)fValue;break;
- case 1: maTopLeft.Y() = (int)fValue;break;
- case 2: maBottomRight.X() = (int)fValue;break;
+ case 1: maTopLeft.Y() = (int)fValue;break;
+ case 2: maBottomRight.X() = (int)fValue;break;
case 3: maBottomRight.Y() = (int)fValue;break;
}
}
@@ -460,7 +460,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
aGrid.setBoundings( 0, mfMin, nElements, mfMax );
if( aGrid.Execute() && aGrid.getNewYValues() )
mrSane.SetOptionValue( mnCurrentOption, aGrid.getNewYValues() );
-
+
delete [] x;
delete [] y;
}
@@ -537,7 +537,7 @@ IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox )
SANE_Constraint_Type nConstraint;
switch( nType )
{
- case SANE_TYPE_BOOL: EstablishBoolOption();break;
+ case SANE_TYPE_BOOL: EstablishBoolOption();break;
case SANE_TYPE_STRING:
nConstraint = mrSane.GetOptionConstraintType( mnCurrentOption );
if( nConstraint == SANE_CONSTRAINT_STRING_LIST )
@@ -931,20 +931,20 @@ void SaneDlg::MouseMove( const MouseEvent& rMEvt )
aMousePos = GetPixelPos( aLogicPos );
switch( meDragDirection )
{
- case TopLeft: maTopLeft = aMousePos; break;
- case Top: maTopLeft.Y() = aMousePos.Y(); break;
+ case TopLeft: maTopLeft = aMousePos; break;
+ case Top: maTopLeft.Y() = aMousePos.Y(); break;
case TopRight:
maTopLeft.Y() = aMousePos.Y();
maBottomRight.X() = aMousePos.X();
break;
- case Right: maBottomRight.X() = aMousePos.X(); break;
- case BottomRight: maBottomRight = aMousePos; break;
- case Bottom: maBottomRight.Y() = aMousePos.Y(); break;
+ case Right: maBottomRight.X() = aMousePos.X(); break;
+ case BottomRight: maBottomRight = aMousePos; break;
+ case Bottom: maBottomRight.Y() = aMousePos.Y(); break;
case BottomLeft:
maTopLeft.X() = aMousePos.X();
maBottomRight.Y() = aMousePos.Y();
break;
- case Left: maTopLeft.X() = aMousePos.X(); break;
+ case Left: maTopLeft.X() = aMousePos.X(); break;
default: break;
}
int nSwap;
diff --git a/extensions/source/scanner/sanedlg.hrc b/extensions/source/scanner/sanedlg.hrc
index ca893122c9a9..711caff9ac2b 100644
--- a/extensions/source/scanner/sanedlg.hrc
+++ b/extensions/source/scanner/sanedlg.hrc
@@ -1,7 +1,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
@@ -27,56 +27,56 @@
#ifndef _SVT_SANEDLG_HRC
#define _SVT_SANEDLG_HRC
-#define RID_SANE_DIALOG 1000
-#define RID_SCAN_OK 1
-#define RID_SCAN_CANCEL 2
-#define RID_DEVICEINFO_BTN 3
-#define RID_PREVIEW_BOX 4
-#define RID_DEVICE_BOX_TXT 5
-#define RID_DEVICE_BOX 6
-#define RID_SCANAREA_BOX 7
-#define RID_SCAN_LEFT_TXT 8
-#define RID_SCAN_LEFT_BOX 9
-#define RID_SCAN_TOP_BOX 10
-#define RID_SCAN_TOP_TXT 11
-#define RID_SCAN_RIGHT_TXT 12
-#define RID_SCAN_RIGHT_BOX 13
-#define RID_SCAN_BOTTOM_TXT 14
-#define RID_SCAN_BOTTOM_BOX 15
-#define RID_SCAN_RESOLUTION_TXT 16
-#define RID_SCAN_RESOLUTION_BOX 17
-#define RID_PREVIEW_BTN 18
-#define RID_SCAN_OPTION_BOX 19
-#define RID_SCAN_OPTIONTITLE_TXT 20
-#define RID_SCAN_OPTION_DESC_TXT 21
-#define RID_SCAN_BOOL_OPTION_BOX 22
-#define RID_SCAN_OPTION_TXT 23
-#define RID_SCAN_STRING_OPTION_EDT 24
-#define RID_SCAN_QUANTUM_RANGE_BOX 25
-#define RID_SCAN_STRING_RANGE_BOX 26
-#define RID_SCAN_NUMERIC_OPTION_EDT 27
-#define RID_SCAN_BUTTON_OPTION_BTN 28
-#define RID_SCAN_NUMERIC_VECTOR_BOX 29
-#define RID_SCAN_NUMERIC_VECTOR_TXT 30
-#define RID_SCAN_BITMAP_PLUS 31
-#define RID_SCAN_BITMAP_MINUS 32
-#define RID_SCAN_ADVANCED_BOX 33
-#define RID_SCAN_ADVANCED_TXT 34
+#define RID_SANE_DIALOG 1000
+#define RID_SCAN_OK 1
+#define RID_SCAN_CANCEL 2
+#define RID_DEVICEINFO_BTN 3
+#define RID_PREVIEW_BOX 4
+#define RID_DEVICE_BOX_TXT 5
+#define RID_DEVICE_BOX 6
+#define RID_SCANAREA_BOX 7
+#define RID_SCAN_LEFT_TXT 8
+#define RID_SCAN_LEFT_BOX 9
+#define RID_SCAN_TOP_BOX 10
+#define RID_SCAN_TOP_TXT 11
+#define RID_SCAN_RIGHT_TXT 12
+#define RID_SCAN_RIGHT_BOX 13
+#define RID_SCAN_BOTTOM_TXT 14
+#define RID_SCAN_BOTTOM_BOX 15
+#define RID_SCAN_RESOLUTION_TXT 16
+#define RID_SCAN_RESOLUTION_BOX 17
+#define RID_PREVIEW_BTN 18
+#define RID_SCAN_OPTION_BOX 19
+#define RID_SCAN_OPTIONTITLE_TXT 20
+#define RID_SCAN_OPTION_DESC_TXT 21
+#define RID_SCAN_BOOL_OPTION_BOX 22
+#define RID_SCAN_OPTION_TXT 23
+#define RID_SCAN_STRING_OPTION_EDT 24
+#define RID_SCAN_QUANTUM_RANGE_BOX 25
+#define RID_SCAN_STRING_RANGE_BOX 26
+#define RID_SCAN_NUMERIC_OPTION_EDT 27
+#define RID_SCAN_BUTTON_OPTION_BTN 28
+#define RID_SCAN_NUMERIC_VECTOR_BOX 29
+#define RID_SCAN_NUMERIC_VECTOR_TXT 30
+#define RID_SCAN_BITMAP_PLUS 31
+#define RID_SCAN_BITMAP_MINUS 32
+#define RID_SCAN_ADVANCED_BOX 33
+#define RID_SCAN_ADVANCED_TXT 34
-#define RID_SANE_DEVICEINFO_TXT 1001
-#define RID_SANE_SCANERROR_TXT 1002
-#define RID_SANE_NORESOLUTIONOPTION_TXT 1003
-#define RID_SANE_NOSANELIB_TXT 1004
+#define RID_SANE_DEVICEINFO_TXT 1001
+#define RID_SANE_SCANERROR_TXT 1002
+#define RID_SANE_NORESOLUTIONOPTION_TXT 1003
+#define RID_SANE_NOSANELIB_TXT 1004
-#define SCAN_AREA_TOP 17
-#define SCAN_AREA_LEFT 8
+#define SCAN_AREA_TOP 17
+#define SCAN_AREA_LEFT 8
#define PREVIEW_UPPER_LEFT SCAN_AREA_LEFT
#define PREVIEW_UPPER_TOP SCAN_AREA_TOP + 80
#define PREVIEW_WIDTH 113
#define PREVIEW_HEIGHT 160
-#define PREVIEW_BOTTOM PREVIEW_UPPER_TOP + PREVIEW_HEIGHT
-#define PREVIEW_RIGHT PREVIEW_UPPER_LEFT + PREVIEW_WIDTH
-#define SECOND_COLUMN PREVIEW_WIDTH + 20
-#define THIRD_COLUMN SECOND_COLUMN + 135
+#define PREVIEW_BOTTOM PREVIEW_UPPER_TOP + PREVIEW_HEIGHT
+#define PREVIEW_RIGHT PREVIEW_UPPER_LEFT + PREVIEW_WIDTH
+#define SECOND_COLUMN PREVIEW_WIDTH + 20
+#define THIRD_COLUMN SECOND_COLUMN + 135
#endif
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 8019f5b38d5c..cacd411afdb5 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.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
@@ -46,66 +46,66 @@ private:
enum DragDirection { TopLeft, Top, TopRight, Right, BottomRight, Bottom,
BottomLeft, Left };
- Sane& mrSane;
- Bitmap maPreviewBitmap;
- Rectangle maPreviewRect;
- Point maTopLeft, maBottomRight;
- Point maMinTopLeft, maMaxBottomRight;
- BOOL mbDragEnable;
- BOOL mbIsDragging;
- int mnDragMode;
- BOOL mbDragDrawn;
- DragDirection meDragDirection;
-
- MapMode maMapMode;
-
- Link maOldLink;
-
- OKButton maOKButton;
- CancelButton maCancelButton;
- PushButton maDeviceInfoButton;
- PushButton maPreviewButton;
- PushButton maButtonOption;
-
- FixedText maOptionsTxt;
- FixedText maOptionTitle;
- FixedText maOptionDescTxt;
- FixedText maVectorTxt;
-
- FixedText maScanLeftTxt;
- MetricField maLeftField;
- FixedText maScanTopTxt;
- MetricField maTopField;
- FixedText maRightTxt;
- MetricField maRightField;
- FixedText maBottomTxt;
- MetricField maBottomField;
-
- FixedText maDeviceBoxTxt;
- ListBox maDeviceBox;
- FixedText maReslTxt;
- NumericBox maReslBox;
- FixedText maAdvancedTxt;
- CheckBox maAdvancedBox;
-
- NumericField maVectorBox;
- ListBox maQuantumRangeBox;
- ListBox maStringRangeBox;
-
- FixedLine maPreviewBox;
- FixedLine maAreaBox;
-
- CheckBox maBoolCheckBox;
-
- Edit maStringEdit;
- Edit maNumericEdit;
-
- SvTreeListBox maOptionBox;
-
- int mnCurrentOption;
- int mnCurrentElement;
- double* mpRange;
- double mfMin, mfMax;
+ Sane& mrSane;
+ Bitmap maPreviewBitmap;
+ Rectangle maPreviewRect;
+ Point maTopLeft, maBottomRight;
+ Point maMinTopLeft, maMaxBottomRight;
+ BOOL mbDragEnable;
+ BOOL mbIsDragging;
+ int mnDragMode;
+ BOOL mbDragDrawn;
+ DragDirection meDragDirection;
+
+ MapMode maMapMode;
+
+ Link maOldLink;
+
+ OKButton maOKButton;
+ CancelButton maCancelButton;
+ PushButton maDeviceInfoButton;
+ PushButton maPreviewButton;
+ PushButton maButtonOption;
+
+ FixedText maOptionsTxt;
+ FixedText maOptionTitle;
+ FixedText maOptionDescTxt;
+ FixedText maVectorTxt;
+
+ FixedText maScanLeftTxt;
+ MetricField maLeftField;
+ FixedText maScanTopTxt;
+ MetricField maTopField;
+ FixedText maRightTxt;
+ MetricField maRightField;
+ FixedText maBottomTxt;
+ MetricField maBottomField;
+
+ FixedText maDeviceBoxTxt;
+ ListBox maDeviceBox;
+ FixedText maReslTxt;
+ NumericBox maReslBox;
+ FixedText maAdvancedTxt;
+ CheckBox maAdvancedBox;
+
+ NumericField maVectorBox;
+ ListBox maQuantumRangeBox;
+ ListBox maStringRangeBox;
+
+ FixedLine maPreviewBox;
+ FixedLine maAreaBox;
+
+ CheckBox maBoolCheckBox;
+
+ Edit maStringEdit;
+ Edit maNumericEdit;
+
+ SvTreeListBox maOptionBox;
+
+ int mnCurrentOption;
+ int mnCurrentElement;
+ double* mpRange;
+ double mfMin, mfMax;
DECL_LINK( ClickBtnHdl, Button* );
DECL_LINK( SelectHdl, ListBox* );
@@ -135,7 +135,7 @@ private:
// helper
BOOL SetAdjustedNumericalValue( const char* pOption, double fValue, int nElement = 0 );
-
+
virtual void Paint( const Rectangle& );
virtual void MouseMove( const MouseEvent& rMEvt );
virtual void MouseButtonDown( const MouseEvent& rMEvt );
diff --git a/extensions/source/scanner/sanedlg.src b/extensions/source/scanner/sanedlg.src
index 2c4cc338ab8a..2b41785c880d 100644
--- a/extensions/source/scanner/sanedlg.src
+++ b/extensions/source/scanner/sanedlg.src
@@ -1,7 +1,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
diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx
index e833c4f1d56d..97d8b925c1e4 100644
--- a/extensions/source/scanner/scanner.cxx
+++ b/extensions/source/scanner/scanner.cxx
@@ -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
@@ -58,7 +58,7 @@ ScannerManager::~ScannerManager()
ANY SAL_CALL ScannerManager::queryInterface( const Type& rType ) throw( RuntimeException )
{
- const ANY aRet( cppu::queryInterface( rType,
+ const ANY aRet( cppu::queryInterface( rType,
static_cast< XScannerManager* >( this ),
static_cast< AWT::XBitmap* >( this ) ) );
@@ -83,7 +83,7 @@ void SAL_CALL ScannerManager::release() throw()
SEQ( sal_Int8 ) SAL_CALL ScannerManager::getMaskDIB() throw()
{
- return SEQ( sal_Int8 )();
+ return SEQ( sal_Int8 )();
}
// -----------------------------------------------------------------------------
@@ -98,9 +98,9 @@ OUString ScannerManager::getImplementationName_Static() throw()
SEQ( OUString ) ScannerManager::getSupportedServiceNames_Static() throw ()
{
SEQ( OUString ) aSNS( 1 );
-
- aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" ) );
-
+
+ aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" ) );
+
return aSNS;
}
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index b263ecaa0802..f8420bd4483f 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.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
@@ -52,10 +52,10 @@ using namespace com::sun::star::scanner;
// - Defines -
// -----------
-#define REF( _def_Obj ) Reference< _def_Obj >
-#define SEQ( _def_Obj ) Sequence< _def_Obj >
-#define ANY Any
-#define AWT com::sun::star::awt
+#define REF( _def_Obj ) Reference< _def_Obj >
+#define SEQ( _def_Obj ) Sequence< _def_Obj >
+#define ANY Any
+#define AWT com::sun::star::awt
// ------------------
// - ScannerManager -
@@ -66,42 +66,42 @@ class ScannerManager : public OWeakObject, XScannerManager, AWT::XBitmap
protected:
osl::Mutex maProtector;
- void* mpData;
+ void* mpData;
- void AcquireData();
- void ReleaseData();
+ void AcquireData();
+ void ReleaseData();
public:
ScannerManager();
- virtual ~ScannerManager();
-
- // XInterface
- virtual ANY SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException );
- virtual void SAL_CALL acquire() throw();
- virtual void SAL_CALL release() throw();
+ virtual ~ScannerManager();
+
+ // XInterface
+ virtual ANY SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException );
+ virtual void SAL_CALL acquire() throw();
+ virtual void SAL_CALL release() throw();
// XScannerManager
- virtual SEQ( ScannerContext ) SAL_CALL getAvailableScanners() throw();
- virtual BOOL SAL_CALL configureScanner( ScannerContext& scanner_context ) throw( ScannerException );
- virtual void SAL_CALL startScan( const ScannerContext& scanner_context, const REF( com::sun::star::lang::XEventListener )& rxListener ) throw( ScannerException );
- virtual ScanError SAL_CALL getError( const ScannerContext& scanner_context ) throw( ScannerException );
- virtual REF( AWT::XBitmap ) SAL_CALL getBitmap( const ScannerContext& scanner_context ) throw( ScannerException );
+ virtual SEQ( ScannerContext ) SAL_CALL getAvailableScanners() throw();
+ virtual BOOL SAL_CALL configureScanner( ScannerContext& scanner_context ) throw( ScannerException );
+ virtual void SAL_CALL startScan( const ScannerContext& scanner_context, const REF( com::sun::star::lang::XEventListener )& rxListener ) throw( ScannerException );
+ virtual ScanError SAL_CALL getError( const ScannerContext& scanner_context ) throw( ScannerException );
+ virtual REF( AWT::XBitmap ) SAL_CALL getBitmap( const ScannerContext& scanner_context ) throw( ScannerException );
// XBitmap
- virtual AWT::Size SAL_CALL getSize() throw();
- virtual SEQ( sal_Int8 ) SAL_CALL getDIB() throw();
- virtual SEQ( sal_Int8 ) SAL_CALL getMaskDIB() throw();
+ virtual AWT::Size SAL_CALL getSize() throw();
+ virtual SEQ( sal_Int8 ) SAL_CALL getDIB() throw();
+ virtual SEQ( sal_Int8 ) SAL_CALL getMaskDIB() throw();
// Misc
- static OUString getImplementationName_Static() throw();
- static Sequence< OUString > getSupportedServiceNames_Static() throw();
+ static OUString getImplementationName_Static() throw();
+ static Sequence< OUString > getSupportedServiceNames_Static() throw();
- void Lock() { maProtector.acquire(); }
- void Unlock() { maProtector.release(); }
+ void Lock() { maProtector.acquire(); }
+ void Unlock() { maProtector.release(); }
- void* GetData() const { return mpData; }
- void SetData( void* pData ) { ReleaseData(); mpData = pData; }
+ void* GetData() const { return mpData; }
+ void SetData( void* pData ) { ReleaseData(); mpData = pData; }
};
// -----------------------------------------------------------------------------
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 7043c3d9a971..0dcf457713b9 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -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
@@ -66,8 +66,8 @@ ANY SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( Runti
AWT::Size BitmapTransporter::getSize() throw()
{
osl::MutexGuard aGuard( m_aProtector );
- int nPreviousPos = m_aStream.Tell();
- AWT::Size aRet;
+ int nPreviousPos = m_aStream.Tell();
+ AWT::Size aRet;
// ensure that there is at least a header
m_aStream.Seek( STREAM_SEEK_TO_END );
@@ -90,7 +90,7 @@ AWT::Size BitmapTransporter::getSize() throw()
SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw()
{
osl::MutexGuard aGuard( m_aProtector );
- int nPreviousPos = m_aStream.Tell();
+ int nPreviousPos = m_aStream.Tell();
// create return value
m_aStream.Seek( STREAM_SEEK_TO_END );
@@ -110,11 +110,11 @@ SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw()
struct SaneHolder
{
- Sane m_aSane;
- REF( AWT::XBitmap ) m_xBitmap;
+ Sane m_aSane;
+ REF( AWT::XBitmap ) m_xBitmap;
osl::Mutex m_aProtector;
- ScanError m_nError;
- bool m_bBusy;
+ ScanError m_nError;
+ bool m_bBusy;
SaneHolder() : m_nError(ScanError_ScanErrorNone), m_bBusy(false) {}
};
@@ -157,9 +157,9 @@ namespace
class ScannerThread : public osl::Thread
{
- boost::shared_ptr<SaneHolder> m_pHolder;
- REF( com::sun::star::lang::XEventListener ) m_xListener;
- ScannerManager* m_pManager; // just for the disposing call
+ boost::shared_ptr<SaneHolder> m_pHolder;
+ REF( com::sun::star::lang::XEventListener ) m_xListener;
+ ScannerManager* m_pManager; // just for the disposing call
public:
virtual void run();
@@ -193,9 +193,9 @@ ScannerThread::~ScannerThread()
void ScannerThread::run()
{
- osl::MutexGuard aGuard( m_pHolder->m_aProtector );
- BitmapTransporter* pTransporter = new BitmapTransporter;
- REF( XInterface ) aIf( static_cast< OWeakObject* >( pTransporter ) );
+ osl::MutexGuard aGuard( m_pHolder->m_aProtector );
+ BitmapTransporter* pTransporter = new BitmapTransporter;
+ REF( XInterface ) aIf( static_cast< OWeakObject* >( pTransporter ) );
m_pHolder->m_xBitmap = REF( AWT::XBitmap )( aIf, UNO_QUERY );
@@ -268,8 +268,8 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
if( Sane::IsSane() )
{
SEQ( ScannerContext ) aRet(1);
- aRet.getArray()[0].ScannerName = ::rtl::OUString::createFromAscii( "SANE" );
- aRet.getArray()[0].InternalData = 0;
+ aRet.getArray()[0].ScannerName = ::rtl::OUString::createFromAscii( "SANE" );
+ aRet.getArray()[0].InternalData = 0;
return aRet;
}
@@ -306,7 +306,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
SaneDlg aDlg( NULL, pHolder->m_aSane );
BOOL bRet = (BOOL)aDlg.Execute();
pHolder->m_bBusy = false;
-
+
return bRet;
}
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 457be67d0f9b..a23181a66624 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -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
@@ -61,26 +61,26 @@ using namespace ::com::sun::star;
// - Defines -
// -----------
-#define TWAIN_SELECT 0x00000001UL
-#define TWAIN_ACQUIRE 0x00000002UL
-#define TWAIN_TERMINATE 0xFFFFFFFFUL
-
-#define TWAIN_EVENT_NONE 0x00000000UL
-#define TWAIN_EVENT_QUIT 0x00000001UL
-#define TWAIN_EVENT_SCANNING 0x00000002UL
-#define TWAIN_EVENT_XFER 0x00000004UL
-
-#define PFUNC (*pDSM)
-#define PTWAINMSG MSG*
-#define FIXTODOUBLE( nFix ) ((double)nFix.Whole+(double)nFix.Frac/65536.)
-#define FIXTOLONG( nFix ) ((long)floor(FIXTODOUBLE(nFix)+0.5))
-
-#if defined WIN
-#define TWAIN_LIBNAME "TWAIN.DLL"
-#define TWAIN_FUNCNAME "DSM_Entry"
-#elif defined WNT
-#define TWAIN_LIBNAME "TWAIN_32.DLL"
-#define TWAIN_FUNCNAME "DSM_Entry"
+#define TWAIN_SELECT 0x00000001UL
+#define TWAIN_ACQUIRE 0x00000002UL
+#define TWAIN_TERMINATE 0xFFFFFFFFUL
+
+#define TWAIN_EVENT_NONE 0x00000000UL
+#define TWAIN_EVENT_QUIT 0x00000001UL
+#define TWAIN_EVENT_SCANNING 0x00000002UL
+#define TWAIN_EVENT_XFER 0x00000004UL
+
+#define PFUNC (*pDSM)
+#define PTWAINMSG MSG*
+#define FIXTODOUBLE( nFix ) ((double)nFix.Whole+(double)nFix.Frac/65536.)
+#define FIXTOLONG( nFix ) ((long)floor(FIXTODOUBLE(nFix)+0.5))
+
+#if defined WIN
+#define TWAIN_LIBNAME "TWAIN.DLL"
+#define TWAIN_FUNCNAME "DSM_Entry"
+#elif defined WNT
+#define TWAIN_LIBNAME "TWAIN_32.DLL"
+#define TWAIN_FUNCNAME "DSM_Entry"
#endif
// --------------
@@ -103,31 +103,31 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
{
friend LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam );
- uno::Reference< uno::XInterface > mxSelfRef;
- uno::Reference< scanner::XScannerManager > mxMgr;
- ScannerManager& mrMgr;
- TW_IDENTITY aAppIdent;
- TW_IDENTITY aSrcIdent;
- Link aNotifyLink;
- DSMENTRYPROC pDSM;
+ uno::Reference< uno::XInterface > mxSelfRef;
+ uno::Reference< scanner::XScannerManager > mxMgr;
+ ScannerManager& mrMgr;
+ TW_IDENTITY aAppIdent;
+ TW_IDENTITY aSrcIdent;
+ Link aNotifyLink;
+ DSMENTRYPROC pDSM;
osl::Module* pMod;
- ULONG nCurState;
- HWND hTwainWnd;
- HHOOK hTwainHook;
- bool mbCloseFrameOnExit;
-
- bool ImplHandleMsg( void* pMsg );
- void ImplCreate();
- void ImplOpenSourceManager();
- void ImplOpenSource();
- bool ImplEnableSource();
- void ImplXfer();
- void ImplFallback( ULONG nEvent );
- void ImplSendCloseEvent();
- void ImplDeregisterCloseListener();
- void ImplRegisterCloseListener();
- uno::Reference< frame::XFrame > ImplGetActiveFrame();
- uno::Reference< util::XCloseBroadcaster > ImplGetActiveFrameCloseBroadcaster();
+ ULONG nCurState;
+ HWND hTwainWnd;
+ HHOOK hTwainHook;
+ bool mbCloseFrameOnExit;
+
+ bool ImplHandleMsg( void* pMsg );
+ void ImplCreate();
+ void ImplOpenSourceManager();
+ void ImplOpenSource();
+ bool ImplEnableSource();
+ void ImplXfer();
+ void ImplFallback( ULONG nEvent );
+ void ImplSendCloseEvent();
+ void ImplDeregisterCloseListener();
+ void ImplRegisterCloseListener();
+ uno::Reference< frame::XFrame > ImplGetActiveFrame();
+ uno::Reference< util::XCloseBroadcaster > ImplGetActiveFrameCloseBroadcaster();
DECL_LINK( ImplFallbackHdl, void* );
DECL_LINK( ImplDestroyHdl, void* );
@@ -144,10 +144,10 @@ public:
ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink );
~ImpTwain();
- void Destroy();
+ void Destroy();
- bool SelectSource();
- bool InitXfer();
+ bool SelectSource();
+ bool InitXfer();
};
// ---------
@@ -177,7 +177,7 @@ LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
{
pMsg->message = WM_USER;
pMsg->lParam = 0;
-
+
return 0;
}
}
@@ -206,8 +206,8 @@ ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) :
aAppIdent.Version.Country = TWCY_USA;
aAppIdent.ProtocolMajor = TWON_PROTOCOLMAJOR;
aAppIdent.ProtocolMinor = TWON_PROTOCOLMINOR;
- aAppIdent.SupportedGroups = DG_IMAGE | DG_CONTROL;
- strncpy( aAppIdent.Version.Info, "8.0", 32 );
+ aAppIdent.SupportedGroups = DG_IMAGE | DG_CONTROL;
+ strncpy( aAppIdent.Version.Info, "8.0", 32 );
aAppIdent.Version.Info[32] = aAppIdent.Version.Info[33] = 0;
strncpy( aAppIdent.Manufacturer, "Sun Microsystems", 32 );
aAppIdent.Manufacturer[32] = aAppIdent.Manufacturer[33] = 0;
@@ -218,7 +218,7 @@ ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) :
WNDCLASS aWc = { 0, &TwainWndProc, 0, sizeof( WNDCLASS ), GetModuleHandle( NULL ), NULL, NULL, NULL, NULL, "TwainClass" };
RegisterClass( &aWc );
-
+
hTwainWnd = CreateWindowEx( WS_EX_TOPMOST, aWc.lpszClassName, "TWAIN", 0, 0, 0, 0, 0, HWND_DESKTOP, NULL, aWc.hInstance, 0 );
hTwainHook = SetWindowsHookEx( WH_GETMESSAGE, &TwainMsgProc, NULL, GetCurrentThreadId() );
@@ -322,8 +322,8 @@ void ImpTwain::ImplOpenSource()
if( ( PFUNC( &aAppIdent, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETDEFAULT, &aSrcIdent ) == TWRC_SUCCESS ) &&
( PFUNC( &aAppIdent, NULL, DG_CONTROL, DAT_IDENTITY, MSG_OPENDS, &aSrcIdent ) == TWRC_SUCCESS ) )
{
- TW_CAPABILITY aCap = { CAP_XFERCOUNT, TWON_ONEVALUE, GlobalAlloc( GHND, sizeof( TW_ONEVALUE ) ) };
- TW_ONEVALUE* pVal = (TW_ONEVALUE*) GlobalLock( aCap.hContainer );
+ TW_CAPABILITY aCap = { CAP_XFERCOUNT, TWON_ONEVALUE, GlobalAlloc( GHND, sizeof( TW_ONEVALUE ) ) };
+ TW_ONEVALUE* pVal = (TW_ONEVALUE*) GlobalLock( aCap.hContainer );
pVal->ItemType = TWTY_INT16, pVal->Item = 1;
GlobalUnlock( aCap.hContainer );
@@ -370,9 +370,9 @@ bool ImpTwain::ImplEnableSource()
bool ImpTwain::ImplHandleMsg( void* pMsg )
{
- TW_UINT16 nRet;
- PTWAINMSG pMess = (PTWAINMSG) pMsg;
- TW_EVENT aEvt = { pMess, MSG_NULL };
+ TW_UINT16 nRet;
+ PTWAINMSG pMess = (PTWAINMSG) pMsg;
+ TW_EVENT aEvt = { pMess, MSG_NULL };
nRet = PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_EVENT, MSG_PROCESSEVENT, &aEvt );
@@ -396,7 +396,7 @@ bool ImpTwain::ImplHandleMsg( void* pMsg )
ImplFallback( nEvent );
}
break;
-
+
case MSG_CLOSEDSREQ:
ImplFallback( TWAIN_EVENT_QUIT );
break;
@@ -417,9 +417,9 @@ void ImpTwain::ImplXfer()
{
if( nCurState == 6 )
{
- TW_IMAGEINFO aInfo;
- TW_UINT32 hDIB = 0;
- long nWidth, nHeight, nXRes, nYRes;
+ TW_IMAGEINFO aInfo;
+ TW_UINT32 hDIB = 0;
+ long nWidth, nHeight, nXRes, nYRes;
if( PFUNC( &aAppIdent, &aSrcIdent, DG_IMAGE, DAT_IMAGEINFO, MSG_GET, &aInfo ) == TWRC_SUCCESS )
{
@@ -444,8 +444,8 @@ void ImpTwain::ImplXfer()
if( ( nXRes != -1 ) && ( nYRes != - 1 ) && ( nWidth != - 1 ) && ( nHeight != - 1 ) )
{
// set resolution of bitmap
- BITMAPINFOHEADER* pBIH = (BITMAPINFOHEADER*) GlobalLock( (HGLOBAL) hDIB );
- static const double fFactor = 100.0 / 2.54;
+ BITMAPINFOHEADER* pBIH = (BITMAPINFOHEADER*) GlobalLock( (HGLOBAL) hDIB );
+ static const double fFactor = 100.0 / 2.54;
pBIH->biXPelsPerMeter = FRound( fFactor * nXRes );
pBIH->biYPelsPerMeter = FRound( fFactor * nYRes );
@@ -479,8 +479,8 @@ void ImpTwain::ImplFallback( ULONG nEvent )
IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
{
- const ULONG nEvent = (ULONG) pData;
- bool bFallback = true;
+ const ULONG nEvent = (ULONG) pData;
+ bool bFallback = true;
switch( nCurState )
{
@@ -502,7 +502,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
case( 5 ):
{
TW_USERINTERFACE aUI = { true, true, hTwainWnd };
-
+
PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_DISABLEDS, &aUI );
nCurState = 4;
@@ -580,7 +580,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
// query desktop instance
uno::Reference< frame::XDesktop > xDesktop( xMgr->createInstance(
OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), uno::UNO_QUERY );
-
+
if( xDesktop.is() )
{
// query property set from desktop, which contains the currently active frame
@@ -603,7 +603,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
}
uno::Reference< frame::XFrame > xActiveFrame;
-
+
if( (aActiveFrame >>= xActiveFrame) &&
xActiveFrame.is() )
{
@@ -644,7 +644,7 @@ void ImpTwain::ImplRegisterCloseListener()
try
{
uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( ImplGetActiveFrameCloseBroadcaster() );
-
+
if( xCloseBroadcaster.is() )
{
xCloseBroadcaster->addCloseListener(this);
@@ -670,9 +670,9 @@ void ImpTwain::ImplDeregisterCloseListener()
{
try
{
- uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster(
+ uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster(
ImplGetActiveFrameCloseBroadcaster() );
-
+
if( xCloseBroadcaster.is() )
{
xCloseBroadcaster->removeCloseListener(this);
@@ -725,7 +725,7 @@ void ImpTwain::ImplSendCloseEvent()
try
{
uno::Reference< util::XCloseable > xCloseable( ImplGetActiveFrame(), uno::UNO_QUERY );
-
+
if( xCloseable.is() )
xCloseable->close( true );
}
@@ -743,23 +743,23 @@ void ImpTwain::ImplSendCloseEvent()
class Twain
{
- uno::Reference< lang::XEventListener > mxListener;
- uno::Reference< scanner::XScannerManager > mxMgr;
- const ScannerManager* mpCurMgr;
- ImpTwain* mpImpTwain;
- TwainState meState;
-
+ uno::Reference< lang::XEventListener > mxListener;
+ uno::Reference< scanner::XScannerManager > mxMgr;
+ const ScannerManager* mpCurMgr;
+ ImpTwain* mpImpTwain;
+ TwainState meState;
+
DECL_LINK( ImpNotifyHdl, ImpTwain* );
-
-public:
-
+
+public:
+
Twain();
~Twain();
-
- bool SelectSource( ScannerManager& rMgr );
- bool PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::XEventListener >& rxListener );
-
- TwainState GetState() const { return meState; }
+
+ bool SelectSource( ScannerManager& rMgr );
+ bool PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::XEventListener >& rxListener );
+
+ TwainState GetState() const { return meState; }
};
// ------------------------------------------------------------------------
@@ -790,7 +790,7 @@ bool Twain::SelectSource( ScannerManager& rMgr )
// #107835# hold reference to ScannerManager, to prevent premature death
mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ),
uno::UNO_QUERY ),
-
+
meState = TWAIN_STATE_NONE;
mpImpTwain = new ImpTwain( rMgr, LINK( this, Twain, ImpNotifyHdl ) );
bRet = mpImpTwain->SelectSource();
@@ -812,7 +812,7 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X
// #107835# hold reference to ScannerManager, to prevent premature death
mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ),
uno::UNO_QUERY ),
-
+
mxListener = rxListener;
meState = TWAIN_STATE_NONE;
mpImpTwain = new ImpTwain( rMgr, LINK( this, Twain, ImpNotifyHdl ) );
@@ -858,7 +858,7 @@ IMPL_LINK( Twain, ImpNotifyHdl, ImpTwain*, nEvent )
if( mpImpTwain )
{
meState = ( mpCurMgr->GetData() ? TWAIN_STATE_DONE : TWAIN_STATE_CANCELED );
-
+
mpImpTwain->Destroy();
mpImpTwain = NULL;
mpCurMgr = NULL;
@@ -905,8 +905,8 @@ void ScannerManager::ReleaseData()
AWT::Size ScannerManager::getSize() throw()
{
- AWT::Size aRet;
- HGLOBAL hDIB = (HGLOBAL)(long) mpData;
+ AWT::Size aRet;
+ HGLOBAL hDIB = (HGLOBAL)(long) mpData;
if( hDIB )
{
@@ -915,7 +915,7 @@ AWT::Size ScannerManager::getSize() throw()
if( pBIH )
{
aRet.Width = pBIH->biWidth;
- aRet.Height = pBIH->biHeight;
+ aRet.Height = pBIH->biHeight;
}
else
aRet.Width = aRet.Height = 0;
@@ -936,13 +936,13 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
if( mpData )
{
- HGLOBAL hDIB = (HGLOBAL)(long) mpData;
- const sal_uInt32 nDIBSize = GlobalSize( hDIB );
- BITMAPINFOHEADER* pBIH = (BITMAPINFOHEADER*) GlobalLock( hDIB );
+ HGLOBAL hDIB = (HGLOBAL)(long) mpData;
+ const sal_uInt32 nDIBSize = GlobalSize( hDIB );
+ BITMAPINFOHEADER* pBIH = (BITMAPINFOHEADER*) GlobalLock( hDIB );
if( pBIH )
{
- sal_uInt32 nColEntries;
+ sal_uInt32 nColEntries;
switch( pBIH->biBitCount )
{
@@ -972,8 +972,8 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
}
aRet = SEQ( sal_Int8 )( sizeof( BITMAPFILEHEADER ) + nDIBSize );
-
- sal_Int8* pBuf = aRet.getArray();
+
+ sal_Int8* pBuf = aRet.getArray();
SvMemoryStream* pMemStm = new SvMemoryStream( (char*) pBuf, sizeof( BITMAPFILEHEADER ), STREAM_WRITE );
*pMemStm << 'B' << 'M' << (sal_uInt32) 0 << (sal_uInt32) 0;
@@ -995,8 +995,8 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
{
osl::MutexGuard aGuard( maProtector );
- SEQ( ScannerContext ) aRet( 1 );
-
+ SEQ( ScannerContext ) aRet( 1 );
+
aRet.getArray()[0].ScannerName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) );
aRet.getArray()[0].InternalData = 0;
@@ -1005,11 +1005,11 @@ SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
// -----------------------------------------------------------------------------
-BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
+BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
throw( ScannerException )
{
osl::MutexGuard aGuard( maProtector );
- uno::Reference< XScannerManager > xThis( this );
+ uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
throw ScannerException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scanner does not exist" ) ), xThis, ScanError_InvalidContext );
@@ -1021,11 +1021,11 @@ BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
// -----------------------------------------------------------------------------
-void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener )
+void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener )
throw( ScannerException )
{
osl::MutexGuard aGuard( maProtector );
- uno::Reference< XScannerManager > xThis( this );
+ uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
throw ScannerException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scanner does not exist" ) ), xThis, ScanError_InvalidContext );
@@ -1040,17 +1040,17 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
throw( ScannerException )
{
osl::MutexGuard aGuard( maProtector );
- uno::Reference< XScannerManager > xThis( this );
+ uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
throw ScannerException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scanner does not exist" ) ), xThis, ScanError_InvalidContext );
-
+
return( ( aTwain.GetState() == TWAIN_STATE_CANCELED ) ? ScanError_ScanCanceled : ScanError_ScanErrorNone );
}
// -----------------------------------------------------------------------------
-uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ )
+uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ )
throw( ScannerException )
{
osl::MutexGuard aGuard( maProtector );
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index 9e58a0ece115..f77acc084a4e 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -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
@@ -59,13 +59,13 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, voi
try
{
::rtl::OUString aImplName( '/' );
-
+
aImplName += ScannerManager::getImplementationName_Static();
aImplName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES/" ) );
aImplName += ScannerManager::getImplementationName_Static();
REF( XRegistryKey ) xNewKey1( static_cast< XRegistryKey* >( pRegistryKey )->createKey( aImplName ) );
-
+
bRet = sal_True;
}
catch( InvalidRegistryException& )
@@ -84,14 +84,14 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, voi
extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{
REF( ::com::sun::star::lang::XSingleServiceFactory ) xFactory;
- void* pRet = 0;
-
+ void* pRet = 0;
+
if( ::rtl::OUString::createFromAscii( pImplName ) == ScannerManager::getImplementationName_Static() )
{
xFactory = REF( ::com::sun::star::lang::XSingleServiceFactory )( ::cppu::createSingleFactory(
static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ),
ScannerManager::getImplementationName_Static(),
- ScannerManager_CreateInstance,
+ ScannerManager_CreateInstance,
ScannerManager::getSupportedServiceNames_Static() ) );
}
@@ -100,7 +100,7 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
xFactory->acquire();
pRet = xFactory.get();
}
-
+
return pRet;
}
diff --git a/extensions/source/scanner/twain.cxx b/extensions/source/scanner/twain.cxx
index 2b6647e4e7d6..d2a6684f3a86 100644
--- a/extensions/source/scanner/twain.cxx
+++ b/extensions/source/scanner/twain.cxx
@@ -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
@@ -34,7 +34,7 @@
#if defined( WNT ) || defined (WIN)
#include <tools/svwin.h>
-#endif
+#endif
#ifdef OS2
#include <svpm.h>
#endif // OS2
@@ -49,19 +49,19 @@
// - Defines -
// -----------
-#define PFUNC (*pDSM)
-#define FIXTODOUBLE( nFix ) ((double)nFix.Whole+(double)nFix.Frac/65536.)
-#define FIXTOLONG( nFix ) ((long)floor(FIXTODOUBLE(nFix)+0.5))
+#define PFUNC (*pDSM)
+#define FIXTODOUBLE( nFix ) ((double)nFix.Whole+(double)nFix.Frac/65536.)
+#define FIXTOLONG( nFix ) ((long)floor(FIXTODOUBLE(nFix)+0.5))
#if defined WIN
-#define TWAIN_LIBNAME "TWAIN.DLL"
-#define TWAIN_FUNCNAME "DSM_Entry"
+#define TWAIN_LIBNAME "TWAIN.DLL"
+#define TWAIN_FUNCNAME "DSM_Entry"
#elif defined WNT
-#define TWAIN_LIBNAME "TWAIN_32.DLL"
-#define TWAIN_FUNCNAME "DSM_Entry"
+#define TWAIN_LIBNAME "TWAIN_32.DLL"
+#define TWAIN_FUNCNAME "DSM_Entry"
#elif defined OS2
-#define TWAIN_LIBNAME "twain"
-#define TWAIN_FUNCNAME "DSM_ENTRY"
+#define TWAIN_LIBNAME "twain"
+#define TWAIN_FUNCNAME "DSM_ENTRY"
#endif
// -----------
@@ -101,7 +101,7 @@ static ImpTwain* pImpTwainInstance = NULL;
{
MSG* pMsg = (MSG*) lParam;
- if( ( nCode < 0 ) ||
+ if( ( nCode < 0 ) ||
( pImpTwainInstance->hTwainWnd != pMsg->hwnd ) ||
!pImpTwainInstance->ImplHandleMsg( (void*) lParam ) )
{
@@ -111,7 +111,7 @@ static ImpTwain* pImpTwainInstance = NULL;
{
pMsg->message = WM_USER;
pMsg->lParam = 0;
-
+
return 0;
}
}
@@ -124,11 +124,11 @@ static ImpTwain* pImpTwainInstance = NULL;
ImpTwain::ImpTwain( const Link& rNotifyLink ) :
aNotifyLink ( rNotifyLink ),
- pDSM ( NULL ),
- pMod ( NULL ),
- hTwainWnd ( 0 ),
- hTwainHook ( 0 ),
- nCurState ( 1 )
+ pDSM ( NULL ),
+ pMod ( NULL ),
+ hTwainWnd ( 0 ),
+ hTwainHook ( 0 ),
+ nCurState ( 1 )
{
pImpTwainInstance = this;
@@ -139,7 +139,7 @@ ImpTwain::ImpTwain( const Link& rNotifyLink ) :
aAppIdent.Version.Country = TWCY_USA;
aAppIdent.ProtocolMajor = TWON_PROTOCOLMAJOR;
aAppIdent.ProtocolMinor = TWON_PROTOCOLMINOR;
- aAppIdent.SupportedGroups = DG_IMAGE | DG_CONTROL;
+ aAppIdent.SupportedGroups = DG_IMAGE | DG_CONTROL;
strcpy( aAppIdent.Version.Info, "6.0" );
strcpy( aAppIdent.Manufacturer, "Sun Microsystems");
strcpy( aAppIdent.ProductFamily,"Office");
@@ -153,8 +153,8 @@ ImpTwain::ImpTwain( const Link& rNotifyLink ) :
#else
- HWND hParentWnd = HWND_DESKTOP;
- WNDCLASS aWc = { 0, &TwainWndProc, 0, sizeof( WNDCLASS ), GetModuleHandle( NULL ),
+ HWND hParentWnd = HWND_DESKTOP;
+ WNDCLASS aWc = { 0, &TwainWndProc, 0, sizeof( WNDCLASS ), GetModuleHandle( NULL ),
NULL, NULL, NULL, NULL, "TwainClass" };
RegisterClass( &aWc );
@@ -275,11 +275,11 @@ void ImpTwain::ImplOpenSource()
#ifdef OS2
// negotiate capabilities
-
+
#else
- TW_CAPABILITY aCap = { CAP_XFERCOUNT, TWON_ONEVALUE, GlobalAlloc( GHND, sizeof( TW_ONEVALUE ) ) };
- TW_ONEVALUE* pVal = (TW_ONEVALUE*) GlobalLock( aCap.hContainer );
+ TW_CAPABILITY aCap = { CAP_XFERCOUNT, TWON_ONEVALUE, GlobalAlloc( GHND, sizeof( TW_ONEVALUE ) ) };
+ TW_ONEVALUE* pVal = (TW_ONEVALUE*) GlobalLock( aCap.hContainer );
pVal->ItemType = TWTY_INT16, pVal->Item = 1;
GlobalUnlock( aCap.hContainer );
@@ -318,9 +318,9 @@ BOOL ImpTwain::ImplEnableSource()
BOOL ImpTwain::ImplHandleMsg( void* pMsg )
{
- TW_UINT16 nRet;
- PTWAINMSG pMess = (PTWAINMSG) pMsg;
- TW_EVENT aEvt = { pMess, MSG_NULL };
+ TW_UINT16 nRet;
+ PTWAINMSG pMess = (PTWAINMSG) pMsg;
+ TW_EVENT aEvt = { pMess, MSG_NULL };
nRet = PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_EVENT, MSG_PROCESSEVENT, &aEvt );
@@ -344,7 +344,7 @@ BOOL ImpTwain::ImplHandleMsg( void* pMsg )
ImplFallback( nEvent );
}
break;
-
+
case MSG_CLOSEDSREQ:
ImplFallback( TWAIN_EVENT_QUIT );
break;
@@ -365,12 +365,12 @@ void ImpTwain::ImplXfer()
{
if( nCurState == 6 )
{
- TW_IMAGEINFO aInfo;
- TW_UINT32 hDIB = 0;
- long nWidth = aInfo.ImageWidth;
- long nHeight = aInfo.ImageLength;
- long nXRes = FIXTOLONG( aInfo.XResolution );
- long nYRes = FIXTOLONG( aInfo.YResolution );
+ TW_IMAGEINFO aInfo;
+ TW_UINT32 hDIB = 0;
+ long nWidth = aInfo.ImageWidth;
+ long nHeight = aInfo.ImageLength;
+ long nXRes = FIXTOLONG( aInfo.XResolution );
+ long nYRes = FIXTOLONG( aInfo.YResolution );
if( PFUNC( &aAppIdent, &aSrcIdent, DG_IMAGE, DAT_IMAGEINFO, MSG_GET, &aInfo ) == TWRC_SUCCESS )
{
@@ -396,7 +396,7 @@ void ImpTwain::ImplXfer()
#else // OS2
const ULONG nSize = GlobalSize( (HGLOBAL) hDIB );
- char* pBuf = (char*) GlobalLock( (HGLOBAL) hDIB );
+ char* pBuf = (char*) GlobalLock( (HGLOBAL) hDIB );
if( pBuf )
{
@@ -438,8 +438,8 @@ void ImpTwain::ImplFallback( ULONG nEvent )
IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
{
- const ULONG nEvent = (ULONG) pData;
- BOOL bFallback = TRUE;
+ const ULONG nEvent = (ULONG) pData;
+ BOOL bFallback = TRUE;
switch( nCurState )
{
@@ -461,7 +461,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
case( 5 ):
{
TW_USERINTERFACE aUI = { TRUE, TRUE, hTwainWnd };
-
+
PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_DISABLEDS, &aUI );
nCurState = 4;
}
diff --git a/extensions/source/scanner/twain.hxx b/extensions/source/scanner/twain.hxx
index 446748c920fb..ca7d80240c43 100644
--- a/extensions/source/scanner/twain.hxx
+++ b/extensions/source/scanner/twain.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
@@ -38,14 +38,14 @@
// - Defines -
// -----------
-#define TWAIN_SELECT 0x00000001UL
-#define TWAIN_ACQUIRE 0x00000002UL
-#define TWAIN_TERMINATE 0xFFFFFFFFUL
+#define TWAIN_SELECT 0x00000001UL
+#define TWAIN_ACQUIRE 0x00000002UL
+#define TWAIN_TERMINATE 0xFFFFFFFFUL
-#define TWAIN_EVENT_NONE 0x00000000UL
-#define TWAIN_EVENT_QUIT 0x00000001UL
-#define TWAIN_EVENT_SCANNING 0x00000002UL
-#define TWAIN_EVENT_XFER 0x00000004UL
+#define TWAIN_EVENT_NONE 0x00000000UL
+#define TWAIN_EVENT_QUIT 0x00000001UL
+#define TWAIN_EVENT_SCANNING 0x00000002UL
+#define TWAIN_EVENT_XFER 0x00000004UL
// ------------
// - ImpTwain -
@@ -53,35 +53,35 @@
class ImpTwain
{
- TW_IDENTITY aAppIdent;
- TW_IDENTITY aSrcIdent;
- Link aNotifyLink;
- Bitmap aBitmap;
- DSMENTRYPROC pDSM;
+ TW_IDENTITY aAppIdent;
+ TW_IDENTITY aSrcIdent;
+ Link aNotifyLink;
+ Bitmap aBitmap;
+ DSMENTRYPROC pDSM;
osl::Module pMod;
- ULONG nCurState;
+ ULONG nCurState;
- void ImplCreate();
- void ImplOpenSourceManager();
- void ImplOpenSource();
- BOOL ImplEnableSource();
- void ImplXfer();
- void ImplFallback( ULONG nEvent );
+ void ImplCreate();
+ void ImplOpenSourceManager();
+ void ImplOpenSource();
+ BOOL ImplEnableSource();
+ void ImplXfer();
+ void ImplFallback( ULONG nEvent );
DECL_LINK( ImplFallbackHdl, void* );
DECL_LINK( ImplDestroyHdl, void* );
public:
- BOOL ImplHandleMsg( void* pMsg );
+ BOOL ImplHandleMsg( void* pMsg );
#ifdef OS2
- HAB hAB;
- HWND hTwainWnd;
- long hTwainHook;
+ HAB hAB;
+ HWND hTwainWnd;
+ long hTwainHook;
#else
- HWND hTwainWnd;
- HHOOK hTwainHook;
+ HWND hTwainWnd;
+ HHOOK hTwainHook;
#endif
public:
@@ -89,11 +89,11 @@ public:
ImpTwain( const Link& rNotifyLink );
~ImpTwain();
- void Destroy();
+ void Destroy();
- BOOL SelectSource();
- BOOL InitXfer();
- Bitmap GetXferBitmap();
+ BOOL SelectSource();
+ BOOL InitXfer();
+ Bitmap GetXferBitmap();
};
#endif // _TWAIN_HXX