summaryrefslogtreecommitdiff
path: root/sw/source/filter/ascii
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/ascii')
-rw-r--r--sw/source/filter/ascii/ascatr.cxx54
-rw-r--r--sw/source/filter/ascii/parasc.cxx20
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx10
3 files changed, 42 insertions, 42 deletions
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 0be50d3db442..a4f32b8d2822 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -45,13 +45,13 @@
class SwASC_AttrIter
{
SwASCWriter& rWrt;
- const SwTxtNode& rNd;
+ const SwTextNode& rNd;
sal_Int32 nAktSwPos;
sal_Int32 SearchNext( sal_Int32 nStartPos );
public:
- SwASC_AttrIter( SwASCWriter& rWrt, const SwTxtNode& rNd, sal_Int32 nStt );
+ SwASC_AttrIter( SwASCWriter& rWrt, const SwTextNode& rNd, sal_Int32 nStt );
void NextPos()
{
@@ -68,10 +68,10 @@ public:
SwASC_AttrIter::SwASC_AttrIter(
SwASCWriter& rWr,
- const SwTxtNode& rTxtNd,
+ const SwTextNode& rTextNd,
sal_Int32 nStt )
: rWrt( rWr )
- , rNd( rTxtNd )
+ , rNd( rTextNd )
, nAktSwPos( 0 )
{
nAktSwPos = SearchNext( nStt + 1 );
@@ -80,14 +80,14 @@ SwASC_AttrIter::SwASC_AttrIter(
sal_Int32 SwASC_AttrIter::SearchNext( sal_Int32 nStartPos )
{
sal_Int32 nMinPos = SAL_MAX_INT32;
- const SwpHints* pTxtAttrs = rNd.GetpSwpHints();
- if( pTxtAttrs )
+ const SwpHints* pTextAttrs = rNd.GetpSwpHints();
+ if( pTextAttrs )
{
- // TODO: This can be optimized, if we make use of the fact that the TxtAttrs
+ // TODO: This can be optimized, if we make use of the fact that the TextAttrs
// are sorted by starting position. We would need to remember two indices, however.
- for ( size_t i = 0; i < pTxtAttrs->Count(); ++i )
+ for ( size_t i = 0; i < pTextAttrs->Count(); ++i )
{
- const SwTxtAttr* pHt = (*pTxtAttrs)[i];
+ const SwTextAttr* pHt = (*pTextAttrs)[i];
if ( pHt->HasDummyChar() )
{
sal_Int32 nPos = pHt->GetStart();
@@ -120,12 +120,12 @@ sal_Int32 SwASC_AttrIter::SearchNext( sal_Int32 nStartPos )
bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos )
{
bool bRet = false;
- const SwpHints* pTxtAttrs = rNd.GetpSwpHints();
- if( pTxtAttrs )
+ const SwpHints* pTextAttrs = rNd.GetpSwpHints();
+ if( pTextAttrs )
{
- for( size_t i = 0; i < pTxtAttrs->Count(); ++i )
+ for( size_t i = 0; i < pTextAttrs->Count(); ++i )
{
- const SwTxtAttr* pHt = (*pTxtAttrs)[i];
+ const SwTextAttr* pHt = (*pTextAttrs)[i];
if ( ( pHt->HasDummyChar()
|| pHt->HasContent() )
&& nSwPos == pHt->GetStart() )
@@ -137,21 +137,21 @@ bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos )
case RES_TXTATR_FIELD:
case RES_TXTATR_ANNOTATION:
case RES_TXTATR_INPUTFIELD:
- sOut = static_txtattr_cast<SwTxtFld const*>(pHt)
- ->GetFmtFld().GetField()->ExpandField(true);
+ sOut = static_txtattr_cast<SwTextField const*>(pHt)
+ ->GetFormatField().GetField()->ExpandField(true);
break;
case RES_TXTATR_FTN:
{
- const SwFmtFtn& rFtn = pHt->GetFtn();
- if( !rFtn.GetNumStr().isEmpty() )
- sOut = rFtn.GetNumStr();
- else if( rFtn.IsEndNote() )
- sOut = rWrt.pDoc->GetEndNoteInfo().aFmt.
- GetNumStr( rFtn.GetNumber() );
+ const SwFormatFootnote& rFootnote = pHt->GetFootnote();
+ if( !rFootnote.GetNumStr().isEmpty() )
+ sOut = rFootnote.GetNumStr();
+ else if( rFootnote.IsEndNote() )
+ sOut = rWrt.pDoc->GetEndNoteInfo().aFormat.
+ GetNumStr( rFootnote.GetNumber() );
else
- sOut = rWrt.pDoc->GetFtnInfo().aFmt.
- GetNumStr( rFtn.GetNumber() );
+ sOut = rWrt.pDoc->GetFootnoteInfo().aFormat.
+ GetNumStr( rFootnote.GetNumber() );
}
break;
}
@@ -167,9 +167,9 @@ bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos )
// Output of the node
-static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
+static Writer& OutASC_SwTextNode( Writer& rWrt, SwContentNode& rNode )
{
- const SwTxtNode& rNd = static_cast<SwTxtNode&>(rNode);
+ const SwTextNode& rNd = static_cast<SwTextNode&>(rNode);
sal_Int32 nStrPos = rWrt.pCurPam->GetPoint()->nContent.GetIndex();
const sal_Int32 nNodeEnd = rNd.Len();
@@ -190,7 +190,7 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
}
}
- OUString aStr( rNd.GetTxt() );
+ OUString aStr( rNd.GetText() );
if( rWrt.bASCII_ParaAsBlanc )
aStr = aStr.replace(0x0A, ' ');
@@ -231,7 +231,7 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
*/
SwNodeFnTab aASCNodeFnTab = {
-/* RES_TXTNODE */ OutASC_SwTxtNode,
+/* RES_TXTNODE */ OutASC_SwTextNode,
/* RES_GRFNODE */ 0,
/* RES_OLENODE */ 0
};
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 6bc9f674d3f5..202bad3582af 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -144,23 +144,23 @@ sal_uLong SwASCIIParser::CallParser()
::StartProgress( STR_STATSTR_W4WREAD, 0, nFileSize, pDoc->GetDocShell() );
SwPaM* pInsPam = 0;
- sal_Int32 nSttCntnt = 0;
+ sal_Int32 nSttContent = 0;
if (!bNewDoc)
{
const SwNodeIndex& rTmp = pPam->GetPoint()->nNode;
pInsPam = new SwPaM( rTmp, rTmp, 0, -1 );
- nSttCntnt = pPam->GetPoint()->nContent.GetIndex();
+ nSttContent = pPam->GetPoint()->nContent.GetIndex();
}
- SwTxtFmtColl *pColl = 0;
+ SwTextFormatColl *pColl = 0;
if (bNewDoc)
{
- pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_HTML_PRE, false);
+ pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_HTML_PRE, false);
if (!pColl)
- pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD,false);
+ pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD,false);
if (pColl)
- pDoc->SetTxtFmtColl(*pPam, pColl);
+ pDoc->SetTextFormatColl(*pPam, pColl);
}
sal_uLong nError = ReadChars();
@@ -212,7 +212,7 @@ sal_uLong SwASCIIParser::CallParser()
if (SfxItemState::SET == pItemSet->GetItemState(*pWhichIds,
false, &pItem))
{
- pColl->SetFmtAttr( *pItem );
+ pColl->SetFormatAttr( *pItem );
pItemSet->ClearItem( *pWhichIds );
}
++pWhichIds;
@@ -227,7 +227,7 @@ sal_uLong SwASCIIParser::CallParser()
*pInsPam->GetMark() = *pPam->GetPoint();
++pInsPam->GetPoint()->nNode;
pInsPam->GetPoint()->nContent.Assign(
- pInsPam->GetCntntNode(), nSttCntnt );
+ pInsPam->GetContentNode(), nSttContent );
// !!!!!
OSL_ENSURE( false, "Have to change - hard attr. to para. style" );
@@ -428,7 +428,7 @@ sal_uLong SwASCIIParser::ReadChars()
}
pDoc->getIDocumentContentOperations().SplitNode( *pPam->GetPoint(), false );
pDoc->getIDocumentContentOperations().InsertPoolItem(
- *pPam, SvxFmtBreakItem( SVX_BREAK_PAGE_BEFORE, RES_BREAK ) );
+ *pPam, SvxFormatBreakItem( SVX_BREAK_PAGE_BEFORE, RES_BREAK ) );
pLastStt = pStt;
nLineLen = 0;
bIns = false;
@@ -489,7 +489,7 @@ void SwASCIIParser::InsertText( const OUString& rStr )
{
pDoc->getIDocumentContentOperations().InsertString( *pPam, rStr );
pDoc->UpdateRsid( *pPam, rStr.getLength() );
- pDoc->UpdateParRsid( pPam->GetPoint()->nNode.GetNode().GetTxtNode() );
+ pDoc->UpdateParRsid( pPam->GetPoint()->nNode.GetNode().GetTextNode() );
if( pItemSet && g_pBreakIt && nScript != ( SvtScriptType::LATIN |
SvtScriptType::ASIAN |
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 66a671622c04..907ea407ffc9 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -118,15 +118,15 @@ sal_uLong SwASCWriter::WriteStream()
(pCurPam->GetPoint()->nNode.GetIndex() == pCurPam->GetMark()->nNode.GetIndex() &&
pCurPam->GetPoint()->nContent.GetIndex() <= pCurPam->GetMark()->nContent.GetIndex()) )
{
- SwTxtNode* pNd = pCurPam->GetPoint()->nNode.GetNode().GetTxtNode();
+ SwTextNode* pNd = pCurPam->GetPoint()->nNode.GetNode().GetTextNode();
if( pNd )
{
// Should we have frames only?
// That's possible, if we put a frame selection into the clipboard
if( bTstFly && bWriteAll &&
- pNd->GetTxt().isEmpty() &&
+ pNd->GetText().isEmpty() &&
// Frame exists
- pDoc->GetSpzFrmFmts()->size() &&
+ pDoc->GetSpzFrameFormats()->size() &&
// Only one node in the array
pDoc->GetNodes().GetEndOfExtras().GetIndex() + 3 ==
pDoc->GetNodes().GetEndOfContent().GetIndex() &&
@@ -136,8 +136,8 @@ sal_uLong SwASCWriter::WriteStream()
{
// Print the frame's content.
// It is always at position 0!
- const SwFrmFmt* pFmt = (*pDoc->GetSpzFrmFmts())[ 0 ];
- const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+ const SwFrameFormat* pFormat = (*pDoc->GetSpzFrameFormats())[ 0 ];
+ const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
if( pIdx )
{
delete pCurPam;
generated by cgit (git 2.34.1) at 2024-05-23 09:02:39 +0000