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

Miklos Vajna vmiklos at collabora.co.uk
Sat Feb 1 06:12:30 PST 2014


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

New commits:
commit dd1d7868a9180c846e309445de6d7ce54bbb710b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Feb 1 15:03:09 2014 +0100

    sw: hardcoded NS_sprm::LN_PWAlignFont
    
    Change-Id: I539f0f0affb6edcfbc16ace773cbe7357793d72f

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index d65e7dc..627a19b 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -5664,7 +5664,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
                                                      //pap.fAutoSpaceDE;0 or 1;byte;
         {0x2438, 0},                                 //"sprmPFAutoSpaceDN"
                                                      //pap.fAutoSpaceDN;0 or 1;byte;
-        {0x4439, &SwWW8ImplReader::Read_AlignFont},  //"sprmPWAlignFont"
+        {NS_sprm::LN_PWAlignFont, &SwWW8ImplReader::Read_AlignFont},  //"sprmPWAlignFont"
                                                      //pap.wAlignFont;iFa; word;
         {0x443A, 0},                                 //"sprmPFrameTextFlow"
                                                      //pap.fVertical pap.fBackward
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 15d81b0..98a79a4 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -24,6 +24,7 @@
 
 #include <string.h>
 #include <i18nlangtag/mslangid.hxx>
+#include <filter/msfilter/sprmids.hxx>
 #include <rtl/tencinfo.h>
 #include <sal/macros.h>
 
@@ -511,7 +512,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
         {0x2436, 1, L_FIX}, // "sprmPFTopLinePunct" pap.fTopLinePunct;0 or 1
         {0x2437, 1, L_FIX}, // "sprmPFAutoSpaceDE" pap.fAutoSpaceDE;0 or 1
         {0x2438, 1, L_FIX}, // "sprmPFAutoSpaceDN" pap.fAutoSpaceDN;0 or 1
-        {0x4439, 2, L_FIX}, // "sprmPWAlignFont" pap.wAlignFont;iFa
+        {NS_sprm::LN_PWAlignFont, 2, L_FIX}, // "sprmPWAlignFont" pap.wAlignFont;iFa
         {0x443A, 2, L_FIX}, // "sprmPFrameTextFlow" pap.fVertical pap.fBackward
                             // pap.fRotateFont;complex
         {0x243B, 1, L_FIX}, // "sprmPISnapBaseLine" obsolete: not applicable in


More information about the Libreoffice-commits mailing list