sw/source/filter/ww8/ww8graf.cxx | 4 +- sw/source/filter/ww8/ww8par.cxx | 58 +++++++++++++++++++-------------------- sw/source/filter/ww8/ww8par.hxx | 16 +++++----- sw/source/filter/ww8/ww8par2.cxx | 12 ++++---- sw/source/filter/ww8/ww8par3.cxx | 50 ++++++++++++++++----------------- sw/source/filter/ww8/ww8par6.cxx | 54 ++++++++++++++++++------------------ 6 files changed, 97 insertions(+), 97 deletions(-)
New commits: commit bf183a4ef2368e38ee5fc94518815c34850d828e Author: Johnny_M <kla...@partyheld.de> Date: Sun Feb 11 11:37:15 2018 +0100 Translate German variable names Akt -> Current Act -> Current (in same context, including comments correction, under assumption of a "false friend" wording by a non-English speaker) in ww8par Note: Similar translation of other occurrences in affected files will be done separately Change-Id: I267aa37020662eb5a267f2355fe04fc0f87a2dda Reviewed-on: https://gerrit.libreoffice.org/49558 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 767381499e96..da262f684feb 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -606,7 +606,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, // get position of next SPRM bool bStartAttr = m_xPlcxMan->Get(&aRes); - m_nAktColl = m_xPlcxMan->GetColl(); + m_nCurrentColl = m_xPlcxMan->GetColl(); if (aRes.nSprmId) { if( bONLYnPicLocFc ) @@ -717,7 +717,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, } } // Fill in the remainder from the style - InsertTxbxStyAttrs(*pS, m_nAktColl); + InsertTxbxStyAttrs(*pS, m_nCurrentColl); if( pS->Count() ) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 5b5c9a91042f..a3a90efed173 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1441,8 +1441,8 @@ const SfxPoolItem* SwWW8FltControlStack::GetFormatAttr(const SwPosition& rPos, SfxItemState eState = SfxItemState::DEFAULT; if (const SfxItemSet *pSet = pNd->GetpSwAttrSet()) eState = pSet->GetItemState(RES_LR_SPACE, false); - if (eState != SfxItemState::SET && rReader.m_nAktColl < rReader.m_vColl.size()) - pItem = &(rReader.m_vColl[rReader.m_nAktColl].maWordLR); + if (eState != SfxItemState::SET && rReader.m_nCurrentColl < rReader.m_vColl.size()) + pItem = &(rReader.m_vColl[rReader.m_nCurrentColl].maWordLR); } /* @@ -1619,17 +1619,17 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen) const SwFormat * pSty = nullptr; sal_uInt16 nTabBase; - if (m_pAktColl && m_nAktColl < m_vColl.size()) // StyleDef + if (m_pAktColl && m_nCurrentColl < m_vColl.size()) // StyleDef { - nTabBase = m_vColl[m_nAktColl].m_nBase; + nTabBase = m_vColl[m_nCurrentColl].m_nBase; if (nTabBase < m_vColl.size()) // Based On pSty = m_vColl[nTabBase].m_pFormat; } else { // Text - nTabBase = m_nAktColl; - if (m_nAktColl < m_vColl.size()) - pSty = m_vColl[m_nAktColl].m_pFormat; + nTabBase = m_nCurrentColl; + if (m_nCurrentColl < m_vColl.size()) + pSty = m_vColl[m_nCurrentColl].m_pFormat; //TODO: figure out else here } @@ -1941,7 +1941,7 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) : mpPrevNumRule(pRdr->m_pPrevNumRule), mpTableDesc(pRdr->m_pTableDesc), mnInTable(pRdr->m_nInTable), - mnAktColl(pRdr->m_nAktColl), + mnCurrentColl(pRdr->m_nCurrentColl), mcSymbol(pRdr->m_cSymbol), mbIgnoreText(pRdr->m_bIgnoreText), mbSymbol(pRdr->m_bSymbol), @@ -1963,7 +1963,7 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) : pRdr->m_pPreviousNumPaM = nullptr; pRdr->m_pPrevNumRule = nullptr; pRdr->m_pTableDesc = nullptr; - pRdr->m_nAktColl = 0; + pRdr->m_nCurrentColl = 0; pRdr->m_xCtrlStck.reset(new SwWW8FltControlStack(&pRdr->m_rDoc, pRdr->m_nFieldFlags, *pRdr)); @@ -2005,7 +2005,7 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr ) pRdr->m_bInHyperlink = mbInHyperlink; pRdr->m_bWasParaEnd = mbWasParaEnd; pRdr->m_bPgSecBreak = mbPgSecBreak; - pRdr->m_nAktColl = mnAktColl; + pRdr->m_nCurrentColl = mnCurrentColl; pRdr->m_bHasBorder = mbHasBorder; pRdr->m_bFirstPara = mbFirstPara; @@ -2770,8 +2770,8 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCharSet() eSrcCharSet = m_aFontSrcCharSets.top(); if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && static_cast<size_t>(m_nCharFormat) < m_vColl.size() ) eSrcCharSet = m_vColl[m_nCharFormat].GetCharSet(); - if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && StyleExists(m_nAktColl) && m_nAktColl < m_vColl.size()) - eSrcCharSet = m_vColl[m_nAktColl].GetCharSet(); + if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && StyleExists(m_nCurrentColl) && m_nCurrentColl < m_vColl.size()) + eSrcCharSet = m_vColl[m_nCurrentColl].GetCharSet(); if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) eSrcCharSet = GetCharSetFromLanguage(); } @@ -2794,8 +2794,8 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCJKCharSet() eSrcCharSet = m_aFontSrcCJKCharSets.top(); if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && static_cast<size_t>(m_nCharFormat) < m_vColl.size() ) eSrcCharSet = m_vColl[m_nCharFormat].GetCJKCharSet(); - if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW && StyleExists(m_nAktColl) && m_nAktColl < m_vColl.size()) - eSrcCharSet = m_vColl[m_nAktColl].GetCJKCharSet(); + if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW && StyleExists(m_nCurrentColl) && m_nCurrentColl < m_vColl.size()) + eSrcCharSet = m_vColl[m_nCurrentColl].GetCJKCharSet(); if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) eSrcCharSet = GetCJKCharSetFromLanguage(); } @@ -3704,20 +3704,20 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) void SwWW8ImplReader::ProcessAktCollChange(WW8PLCFManResult& rRes, bool* pStartAttr, bool bCallProcessSpecial) { - sal_uInt16 nOldColl = m_nAktColl; - m_nAktColl = m_xPlcxMan->GetColl(); + sal_uInt16 nOldColl = m_nCurrentColl; + m_nCurrentColl = m_xPlcxMan->GetColl(); // Invalid Style-Id - if (m_nAktColl >= m_vColl.size() || !m_vColl[m_nAktColl].m_pFormat || !m_vColl[m_nAktColl].m_bColl) + if (m_nCurrentColl >= m_vColl.size() || !m_vColl[m_nCurrentColl].m_pFormat || !m_vColl[m_nCurrentColl].m_bColl) { - m_nAktColl = 0; + m_nCurrentColl = 0; m_bParaAutoBefore = false; m_bParaAutoAfter = false; } else { - m_bParaAutoBefore = m_vColl[m_nAktColl].m_bParaAutoBefore; - m_bParaAutoAfter = m_vColl[m_nAktColl].m_bParaAutoAfter; + m_bParaAutoBefore = m_vColl[m_nCurrentColl].m_bParaAutoBefore; + m_bParaAutoAfter = m_vColl[m_nCurrentColl].m_bParaAutoAfter; } if (nOldColl >= m_vColl.size()) @@ -3733,12 +3733,12 @@ void SwWW8ImplReader::ProcessAktCollChange(WW8PLCFManResult& rRes, *pStartAttr = m_xPlcxMan->Get( &rRes ); // Get Attribut-Pos again } - if (!bTabRowEnd && StyleExists(m_nAktColl)) + if (!bTabRowEnd && StyleExists(m_nCurrentColl)) { - SetTextFormatCollAndListLevel( *m_pPaM, m_vColl[ m_nAktColl ]); - ChkToggleAttr(m_vColl[ nOldColl ].m_n81Flags, m_vColl[ m_nAktColl ].m_n81Flags); + SetTextFormatCollAndListLevel( *m_pPaM, m_vColl[ m_nCurrentColl ]); + ChkToggleAttr(m_vColl[ nOldColl ].m_n81Flags, m_vColl[ m_nCurrentColl ].m_n81Flags); ChkToggleBiDiAttr(m_vColl[nOldColl].m_n81BiDiFlags, - m_vColl[m_nAktColl].m_n81BiDiFlags); + m_vColl[m_nCurrentColl].m_n81BiDiFlags); } } @@ -3817,7 +3817,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, long nTextEnd, bool& rbStar m_xCtrlStck->MarkAllAttrsOld(); bool bOldIgnoreText = m_bIgnoreText; m_bIgnoreText = true; - sal_uInt16 nOldColl = m_nAktColl; + sal_uInt16 nOldColl = m_nCurrentColl; bool bDoPlcxManPlusPLus = true; long nNext; do @@ -3908,8 +3908,8 @@ void SwWW8ImplReader::ReadAttrs(WW8_CP& rTextPos, WW8_CP& rNext, long nTextEnd, * is false. * Due to this we need to set the template here as a kind of special treatment. */ - if (!m_bCpxStyle && m_nAktColl < m_vColl.size()) - SetTextFormatCollAndListLevel(*m_pPaM, m_vColl[m_nAktColl]); + if (!m_bCpxStyle && m_nCurrentColl < m_vColl.size()) + SetTextFormatCollAndListLevel(*m_pPaM, m_vColl[m_nCurrentColl]); rbStartLine = false; } } @@ -3946,7 +3946,7 @@ bool SwWW8ImplReader::ReadText(WW8_CP nStartCp, WW8_CP nTextLen, ManTypes nType) short nDistance = 0; m_bWasParaEnd = false; - m_nAktColl = 0; + m_nCurrentColl = 0; m_xAktItemSet.reset(); m_nCharFormat = -1; m_bSpec = false; @@ -4189,7 +4189,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage, , m_eStructCharSet(RTL_TEXTENCODING_ASCII_US) , m_eHardCharSet(RTL_TEXTENCODING_DONTKNOW) , m_nProgress(0) - , m_nAktColl(0) + , m_nCurrentColl(0) , m_nFieldNum(0) , m_nLFOPosition(USHRT_MAX) , m_nCharFormat(0) diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 8e5404ab9ce5..040c5f995e0c 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -595,7 +595,7 @@ private: const SwNumRule* mpPrevNumRule; WW8TabDesc* mpTableDesc; int mnInTable; - sal_uInt16 mnAktColl; + sal_uInt16 mnCurrentColl; sal_Unicode mcSymbol; bool mbIgnoreText; bool mbSymbol; @@ -1269,7 +1269,7 @@ private: rtl_TextEncoding m_eStructCharSet; // rtl_TextEncoding for structures rtl_TextEncoding m_eHardCharSet; // Hard rtl_TextEncoding-Attribute sal_uInt16 m_nProgress; // percentage for Progressbar - sal_uInt16 m_nAktColl; // per WW-count + sal_uInt16 m_nCurrentColl; // per WW-count sal_uInt16 m_nFieldNum; // serial nummer for that sal_uInt16 m_nLFOPosition; @@ -1618,13 +1618,13 @@ private: // Ver8 lists - void RegisterNumFormatOnTextNode(sal_uInt16 nActLFO, sal_uInt8 nActLevel, + void RegisterNumFormatOnTextNode(sal_uInt16 nCurrentLFO, sal_uInt8 nCurrentLevel, const bool bSetAttr = true); void RegisterNumFormatOnStyle(sal_uInt16 nStyle); - void SetStylesList(sal_uInt16 nStyle, sal_uInt16 nActLFO, - sal_uInt8 nActLevel); - void RegisterNumFormat(sal_uInt16 nActLFO, sal_uInt8 nActLevel); + void SetStylesList(sal_uInt16 nStyle, sal_uInt16 nCurrentLFO, + sal_uInt8 nCurrentLevel); + void RegisterNumFormat(sal_uInt16 nCurrentLFO, sal_uInt8 nCurrentLevel); // to be replaced by calls in the appropriate extended SvxMSDffManager @@ -1863,8 +1863,8 @@ public: // really private, but can only be done public const WW8Fib& GetFib() const { return *m_xWwFib; } SwDoc& GetDoc() const { return m_rDoc; } - sal_uInt16 GetNAktColl() const { return m_nAktColl; } - void SetNAktColl( sal_uInt16 nColl ) { m_nAktColl = nColl; } + sal_uInt16 GetNAktColl() const { return m_nCurrentColl; } + void SetNAktColl( sal_uInt16 nColl ) { m_nCurrentColl = nColl; } std::unique_ptr<SfxItemSet> SetAktItemSet(SfxItemSet* pItemSet); sal_uInt16 StyleUsingLFO( sal_uInt16 nLFOIndex ) const ; const SwFormat* GetStyleWithOrgWWName( OUString const & rName ) const ; diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 3cbd764fa6d6..d299331c85df 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -880,7 +880,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short { // only for SwTextFormatColl, not CharFormat // WW: 0 = no Numbering - SwWW8StyInf * pColl = GetStyle(m_nAktColl); + SwWW8StyInf * pColl = GetStyle(m_nCurrentColl); if (pColl != nullptr && pColl->m_bColl && *pData) { // Range WW:1..9 -> SW:0..8 no bullets / numbering @@ -914,7 +914,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_nAktColl); + SwWW8StyInf * pStyInf = GetStyle(m_nCurrentColl); if( !m_pAktColl || nLen <= 0 // only for Styledef || (pStyInf && !pStyInf->m_bColl) // ignore CharFormat -> || ( m_nIniFlags & WW8FL_NO_OUTLINE ) ) @@ -951,7 +951,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor SetAnld(pNR, reinterpret_cast<WW8_ANLD const *>(pData), 0, false); m_pAktColl->SetFormatAttr( SwNumRuleItem( pNR->GetName() ) ); - pStyInf = GetStyle(m_nAktColl); + pStyInf = GetStyle(m_nCurrentColl); if (pStyInf != nullptr) pStyInf->m_bHasStyNumRule = true; } @@ -1066,7 +1066,7 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13) } } - SwWW8StyInf * pStyInf = GetStyle(m_nAktColl); + SwWW8StyInf * pStyInf = GetStyle(m_nCurrentColl); if (sNumRule.isEmpty() && pStyInf != nullptr && pStyInf->m_bHasStyNumRule) { sNumRule = pStyInf->m_pFormat->GetNumRule().GetValue(); @@ -3527,9 +3527,9 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp) } } // if first paragraph in table has break-before-page, transfer that setting to the table itself. - else if( StyleExists(m_nAktColl) ) + else if( StyleExists(m_nCurrentColl) ) { - const SwFormat* pStyleFormat = m_vColl[m_nAktColl].m_pFormat; + const SwFormat* pStyleFormat = m_vColl[m_nCurrentColl].m_pFormat; if( pStyleFormat && pStyleFormat->GetBreak().GetBreak() == SvxBreak::PageBefore ) NewAttr( pStyleFormat->GetBreak() ); } diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 6b54244c0529..ed52e72b00d2 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1705,8 +1705,8 @@ void SetStyleIndent(SwWW8StyInf &rStyle, const SwNumFormat &rFormat) } } -void SwWW8ImplReader::SetStylesList(sal_uInt16 nStyle, sal_uInt16 nActLFO, - sal_uInt8 nActLevel) +void SwWW8ImplReader::SetStylesList(sal_uInt16 nStyle, sal_uInt16 nCurrentLFO, + sal_uInt8 nCurrentLevel) { if (nStyle >= m_vColl.size()) return; @@ -1721,24 +1721,24 @@ void SwWW8ImplReader::SetStylesList(sal_uInt16 nStyle, sal_uInt16 nActLFO, // only save the Parameters for now. The actual List will be appended // at a later point, when the Listdefinitions is read... if ( - (USHRT_MAX > nActLFO) && - (WW8ListManager::nMaxLevel > nActLevel) + (USHRT_MAX > nCurrentLFO) && + (WW8ListManager::nMaxLevel > nCurrentLevel) ) { - rStyleInf.m_nLFOIndex = nActLFO; - rStyleInf.m_nListLevel = nActLevel; + rStyleInf.m_nLFOIndex = nCurrentLFO; + rStyleInf.m_nListLevel = nCurrentLevel; if ( - (USHRT_MAX > nActLFO) && - (WW8ListManager::nMaxLevel > nActLevel) + (USHRT_MAX > nCurrentLFO) && + (WW8ListManager::nMaxLevel > nCurrentLevel) ) { std::vector<sal_uInt8> aParaSprms; SwNumRule *pNmRule = - m_xLstManager->GetNumRuleForActivation(nActLFO, - nActLevel, aParaSprms); + m_xLstManager->GetNumRuleForActivation(nCurrentLFO, + nCurrentLevel, aParaSprms); if (pNmRule) - UseListIndent(rStyleInf, pNmRule->Get(nActLevel)); + UseListIndent(rStyleInf, pNmRule->Get(nCurrentLevel)); } } } @@ -1792,8 +1792,8 @@ void SwWW8ImplReader::RegisterNumFormatOnStyle(sal_uInt16 nStyle) } } -void SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nActLFO, - sal_uInt8 nActLevel, +void SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nCurrentLFO, + sal_uInt8 nCurrentLevel, const bool bSetAttr) { // Note: the method appends NumRule to the Text Node if @@ -1810,7 +1810,7 @@ void SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nActLFO, std::vector<sal_uInt8> aParaSprms; const SwNumRule* pRule = bSetAttr ? - m_xLstManager->GetNumRuleForActivation( nActLFO, nActLevel, + m_xLstManager->GetNumRuleForActivation( nCurrentLFO, nCurrentLevel, aParaSprms, pTextNd) : nullptr; if (pRule != nullptr || !bSetAttr) @@ -1820,10 +1820,10 @@ void SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nActLFO, { pTextNd->SetAttr(SwNumRuleItem(pRule->GetName())); } - pTextNd->SetAttrListLevel(nActLevel); + pTextNd->SetAttrListLevel(nCurrentLevel); // <IsCounted()> state of text node has to be adjusted accordingly. - if ( /*nActLevel >= 0 &&*/ nActLevel < MAXLEVEL ) + if ( /*nCurrentLevel >= 0 &&*/ nCurrentLevel < MAXLEVEL ) { pTextNd->SetCountedInList( true ); } @@ -1833,9 +1833,9 @@ void SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nActLFO, // needed for list levels of mode LABEL_ALIGNMENT bool bApplyListLevelIndentDirectlyAtPara(true); { - if (pTextNd->GetNumRule() && nActLevel < MAXLEVEL) + if (pTextNd->GetNumRule() && nCurrentLevel < MAXLEVEL) { - const SwNumFormat& rFormat = pTextNd->GetNumRule()->Get(nActLevel); + const SwNumFormat& rFormat = pTextNd->GetNumRule()->Get(nCurrentLevel); if (rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT) { @@ -1884,13 +1884,13 @@ void SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nActLFO, } } -void SwWW8ImplReader::RegisterNumFormat(sal_uInt16 nActLFO, sal_uInt8 nActLevel) +void SwWW8ImplReader::RegisterNumFormat(sal_uInt16 nCurrentLFO, sal_uInt8 nCurrentLevel) { // Are we reading the StyleDef ? if (m_pAktColl) - SetStylesList( m_nAktColl , nActLFO, nActLevel); + SetStylesList( m_nCurrentColl , nCurrentLFO, nCurrentLevel); else - RegisterNumFormatOnTextNode(nActLFO, nActLevel); + RegisterNumFormatOnTextNode(nCurrentLFO, nCurrentLevel); } void SwWW8ImplReader::Read_ListLevel(sal_uInt16, const sal_uInt8* pData, @@ -1901,7 +1901,7 @@ void SwWW8ImplReader::Read_ListLevel(sal_uInt16, const sal_uInt8* pData, if( nLen < 0 ) { - // the actual level is finished, what should we do ? + // the current level is finished, what should we do ? m_nListLevel = WW8ListManager::nMaxLevel; if (m_xStyles && !m_bVer67) m_xStyles->nWwNumLevel = 0; @@ -1949,7 +1949,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData, if( nLen < 0 ) { - // the actual level is finished, what should we do ? + // the current level is finished, what should we do ? m_nLFOPosition = USHRT_MAX; m_nListLevel = WW8ListManager::nMaxLevel; } @@ -2020,8 +2020,8 @@ 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_nAktColl < m_vColl.size()) - m_vColl[m_nAktColl].m_bHasBrokenWW6List = true; + if (m_pAktColl && (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 if (USHRT_MAX > m_nLFOPosition) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 79b2d165ae6b..c134d35939f8 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2705,10 +2705,10 @@ const SfxPoolItem* SwWW8ImplReader::GetFormatAttr( sal_uInt16 nWhich ) pRet = m_xCtrlStck->GetStackAttr(*m_pPaM->GetPoint(), nWhich); if (!pRet) { - if (m_nAktColl < m_vColl.size() && m_vColl[m_nAktColl].m_pFormat && - m_vColl[m_nAktColl].m_bColl) + if (m_nCurrentColl < m_vColl.size() && m_vColl[m_nCurrentColl].m_pFormat && + m_vColl[m_nCurrentColl].m_bColl) { - pRet = &(m_vColl[m_nAktColl].m_pFormat->GetFormatAttr(nWhich)); + pRet = &(m_vColl[m_nCurrentColl].m_pFormat->GetFormatAttr(nWhich)); } } if (!pRet) @@ -2784,7 +2784,7 @@ void SwWW8ImplReader::Read_POutLvl(sal_uInt16, const sal_uInt8* pData, short nLe if (m_pAktColl != nullptr) { - SwWW8StyInf* pSI = GetStyle(m_nAktColl); + SwWW8StyInf* pSI = GetStyle(m_nCurrentColl); if (pSI && pSI->m_bColl && pSI->m_pFormat) { pSI->mnWW8OutlineLevel = @@ -2916,7 +2916,7 @@ void SwWW8ImplReader::Read_BoldUsw( sal_uInt16 nId, const sal_uInt8* pData, shor } // value: 0 = off, 1 = on, 128 = like style, 129 contrary to style bool bOn = *pData & 1; - SwWW8StyInf* pSI = GetStyle(m_nAktColl); + SwWW8StyInf* pSI = GetStyle(m_nCurrentColl); if (m_xPlcxMan && eVersion > ww::eWW2) { SprmResult aCharIstd = @@ -3083,7 +3083,7 @@ void SwWW8ImplReader::Read_BoldBiDiUsw(sal_uInt16 nId, const sal_uInt8* pData, return; } bool bOn = *pData & 1; - SwWW8StyInf* pSI = GetStyle(m_nAktColl); + SwWW8StyInf* pSI = GetStyle(m_nCurrentColl); if (m_xPlcxMan) { SprmResult aCharIstd = @@ -3661,19 +3661,19 @@ bool SwWW8ImplReader::SetNewFontAttr(sal_uInt16 nFCode, bool bSetEnums, if( bSetEnums ) { - if( m_pAktColl && m_nAktColl < m_vColl.size() ) // StyleDef + if( m_pAktColl && m_nCurrentColl < m_vColl.size() ) // StyleDef { switch(nWhich) { default: case RES_CHRATR_FONT: - m_vColl[m_nAktColl].m_eLTRFontSrcCharSet = eSrcCharSet; + m_vColl[m_nCurrentColl].m_eLTRFontSrcCharSet = eSrcCharSet; break; case RES_CHRATR_CTL_FONT: - m_vColl[m_nAktColl].m_eRTLFontSrcCharSet = eSrcCharSet; + m_vColl[m_nCurrentColl].m_eRTLFontSrcCharSet = eSrcCharSet; break; case RES_CHRATR_CJK_FONT: - m_vColl[m_nAktColl].m_eCJKFontSrcCharSet = eSrcCharSet; + m_vColl[m_nCurrentColl].m_eCJKFontSrcCharSet = eSrcCharSet; break; } } @@ -4114,9 +4114,9 @@ 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_nAktColl < m_vColl.size()) + if (m_pAktColl && m_nCurrentColl < m_vColl.size()) { - m_vColl[m_nAktColl].m_bListReleventIndentSet = true; + m_vColl[m_nCurrentColl].m_bListReleventIndentSet = true; } bLeftIndentSet = true; // #i105414# break; @@ -4135,13 +4135,13 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe been removed then we will factor the original list applied hanging into our calculation. */ - if (m_xPlcxMan && m_nAktColl < m_vColl.size() && m_vColl[m_nAktColl].m_bHasBrokenWW6List) + if (m_xPlcxMan && m_nCurrentColl < m_vColl.size() && m_vColl[m_nCurrentColl].m_bHasBrokenWW6List) { SprmResult aIsZeroed = m_xPlcxMan->GetPapPLCF()->HasSprm(NS_sprm::sprmPIlfo); if (aIsZeroed.pSprm && aIsZeroed.nRemainingData >= 1 && *aIsZeroed.pSprm == 0) { const SvxLRSpaceItem &rLR = - ItemGet<SvxLRSpaceItem>(*(m_vColl[m_nAktColl].m_pFormat), + ItemGet<SvxLRSpaceItem>(*(m_vColl[m_nCurrentColl].m_pFormat), RES_LR_SPACE); nPara = nPara - rLR.GetTextFirstLineOfst(); } @@ -4167,9 +4167,9 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe } } } - if (m_pAktColl && m_nAktColl < m_vColl.size()) + if (m_pAktColl && m_nCurrentColl < m_vColl.size()) { - m_vColl[m_nAktColl].m_bListReleventIndentSet = true; + m_vColl[m_nCurrentColl].m_bListReleventIndentSet = true; } bFirstLinOfstSet = true; // #i103711# break; @@ -4274,15 +4274,15 @@ 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_nAktColl < m_vColl.size()) - m_vColl[m_nAktColl].m_bParaAutoBefore = true; + if (m_pAktColl && m_nCurrentColl < m_vColl.size()) + m_vColl[m_nCurrentColl].m_bParaAutoBefore = true; else m_bParaAutoBefore = true; } else { - if (m_pAktColl && m_nAktColl < m_vColl.size()) - m_vColl[m_nAktColl].m_bParaAutoBefore = false; + if (m_pAktColl && m_nCurrentColl < m_vColl.size()) + m_vColl[m_nCurrentColl].m_bParaAutoBefore = false; else m_bParaAutoBefore = false; } @@ -4301,15 +4301,15 @@ 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_nAktColl < m_vColl.size()) - m_vColl[m_nAktColl].m_bParaAutoAfter = true; + if (m_pAktColl && m_nCurrentColl < m_vColl.size()) + m_vColl[m_nCurrentColl].m_bParaAutoAfter = true; else m_bParaAutoAfter = true; } else { - if (m_pAktColl && m_nAktColl < m_vColl.size()) - m_vColl[m_nAktColl].m_bParaAutoAfter = false; + if (m_pAktColl && m_nCurrentColl < m_vColl.size()) + m_vColl[m_nCurrentColl].m_bParaAutoAfter = false; else m_bParaAutoAfter = false; } @@ -5081,15 +5081,15 @@ 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_nAktColl < m_vColl.size()) // only for Styledef, otherwise solved differently + if (m_pAktColl && m_nCurrentColl < m_vColl.size()) // only for Styledef, otherwise solved differently { - SwWW8StyInf& rSI = m_vColl[m_nAktColl]; + SwWW8StyInf& rSI = m_vColl[m_nCurrentColl]; if (!rSI.m_xWWFly) rSI.m_xWWFly.reset(new WW8FlyPara(m_bVer67)); rSI.m_xWWFly->Read(*pData, m_xStyles.get()); if (rSI.m_xWWFly->IsEmpty()) { - m_vColl[m_nAktColl].m_xWWFly.reset(); + m_vColl[m_nCurrentColl].m_xWWFly.reset(); } } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits