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

[Miklos Vajna]

 sw/source/filter/ww8/ww8par4.cxx |    3 ++-
 sw/source/filter/ww8/ww8par6.cxx |    2 +-
 sw/source/filter/ww8/ww8scan.cxx |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ab207cc63d697426bb5c0e05bcde5c6a2785ad25
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Feb 3 13:00:18 2014 +0100

    sw: hardcoded NS_sprm::LN_CDttmRMarkDel
    
    Change-Id: I56dc2661de5e421e979485f718b7b2a464a03866

diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 0532bd0..2573a8f 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -30,6 +30,7 @@
 #include <hintids.hxx>
 #include <svx/svdoole2.hxx>
 #include <filter/msfilter/msdffimp.hxx>
+#include <filter/msfilter/sprmids.hxx>
 #include <svx/unoapi.hxx>
 
 #include <sot/exchange.hxx>
@@ -503,7 +504,7 @@ void SwWW8ImplReader::Read_CRevisionMark(RedlineType_t eType,
             pPlcxMan->HasCharSprm( bIns ? 0x4804 : 0x4863, aResult);
             pSprmCIbstRMark = aResult.empty() ? 0 : aResult.back();
             aResult.clear();
-            pPlcxMan->HasCharSprm( bIns ? 0x6805 : 0x6864, aResult);
+            pPlcxMan->HasCharSprm( bIns ? 0x6805 : NS_sprm::LN_CDttmRMarkDel, aResult);
             pSprmCDttmRMark = aResult.empty() ? 0 : aResult.back();
         }
     }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 627a19b..b0ce585 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -5853,7 +5853,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
         {0x4863, 0},                                 //"sprmCIbstRMarkDel"
                                                      //chp.ibstRMarkDel;index into
                                                      //sttbRMark;short;
-        {0x6864, 0},                                 //"sprmCDttmRMarkDel"
+        {NS_sprm::LN_CDttmRMarkDel, 0},
                                                      //chp.dttmRMarkDel;DTTM;long;
         {0x6865, &SwWW8ImplReader::Read_CharBorder}, //"sprmCBrc" chp.brc;BRC;long;
         {0x4866, &SwWW8ImplReader::Read_CharShadow}, //"sprmCShd" chp.shd;SHD;short;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 98a79a4..c5830fb 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -617,7 +617,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
                             // chp.ibstDispFldRMark, chp.dttmDispFldRMark ;
         {0x4863, 2, L_FIX}, // "sprmCIbstRMarkDel" chp.ibstRMarkDel;index into
                             // sttbRMark;short;
-        {0x6864, 4, L_FIX}, // "sprmCDttmRMarkDel" chp.dttmRMarkDel;DTTM;long;
+        {NS_sprm::LN_CDttmRMarkDel, 4, L_FIX}, // chp.dttmRMarkDel;DTTM;long;
         {0x6865, 4, L_FIX}, // "sprmCBrc" chp.brc;BRC;long;
         {0x4866, 2, L_FIX}, // "sprmCShd" chp.shd;SHD;short;
         {0x4867, 2, L_FIX}, // "sprmCIdslRMarkDel" chp.idslRMReasonDel;an index