src/lib/CDRContentCollector.h | 8 ++++---- src/lib/CDRParser.cpp | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit 4144e6e95a6ff2a73b5c94af87eb51a25c56e103 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Tue Mar 26 09:02:55 2013 +0100 Some cosmetical fixes diff --git a/src/lib/CDRContentCollector.h b/src/lib/CDRContentCollector.h index ba0cd28..0f8019c 100644 --- a/src/lib/CDRContentCollector.h +++ b/src/lib/CDRContentCollector.h @@ -73,8 +73,8 @@ public: 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 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); @@ -87,8 +87,8 @@ public: void collectVectorPattern(unsigned id, const WPXBinaryData &data); void collectPaletteEntry(unsigned, unsigned, const CDRColor &) {} void collectFont(unsigned, unsigned short, const WPXString &) {} - void collectText(unsigned, unsigned, const std::vector<unsigned char>&, - const std::vector<uint64_t>&, const std::map<unsigned, CDRCharacterStyle>&) {} + void collectText(unsigned, unsigned, const std::vector<unsigned char> &, + const std::vector<uint64_t> &, const std::map<unsigned, CDRCharacterStyle> &) {} void collectArtisticText(double x, double y); void collectParagraphText(double x, double y, double width, double height); void collectStlt(const std::map<unsigned, CDRCharacterStyle> &) {} diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp index 52cea0b..6cc31de 100644 --- a/src/lib/CDRParser.cpp +++ b/src/lib/CDRParser.cpp @@ -115,7 +115,7 @@ static void processNameForEncoding(WPXString &name, unsigned short &encoding) else if (length >= 4 && (found=fontName.find("GOST", 0, 4)) != std::string::npos) { encoding = 0xcc; - found = std::string::npos; + found = std::string::npos; } if (found != std::string::npos) @@ -2386,7 +2386,8 @@ void libcdr::CDRParser::readFont(WPXInputStream *input, unsigned length) break; } } - processNameForEncoding(name, fontEncoding); + if (!fontEncoding) + processNameForEncoding(name, fontEncoding); m_collector->collectFont(fontId, fontEncoding, name); }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits