summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-12-08 11:00:30 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-07-07 11:23:49 +0200
commit380d959e2b161d2244468c7d6d2af5e5179de59e (patch)
treefc0152efa5ef53b167726f3347269dc7a7885748 /sw/source/filter/ww8
parent492f2c02252992542ab3fbda85531faf829de772 (diff)
DOC import: tokenize smart-tag data
Change-Id: I43e52c2c982ed553a53be9839feff591c99fdfca (cherry picked from commit b088fc60b42646cf55fde3c2dba4e8cd48753ee6)
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx6
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx6
2 files changed, 11 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index aac1f2c46ebf..1a396421eeaa 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5860,6 +5860,12 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
rSt.ReadInt32(fcPlcfBklFactoid);
rSt.ReadUInt32(lcbPlcfBklFactoid);
}
+ if (cfclcb > 137)
+ {
+ rSt.Seek(0x44a);
+ rSt.ReadInt32(fcFactoidData);
+ rSt.ReadUInt32(lcbFactoidData);
+ }
if( 0 != rSt.GetError() )
nFibError = ERR_SWG_READ_ERROR;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 07f613d3fdc1..7a599be2c48a 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1465,8 +1465,12 @@ public:
WW8_FC fcPlcfBklFactoid;
/// 0x446 smart-tag bookmark ends length.
sal_uInt32 lcbPlcfBklFactoid;
+ /// 0x44a smart tag data offset.
+ WW8_FC fcFactoidData;
+ /// 0x44e smart tag data length.
+ sal_uInt32 lcbFactoidData;
- // 0x44a - 0x4d4 == ignore
+ // 0x452 - 0x4d4 == ignore
WW8_FC fcHplxsdr; //bizarrely, word xp seems to require this set to shows dates from AtrdExtra
sal_uInt32 lcbHplxsdr;