hwpfilter/source/hbox.cxx | 2 +-
hwpfilter/source/hbox.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e488bc443b681c8d1a36667e5d3caa4e42c28baf
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jan 4 20:27:22 2016 +0000
cppcheck: duplInheritedMember
Change-Id: I451a7a04fd1578d3095e5931f0792a32870a647e
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index fb3037d..beef201 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -331,7 +331,7 @@ TxtBox::TxtBox()
, dummy(0)
, dummy1(0)
, cap_len(0)
- , next(0)
+ , next_box(0)
, dummy2(0)
, reserved1(0)
, cap_pos(0)
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index f8fbd6e..36b8a14 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -336,7 +336,7 @@ struct TxtBox: public FBox
short dummy1; // to not change structure
size */
short cap_len;
- short next;
+ short next_box;
short dummy2; // to not change structure
size */
unsigned char reserved1;
/**
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
