diff options
author | Johnny_M <klasse@partyheld.de> | 2018-03-03 19:16:34 +0100 |
---|---|---|
committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2018-03-04 09:52:24 +0100 |
commit | 70b448724f55958acd9907fe51d20ef1b779046a (patch) | |
tree | 5d7515769c9390111a5ee4762f651e2b806bc840 /sw/source/filter/ww8/rtfexport.cxx | |
parent | 13164cc99dc6184fb2c12e56e9c0dea0d5692eec (diff) |
Translate German variable names
Akt -> Current in MSWordExportBase
(Other occurrences will be done separately.)
Change-Id: Ibb9f8f79e73a36dae1d4cb92f202ff733d7bf673
Reviewed-on: https://gerrit.libreoffice.org/50687
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'sw/source/filter/ww8/rtfexport.cxx')
-rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 848a11f28715..292b1305e9c3 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -840,7 +840,7 @@ void RtfExport::ExportDocument_Impl() // following title page are correctly added - i13107 if (pSttPgDsc) { - m_pAktPageDesc = &rPageDesc; + m_pCurrentPageDesc = &rPageDesc; } } @@ -1333,47 +1333,48 @@ const OUString* RtfExport::GetRedline(sal_uInt16 nId) void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bCheckForFirstPage) { SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start"); - const SwPageDesc* pSave = m_pAktPageDesc; + const SwPageDesc* pSave = m_pCurrentPageDesc; - m_pAktPageDesc = &rPgDsc; - if (bCheckForFirstPage && m_pAktPageDesc->GetFollow() - && m_pAktPageDesc->GetFollow() != m_pAktPageDesc) - m_pAktPageDesc = m_pAktPageDesc->GetFollow(); + m_pCurrentPageDesc = &rPgDsc; + if (bCheckForFirstPage && m_pCurrentPageDesc->GetFollow() + && m_pCurrentPageDesc->GetFollow() != m_pCurrentPageDesc) + m_pCurrentPageDesc = m_pCurrentPageDesc->GetFollow(); - if (m_pAktPageDesc->GetLandscape()) + if (m_pCurrentPageDesc->GetLandscape()) Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LNDSCPSXN); - const SwFormat* pFormat = &m_pAktPageDesc->GetMaster(); //GetLeft(); + const SwFormat* pFormat = &m_pCurrentPageDesc->GetMaster(); //GetLeft(); m_bOutPageDescs = true; OutputFormat(*pFormat, true, false); m_bOutPageDescs = false; // normal header / footer (without a style) const SfxPoolItem* pItem; - if (m_pAktPageDesc->GetLeft().GetAttrSet().GetItemState(RES_HEADER, false, &pItem) + if (m_pCurrentPageDesc->GetLeft().GetAttrSet().GetItemState(RES_HEADER, false, &pItem) == SfxItemState::SET) WriteHeaderFooter(*pItem, true); - if (m_pAktPageDesc->GetLeft().GetAttrSet().GetItemState(RES_FOOTER, false, &pItem) + if (m_pCurrentPageDesc->GetLeft().GetAttrSet().GetItemState(RES_FOOTER, false, &pItem) == SfxItemState::SET) WriteHeaderFooter(*pItem, false); // title page - if (m_pAktPageDesc != &rPgDsc) + if (m_pCurrentPageDesc != &rPgDsc) { Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_TITLEPG); - m_pAktPageDesc = &rPgDsc; - if (m_pAktPageDesc->GetMaster().GetAttrSet().GetItemState(RES_HEADER, false, &pItem) + m_pCurrentPageDesc = &rPgDsc; + if (m_pCurrentPageDesc->GetMaster().GetAttrSet().GetItemState(RES_HEADER, false, &pItem) == SfxItemState::SET) WriteHeaderFooter(*pItem, true); - if (m_pAktPageDesc->GetMaster().GetAttrSet().GetItemState(RES_FOOTER, false, &pItem) + if (m_pCurrentPageDesc->GetMaster().GetAttrSet().GetItemState(RES_FOOTER, false, &pItem) == SfxItemState::SET) WriteHeaderFooter(*pItem, false); } // numbering type - AttrOutput().SectionPageNumbering(m_pAktPageDesc->GetNumType().GetNumberingType(), boost::none); + AttrOutput().SectionPageNumbering(m_pCurrentPageDesc->GetNumType().GetNumberingType(), + boost::none); - m_pAktPageDesc = pSave; + m_pCurrentPageDesc = pSave; SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end"); } @@ -1397,13 +1398,13 @@ void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader) const sal_Char* pStr = (bHeader ? OOO_STRING_SVTOOLS_RTF_HEADER : OOO_STRING_SVTOOLS_RTF_FOOTER); /* is this a title page? */ - if (m_pAktPageDesc->GetFollow() && m_pAktPageDesc->GetFollow() != m_pAktPageDesc) + if (m_pCurrentPageDesc->GetFollow() && m_pCurrentPageDesc->GetFollow() != m_pCurrentPageDesc) { Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_TITLEPG); pStr = (bHeader ? OOO_STRING_SVTOOLS_RTF_HEADERF : OOO_STRING_SVTOOLS_RTF_FOOTERF); } Strm().WriteChar('{').WriteCharPtr(pStr); - WriteHeaderFooterText(m_pAktPageDesc->GetMaster(), bHeader); + WriteHeaderFooterText(m_pCurrentPageDesc->GetMaster(), bHeader); Strm().WriteChar('}'); SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end"); |