diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-29 19:08:42 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-29 19:30:23 -0500 |
commit | 601500f8a85d170f3278f905c6b6795b2dd0fa8b (patch) | |
tree | e886a669ff35c7dce31344ed2a9c365cd7d931f1 /extensions/source/scanner | |
parent | c88234357f97020885010d50aa3e2c3e1c53d605 (diff) |
targeted string re-work
Change-Id: I6ce76c22118586b213161a0e307a53b22b318004
Diffstat (limited to 'extensions/source/scanner')
-rw-r--r-- | extensions/source/scanner/scanunx.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index e854233d125d..cb2d8ec7a0af 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -266,7 +266,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw() if( Sane::IsSane() ) { SEQ( ScannerContext ) aRet(1); - aRet.getArray()[0].ScannerName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SANE")); + aRet.getArray()[0].ScannerName = ::rtl::OUString("SANE"); aRet.getArray()[0].InternalData = 0; return aRet; } @@ -291,7 +291,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), + ::rtl::OUString("Scanner does not exist"), REF( XScannerManager )( this ), ScanError_InvalidContext ); @@ -299,7 +299,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner is busy")), + ::rtl::OUString("Scanner is busy"), REF( XScannerManager )( this ), ScanError_ScanInProgress ); @@ -330,14 +330,14 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), + ::rtl::OUString("Scanner does not exist"), REF( XScannerManager )( this ), ScanError_InvalidContext ); boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner is busy")), + ::rtl::OUString("Scanner is busy"), REF( XScannerManager )( this ), ScanError_ScanInProgress ); @@ -356,7 +356,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), + ::rtl::OUString("Scanner does not exist"), REF( XScannerManager )( this ), ScanError_InvalidContext ); @@ -375,7 +375,7 @@ REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_con if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), + ::rtl::OUString("Scanner does not exist"), REF( XScannerManager )( this ), ScanError_InvalidContext ); |