[Libreoffice-commits] core.git: 2 commits - include/filter sw/source writerfilter/qa

[Miklos Vajna]

 include/filter/msfilter/sprmids.hxx                |    1 +
 sw/source/filter/ww8/ww8atr.cxx                    |    2 +-
 sw/source/filter/ww8/ww8par6.cxx                   |    4 ++--
 sw/source/filter/ww8/ww8scan.cxx                   |    2 +-
 writerfilter/qa/cppunittests/rtftok/testrtftok.cxx |   16 ++++++++--------
 5 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit f3ad86efeb94ea201b2778b900ca4e8a9d849cb2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Feb 6 21:45:05 2014 +0100

    writerfilter: whitespace fixes in testrtftok
    
    Change-Id: I520595debaa47cd38be88428480ff2de9d7bf1b6

diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
index 3342f12..a570983 100644
--- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
@@ -33,9 +33,9 @@ public:
 
     virtual void setUp();
 
-    virtual bool load(const OUString &,
-        const OUString &rURL, const OUString &,
-        unsigned int, unsigned int, unsigned int);
+    virtual bool load(const OUString&,
+                      const OUString& rURL, const OUString&,
+                      unsigned int, unsigned int, unsigned int);
 
     void test();
 
@@ -53,9 +53,9 @@ void RtfTest::setUp()
     m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), uno::UNO_QUERY_THROW);
 }
 
-bool RtfTest::load(const OUString &,
-    const OUString &rURL, const OUString &,
-    unsigned int, unsigned int, unsigned int)
+bool RtfTest::load(const OUString&,
+                   const OUString& rURL, const OUString&,
+                   unsigned int, unsigned int, unsigned int)
 {
     uno::Sequence< beans::PropertyValue > aDescriptor(1);
     aDescriptor[0].Name = "URL";
@@ -78,8 +78,8 @@ bool RtfTest::load(const OUString &,
 void RtfTest::test()
 {
     testDir(OUString(),
-        getURLFromSrc("/writerfilter/qa/cppunittests/rtftok/data/"),
-        OUString());
+            getURLFromSrc("/writerfilter/qa/cppunittests/rtftok/data/"),
+            OUString());
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(RtfTest);
commit 3bd0d1f63de40152b1047d501b9be74eae339476
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Feb 6 21:44:08 2014 +0100

    sw: hardwired NS_sprm::LN_CCv
    
    Change-Id: Ibbffd00b146369be75c462f9eea243e3582f14e6

diff --git a/include/filter/msfilter/sprmids.hxx b/include/filter/msfilter/sprmids.hxx
index 85c97a0..d632ab9 100644
--- a/include/filter/msfilter/sprmids.hxx
+++ b/include/filter/msfilter/sprmids.hxx
@@ -298,6 +298,7 @@ namespace NS_sprm {
     const sal_uInt16 LN_TDxaFromTextRight = 0x941e;
     const sal_uInt16 LN_TDyaFromTextBottom = 0x941f;
     const sal_uInt16 LN_TFNoAllowOverlap = 0x3465;
+    const sal_uInt16 LN_CCv = 0x6870;
 }
 
 #endif // INCLUDED_SPRMIDS
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index a39f00a..5e43c77 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1604,7 +1604,7 @@ void WW8AttributeOutput::CharColor( const SvxColorItem& rColor )
 
     if ( m_rWW8Export.bWrtWW8 && nColor )
     {
-        m_rWW8Export.InsUInt16( 0x6870 );
+        m_rWW8Export.InsUInt16( NS_sprm::LN_CCv );
         m_rWW8Export.InsUInt32( wwUtility::RGBToBGR( rColor.GetValue().GetColor() ) );
     }
 }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index b0ce585..e808c5a 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3286,7 +3286,7 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData
 void SwWW8ImplReader::Read_TxtColor( sal_uInt16, const sal_uInt8* pData, short nLen )
 {
     //Has newer colour varient, ignore this old varient
-    if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(0x6870))
+    if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(NS_sprm::LN_CCv))
         return;
 
     if( nLen < 0 )
@@ -6108,7 +6108,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
                                                      // subtable "sprmPFTtp"
         {0x6815, 0},                                 //undocumented
         {0x6816, 0},                                 //undocumented
-        {0x6870, &SwWW8ImplReader::Read_TxtForeColor},
+        {NS_sprm::LN_CCv, &SwWW8ImplReader::Read_TxtForeColor},
         {0x6877, &SwWW8ImplReader::Read_UnderlineColor},
         {0xC64D, &SwWW8ImplReader::Read_ParaBackColor},
         {0x6467, 0},                                 //undocumented
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index c5830fb..725843b 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -761,7 +761,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
         {0x9410, 2, L_FIX}, // undocumented
         {0x6815, 4, L_FIX}, // undocumented
         {0x6816, 4, L_FIX}, // undocumented
-        {0x6870, 4, L_FIX}, // undocumented, text colour
+        {NS_sprm::LN_CCv, 4, L_FIX}, // text colour
         {0xC64D, 0, L_VAR}, // undocumented, para back colour
         {0x6467, 4, L_FIX}, // undocumented
         {0x646B, 4, L_FIX}, // undocumented