diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:10:38 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:10:38 +0000 |
commit | 8c1914a252acbf39999db41d57eac220dd1f3dd0 (patch) | |
tree | db4fadb894f3e9fba5067957640511a15ba81632 /extensions/source/scanner | |
parent | ac68919928f6797c7aa57bfad63504b8df1d2c0a (diff) |
INTEGRATION: CWS mingwport03 (1.8.152); FILE MERGED
2006/11/07 18:16:29 vg 1.8.152.2: RESYNC: (1.8-1.9); FILE MERGED
2006/09/06 14:08:47 vg 1.8.152.1: #i53572# MinGW port
Diffstat (limited to 'extensions/source/scanner')
-rw-r--r-- | extensions/source/scanner/scanwin.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 25406e5310e4..406d9eaf1e43 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -4,9 +4,9 @@ * * $RCSfile: scanwin.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-16 13:28:16 $ + * last change: $Author: vg $ $Date: 2007-03-26 13:10:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -932,7 +932,7 @@ void ScannerManager::DestroyData() // ----------------------------------------------------------------------------- -AWT::Size ScannerManager::getSize() +AWT::Size ScannerManager::getSize() throw() { AWT::Size aRet; HGLOBAL hDIB = (HGLOBAL)(long) mpData; @@ -959,7 +959,7 @@ AWT::Size ScannerManager::getSize() // ----------------------------------------------------------------------------- -SEQ( sal_Int8 ) ScannerManager::getDIB() +SEQ( sal_Int8 ) ScannerManager::getDIB() throw() { SEQ( sal_Int8 ) aRet; @@ -1022,7 +1022,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() // ----------------------------------------------------------------------------- -SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() +SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw() { vos::OGuard aGuard( maProtector ); SEQ( ScannerContext ) aRet( 1 ); |