summaryrefslogtreecommitdiff
path: root/sdext/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-04-30 08:20:03 +0200
committerStephan Bergmann <sbergman@redhat.com>2021-05-02 17:02:28 +0200
commit10d29c390dd58ed629dd27fe5ed35fae28eceec3 (patch)
tree7476cbb90fff182c5bec0a5a1ef9c41a3ad29f19 /sdext/source
parenta9243e626193ab4efe3a618413886773336a38e6 (diff)
throw() -> noexcept, part 2/3: Automatic loplugin:noexcept rewrite
Change-Id: I076f16d0536b534abf0ced4d76051eadb4c0e033 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114949 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sdext/source')
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfparse.cxx8
-rw-r--r--sdext/source/pdfimport/test/pdfunzip.cxx16
2 files changed, 12 insertions, 12 deletions
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index b2ffe23f06eb..3a032af5878c 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -61,16 +61,16 @@ class StringEmitContext : public EmitContext
public:
StringEmitContext() : EmitContext(), m_aBuf(256) {}
- virtual bool write( const void* pBuf, unsigned int nLen ) throw() override
+ virtual bool write( const void* pBuf, unsigned int nLen ) noexcept override
{
m_aBuf.append( static_cast<const char*>(pBuf), nLen );
return true;
}
- virtual unsigned int getCurPos() throw() override { return m_aBuf.getLength(); }
- virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw() override
+ virtual unsigned int getCurPos() noexcept override { return m_aBuf.getLength(); }
+ virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) noexcept override
{ return (nOrigOffset+nLen < o3tl::make_unsigned(m_aBuf.getLength()) ) &&
write( m_aBuf.getStr() + nOrigOffset, nLen ); }
- virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw() override
+ virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) noexcept override
{
if( nOrigOffset+nLen < o3tl::make_unsigned(m_aBuf.getLength()) )
{
diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index d206c981f356..3e2e614a9327 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -68,10 +68,10 @@ class FileEmitContext : public EmitContext
FileEmitContext( const char* pFileName, const char* pOrigName, const PDFContainer* pTop );
virtual ~FileEmitContext() override;
- virtual bool write( const void* pBuf, unsigned int nLen ) throw() override;
- virtual unsigned int getCurPos() throw() override;
- virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw() override;
- virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw() override;
+ virtual bool write( const void* pBuf, unsigned int nLen ) noexcept override;
+ virtual unsigned int getCurPos() noexcept override;
+ virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) noexcept override;
+ virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) noexcept override;
};
}
@@ -154,7 +154,7 @@ void FileEmitContext::openReadFile( const char* pInFile )
m_nReadLen = static_cast<unsigned int>(nFileSize);
}
-bool FileEmitContext::write( const void* pBuf, unsigned int nLen ) throw()
+bool FileEmitContext::write( const void* pBuf, unsigned int nLen ) noexcept
{
if( ! m_aHandle )
return false;
@@ -165,7 +165,7 @@ bool FileEmitContext::write( const void* pBuf, unsigned int nLen ) throw()
&& nWrite == nWritten;
}
-unsigned int FileEmitContext::getCurPos() throw()
+unsigned int FileEmitContext::getCurPos() noexcept
{
sal_uInt64 nFileSize = 0;
if( m_aHandle )
@@ -176,7 +176,7 @@ unsigned int FileEmitContext::getCurPos() throw()
return static_cast<unsigned int>(nFileSize);
}
-bool FileEmitContext::copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw()
+bool FileEmitContext::copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) noexcept
{
if( nOrigOffset + nLen > m_nReadLen )
return false;
@@ -202,7 +202,7 @@ bool FileEmitContext::copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen
return bRet;
}
-unsigned int FileEmitContext::readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw()
+unsigned int FileEmitContext::readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) noexcept
{
if( nOrigOffset + nLen > m_nReadLen )
return 0;