[Libreoffice-commits] libcdr.git: src/lib
Miklos Vajna
vmiklos at collabora.co.uk
Wed Aug 16 06:15:58 UTC 2017
src/lib/CDRContentCollector.h | 72 +++++++++++++++++++--------------------
src/lib/CDRInternalStream.h | 22 +++++------
src/lib/CDROutputElementList.cpp | 72 +++++++++++++++++++--------------------
src/lib/CDRParser.h | 2 -
src/lib/CDRPath.cpp | 70 ++++++++++++++++++-------------------
src/lib/CDRPath.h | 10 ++---
src/lib/CDRStylesCollector.h | 72 +++++++++++++++++++--------------------
src/lib/CMXParser.h | 2 -
8 files changed, 161 insertions(+), 161 deletions(-)
New commits:
commit 4be31f3c4c57fc8b9c8ae048b1b8f03b7d6db154
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Aug 16 08:14:54 2017 +0200
Mark overriding member functions as 'override'
This does not affect the generated code (API or ABI), but:
1) Makes sure that in case the signature of one of these functions would
change by accident, the build breaks as the function no longer overrides
a base function.
2) Makes the code readable by explicitly marking all overriding
functions as 'override', where previously the reader had to read the
interface of the base class(es) as well to find out if the function is
virtual or not.
3) Since 'override' implies 'virtual', remove the 'virtual' keyword
where 'override' is present.
Change-Id: I21c123df891f582a0df624360d8ac3404186c2d0
diff --git a/src/lib/CDRContentCollector.h b/src/lib/CDRContentCollector.h
index 79faf54..438802d 100644
--- a/src/lib/CDRContentCollector.h
+++ b/src/lib/CDRContentCollector.h
@@ -28,45 +28,45 @@ class CDRContentCollector : public CDRCollector
{
public:
CDRContentCollector(CDRParserState &ps, librevenge::RVNGDrawingInterface *painter, bool reverseOrder = true);
- virtual ~CDRContentCollector();
+ ~CDRContentCollector() override;
// collector functions
- void collectPage(unsigned level);
- void collectObject(unsigned level);
- void collectGroup(unsigned level);
- void collectVect(unsigned level);
- void collectOtherList();
- void collectPath(const CDRPath &path);
- void collectLevel(unsigned level);
- void collectTransform(const CDRTransforms &transforms, bool considerGroupTransform);
- void collectFillStyle(unsigned,const CDRFillStyle &) {}
- void collectFillStyleId(unsigned id);
- void collectLineStyle(unsigned,const CDRLineStyle &) {}
- void collectLineStyleId(unsigned id);
- void collectRotate(double angle, double cx, double cy);
- void collectFlags(unsigned flags, bool considerFlags);
- void collectPageSize(double, double, double, double) {}
- void collectPolygonTransform(unsigned numAngles, unsigned nextPoint, double rx, double ry, double cx, double cy);
- void collectBitmap(unsigned imageId, double x1, double x2, double y1, double y2);
- void collectBmp(unsigned, unsigned, unsigned, unsigned, unsigned, const std::vector<unsigned> &, const std::vector<unsigned char> &) {}
- void collectBmp(unsigned, const std::vector<unsigned char> &) {}
- void collectBmpf(unsigned, unsigned, unsigned, const std::vector<unsigned char> &) {}
- void collectPpdt(const std::vector<std::pair<double, double> > &points, const std::vector<unsigned> &knotVector);
- void collectFillTransform(const CDRTransforms &fillTrafo);
- void collectFillOpacity(double opacity);
- void collectPolygon();
- void collectSpline();
- void collectColorProfile(const std::vector<unsigned char> &) {}
- void collectBBox(double x0, double y0, double x1, double y1);
- void collectSpnd(unsigned spnd);
- void collectVectorPattern(unsigned id, const librevenge::RVNGBinaryData &data);
- void collectPaletteEntry(unsigned, unsigned, const CDRColor &) {}
+ void collectPage(unsigned level) override;
+ void collectObject(unsigned level) override;
+ void collectGroup(unsigned level) override;
+ void collectVect(unsigned level) override;
+ void collectOtherList() override;
+ void collectPath(const CDRPath &path) override;
+ void collectLevel(unsigned level) override;
+ void collectTransform(const CDRTransforms &transforms, bool considerGroupTransform) override;
+ void collectFillStyle(unsigned,const CDRFillStyle &) override {}
+ void collectFillStyleId(unsigned id) override;
+ void collectLineStyle(unsigned,const CDRLineStyle &) override {}
+ void collectLineStyleId(unsigned id) override;
+ void collectRotate(double angle, double cx, double cy) override;
+ void collectFlags(unsigned flags, bool considerFlags) override;
+ void collectPageSize(double, double, double, double) override {}
+ void collectPolygonTransform(unsigned numAngles, unsigned nextPoint, double rx, double ry, double cx, double cy) override;
+ void collectBitmap(unsigned imageId, double x1, double x2, double y1, double y2) override;
+ void collectBmp(unsigned, unsigned, unsigned, unsigned, unsigned, const std::vector<unsigned> &, const std::vector<unsigned char> &) override {}
+ void collectBmp(unsigned, const std::vector<unsigned char> &) override {}
+ void collectBmpf(unsigned, unsigned, unsigned, const std::vector<unsigned char> &) override {}
+ void collectPpdt(const std::vector<std::pair<double, double> > &points, const std::vector<unsigned> &knotVector) override;
+ void collectFillTransform(const CDRTransforms &fillTrafo) override;
+ void collectFillOpacity(double opacity) override;
+ void collectPolygon() override;
+ void collectSpline() override;
+ void collectColorProfile(const std::vector<unsigned char> &) override {}
+ void collectBBox(double x0, double y0, double x1, double y1) override;
+ void collectSpnd(unsigned spnd) override;
+ void collectVectorPattern(unsigned id, const librevenge::RVNGBinaryData &data) override;
+ void collectPaletteEntry(unsigned, unsigned, const CDRColor &) override {}
void collectText(unsigned, unsigned, const std::vector<unsigned char> &,
- const std::vector<unsigned char> &, const std::map<unsigned, CDRStyle> &) {}
- void collectArtisticText(double x, double y);
- void collectParagraphText(double x, double y, double width, double height);
- void collectStld(unsigned, const CDRStyle &) {}
- void collectStyleId(unsigned styleId);
+ const std::vector<unsigned char> &, const std::map<unsigned, CDRStyle> &) override {}
+ void collectArtisticText(double x, double y) override;
+ void collectParagraphText(double x, double y, double width, double height) override;
+ void collectStld(unsigned, const CDRStyle &) override {}
+ void collectStyleId(unsigned styleId) override;
private:
CDRContentCollector(const CDRContentCollector &);
diff --git a/src/lib/CDRInternalStream.h b/src/lib/CDRInternalStream.h
index ddb65f1..5b70653 100644
--- a/src/lib/CDRInternalStream.h
+++ b/src/lib/CDRInternalStream.h
@@ -22,36 +22,36 @@ class CDRInternalStream : public librevenge::RVNGInputStream
public:
CDRInternalStream(librevenge::RVNGInputStream *input, unsigned long size, bool compressed=false);
CDRInternalStream(const std::vector<unsigned char> &buffer);
- ~CDRInternalStream() {}
+ ~CDRInternalStream() override {}
- bool isStructured()
+ bool isStructured() override
{
return false;
}
- unsigned subStreamCount()
+ unsigned subStreamCount() override
{
return 0;
}
- const char *subStreamName(unsigned)
+ const char *subStreamName(unsigned) override
{
return 0;
}
- bool existsSubStream(const char *)
+ bool existsSubStream(const char *) override
{
return false;
}
- librevenge::RVNGInputStream *getSubStreamByName(const char *)
+ librevenge::RVNGInputStream *getSubStreamByName(const char *) override
{
return 0;
}
- librevenge::RVNGInputStream *getSubStreamById(unsigned)
+ librevenge::RVNGInputStream *getSubStreamById(unsigned) override
{
return 0;
}
- const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
- long tell();
- bool isEnd();
+ const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead) override;
+ int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) override;
+ long tell() override;
+ bool isEnd() override;
unsigned long getSize() const
{
return m_buffer.size();
diff --git a/src/lib/CDROutputElementList.cpp b/src/lib/CDROutputElementList.cpp
index 8344876..b7c0cd6 100644
--- a/src/lib/CDROutputElementList.cpp
+++ b/src/lib/CDROutputElementList.cpp
@@ -110,9 +110,9 @@ class CDRStyleOutputElement : public CDROutputElement
{
public:
CDRStyleOutputElement(const librevenge::RVNGPropertyList &propList);
- virtual ~CDRStyleOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDRStyleOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDRStyleOutputElement(m_propList);
}
@@ -125,9 +125,9 @@ class CDRPathOutputElement : public CDROutputElement
{
public:
CDRPathOutputElement(const librevenge::RVNGPropertyList &propList);
- virtual ~CDRPathOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDRPathOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDRPathOutputElement(m_propList);
}
@@ -140,9 +140,9 @@ class CDRGraphicObjectOutputElement : public CDROutputElement
{
public:
CDRGraphicObjectOutputElement(const librevenge::RVNGPropertyList &propList);
- virtual ~CDRGraphicObjectOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDRGraphicObjectOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDRGraphicObjectOutputElement(m_propList);
}
@@ -155,9 +155,9 @@ class CDRStartTextObjectOutputElement : public CDROutputElement
{
public:
CDRStartTextObjectOutputElement(const librevenge::RVNGPropertyList &propList);
- virtual ~CDRStartTextObjectOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDRStartTextObjectOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDRStartTextObjectOutputElement(m_propList);
}
@@ -170,9 +170,9 @@ class CDROpenParagraphOutputElement : public CDROutputElement
{
public:
CDROpenParagraphOutputElement(const librevenge::RVNGPropertyList &propList);
- virtual ~CDROpenParagraphOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDROpenParagraphOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDROpenParagraphOutputElement(m_propList);
}
@@ -185,9 +185,9 @@ class CDROpenSpanOutputElement : public CDROutputElement
{
public:
CDROpenSpanOutputElement(const librevenge::RVNGPropertyList &propList);
- virtual ~CDROpenSpanOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDROpenSpanOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDROpenSpanOutputElement(m_propList);
}
@@ -200,9 +200,9 @@ class CDRInsertTextOutputElement : public CDROutputElement
{
public:
CDRInsertTextOutputElement(const librevenge::RVNGString &text);
- virtual ~CDRInsertTextOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDRInsertTextOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDRInsertTextOutputElement(m_text);
}
@@ -215,9 +215,9 @@ class CDRCloseSpanOutputElement : public CDROutputElement
{
public:
CDRCloseSpanOutputElement();
- virtual ~CDRCloseSpanOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDRCloseSpanOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDRCloseSpanOutputElement();
}
@@ -228,9 +228,9 @@ class CDRCloseParagraphOutputElement : public CDROutputElement
{
public:
CDRCloseParagraphOutputElement();
- virtual ~CDRCloseParagraphOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDRCloseParagraphOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDRCloseParagraphOutputElement();
}
@@ -241,9 +241,9 @@ class CDREndTextObjectOutputElement : public CDROutputElement
{
public:
CDREndTextObjectOutputElement();
- virtual ~CDREndTextObjectOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDREndTextObjectOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDREndTextObjectOutputElement();
}
@@ -253,9 +253,9 @@ class CDRStartLayerOutputElement : public CDROutputElement
{
public:
CDRStartLayerOutputElement(const librevenge::RVNGPropertyList &propList);
- virtual ~CDRStartLayerOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDRStartLayerOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDRStartLayerOutputElement(m_propList);
}
@@ -267,9 +267,9 @@ class CDREndLayerOutputElement : public CDROutputElement
{
public:
CDREndLayerOutputElement();
- virtual ~CDREndLayerOutputElement() {}
- virtual void draw(librevenge::RVNGDrawingInterface *painter);
- virtual CDROutputElement *clone()
+ ~CDREndLayerOutputElement() override {}
+ void draw(librevenge::RVNGDrawingInterface *painter) override;
+ CDROutputElement *clone() override
{
return new CDREndLayerOutputElement();
}
diff --git a/src/lib/CDRParser.h b/src/lib/CDRParser.h
index 2521cd3..8ce7887 100644
--- a/src/lib/CDRParser.h
+++ b/src/lib/CDRParser.h
@@ -28,7 +28,7 @@ class CDRParser : protected CommonParser
{
public:
explicit CDRParser(const std::vector<librevenge::RVNGInputStream *> &externalStreams, CDRCollector *collector);
- virtual ~CDRParser();
+ ~CDRParser() override;
bool parseRecords(librevenge::RVNGInputStream *input, const std::vector<unsigned> &blockLengths = std::vector<unsigned>(), unsigned level = 0);
bool parseWaldo(librevenge::RVNGInputStream *input);
diff --git a/src/lib/CDRPath.cpp b/src/lib/CDRPath.cpp
index 45b0bc6..a0d500d 100644
--- a/src/lib/CDRPath.cpp
+++ b/src/lib/CDRPath.cpp
@@ -225,11 +225,11 @@ public:
CDRMoveToElement(double x, double y)
: m_x(x),
m_y(y) {}
- ~CDRMoveToElement() {}
- void writeOut(librevenge::RVNGPropertyListVector &vec) const;
- void transform(const CDRTransforms &trafos);
- void transform(const CDRTransform &trafo);
- CDRPathElement *clone();
+ ~CDRMoveToElement() override {}
+ void writeOut(librevenge::RVNGPropertyListVector &vec) const override;
+ void transform(const CDRTransforms &trafos) override;
+ void transform(const CDRTransform &trafo) override;
+ CDRPathElement *clone() override;
private:
double m_x;
double m_y;
@@ -241,11 +241,11 @@ public:
CDRLineToElement(double x, double y)
: m_x(x),
m_y(y) {}
- ~CDRLineToElement() {}
- void writeOut(librevenge::RVNGPropertyListVector &vec) const;
- void transform(const CDRTransforms &trafos);
- void transform(const CDRTransform &trafo);
- CDRPathElement *clone();
+ ~CDRLineToElement() override {}
+ void writeOut(librevenge::RVNGPropertyListVector &vec) const override;
+ void transform(const CDRTransforms &trafos) override;
+ void transform(const CDRTransform &trafo) override;
+ CDRPathElement *clone() override;
private:
double m_x;
double m_y;
@@ -261,11 +261,11 @@ public:
m_y2(y2),
m_x(x),
m_y(y) {}
- ~CDRCubicBezierToElement() {}
- void writeOut(librevenge::RVNGPropertyListVector &vec) const;
- void transform(const CDRTransforms &trafos);
- void transform(const CDRTransform &trafo);
- CDRPathElement *clone();
+ ~CDRCubicBezierToElement() override {}
+ void writeOut(librevenge::RVNGPropertyListVector &vec) const override;
+ void transform(const CDRTransforms &trafos) override;
+ void transform(const CDRTransform &trafo) override;
+ CDRPathElement *clone() override;
private:
double m_x1;
double m_y1;
@@ -283,11 +283,11 @@ public:
m_y1(y1),
m_x(x),
m_y(y) {}
- ~CDRQuadraticBezierToElement() {}
- void writeOut(librevenge::RVNGPropertyListVector &vec) const;
- void transform(const CDRTransforms &trafos);
- void transform(const CDRTransform &trafo);
- CDRPathElement *clone();
+ ~CDRQuadraticBezierToElement() override {}
+ void writeOut(librevenge::RVNGPropertyListVector &vec) const override;
+ void transform(const CDRTransforms &trafos) override;
+ void transform(const CDRTransform &trafo) override;
+ CDRPathElement *clone() override;
private:
double m_x1;
double m_y1;
@@ -300,11 +300,11 @@ class CDRSplineToElement : public CDRPathElement
public:
CDRSplineToElement(const std::vector<std::pair<double, double> > &points)
: m_points(points) {}
- ~CDRSplineToElement() {}
- void writeOut(librevenge::RVNGPropertyListVector &vec) const;
- void transform(const CDRTransforms &trafos);
- void transform(const CDRTransform &trafo);
- CDRPathElement *clone();
+ ~CDRSplineToElement() override {}
+ void writeOut(librevenge::RVNGPropertyListVector &vec) const override;
+ void transform(const CDRTransforms &trafos) override;
+ void transform(const CDRTransform &trafo) override;
+ CDRPathElement *clone() override;
private:
std::vector<std::pair<double, double> > m_points;
unsigned knot(unsigned i) const;
@@ -321,11 +321,11 @@ public:
m_sweep(sweep),
m_x(x),
m_y(y) {}
- ~CDRArcToElement() {}
- void writeOut(librevenge::RVNGPropertyListVector &vec) const;
- void transform(const CDRTransforms &trafos);
- void transform(const CDRTransform &trafo);
- CDRPathElement *clone();
+ ~CDRArcToElement() override {}
+ void writeOut(librevenge::RVNGPropertyListVector &vec) const override;
+ void transform(const CDRTransforms &trafos) override;
+ void transform(const CDRTransform &trafo) override;
+ CDRPathElement *clone() override;
private:
double m_rx;
double m_ry;
@@ -340,11 +340,11 @@ class CDRClosePathElement : public CDRPathElement
{
public:
CDRClosePathElement() {}
- ~CDRClosePathElement() {}
- void writeOut(librevenge::RVNGPropertyListVector &vec) const;
- void transform(const CDRTransforms &trafos);
- void transform(const CDRTransform &trafo);
- CDRPathElement *clone();
+ ~CDRClosePathElement() override {}
+ void writeOut(librevenge::RVNGPropertyListVector &vec) const override;
+ void transform(const CDRTransforms &trafos) override;
+ void transform(const CDRTransform &trafo) override;
+ CDRPathElement *clone() override;
};
} // namespace libcdr
diff --git a/src/lib/CDRPath.h b/src/lib/CDRPath.h
index 7e41dfd..eb064b5 100644
--- a/src/lib/CDRPath.h
+++ b/src/lib/CDRPath.h
@@ -36,7 +36,7 @@ class CDRPath : public CDRPathElement
public:
CDRPath() : m_elements(), m_isClosed(false) {}
CDRPath(const CDRPath &path);
- ~CDRPath();
+ ~CDRPath() override;
CDRPath &operator=(const CDRPath &path);
@@ -49,11 +49,11 @@ public:
void appendClosePath();
void appendPath(const CDRPath &path);
- void writeOut(librevenge::RVNGPropertyListVector &vec) const;
+ void writeOut(librevenge::RVNGPropertyListVector &vec) const override;
void writeOut(librevenge::RVNGString &path, librevenge::RVNGString &viewBox, double &width) const;
- void transform(const CDRTransforms &trafos);
- void transform(const CDRTransform &trafo);
- CDRPathElement *clone();
+ void transform(const CDRTransforms &trafos) override;
+ void transform(const CDRTransform &trafo) override;
+ CDRPathElement *clone() override;
void clear();
bool empty() const;
diff --git a/src/lib/CDRStylesCollector.h b/src/lib/CDRStylesCollector.h
index 009692f..91903ee 100644
--- a/src/lib/CDRStylesCollector.h
+++ b/src/lib/CDRStylesCollector.h
@@ -28,45 +28,45 @@ class CDRStylesCollector : public CDRCollector
{
public:
CDRStylesCollector(CDRParserState &ps);
- virtual ~CDRStylesCollector();
+ ~CDRStylesCollector() override;
// collector functions
- void collectPage(unsigned level);
- void collectObject(unsigned) {}
- void collectGroup(unsigned) {}
- void collectVect(unsigned) {}
- void collectOtherList() {}
- void collectPath(const CDRPath &) {}
- void collectLevel(unsigned) {}
- void collectTransform(const CDRTransforms &, bool) {}
- void collectFillStyle(unsigned id, const CDRFillStyle &fillStyle);
- void collectFillStyleId(unsigned) {}
- void collectLineStyle(unsigned id, const CDRLineStyle &lineStyle);
- void collectLineStyleId(unsigned) {}
- void collectRotate(double,double,double) {}
- void collectFlags(unsigned, bool) {}
- void collectPageSize(double width, double height, double offsetX, double offsetY);
- void collectPolygonTransform(unsigned, unsigned, double, double, double, double) {}
- void collectBitmap(unsigned, double, double, double, double) {}
- void collectBmp(unsigned imageId, unsigned colorModel, unsigned width, unsigned height, unsigned bpp, const std::vector<unsigned> &palette, const std::vector<unsigned char> &bitmap);
- void collectBmp(unsigned imageId, const std::vector<unsigned char> &bitmap);
- void collectBmpf(unsigned patternId, unsigned width, unsigned height, const std::vector<unsigned char> &pattern);
- void collectPpdt(const std::vector<std::pair<double, double> > &, const std::vector<unsigned> &) {}
- void collectFillTransform(const CDRTransforms &) {}
- void collectFillOpacity(double) {}
- void collectPolygon() {}
- void collectSpline() {}
- void collectColorProfile(const std::vector<unsigned char> &profile);
- void collectBBox(double, double, double, double) {}
- void collectSpnd(unsigned) {}
- void collectVectorPattern(unsigned, const librevenge::RVNGBinaryData &) {}
- void collectPaletteEntry(unsigned colorId, unsigned userId, const CDRColor &color);
+ void collectPage(unsigned level) override;
+ void collectObject(unsigned) override {}
+ void collectGroup(unsigned) override {}
+ void collectVect(unsigned) override {}
+ void collectOtherList() override {}
+ void collectPath(const CDRPath &) override {}
+ void collectLevel(unsigned) override {}
+ void collectTransform(const CDRTransforms &, bool) override {}
+ void collectFillStyle(unsigned id, const CDRFillStyle &fillStyle) override;
+ void collectFillStyleId(unsigned) override {}
+ void collectLineStyle(unsigned id, const CDRLineStyle &lineStyle) override;
+ void collectLineStyleId(unsigned) override {}
+ void collectRotate(double,double,double) override {}
+ void collectFlags(unsigned, bool) override {}
+ void collectPageSize(double width, double height, double offsetX, double offsetY) override;
+ void collectPolygonTransform(unsigned, unsigned, double, double, double, double) override {}
+ void collectBitmap(unsigned, double, double, double, double) override {}
+ void collectBmp(unsigned imageId, unsigned colorModel, unsigned width, unsigned height, unsigned bpp, const std::vector<unsigned> &palette, const std::vector<unsigned char> &bitmap) override;
+ void collectBmp(unsigned imageId, const std::vector<unsigned char> &bitmap) override;
+ void collectBmpf(unsigned patternId, unsigned width, unsigned height, const std::vector<unsigned char> &pattern) override;
+ void collectPpdt(const std::vector<std::pair<double, double> > &, const std::vector<unsigned> &) override {}
+ void collectFillTransform(const CDRTransforms &) override {}
+ void collectFillOpacity(double) override {}
+ void collectPolygon() override {}
+ void collectSpline() override {}
+ void collectColorProfile(const std::vector<unsigned char> &profile) override;
+ void collectBBox(double, double, double, double) override {}
+ void collectSpnd(unsigned) override {}
+ void collectVectorPattern(unsigned, const librevenge::RVNGBinaryData &) override {}
+ void collectPaletteEntry(unsigned colorId, unsigned userId, const CDRColor &color) override;
void collectText(unsigned textId, unsigned styleId, const std::vector<unsigned char> &data,
- const std::vector<unsigned char> &charDescriptions, const std::map<unsigned, CDRStyle> &styleOverrides);
- void collectArtisticText(double, double) {}
- void collectParagraphText(double, double, double, double) {}
- void collectStld(unsigned id, const CDRStyle &style);
- void collectStyleId(unsigned) {}
+ const std::vector<unsigned char> &charDescriptions, const std::map<unsigned, CDRStyle> &styleOverrides) override;
+ void collectArtisticText(double, double) override {}
+ void collectParagraphText(double, double, double, double) override {}
+ void collectStld(unsigned id, const CDRStyle &style) override;
+ void collectStyleId(unsigned) override {}
private:
CDRStylesCollector(const CDRStylesCollector &);
diff --git a/src/lib/CMXParser.h b/src/lib/CMXParser.h
index 1cea078..47dc5ae 100644
--- a/src/lib/CMXParser.h
+++ b/src/lib/CMXParser.h
@@ -104,7 +104,7 @@ class CMXParser : protected CommonParser
{
public:
explicit CMXParser(CDRCollector *collector, CMXParserState &parserState);
- virtual ~CMXParser();
+ ~CMXParser() override;
bool parseRecords(librevenge::RVNGInputStream *input, long size = -1, unsigned level = 0);
private:
More information about the Libreoffice-commits
mailing list