diff options
| author | Marco Cecchetti <mrcekets@gmail.com> | 2018-10-27 16:53:10 +0000 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-11-07 16:31:38 +0100 |
| commit | f5ae3fc056408a55365b04d45f98de64b667ab3c (patch) | |
| tree | 61ecc4a192fc5a86bac77f00bbb71933fbfc6380 /svx | |
| parent | e94ceb6eff0edd1699d21b8b860f6929236a90ef (diff) | |
fix compiler error: shadows a member of 'this'
Fix an annoying bug reported by compiler (warnings as errors enabled)
Moreover there are some minor change in formatting reported by
clang-format commit-hook
Change-Id: I148b0bc3384e9fab070bba4df5b15cbb44ece930
(cherry picked from commit e30214acc7f9d527876354200c8b9b792a323ecf)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdpdf.hxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx index a4a59a8bff82..6b4b0d63a816 100644 --- a/svx/source/svdraw/svdpdf.hxx +++ b/svx/source/svdraw/svdpdf.hxx @@ -41,7 +41,7 @@ class SdrPage; class SdrObject; class SvdProgressInfo; typedef struct fpdf_document_t__* FPDF_DOCUMENT; -typedef struct fpdf_pageobject_t__* FPDF_PAGEOBJECT; // (text, path, etc.) +typedef struct fpdf_pageobject_t__* FPDF_PAGEOBJECT; // (text, path, etc.) typedef struct fpdf_textpage_t__* FPDF_TEXTPAGE; // Helper Class to import PDF @@ -60,13 +60,13 @@ class ImpSdrPdfImport final { } - Matrix(double a, double b, double c, double d, double e, double f) - : ma(a) - , mb(b) - , mc(c) - , md(d) - , me(e) - , mf(f) + Matrix(double da, double db, double dc, double dd, double de, double df) + : ma(da) + , mb(db) + , mc(dc) + , md(dd) + , me(de) + , mf(df) { } @@ -87,7 +87,6 @@ class ImpSdrPdfImport final double d() const { return md; } double e() const { return me; } double f() const { return mf; } - /// Mutliply this * other. void Concatinate(const Matrix& other) { |