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

[Caolán McNamara]

 sw/source/filter/ww8/ww8atr.cxx   |    2 +-
 sw/source/filter/ww8/ww8struc.hxx |   14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 0ca8c07e3d9eb111997cf387836efcbcefea0a4a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 22 10:29:49 2015 +0100

    fix SHD ipat entry setting
    
    Change-Id: Id299ba67bf04e63297885eca72e499f4abee4e7c

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index d9ca775..8264647 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1481,7 +1481,7 @@ bool WW8Export::TransBrush(const Color& rCol, WW8_SHD& rShd)
     {
         rShd.SetFore( 0);
         rShd.SetBack( msfilter::util::TransColToIco( rCol ) );
-        rShd.SetStyle( true, 0 ); // TODO FIXME???
+        rShd.SetStyle( 0 );
     }
     return !rCol.GetTransparency();
 }
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index 823c65a..b0bd95b 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -613,18 +613,10 @@ public:
         maBits &= 0xfc1f;
         maBits |= (nVal & 0x1f) << 5;
     }
-    void SetStyle(bool bVer67, sal_uInt8 nVal)
+    void SetStyle(sal_uInt8 nVal)
     {
-        if (bVer67)
-        {
-            maBits &= 0x83ff;
-            maBits |= (nVal & 0x1f) << 10;
-        }
-        else
-        {
-            maBits &= 0x03ff;
-            maBits |= (nVal & 0x2f) << 10;
-        }
+        maBits &= 0x03ff;
+        maBits |= (nVal & 0x3f) << 10;
     }
 };