sw/source/filter/ww8/ww8par.cxx | 8 ++++----
sw/source/filter/ww8/ww8par.hxx | 8 ++++----
sw/source/filter/ww8/ww8par2.cxx | 4 ++--
sw/source/filter/ww8/ww8par3.cxx | 14 +++++++-------
4 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 23bc8f0aa09d7d8cce284314723b3eb8b74972c1
Author: Johnny_M <kla...@partyheld.de>
Date: Sat Mar 3 11:34:30 2018 +0100
Translate German variable and function names
Akt -> Current in ww8par
Change-Id: I5adedc8edc6e8c0a6b9022ca55bca1293ab046fd
Reviewed-on: https://gerrit.libreoffice.org/50670
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 05f9de2d82f7..dc6c41deeffb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3699,7 +3699,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
return bParaMark;
}
-void SwWW8ImplReader::ProcessAktCollChange(WW8PLCFManResult& rRes,
+void SwWW8ImplReader::ProcessCurrentCollChange(WW8PLCFManResult& rRes,
bool* pStartAttr, bool bCallProcessSpecial)
{
sal_uInt16 nOldColl = m_nCurrentColl;
@@ -3764,7 +3764,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, long
nTextEnd, bool& rbStar
// New paragraph over Plcx.Fkp.papx
if ( (aRes.nFlags & MAN_MASK_NEW_PAP)|| rbStartLine )
{
- ProcessAktCollChange( aRes, &bStartAttr,
+ ProcessCurrentCollChange( aRes, &bStartAttr,
MAN_MASK_NEW_PAP == (aRes.nFlags & MAN_MASK_NEW_PAP) &&
!m_bIgnoreText );
rbStartLine = false;
@@ -3849,7 +3849,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, long
nTextEnd, bool& rbStar
{
m_xCtrlStck->KillUnlockedAttrs( *m_pPaM->GetPoint() );
if( nOldColl != m_xPlcxMan->GetColl() )
- ProcessAktCollChange(aRes, nullptr, false);
+ ProcessCurrentCollChange(aRes, nullptr, false);
}
return nNext;
@@ -6501,7 +6501,7 @@ SdrObjUserData* SwMacroInfo::Clone( SdrObject* /*pObj*/ )
const
return new SwMacroInfo( *this );
}
-std::unique_ptr<SfxItemSet> SwWW8ImplReader::SetAktItemSet(SfxItemSet*
pItemSet)
+std::unique_ptr<SfxItemSet> SwWW8ImplReader::SetCurrentItemSet(SfxItemSet*
pItemSet)
{
std::unique_ptr<SfxItemSet> xRet(std::move(m_xCurrentItemSet));
m_xCurrentItemSet.reset(pItemSet);
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index a43f50cff080..d434c9616472 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1411,7 +1411,7 @@ private:
void SetDocumentGrid(SwFrameFormat &rFormat, const wwSection &rSection);
- void ProcessAktCollChange(WW8PLCFManResult& rRes, bool* pStartAttr,
+ void ProcessCurrentCollChange(WW8PLCFManResult& rRes, bool* pStartAttr,
bool bCallProcessSpecial);
long ReadTextAttr(WW8_CP& rTextPos, long nTextEnd, bool& rbStartLine);
void ReadAttrs(WW8_CP& rTextPos, WW8_CP& rNext, long nTextEnd, bool&
rbStartLine);
@@ -1868,9 +1868,9 @@ 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_nCurrentColl; }
- void SetNAktColl( sal_uInt16 nColl ) { m_nCurrentColl = nColl; }
- std::unique_ptr<SfxItemSet> SetAktItemSet(SfxItemSet* pItemSet);
+ sal_uInt16 GetCurrentColl() const { return m_nCurrentColl; }
+ void SetNCurrentColl( sal_uInt16 nColl ) { m_nCurrentColl = nColl; }
+ std::unique_ptr<SfxItemSet> SetCurrentItemSet(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 c4d158fb715f..4374a1cf9ab3 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3836,7 +3836,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti
eSti, sal_uInt16 nThisSty
pStyRule = nullptr; // recreate if necessary
bTextColChanged = bFontChanged = bCJKFontChanged = bCTLFontChanged =
bFSizeChanged = bFCTLSizeChanged = bWidowsChanged = false;
- pIo->SetNAktColl( nThisStyle );
+ pIo->SetNCurrentColl( nThisStyle );
pIo->m_bStyNormal = nThisStyle == 0;
return bOldNoImp;
}
@@ -3858,7 +3858,7 @@ void WW8RStyle::PostStyle(SwWW8StyInf const &rSI, bool
bOldNoImp)
pStyRule = nullptr; // to be on the safe side
pIo->m_bStyNormal = false;
- pIo->SetNAktColl( 0 );
+ pIo->SetNCurrentColl( 0 );
pIo->m_bNoAttrImport = bOldNoImp;
// reset the list-remember-fields, if used when reading styles
pIo->m_nLFOPosition = USHRT_MAX;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index ed6e734bc8c4..fd6b4e8293f5 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -682,13 +682,13 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat,
std::unique_ptr<SfxItemSet
rpItemSet.reset(new SfxItemSet( rDoc.GetAttrPool(),
svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>{}));
// Set Reader-ItemSet-Pointer to the newly created set
- rReader.SetAktItemSet(rpItemSet.release());
+ rReader.SetCurrentItemSet(rpItemSet.release());
// Set Reader-Style to Style of this Level
- sal_uInt16 nOldColl = rReader.GetNAktColl();
+ sal_uInt16 nOldColl = rReader.GetCurrentColl();
sal_uInt16 nNewColl = nLevelStyle;
if (ww::stiNil == nNewColl)
nNewColl = 0;
- rReader.SetNAktColl( nNewColl );
+ rReader.SetNCurrentColl( nNewColl );
// The Read_xy() methods in WW8PAR6.cxx are calling their respective
// NewAttr() or GetFormatAttr() which can determine, by using the
assigned
@@ -706,8 +706,8 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat,
std::unique_ptr<SfxItemSet
}
// Reset Reader-ItemSet-Pointer and Reader-Style
- rpItemSet = rReader.SetAktItemSet(nullptr);
- rReader.SetNAktColl( nOldColl );
+ rpItemSet = rReader.SetCurrentItemSet(nullptr);
+ rReader.SetNCurrentColl( nOldColl );
rReader.SetToggleAttrFlags(nOldFlags1);
rReader.SetToggleBiDiAttrFlags(nOldFlags2);
}
@@ -1869,7 +1869,7 @@ void
SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nCurrentLFO,
*/
if (short nLen = static_cast< short >(aParaSprms.size()))
{
- std::unique_ptr<SfxItemSet>
xOldAktItemSet(SetAktItemSet(xListIndent.release()));
+ std::unique_ptr<SfxItemSet>
xOldCurrentItemSet(SetCurrentItemSet(xListIndent.release()));
sal_uInt8* pSprms1 = &aParaSprms[0];
while (0 < nLen)
@@ -1879,7 +1879,7 @@ void
SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nCurrentLFO,
pSprms1 += nL1;
}
- xListIndent = SetAktItemSet(xOldAktItemSet.release());
+ xListIndent =
SetCurrentItemSet(xOldCurrentItemSet.release());
}
if (const SvxLRSpaceItem *pLR =
xListIndent->GetItem<SvxLRSpaceItem>(RES_LR_SPACE))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
