diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-07-27 17:12:01 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-07-27 17:12:01 +0200 |
| commit | 82de1aefa19ebd1c64c78610ea2b683bd5c2ff92 (patch) | |
| tree | 8991b05f373e660649ed23d0e13f418c9d80d4a9 /extensions | |
| parent | 63011eb5ee3b5da99275dceb747f771276b175a8 (diff) | |
| parent | 273fa6a6aa0d56660807ab29892f0618cfbb2e63 (diff) | |
mib17: rebase to DEV300_m84
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/scanner/sane.cxx | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | extensions/source/update/check/updatecheck.cxx | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index af1a8d91c8fd..43c50e6f8451 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -642,6 +642,11 @@ BOOL Sane::Start( BitmapTransporter& rBitmap ) nStatus = p_get_parameters( maHandle, &aParams ); DUMP_STATE( nStatus, "sane_get_parameters" ); CheckConsistency( "sane_get_parameters" ); + if (nStatus != SANE_STATUS_GOOD || aParams.bytes_per_line == 0) + { + bSuccess = FALSE; + break; + } #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL const char* ppFormats[] = { "SANE_FRAME_GRAY", "SANE_FRAME_RGB", "SANE_FRAME_RED", "SANE_FRAME_GREEN", diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index d65a97e49dc6..8419569bd949 100755..100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -865,6 +865,9 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, m_aUpdateInfo = UpdateInfo(); + // Remove outdated release notes + storeReleaseNote( 1, rtl::OUString() ); + storeReleaseNote( 2, rtl::OUString() ); } else { |