[Libreoffice-commits] core.git: sw/source
Johnny_M
klasse at partyheld.de
Sat Feb 17 18:51:44 UTC 2018
sw/source/filter/ww8/ww8par.cxx | 6 ++--
sw/source/filter/ww8/ww8par.hxx | 2 -
sw/source/filter/ww8/ww8par2.cxx | 26 +++++++++---------
sw/source/filter/ww8/ww8par3.cxx | 14 +++++-----
sw/source/filter/ww8/ww8par5.cxx | 2 -
sw/source/filter/ww8/ww8par6.cxx | 54 +++++++++++++++++++--------------------
6 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 57251bd42e4d5656ec456f9cf612195cb598bc43
Author: Johnny_M <klasse at partyheld.de>
Date: Sat Feb 17 13:49:34 2018 +0100
Translate German variable names
m_pAktColl -> m_pCurrentColl in ww8par
Change-Id: I11299bab3c294345cd32d829003b2351192f9bf9
Note: Other occurrences of "Akt" will be done separately
Reviewed-on: https://gerrit.libreoffice.org/49904
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e6a5d3bd6b4a..2d585cdd8624 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1619,7 +1619,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen)
const SwFormat * pSty = nullptr;
sal_uInt16 nTabBase;
- if (m_pAktColl && m_nCurrentColl < m_vColl.size()) // StyleDef
+ if (m_pCurrentColl && m_nCurrentColl < m_vColl.size()) // StyleDef
{
nTabBase = m_vColl[m_nCurrentColl].m_nBase;
if (nTabBase < m_vColl.size()) // Based On
@@ -1735,7 +1735,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen)
// text SwWW8ImplReader::Read_Tab is called at the begin and end of
// the range the attrib affects, and ignoring it would upset the
// balance
- if (!m_pAktColl) // not importing into a style
+ if (!m_pCurrentColl) // not importing into a style
{
SvxTabStopItem aOrig = pSty ?
ItemGet<SvxTabStopItem>(*pSty, RES_PARATR_TABSTOP) :
@@ -4164,7 +4164,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
, m_pPostProcessAttrsInfo(nullptr)
, m_aTextNodesHavingFirstLineOfstSet()
, m_aTextNodesHavingLeftIndentSet()
- , m_pAktColl(nullptr)
+ , m_pCurrentColl(nullptr)
, m_pDfltTextFormatColl(nullptr)
, m_pStandardFormatColl(nullptr)
, m_pDrawModel(nullptr)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 9d84a13ec742..6182e324677c 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1217,7 +1217,7 @@ private:
std::set<const SwNode*> m_aTextNodesHavingLeftIndentSet; // #i105414#
std::unique_ptr<WW8RStyle> m_xStyles; // pointer to the style reading class
- SwFormat* m_pAktColl; // collection to be created now
+ SwFormat* m_pCurrentColl; // collection to be created now
// ( always 0 outside of a Style-Def )
std::unique_ptr<SfxItemSet> m_xAktItemSet;// character attributes to be read in now
// (always 0 outside of the WW8ListManager Ctor)
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 56f21654bedb..7e896f554579 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -728,7 +728,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short
return;
// StyleDef ?
- if( m_pAktColl )
+ if( m_pCurrentColl )
{
// only for SwTextFormatColl, not CharFormat
// WW: 0 = no Numbering
@@ -741,7 +741,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short
{
m_nSwNumLevel = *pData - 1;
if (!m_bNoAttrImport)
- static_cast<SwTextFormatColl*>(m_pAktColl)->AssignToListLevelOfOutlineStyle( m_nSwNumLevel );
+ static_cast<SwTextFormatColl*>(m_pCurrentColl)->AssignToListLevelOfOutlineStyle( m_nSwNumLevel );
// For WW-NoNumbering also NO_NUMBERING could be used.
// ( For normal numberierung NO_NUM has to be used:
// NO_NUM : pauses numbering,
@@ -767,7 +767,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short
void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, short nLen ) // Sprm 12
{
SwWW8StyInf * pStyInf = GetStyle(m_nCurrentColl);
- if( !m_pAktColl || nLen <= 0 // only for Styledef
+ if( !m_pCurrentColl || nLen <= 0 // only for Styledef
|| (pStyInf && !pStyInf->m_bColl) // ignore CharFormat ->
|| ( m_nIniFlags & WW8FL_NO_OUTLINE ) )
{
@@ -786,7 +786,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
&& m_nSwNumLevel <= 9 ){ // No Bullets or Numbering
// If NumRuleItems were set, either directly or through inheritance, disable them now
- m_pAktColl->SetFormatAttr( SwNumRuleItem() );
+ m_pCurrentColl->SetFormatAttr( SwNumRuleItem() );
const OUString aName("Outline");
SwNumRule aNR( m_rDoc.GetUniqueNumRuleName( &aName ),
@@ -801,7 +801,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
}else if( m_xStyles->nWwNumLevel == 10 || m_xStyles->nWwNumLevel == 11 ){
SwNumRule* pNR = GetStyRule();
SetAnld(pNR, reinterpret_cast<WW8_ANLD const *>(pData), 0, false);
- m_pAktColl->SetFormatAttr( SwNumRuleItem( pNR->GetName() ) );
+ m_pCurrentColl->SetFormatAttr( SwNumRuleItem( pNR->GetName() ) );
pStyInf = GetStyle(m_nCurrentColl);
if (pStyInf != nullptr)
@@ -3709,15 +3709,15 @@ void WW8RStyle::Set1StyleDefaults()
{
// Style has no text color set, winword default is auto
if ( !bTextColChanged )
- pIo->m_pAktColl->SetFormatAttr(SvxColorItem(Color(COL_AUTO), RES_CHRATR_COLOR));
+ pIo->m_pCurrentColl->SetFormatAttr(SvxColorItem(Color(COL_AUTO), RES_CHRATR_COLOR));
// Style has no FontSize ? WinWord Default is 10pt for western and asian
if( !bFSizeChanged )
{
SvxFontHeightItem aAttr(200, 100, RES_CHRATR_FONTSIZE);
- pIo->m_pAktColl->SetFormatAttr(aAttr);
+ pIo->m_pCurrentColl->SetFormatAttr(aAttr);
aAttr.SetWhich(RES_CHRATR_CJK_FONTSIZE);
- pIo->m_pAktColl->SetFormatAttr(aAttr);
+ pIo->m_pCurrentColl->SetFormatAttr(aAttr);
}
// Style has no FontSize ? WinWord Default is 10pt for western and asian
@@ -3725,13 +3725,13 @@ void WW8RStyle::Set1StyleDefaults()
{
SvxFontHeightItem aAttr(200, 100, RES_CHRATR_FONTSIZE);
aAttr.SetWhich(RES_CHRATR_CTL_FONTSIZE);
- pIo->m_pAktColl->SetFormatAttr(aAttr);
+ pIo->m_pCurrentColl->SetFormatAttr(aAttr);
}
if( !bWidowsChanged ) // Widows ?
{
- pIo->m_pAktColl->SetFormatAttr( SvxWidowsItem( 2, RES_PARATR_WIDOWS ) );
- pIo->m_pAktColl->SetFormatAttr( SvxOrphansItem( 2, RES_PARATR_ORPHANS ) );
+ pIo->m_pCurrentColl->SetFormatAttr( SvxWidowsItem( 2, RES_PARATR_WIDOWS ) );
+ pIo->m_pCurrentColl->SetFormatAttr( SvxOrphansItem( 2, RES_PARATR_ORPHANS ) );
}
}
}
@@ -3777,7 +3777,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
}
pColl->SetAuto(false); // suggested by JP
} // but changes the UI
- pIo->m_pAktColl = pColl;
+ pIo->m_pCurrentColl = pColl;
rSI.m_pFormat = pColl; // remember translation WW->SW
rSI.m_bImportSkipped = !bImport;
@@ -4502,7 +4502,7 @@ void WW8RStyle::Import()
}
// we do not read styles anymore:
- pIo->m_pAktColl = nullptr;
+ pIo->m_pCurrentColl = nullptr;
}
rtl_TextEncoding SwWW8StyInf::GetCharSet() const
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 019729fb5f7b..ed6e734bc8c4 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1722,9 +1722,9 @@ void SwWW8ImplReader::SetStylesList(sal_uInt16 nStyle, sal_uInt16 nCurrentLFO,
SwWW8StyInf &rStyleInf = m_vColl[nStyle];
if (rStyleInf.m_bValid)
{
- OSL_ENSURE(m_pAktColl, "Cannot be called outside of style import");
+ OSL_ENSURE(m_pCurrentColl, "Cannot be called outside of style import");
// Phase 1: Numbering attributes when reading a StyleDef
- if( m_pAktColl )
+ if( m_pCurrentColl )
{
// only save the Parameters for now. The actual List will be appended
// at a later point, when the Listdefinitions is read...
@@ -1895,7 +1895,7 @@ void SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nCurrentLFO,
void SwWW8ImplReader::RegisterNumFormat(sal_uInt16 nCurrentLFO, sal_uInt8 nCurrentLevel)
{
// Are we reading the StyleDef ?
- if (m_pAktColl)
+ if (m_pCurrentColl)
SetStylesList( m_nCurrentColl , nCurrentLFO, nCurrentLevel);
else
RegisterNumFormatOnTextNode(nCurrentLFO, nCurrentLevel);
@@ -1982,15 +1982,15 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
ww8par6.cxx#SwWW8ImplReader::Read_LR
*/
- if (m_pAktColl)
+ if (m_pCurrentColl)
{
// here a "named" style is being configured
// disable the numbering/list in the style currently configured
- m_pAktColl->SetFormatAttr(*GetDfltAttr(RES_PARATR_NUMRULE));
+ m_pCurrentColl->SetFormatAttr(*GetDfltAttr(RES_PARATR_NUMRULE));
// reset/blank the indent
- m_pAktColl->SetFormatAttr(SvxLRSpaceItem(RES_LR_SPACE));
+ m_pCurrentColl->SetFormatAttr(SvxLRSpaceItem(RES_LR_SPACE));
}
else if (SwTextNode* pTextNode = m_pPaM->GetNode().GetTextNode())
{
@@ -2028,7 +2028,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
indentation. Setting this flag will allow us to recover from this
braindeadness
*/
- if (m_pAktColl && (m_nLFOPosition == 2047-1) && m_nCurrentColl < m_vColl.size())
+ if (m_pCurrentColl && (m_nLFOPosition == 2047-1) && m_nCurrentColl < m_vColl.size())
m_vColl[m_nCurrentColl].m_bHasBrokenWW6List = true;
// here the stream data is 1-based, we subtract ONE
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index a1922c0a0566..82b4c2b8c2ec 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -3628,7 +3628,7 @@ void SwWW8ImplReader::ImportTox( int nFieldId, const OUString& aStr )
void SwWW8ImplReader::Read_FieldVanish( sal_uInt16, const sal_uInt8*, short nLen )
{
//Meaningless in a style
- if (m_pAktColl || !m_xPlcxMan)
+ if (m_pCurrentColl || !m_xPlcxMan)
return;
const int nChunk = 64; //number of characters to read at one time
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index c134d35939f8..ded6510bce40 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2651,10 +2651,10 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr,
{
if( !m_bNoAttrImport ) // for ignoring styles during doc inserts
{
- if (m_pAktColl)
+ if (m_pCurrentColl)
{
OSL_ENSURE(rAttr.Which() != RES_FLTR_REDLINE, "redline in style!");
- m_pAktColl->SetFormatAttr(rAttr);
+ m_pCurrentColl->SetFormatAttr(rAttr);
}
else if (m_xAktItemSet)
{
@@ -2690,8 +2690,8 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr,
const SfxPoolItem* SwWW8ImplReader::GetFormatAttr( sal_uInt16 nWhich )
{
const SfxPoolItem* pRet = nullptr;
- if (m_pAktColl)
- pRet = &(m_pAktColl->GetFormatAttr(nWhich));
+ if (m_pCurrentColl)
+ pRet = &(m_pCurrentColl->GetFormatAttr(nWhich));
else if (m_xAktItemSet)
{
pRet = m_xAktItemSet->GetItem(nWhich);
@@ -2782,7 +2782,7 @@ void SwWW8ImplReader::Read_POutLvl(sal_uInt16, const sal_uInt8* pData, short nLe
return;
}
- if (m_pAktColl != nullptr)
+ if (m_pCurrentColl != nullptr)
{
SwWW8StyInf* pSI = GetStyle(m_nCurrentColl);
if (pSI && pSI->m_bColl && pSI->m_pFormat)
@@ -2925,7 +2925,7 @@ void SwWW8ImplReader::Read_BoldUsw( sal_uInt16 nId, const sal_uInt8* pData, shor
pSI = GetStyle(SVBT16ToShort(aCharIstd.pSprm));
}
- if( m_pAktColl ) // StyleDef -> remember flags
+ if( m_pCurrentColl ) // StyleDef -> remember flags
{
if (pSI)
{
@@ -3092,7 +3092,7 @@ void SwWW8ImplReader::Read_BoldBiDiUsw(sal_uInt16 nId, const sal_uInt8* pData,
pSI = GetStyle(SVBT16ToShort(aCharIstd.pSprm));
}
- if (m_pAktColl && eVersion > ww::eWW2) // StyleDef -> remember flags
+ if (m_pCurrentColl && eVersion > ww::eWW2) // StyleDef -> remember flags
{
if (pSI)
{
@@ -3473,7 +3473,7 @@ void SwWW8ImplReader::Read_TextColor( sal_uInt16, const sal_uInt8* pData, short
b = 0;
NewAttr( SvxColorItem(Color(GetCol(b)), RES_CHRATR_COLOR));
- if (m_pAktColl && m_xStyles)
+ if (m_pCurrentColl && m_xStyles)
m_xStyles->bTextColChanged = true;
}
}
@@ -3486,7 +3486,7 @@ void SwWW8ImplReader::Read_TextForeColor(sal_uInt16, const sal_uInt8* pData, sho
{
Color aColor(msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)));
NewAttr(SvxColorItem(aColor, RES_CHRATR_COLOR));
- if (m_pAktColl && m_xStyles)
+ if (m_pCurrentColl && m_xStyles)
m_xStyles->bTextColChanged = true;
}
}
@@ -3503,17 +3503,17 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh
}
else
{
- if ( m_pAktColl ) //importing style
+ if ( m_pCurrentColl ) //importing style
{
- if( SfxItemState::SET == m_pAktColl->GetItemState( RES_CHRATR_UNDERLINE, false ) )
+ if( SfxItemState::SET == m_pCurrentColl->GetItemState( RES_CHRATR_UNDERLINE, false ) )
{
- const SwAttrSet& aSet = m_pAktColl->GetAttrSet();
+ const SwAttrSet& aSet = m_pCurrentColl->GetAttrSet();
SvxUnderlineItem *pUnderline
= static_cast<SvxUnderlineItem *>(aSet.Get( RES_CHRATR_UNDERLINE, false ).Clone());
if (pUnderline && nLen >= 4)
{
pUnderline->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ) );
- m_pAktColl->SetFormatAttr( *pUnderline );
+ m_pCurrentColl->SetFormatAttr( *pUnderline );
delete pUnderline;
}
}
@@ -3623,7 +3623,7 @@ bool SwWW8ImplReader::SetNewFontAttr(sal_uInt16 nFCode, bool bSetEnums,
//If we fail (and are not doing a style) then put something into the
//character encodings stack anyway so that the property end that pops
//off the stack will keep in sync
- if (!m_pAktColl && IsListOrDropcap())
+ if (!m_pCurrentColl && IsListOrDropcap())
{
if (nWhich == RES_CHRATR_CJK_FONT)
{
@@ -3661,7 +3661,7 @@ bool SwWW8ImplReader::SetNewFontAttr(sal_uInt16 nFCode, bool bSetEnums,
if( bSetEnums )
{
- if( m_pAktColl && m_nCurrentColl < m_vColl.size() ) // StyleDef
+ if( m_pCurrentColl && m_nCurrentColl < m_vColl.size() ) // StyleDef
{
switch(nWhich)
{
@@ -3708,7 +3708,7 @@ void SwWW8ImplReader::ResetCJKCharSetVars()
void SwWW8ImplReader::openFont(sal_uInt16 nFCode, sal_uInt16 nId)
{
- if (SetNewFontAttr(nFCode, true, nId) && m_pAktColl && m_xStyles)
+ if (SetNewFontAttr(nFCode, true, nId) && m_pCurrentColl && m_xStyles)
{
// remember for simulating default font
if (RES_CHRATR_CJK_FONT == nId)
@@ -3826,7 +3826,7 @@ void SwWW8ImplReader::Read_FontSize( sal_uInt16 nId, const sal_uInt8* pData, sho
aSz.SetWhich( RES_CHRATR_CTL_FONTSIZE );
NewAttr( aSz );
}
- if (m_pAktColl && m_xStyles) // Style-Def ?
+ if (m_pCurrentColl && m_xStyles) // Style-Def ?
{
// remember for simulating default font size
if (nId == RES_CHRATR_CTL_FONTSIZE)
@@ -4114,7 +4114,7 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
case NS_sprm::sprmPDxaLeft80:
case NS_sprm::sprmPDxaLeft:
aLR.SetTextLeft( nPara );
- if (m_pAktColl && m_nCurrentColl < m_vColl.size())
+ if (m_pCurrentColl && m_nCurrentColl < m_vColl.size())
{
m_vColl[m_nCurrentColl].m_bListReleventIndentSet = true;
}
@@ -4149,7 +4149,7 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
aLR.SetTextFirstLineOfst(nPara);
- if (!m_pAktColl)
+ if (!m_pCurrentColl)
{
if (const SwTextNode* pNode = m_pPaM->GetNode().GetTextNode())
{
@@ -4167,7 +4167,7 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
}
}
}
- if (m_pAktColl && m_nCurrentColl < m_vColl.size())
+ if (m_pCurrentColl && m_nCurrentColl < m_vColl.size())
{
m_vColl[m_nCurrentColl].m_bListReleventIndentSet = true;
}
@@ -4274,14 +4274,14 @@ void SwWW8ImplReader::Read_ParaAutoBefore(sal_uInt16, const sal_uInt8 *pData, sh
SvxULSpaceItem aUL(*static_cast<const SvxULSpaceItem*>(GetFormatAttr(RES_UL_SPACE)));
aUL.SetUpper(GetParagraphAutoSpace(m_xWDop->fDontUseHTMLAutoSpacing));
NewAttr(aUL);
- if (m_pAktColl && m_nCurrentColl < m_vColl.size())
+ if (m_pCurrentColl && m_nCurrentColl < m_vColl.size())
m_vColl[m_nCurrentColl].m_bParaAutoBefore = true;
else
m_bParaAutoBefore = true;
}
else
{
- if (m_pAktColl && m_nCurrentColl < m_vColl.size())
+ if (m_pCurrentColl && m_nCurrentColl < m_vColl.size())
m_vColl[m_nCurrentColl].m_bParaAutoBefore = false;
else
m_bParaAutoBefore = false;
@@ -4301,14 +4301,14 @@ void SwWW8ImplReader::Read_ParaAutoAfter(sal_uInt16, const sal_uInt8 *pData, sho
SvxULSpaceItem aUL(*static_cast<const SvxULSpaceItem*>(GetFormatAttr(RES_UL_SPACE)));
aUL.SetLower(GetParagraphAutoSpace(m_xWDop->fDontUseHTMLAutoSpacing));
NewAttr(aUL);
- if (m_pAktColl && m_nCurrentColl < m_vColl.size())
+ if (m_pCurrentColl && m_nCurrentColl < m_vColl.size())
m_vColl[m_nCurrentColl].m_bParaAutoAfter = true;
else
m_bParaAutoAfter = true;
}
else
{
- if (m_pAktColl && m_nCurrentColl < m_vColl.size())
+ if (m_pCurrentColl && m_nCurrentColl < m_vColl.size())
m_vColl[m_nCurrentColl].m_bParaAutoAfter = false;
else
m_bParaAutoAfter = false;
@@ -4870,7 +4870,7 @@ void SwWW8ImplReader::Read_Border(sal_uInt16 , const sal_uInt8*, short nLen)
WW8_BRCVer9_5 aBrcs; // Top, Left, Bottom, Right, Between
sal_uInt8 nBorder;
- if( m_pAktColl )
+ if( m_pCurrentColl )
nBorder = ::lcl_ReadBorders(m_bVer67, aBrcs, nullptr, m_xStyles.get());
else
nBorder = ::lcl_ReadBorders(m_bVer67, aBrcs, m_xPlcxMan ? m_xPlcxMan->GetPapPLCF() : nullptr);
@@ -5001,7 +5001,7 @@ void SwWW8ImplReader::Read_WidowControl( sal_uInt16, const sal_uInt8* pData, sho
NewAttr( SvxWidowsItem( nL, RES_PARATR_WIDOWS ) ); // Off -> nLines = 0
NewAttr( SvxOrphansItem( nL, RES_PARATR_ORPHANS ) );
- if( m_pAktColl && m_xStyles ) // Style-Def ?
+ if( m_pCurrentColl && m_xStyles ) // Style-Def ?
m_xStyles->bWidowsChanged = true; // save for simulation
// Default-Widows
}
@@ -5081,7 +5081,7 @@ void SwWW8ImplReader::Read_BreakBefore( sal_uInt16, const sal_uInt8* pData, shor
void SwWW8ImplReader::Read_ApoPPC( sal_uInt16, const sal_uInt8* pData, short )
{
- if (m_pAktColl && m_nCurrentColl < m_vColl.size()) // only for Styledef, otherwise solved differently
+ if (m_pCurrentColl && m_nCurrentColl < m_vColl.size()) // only for Styledef, otherwise solved differently
{
SwWW8StyInf& rSI = m_vColl[m_nCurrentColl];
if (!rSI.m_xWWFly)
More information about the Libreoffice-commits
mailing list