summaryrefslogtreecommitdiff
path: root/sdext/source/pdfimport
diff options
context:
space:
mode:
Diffstat (limited to 'sdext/source/pdfimport')
-rw-r--r--sdext/source/pdfimport/filterdet.cxx8
-rw-r--r--sdext/source/pdfimport/filterdet.hxx2
-rw-r--r--sdext/source/pdfimport/inc/pdfparse.hxx56
-rw-r--r--sdext/source/pdfimport/misc/pwdinteract.cxx14
-rw-r--r--sdext/source/pdfimport/odf/odfemitter.cxx6
-rw-r--r--sdext/source/pdfimport/pdfiadaptor.hxx10
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfparse.cxx8
-rw-r--r--sdext/source/pdfimport/sax/emitcontext.hxx6
-rw-r--r--sdext/source/pdfimport/sax/saxattrlist.hxx14
-rw-r--r--sdext/source/pdfimport/test/outputwrap.hxx6
-rw-r--r--sdext/source/pdfimport/test/pdfunzip.cxx8
-rw-r--r--sdext/source/pdfimport/test/tests.cxx60
-rw-r--r--sdext/source/pdfimport/tree/drawtreevisiting.hxx48
-rw-r--r--sdext/source/pdfimport/tree/genericelements.hxx18
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.hxx60
-rw-r--r--sdext/source/pdfimport/tree/treevisitorfactory.cxx18
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.hxx48
17 files changed, 195 insertions, 195 deletions
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index b412294ba51e..0195c32b7357 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -57,10 +57,10 @@ public:
const pdfparse::PDFContainer* pTop );
virtual ~FileEmitContext();
- virtual bool write( const void* pBuf, unsigned int nLen );
- virtual unsigned int getCurPos();
- virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen );
- virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf );
+ virtual bool write( const void* pBuf, unsigned int nLen ) SAL_OVERRIDE;
+ virtual unsigned int getCurPos() SAL_OVERRIDE;
+ virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) SAL_OVERRIDE;
+ virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) SAL_OVERRIDE;
const uno::Reference< io::XStream >& getContextStream() const { return m_xContextStream; }
};
diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx
index f883afa5883b..75b580868548 100644
--- a/sdext/source/pdfimport/filterdet.hxx
+++ b/sdext/source/pdfimport/filterdet.hxx
@@ -50,7 +50,7 @@ public:
// XExtendedFilterDetection
virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& io_rDescriptor )
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx
index fc96504fe8d8..f747e8c41177 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -73,8 +73,8 @@ struct PDFComment : public PDFEntry
PDFComment( const OString& rComment )
: PDFEntry(), m_aComment( rComment ) {}
virtual ~PDFComment();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
};
struct PDFValue : public PDFEntry
@@ -91,8 +91,8 @@ struct PDFName : public PDFValue
PDFName( const OString& rName )
: PDFValue(), m_aName( rName ) {}
virtual ~PDFName();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
OUString getFilteredName() const;
};
@@ -104,8 +104,8 @@ struct PDFString : public PDFValue
PDFString( const OString& rString )
: PDFValue(), m_aString( rString ) {}
virtual ~PDFString();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
OString getFilteredString() const;
};
@@ -117,8 +117,8 @@ struct PDFNumber : public PDFValue
PDFNumber( double fVal )
: PDFValue(), m_fValue( fVal ) {}
virtual ~PDFNumber();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
};
struct PDFBool : public PDFValue
@@ -128,8 +128,8 @@ struct PDFBool : public PDFValue
PDFBool( bool bVal )
: PDFValue(), m_bValue( bVal ) {}
virtual ~PDFBool();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
};
struct PDFObjectRef : public PDFValue
@@ -140,16 +140,16 @@ struct PDFObjectRef : public PDFValue
PDFObjectRef( unsigned int nNr, unsigned int nGen )
: PDFValue(), m_nNumber( nNr ), m_nGeneration( nGen ) {}
virtual ~PDFObjectRef();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
};
struct PDFNull : public PDFValue
{
PDFNull() {}
virtual ~PDFNull();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
};
struct PDFObject;
@@ -174,8 +174,8 @@ struct PDFArray : public PDFContainer
{
PDFArray() {}
virtual ~PDFArray();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
};
struct PDFDict : public PDFContainer
@@ -185,8 +185,8 @@ struct PDFDict : public PDFContainer
PDFDict() {}
virtual ~PDFDict();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
// inserting a value of NULL will remove rName and the previous value
// from the dictionary
@@ -207,8 +207,8 @@ struct PDFStream : public PDFEntry
PDFStream( unsigned int nBegin, unsigned int nEnd, PDFDict* pStreamDict )
: PDFEntry(), m_nBeginOffset( nBegin ), m_nEndOffset( nEnd ), m_pDict( pStreamDict ) {}
virtual ~PDFStream();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
unsigned int getDictLength( const PDFContainer* pObjectContainer = NULL ) const; // get contents of the "Length" entry of the dict
};
@@ -219,8 +219,8 @@ struct PDFTrailer : public PDFContainer
PDFTrailer() : PDFContainer(), m_pDict( NULL ) {}
virtual ~PDFTrailer();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
};
struct PDFFileImplData;
@@ -240,8 +240,8 @@ struct PDFFile : public PDFContainer
{}
virtual ~PDFFile();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
bool isEncrypted() const;
@@ -269,8 +269,8 @@ struct PDFObject : public PDFContainer
PDFObject( unsigned int nNr, unsigned int nGen )
: m_pObject( NULL ), m_pStream( NULL ), m_nNumber( nNr ), m_nGeneration( nGen ) {}
virtual ~PDFObject();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
// writes only the contained stream, deflated if necessary
bool writeStream( EmitContext& rContext, const PDFFile* pPDFFile ) const;
@@ -287,8 +287,8 @@ struct PDFPart : public PDFContainer
{
PDFPart() : PDFContainer() {}
virtual ~PDFPart();
- virtual bool emit( EmitContext& rWriteContext ) const;
- virtual PDFEntry* clone() const;
+ virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE;
+ virtual PDFEntry* clone() const SAL_OVERRIDE;
};
class PDFReader
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 0e0d58622da4..e0c27aa37cad 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -57,15 +57,15 @@ public:
explicit PDFPasswordRequest(bool bFirstTry, const OUString& rName);
// XInteractionRequest
- virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException, std::exception);
- virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw (uno::RuntimeException, std::exception);
+ virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInteractionPassword
- virtual void SAL_CALL setPassword( const OUString& rPwd ) throw (uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getPassword() throw (uno::RuntimeException, std::exception);
+ virtual void SAL_CALL setPassword( const OUString& rPwd ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getPassword() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInteractionContinuation
- virtual void SAL_CALL select() throw (uno::RuntimeException, std::exception);
+ virtual void SAL_CALL select() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
bool isSelected() const { osl::MutexGuard const guard( m_aMutex ); return m_bSelected; }
@@ -129,7 +129,7 @@ public:
private:
virtual ~UnsupportedEncryptionFormatRequest() {}
- virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) {
+ virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE {
return uno::makeAny(
task::ErrorCodeRequest(
OUString(), uno::Reference< uno::XInterface >(),
@@ -139,7 +139,7 @@ private:
}
virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > >
- SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) {
+ SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE {
return
uno::Sequence< uno::Reference< task::XInteractionContinuation > >();
}
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx
index 540d6476931e..80a31fa7c0de 100644
--- a/sdext/source/pdfimport/odf/odfemitter.cxx
+++ b/sdext/source/pdfimport/odf/odfemitter.cxx
@@ -41,9 +41,9 @@ private:
public:
explicit OdfEmitter( const uno::Reference<io::XOutputStream>& xOutput );
- virtual void beginTag( const char* pTag, const PropertyMap& rProperties );
- virtual void write( const OUString& rString );
- virtual void endTag( const char* pTag );
+ virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) SAL_OVERRIDE;
+ virtual void write( const OUString& rString ) SAL_OVERRIDE;
+ virtual void endTag( const char* pTag ) SAL_OVERRIDE;
};
OdfEmitter::OdfEmitter( const uno::Reference<io::XOutputStream>& xOutput ) :
diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx
index 7b99f179e756..7276d08e705e 100644
--- a/sdext/source/pdfimport/pdfiadaptor.hxx
+++ b/sdext/source/pdfimport/pdfiadaptor.hxx
@@ -57,12 +57,12 @@ namespace pdfi
::com::sun::star::uno::XComponentContext >& xContext );
// XFilter
- virtual sal_Bool SAL_CALL filter( const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rFilterData ) throw(com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL cancel() throw(std::exception);
+ virtual sal_Bool SAL_CALL filter( const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rFilterData ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL cancel() throw(std::exception) SAL_OVERRIDE;
// XImporter
virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument )
- throw( com::sun::star::lang::IllegalArgumentException, std::exception );
+ throw( com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE;
};
@@ -119,11 +119,11 @@ namespace pdfi
// XImportFilter
virtual sal_Bool SAL_CALL importer( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rSourceData,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& rHdl,
- const com::sun::star::uno::Sequence< OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException, std::exception );
+ const com::sun::star::uno::Sequence< OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XImporter
virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument )
- throw( com::sun::star::lang::IllegalArgumentException, std::exception );
+ throw( com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE;
};
}
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index ec8b6439dd10..21c191c3c97b 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -50,16 +50,16 @@ class StringEmitContext : public EmitContext
public:
StringEmitContext() : EmitContext(), m_aBuf(256) {}
virtual ~StringEmitContext() {}
- virtual bool write( const void* pBuf, unsigned int nLen ) throw()
+ virtual bool write( const void* pBuf, unsigned int nLen ) throw() SAL_OVERRIDE
{
m_aBuf.append( (const sal_Char*)pBuf, nLen );
return true;
}
- virtual unsigned int getCurPos() throw() { return m_aBuf.getLength(); }
- virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw()
+ virtual unsigned int getCurPos() throw() SAL_OVERRIDE { return m_aBuf.getLength(); }
+ virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw() SAL_OVERRIDE
{ return (nOrigOffset+nLen < static_cast<unsigned int>(m_aBuf.getLength()) ) ?
write( m_aBuf.getStr() + nOrigOffset, nLen ) : false; }
- virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw()
+ virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw() SAL_OVERRIDE
{
if( nOrigOffset+nLen < static_cast<unsigned int>(m_aBuf.getLength()) )
{
diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx
index d721b5104089..a54fa7a7da95 100644
--- a/sdext/source/pdfimport/sax/emitcontext.hxx
+++ b/sdext/source/pdfimport/sax/emitcontext.hxx
@@ -40,9 +40,9 @@ namespace pdfi
com::sun::star::xml::sax::XDocumentHandler >& xDocHdl );
~SaxEmitter();
- virtual void beginTag( const char* pTag, const PropertyMap& rProperties );
- virtual void write( const OUString& rString );
- virtual void endTag( const char* pTag );
+ virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) SAL_OVERRIDE;
+ virtual void write( const OUString& rString ) SAL_OVERRIDE;
+ virtual void endTag( const char* pTag ) SAL_OVERRIDE;
};
}
diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx
index 92eff9ed3435..8b8494463fa7 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.hxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.hxx
@@ -53,15 +53,15 @@ namespace pdfi
virtual ~SaxAttrList();
// ::com::sun::star::xml::sax::XAttributeList
- virtual sal_Int16 SAL_CALL getLength() throw(std::exception);
- virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(std::exception);
- virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(std::exception);
- virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw(std::exception);
- virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(std::exception);
- virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(std::exception);
+ virtual sal_Int16 SAL_CALL getLength() throw(std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw(std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(std::exception) SAL_OVERRIDE;
// ::com::sun::star::util::XCloneable
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(std::exception) SAL_OVERRIDE;
};
}
diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx
index 40b2e2b825b2..1857c20e3e0b 100644
--- a/sdext/source/pdfimport/test/outputwrap.hxx
+++ b/sdext/source/pdfimport/test/outputwrap.hxx
@@ -43,18 +43,18 @@ typedef ::cppu::WeakComponentImplHelper1<
maFile.open(osl_File_OpenFlag_Create|osl_File_OpenFlag_Write);
}
- virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
sal_uInt64 nBytesWritten(0);
maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten);
}
- virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
}
- virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
maFile.close();
}
diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index 5558e0cb7e38..7ea3aaadce81 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -64,10 +64,10 @@ class FileEmitContext : public EmitContext
FileEmitContext( const char* pFileName, const char* pOrigName, const PDFContainer* pTop );
virtual ~FileEmitContext();
- virtual bool write( const void* pBuf, unsigned int nLen ) throw();
- virtual unsigned int getCurPos() throw();
- virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw();
- virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw();
+ virtual bool write( const void* pBuf, unsigned int nLen ) throw() SAL_OVERRIDE;
+ virtual unsigned int getCurPos() throw() SAL_OVERRIDE;
+ virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw() SAL_OVERRIDE;
+ virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw() SAL_OVERRIDE;
};
FileEmitContext::FileEmitContext( const char* pFileName, const char* pOrigName, const PDFContainer* pTop )
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 93c3a53c8b71..5fe48aca521b 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -115,40 +115,40 @@ namespace
GraphicsContext& getCurrentContext() { return m_aGCStack.back(); }
// ContentSink interface implementation
- virtual void setPageNum( sal_Int32 nNumPages )
+ virtual void setPageNum( sal_Int32 nNumPages ) SAL_OVERRIDE
{
m_nNumPages = nNumPages;
}
- virtual void startPage( const geometry::RealSize2D& rSize )
+ virtual void startPage( const geometry::RealSize2D& rSize ) SAL_OVERRIDE
{
m_aPageSize = rSize;
}
- virtual void endPage()
+ virtual void endPage() SAL_OVERRIDE
{
m_bPageEnded = true;
}
virtual void hyperLink( const geometry::RealRectangle2D& rBounds,
- const OUString& rURI )
+ const OUString& rURI ) SAL_OVERRIDE
{
m_aHyperlinkBounds = rBounds;
m_aURI = rURI;
}
- virtual void pushState()
+ virtual void pushState() SAL_OVERRIDE
{
GraphicsContextStack::value_type const a(m_aGCStack.back());
m_aGCStack.push_back(a);
}
- virtual void popState()
+ virtual void popState() SAL_OVERRIDE
{
m_aGCStack.pop_back();
}
- virtual void setTransformation( const geometry::AffineMatrix2D& rMatrix )
+ virtual void setTransformation( const geometry::AffineMatrix2D& rMatrix ) SAL_OVERRIDE
{
basegfx::unotools::homMatrixFromAffineMatrix(
getCurrentContext().Transformation,
@@ -156,7 +156,7 @@ namespace
}
virtual void setLineDash( const uno::Sequence<double>& dashes,
- double start )
+ double start ) SAL_OVERRIDE
{
GraphicsContext& rContext( getCurrentContext() );
if( dashes.getLength() )
@@ -164,47 +164,47 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "line dashing start offset", start, 0.0, 0.000000001 );
}
- virtual void setFlatness( double nFlatness )
+ virtual void setFlatness( double nFlatness ) SAL_OVERRIDE
{
getCurrentContext().Flatness = nFlatness;
}
- virtual void setLineJoin(sal_Int8 nJoin)
+ virtual void setLineJoin(sal_Int8 nJoin) SAL_OVERRIDE
{
getCurrentContext().LineJoin = nJoin;
}
- virtual void setLineCap(sal_Int8 nCap)
+ virtual void setLineCap(sal_Int8 nCap) SAL_OVERRIDE
{
getCurrentContext().LineCap = nCap;
}
- virtual void setMiterLimit(double nVal)
+ virtual void setMiterLimit(double nVal) SAL_OVERRIDE
{
getCurrentContext().MiterLimit = nVal;
}
- virtual void setLineWidth(double nVal)
+ virtual void setLineWidth(double nVal) SAL_OVERRIDE
{
getCurrentContext().LineWidth = nVal;
}
- virtual void setFillColor( const rendering::ARGBColor& rColor )
+ virtual void setFillColor( const rendering::ARGBColor& rColor ) SAL_OVERRIDE
{
getCurrentContext().FillColor = rColor;
}
- virtual void setStrokeColor( const rendering::ARGBColor& rColor )
+ virtual void setStrokeColor( const rendering::ARGBColor& rColor ) SAL_OVERRIDE
{
getCurrentContext().LineColor = rColor;
}
- virtual void setBlendMode(sal_Int8 nMode)
+ virtual void setBlendMode(sal_Int8 nMode) SAL_OVERRIDE
{
getCurrentContext().BlendMode = nMode;
}
- virtual void setFont( const FontAttributes& rFont )
+ virtual void setFont( const FontAttributes& rFont ) SAL_OVERRIDE
{
FontToIdMap::const_iterator it = m_aFontToId.find( rFont );
if( it != m_aFontToId.end() )
@@ -218,7 +218,7 @@ namespace
}
}
- virtual void strokePath( const uno::Reference<rendering::XPolyPolygon2D>& rPath )
+ virtual void strokePath( const uno::Reference<rendering::XPolyPolygon2D>& rPath ) SAL_OVERRIDE
{
GraphicsContext& rContext( getCurrentContext() );
basegfx::B2DPolyPolygon aPath = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
@@ -277,7 +277,7 @@ namespace
rContext.FontId, (sal_Int32) 0 );
}
- virtual void fillPath( const uno::Reference<rendering::XPolyPolygon2D>& rPath )
+ virtual void fillPath( const uno::Reference<rendering::XPolyPolygon2D>& rPath ) SAL_OVERRIDE
{
GraphicsContext& rContext( getCurrentContext() );
basegfx::B2DPolyPolygon aPath = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
@@ -296,7 +296,7 @@ namespace
rContext.FontId, (sal_Int32) 0 );
}
- virtual void eoFillPath( const uno::Reference<rendering::XPolyPolygon2D>& rPath )
+ virtual void eoFillPath( const uno::Reference<rendering::XPolyPolygon2D>& rPath ) SAL_OVERRIDE
{
GraphicsContext& rContext( getCurrentContext() );
basegfx::B2DPolyPolygon aPath = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
@@ -322,7 +322,7 @@ namespace
m_bRedCircleSeen = true;
}
- virtual void intersectClip(const uno::Reference<rendering::XPolyPolygon2D>& rPath)
+ virtual void intersectClip(const uno::Reference<rendering::XPolyPolygon2D>& rPath) SAL_OVERRIDE
{
basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip;
@@ -333,7 +333,7 @@ namespace
getCurrentContext().Clip = aNewClip;
}
- virtual void intersectEoClip(const uno::Reference<rendering::XPolyPolygon2D>& rPath)
+ virtual void intersectEoClip(const uno::Reference<rendering::XPolyPolygon2D>& rPath) SAL_OVERRIDE
{
basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip;
@@ -346,18 +346,18 @@ namespace
virtual void drawGlyphs( const OUString& rGlyphs,
const geometry::RealRectangle2D& /*rRect*/,
- const geometry::Matrix2D& /*rFontMatrix*/ )
+ const geometry::Matrix2D& /*rFontMatrix*/ ) SAL_OVERRIDE
{
m_aTextOut.append(rGlyphs);
}
- virtual void endText()
+ virtual void endText() SAL_OVERRIDE
{
m_aTextOut.append( "\n" );
}
virtual void drawMask(const uno::Sequence<beans::PropertyValue>& xBitmap,
- bool /*bInvert*/ )
+ bool /*bInvert*/ ) SAL_OVERRIDE
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMask received two properties",
xBitmap.getLength(), (sal_Int32) 3 );
@@ -367,7 +367,7 @@ namespace
xBitmap[1].Name.equalsAscii( "InputStream" ) );
}
- virtual void drawImage(const uno::Sequence<beans::PropertyValue>& xBitmap )
+ virtual void drawImage(const uno::Sequence<beans::PropertyValue>& xBitmap ) SAL_OVERRIDE
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawImage received two properties",
xBitmap.getLength(), (sal_Int32) 3 );
@@ -379,7 +379,7 @@ namespace
}
virtual void drawColorMaskedImage(const uno::Sequence<beans::PropertyValue>& xBitmap,
- const uno::Sequence<uno::Any>& /*xMaskColors*/ )
+ const uno::Sequence<uno::Any>& /*xMaskColors*/ ) SAL_OVERRIDE
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawColorMaskedImage received two properties",
xBitmap.getLength(), (sal_Int32) 3 );
@@ -391,7 +391,7 @@ namespace
virtual void drawMaskedImage(const uno::Sequence<beans::PropertyValue>& xBitmap,
const uno::Sequence<beans::PropertyValue>& xMask,
- bool /*bInvertMask*/)
+ bool /*bInvertMask*/) SAL_OVERRIDE
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMaskedImage received two properties #1",
xBitmap.getLength(), (sal_Int32) 3 );
@@ -409,7 +409,7 @@ namespace
}
virtual void drawAlphaMaskedImage(const uno::Sequence<beans::PropertyValue>& xBitmap,
- const uno::Sequence<beans::PropertyValue>& xMask)
+ const uno::Sequence<beans::PropertyValue>& xMask) SAL_OVERRIDE
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawAlphaMaskedImage received two properties #1",
xBitmap.getLength(), (sal_Int32) 3 );
@@ -426,7 +426,7 @@ namespace
xMask[1].Name.equalsAscii( "InputStream" ) );
}
- virtual void setTextRenderMode( sal_Int32 )
+ virtual void setTextRenderMode( sal_Int32 ) SAL_OVERRIDE
{
}
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
index 9b4688efd285..2bd8a5aaeafc 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
@@ -44,14 +44,14 @@ namespace pdfi
m_rProcessor(rProcessor)
{}
- virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( TextElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& );
+ virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
};
class DrawXmlFinalizer : public ElementTreeVisitor
@@ -67,14 +67,14 @@ namespace pdfi
m_rProcessor(rProcessor)
{}
- virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( TextElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& );
+ virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
};
class DrawXmlEmitter : public ElementTreeVisitor
@@ -106,14 +106,14 @@ namespace pdfi
m_bWriteDrawDocument(eDocType==DRAW_DOC)
{}
- virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( TextElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& );
+ virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
};
}
diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx
index a616d377ca55..5593ecb776f6 100644
--- a/sdext/source/pdfimport/tree/genericelements.hxx
+++ b/sdext/source/pdfimport/tree/genericelements.hxx
@@ -107,7 +107,7 @@ namespace pdfi
{
ListElement() : Element( NULL ) {}
// ElementTreeVisitable
- virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& );
+ virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
};
struct HyperlinkElement : public Element
@@ -118,7 +118,7 @@ namespace pdfi
: Element( pParent ), URI( rURI ) {}
public:
// ElementTreeVisitable
- virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& );
+ virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
OUString URI;
};
@@ -154,7 +154,7 @@ namespace pdfi
public:
// ElementTreeVisitable
- virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& );
+ virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
};
struct TextElement : public GraphicalElement
@@ -166,7 +166,7 @@ namespace pdfi
public:
// ElementTreeVisitable
- virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& );
+ virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
OUStringBuffer Text;
sal_Int32 FontId;
@@ -180,7 +180,7 @@ namespace pdfi
public:
// ElementTreeVisitable
- virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt );
+ virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) SAL_OVERRIDE;
// returns true only if only a single line is contained
bool isSingleLined( PDFIProcessor& rProc ) const;
@@ -204,7 +204,7 @@ namespace pdfi
sal_Int8 nAction );
public:
// ElementTreeVisitable
- virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt );
+ virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) SAL_OVERRIDE;
void updateGeometry();
@@ -225,7 +225,7 @@ namespace pdfi
public:
// ElementTreeVisitable
- virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& );
+ virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
ImageId Image;
};
@@ -246,7 +246,7 @@ namespace pdfi
virtual ~PageElement();
// ElementTreeVisitable
- virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt );
+ virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) SAL_OVERRIDE;
void emitPageAnchoredElements( EmitContext& rEmitContext );
static void updateParagraphGeometry( Element* pEle );
@@ -273,7 +273,7 @@ namespace pdfi
virtual ~DocumentElement();
// ElementTreeVisitable
- virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& );
+ virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
};
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 98236d4ea9dc..979e17015c2b 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -119,51 +119,51 @@ namespace pdfi
// ContentSink interface implementation
- virtual void setPageNum( sal_Int32 nNumPages );
- virtual void startPage( const ::com::sun::star::geometry::RealSize2D& rSize );
- virtual void endPage();
+ virtual void setPageNum( sal_Int32 nNumPages ) SAL_OVERRIDE;
+ virtual void startPage( const ::com::sun::star::geometry::RealSize2D& rSize ) SAL_OVERRIDE;
+ virtual void endPage() SAL_OVERRIDE;
virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds,
- const OUString& rURI );
- virtual void pushState();
- virtual void popState();
- virtual void setFlatness( double );
- virtual void setTransformation( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix );
+ const OUString& rURI ) SAL_OVERRIDE;
+ virtual void pushState() SAL_OVERRIDE;
+ virtual void popState() SAL_OVERRIDE;
+ virtual void setFlatness( double ) SAL_OVERRIDE;
+ virtual void setTransformation( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix ) SAL_OVERRIDE;
virtual void setLineDash( const ::com::sun::star::uno::Sequence<double>& dashes,
- double start );
- virtual void setLineJoin(sal_Int8);
- virtual void setLineCap(sal_Int8);
- virtual void setMiterLimit(double);
- virtual void setLineWidth(double);
- virtual void setFillColor( const ::com::sun::star::rendering::ARGBColor& rColor );
- virtual void setStrokeColor( const ::com::sun::star::rendering::ARGBColor& rColor );
- virtual void setBlendMode(sal_Int8);
- virtual void setFont( const FontAttributes& rFont );
- virtual void setTextRenderMode( sal_Int32 );
+ double start ) SAL_OVERRIDE;
+ virtual void setLineJoin(sal_Int8) SAL_OVERRIDE;
+ virtual void setLineCap(sal_Int8) SAL_OVERRIDE;
+ virtual void setMiterLimit(double) SAL_OVERRIDE;
+ virtual void setLineWidth(double) SAL_OVERRIDE;
+ virtual void setFillColor( const ::com::sun::star::rendering::ARGBColor& rColor ) SAL_OVERRIDE;
+ virtual void setStrokeColor( const ::com::sun::star::rendering::ARGBColor& rColor ) SAL_OVERRIDE;
+ virtual void setBlendMode(sal_Int8) SAL_OVERRIDE;
+ virtual void setFont( const FontAttributes& rFont ) SAL_OVERRIDE;
+ virtual void setTextRenderMode( sal_Int32 ) SAL_OVERRIDE;
virtual void strokePath( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath );
+ ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE;
virtual void fillPath( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath );
+ ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE;
virtual void eoFillPath( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath );
+ ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE;
virtual void intersectClip(const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath);
+ ::com::sun::star::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE;
virtual void intersectEoClip(const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath);
+ ::com::sun::star::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE;
virtual void drawGlyphs( const OUString& rGlyphs,
const ::com::sun::star::geometry::RealRectangle2D& rRect,
- const ::com::sun::star::geometry::Matrix2D& rFontMatrix );
- virtual void endText();
+ const ::com::sun::star::geometry::Matrix2D& rFontMatrix ) SAL_OVERRIDE;
+ virtual void endText() SAL_OVERRIDE;
virtual void drawMask(const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>& xBitmap,
- bool bInvert );
+ bool bInvert ) SAL_OVERRIDE;
/// Given image must already be color-mapped and normalized to sRGB.
virtual void drawImage(const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xBitmap );
+ ::com::sun::star::beans::PropertyValue>& xBitmap ) SAL_OVERRIDE;
/** Given image must already be color-mapped and normalized to sRGB.
maskColors must contain two sequences of color components
@@ -171,16 +171,16 @@ namespace pdfi
virtual void drawColorMaskedImage(const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>& xBitmap,
const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any>& xMaskColors );
+ ::com::sun::star::uno::Any>& xMaskColors ) SAL_OVERRIDE;
virtual void drawMaskedImage(const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>& xBitmap,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>& xMask,
- bool bInvertMask);
+ bool bInvertMask) SAL_OVERRIDE;
virtual void drawAlphaMaskedImage(const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>& xImage,
const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xMask);
+ ::com::sun::star::beans::PropertyValue>& xMask) SAL_OVERRIDE;
/// nElements == -1 means fill in number of pages
void startIndicator( const OUString& rText, sal_Int32 nElements = -1 );
diff --git a/sdext/source/pdfimport/tree/treevisitorfactory.cxx b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
index badada10541a..9a2352917e88 100644
--- a/sdext/source/pdfimport/tree/treevisitorfactory.cxx
+++ b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
@@ -28,19 +28,19 @@ namespace pdfi
{
WriterTreeVisitorFactory() {}
- virtual boost::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const
+ virtual boost::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE
{
return boost::shared_ptr<ElementTreeVisitor>(new WriterXmlOptimizer(rProc));
}
virtual boost::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
StyleContainer& rStyles,
- PDFIProcessor& rProc ) const
+ PDFIProcessor& rProc ) const SAL_OVERRIDE
{
return boost::shared_ptr<ElementTreeVisitor>(new WriterXmlFinalizer(rStyles,rProc));
}
- virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor&) const
+ virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor&) const SAL_OVERRIDE
{
return boost::shared_ptr<ElementTreeVisitor>(new WriterXmlEmitter(rEmitContext));
}
@@ -50,19 +50,19 @@ namespace pdfi
{
ImpressTreeVisitorFactory() {}
- virtual boost::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const
+ virtual boost::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE
{
return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlOptimizer(rProc));
}
virtual boost::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
StyleContainer& rStyles,
- PDFIProcessor& rProc ) const
+ PDFIProcessor& rProc ) const SAL_OVERRIDE
{
return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc));
}
- virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor& rProc) const
+ virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor& rProc) const SAL_OVERRIDE
{
return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlEmitter(rEmitContext,
DrawXmlEmitter::IMPRESS_DOC,
@@ -75,19 +75,19 @@ namespace pdfi
{
DrawTreeVisitorFactory() {}
- virtual boost::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const
+ virtual boost::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE
{
return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlOptimizer(rProc));
}
virtual boost::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
StyleContainer& rStyles,
- PDFIProcessor& rProc ) const
+ PDFIProcessor& rProc ) const SAL_OVERRIDE
{
return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc));
}
- virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor& rProc) const
+ virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor& rProc) const SAL_OVERRIDE
{
return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlEmitter(rEmitContext,
DrawXmlEmitter::DRAW_DOC,
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx
index b0e8ef04af9a..d2cef9df9ddf 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx
@@ -40,14 +40,14 @@ namespace pdfi
virtual ~WriterXmlOptimizer()
{}
- virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( TextElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& );
+ virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
};
class WriterXmlFinalizer : public ElementTreeVisitor
@@ -69,14 +69,14 @@ namespace pdfi
virtual ~WriterXmlFinalizer()
{}
- virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( TextElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& );
+ virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
};
class WriterXmlEmitter : public ElementTreeVisitor
@@ -94,14 +94,14 @@ namespace pdfi
virtual ~WriterXmlEmitter()
{}
- virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( TextElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( PageElement&, const std::list< Element* >::const_iterator& );
- virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& );
+ virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
+ virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE;
};
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 18:30:49 +0000