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

[Zolnai Tamás]

 sw/source/filter/ww8/ww8par.cxx  |    1 -
 sw/source/filter/ww8/ww8par.hxx  |    1 -
 sw/source/filter/ww8/ww8par2.cxx |    3 +--
 sw/source/filter/ww8/ww8par6.cxx |   17 -----------------
 4 files changed, 1 insertion(+), 21 deletions(-)

New commits:
commit de145fb467f2a168261915d63b47d3cd3b03d732
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun Feb 8 10:26:26 2015 +0100

    WW8: bCharShdTxtCol is always false
    
    Change-Id: Ib62a4f5dcd7e41cd8c8e82f23efebb468e2e7c91

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 497e19c..5441d713 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4202,7 +4202,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
     , bWasTabRowEnd(false)
     , bWasTabCellEnd(false)
     , bShdTxtCol(false)
-    , bCharShdTxtCol(false)
     , bAnl(false)
     , bHdFtFtnEdn(false)
     , bFtnEdn(false)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index df39a7f..76e5e3e 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1315,7 +1315,6 @@ private:
     bool bWasTabCellEnd;    // table: Cell End Mark
 
     bool bShdTxtCol;        // Textfarbe indirekt gesetzt ( Hintergrund sw )
-    bool bCharShdTxtCol;    // Textfarbe indirekt gesetzt ( Zeichenhintergrund sw )
     bool bAnl;              // Nummerierung in Bearbeitung
                                 // Anl heisst Autonumber level
 
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index c9f965c..376de19 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3818,8 +3818,7 @@ void WW8RStyle::PostStyle(SwWW8StyInf &rSI, bool bOldNoImp)
 {
     // Reset attribute flags, because there are no style-ends.
 
-    pIo->bHasBorder = pIo->bShdTxtCol = pIo->bCharShdTxtCol
-        = pIo->bSpec = pIo->bObj = pIo->bSymbol = false;
+    pIo->bHasBorder = pIo->bShdTxtCol = pIo->bSpec = pIo->bObj = pIo->bSymbol = false;
     pIo->nCharFmt = -1;
 
     // If Style basiert auf Nichts oder Basis ignoriert
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 451fba5..e70b771 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3791,12 +3791,6 @@ void SwWW8ImplReader::Read_CharShadow(  sal_uInt16, const sal_uInt8* pData, shor
     if( nLen <= 0 )
     {
         pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_BACKGROUND );
-        if( bCharShdTxtCol )
-        {
-            // Zeichenfarbe auch
-            pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_COLOR );
-            bCharShdTxtCol = false;
-        }
     }
     else
     {
@@ -3813,12 +3807,6 @@ void SwWW8ImplReader::Read_TxtBackColor(sal_uInt16, const sal_uInt8* pData, shor
     if( nLen <= 0 )
     {
         pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_BACKGROUND );
-        if( bCharShdTxtCol )
-        {
-            // Zeichenfarbe auch
-            pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_COLOR );
-            bCharShdTxtCol = false;
-        }
     }
     else
     {
@@ -3835,11 +3823,6 @@ void SwWW8ImplReader::Read_CharHighlight(sal_uInt16, const sal_uInt8* pData, sho
     if( nLen <= 0 )
     {
         pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_BACKGROUND );
-        if( bCharShdTxtCol )
-        {
-            pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_COLOR );  // Zeichenfarbe auch
-            bCharShdTxtCol = false;
-        }
     }
     else
     {