summaryrefslogtreecommitdiff
path: root/fxbarcode/oned
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-09-17 18:54:07 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-09-17 18:54:07 +0000
commit222db47cd745c223bbf52ac5770909c41dc660b8 (patch)
treef570fd38c1fa427fd60eeadf3b86ead966d8b9a4 /fxbarcode/oned
parentbff81396b7aee1cc195194d0d1122d8fbec7dfb9 (diff)
downloadpdfium-222db47cd745c223bbf52ac5770909c41dc660b8.tar.xz
Make CBC_CodeBase::SetTextLocation() not virtual.
Make CBC_Writer::SetTextLocation() virtual instead. Change-Id: I9ac06affe35f3c7bebc2f5ff0917e7146cfe89cc Reviewed-on: https://pdfium-review.googlesource.com/42601 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'fxbarcode/oned')
-rw-r--r--fxbarcode/oned/BC_OnedCodaBarWriter.h2
-rw-r--r--fxbarcode/oned/BC_OnedCode128Writer.h3
-rw-r--r--fxbarcode/oned/BC_OnedCode39Writer.h2
-rw-r--r--fxbarcode/oned/BC_OnedEAN8Writer.h2
4 files changed, 4 insertions, 5 deletions
diff --git a/fxbarcode/oned/BC_OnedCodaBarWriter.h b/fxbarcode/oned/BC_OnedCodaBarWriter.h
index 4b4f066ad4..ff30ab64d9 100644
--- a/fxbarcode/oned/BC_OnedCodaBarWriter.h
+++ b/fxbarcode/oned/BC_OnedCodaBarWriter.h
@@ -30,10 +30,10 @@ class CBC_OnedCodaBarWriter final : public CBC_OneDimWriter {
bool CheckContentValidity(const WideStringView& contents) override;
WideString FilterContents(const WideStringView& contents) override;
void SetDataLength(int32_t length) override;
+ bool SetTextLocation(BC_TEXT_LOC location) override;
virtual bool SetStartChar(char start);
virtual bool SetEndChar(char end);
- virtual bool SetTextLocation(BC_TEXT_LOC location);
virtual bool SetWideNarrowRatio(int8_t ratio);
virtual bool FindChar(wchar_t ch, bool isContent);
diff --git a/fxbarcode/oned/BC_OnedCode128Writer.h b/fxbarcode/oned/BC_OnedCode128Writer.h
index f91874ce14..3a834e8c98 100644
--- a/fxbarcode/oned/BC_OnedCode128Writer.h
+++ b/fxbarcode/oned/BC_OnedCode128Writer.h
@@ -33,8 +33,7 @@ class CBC_OnedCode128Writer final : public CBC_OneDimWriter {
uint8_t* EncodeImpl(const ByteString& contents, int32_t& outLength) override;
bool CheckContentValidity(const WideStringView& contents) override;
WideString FilterContents(const WideStringView& contents) override;
-
- bool SetTextLocation(BC_TEXT_LOC location);
+ bool SetTextLocation(BC_TEXT_LOC location) override;
BC_TYPE GetType() const { return m_codeFormat; }
diff --git a/fxbarcode/oned/BC_OnedCode39Writer.h b/fxbarcode/oned/BC_OnedCode39Writer.h
index 97ef7a22b5..e136073209 100644
--- a/fxbarcode/oned/BC_OnedCode39Writer.h
+++ b/fxbarcode/oned/BC_OnedCode39Writer.h
@@ -28,8 +28,8 @@ class CBC_OnedCode39Writer final : public CBC_OneDimWriter {
bool CheckContentValidity(const WideStringView& contents) override;
WideString FilterContents(const WideStringView& contents) override;
WideString RenderTextContents(const WideStringView& contents) override;
+ bool SetTextLocation(BC_TEXT_LOC location) override;
- virtual bool SetTextLocation(BC_TEXT_LOC location);
virtual bool SetWideNarrowRatio(int8_t ratio);
bool encodedContents(const WideStringView& contents, WideString* result);
diff --git a/fxbarcode/oned/BC_OnedEAN8Writer.h b/fxbarcode/oned/BC_OnedEAN8Writer.h
index 853d4dace8..6295c4eb58 100644
--- a/fxbarcode/oned/BC_OnedEAN8Writer.h
+++ b/fxbarcode/oned/BC_OnedEAN8Writer.h
@@ -30,8 +30,8 @@ class CBC_OnedEAN8Writer final : public CBC_OneDimWriter {
bool CheckContentValidity(const WideStringView& contents) override;
WideString FilterContents(const WideStringView& contents) override;
void SetDataLength(int32_t length) override;
+ bool SetTextLocation(BC_TEXT_LOC location) override;
- bool SetTextLocation(BC_TEXT_LOC location);
int32_t CalcChecksum(const ByteString& contents);
private: