diff options
| author | Robert Roth <robert.roth.off@gmail.com> | 2010-11-25 21:22:04 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2010-11-26 06:23:05 +0100 |
| commit | b997cefed4441bf5356b9ec68812f524907711de (patch) | |
| tree | 95899c9b0d3387093fa046e5acaf685d61bd4794 /extensions/source/scanner | |
| parent | 7bb409d3a8672f6da645ab286d80545b6f1d7fea (diff) | |
Some more dead code removed from the extensions.
Diffstat (limited to 'extensions/source/scanner')
| -rw-r--r-- | extensions/source/scanner/sane.cxx | 1 | ||||
| -rw-r--r-- | extensions/source/scanner/scanwin.cxx | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index d6df2a30644a..1f71c0245547 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -160,7 +160,6 @@ 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 ) ReloadOptions(); return nStatus; diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 457be67d0f9b..74a94760d2b5 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -222,7 +222,7 @@ ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) : 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() ); - // #107835# block destruction until ImplDestroyHdl is called + // block destruction until ImplDestroyHdl is called mxSelfRef = static_cast< ::cppu::OWeakObject* >( this ); } @@ -347,7 +347,7 @@ bool ImpTwain::ImplEnableSource() aNotifyLink.Call( (void*) TWAIN_EVENT_SCANNING ); nCurState = 5; - // #107835# register as vetoable close listener, to prevent application to die under us + // register as vetoable close listener, to prevent application to die under us ImplRegisterCloseListener(); if( PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_ENABLEDS, &aUI ) == TWRC_SUCCESS ) @@ -358,7 +358,7 @@ bool ImpTwain::ImplEnableSource() { nCurState = 4; - // #107835# deregister as vetoable close listener, dialog failed + // deregister as vetoable close listener, dialog failed ImplDeregisterCloseListener(); } } @@ -506,7 +506,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData ) PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_DISABLEDS, &aUI ); nCurState = 4; - // #107835# deregister as vetoable close listener + // deregister as vetoable close listener ImplDeregisterCloseListener(); } break; @@ -559,7 +559,7 @@ IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, /*p*/ ) if( hTwainHook ) UnhookWindowsHookEx( hTwainHook ); - // #107835# permit destruction of ourselves (normally, refcount + // permit destruction of ourselves (normally, refcount // should drop to zero exactly here) mxSelfRef = NULL; pImpTwainInstance = NULL; @@ -787,7 +787,7 @@ bool Twain::SelectSource( ScannerManager& rMgr ) if( !mpImpTwain ) { - // #107835# hold reference to ScannerManager, to prevent premature death + // hold reference to ScannerManager, to prevent premature death mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ), uno::UNO_QUERY ), @@ -809,7 +809,7 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X if( !mpImpTwain ) { - // #107835# hold reference to ScannerManager, to prevent premature death + // hold reference to ScannerManager, to prevent premature death mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ), uno::UNO_QUERY ), |