[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/filter/ww8/ww8scan.cxx |   14 ++++++++++++++
 sw/source/filter/ww8/ww8scan.hxx |   17 ++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

New commits:
commit 3decff7736a46e19e4296a4eedb3c917f02d3b97
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Dec 7 16:34:15 2015 +0100

    DOC import: tokenize smart-tag bookmark offsets/sizes
    
    Change-Id: I4a37651c3cf78ae818d1018abb6cc8e69ffd71b0

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index f19243d..491adec 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5708,6 +5708,20 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
                 rSt.ReadUInt32( lcbAtrdExtra );
             }
 
+            // Factoid bookmarks
+            if (cfclcb > 134)
+            {
+                rSt.Seek(0x432);
+                rSt.ReadInt32(fcPlcfBkfFactoid);
+                rSt.ReadUInt32(lcbPlcfBkfFactoid);
+            }
+            if (cfclcb > 136)
+            {
+                rSt.Seek(0x442);
+                rSt.ReadInt32(fcPlcfBklFactoid);
+                rSt.ReadUInt32(lcbPlcfBklFactoid);
+            }
+
             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 368429a..36c6062 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1419,7 +1419,22 @@ public:
     WW8_FC fcAtrdExtra;
     sal_uInt32 lcbAtrdExtra;
 
-    // 0x422 - 0x4D4 == ignore
+    // 0x422 - 0x431 == ignore
+
+    /// 0x432 smart-tag bookmark starts offset.
+    WW8_FC fcPlcfBkfFactoid;
+    /// 0x436 smart-tag bookmark ends length.
+    sal_uInt32 lcbPlcfBkfFactoid;
+
+    // 0x43a - 0x441 == ignore
+
+    /// 0x442 smart-tag bookmark ends offset.
+    WW8_FC fcPlcfBklFactoid;
+    /// 0x446 smart-tag bookmark ends length.
+    sal_uInt32 lcbPlcfBklFactoid;
+
+    // 0x44a - 0x4d4 == ignore
+
     WW8_FC fcHplxsdr;    //bizarrely, word xp seems to require this set to shows dates from AtrdExtra
     sal_uInt32 lcbHplxsdr;