[Libreoffice-commits] core.git: sw/source
Johnny_M
klasse at partyheld.de
Sun Mar 4 08:52:46 UTC 2018
sw/source/filter/ww8/docxattributeoutput.cxx | 2 -
sw/source/filter/ww8/docxexport.cxx | 2 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 2 -
sw/source/filter/ww8/rtfexport.cxx | 37 ++++++++++----------
sw/source/filter/ww8/wrtw8nds.cxx | 18 +++++-----
sw/source/filter/ww8/wrtw8sty.cxx | 8 ++--
sw/source/filter/ww8/wrtww8.cxx | 10 ++---
sw/source/filter/ww8/wrtww8.hxx | 2 -
sw/source/filter/ww8/ww8atr.cxx | 48 +++++++++++++--------------
9 files changed, 65 insertions(+), 64 deletions(-)
New commits:
commit 70b448724f55958acd9907fe51d20ef1b779046a
Author: Johnny_M <klasse at partyheld.de>
Date: Sat Mar 3 19:16:34 2018 +0100
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 at libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index e472319cc4b8..0e81dae183ae 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7903,7 +7903,7 @@ void DocxAttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize )
else if ( m_rExport.m_bOutPageDescs )
{
FastAttributeList *attrList = FastSerializerHelper::createAttrList( );
- if ( m_rExport.m_pAktPageDesc->GetLandscape( ) )
+ if ( m_rExport.m_pCurrentPageDesc->GetLandscape( ) )
attrList->add( FSNS( XML_w, XML_orient ), "landscape" );
attrList->add( FSNS( XML_w, XML_w ), OString::number( rSize.GetWidth( ) ) );
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 89dc6b8bf0a1..201191ddd1b2 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -583,7 +583,7 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode )
nRstLnNum = 0;
AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo( ) );
- m_pSections->AppendSection( m_pAktPageDesc, pParentFormat, nRstLnNum );
+ m_pSections->AppendSection( m_pCurrentPageDesc, pParentFormat, nRstLnNum );
}
else
{
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index bf3d687c72ba..56c4169aff32 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1618,7 +1618,7 @@ void RtfAttributeOutput::WriteHeaderFooter_Impl(const SwFrameFormat& rFormat, bo
m_aSectionHeaders.append(bHeader ? OOO_STRING_SVTOOLS_RTF_HEADERY
: OOO_STRING_SVTOOLS_RTF_FOOTERY);
m_aSectionHeaders.append(
- static_cast<sal_Int32>(m_rExport.m_pAktPageDesc->GetMaster().GetULSpace().GetUpper()));
+ static_cast<sal_Int32>(m_rExport.m_pCurrentPageDesc->GetMaster().GetULSpace().GetUpper()));
if (bTitlepg)
m_aSectionHeaders.append(OOO_STRING_SVTOOLS_RTF_TITLEPG);
m_aSectionHeaders.append('{');
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");
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 0a2d6128ce07..a5c4c9ecf599 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1556,8 +1556,8 @@ const SwRedlineData* SwWW8AttrIter::GetRunLevelRedline( sal_Int32 nPos )
SvxFrameDirection MSWordExportBase::GetCurrentPageDirection() const
{
- const SwFrameFormat &rFormat = m_pAktPageDesc
- ? m_pAktPageDesc->GetMaster()
+ const SwFrameFormat &rFormat = m_pCurrentPageDesc
+ ? m_pCurrentPageDesc->GetMaster()
: m_pDoc->GetPageDesc( 0 ).GetMaster();
return rFormat.GetFrameDir().GetValue();
}
@@ -1636,8 +1636,8 @@ SvxFrameDirection MSWordExportBase::TrueFrameDirection( const SwFrameFormat &rFl
const SvxBrushItem* WW8Export::GetCurrentPageBgBrush() const
{
- const SwFrameFormat &rFormat = m_pAktPageDesc
- ? m_pAktPageDesc->GetMaster()
+ const SwFrameFormat &rFormat = m_pCurrentPageDesc
+ ? m_pCurrentPageDesc->GetMaster()
: m_pDoc->GetPageDesc(0).GetMaster();
const SfxPoolItem* pItem = nullptr;
@@ -2098,14 +2098,14 @@ void MSWordExportBase::GetSortedBookmarks( const SwTextNode& rNode, sal_Int32 nA
bool MSWordExportBase::NeedSectionBreak( const SwNode& rNd ) const
{
- if ( m_bStyDef || m_bOutKF || m_bInWriteEscher || m_bOutPageDescs || m_pAktPageDesc == nullptr )
+ if ( m_bStyDef || m_bOutKF || m_bInWriteEscher || m_bOutPageDescs || m_pCurrentPageDesc == nullptr )
return false;
const SwPageDesc * pPageDesc = rNd.FindPageDesc()->GetFollow();
- if (m_pAktPageDesc != pPageDesc)
+ if (m_pCurrentPageDesc != pPageDesc)
{
- if (!sw::util::IsPlausableSingleWordSection(m_pAktPageDesc->GetFirstMaster(), pPageDesc->GetMaster()))
+ if (!sw::util::IsPlausableSingleWordSection(m_pCurrentPageDesc->GetFirstMaster(), pPageDesc->GetMaster()))
{
return true;
}
@@ -2608,7 +2608,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
{
// In this case the same paragraph holds the next page style
// too.
- const SwPageDesc* pNextPageDesc = m_pAktPageDesc->GetFollow();
+ const SwPageDesc* pNextPageDesc = m_pCurrentPageDesc->GetFollow();
assert(pNextPageDesc);
PrepareNewPageDesc( rNode.GetpSwAttrSet(), rNode, nullptr , pNextPageDesc);
}
@@ -3064,7 +3064,7 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode )
const SwPageDesc *pCurrent =
SwPageDesc::GetPageDescOfNode(aIdxTmp.GetNode());
if (!pCurrent)
- pCurrent = m_pAktPageDesc;
+ pCurrent = m_pCurrentPageDesc;
AppendSection( pCurrent, &rFormat, nRstLnNum );
}
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 1b0aefe49c4d..5cc7bc335008 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -968,7 +968,7 @@ MSWordSections::MSWordSections( MSWordExportBase& rExport )
: mbDocumentIsProtected( false )
{
const SwSectionFormat *pFormat = nullptr;
- rExport.m_pAktPageDesc = &rExport.m_pDoc->GetPageDesc( 0 );
+ rExport.m_pCurrentPageDesc = &rExport.m_pDoc->GetPageDesc( 0 );
const SfxPoolItem* pI;
const SwNode* pNd = rExport.m_pCurPam->GetContentNode();
@@ -1009,7 +1009,7 @@ MSWordSections::MSWordSections( MSWordExportBase& rExport )
AppendSection( *static_cast<const SwFormatPageDesc*>(pI), *pNd, pFormat, nRstLnNum );
}
else
- AppendSection( rExport.m_pAktPageDesc, pFormat, nRstLnNum );
+ AppendSection( rExport.m_pCurrentPageDesc, pFormat, nRstLnNum );
}
WW8_WrPlcSepx::WW8_WrPlcSepx( MSWordExportBase& rExport )
@@ -1513,7 +1513,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
if ( rSepInfo.pSectionFormat && !pPd )
pPd = &m_pDoc->GetPageDesc( 0 );
- m_pAktPageDesc = pPd;
+ m_pCurrentPageDesc = pPd;
if ( !pPd )
return;
@@ -1640,7 +1640,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
else
pPdFirstPgFormat = &pPd->GetMaster();
- m_pAktPageDesc = pPd = pFollow;
+ m_pCurrentPageDesc = pPd = pFollow;
pPdFormat = &rFollowFormat;
// has different headers/footers for the title page
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 7287557f8780..c2136a3ecb50 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1923,7 +1923,7 @@ void MSWordExportBase::SaveData( sal_uLong nStt, sal_uLong nEnd )
aData.pOldPam = m_pCurPam;
aData.pOldEnd = m_pOrigPam;
aData.pOldFlyFormat = m_pParentFrame;
- aData.pOldPageDesc = m_pAktPageDesc;
+ aData.pOldPageDesc = m_pCurrentPageDesc;
aData.pOldFlyOffset = m_pFlyOffset;
aData.eOldAnchorType = m_eNewAnchorType;
@@ -1960,7 +1960,7 @@ void MSWordExportBase::RestoreData()
m_bInWriteTOX = rData.bOldInWriteTOX;
m_pParentFrame = rData.pOldFlyFormat;
- m_pAktPageDesc = rData.pOldPageDesc;
+ m_pCurrentPageDesc = rData.pOldPageDesc;
m_eNewAnchorType = rData.eOldAnchorType;
m_pFlyOffset = rData.pOldFlyOffset;
@@ -2718,7 +2718,7 @@ void MSWordExportBase::WriteText()
const SwPageDesc* pTemp = rNd.FindPageDesc();
if ( pTemp )
- m_pAktPageDesc = pTemp;
+ m_pCurrentPageDesc = pTemp;
m_pCurPam->GetPoint()->nContent.Assign( pCNd, 0 );
OutputContentNode( *pCNd );
@@ -2792,7 +2792,7 @@ void MSWordExportBase::WriteText()
else
nRstLnNum = 0;
- AppendSection( m_pAktPageDesc, pParentFormat, nRstLnNum );
+ AppendSection( m_pCurrentPageDesc, pParentFormat, nRstLnNum );
}
else
{
@@ -3562,7 +3562,7 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM
, m_nUniqueList(0)
, m_nHdFtIndex(0)
, m_nOrigRedlineFlags(RedlineFlags::NONE)
- , m_pAktPageDesc(nullptr)
+ , m_pCurrentPageDesc(nullptr)
, m_bPrevTextNodeIsEmpty(false)
, m_pPapPlc(nullptr)
, m_pChpPlc(nullptr)
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 5a52a2aa852f..5bec4ab6b226 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -480,7 +480,7 @@ public:
/* implicit bookmark vector containing pairs of node indexes and bookmark names */
std::vector<aBookmarkPair> m_aImplicitBookmarks;
ww8::Frames m_aFrames; // The floating frames in this document
- const SwPageDesc *m_pAktPageDesc;
+ const SwPageDesc *m_pCurrentPageDesc;
bool m_bPrevTextNodeIsEmpty;
WW8_WrPlcPn* m_pPapPlc;
WW8_WrPlcPn* m_pChpPlc;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index d923d0c491ac..9b6b425269ef 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -375,22 +375,22 @@ bool MSWordExportBase::SetAktPageDescFromNode(const SwNode &rNd)
{
bool bNewPageDesc = false;
const SwPageDesc* pCurrent = SwPageDesc::GetPageDescOfNode(rNd);
- OSL_ENSURE(pCurrent && m_pAktPageDesc, "Not possible surely");
- if (m_pAktPageDesc && pCurrent)
+ OSL_ENSURE(pCurrent && m_pCurrentPageDesc, "Not possible surely");
+ if (m_pCurrentPageDesc && pCurrent)
{
- if (pCurrent != m_pAktPageDesc)
+ if (pCurrent != m_pCurrentPageDesc)
{
- if (m_pAktPageDesc->GetFollow() != pCurrent)
+ if (m_pCurrentPageDesc->GetFollow() != pCurrent)
bNewPageDesc = true;
else
{
- const SwFrameFormat& rTitleFormat = m_pAktPageDesc->GetFirstMaster();
+ const SwFrameFormat& rTitleFormat = m_pCurrentPageDesc->GetFirstMaster();
const SwFrameFormat& rFollowFormat = pCurrent->GetMaster();
bNewPageDesc = !IsPlausableSingleWordSection(rTitleFormat,
rFollowFormat);
}
- m_pAktPageDesc = pCurrent;
+ m_pCurrentPageDesc = pCurrent;
}
else
{
@@ -430,9 +430,9 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
const SwPageDesc * pPageDesc = rNd.FindPageDesc();
// Even if pAktPageDesc != pPageDesc ,it might be because of the different header & footer types.
- if (m_pAktPageDesc != pPageDesc)
+ if (m_pCurrentPageDesc != pPageDesc)
{
- if ( ( isCellOpen && ( m_pAktPageDesc->GetName() != pPageDesc->GetName() )) ||
+ if ( ( isCellOpen && ( m_pCurrentPageDesc->GetName() != pPageDesc->GetName() )) ||
( isTextNodeEmpty || m_bPrevTextNodeIsEmpty ))
{
/* Do not output a section break in the following scenarios.
@@ -449,14 +449,14 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
* If Table cell is open and page header types are different
* set pSet to NULL as we don't want to add any section breaks.
*/
- if ( isCellOpen && ( m_pAktPageDesc->GetName() != pPageDesc->GetName() ) )
+ if ( isCellOpen && ( m_pCurrentPageDesc->GetName() != pPageDesc->GetName() ) )
pSet = nullptr;
}
- else if (!sw::util::IsPlausableSingleWordSection(m_pAktPageDesc->GetFirstMaster(), pPageDesc->GetMaster()))
+ else if (!sw::util::IsPlausableSingleWordSection(m_pCurrentPageDesc->GetFirstMaster(), pPageDesc->GetMaster()))
{
bBreakSet = true;
bNewPageDesc = true;
- m_pAktPageDesc = pPageDesc;
+ m_pCurrentPageDesc = pPageDesc;
}
}
@@ -468,7 +468,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
bBreakSet = true;
bNewPageDesc = true;
pPgDesc = static_cast<const SwFormatPageDesc*>(pItem);
- m_pAktPageDesc = pPgDesc->GetPageDesc();
+ m_pCurrentPageDesc = pPgDesc->GetPageDesc();
}
else if ( SfxItemState::SET == pSet->GetItemState( RES_BREAK, false, &pItem ) )
{
@@ -497,7 +497,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
if ( !bRemoveHardBreakInsideTable )
{
- OSL_ENSURE(m_pAktPageDesc, "should not be possible");
+ OSL_ENSURE(m_pCurrentPageDesc, "should not be possible");
/*
If because of this pagebreak the page desc following the page
break is the follow style of the current page desc then output a
@@ -506,7 +506,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
done when it happens when we get a new pagedesc because we
overflow from the first page style.
*/
- if ( m_pAktPageDesc )
+ if ( m_pCurrentPageDesc )
{
// #i76301# - assure that there is a page break before set at the node.
const SvxFormatBreakItem* pBreak = dynamic_cast<const SvxFormatBreakItem*>(pItem);
@@ -553,14 +553,14 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
if ( bHackInBreak )
{
- OSL_ENSURE( m_pAktPageDesc, "should not be possible" );
- if ( m_pAktPageDesc )
+ OSL_ENSURE( m_pCurrentPageDesc, "should not be possible" );
+ if ( m_pCurrentPageDesc )
bNewPageDesc = SetAktPageDescFromNode( rNd );
}
- if ( bNewPageDesc && m_pAktPageDesc )
+ if ( bNewPageDesc && m_pCurrentPageDesc )
{
- PrepareNewPageDesc( pSet, rNd, pPgDesc, m_pAktPageDesc );
+ PrepareNewPageDesc( pSet, rNd, pPgDesc, m_pCurrentPageDesc );
}
m_bBreakBefore = false;
m_bPrevTextNodeIsEmpty = isTextNodeEmpty ;
@@ -572,10 +572,10 @@ bool MSWordExportBase::OutputFollowPageDesc( const SfxItemSet* pSet, const SwTex
bool bRet = false;
if ( pNd &&
- m_pAktPageDesc &&
- m_pAktPageDesc != m_pAktPageDesc->GetFollow() )
+ m_pCurrentPageDesc &&
+ m_pCurrentPageDesc != m_pCurrentPageDesc->GetFollow() )
{
- PrepareNewPageDesc( pSet, *pNd, nullptr, m_pAktPageDesc->GetFollow() );
+ PrepareNewPageDesc( pSet, *pNd, nullptr, m_pCurrentPageDesc->GetFollow() );
bRet = true;
}
@@ -3640,7 +3640,7 @@ void WW8AttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize )
}
else if( m_rWW8Export.m_bOutPageDescs ) // PageDesc : width + height
{
- if( m_rWW8Export.m_pAktPageDesc->GetLandscape() )
+ if( m_rWW8Export.m_pCurrentPageDesc->GetLandscape() )
{
/*sprmSBOrientation*/
m_rWW8Export.InsUInt16( NS_sprm::sprmSBOrientation );
@@ -4467,7 +4467,7 @@ void WW8AttributeOutput::FormatBox( const SvxBoxItem& rBox )
SwTwips WW8Export::CurrentPageWidth(SwTwips &rLeft, SwTwips &rRight) const
{
- const SwFrameFormat* pFormat = m_pAktPageDesc ? &m_pAktPageDesc->GetMaster()
+ const SwFrameFormat* pFormat = m_pCurrentPageDesc ? &m_pCurrentPageDesc->GetMaster()
: &m_pDoc->GetPageDesc(0).GetMaster();
const SvxLRSpaceItem& rLR = pFormat->GetLRSpace();
@@ -4529,7 +4529,7 @@ void AttributeOutputBase::FormatColumns( const SwFormatCol& rCol )
{
// get the page width without borders !!
- const SwFrameFormat* pFormat = GetExport( ).m_pAktPageDesc ? &GetExport( ).m_pAktPageDesc->GetMaster() : &const_cast<const SwDoc *>(GetExport( ).m_pDoc)->GetPageDesc(0).GetMaster();
+ const SwFrameFormat* pFormat = GetExport( ).m_pCurrentPageDesc ? &GetExport( ).m_pCurrentPageDesc->GetMaster() : &const_cast<const SwDoc *>(GetExport( ).m_pDoc)->GetPageDesc(0).GetMaster();
const SvxFrameDirectionItem &frameDirection = pFormat->GetFrameDir();
SwTwips nPageSize;
if ( frameDirection.GetValue() == SvxFrameDirection::Vertical_RL_TB || frameDirection.GetValue() == SvxFrameDirection::Vertical_LR_TB )
More information about the Libreoffice-commits
mailing list