sw/source/filter/ww8/ww8par.hxx | 3 --- sw/source/filter/ww8/ww8scan.cxx | 6 ++++++ sw/source/filter/ww8/ww8scan.hxx | 6 +++++- 3 files changed, 11 insertions(+), 4 deletions(-)
New commits: commit b088fc60b42646cf55fde3c2dba4e8cd48753ee6 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue Dec 8 11:00:30 2015 +0100 DOC import: tokenize smart-tag data Change-Id: I43e52c2c982ed553a53be9839feff591c99fdfca diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index aac1f2c..1a39642 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 07f613d..7a599be 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; commit 012f33f0cc08e19e6635a39f135ee79a96d6f3f9 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue Dec 8 10:27:56 2015 +0100 SwWW8ImplReader: unused members Leftover from commit 0ec0ec267986644084baaa5bda5ba917dc5744df (i#93570 DOC import: handle commented text ranges via RES_FLTR_ANNOTATIONMARK, 2014-12-30). Change-Id: Ifc2547ccb6bc91687ad61896b72367320210a837 diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 0b18e4b..98669e3 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1250,9 +1250,6 @@ private: SwMSDffManager* m_pMSDffManager; std::vector<OUString>* m_pAtnNames; - std::shared_ptr< std::map<sal_uInt32, int> > m_pAtnIndexes; - std::shared_ptr<WW8PLCFspecial> m_pAtnStarts; - std::shared_ptr<WW8PLCFspecial> m_pAtnEnds; sw::util::AuthorInfos m_aAuthorInfos; OUString m_sBaseURL; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits