diff options
author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-03-15 11:05:19 +0100 |
---|---|---|
committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-03-17 00:10:01 +0100 |
commit | d4652b5e2f1c7a2c207888fade7a41245b7ae9fb (patch) | |
tree | 285ba8fe14107ae3ecec710e11c8d7ddacaa61e1 | |
parent | f7424ed710e54bb2437a28380b03ed7c26290edc (diff) |
WW8: bShdTxtCol is always false
Change-Id: I745dabe00567a5d0d076741bfa38c0b5e07713b6
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 1 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 1 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 12 |
4 files changed, 1 insertions, 15 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 5441d713798e..3f2df5e6ca64 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4201,7 +4201,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage, , nInTable(0) , bWasTabRowEnd(false) , bWasTabCellEnd(false) - , bShdTxtCol(false) , bAnl(false) , bHdFtFtnEdn(false) , bFtnEdn(false) diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 76e5e3e6a61f..7d537f068fb1 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1314,7 +1314,6 @@ private: bool bWasTabRowEnd; // Tabelle : Row End Mark bool bWasTabCellEnd; // table: Cell End Mark - bool bShdTxtCol; // Textfarbe indirekt gesetzt ( Hintergrund 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 376de198e082..66a66484803c 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -3818,7 +3818,7 @@ void WW8RStyle::PostStyle(SwWW8StyInf &rSI, bool bOldNoImp) { // Reset attribute flags, because there are no style-ends. - pIo->bHasBorder = pIo->bShdTxtCol = pIo->bSpec = pIo->bObj = pIo->bSymbol = false; + pIo->bHasBorder = 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 e70b771a5a99..791ebb662008 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -4608,12 +4608,6 @@ void SwWW8ImplReader::Read_Shade( sal_uInt16, const sal_uInt8* pData, short nLen { // Ende des Attributes pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_BACKGROUND ); - if (bShdTxtCol) - { - // Zeichenfarbe auch - pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_COLOR ); - bShdTxtCol = false; - } } else { @@ -4631,12 +4625,6 @@ void SwWW8ImplReader::Read_ParaBackColor(sal_uInt16, const sal_uInt8* pData, sho { // Ende des Attributes pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_BACKGROUND ); - if (bShdTxtCol) - { - // Zeichenfarbe auch - pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_COLOR ); - bShdTxtCol = false; - } } else { |