sw/source/filter/ww8/docxattributeoutput.cxx | 114 ++--
sw/source/filter/ww8/docxexport.cxx | 52 -
sw/source/filter/ww8/docxsdrexport.cxx | 16
sw/source/filter/ww8/rtfattributeoutput.cxx | 74 +-
sw/source/filter/ww8/rtfexport.cxx | 122 ++--
sw/source/filter/ww8/rtfsdrexport.cxx | 4
sw/source/filter/ww8/wrtw8esh.cxx | 124 ++--
sw/source/filter/ww8/wrtw8nds.cxx | 178 +++---
sw/source/filter/ww8/wrtw8num.cxx | 74 +-
sw/source/filter/ww8/wrtw8sty.cxx | 116 ++--
sw/source/filter/ww8/wrtww8.cxx | 704 +++++++++++++--------------
sw/source/filter/ww8/wrtww8.hxx | 180 +++---
sw/source/filter/ww8/wrtww8gr.cxx | 44 -
sw/source/filter/ww8/ww8atr.cxx | 398 +++++++--------
14 files changed, 1100 insertions(+), 1100 deletions(-)
New commits:
commit 93f0b14458a618ad575cd446680e5c4aa7d87bdc
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun May 3 10:39:00 2015 +0200
sw: prefix members of MSWordExportBase
Change-Id: If1f677c4b3a4b219b32969db5263f70ff18f0144
Reviewed-on: https://gerrit.libreoffice.org/15602
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2819583..6b91f36 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -282,7 +282,7 @@ void DocxAttributeOutput::StartParagraph(
ww8::WW8TableNodeInfo::Pointer_t pText
// would normally arrive, it would be too late (would be after the
// paragraph start has been written).
bool bEndParaSdt = false;
- SwTxtNode* pTxtNode = m_rExport.pCurPam->GetNode().GetTxtNode();
+ SwTxtNode* pTxtNode = m_rExport.m_pCurPam->GetNode().GetTxtNode();
if (pTxtNode && pTxtNode->GetpSwAttrSet())
{
const SfxItemSet* pSet = pTxtNode->GetpSwAttrSet();
@@ -475,9 +475,9 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
spawned from within the VML & DML block and alter
the contents.
*/
- ww8::WW8TableInfo::Pointer_t pOldTableInfo =
m_rExport.mpTableInfo;
+ ww8::WW8TableInfo::Pointer_t pOldTableInfo =
m_rExport.m_pTableInfo;
//Reset the table infos after saving.
- m_rExport.mpTableInfo = ww8::WW8TableInfo::Pointer_t(new
ww8::WW8TableInfo());
+ m_rExport.m_pTableInfo = ww8::WW8TableInfo::Pointer_t(new
ww8::WW8TableInfo());
/** FDO#71834 :
Save the table reference attributes before calling
WriteDMLTextFrame,
@@ -494,7 +494,7 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
// Reset table infos, otherwise the depth of the cells will be
incorrect,
// in case the text frame had table(s) and we try to export the
// same table second time.
- m_rExport.mpTableInfo = ww8::WW8TableInfo::Pointer_t(new
ww8::WW8TableInfo());
+ m_rExport.m_pTableInfo = ww8::WW8TableInfo::Pointer_t(new
ww8::WW8TableInfo());
//reset the tableReference.
m_pSerializer->startElementNS(XML_mc, XML_Fallback, FSEND);
@@ -502,7 +502,7 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
pushToTableExportContext(aVMLTableExportContext);
m_rExport.SdrExporter().writeVMLTextFrame(&aFrame);
popFromTableExportContext(aVMLTableExportContext);
- m_rExport.mpTableInfo = pOldTableInfo;
+ m_rExport.m_pTableInfo = pOldTableInfo;
m_pSerializer->endElementNS(XML_mc, XML_Fallback);
m_pSerializer->endElementNS(XML_mc, XML_AlternateContent);
@@ -570,15 +570,15 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
// Write framePr
if(!aFramePrTextbox.empty())
{
- ww8::WW8TableInfo::Pointer_t pOldTableInfo = m_rExport.mpTableInfo;
+ ww8::WW8TableInfo::Pointer_t pOldTableInfo = m_rExport.m_pTableInfo;
for (std::vector< boost::shared_ptr<sw::Frame> > ::iterator it =
aFramePrTextbox.begin() ; it != aFramePrTextbox.end(); ++it)
{
- m_rExport.mpTableInfo = ww8::WW8TableInfo::Pointer_t(new
ww8::WW8TableInfo());
+ m_rExport.m_pTableInfo = ww8::WW8TableInfo::Pointer_t(new
ww8::WW8TableInfo());
m_pCurrentFrame = it->get();
m_rExport.SdrExporter().writeOnlyTextOfFrame(it->get());
m_pCurrentFrame = NULL;
}
- m_rExport.mpTableInfo = pOldTableInfo;
+ m_rExport.m_pTableInfo = pOldTableInfo;
aFramePrTextbox.clear();
}
// Check for end of cell, rows, tables here
@@ -1180,7 +1180,7 @@ void DocxAttributeOutput::EndRun()
}
m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
- if(GetExport().bTabInTOC && m_pHyperlinkAttrList)
+ if(GetExport().m_bTabInTOC && m_pHyperlinkAttrList)
{
RunText(OUString("\t")) ;
}
@@ -1624,7 +1624,7 @@ void DocxAttributeOutput::StartRunProperties()
m_pSerializer->startElementNS( XML_w, XML_rPr, FSEND );
- if(GetExport().bHideTabLeaderAndPageNumbers && m_pHyperlinkAttrList )
+ if(GetExport().m_bHideTabLeaderAndPageNumbers && m_pHyperlinkAttrList )
{
m_pSerializer->singleElementNS( XML_w, XML_webHidden, FSEND );
}
@@ -2166,7 +2166,7 @@ void DocxAttributeOutput::StartRuby( const SwTxtNode&
rNode, sal_Int32 nPos, con
aAttrIt.OutAttr( nPos, true );
sal_uInt16 nStyle = m_rExport.GetId( rRuby.GetTxtRuby()->GetCharFmt() );
- OString aStyleId(m_rExport.pStyles->GetStyleId(nStyle));
+ OString aStyleId(m_rExport.m_pStyles->GetStyleId(nStyle));
m_pSerializer->singleElementNS( XML_w, XML_rStyle,
FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
@@ -2346,7 +2346,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
pRedlineData)
std::unique_ptr<sax_fastparser::FastAttributeList>
pCharLangAttrList_Original(m_pCharLangAttrList.release());
// Output the redline item set
- m_rExport.OutputItemSet( *pChangesSet, false, true,
i18n::ScriptType::LATIN, m_rExport.mbExportModeRTF );
+ m_rExport.OutputItemSet( *pChangesSet, false, true,
i18n::ScriptType::LATIN, m_rExport.m_bExportModeRTF );
// Write the collected run properties that are stored in
'm_pFontsAttrList', 'm_pEastAsianLayoutAttrList', 'm_pCharLangAttrList'
WriteCollectedRunProperties();
@@ -2398,7 +2398,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
pRedlineData)
std::unique_ptr<sax_fastparser::FastAttributeList>
pParagraphSpacingAttrList_Original(m_pParagraphSpacingAttrList.release());
// Output the redline item set
- m_rExport.OutputItemSet( *pChangesSet, true, false,
i18n::ScriptType::LATIN, m_rExport.mbExportModeRTF );
+ m_rExport.OutputItemSet( *pChangesSet, true, false,
i18n::ScriptType::LATIN, m_rExport.m_bExportModeRTF );
// Write the collected paragraph properties that are
stored in 'm_rExport.SdrExporter().getFlyAttrList()',
'm_pParagraphSpacingAttrList'
WriteCollectedParagraphProperties();
@@ -2494,7 +2494,7 @@ void DocxAttributeOutput::FormatDrop( const SwTxtNode&
/*rNode*/, const SwFmtDro
void DocxAttributeOutput::ParagraphStyle( sal_uInt16 nStyle )
{
- OString aStyleId(m_rExport.pStyles->GetStyleId(nStyle));
+ OString aStyleId(m_rExport.m_pStyles->GetStyleId(nStyle));
m_pSerializer->singleElementNS( XML_w, XML_pStyle, FSNS( XML_w, XML_val ),
aStyleId.getStr(), FSEND );
}
@@ -3443,7 +3443,7 @@ void DocxAttributeOutput::TableRowRedline(
ww8::WW8TableNodeInfoInner::Pointer_t
const SwTableLine * pTabLine = pTabBox->GetUpper();
// search next Redline
- const SwExtraRedlineTbl& aExtraRedlineTbl =
m_rExport.pDoc->getIDocumentRedlineAccess().GetExtraRedlineTbl();
+ const SwExtraRedlineTbl& aExtraRedlineTbl =
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetExtraRedlineTbl();
for(sal_uInt16 nCurRedlinePos = 0; nCurRedlinePos <
aExtraRedlineTbl.GetSize(); ++nCurRedlinePos )
{
SwExtraRedline* pExtraRedline =
aExtraRedlineTbl.GetRedline(nCurRedlinePos);
@@ -3489,7 +3489,7 @@ void DocxAttributeOutput::TableCellRedline(
ww8::WW8TableNodeInfoInner::Pointer_
const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
// search next Redline
- const SwExtraRedlineTbl& aExtraRedlineTbl =
m_rExport.pDoc->getIDocumentRedlineAccess().GetExtraRedlineTbl();
+ const SwExtraRedlineTbl& aExtraRedlineTbl =
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetExtraRedlineTbl();
for(sal_uInt16 nCurRedlinePos = 0; nCurRedlinePos <
aExtraRedlineTbl.GetSize(); ++nCurRedlinePos )
{
SwExtraRedline* pExtraRedline =
aExtraRedlineTbl.GetRedline(nCurRedlinePos);
@@ -3716,7 +3716,7 @@ DocxStringTokenMap const aExceptionTokens[] = {
void DocxAttributeOutput::LatentStyles()
{
// Do we have latent styles available?
- uno::Reference<beans::XPropertySet>
xPropertySet(m_rExport.pDoc->GetDocShell()->GetBaseModel(),
uno::UNO_QUERY_THROW);
+ uno::Reference<beans::XPropertySet>
xPropertySet(m_rExport.m_pDoc->GetDocShell()->GetBaseModel(),
uno::UNO_QUERY_THROW);
uno::Sequence<beans::PropertyValue> aInteropGrabBag;
xPropertySet->getPropertyValue("InteropGrabBag") >>= aInteropGrabBag;
uno::Sequence<beans::PropertyValue> aLatentStyles;
@@ -3804,7 +3804,7 @@ void DocxAttributeOutput::OutputDefaultItem(const
SfxPoolItem& rHt)
bMustWrite = true;
break;
case RES_CHRATR_FONTSIZE:
- bMustWrite = lcl_isDefaultFontSize(static_cast< const
SvxFontHeightItem& >(rHt), m_rExport.pDoc);
+ bMustWrite = lcl_isDefaultFontSize(static_cast< const
SvxFontHeightItem& >(rHt), m_rExport.m_pDoc);
break;
case RES_CHRATR_KERNING:
bMustWrite = static_cast< const SvxKerningItem& >(rHt).GetValue()
!= 0;
@@ -3968,7 +3968,7 @@ void DocxAttributeOutput::DocDefaults( )
StartStyleProperties(false, 0);
for (int i = int(RES_CHRATR_BEGIN); i < int(RES_CHRATR_END); ++i)
- OutputDefaultItem(m_rExport.pDoc->GetDefault(i));
+ OutputDefaultItem(m_rExport.m_pDoc->GetDefault(i));
EndStyleProperties(false);
@@ -3980,7 +3980,7 @@ void DocxAttributeOutput::DocDefaults( )
StartStyleProperties(true, 0);
for (int i = int(RES_PARATR_BEGIN); i < int(RES_PARATR_END); ++i)
- OutputDefaultItem(m_rExport.pDoc->GetDefault(i));
+ OutputDefaultItem(m_rExport.m_pDoc->GetDefault(i));
EndStyleProperties(true);
@@ -4579,7 +4579,7 @@ void DocxAttributeOutput::WritePostponedOLE()
void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const
SwFlyFrmFmt* rFlyFrmFmt )
{
// get interoperability information about embedded objects
- uno::Reference< beans::XPropertySet > xPropSet(
m_rExport.pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
+ uno::Reference< beans::XPropertySet > xPropSet(
m_rExport.m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
uno::Sequence< beans::PropertyValue > aGrabBag,
aObjectsInteropList,aObjectInteropAttributes;
xPropSet->getPropertyValue( pName ) >>= aGrabBag;
@@ -4994,7 +4994,7 @@ void DocxAttributeOutput::WriteOutliner(const
OutlinerParaObject& rParaObj)
// Write paragraph properties.
StartParagraphProperties();
aAttrIter.OutParaAttr(false);
- SfxItemSet aParagraphMarkerProperties(m_rExport.pDoc->GetAttrPool());
+ SfxItemSet aParagraphMarkerProperties(m_rExport.m_pDoc->GetAttrPool());
EndParagraphProperties(aParagraphMarkerProperties, 0, 0, 0);
do {
@@ -5031,8 +5031,8 @@ void DocxAttributeOutput::WriteOutliner(const
OutlinerParaObject& rParaObj)
void DocxAttributeOutput::pushToTableExportContext(DocxTableExportContext&
rContext)
{
- rContext.m_pTableInfo = m_rExport.mpTableInfo;
- m_rExport.mpTableInfo = ww8::WW8TableInfo::Pointer_t(new
ww8::WW8TableInfo());
+ rContext.m_pTableInfo = m_rExport.m_pTableInfo;
+ m_rExport.m_pTableInfo = ww8::WW8TableInfo::Pointer_t(new
ww8::WW8TableInfo());
rContext.m_bTableCellOpen = m_tableReference->m_bTableCellOpen;
m_tableReference->m_bTableCellOpen = false;
@@ -5043,7 +5043,7 @@ void
DocxAttributeOutput::pushToTableExportContext(DocxTableExportContext& rCont
void DocxAttributeOutput::popFromTableExportContext(DocxTableExportContext&
rContext)
{
- m_rExport.mpTableInfo = rContext.m_pTableInfo;
+ m_rExport.m_pTableInfo = rContext.m_pTableInfo;
m_tableReference->m_bTableCellOpen = rContext.m_bTableCellOpen;
m_tableReference->m_nTableDepth = rContext.m_nTableDepth;
}
@@ -5137,12 +5137,12 @@ void DocxAttributeOutput::StartStyle( const OUString&
rName, StyleType eType,
uno::Any aAny;
if (eType == STYLE_TYPE_PARA || eType == STYLE_TYPE_CHAR)
{
- const SwFmt* pFmt = m_rExport.pStyles->GetSwFmt(nId);
+ const SwFmt* pFmt = m_rExport.m_pStyles->GetSwFmt(nId);
pFmt->GetGrabBagItem(aAny);
}
else
{
- const SwNumRule* pRule = m_rExport.pStyles->GetSwNumRule(nId);
+ const SwNumRule* pRule = m_rExport.m_pStyles->GetSwNumRule(nId);
pRule->GetGrabBagItem(aAny);
}
const uno::Sequence<beans::PropertyValue>& rGrabBag = aAny.get<
uno::Sequence<beans::PropertyValue> >();
@@ -5179,7 +5179,7 @@ void DocxAttributeOutput::StartStyle( const OUString&
rName, StyleType eType,
case STYLE_TYPE_LIST: pType = "numbering"; break;
}
pStyleAttributeList->add(FSNS( XML_w, XML_type ), pType);
- pStyleAttributeList->add(FSNS( XML_w, XML_styleId ),
m_rExport.pStyles->GetStyleId(nId).getStr());
+ pStyleAttributeList->add(FSNS( XML_w, XML_styleId ),
m_rExport.m_pStyles->GetStyleId(nId).getStr());
if (bDefault)
pStyleAttributeList->add(FSNS(XML_w, XML_default), "1");
if (bCustomStyle)
@@ -5194,14 +5194,14 @@ void DocxAttributeOutput::StartStyle( const OUString&
rName, StyleType eType,
if ( nBase != 0x0FFF && eType != STYLE_TYPE_LIST)
{
m_pSerializer->singleElementNS( XML_w, XML_basedOn,
- FSNS( XML_w, XML_val ),
m_rExport.pStyles->GetStyleId(nBase).getStr(),
+ FSNS( XML_w, XML_val ),
m_rExport.m_pStyles->GetStyleId(nBase).getStr(),
FSEND );
}
if ( nNext != nId && eType != STYLE_TYPE_LIST)
{
m_pSerializer->singleElementNS( XML_w, XML_next,
- FSNS( XML_w, XML_val ),
m_rExport.pStyles->GetStyleId(nNext).getStr(),
+ FSNS( XML_w, XML_val ),
m_rExport.m_pStyles->GetStyleId(nNext).getStr(),
FSEND );
}
@@ -5704,7 +5704,7 @@ void DocxAttributeOutput::FontPitchType( FontPitch ePitch
) const
void DocxAttributeOutput::EmbedFont( const OUString& name, FontFamily family,
FontPitch pitch, rtl_TextEncoding encoding )
{
- if( !m_rExport.pDoc->getIDocumentSettingAccess().get(
DocumentSettingId::EMBED_FONTS ))
+ if( !m_rExport.m_pDoc->getIDocumentSettingAccess().get(
DocumentSettingId::EMBED_FONTS ))
return; // no font embedding with this document
EmbedFontStyle( name, XML_embedRegular, family, ITALIC_NONE,
WEIGHT_NORMAL, pitch, encoding );
EmbedFontStyle( name, XML_embedBold, family, ITALIC_NONE, WEIGHT_BOLD,
pitch, encoding );
@@ -6007,7 +6007,7 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8
nLevel,
FSNS( XML_w, XML_hint ), "default",
FSEND );
}
- m_rExport.OutputItemSet( *pOutSet, false, true,
i18n::ScriptType::LATIN, m_rExport.mbExportModeRTF );
+ m_rExport.OutputItemSet( *pOutSet, false, true,
i18n::ScriptType::LATIN, m_rExport.m_bExportModeRTF );
WriteCollectedRunProperties();
@@ -6108,7 +6108,7 @@ void DocxAttributeOutput::CharEscapement( const
SvxEscapementItem& rEscapement )
m_pSerializer->singleElementNS( XML_w, XML_position,
FSNS( XML_w, XML_val ), sPos.getStr( ), FSEND );
- if( ( 100 != nProp || sIss.match( OString( "baseline" ) ) ) &&
!m_rExport.mbFontSizeWritten )
+ if( ( 100 != nProp || sIss.match( OString( "baseline" ) ) ) &&
!m_rExport.m_bFontSizeWritten )
{
OString sSize = OString::number( ( nHeight * nProp + 500 ) / 1000
);
m_pSerializer->singleElementNS( XML_w, XML_sz,
@@ -6445,14 +6445,14 @@ void DocxAttributeOutput::TextINetFormat( const
SwFmtINetFmt& rLink )
const SwTxtINetFmt* pINetFmt = rLink.GetTxtINetFmt();
const SwCharFmt* pCharFmt = pINetFmt->GetCharFmt();
- OString aStyleId(m_rExport.pStyles->GetStyleId(m_rExport.GetId(pCharFmt)));
+ OString
aStyleId(m_rExport.m_pStyles->GetStyleId(m_rExport.GetId(pCharFmt)));
m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ),
aStyleId.getStr(), FSEND );
}
void DocxAttributeOutput::TextCharFormat( const SwFmtCharFmt& rCharFmt )
{
- OString
aStyleId(m_rExport.pStyles->GetStyleId(m_rExport.GetId(rCharFmt.GetCharFmt())));
+ OString
aStyleId(m_rExport.m_pStyles->GetStyleId(m_rExport.GetId(rCharFmt.GetCharFmt())));
m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ),
aStyleId.getStr(), FSEND );
}
@@ -6658,12 +6658,12 @@ void DocxAttributeOutput::WriteAnnotationMarks_Impl(
std::vector< OUString >& rS
void DocxAttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFootnote )
{
const SwEndNoteInfo& rInfo = rFootnote.IsEndNote()?
- m_rExport.pDoc->GetEndNoteInfo(): m_rExport.pDoc->GetFtnInfo();
+ m_rExport.m_pDoc->GetEndNoteInfo(): m_rExport.m_pDoc->GetFtnInfo();
// footnote/endnote run properties
- const SwCharFmt* pCharFmt = rInfo.GetAnchorCharFmt( *m_rExport.pDoc );
+ const SwCharFmt* pCharFmt = rInfo.GetAnchorCharFmt( *m_rExport.m_pDoc );
- OString aStyleId(m_rExport.pStyles->GetStyleId(m_rExport.GetId(pCharFmt)));
+ OString
aStyleId(m_rExport.m_pStyles->GetStyleId(m_rExport.GetId(pCharFmt)));
m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ),
aStyleId.getStr(), FSEND );
@@ -6733,7 +6733,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool
bFootnotes )
bool bSeparator = true;
if (bFootnotes)
{
- const SwPageFtnInfo& rFtnInfo =
m_rExport.pDoc->GetPageDesc(0).GetFtnInfo();
+ const SwPageFtnInfo& rFtnInfo =
m_rExport.m_pDoc->GetPageDesc(0).GetFtnInfo();
// Request a separator only in case the width is larger than zero.
bSeparator = double(rFtnInfo.GetWidth()) > 0;
}
@@ -6831,9 +6831,9 @@ void DocxAttributeOutput::WriteFootnoteEndnotePr(
::sax_fastparser::FSHelperPtr
void DocxAttributeOutput::SectFootnoteEndnotePr()
{
if( HasFootnotes())
- WriteFootnoteEndnotePr( m_pSerializer, XML_footnotePr,
m_rExport.pDoc->GetFtnInfo(), 0 );
+ WriteFootnoteEndnotePr( m_pSerializer, XML_footnotePr,
m_rExport.m_pDoc->GetFtnInfo(), 0 );
if( HasEndnotes())
- WriteFootnoteEndnotePr( m_pSerializer, XML_endnotePr,
m_rExport.pDoc->GetEndNoteInfo(), 0 );
+ WriteFootnoteEndnotePr( m_pSerializer, XML_endnotePr,
m_rExport.m_pDoc->GetEndNoteInfo(), 0 );
}
void DocxAttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti )
@@ -7090,7 +7090,7 @@ void DocxAttributeOutput::FormatFrameSize( const
SwFmtFrmSize& rSize )
else if (m_rExport.SdrExporter().getDMLTextFrameSyntax())
{
}
- else if ( m_rExport.bOutFlyFrmAttrs )
+ else if ( m_rExport.m_bOutFlyFrmAttrs )
{
if ( rSize.GetWidth() && rSize.GetWidthSizeType() == ATT_FIX_SIZE )
AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(),
@@ -7106,10 +7106,10 @@ void DocxAttributeOutput::FormatFrameSize( const
SwFmtFrmSize& rSize )
FSNS( XML_w, XML_h ), OString::number( rSize.GetHeight( )
).getStr() );
}
}
- else if ( m_rExport.bOutPageDescs )
+ else if ( m_rExport.m_bOutPageDescs )
{
FastAttributeList *attrList = FastSerializerHelper::createAttrList( );
- if ( m_rExport.pAktPageDesc->GetLandscape( ) )
+ if ( m_rExport.m_pAktPageDesc->GetLandscape( ) )
attrList->add( FSNS( XML_w, XML_orient ), "landscape" );
attrList->add( FSNS( XML_w, XML_w ), OString::number( rSize.GetWidth(
) ) );
@@ -7139,13 +7139,13 @@ void DocxAttributeOutput::FormatLRSpace( const
SvxLRSpaceItem& rLRSpace )
else if (m_rExport.SdrExporter().getDMLTextFrameSyntax())
{
}
- else if ( m_rExport.bOutFlyFrmAttrs )
+ else if ( m_rExport.m_bOutFlyFrmAttrs )
{
AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(), FSNS( XML_w,
XML_hSpace ),
OString::number(
( rLRSpace.GetLeft() + rLRSpace.GetRight() ) / 2
).getStr() );
}
- else if ( m_rExport.bOutPageDescs )
+ else if ( m_rExport.m_bOutPageDescs )
{
m_pageMargins.nPageMarginLeft = 0;
m_pageMargins.nPageMarginRight = 0;
@@ -7197,13 +7197,13 @@ void DocxAttributeOutput::FormatULSpace( const
SvxULSpaceItem& rULSpace )
else if (m_rExport.SdrExporter().getDMLTextFrameSyntax())
{
}
- else if ( m_rExport.bOutFlyFrmAttrs )
+ else if ( m_rExport.m_bOutFlyFrmAttrs )
{
AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(), FSNS( XML_w,
XML_vSpace ),
OString::number(
( rULSpace.GetLower() + rULSpace.GetUpper() ) / 2
).getStr() );
}
- else if (m_rExport.bOutPageDescs )
+ else if (m_rExport.m_bOutPageDescs )
{
OSL_ENSURE( m_rExport.GetCurItemSet(), "Impossible" );
if ( !m_rExport.GetCurItemSet() )
@@ -7324,7 +7324,7 @@ void DocxAttributeOutput::FormatSurround( const
SwFmtSurround& rSurround )
else if (m_rExport.SdrExporter().getDMLTextFrameSyntax())
{
}
- else if ( m_rExport.bOutFlyFrmAttrs )
+ else if ( m_rExport.m_bOutFlyFrmAttrs )
{
OString sWrap( "auto" );
switch ( rSurround.GetSurround( ) )
@@ -7403,7 +7403,7 @@ void DocxAttributeOutput::FormatVertOrientation( const
SwFmtVertOrient& rFlyVert
else if (m_rExport.SdrExporter().getDMLTextFrameSyntax())
{
}
- else if ( m_rExport.bOutFlyFrmAttrs )
+ else if ( m_rExport.m_bOutFlyFrmAttrs )
{
if ( !sAlign.isEmpty() )
AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(), FSNS(
XML_w, XML_yAlign ), sAlign.getStr() );
@@ -7463,7 +7463,7 @@ void DocxAttributeOutput::FormatHorizOrientation( const
SwFmtHoriOrient& rFlyHor
else if (m_rExport.SdrExporter().getDMLTextFrameSyntax())
{
}
- else if ( m_rExport.bOutFlyFrmAttrs )
+ else if ( m_rExport.m_bOutFlyFrmAttrs )
{
if ( !sAlign.isEmpty() )
AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(), FSNS(
XML_w, XML_xAlign ), sAlign.getStr() );
@@ -7542,7 +7542,7 @@ void DocxAttributeOutput::FormatBackground( const
SvxBrushItem& rBrush )
m_pSerializer->endElementNS(XML_a, XML_solidFill);
}
}
- else if ( !m_rExport.bOutPageDescs )
+ else if ( !m_rExport.m_bOutPageDescs )
{
// compare fill color with the original fill color
OString sOriginalFill = OUStringToOString(
@@ -7624,7 +7624,7 @@ void DocxAttributeOutput::FormatFillGradient( const
XFillGradientItem& rFillGrad
else if (m_oFillStyle && *m_oFillStyle == drawing::FillStyle_GRADIENT &&
m_rExport.SdrExporter().getDMLTextFrameSyntax())
{
SwFrmFmt & rFormat(
- const_cast<SwFrmFmt&>(m_rExport.mpParentFrame->GetFrmFmt()));
+ const_cast<SwFrmFmt&>(m_rExport.m_pParentFrame->GetFrmFmt()));
uno::Reference<beans::XPropertySet> const xPropertySet(
SwXTextFrame::CreateXTextFrame(*rFormat.GetDoc(), &rFormat),
uno::UNO_QUERY);
@@ -7646,7 +7646,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem&
rBox )
FormatFillStyle(*pFillStyle);
if (m_oFillStyle && *m_oFillStyle == drawing::FillStyle_BITMAP)
{
- const SdrObject* pSdrObj =
m_rExport.mpParentFrame->GetFrmFmt().FindRealSdrObject();
+ const SdrObject* pSdrObj =
m_rExport.m_pParentFrame->GetFrmFmt().FindRealSdrObject();
if (pSdrObj)
{
uno::Reference< drawing::XShape > xShape(
const_cast<SdrObject*>(pSdrObj)->getUnoShape(), uno::UNO_QUERY );
@@ -7897,7 +7897,7 @@ void DocxAttributeOutput::FormatFrameDirection( const
SvxFrameDirectionItem& rDi
break;
}
- if ( m_rExport.bOutPageDescs )
+ if ( m_rExport.m_bOutPageDescs )
{
m_pSerializer->singleElementNS( XML_w, XML_textDirection,
FSNS( XML_w, XML_val ), sTextFlow.getStr( ),
@@ -7905,7 +7905,7 @@ void DocxAttributeOutput::FormatFrameDirection( const
SvxFrameDirectionItem& rDi
if ( bBiDi )
m_pSerializer->singleElementNS( XML_w, XML_bidi, FSEND );
}
- else if ( !m_rExport.bOutFlyFrmAttrs )
+ else if ( !m_rExport.m_bOutFlyFrmAttrs )
{
if ( bBiDi )
m_pSerializer->singleElementNS( XML_w, XML_bidi, FSNS( XML_w,
XML_val ), "1", FSEND );
@@ -8332,7 +8332,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
&rExport, FSHelperPtr pSeri
m_tableReference(new TableReference()),
m_bIgnoreNextFill(false),
m_bBtLr(false),
- m_pTableStyleExport(new DocxTableStyleExport(rExport.pDoc, pSerializer)),
+ m_pTableStyleExport(new DocxTableStyleExport(rExport.m_pDoc,
pSerializer)),
m_bParaBeforeAutoSpacing(false),
m_bParaAfterAutoSpacing(false),
m_nParaBeforeSpacing(0),
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index cb48a7f..f22cb91 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -421,7 +421,7 @@ void DocxExport::OutputDML(uno::Reference<drawing::XShape>&
xShape)
void DocxExport::ExportDocument_Impl()
{
// Set the 'Track Revisions' flag in the settings structure
- m_aSettings.trackRevisions = 0 != ( nsRedlineMode_t::REDLINE_ON &
mnOrigRedlineMode );
+ m_aSettings.trackRevisions = 0 != ( nsRedlineMode_t::REDLINE_ON &
m_nOrigRedlineMode );
InitStyles();
@@ -453,7 +453,7 @@ void DocxExport::ExportDocument_Impl()
WriteEmbeddings();
- delete pStyles, pStyles = NULL;
+ delete m_pStyles, m_pStyles = NULL;
delete m_pSections, m_pSections = NULL;
}
@@ -467,14 +467,14 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode
)
{
MSWordExportBase::OutputEndNode( rEndNode );
- if ( TXT_MAINTEXT == nTxtTyp &&
rEndNode.StartOfSectionNode()->IsSectionNode() )
+ if ( TXT_MAINTEXT == m_nTxtTyp &&
rEndNode.StartOfSectionNode()->IsSectionNode() )
{
// this originally comes from WW8Export::WriteText(), and looks like it
// could have some code common with SectionNode()...
const SwSection& rSect =
rEndNode.StartOfSectionNode()->GetSectionNode()->GetSection();
- if ( bStartTOX && TOX_CONTENT_SECTION == rSect.GetType() )
- bStartTOX = false;
+ if ( m_bStartTOX && TOX_CONTENT_SECTION == rSect.GetType() )
+ m_bStartTOX = false;
SwNodeIndex aIdx( rEndNode, 1 );
const SwNode& rNd = aIdx.GetNode();
@@ -495,7 +495,7 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode )
nRstLnNum = 0;
AttrOutput().SectionBreak( msword::PageBreak,
m_pSections->CurrentSectionInfo( ) );
- m_pSections->AppendSection( pAktPageDesc, pParentFmt, nRstLnNum );
+ m_pSections->AppendSection( m_pAktPageDesc, pParentFmt, nRstLnNum
);
}
}
}
@@ -548,7 +548,7 @@ void DocxExport::PrepareNewPageDesc( const SfxItemSet* pSet,
void DocxExport::InitStyles()
{
- pStyles = new MSWordStyles( *this, /*bListStyles =*/ true );
+ m_pStyles = new MSWordStyles( *this, /*bListStyles =*/ true );
// setup word/styles.xml and the relations + content type
m_pFilter->addRelation( m_pDocumentFS->getOutputStream(),
@@ -563,7 +563,7 @@ void DocxExport::InitStyles()
m_pAttrOutput->SetSerializer( pStylesFS );
// do the work
- pStyles->OutputStylesTable();
+ m_pStyles->OutputStylesTable();
// switch the serializer back
m_pAttrOutput->SetSerializer( m_pDocumentFS );
@@ -636,7 +636,7 @@ void DocxExport::WritePostitFields()
void DocxExport::WriteNumbering()
{
- if ( !pUsedNumTbl )
+ if ( !m_pUsedNumTbl )
return; // no numbering is used
m_pFilter->addRelation( m_pDocumentFS->getOutputStream(),
@@ -765,7 +765,7 @@ void DocxExport::WriteFonts()
m_pAttrOutput->SetSerializer( pFS );
// do the work
- maFontHelper.WriteFontTable( *m_pAttrOutput );
+ m_aFontHelper.WriteFontTable( *m_pAttrOutput );
// switch the serializer back
m_pAttrOutput->SetSerializer( m_pDocumentFS );
@@ -776,7 +776,7 @@ void DocxExport::WriteFonts()
void DocxExport::WriteProperties( )
{
// Write the core properties
- SwDocShell* pDocShell( pDoc->GetDocShell( ) );
+ SwDocShell* pDocShell( m_pDoc->GetDocShell( ) );
uno::Reference<document::XDocumentProperties> xDocProps;
if ( pDocShell )
{
@@ -790,7 +790,7 @@ void DocxExport::WriteProperties( )
void DocxExport::WriteSettings()
{
- SwViewShell
*pViewShell(pDoc->getIDocumentLayoutAccess().GetCurrentViewShell());
+ SwViewShell
*pViewShell(m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell());
if( !pViewShell && !m_aSettings.hasData() &&
!m_pAttrOutput->HasFootnotes() && !m_pAttrOutput->HasEndnotes())
return;
@@ -829,11 +829,11 @@ void DocxExport::WriteSettings()
pFS->singleElementNS( XML_w, XML_mirrorMargins, FSEND );
// Embed Fonts
- if( pDoc->getIDocumentSettingAccess().get( DocumentSettingId::EMBED_FONTS
))
+ if( m_pDoc->getIDocumentSettingAccess().get(
DocumentSettingId::EMBED_FONTS ))
pFS->singleElementNS( XML_w, XML_embedTrueTypeFonts, FSEND );
// Embed System Fonts
- if( pDoc->getIDocumentSettingAccess().get(
DocumentSettingId::EMBED_SYSTEM_FONTS ))
+ if( m_pDoc->getIDocumentSettingAccess().get(
DocumentSettingId::EMBED_SYSTEM_FONTS ))
pFS->singleElementNS( XML_w, XML_embedSystemFonts, FSEND );
// Default Tab Stop
@@ -843,7 +843,7 @@ void DocxExport::WriteSettings()
// Automatic hyphenation: it's a global setting in Word, it's a paragraph
setting in Writer.
// Use the setting from the default style.
- SwTxtFmtColl* pColl =
pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD,
/*bRegardLanguage=*/false);
+ SwTxtFmtColl* pColl =
m_pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD,
/*bRegardLanguage=*/false);
const SfxPoolItem* pItem;
if (pColl && SfxItemState::SET ==
pColl->GetItemState(RES_PARATR_HYPHENZONE, false, &pItem))
{
@@ -858,14 +858,14 @@ void DocxExport::WriteSettings()
// Has Footnotes
if( m_pAttrOutput->HasFootnotes())
- m_pAttrOutput->WriteFootnoteEndnotePr( pFS, XML_footnotePr,
pDoc->GetFtnInfo(), XML_footnote );
+ m_pAttrOutput->WriteFootnoteEndnotePr( pFS, XML_footnotePr,
m_pDoc->GetFtnInfo(), XML_footnote );
// Has Endnotes
if( m_pAttrOutput->HasEndnotes())
- m_pAttrOutput->WriteFootnoteEndnotePr( pFS, XML_endnotePr,
pDoc->GetEndNoteInfo(), XML_endnote );
+ m_pAttrOutput->WriteFootnoteEndnotePr( pFS, XML_endnotePr,
m_pDoc->GetEndNoteInfo(), XML_endnote );
// Has themeFontLang information
- uno::Reference< beans::XPropertySet > xPropSet(
pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
+ uno::Reference< beans::XPropertySet > xPropSet(
m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
@@ -944,7 +944,7 @@ void DocxExport::WriteSettings()
void DocxExport::WriteTheme()
{
- uno::Reference< beans::XPropertySet > xPropSet(
pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
+ uno::Reference< beans::XPropertySet > xPropSet(
m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
@@ -982,7 +982,7 @@ void DocxExport::WriteTheme()
void DocxExport::WriteGlossary()
{
- uno::Reference< beans::XPropertySet > xPropSet(
pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
+ uno::Reference< beans::XPropertySet > xPropSet(
m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
@@ -1053,7 +1053,7 @@ void DocxExport::WriteGlossary()
void DocxExport::WriteCustomXml()
{
- uno::Reference< beans::XPropertySet > xPropSet(
pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
+ uno::Reference< beans::XPropertySet > xPropSet(
m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
@@ -1124,7 +1124,7 @@ void DocxExport::WriteCustomXml()
void DocxExport::WriteActiveX()
{
- uno::Reference< beans::XPropertySet > xPropSet(
pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
+ uno::Reference< beans::XPropertySet > xPropSet(
m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
@@ -1218,7 +1218,7 @@ void DocxExport::WriteActiveX()
void DocxExport::WriteEmbeddings()
{
- uno::Reference< beans::XPropertySet > xPropSet(
pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
+ uno::Reference< beans::XPropertySet > xPropSet(
m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
@@ -1286,7 +1286,7 @@ void DocxExport::WriteEmbeddings()
bool DocxExport::isMirroredMargin()
{
bool bMirroredMargins = false;
- if ( nsUseOnPage::PD_MIRROR == (nsUseOnPage::PD_MIRROR &
pDoc->GetPageDesc(0).ReadUseOn()) )
+ if ( nsUseOnPage::PD_MIRROR == (nsUseOnPage::PD_MIRROR &
m_pDoc->GetPageDesc(0).ReadUseOn()) )
{
bMirroredMargins = true;
}
@@ -1296,7 +1296,7 @@ bool DocxExport::isMirroredMargin()
boost::optional<SvxBrushItem> DocxExport::getBackground()
{
boost::optional<SvxBrushItem> oRet;
- const SwFrmFmt &rFmt = pDoc->GetPageDesc(0).GetMaster();
+ const SwFrmFmt &rFmt = m_pDoc->GetPageDesc(0).GetMaster();
SvxBrushItem aBrush(RES_BACKGROUND);
SfxItemState eState = rFmt.GetBackgroundState(aBrush);
@@ -1326,7 +1326,7 @@ void DocxExport::WriteMainText()
// body
m_pDocumentFS->startElementNS( XML_w, XML_body, FSEND );
- pCurPam->GetPoint()->nNode =
pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex();
+ m_pCurPam->GetPoint()->nNode =
m_pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex();
// the text
WriteText();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 69b6ed4..6427f01 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -114,7 +114,7 @@ ExportDataSaveRestore::ExportDataSaveRestore(DocxExport&
rExport, sal_uLong nStt
: m_rExport(rExport)
{
m_rExport.SaveData(nStt, nEnd);
- m_rExport.mpParentFrame = pParentFrame;
+ m_rExport.m_pParentFrame = pParentFrame;
}
ExportDataSaveRestore::~ExportDataSaveRestore()
@@ -170,7 +170,7 @@ struct DocxSdrExport::Impl
m_nId(0),
m_nSeq(0),
m_bDMLAndVMLDrawingOpen(false),
- m_aTextBoxes(SwTextBoxHelper::findTextBoxes(m_rExport.pDoc)),
+ m_aTextBoxes(SwTextBoxHelper::findTextBoxes(m_rExport.m_pDoc)),
m_nDMLandVMLTextFrameRotation(0)
{
}
@@ -748,7 +748,7 @@ void DocxSdrExport::writeVMLDrawing(const SdrObject*
sdrObj, const SwFrmFmt& rFr
bool bSwapInPage = false;
if (!(sdrObj)->GetPage())
{
- if (SdrModel* pModel =
m_pImpl->m_rExport.pDoc->getIDocumentDrawModelAccess().GetDrawModel())
+ if (SdrModel* pModel =
m_pImpl->m_rExport.m_pDoc->getIDocumentDrawModelAccess().GetDrawModel())
{
if (SdrPage* pPage = pModel->GetPage(0))
{
@@ -1296,7 +1296,7 @@ void DocxSdrExport::writeOnlyTextOfFrame(sw::Frame*
pParentFrame)
ExportDataSaveRestore aDataGuard(m_pImpl->m_rExport, nStt, nEnd,
pParentFrame);
m_pImpl->m_pBodyPrAttrList =
sax_fastparser::FastSerializerHelper::createAttrList();
- m_pImpl->m_bFrameBtLr =
m_pImpl->checkFrameBtlr(m_pImpl->m_rExport.pDoc->GetNodes()[nStt],
/*bDML=*/true);
+ m_pImpl->m_bFrameBtLr =
m_pImpl->checkFrameBtlr(m_pImpl->m_rExport.m_pDoc->GetNodes()[nStt],
/*bDML=*/true);
m_pImpl->m_bFlyFrameGraphic = true;
m_pImpl->m_rExport.WriteText();
m_pImpl->m_bFlyFrameGraphic = false;
@@ -1476,7 +1476,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame*
pParentFrame, int nAnchorId, bo
pFS->endElementNS(XML_wps, XML_spPr);
}
- m_pImpl->m_rExport.mpParentFrame = NULL;
+ m_pImpl->m_rExport.m_pParentFrame = NULL;
bool skipTxBxContent = false ;
bool isTxbxLinked = false ;
@@ -1530,7 +1530,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame*
pParentFrame, int nAnchorId, bo
pFS->startElementNS(XML_w, XML_txbxContent, FSEND);
- m_pImpl->m_bFrameBtLr =
m_pImpl->checkFrameBtlr(m_pImpl->m_rExport.pDoc->GetNodes()[nStt],
/*bDML=*/true);
+ m_pImpl->m_bFrameBtLr =
m_pImpl->checkFrameBtlr(m_pImpl->m_rExport.m_pDoc->GetNodes()[nStt],
/*bDML=*/true);
m_pImpl->m_bFlyFrameGraphic = true;
m_pImpl->m_rExport.WriteText();
if (m_pImpl->m_bParagraphSdtOpen)
@@ -1625,11 +1625,11 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame*
pParentFrame, bool bTextBoxOnly
m_pImpl->m_pFlyAttrList->addNS(XML_w14, XML_anchorId,
OUStringToOString(sAnchorId, RTL_TEXTENCODING_UTF8));
}
sax_fastparser::XFastAttributeListRef
xFlyAttrList(m_pImpl->m_pFlyAttrList.release());
- m_pImpl->m_bFrameBtLr =
m_pImpl->checkFrameBtlr(m_pImpl->m_rExport.pDoc->GetNodes()[nStt],
/*bDML=*/false);
+ m_pImpl->m_bFrameBtLr =
m_pImpl->checkFrameBtlr(m_pImpl->m_rExport.m_pDoc->GetNodes()[nStt],
/*bDML=*/false);
sax_fastparser::XFastAttributeListRef
xTextboxAttrList(m_pImpl->m_pTextboxAttrList.release());
m_pImpl->m_bTextFrameSyntax = false;
m_pImpl->m_pFlyFrameSize = 0;
- m_pImpl->m_rExport.mpParentFrame = NULL;
+ m_pImpl->m_rExport.m_pParentFrame = NULL;
if (!bTextBoxOnly)
{
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index f8daaa3..eed6681 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -269,10 +269,10 @@ void
RtfAttributeOutput::StartParagraph(ww8::WW8TableNodeInfo::Pointer_t pTextNo
void RtfAttributeOutput::EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t
pTextNodeInfoInner)
{
bool bLastPara = false;
- if (m_rExport.nTxtTyp == TXT_FTN || m_rExport.nTxtTyp == TXT_EDN)
+ if (m_rExport.m_nTxtTyp == TXT_FTN || m_rExport.m_nTxtTyp == TXT_EDN)
{
// We're ending a paragraph that is the last paragraph of a footnote
or endnote.
- bLastPara = m_rExport.m_nCurrentNodeIndex &&
m_rExport.m_nCurrentNodeIndex == m_rExport.pCurPam->End()->nNode.GetIndex();
+ bLastPara = m_rExport.m_nCurrentNodeIndex &&
m_rExport.m_nCurrentNodeIndex == m_rExport.m_pCurPam->End()->nNode.GetIndex();
}
FinishTableRowCell(pTextNodeInfoInner);
@@ -592,8 +592,8 @@ void
RtfAttributeOutput::TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t p
if (0 == nPageSize)
{
const SwNode* pNode = pTableTextNodeInfoInner->getNode();
- const SwFrmFmt* pFrmFmt = GetExport().mpParentFrame ?
&GetExport().mpParentFrame->GetFrmFmt() :
-
GetExport().pDoc->GetPageDesc(0).GetPageFmtOfNode(*pNode, false);
+ const SwFrmFmt* pFrmFmt = GetExport().m_pParentFrame ?
&GetExport().m_pParentFrame->GetFrmFmt() :
+
GetExport().m_pDoc->GetPageDesc(0).GetPageFmtOfNode(*pNode, false);
const SvxLRSpaceItem& rLR = pFrmFmt->GetLRSpace();
nPageSize = pFrmFmt->GetFrmSize().GetWidth() -
@@ -1436,9 +1436,9 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel,
if (pFont)
{
m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_F);
- m_rExport.OutULong(m_rExport.maFontHelper.GetId(*pFont));
+ m_rExport.OutULong(m_rExport.m_aFontHelper.GetId(*pFont));
}
- m_rExport.OutputItemSet(*pOutSet, false, true,
i18n::ScriptType::LATIN, m_rExport.mbExportModeRTF);
+ m_rExport.OutputItemSet(*pOutSet, false, true,
i18n::ScriptType::LATIN, m_rExport.m_bExportModeRTF);
m_rExport.Strm().WriteCharPtr(m_aStyles.makeStringAndClear().getStr());
}
@@ -1537,7 +1537,7 @@ void RtfAttributeOutput::WriteHeaderFooter_Impl(const
SwFrmFmt& rFmt, bool bHead
m_aRun.clear();
m_aSectionHeaders.append(bHeader ? OOO_STRING_SVTOOLS_RTF_HEADERY :
OOO_STRING_SVTOOLS_RTF_FOOTERY);
-
m_aSectionHeaders.append((sal_Int32)m_rExport.pAktPageDesc->GetMaster().GetULSpace().GetUpper());
+
m_aSectionHeaders.append((sal_Int32)m_rExport.m_pAktPageDesc->GetMaster().GetULSpace().GetUpper());
if (bTitlepg)
m_aSectionHeaders.append(OOO_STRING_SVTOOLS_RTF_TITLEPG);
m_aSectionHeaders.append('{');
@@ -1648,8 +1648,8 @@ void RtfAttributeOutput::writeTextFrame(const sw::Frame&
rFrame, bool bTextBox)
{
// Save table state, in case the inner text also contains a table.
- ww8::WW8TableInfo::Pointer_t pTableInfoOrig = m_rExport.mpTableInfo;
- m_rExport.mpTableInfo = ww8::WW8TableInfo::Pointer_t(new
ww8::WW8TableInfo());
+ ww8::WW8TableInfo::Pointer_t pTableInfoOrig = m_rExport.m_pTableInfo;
+ m_rExport.m_pTableInfo = ww8::WW8TableInfo::Pointer_t(new
ww8::WW8TableInfo());
std::unique_ptr<SwWriteTable> pTableWrt(m_pTableWrt.release());
sal_uInt32 nTableDepth = m_nTableDepth;
@@ -1672,7 +1672,7 @@ void RtfAttributeOutput::writeTextFrame(const sw::Frame&
rFrame, bool bTextBox)
sal_uLong nStt = pNodeIndex ? pNodeIndex->GetIndex()+1
: 0;
sal_uLong nEnd = pNodeIndex ?
pNodeIndex->GetNode().EndOfSectionIndex() : 0;
m_rExport.SaveData(nStt, nEnd);
- m_rExport.mpParentFrame = &rFrame;
+ m_rExport.m_pParentFrame = &rFrame;
m_rExport.WriteText();
m_rExport.RestoreData();
@@ -1684,12 +1684,12 @@ void RtfAttributeOutput::writeTextFrame(const
sw::Frame& rFrame, bool bTextBox)
m_bSingleEmptyRun = bSingleEmptyRunOrig;
// Restore table state.
- m_rExport.mpTableInfo = pTableInfoOrig;
+ m_rExport.m_pTableInfo = pTableInfoOrig;
m_pTableWrt.reset(pTableWrt.release());
m_nTableDepth = nTableDepth;
}
- m_rExport.mpParentFrame = NULL;
+ m_rExport.m_pParentFrame = NULL;
m_rExport.Strm().WriteChar('}'); // shptxt
@@ -1715,7 +1715,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const
sw::Frame& rFrame, const Poin
break;
OSL_ENSURE(m_aRunText.getLength() == 0, "m_aRunText is not empty");
- m_rExport.mpParentFrame = &rFrame;
+ m_rExport.m_pParentFrame = &rFrame;
m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SHP);
m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE
OOO_STRING_SVTOOLS_RTF_SHPINST);
@@ -1728,11 +1728,11 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const
sw::Frame& rFrame, const Poin
const Size aSize = rFrame.GetSize();
m_pFlyFrameSize = &aSize;
- m_rExport.bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = true;
+ m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = true;
m_rExport.OutputFormat(rFrame.GetFrmFmt(), false, false, true);
m_rExport.Strm().WriteCharPtr(m_aRunText.makeStringAndClear().getStr());
m_rExport.Strm().WriteCharPtr(m_aStyles.makeStringAndClear().getStr());
- m_rExport.bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = false;
+ m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = false;
m_pFlyFrameSize = 0;
const SwFrmFmt& rFrmFmt = rFrame.GetFrmFmt();
@@ -1761,14 +1761,14 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const
sw::Frame& rFrame, const Poin
case sw::Frame::eGraphic:
if (!rFrame.IsInline())
{
- m_rExport.mpParentFrame = &rFrame;
+ m_rExport.m_pParentFrame = &rFrame;
m_rExport.bRTFFlySyntax = true;
m_rExport.OutputFormat(rFrame.GetFrmFmt(), false, false, true);
m_rExport.bRTFFlySyntax = false;
m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE);
m_rExport.OutputFormat(rFrame.GetFrmFmt(), false, false, true);
m_aRunText->append('}');
- m_rExport.mpParentFrame = NULL;
+ m_rExport.m_pParentFrame = NULL;
}
if (pGrfNode)
@@ -1782,7 +1782,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const
sw::Frame& rFrame, const Poin
bool bSwapInPage = false;
if (!pSdrObj->GetPage())
{
- if (SwDrawModel* pModel =
m_rExport.pDoc->getIDocumentDrawModelAccess().GetDrawModel())
+ if (SwDrawModel* pModel =
m_rExport.m_pDoc->getIDocumentDrawModelAccess().GetDrawModel())
{
if (SdrPage* pPage = pModel->GetPage(0))
{
@@ -2139,7 +2139,7 @@ void RtfAttributeOutput::CharFont(const SvxFontItem&
rFont)
{
m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_LOCH);
m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_F);
- m_aStylesEnd.append((sal_Int32)m_rExport.maFontHelper.GetId(rFont));
+ m_aStylesEnd.append((sal_Int32)m_rExport.m_aFontHelper.GetId(rFont));
// FIXME: this may be a tad expensive... but the charset needs to be
// consistent with what wwFont::WriteRtf() does
sw::util::FontMapExport aTmp(rFont.GetFamilyName());
@@ -2316,7 +2316,7 @@ void RtfAttributeOutput::CharFontCJK(const SvxFontItem&
rFont)
{
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_DBCH);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF);
- m_aStyles.append((sal_Int32)m_rExport.maFontHelper.GetId(rFont));
+ m_aStyles.append((sal_Int32)m_rExport.m_aFontHelper.GetId(rFont));
}
void RtfAttributeOutput::CharFontSizeCJK(const SvxFontHeightItem& rFontSize)
@@ -2347,7 +2347,7 @@ void RtfAttributeOutput::CharFontCTL(const SvxFontItem&
rFont)
{
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_DBCH);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF);
- m_aStyles.append((sal_Int32)m_rExport.maFontHelper.GetId(rFont));
+ m_aStyles.append((sal_Int32)m_rExport.m_aFontHelper.GetId(rFont));
}
void RtfAttributeOutput::CharFontSizeCTL(const SvxFontHeightItem& rFontSize)
@@ -2788,7 +2788,7 @@ void RtfAttributeOutput::ParaSnapToGrid(const
SvxParaGridItem& /*rGrid*/)
void RtfAttributeOutput::FormatFrameSize(const SwFmtFrmSize& rSize)
{
- if (m_rExport.bOutPageDescs)
+ if (m_rExport.m_bOutPageDescs)
{
m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGWSXN);
m_aSectionBreaks.append((sal_Int32)rSize.GetWidth());
@@ -2806,9 +2806,9 @@ void RtfAttributeOutput::FormatPaperBin(const
SvxPaperBinItem&)
void RtfAttributeOutput::FormatLRSpace(const SvxLRSpaceItem& rLRSpace)
{
- if (!m_rExport.bOutFlyFrmAttrs)
+ if (!m_rExport.m_bOutFlyFrmAttrs)
{
- if (m_rExport.bOutPageDescs)
+ if (m_rExport.m_bOutPageDescs)
{
if (rLRSpace.GetLeft())
{
@@ -2847,9 +2847,9 @@ void RtfAttributeOutput::FormatLRSpace(const
SvxLRSpaceItem& rLRSpace)
void RtfAttributeOutput::FormatULSpace(const SvxULSpaceItem& rULSpace)
{
- if (!m_rExport.bOutFlyFrmAttrs)
+ if (!m_rExport.m_bOutFlyFrmAttrs)
{
- if (m_rExport.bOutPageDescs)
+ if (m_rExport.m_bOutPageDescs)
{
OSL_ENSURE(m_rExport.GetCurItemSet(), "Impossible");
if (!m_rExport.GetCurItemSet())
@@ -2901,7 +2901,7 @@ void RtfAttributeOutput::FormatULSpace(const
SvxULSpaceItem& rULSpace)
void RtfAttributeOutput::FormatSurround(const SwFmtSurround& rSurround)
{
- if (m_rExport.bOutFlyFrmAttrs && !m_rExport.bRTFFlySyntax)
+ if (m_rExport.m_bOutFlyFrmAttrs && !m_rExport.bRTFFlySyntax)
{
SwSurround eSurround = rSurround.GetSurround();
bool bGold = SURROUND_IDEAL == eSurround;
@@ -2911,7 +2911,7 @@ void RtfAttributeOutput::FormatSurround(const
SwFmtSurround& rSurround)
m_aRunText->append(OOO_STRING_SVTOOLS_RTF_FLYMAINCNT);
m_aRunText->append((sal_Int32) aMC.GetValue());
}
- else if (m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax)
+ else if (m_rExport.m_bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax)
{
// See DocxSdrExport::startDMLAnchorInline() for SwFmtSurround -> WR /
WRK mappings.
sal_Int32 nWr = -1;
@@ -2950,7 +2950,7 @@ void RtfAttributeOutput::FormatSurround(const
SwFmtSurround& rSurround)
void RtfAttributeOutput::FormatVertOrientation(const SwFmtVertOrient& rFlyVert)
{
- if (m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax)
+ if (m_rExport.m_bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax)
{
switch (rFlyVert.GetRelationOrient())
{
@@ -2993,7 +2993,7 @@ void RtfAttributeOutput::FormatVertOrientation(const
SwFmtVertOrient& rFlyVert)
void RtfAttributeOutput::FormatHorizOrientation(const SwFmtHoriOrient&
rFlyHori)
{
- if (m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax)
+ if (m_rExport.m_bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax)
{
switch (rFlyHori.GetRelationOrient())
{
@@ -3233,7 +3233,7 @@ void RtfAttributeOutput::FormatLineNumbering(const
SwFmtLineNumber& rNumbering)
void RtfAttributeOutput::FormatFrameDirection(const SvxFrameDirectionItem&
rDirection)
{
- if (!m_rExport.bOutPageDescs)
+ if (!m_rExport.m_bOutPageDescs)
{
if (rDirection.GetValue() == FRMDIR_HORI_RIGHT_TOP)
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_RTLPAR);
@@ -3435,7 +3435,7 @@ void RtfAttributeOutput::FontFamilyType(FontFamily
eFamily, const wwFont& rFont)
default:
break;
}
- m_rExport.OutULong(m_rExport.maFontHelper.GetId(rFont)).WriteCharPtr(pStr);
+
m_rExport.OutULong(m_rExport.m_aFontHelper.GetId(rFont)).WriteCharPtr(pStr);
}
/// Font pitch.
@@ -3759,7 +3759,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
aRendered.Height() = rS.GetHeight();
sw::Frame* pFrame = 0;
- for (sw::FrameIter it = m_rExport.maFrames.begin(); it !=
m_rExport.maFrames.end(); ++it)
+ for (sw::FrameIter it = m_rExport.m_aFrames.begin(); it !=
m_rExport.m_aFrames.end(); ++it)
{
if (pFlyFrmFmt == &it->GetFrmFmt())
{
@@ -3784,11 +3784,11 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
{
m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SHP "{"
OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPINST);
m_pFlyFrameSize = &aRendered;
- m_rExport.mpParentFrame = pFrame;
- m_rExport.bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = true;
+ m_rExport.m_pParentFrame = pFrame;
+ m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = true;
m_rExport.OutputFormat(pFrame->GetFrmFmt(), false, false, true);
- m_rExport.bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = false;
- m_rExport.mpParentFrame = NULL;
+ m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = false;
+ m_rExport.m_pParentFrame = NULL;
m_pFlyFrameSize = 0;
std::vector< std::pair<OString, OString> > aFlyProperties;
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 24d90be..81272a5 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -202,18 +202,18 @@ static bool IsExportNumRule(const SwNumRule& rRule,
sal_uInt8* pEnd = 0)
void RtfExport::BuildNumbering()
{
- const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl();
+ const SwNumRuleTbl& rListTbl = m_pDoc->GetNumRuleTbl();
for (sal_uInt16 n = rListTbl.size()+1; n;)
{
SwNumRule* pRule;
--n;
if (n == rListTbl.size())
- pRule = (SwNumRule*)pDoc->GetOutlineNumRule();
+ pRule = (SwNumRule*)m_pDoc->GetOutlineNumRule();
else
{
pRule = rListTbl[ n ];
- if (!pDoc->IsUsed(*pRule))
+ if (!m_pDoc->IsUsed(*pRule))
continue;
}
@@ -226,7 +226,7 @@ void RtfExport::WriteNumbering()
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
- if (!pUsedNumTbl)
+ if (!m_pUsedNumTbl)
return; // no numbering is used
Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LISTTABLE);
@@ -250,7 +250,7 @@ void RtfExport::WriteNumbering()
void RtfExport::WriteRevTab()
{
- int nRevAuthors = pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size();
+ int nRevAuthors =
m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size();
if (nRevAuthors < 1)
return;
@@ -258,9 +258,9 @@ void RtfExport::WriteRevTab()
// RTF always seems to use Unknown as the default first entry
GetRedline(OUString("Unknown"));
- for (sal_uInt16 i = 0; i <
pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size(); ++i)
+ for (sal_uInt16 i = 0; i <
m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size(); ++i)
{
- const SwRangeRedline* pRedl =
pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ i ];
+ const SwRangeRedline* pRedl =
m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ i ];
GetRedline(SW_MOD()->GetRedlineAuthor(pRedl->GetAuthor()));
}
@@ -362,20 +362,20 @@ sal_uLong RtfExport::ReplaceCr(sal_uInt8)
void RtfExport::WriteFonts()
{
Strm().WriteCharPtr(SAL_NEWLINE_STRING).WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FONTTBL);
- maFontHelper.WriteFontTable(*m_pAttrOutput);
+ m_aFontHelper.WriteFontTable(*m_pAttrOutput);
Strm().WriteChar('}');
}
void RtfExport::WriteStyles()
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
- pStyles->OutputStylesTable();
+ m_pStyles->OutputStylesTable();
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end");
}
void RtfExport::WriteFootnoteSettings()
{
- const SwPageFtnInfo& rFtnInfo = pDoc->GetPageDesc(0).GetFtnInfo();
+ const SwPageFtnInfo& rFtnInfo = m_pDoc->GetPageDesc(0).GetFtnInfo();
// Request a separator only in case the width is larger than zero.
bool bSeparator = double(rFtnInfo.GetWidth()) > 0;
@@ -389,16 +389,16 @@ void RtfExport::WriteMainText()
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
- SwTableNode* pTableNode = pCurPam->GetNode().FindTableNode();
+ SwTableNode* pTableNode = m_pCurPam->GetNode().FindTableNode();
if (m_pWriter && m_pWriter->bWriteOnlyFirstTable
&& pTableNode != 0)
{
- pCurPam->GetPoint()->nNode = *pTableNode;
- pCurPam->GetMark()->nNode = *(pTableNode->EndOfSectionNode());
+ m_pCurPam->GetPoint()->nNode = *pTableNode;
+ m_pCurPam->GetMark()->nNode = *(pTableNode->EndOfSectionNode());
}
else
{
- pCurPam->GetPoint()->nNode =
pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex();
+ m_pCurPam->GetPoint()->nNode =
m_pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex();
}
WriteText();
@@ -412,7 +412,7 @@ void RtfExport::WriteInfo()
Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE
LO_STRING_SVTOOLS_RTF_GENERATOR "
").WriteCharPtr(aGenerator.getStr()).WriteChar('}');
Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_INFO);
- SwDocShell* pDocShell(pDoc->GetDocShell());
+ SwDocShell* pDocShell(m_pDoc->GetDocShell());
uno::Reference<document::XDocumentProperties> xDocProps;
if (pDocShell)
{
@@ -444,16 +444,16 @@ void RtfExport::WriteInfo()
void RtfExport::WritePageDescTable()
{
// Write page descriptions (page styles)
- sal_uInt16 nSize = pDoc->GetPageDescCnt();
+ sal_uInt16 nSize = m_pDoc->GetPageDescCnt();
if (!nSize)
return;
Strm().WriteCharPtr(SAL_NEWLINE_STRING);
- bOutPageDescs = true;
+ m_bOutPageDescs = true;
Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSCTBL);
for (sal_uInt16 n = 0; n < nSize; ++n)
{
- const SwPageDesc& rPageDesc = pDoc->GetPageDesc(n);
+ const SwPageDesc& rPageDesc = m_pDoc->GetPageDesc(n);
Strm().WriteCharPtr(SAL_NEWLINE_STRING).WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSC);
OutULong(n).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSCUSE);
@@ -464,18 +464,18 @@ void RtfExport::WritePageDescTable()
// search for the next page description
sal_uInt16 i = nSize;
while (i)
- if (rPageDesc.GetFollow() == &pDoc->GetPageDesc(--i))
+ if (rPageDesc.GetFollow() == &m_pDoc->GetPageDesc(--i))
break;
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSCNXT);
OutULong(i).WriteChar(' ');
Strm().WriteCharPtr(msfilter::rtfutil::OutString(rPageDesc.GetName(),
eDefaultEncoding).getStr()).WriteCharPtr(";}");
}
Strm().WriteChar('}').WriteCharPtr(SAL_NEWLINE_STRING);
- bOutPageDescs = false;
+ m_bOutPageDescs = false;
// reset table infos, otherwise the depth of the cells will be incorrect,
// in case the page style (header or footer) had tables
- mpTableInfo = ww8::WW8TableInfo::Pointer_t(new ww8::WW8TableInfo());
+ m_pTableInfo = ww8::WW8TableInfo::Pointer_t(new ww8::WW8TableInfo());
}
void RtfExport::ExportDocument_Impl()
@@ -484,14 +484,14 @@ void RtfExport::ExportDocument_Impl()
Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_RTF).WriteChar('1')
.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_ANSI);
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_DEFF);
- OutULong(maFontHelper.GetId(static_cast<const
SvxFontItem&>(pDoc->GetAttrPool().GetDefaultItem(RES_CHRATR_FONT))));
+ OutULong(m_aFontHelper.GetId(static_cast<const
SvxFontItem&>(m_pDoc->GetAttrPool().GetDefaultItem(RES_CHRATR_FONT))));
// If this not exist, MS don't understand our ansi characters (0x80-0xff).
Strm().WriteCharPtr("\\adeflang1025");
// Font table
WriteFonts();
- pStyles = new MSWordStyles(*this);
+ m_pStyles = new MSWordStyles(*this);
// Color and stylesheet table
WriteStyles();
@@ -507,7 +507,7 @@ void RtfExport::ExportDocument_Impl()
// Automatic hyphenation: it's a global setting in Word, it's a paragraph
setting in Writer.
// Use the setting from the default style.
- SwTxtFmtColl* pTxtFmtColl =
pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD,
/*bRegardLanguage=*/false);
+ SwTxtFmtColl* pTxtFmtColl =
m_pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD,
/*bRegardLanguage=*/false);
const SfxPoolItem* pItem;
if (pTxtFmtColl && pTxtFmtColl->GetItemState(RES_PARATR_HYPHENZONE, false,
&pItem) == SfxItemState::SET)
{
@@ -516,17 +516,17 @@ void RtfExport::ExportDocument_Impl()
}
// Zoom
- SwViewShell*
pViewShell(pDoc->getIDocumentLayoutAccess().GetCurrentViewShell());
+ SwViewShell*
pViewShell(m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell());
if (pViewShell && pViewShell->GetViewOptions()->GetZoomType() ==
SvxZoomType::PERCENT)
{
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_VIEWSCALE);
OutULong(pViewShell->GetViewOptions()->GetZoom());
}
// Record changes?
- if (nsRedlineMode_t::REDLINE_ON & mnOrigRedlineMode)
+ if (nsRedlineMode_t::REDLINE_ON & m_nOrigRedlineMode)
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_REVISIONS);
// Mirror margins?
- if ((nsUseOnPage::PD_MIRROR & pDoc->GetPageDesc(0).ReadUseOn()) ==
nsUseOnPage::PD_MIRROR)
+ if ((nsUseOnPage::PD_MIRROR & m_pDoc->GetPageDesc(0).ReadUseOn()) ==
nsUseOnPage::PD_MIRROR)
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MARGMIRROR);
// Init sections
m_pSections = new MSWordSections(*this);
@@ -539,7 +539,7 @@ void RtfExport::ExportDocument_Impl()
// breaks moving of drawings - so write it only in case there is really a
// protected section in the document.
{
- const SfxItemPool& rPool = pDoc->GetAttrPool();
+ const SfxItemPool& rPool = m_pDoc->GetAttrPool();
sal_uInt32 const nMaxItem = rPool.GetItemCount2(RES_PROTECT);
for (sal_uInt32 n = 0; n < nMaxItem; ++n)
{
@@ -556,13 +556,13 @@ void RtfExport::ExportDocument_Impl()
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FORMSHADE);
// size and empty margins of the page
- if (pDoc->GetPageDescCnt())
+ if (m_pDoc->GetPageDescCnt())
{
// Seeking the first SwFmtPageDesc. If no set, the default is valid
const SwFmtPageDesc* pSttPgDsc = 0;
{
- const SwNode& rSttNd = *pDoc->GetNodes()[
-
pDoc->GetNodes().GetEndOfExtras().GetIndex() + 2 ];
+ const SwNode& rSttNd = *m_pDoc->GetNodes()[
+
m_pDoc->GetNodes().GetEndOfExtras().GetIndex() + 2 ];
const SfxItemSet* pSet = 0;
if (rSttNd.IsCntntNode())
@@ -580,7 +580,7 @@ void RtfExport::ExportDocument_Impl()
pSttPgDsc = static_cast<const
SwFmtPageDesc*>(&pSet->Get(RES_PAGEDESC));
if (!pSttPgDsc->GetPageDesc())
pSttPgDsc = 0;
- else if
(pDoc->FindPageDesc(pSttPgDsc->GetPageDesc()->GetName(), &nPosInDoc))
+ else if
(m_pDoc->FindPageDesc(pSttPgDsc->GetPageDesc()->GetName(), &nPosInDoc))
{
Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSCNO);
OutULong(nPosInDoc).WriteChar('}');
@@ -588,7 +588,7 @@ void RtfExport::ExportDocument_Impl()
}
}
const SwPageDesc& rPageDesc = pSttPgDsc ? *pSttPgDsc->GetPageDesc()
- : pDoc->GetPageDesc(0);
+ : m_pDoc->GetPageDesc(0);
const SwFrmFmt& rFmtPage = rPageDesc.GetMaster();
{
@@ -635,18 +635,18 @@ void RtfExport::ExportDocument_Impl()
// following title page are correctly added - i13107
if (pSttPgDsc)
{
- pAktPageDesc = &rPageDesc;
+ m_pAktPageDesc = &rPageDesc;
}
}
// line numbering
- const SwLineNumberInfo& rLnNumInfo = pDoc->GetLineNumberInfo();
+ const SwLineNumberInfo& rLnNumInfo = m_pDoc->GetLineNumberInfo();
if (rLnNumInfo.IsPaintLineNumbers())
AttrOutput().SectionLineNumbering(0, rLnNumInfo);
{
// write the footnotes and endnotes-out Info
- const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo();
+ const SwFtnInfo& rFtnInfo = m_pDoc->GetFtnInfo();
const char* pOut = FTNPOS_CHAPTER == rFtnInfo.ePos
? OOO_STRING_SVTOOLS_RTF_ENDDOC
@@ -693,7 +693,7 @@ void RtfExport::ExportDocument_Impl()
}
Strm().WriteCharPtr(pOut);
- const SwEndNoteInfo& rEndNoteInfo = pDoc->GetEndNoteInfo();
+ const SwEndNoteInfo& rEndNoteInfo = m_pDoc->GetEndNoteInfo();
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AENDDOC).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT)
.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AFTNSTART);
@@ -815,13 +815,13 @@ RtfExport::RtfExport(RtfExportFilter* pFilter, SwDoc*
pDocument, SwPaM* pCurrent
bRTFFlySyntax(false),
m_nCurrentNodeIndex(0)
{
- mbExportModeRTF = true;
+ m_bExportModeRTF = true;
// the attribute output for the document
m_pAttrOutput.reset(new RtfAttributeOutput(*this));
// that just causes problems for RTF
- bSubstituteBullets = false;
+ m_bSubstituteBullets = false;
// needed to have a complete font table
- maFontHelper.bLoadAllFonts = true;
+ m_aFontHelper.bLoadAllFonts = true;
// the related SdrExport
m_pSdrExport.reset(new RtfSdrExport(*this));
@@ -950,7 +950,7 @@ void RtfExport::OutColorTable()
// Build the table from rPool since the colors provided to
// RtfAttributeOutput callbacks are too late.
sal_uInt32 nMaxItem;
- const SfxItemPool& rPool = pDoc->GetAttrPool();
+ const SfxItemPool& rPool = m_pDoc->GetAttrPool();
// MSO Word uses a default color table with 16 colors (which is used e.g.
for highlighting)
InsColor(COL_BLACK);
@@ -1131,55 +1131,55 @@ const OUString* RtfExport::GetRedline(sal_uInt16 nId)
void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bWriteReset,
bool bCheckForFirstPage)
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
- const SwPageDesc* pSave = pAktPageDesc;
+ const SwPageDesc* pSave = m_pAktPageDesc;
- pAktPageDesc = &rPgDsc;
- if (bCheckForFirstPage && pAktPageDesc->GetFollow() &&
- pAktPageDesc->GetFollow() != pAktPageDesc)
- pAktPageDesc = pAktPageDesc->GetFollow();
+ m_pAktPageDesc = &rPgDsc;
+ if (bCheckForFirstPage && m_pAktPageDesc->GetFollow() &&
+ m_pAktPageDesc->GetFollow() != m_pAktPageDesc)
+ m_pAktPageDesc = m_pAktPageDesc->GetFollow();
if (bWriteReset)
{
- if (pCurPam->GetPoint()->nNode == pOrigPam->Start()->nNode)
+ if (m_pCurPam->GetPoint()->nNode == m_pOrigPam->Start()->nNode)
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECTD).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SBKNONE);
else
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECT).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECTD);
}
- if (pAktPageDesc->GetLandscape())
+ if (m_pAktPageDesc->GetLandscape())
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LNDSCPSXN);
- const SwFmt* pFmt = &pAktPageDesc->GetMaster(); //GetLeft();
- bOutPageDescs = true;
+ const SwFmt* pFmt = &m_pAktPageDesc->GetMaster(); //GetLeft();
+ m_bOutPageDescs = true;
OutputFormat(*pFmt, true, false);
- bOutPageDescs = false;
+ m_bOutPageDescs = false;
// normal header / footer (without a style)
const SfxPoolItem* pItem;
- if (pAktPageDesc->GetLeft().GetAttrSet().GetItemState(RES_HEADER, false,
+ if (m_pAktPageDesc->GetLeft().GetAttrSet().GetItemState(RES_HEADER, false,
&pItem) == SfxItemState::SET)
WriteHeaderFooter(*pItem, true);
- if (pAktPageDesc->GetLeft().GetAttrSet().GetItemState(RES_FOOTER, false,
+ if (m_pAktPageDesc->GetLeft().GetAttrSet().GetItemState(RES_FOOTER, false,
&pItem) == SfxItemState::SET)
WriteHeaderFooter(*pItem, false);
// title page
- if (pAktPageDesc != &rPgDsc)
+ if (m_pAktPageDesc != &rPgDsc)
{
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_TITLEPG);
- pAktPageDesc = &rPgDsc;
- if (pAktPageDesc->GetMaster().GetAttrSet().GetItemState(RES_HEADER,
+ m_pAktPageDesc = &rPgDsc;
+ if (m_pAktPageDesc->GetMaster().GetAttrSet().GetItemState(RES_HEADER,
false, &pItem) == SfxItemState::SET)
WriteHeaderFooter(*pItem, true);
- if (pAktPageDesc->GetMaster().GetAttrSet().GetItemState(RES_FOOTER,
+ if (m_pAktPageDesc->GetMaster().GetAttrSet().GetItemState(RES_FOOTER,
false, &pItem) == SfxItemState::SET)
WriteHeaderFooter(*pItem, false);
}
// numbering type
-
AttrOutput().SectionPageNumbering(pAktPageDesc->GetNumType().GetNumberingType(),
boost::none);
+
AttrOutput().SectionPageNumbering(m_pAktPageDesc->GetNumType().GetNumberingType(),
boost::none);
- pAktPageDesc = pSave;
+ m_pAktPageDesc = pSave;
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end");
}
@@ -1202,13 +1202,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 (pAktPageDesc->GetFollow() && pAktPageDesc->GetFollow() != pAktPageDesc)
+ if (m_pAktPageDesc->GetFollow() && m_pAktPageDesc->GetFollow() !=
m_pAktPageDesc)
{
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_TITLEPG);
pStr = (bHeader ? OOO_STRING_SVTOOLS_RTF_HEADERF :
OOO_STRING_SVTOOLS_RTF_FOOTERF);
}
Strm().WriteChar('{').WriteCharPtr(pStr);
- WriteHeaderFooterText(pAktPageDesc->GetMaster(), bHeader);
+ WriteHeaderFooterText(m_pAktPageDesc->GetMaster(), bHeader);
Strm().WriteChar('}');
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end");
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index 182f91d..58b82f3 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -40,7 +40,7 @@ RtfSdrExport::RtfSdrExport(RtfExport& rExport)
m_nShapeFlags(0) ,
m_aShapeStyle(200),
m_pShapeTypeWritten(new bool[ ESCHER_ShpInst_COUNT ]),
- m_aTextBoxes(SwTextBoxHelper::findTextBoxes(m_rExport.pDoc))
+ m_aTextBoxes(SwTextBoxHelper::findTextBoxes(m_rExport.m_pDoc))
{
mnGroupLevel = 1;
memset(m_pShapeTypeWritten, 0, ESCHER_ShpInst_COUNT * sizeof(bool));
@@ -502,7 +502,7 @@ sal_Int32 RtfSdrExport::StartShape()
if (SwFrmFmt* pTextBox = SwTextBoxHelper::findTextBox(pShape))
{
sw::Frame* pFrame = 0;
- for (sw::FrameIter it = m_rExport.maFrames.begin(); it !=
m_rExport.maFrames.end(); ++it)
+ for (sw::FrameIter it = m_rExport.m_aFrames.begin(); it !=
m_rExport.m_aFrames.end(); ++it)
{
if (pTextBox == &it->GetFrmFmt())
{
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index b730615..77b8271 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -458,7 +458,7 @@ void WW8Export::DoComboBox(const OUString &rName,
WRITEFIELD_START | WRITEFIELD_CMD_START);
// write the refence to the "picture" structure
sal_uLong nDataStt = pDataStrm->Tell();
- pChpPlc->AppendFkpEntry( Strm().Tell() );
+ m_pChpPlc->AppendFkpEntry( Strm().Tell() );
WriteChar( 0x01 );
@@ -472,7 +472,7 @@ void WW8Export::DoComboBox(const OUString &rName,
sal_uInt8* pDataAdr = aArr1 + 2;
Set_UInt32( pDataAdr, nDataStt );
- pChpPlc->AppendFkpEntry(Strm().Tell(), sizeof(aArr1), aArr1);
+ m_pChpPlc->AppendFkpEntry(Strm().Tell(), sizeof(aArr1), aArr1);
OutputField(0, ww::eFORMDROPDOWN, FieldString(ww::eFORMDROPDOWN),
WRITEFIELD_CLOSE);
@@ -505,7 +505,7 @@ void
WW8Export::DoCheckBox(uno::Reference<beans::XPropertySet> xPropSet)
WRITEFIELD_START | WRITEFIELD_CMD_START);
// write the refence to the "picture" structure
sal_uLong nDataStt = pDataStrm->Tell();
- pChpPlc->AppendFkpEntry( Strm().Tell() );
+ m_pChpPlc->AppendFkpEntry( Strm().Tell() );
WriteChar( 0x01 );
static sal_uInt8 aArr1[] = {
@@ -518,7 +518,7 @@ void
WW8Export::DoCheckBox(uno::Reference<beans::XPropertySet> xPropSet)
sal_uInt8* pDataAdr = aArr1 + 2;
Set_UInt32( pDataAdr, nDataStt );
- pChpPlc->AppendFkpEntry(Strm().Tell(),
+ m_pChpPlc->AppendFkpEntry(Strm().Tell(),
sizeof( aArr1 ), aArr1 );
::sw::WW8FFData aFFData;
@@ -565,7 +565,7 @@ void WW8Export::DoFormText(const SwInputField * pFld)
WRITEFIELD_START | WRITEFIELD_CMD_START);
// write the refence to the "picture" structure
sal_uLong nDataStt = pDataStrm->Tell();
- pChpPlc->AppendFkpEntry( Strm().Tell() );
+ m_pChpPlc->AppendFkpEntry( Strm().Tell() );
WriteChar( 0x01 );
static sal_uInt8 aArr1[] = {
@@ -578,7 +578,7 @@ void WW8Export::DoFormText(const SwInputField * pFld)
sal_uInt8* pDataAdr = aArr1 + 5;
Set_UInt32( pDataAdr, nDataStt );
- pChpPlc->AppendFkpEntry(Strm().Tell(),
+ m_pChpPlc->AppendFkpEntry(Strm().Tell(),
sizeof( aArr1 ), aArr1 );
::sw::WW8FFData aFFData;
@@ -601,7 +601,7 @@ void WW8Export::DoFormText(const SwInputField * pFld)
pDataAdr = aArr2 + 2;
Set_UInt32( pDataAdr, nDataStt );
- pChpPlc->AppendFkpEntry(Strm().Tell(),
+ m_pChpPlc->AppendFkpEntry(Strm().Tell(),
sizeof( aArr2 ), aArr2 );
OutputField(0, ww::eFORMTEXT, OUString(), WRITEFIELD_CLOSE);
@@ -671,7 +671,7 @@ bool WW8Export::MiserableRTLFrmFmtHack(SwTwips &rLeft,
SwTwips &rRight,
const sw::Frame &rFrmFmt)
{
//Require nasty bidi swap
- if (FRMDIR_HORI_RIGHT_TOP != pDoc->GetTextDirection(rFrmFmt.GetPosition()))
+ if (FRMDIR_HORI_RIGHT_TOP !=
m_pDoc->GetTextDirection(rFrmFmt.GetPosition()))
return false;
SwTwips nWidth = rRight - rLeft;
@@ -866,8 +866,8 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
OSL_ENSURE(false, "Unsupported surround type for export");
break;
}
- if (pObj && (pObj->GetLayer() ==
rWrt.pDoc->getIDocumentDrawModelAccess().GetHellId() ||
- pObj->GetLayer() ==
rWrt.pDoc->getIDocumentDrawModelAccess().GetInvisibleHellId()))
+ if (pObj && (pObj->GetLayer() ==
rWrt.m_pDoc->getIDocumentDrawModelAccess().GetHellId() ||
+ pObj->GetLayer() ==
rWrt.m_pDoc->getIDocumentDrawModelAccess().GetInvisibleHellId()))
{
nFlags |= 0x4000;
}
@@ -930,7 +930,7 @@ bool PlcDrawObj::Append( WW8Export& rWrt, WW8_CP nCp, const
sw::Frame& rFmt,
{
bool bRet = false;
const SwFrmFmt &rFormat = rFmt.GetFrmFmt();
- if (TXT_HDFT == rWrt.nTxtTyp || TXT_MAINTEXT == rWrt.nTxtTyp)
+ if (TXT_HDFT == rWrt.m_nTxtTyp || TXT_MAINTEXT == rWrt.m_nTxtTyp)
{
if (RES_FLYFRMFMT == rFormat.Which())
{
@@ -959,7 +959,7 @@ void DrawObj::SetShapeDetails(sal_uInt32 nId, sal_Int32
nThick)
bool WW8_WrPlcTxtBoxes::WriteTxt( WW8Export& rWrt )
{
- rWrt.bInWriteEscher = true;
+ rWrt.m_bInWriteEscher = true;
WW8_CP& rccp=TXT_TXTBOX == nTyp ? rWrt.pFib->ccpTxbx :
rWrt.pFib->ccpHdrTxbx;
bool bRet = WriteGenericTxt( rWrt, nTyp, rccp );
@@ -969,10 +969,10 @@ bool WW8_WrPlcTxtBoxes::WriteTxt( WW8Export& rWrt )
WW8_CP nMyOffset = rFib.ccpText + rFib.ccpFtn + rFib.ccpHdr + rFib.ccpAtn
+ rFib.ccpEdn;
if( TXT_TXTBOX == nTyp )
- rWrt.pFldTxtBxs->Finish( nCP, nMyOffset );
+ rWrt.m_pFldTxtBxs->Finish( nCP, nMyOffset );
else
- rWrt.pFldHFTxtBxs->Finish( nCP, nMyOffset + rFib.ccpTxbx );
- rWrt.bInWriteEscher = false;
+ rWrt.m_pFldHFTxtBxs->Finish( nCP, nMyOffset + rFib.ccpTxbx );
+ rWrt.m_bInWriteEscher = false;
return bRet;
}
@@ -1007,9 +1007,9 @@ sal_uInt32 WW8Export::GetSdrOrdNum( const SwFrmFmt& rFmt
) const
{
// no Layout for this format, then recalc the ordnum
SwFrmFmt* pFmt = const_cast<SwFrmFmt*>(&rFmt);
- nOrdNum = pDoc->GetSpzFrmFmts()->GetPos( pFmt );
+ nOrdNum = m_pDoc->GetSpzFrmFmts()->GetPos( pFmt );
- const SwDrawModel* pModel =
pDoc->getIDocumentDrawModelAccess().GetDrawModel();
+ const SwDrawModel* pModel =
m_pDoc->getIDocumentDrawModelAccess().GetDrawModel();
if( pModel )
nOrdNum += pModel->GetPage( 0 )->GetObjCount();
}
@@ -1020,14 +1020,14 @@ void WW8Export::AppendFlyInFlys(const sw::Frame&
rFrmFmt,
const Point& rNdTopLeft)
{
OSL_ENSURE(bWrtWW8, "this has gone horribly wrong");
- OSL_ENSURE(!pEscher, "der EscherStream wurde schon geschrieben!");
- if (pEscher)
+ OSL_ENSURE(!m_pEscher, "der EscherStream wurde schon geschrieben!");
+ if (m_pEscher)
return ;
PlcDrawObj *pDrwO;
- if (TXT_HDFT == nTxtTyp)
- pDrwO = pHFSdrObjs;
+ if (TXT_HDFT == m_nTxtTyp)
+ pDrwO = m_pHFSdrObjs;
else
- pDrwO = pSdrObjs;
+ pDrwO = m_pSdrObjs;
if (rFrmFmt.IsInline())
{
@@ -1049,9 +1049,9 @@ void WW8Export::AppendFlyInFlys(const sw::Frame& rFrmFmt,
// fSpec-Attribut true
// Fuer DrawObjets muss ein Spezial-Zeichen
// in den Text und darum ein fSpec-Attribut
- pChpPlc->AppendFkpEntry( Strm().Tell() );
+ m_pChpPlc->AppendFkpEntry( Strm().Tell() );
WriteChar( 0x8 );
- pChpPlc->AppendFkpEntry( Strm().Tell(), sizeof( aSpec8 ), aSpec8 );
+ m_pChpPlc->AppendFkpEntry( Strm().Tell(), sizeof( aSpec8 ), aSpec8 );
//Need dummy picture frame
if (rFrmFmt.IsInline())
@@ -1154,8 +1154,8 @@ void MSWord_SdrAttrIter::OutEEField(const SfxPoolItem&
rHt)
const SvxFieldData *pFld = rField.GetField();
if (pFld && pFld->ISA(SvxURLField))
{
- sal_uInt8 nOldTxtTyp = m_rExport.nTxtTyp;
- m_rExport.nTxtTyp = mnTyp;
+ sal_uInt8 nOldTxtTyp = m_rExport.m_nTxtTyp;
+ m_rExport.m_nTxtTyp = mnTyp;
const SvxURLField *pURL = static_cast<const SvxURLField *>(pFld);
m_rExport.AttrOutput().StartURL( pURL->GetURL(),
pURL->GetTargetFrame() );
@@ -1163,7 +1163,7 @@ void MSWord_SdrAttrIter::OutEEField(const SfxPoolItem&
rHt)
m_rExport.AttrOutput().RawText( rStr, true, GetNodeCharSet() ); //
FIXME kendy: is the 'true' actually correct here? It was here before, but...
;-)
m_rExport.AttrOutput().EndURL(false);
- m_rExport.nTxtTyp = nOldTxtTyp;
+ m_rExport.m_nTxtTyp = nOldTxtTyp;
}
}
@@ -1194,15 +1194,15 @@ void MSWord_SdrAttrIter::OutAttr( sal_Int32 nSwPos )
if (!aTxtAtrArr.empty())
{
- const SwModify* pOldMod = m_rExport.pOutFmtNode;
- m_rExport.pOutFmtNode = 0;
+ const SwModify* pOldMod = m_rExport.m_pOutFmtNode;
+ m_rExport.m_pOutFmtNode = 0;
const SfxItemPool* pSrcPool = pEditPool;
- const SfxItemPool& rDstPool = m_rExport.pDoc->GetAttrPool();
+ const SfxItemPool& rDstPool = m_rExport.m_pDoc->GetAttrPool();
nTmpSwPos = nSwPos;
// Did we already produce a <w:sz> element?
- m_rExport.mbFontSizeWritten = false;
+ m_rExport.m_bFontSizeWritten = false;
for(std::vector<EECharAttrib>::const_iterator i = aTxtAtrArr.begin();
i < aTxtAtrArr.end(); ++i)
{
if (nSwPos >= i->nStart && nSwPos < i->nEnd)
@@ -1232,10 +1232,10 @@ void MSWord_SdrAttrIter::OutAttr( sal_Int32 nSwPos )
pI->SetWhich( nWhich );
// Will this item produce a <w:sz> element?
bool bFontSizeItem = nWhich == RES_CHRATR_FONTSIZE ||
nWhich == RES_CHRATR_CJK_FONTSIZE;
- if (!m_rExport.mbFontSizeWritten || !bFontSizeItem)
+ if (!m_rExport.m_bFontSizeWritten || !bFontSizeItem)
m_rExport.AttrOutput().OutputItem( *pI );
if (bFontSizeItem)
- m_rExport.mbFontSizeWritten = true;
+ m_rExport.m_bFontSizeWritten = true;
delete pI;
}
}
@@ -1244,10 +1244,10 @@ void MSWord_SdrAttrIter::OutAttr( sal_Int32 nSwPos )
if( nSwPos < i->nStart )
break;
}
- m_rExport.mbFontSizeWritten = false;
+ m_rExport.m_bFontSizeWritten = false;
nTmpSwPos = 0; // HasTextItem nur in dem obigen Bereich erlaubt
- m_rExport.pOutFmtNode = pOldMod;
+ m_rExport.m_pOutFmtNode = pOldMod;
}
}
@@ -1274,7 +1274,7 @@ bool MSWord_SdrAttrIter::IsTxtAttr(sal_Int32 nSwPos)
const SfxPoolItem* MSWord_SdrAttrIter::HasTextItem(sal_uInt16 nWhich) const
{
nWhich = sw::hack::TransformWhichBetweenPools(*pEditPool,
- m_rExport.pDoc->GetAttrPool(), nWhich);
+ m_rExport.m_pDoc->GetAttrPool(), nWhich);
if (nWhich)
{
for (std::vector<EECharAttrib>::const_iterator i = aTxtAtrArr.begin();
i < aTxtAtrArr.end(); ++i)
@@ -1295,7 +1295,7 @@ const SfxPoolItem& MSWord_SdrAttrIter::GetItem(
sal_uInt16 nWhich ) const
if (!pRet)
{
SfxItemSet aSet(pEditObj->GetParaAttribs(nPara));
- nWhich = GetSetWhichFromSwDocWhich(aSet, *m_rExport.pDoc, nWhich);
+ nWhich = GetSetWhichFromSwDocWhich(aSet, *m_rExport.m_pDoc, nWhich);
OSL_ENSURE(nWhich, "Impossible, catastrophic failure imminent");
pRet = &aSet.Get(nWhich);
}
@@ -1314,7 +1314,7 @@ void MSWord_SdrAttrIter::OutParaAttr(bool bCharAttr,
const std::set<sal_uInt16>*
const SfxPoolItem* pItem = aIter.GetCurItem();
const SfxItemPool* pSrcPool = pEditPool,
- * pDstPool = &m_rExport.pDoc->GetAttrPool();
+ * pDstPool = &m_rExport.m_pDoc->GetAttrPool();
do
{
@@ -1407,7 +1407,7 @@ void WW8Export::WriteOutliner(const OutlinerParaObject&
rParaObj, sal_uInt8 nTyp
// Ausgabe der Zeichenattribute
aAttrIter.OutAttr( nAktPos ); // nAktPos - 1 ??
- pChpPlc->AppendFkpEntry( Strm().Tell(),
+ m_pChpPlc->AppendFkpEntry( Strm().Tell(),
pO->size(), pO->data() );
pO->clear();
@@ -1428,10 +1428,10 @@ void WW8Export::WriteOutliner(const OutlinerParaObject&
rParaObj, sal_uInt8 nTyp
aAttrIter.OutParaAttr(false);
sal_uLong nPos = Strm().Tell();
- pPapPlc->AppendFkpEntry( Strm().Tell(),
+ m_pPapPlc->AppendFkpEntry( Strm().Tell(),
pO->size(), pO->data() );
pO->clear();
- pChpPlc->AppendFkpEntry( nPos );
+ m_pChpPlc->AppendFkpEntry( nPos );
}
bAnyWrite = 0 != nPara;
@@ -1469,29 +1469,29 @@ void WinwordAnchoring::WriteData( EscherEx& rEx ) const
void WW8Export::CreateEscher()
{
- SfxItemState eBackSet = pDoc->GetPageDesc(0).GetMaster().
+ SfxItemState eBackSet = m_pDoc->GetPageDesc(0).GetMaster().
GetItemState(RES_BACKGROUND);
- if (pHFSdrObjs->size() || pSdrObjs->size() || SfxItemState::SET ==
eBackSet)
+ if (m_pHFSdrObjs->size() || m_pSdrObjs->size() || SfxItemState::SET ==
eBackSet)
{
- OSL_ENSURE( !pEscher, "wer hat den Pointer nicht geloescht?" );
+ OSL_ENSURE( !m_pEscher, "wer hat den Pointer nicht geloescht?" );
SvMemoryStream* pEscherStrm = new SvMemoryStream;
pEscherStrm->SetEndian(SvStreamEndian::LITTLE);
- pEscher = new SwEscherEx(pEscherStrm, *this);
+ m_pEscher = new SwEscherEx(pEscherStrm, *this);
}
}
void WW8Export::WriteEscher()
{
- if (pEscher)
+ if (m_pEscher)
{
sal_uLong nStart = pTableStrm->Tell();
- pEscher->WritePictures();
- pEscher->FinishEscher();
+ m_pEscher->WritePictures();
+ m_pEscher->FinishEscher();
pFib->fcDggInfo = nStart;
pFib->lcbDggInfo = pTableStrm->Tell() - nStart;
- delete pEscher, pEscher = 0;
+ delete m_pEscher, m_pEscher = 0;
}
}
@@ -2171,7 +2171,7 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt&
rFmt, MSO_SPT eShapeType
void SwBasicEscherEx::Init()
{
MapUnit eMap = MAP_TWIP;
- if (SwDrawModel *pModel =
rWrt.pDoc->getIDocumentDrawModelAccess().GetDrawModel())
+ if (SwDrawModel *pModel =
rWrt.m_pDoc->getIDocumentDrawModelAccess().GetDrawModel())
{
// PPT arbeitet nur mit Einheiten zu 576DPI
// WW hingegen verwendet twips, dh. 1440DPI.
@@ -2187,7 +2187,7 @@ void SwBasicEscherEx::Init()
mnEmuMul = aFact.GetNumerator();
mnEmuDiv = aFact.GetDenominator();
- SetHellLayerId(rWrt.pDoc->getIDocumentDrawModelAccess().GetHellId());
+ SetHellLayerId(rWrt.m_pDoc->getIDocumentDrawModelAccess().GetHellId());
}
sal_Int32 SwBasicEscherEx::ToFract16(sal_Int32 nVal, sal_uInt32 nMax) const
@@ -2213,7 +2213,7 @@ sal_Int32 SwBasicEscherEx::ToFract16(sal_Int32 nVal,
sal_uInt32 nMax) const
SdrLayerID SwBasicEscherEx::GetInvisibleHellId() const
{
- return rWrt.pDoc->getIDocumentDrawModelAccess().GetInvisibleHellId();
+ return rWrt.m_pDoc->getIDocumentDrawModelAccess().GetInvisibleHellId();
}
void SwBasicEscherEx::WritePictures()
@@ -2248,18 +2248,18 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export&
rWW8Wrt)
CloseContainer(); // ESCHER_DggContainer
sal_uInt8 i = 2; // for header/footer and the other
- PlcDrawObj *pSdrObjs = rWrt.pHFSdrObjs;
- pTxtBxs = rWrt.pHFTxtBxs;
+ PlcDrawObj *pSdrObjs = rWrt.m_pHFSdrObjs;
+ pTxtBxs = rWrt.m_pHFTxtBxs;
// if no header/footer -> skip over
if (!pSdrObjs->size())
{
--i;
- pSdrObjs = rWrt.pSdrObjs;
- pTxtBxs = rWrt.pTxtBxs;
+ pSdrObjs = rWrt.m_pSdrObjs;
+ pTxtBxs = rWrt.m_pTxtBxs;
}
- for( ; i--; pSdrObjs = rWrt.pSdrObjs, pTxtBxs = rWrt.pTxtBxs )
+ for( ; i--; pSdrObjs = rWrt.m_pSdrObjs, pTxtBxs = rWrt.m_pTxtBxs )
{
// "dummy char" (or any Count ?) - why? Only Microsoft knows it.
GetStream().WriteChar( i );
@@ -2268,7 +2268,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export&
rWW8Wrt)
EnterGroup( 0 );
- sal_uLong nSecondShapeId = pSdrObjs == rWrt.pSdrObjs ?
GenerateShapeId() : 0;
+ sal_uLong nSecondShapeId = pSdrObjs == rWrt.m_pSdrObjs ?
GenerateShapeId() : 0;
// write now all Writer-/DrawObjects
DrawObjPointerVector aSorted;
@@ -2305,7 +2305,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export&
rWW8Wrt)
bool bSwapInPage = false;
if (!pSdrObj->GetPage())
{
- if (SwDrawModel* pModel =
rWrt.pDoc->getIDocumentDrawModelAccess().GetDrawModel())
+ if (SwDrawModel* pModel =
rWrt.m_pDoc->getIDocumentDrawModelAccess().GetDrawModel())
{
if (SdrPage *pPage = pModel->GetPage(0))
{
@@ -2347,7 +2347,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export&
rWW8Wrt)
AddShape( ESCHER_ShpInst_Rectangle, 0xe00, nSecondShapeId );
EscherPropertyContainer aPropOpt;
- const SwFrmFmt &rFmt = rWrt.pDoc->GetPageDesc(0).GetMaster();
+ const SwFrmFmt &rFmt = rWrt.m_pDoc->GetPageDesc(0).GetMaster();
const SfxPoolItem* pItem = 0;
SfxItemState eState = rFmt.GetItemState(RES_BACKGROUND, true,
&pItem);
@@ -3037,7 +3037,7 @@ void SwEscherEx::WriteOCXControl( const SwFrmFmt& rFmt,
sal_uInt32 nShapeId )
{
OpenContainer( ESCHER_SpContainer );
- SwDrawModel *pModel =
rWrt.pDoc->getIDocumentDrawModelAccess().GetDrawModel();
+ SwDrawModel *pModel =
rWrt.m_pDoc->getIDocumentDrawModelAccess().GetDrawModel();
OutputDevice *pDevice = Application::GetDefaultDevice();
OSL_ENSURE(pModel && pDevice, "no model or device");
@@ -3193,7 +3193,7 @@ bool SwMSConvertControls::ExportControl(WW8Export
&rWW8Wrt, const SdrUnoObj& rFo
rWW8Wrt.OutputField(0, ww::eCONTROL, sFld,
WRITEFIELD_START|WRITEFIELD_CMD_START|WRITEFIELD_CMD_END);
- rWW8Wrt.pChpPlc->AppendFkpEntry(rWW8Wrt.Strm().Tell(),sizeof(aSpecOLE),
+ rWW8Wrt.m_pChpPlc->AppendFkpEntry(rWW8Wrt.Strm().Tell(),sizeof(aSpecOLE),
aSpecOLE);
rWW8Wrt.WriteChar( 0x1 );
rWW8Wrt.OutputField(0, ww::eCONTROL, OUString(), WRITEFIELD_END |
WRITEFIELD_CLOSE);
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 1d5aacb..e0a216c 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -148,14 +148,14 @@ static ww::eField lcl_getFieldId( const IFieldmark*
pFieldmark ) {
}
MSWordAttrIter::MSWordAttrIter( MSWordExportBase& rExport )
- : pOld( rExport.pChpIter ), m_rExport( rExport )
+ : pOld( rExport.m_pChpIter ), m_rExport( rExport )
{
- m_rExport.pChpIter = this;
+ m_rExport.m_pChpIter = this;
}
MSWordAttrIter::~MSWordAttrIter()
{
- m_rExport.pChpIter = pOld;
+ m_rExport.m_pChpIter = pOld;
}
class sortswflys :
@@ -187,7 +187,7 @@ SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const
SwTxtNode& rTxtNd) :
{
SwPosition aPos(rTxtNd);
- if (FRMDIR_HORI_RIGHT_TOP == rWr.pDoc->GetTextDirection(aPos))
+ if (FRMDIR_HORI_RIGHT_TOP == rWr.m_pDoc->GetTextDirection(aPos))
mbParaIsRTL = true;
else
mbParaIsRTL = false;
@@ -199,7 +199,7 @@ SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const
SwTxtNode& rTxtNd) :
#i2916#
Get list of any graphics which may be anchored from this paragraph.
*/
- maFlyFrms = GetFramesInNode(rWr.maFrames, rNd);
+ maFlyFrms = GetFramesInNode(rWr.m_aFrames, rNd);
std::sort(maFlyFrms.begin(), maFlyFrms.end(), sortswflys());
/*
@@ -208,7 +208,7 @@ SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const
SwTxtNode& rTxtNd) :
only be supported by word anchored inline ("as character"), so force
this in the supportable case.
*/
- if (rWr.SupportsUnicode() && rWr.bInWriteEscher)
+ if (rWr.SupportsUnicode() && rWr.m_bInWriteEscher)
{
std::for_each(maFlyFrms.begin(), maFlyFrms.end(),
std::mem_fun_ref(&sw::Frame::ForceTreatAsInline));
@@ -216,10 +216,10 @@ SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const
SwTxtNode& rTxtNd) :
maFlyIter = maFlyFrms.begin();
- if ( !m_rExport.pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+ if (
!m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
{
SwPosition aPosition( rNd, SwIndex( const_cast<SwTxtNode*>(&rNd) ) );
- pCurRedline = m_rExport.pDoc->getIDocumentRedlineAccess().GetRedline(
aPosition, &nCurRedlinePos );
+ pCurRedline =
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedline( aPosition,
&nCurRedlinePos );
}
nAktSwPos = SearchNext(1);
@@ -264,16 +264,16 @@ sal_Int32 SwWW8AttrIter::SearchNext( sal_Int32 nStartPos )
}
}
- if ( nCurRedlinePos <
m_rExport.pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() )
+ if ( nCurRedlinePos <
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() )
{
// nCurRedlinePos point to the next redline
sal_uInt16 nRedLinePos = nCurRedlinePos;
if( pCurRedline )
++nRedLinePos;
- for ( ; nRedLinePos <
m_rExport.pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size();
++nRedLinePos )
+ for ( ; nRedLinePos <
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size();
++nRedLinePos )
{
- const SwRangeRedline* pRedl =
m_rExport.pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nRedLinePos ];
+ const SwRangeRedline* pRedl =
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nRedLinePos ];
const SwPosition* pStt = pRedl->Start();
const SwPosition* pEnd = pStt == pRedl->GetPoint()
@@ -480,15 +480,15 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby
)
if ( !aExportItems.empty() )
{
- const SwModify* pOldMod = m_rExport.pOutFmtNode;
- m_rExport.pOutFmtNode = &rNd;
+ const SwModify* pOldMod = m_rExport.m_pOutFmtNode;
+ m_rExport.m_pOutFmtNode = &rNd;
m_rExport.m_aCurrentCharPropStarts.push( nSwPos );
m_rExport.ExportPoolItemsToCHP( aExportItems, GetScript() );
// HasTextItem only allowed in the above range
m_rExport.m_aCurrentCharPropStarts.pop();
- m_rExport.pOutFmtNode = pOldMod;
+ m_rExport.m_pOutFmtNode = pOldMod;
}
if( rNd.GetpSwpHints() == 0 )
@@ -582,7 +582,7 @@ FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos)
if (VMLExport::IsWaterMarkShape(pSdrObj->GetName()))
{
// This is a watermark object. Should be written ONLY in the
header
- if(m_rExport.nTxtTyp == TXT_HDFT)
+ if(m_rExport.m_nTxtTyp == TXT_HDFT)
{
// Should write a watermark in the header
m_rExport.AttrOutput().OutputFlyFrame( *maFlyIter );
@@ -648,8 +648,8 @@ bool SwWW8AttrIter::IsDropCap( int nSwPos )
bool SwWW8AttrIter::RequiresImplicitBookmark()
{
- SwImplBookmarksIter bkmkIterEnd = m_rExport.maImplicitBookmarks.end();
- for ( SwImplBookmarksIter aIter = m_rExport.maImplicitBookmarks.begin();
aIter != bkmkIterEnd; ++aIter )
+ SwImplBookmarksIter bkmkIterEnd = m_rExport.m_aImplicitBookmarks.end();
+ for ( SwImplBookmarksIter aIter = m_rExport.m_aImplicitBookmarks.begin();
aIter != bkmkIterEnd; ++aIter )
{
sal_uLong sample = aIter->second;
@@ -780,7 +780,7 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode,
sal_Int32 /*nPos*/,
/*Get defaults if no formatting on ruby text*/
const SfxItemPool *pPool = rNode.GetSwAttrSet().GetPool();
- pPool = pPool ? pPool : &m_rWW8Export.pDoc->GetAttrPool();
+ pPool = pPool ? pPool : &m_rWW8Export.m_pDoc->GetAttrPool();
const SvxFontItem &rFont = DefaultItemGet< SvxFontItem >( *pPool,
GetWhichOfScript( RES_CHRATR_FONT,nRubyScript ) );
@@ -865,8 +865,8 @@ bool AttributeOutputBase::AnalyzeURL( const OUString& rUrl,
const OUString& /*rT
if ( sRefType == "outline" )
{
OUString sLink = sMark.copy(0, nPos);
- SwImplBookmarksIter bkmkIterEnd =
GetExport().maImplicitBookmarks.end();
- for ( SwImplBookmarksIter aIter =
GetExport().maImplicitBookmarks.begin(); aIter != bkmkIterEnd; ++aIter )
+ SwImplBookmarksIter bkmkIterEnd =
GetExport().m_aImplicitBookmarks.end();
+ for ( SwImplBookmarksIter aIter =
GetExport().m_aImplicitBookmarks.begin(); aIter != bkmkIterEnd; ++aIter )
{
if ( aIter->first == sLink )
{
@@ -931,7 +931,7 @@ bool WW8AttributeOutput::StartURL( const OUString &rUrl,
const OUString &rTarget
// write the refence to the "picture" structure
sal_uLong nDataStt = m_rWW8Export.pDataStrm->Tell();
- m_rWW8Export.pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell() );
+ m_rWW8Export.m_pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell() );
// WinWord 2000 doesn't write this - so it's a temp solution by W97 ?
m_rWW8Export.WriteChar( 0x01 );
@@ -946,7 +946,7 @@ bool WW8AttributeOutput::StartURL( const OUString &rUrl,
const OUString &rTarget
sal_uInt8* pDataAdr = aArr1 + 2;
Set_UInt32( pDataAdr, nDataStt );
- m_rWW8Export.pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), sizeof(
aArr1 ), aArr1 );
+ m_rWW8Export.m_pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(),
sizeof( aArr1 ), aArr1 );
m_rWW8Export.OutputField( 0, ww::eHYPERLINK, sURL, WRITEFIELD_CMD_END );
@@ -1125,14 +1125,14 @@ void WW8AttributeOutput::FieldVanish( const OUString&
rTxt, ww::eField /*eType*/
aItems.push_back( 1 );
m_rWW8Export.WriteChar( '\x13' );
- m_rWW8Export.pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(),
aItems.size(),
+ m_rWW8Export.m_pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(),
aItems.size(),
aItems.data() );
m_rWW8Export.OutSwString( rTxt, 0, rTxt.getLength(),
m_rWW8Export.IsUnicode(),
RTL_TEXTENCODING_MS_1252 );
- m_rWW8Export.pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(),
nStt_sprmCFSpec,
+ m_rWW8Export.m_pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(),
nStt_sprmCFSpec,
aItems.data() );
m_rWW8Export.WriteChar( '\x15' );
- m_rWW8Export.pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(),
aItems.size(),
+ m_rWW8Export.m_pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(),
aItems.size(),
aItems.data() );
}
@@ -1256,9 +1256,9 @@ bool
SwWW8AttrIter::IncludeEndOfParaCRInRedlineProperties( sal_Int32 nEnd ) cons
{
// search next Redline
for( sal_uInt16 nPos = nCurRedlinePos;
- nPos <
m_rExport.pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size(); ++nPos )
+ nPos <
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size(); ++nPos )
{
- const SwRangeRedline *pRange =
m_rExport.pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[nPos];
+ const SwRangeRedline *pRange =
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[nPos];
const SwPosition* pEnd = pRange->End();
const SwPosition* pStart = pRange->Start();
bool bBreak = true;
@@ -1313,9 +1313,9 @@ const SwRedlineData*
SwWW8AttrIter::GetParagraphLevelRedline( )
pCurRedline = NULL;
// ToDo : this is not the most ideal ... should start maybe from
'nCurRedlinePos'
- for( sal_uInt16 nRedlinePos = 0; nRedlinePos <
m_rExport.pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size();
++nRedlinePos )
+ for( sal_uInt16 nRedlinePos = 0; nRedlinePos <
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size();
++nRedlinePos )
{
- const SwRangeRedline* pRedl =
m_rExport.pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlinePos ];
+ const SwRangeRedline* pRedl =
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlinePos ];
const SwPosition* pCheckedStt = pRedl->Start();
@@ -1367,10 +1367,10 @@ const SwRedlineData* SwWW8AttrIter::GetRunLevelRedline(
sal_Int32 nPos )
if( !pCurRedline )
{
// search next Redline
- for( ; nCurRedlinePos <
m_rExport.pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size();
+ for( ; nCurRedlinePos <
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size();
++nCurRedlinePos )
{
- const SwRangeRedline* pRedl =
m_rExport.pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nCurRedlinePos ];
+ const SwRangeRedline* pRedl =
m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nCurRedlinePos ];
const SwPosition* pStt = pRedl->Start();
const SwPosition* pEnd = pStt == pRedl->GetPoint()
@@ -1417,9 +1417,9 @@ const SwRedlineData* SwWW8AttrIter::GetRunLevelRedline(
sal_Int32 nPos )
short MSWordExportBase::GetCurrentPageDirection() const
{
- const SwFrmFmt &rFmt = pAktPageDesc
- ? pAktPageDesc->GetMaster()
- : pDoc->GetPageDesc( 0 ).GetMaster();
+ const SwFrmFmt &rFmt = m_pAktPageDesc
+ ? m_pAktPageDesc->GetMaster()
+ : m_pDoc->GetPageDesc( 0 ).GetMaster();
return rFmt.GetFrmDir().GetValue();
}
@@ -1427,21 +1427,21 @@ short MSWordExportBase::GetDefaultFrameDirection( )
const
{
short nDir = FRMDIR_ENVIRONMENT;
- if ( bOutPageDescs )
+ if ( m_bOutPageDescs )
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
