summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-01-18 10:53:42 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-18 10:53:42 +0000
commit02cf0e0f895b79d565a410ecfaf5f1fbbdae871e (patch)
tree7a24c7556d9f71bbdd1642cb46e3386b98d6bd68
parentb9ef2799e679bf8f4aab2d4b47f725dcaf0d1e5c (diff)
disambiguate between two different SkipBlocks
-rw-r--r--hwpfilter/source/hbox.cpp4
-rw-r--r--hwpfilter/source/hbox.h6
-rw-r--r--hwpfilter/source/hpara.cpp2
-rw-r--r--hwpfilter/source/hwpread.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/hwpfilter/source/hbox.cpp b/hwpfilter/source/hbox.cpp
index ce3bf2f53cd7..485bf3fb512d 100644
--- a/hwpfilter/source/hbox.cpp
+++ b/hwpfilter/source/hbox.cpp
@@ -85,13 +85,13 @@ hunit HBox::Height(CharShape *csty)
// skip block
-SkipBlock::SkipBlock(hchar hch):HBox(hch)
+SkipData::SkipData(hchar hch):HBox(hch)
{
data_block = 0;
}
-SkipBlock::~SkipBlock(void)
+SkipData::~SkipData(void)
{
delete[]data_block;
}
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index 3a0647019cc6..fdbfe1fe31e2 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -84,14 +84,14 @@ struct HBox
/**
* @short Class for saving data to be skipped.
*/
-struct SkipBlock: public HBox
+struct SkipData: public HBox
{
ulong data_block_len;
hchar dummy;
char *data_block;
- SkipBlock(hchar);
- virtual ~SkipBlock();
+ SkipData(hchar);
+ virtual ~SkipData();
virtual int Read(HWPFile &hwpf);
};
struct DateCode;
diff --git a/hwpfilter/source/hpara.cpp b/hwpfilter/source/hpara.cpp
index b60df27dda1e..629236e32b5e 100644
--- a/hwpfilter/source/hpara.cpp
+++ b/hwpfilter/source/hpara.cpp
@@ -221,7 +221,7 @@ HBox *HWPPara::readHBox(HWPFile & hwpf)
if (hh > 31 || hh == CH_END_PARA)
hbox = new HBox(hh);
else if (IS_SP_SKIP_BLOCK(hh))
- hbox = new SkipBlock(hh);
+ hbox = new SkipData(hh);
else
{
switch (hh)
diff --git a/hwpfilter/source/hwpread.cpp b/hwpfilter/source/hwpread.cpp
index 3be3cc0815b5..2fa29da5ae40 100644
--- a/hwpfilter/source/hwpread.cpp
+++ b/hwpfilter/source/hwpread.cpp
@@ -52,7 +52,7 @@ int HBox::Read(HWPFile & )
// skip block
-int SkipBlock::Read(HWPFile & hwpf)
+int SkipData::Read(HWPFile & hwpf)
{
hwpf.Read4b(&data_block_len, 1);
hwpf.Read2b(&dummy, 1);