[Libreoffice-commits] core.git: sw/source
Johnny_M
klasse at partyheld.de
Sun Feb 18 14:21:22 UTC 2018
sw/source/filter/ww8/ww8par.cxx | 20 ++++++++++----------
sw/source/filter/ww8/ww8par.hxx | 6 +++---
sw/source/filter/ww8/ww8par2.cxx | 8 ++++----
sw/source/filter/ww8/ww8par6.cxx | 18 +++++++++---------
4 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 0679691db053acaa3ca2aa633a56d108f2e5bb85
Author: Johnny_M <klasse at partyheld.de>
Date: Sat Feb 17 14:09:19 2018 +0100
Translate German variable names
m_xAktItemSet -> m_xCurrentItemSet
m_bAktAND_fNumberAcross -> m_bCurrentAND_fNumberAcross
in ww8par
Change-Id: I1f78120008530b17d2eab508c8649798fc7bedea
Note: Other occurrences of "Akt" will be done separately
Reviewed-on: https://gerrit.libreoffice.org/49905
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 2d585cdd8624..70c962d48a2f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3946,7 +3946,7 @@ bool SwWW8ImplReader::ReadText(WW8_CP nStartCp, WW8_CP nTextLen, ManTypes nType)
m_bWasParaEnd = false;
m_nCurrentColl = 0;
- m_xAktItemSet.reset();
+ m_xCurrentItemSet.reset();
m_nCharFormat = -1;
m_bSpec = false;
m_bPgSecBreak = false;
@@ -4067,21 +4067,21 @@ bool SwWW8ImplReader::ReadText(WW8_CP nStartCp, WW8_CP nTextLen, ManTypes nType)
const SwFormatCharFormat *pSwFormatCharFormat = nullptr;
- if (m_xAktItemSet)
- pSwFormatCharFormat = &(ItemGet<SwFormatCharFormat>(*m_xAktItemSet, RES_TXTATR_CHARFMT));
+ if (m_xCurrentItemSet)
+ pSwFormatCharFormat = &(ItemGet<SwFormatCharFormat>(*m_xCurrentItemSet, RES_TXTATR_CHARFMT));
if (pSwFormatCharFormat)
pFormat = pSwFormatCharFormat->GetCharFormat();
- if (m_xAktItemSet && !pFormat)
+ if (m_xCurrentItemSet && !pFormat)
{
OUString sPrefix = "WW8Dropcap" + OUString::number(m_nDropCap++);
pNewSwCharFormat = m_rDoc.MakeCharFormat(sPrefix, m_rDoc.GetDfltCharFormat());
- m_xAktItemSet->ClearItem(RES_CHRATR_ESCAPEMENT);
- pNewSwCharFormat->SetFormatAttr(*m_xAktItemSet);
+ m_xCurrentItemSet->ClearItem(RES_CHRATR_ESCAPEMENT);
+ pNewSwCharFormat->SetFormatAttr(*m_xCurrentItemSet);
}
- m_xAktItemSet.reset();
+ m_xCurrentItemSet.reset();
m_bDropCap=false;
}
@@ -4230,7 +4230,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
, m_bVer7(false)
, m_bVer8(false)
, m_bEmbeddObj(false)
- , m_bAktAND_fNumberAcross(false)
+ , m_bCurrentAND_fNumberAcross(false)
, m_bNoLnNumYet(true)
, m_bFirstPara(true)
, m_bFirstParaOfPage(false)
@@ -6504,8 +6504,8 @@ SdrObjUserData* SwMacroInfo::Clone( SdrObject* /*pObj*/ ) const
std::unique_ptr<SfxItemSet> SwWW8ImplReader::SetAktItemSet(SfxItemSet* pItemSet)
{
- std::unique_ptr<SfxItemSet> xRet(std::move(m_xAktItemSet));
- m_xAktItemSet.reset(pItemSet);
+ std::unique_ptr<SfxItemSet> xRet(std::move(m_xCurrentItemSet));
+ m_xCurrentItemSet.reset(pItemSet);
return xRet;
}
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 6182e324677c..5b7b9a6f10e2 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1219,7 +1219,7 @@ private:
std::unique_ptr<WW8RStyle> m_xStyles; // pointer to the style reading class
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
+ std::unique_ptr<SfxItemSet> m_xCurrentItemSet;// character attributes to be read in now
// (always 0 outside of the WW8ListManager Ctor)
std::vector<SwWW8StyInf> m_vColl;
const SwTextFormatColl* m_pDfltTextFormatColl; // Default
@@ -1332,7 +1332,7 @@ private:
bool m_bEmbeddObj; // EmbeddField is being read
- bool m_bAktAND_fNumberAcross; // current active Annotated List Deskriptor - ROW flag
+ bool m_bCurrentAND_fNumberAcross; // current active Annotated List Deskriptor - ROW flag
bool m_bNoLnNumYet; // no Line Numbering has been activated yet (we import
// the very 1st Line Numbering and ignore the rest)
@@ -1478,7 +1478,7 @@ private:
SwFrameFormat const *pFlyFormat, WW8_FSPA const *pF);
bool IsDropCap();
- bool IsListOrDropcap() { return (!m_xAktItemSet || m_bDropCap); };
+ bool IsListOrDropcap() { return (!m_xCurrentItemSet || m_bDropCap); };
//Apo == Absolutely Positioned Object, MSWord's old-style frames
WW8FlyPara *ConstructApo(const ApoTestResults &rApo,
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 7e896f554579..f284886201cd 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -688,7 +688,7 @@ void SwWW8ImplReader::SetAnld(SwNumRule* pNumR, WW8_ANLD const * pAD, sal_uInt8
SwNumFormat aNF;
if (pAD)
{ // there is a Anld-Sprm
- m_bAktAND_fNumberAcross = 0 != pAD->fNumberAcross;
+ m_bCurrentAND_fNumberAcross = 0 != pAD->fNumberAcross;
WW8_ANLV const &rAV = pAD->eAnlv;
SetBaseAnlv(aNF, rAV, nSwLevel); // set the base format
SetAnlvStrings(aNF, rAV, pAD->rgchAnld, 0, SAL_N_ELEMENTS(pAD->rgchAnld), bOutLine); // set the rest
@@ -887,7 +887,7 @@ void ANLDRuleMap::SetNumRule(const SwNumRule *pRule, sal_uInt8 nNumType)
// outline / numbering / bullets
void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
{
- m_bAktAND_fNumberAcross = false;
+ m_bCurrentAND_fNumberAcross = false;
sal_uInt8 nT = static_cast< sal_uInt8 >(GetNumType(*pSprm13));
if (nT == WW8_Pause || nT == WW8_None)
@@ -1723,7 +1723,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
m_pFlyFormat(nullptr),
m_aItemSet(m_pIo->m_rDoc.GetAttrPool(),svl::Items<RES_FRMATR_BEGIN,RES_FRMATR_END-1>{})
{
- m_pIo->m_bAktAND_fNumberAcross = false;
+ m_pIo->m_bCurrentAND_fNumberAcross = false;
static const sal_Int16 aOriArr[] =
{
@@ -3254,7 +3254,7 @@ void WW8TabDesc::TableCellEnd()
SetPamInCell(m_nCurrentCol, true);
// finish Annotated Level Numbering ?
- if (m_pIo->m_bAnl && !m_pIo->m_bAktAND_fNumberAcross && m_pActBand)
+ if (m_pIo->m_bAnl && !m_pIo->m_bCurrentAND_fNumberAcross && m_pActBand)
m_pIo->StopAllAnl(IsValidCell(m_nCurrentCol));
}
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index ded6510bce40..3142f3441ce2 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2368,7 +2368,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo, const WW8_TablePos *p
if (IsDropCap())
{
m_bDropCap = true;
- m_xAktItemSet.reset(new SfxItemSet(m_rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_END - 1>{}));
+ m_xCurrentItemSet.reset(new SfxItemSet(m_rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_END - 1>{}));
return false;
}
@@ -2656,9 +2656,9 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr,
OSL_ENSURE(rAttr.Which() != RES_FLTR_REDLINE, "redline in style!");
m_pCurrentColl->SetFormatAttr(rAttr);
}
- else if (m_xAktItemSet)
+ else if (m_xCurrentItemSet)
{
- m_xAktItemSet->Put(rAttr);
+ m_xCurrentItemSet->Put(rAttr);
}
else if (rAttr.Which() == RES_FLTR_REDLINE)
{
@@ -2692,9 +2692,9 @@ const SfxPoolItem* SwWW8ImplReader::GetFormatAttr( sal_uInt16 nWhich )
const SfxPoolItem* pRet = nullptr;
if (m_pCurrentColl)
pRet = &(m_pCurrentColl->GetFormatAttr(nWhich));
- else if (m_xAktItemSet)
+ else if (m_xCurrentItemSet)
{
- pRet = m_xAktItemSet->GetItem(nWhich);
+ pRet = m_xCurrentItemSet->GetItem(nWhich);
if (!pRet)
pRet = m_pStandardFormatColl ? &(m_pStandardFormatColl->GetFormatAttr(nWhich)) : nullptr;
if (!pRet)
@@ -3518,16 +3518,16 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh
}
}
}
- else if (m_xAktItemSet)
+ else if (m_xCurrentItemSet)
{
- if ( SfxItemState::SET == m_xAktItemSet->GetItemState( RES_CHRATR_UNDERLINE, false ) )
+ if ( SfxItemState::SET == m_xCurrentItemSet->GetItemState( RES_CHRATR_UNDERLINE, false ) )
{
SvxUnderlineItem *pUnderline
- = static_cast<SvxUnderlineItem*>(m_xAktItemSet->Get(RES_CHRATR_UNDERLINE, false).Clone());
+ = static_cast<SvxUnderlineItem*>(m_xCurrentItemSet->Get(RES_CHRATR_UNDERLINE, false).Clone());
if (pUnderline && nLen >= 4)
{
pUnderline->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ) );
- m_xAktItemSet->Put( *pUnderline );
+ m_xCurrentItemSet->Put( *pUnderline );
delete pUnderline;
}
}
More information about the Libreoffice-commits
mailing list