diff options
Diffstat (limited to 'extensions/source/scanner/scanunx.cxx')
| -rw-r--r-- | extensions/source/scanner/scanunx.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index b06e30a2794a..92b53915ae42 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -22,6 +22,7 @@ #include <o3tl/safeint.hxx> #include <osl/thread.hxx> #include <sal/log.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <memory> @@ -129,7 +130,7 @@ public: virtual void SAL_CALL run() override; virtual void SAL_CALL onTerminated() override { delete this; } public: - ScannerThread( const std::shared_ptr<SaneHolder>& pHolder, + ScannerThread( std::shared_ptr<SaneHolder> pHolder, const Reference< css::lang::XEventListener >& listener, ScannerManager* pManager ); virtual ~ScannerThread() override; @@ -137,10 +138,10 @@ public: } -ScannerThread::ScannerThread(const std::shared_ptr<SaneHolder>& pHolder, +ScannerThread::ScannerThread(std::shared_ptr<SaneHolder> pHolder, const Reference< css::lang::XEventListener >& listener, ScannerManager* pManager) - : m_pHolder( pHolder ), m_xListener( listener ), m_pManager( pManager ) + : m_pHolder(std::move( pHolder )), m_xListener( listener ), m_pManager( pManager ) { SAL_INFO("extensions.scanner", "ScannerThread"); } @@ -224,7 +225,7 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() if( Sane::IsSane() ) { - Sequence< ScannerContext > aRet{ { /* ScannerName */ "SANE", /* InternalData */ 0 } }; + Sequence< ScannerContext > aRet{ { /* ScannerName */ u"SANE"_ustr, /* InternalData */ 0 } }; return aRet; } @@ -245,7 +246,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex if( scanner_context.InternalData < 0 || o3tl::make_unsigned(scanner_context.InternalData) >= rSanes.size() ) throw ScannerException( - "Scanner does not exist", + u"Scanner does not exist"_ustr, Reference< XScannerManager >( this ), ScanError_InvalidContext ); @@ -253,7 +254,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex std::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - "Scanner is busy", + u"Scanner is busy"_ustr, Reference< XScannerManager >( this ), ScanError_ScanInProgress ); @@ -281,14 +282,14 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, if( scanner_context.InternalData < 0 || o3tl::make_unsigned(scanner_context.InternalData) >= rSanes.size() ) throw ScannerException( - "Scanner does not exist", + u"Scanner does not exist"_ustr, Reference< XScannerManager >( this ), ScanError_InvalidContext ); std::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - "Scanner is busy", + u"Scanner is busy"_ustr, Reference< XScannerManager >( this ), ScanError_ScanInProgress ); @@ -306,7 +307,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) if( scanner_context.InternalData < 0 || o3tl::make_unsigned(scanner_context.InternalData) >= rSanes.size() ) throw ScannerException( - "Scanner does not exist", + u"Scanner does not exist"_ustr, Reference< XScannerManager >( this ), ScanError_InvalidContext ); @@ -324,7 +325,7 @@ Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext& if( scanner_context.InternalData < 0 || o3tl::make_unsigned(scanner_context.InternalData) >= rSanes.size() ) throw ScannerException( - "Scanner does not exist", + u"Scanner does not exist"_ustr, Reference< XScannerManager >( this ), ScanError_InvalidContext ); |