summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
commitab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch)
tree36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw/source/filter
parent0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff)
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/source/filter')
-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
-rw-r--r--sw/source/filter/basflt/fltini.cxx58
-rw-r--r--sw/source/filter/basflt/fltshell.cxx116
-rw-r--r--sw/source/filter/basflt/iodetect.cxx14
-rw-r--r--sw/source/filter/basflt/shellio.cxx104
-rw-r--r--sw/source/filter/html/css1atr.cxx454
-rw-r--r--sw/source/filter/html/htmlatr.cxx552
-rw-r--r--sw/source/filter/html/htmlbas.cxx12
-rw-r--r--sw/source/filter/html/htmlcss1.cxx330
-rw-r--r--sw/source/filter/html/htmlctxt.cxx28
-rw-r--r--sw/source/filter/html/htmldrawreader.cxx24
-rw-r--r--sw/source/filter/html/htmldrawwriter.cxx12
-rw-r--r--sw/source/filter/html/htmlfld.cxx174
-rw-r--r--sw/source/filter/html/htmlfldw.cxx172
-rw-r--r--sw/source/filter/html/htmlfly.cxx24
-rw-r--r--sw/source/filter/html/htmlfly.hxx10
-rw-r--r--sw/source/filter/html/htmlflywriter.cxx346
-rw-r--r--sw/source/filter/html/htmlform.cxx148
-rw-r--r--sw/source/filter/html/htmlforw.cxx28
-rw-r--r--sw/source/filter/html/htmlftn.cxx144
-rw-r--r--sw/source/filter/html/htmlgrin.cxx188
-rw-r--r--sw/source/filter/html/htmlnum.cxx16
-rw-r--r--sw/source/filter/html/htmlnum.hxx6
-rw-r--r--sw/source/filter/html/htmlnumreader.cxx194
-rw-r--r--sw/source/filter/html/htmlnumwriter.cxx28
-rw-r--r--sw/source/filter/html/htmlplug.cxx114
-rw-r--r--sw/source/filter/html/htmlsect.cxx192
-rw-r--r--sw/source/filter/html/htmltab.cxx540
-rw-r--r--sw/source/filter/html/htmltabw.cxx114
-rw-r--r--sw/source/filter/html/svxcss1.cxx20
-rw-r--r--sw/source/filter/html/swcss1.hxx52
-rw-r--r--sw/source/filter/html/swhtml.cxx536
-rw-r--r--sw/source/filter/html/swhtml.hxx60
-rw-r--r--sw/source/filter/html/wrthtml.cxx186
-rw-r--r--sw/source/filter/html/wrthtml.hxx130
-rw-r--r--sw/source/filter/inc/fltini.hxx6
-rw-r--r--sw/source/filter/inc/fltshell.hxx26
-rw-r--r--sw/source/filter/inc/msfilter.hxx34
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx4
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx2
-rw-r--r--sw/source/filter/inc/wwstyles.hxx4
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx32
-rw-r--r--sw/source/filter/writer/writer.cxx34
-rw-r--r--sw/source/filter/writer/wrt_fn.cxx4
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx30
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx54
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.hxx16
-rw-r--r--sw/source/filter/ww8/attributeoutputbase.hxx120
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx412
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx86
-rw-r--r--sw/source/filter/ww8/docxexport.cxx82
-rw-r--r--sw/source/filter/ww8/docxexport.hxx26
-rw-r--r--sw/source/filter/ww8/docxexportfilter.cxx6
-rw-r--r--sw/source/filter/ww8/docxfootnotes.hxx10
-rw-r--r--sw/source/filter/ww8/docxsdrexport.cxx136
-rw-r--r--sw/source/filter/ww8/docxsdrexport.hxx18
-rw-r--r--sw/source/filter/ww8/docxtablestyleexport.cxx126
-rw-r--r--sw/source/filter/ww8/escher.hxx46
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx346
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx72
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx176
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx44
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.cxx6
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx24
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx6
-rw-r--r--sw/source/filter/ww8/rtfstringbuffer.cxx14
-rw-r--r--sw/source/filter/ww8/rtfstringbuffer.hxx8
-rw-r--r--sw/source/filter/ww8/sprmids.hxx4
-rw-r--r--sw/source/filter/ww8/styles.cxx4
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx134
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx112
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx158
-rw-r--r--sw/source/filter/ww8/writerwordglue.hxx8
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx454
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx488
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx220
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx538
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx490
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx362
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx30
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx958
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx56
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx32
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx258
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx66
-rw-r--r--sw/source/filter/ww8/ww8par.cxx648
-rw-r--r--sw/source/filter/ww8/ww8par.hxx212
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx384
-rw-r--r--sw/source/filter/ww8/ww8par2.hxx4
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx300
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx32
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx368
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx432
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx356
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx102
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx4
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx4
-rw-r--r--sw/source/filter/xml/swxml.cxx42
-rw-r--r--sw/source/filter/xml/wrtxml.cxx2
-rw-r--r--sw/source/filter/xml/xmlexp.cxx6
-rw-r--r--sw/source/filter/xml/xmlexp.hxx26
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx32
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx34
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx36
-rw-r--r--sw/source/filter/xml/xmlimp.cxx92
-rw-r--r--sw/source/filter/xml/xmlimp.hxx2
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx30
-rw-r--r--sw/source/filter/xml/xmliteme.cxx6
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx2
-rw-r--r--sw/source/filter/xml/xmltble.cxx260
-rw-r--r--sw/source/filter/xml/xmltbli.cxx238
-rw-r--r--sw/source/filter/xml/xmltbli.hxx18
-rw-r--r--sw/source/filter/xml/xmltexte.cxx30
-rw-r--r--sw/source/filter/xml/xmltexte.hxx4
-rw-r--r--sw/source/filter/xml/xmltexti.cxx126
-rw-r--r--sw/source/filter/xml/xmltexti.hxx4
118 files changed, 7714 insertions, 7714 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;
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index e1da5d904eb7..0144e2c4fb3d 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -277,19 +277,19 @@ void StgReader::SetFltName( const OUString& rFltNm )
SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc& rDoc, bool bNDoc )
{
- pNumRuleTbl = new SwNumRuleTbl();
- pNumRuleTbl->reserve(8);
+ pNumRuleTable = new SwNumRuleTable();
+ pNumRuleTable->reserve(8);
if( !bNDoc )
- pNumRuleTbl->insert( pNumRuleTbl->begin(),
- rDoc.GetNumRuleTbl().begin(), rDoc.GetNumRuleTbl().end() );
+ pNumRuleTable->insert( pNumRuleTable->begin(),
+ rDoc.GetNumRuleTable().begin(), rDoc.GetNumRuleTable().end() );
}
SwRelNumRuleSpaces::~SwRelNumRuleSpaces()
{
- if( pNumRuleTbl )
+ if( pNumRuleTable )
{
- pNumRuleTbl->clear();
- delete pNumRuleTbl;
+ pNumRuleTable->clear();
+ delete pNumRuleTable;
}
}
@@ -298,39 +298,39 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
{
const SfxPoolItem* pItem = 0;
if( SfxItemState::SET != rFlySet.GetItemState( RES_FRM_SIZE, true, &pItem ) ||
- MINFLY > static_cast<const SwFmtFrmSize*>(pItem)->GetWidth() )
+ MINFLY > static_cast<const SwFormatFrmSize*>(pItem)->GetWidth() )
{
- SwFmtFrmSize aSz(static_cast<const SwFmtFrmSize&>(rFlySet.Get(RES_FRM_SIZE, true)));
+ SwFormatFrmSize aSz(static_cast<const SwFormatFrmSize&>(rFlySet.Get(RES_FRM_SIZE, true)));
if (pItem)
- aSz = static_cast<const SwFmtFrmSize&>(*pItem);
+ aSz = static_cast<const SwFormatFrmSize&>(*pItem);
SwTwips nWidth;
// determine the width; if there is a table use the width of the table;
// otherwise use the width of the page
- const SwTableNode* pTblNd = rAnchor.GetNode().FindTableNode();
- if( pTblNd )
- nWidth = pTblNd->GetTable().GetFrmFmt()->GetFrmSize().GetWidth();
+ const SwTableNode* pTableNd = rAnchor.GetNode().FindTableNode();
+ if( pTableNd )
+ nWidth = pTableNd->GetTable().GetFrameFormat()->GetFrmSize().GetWidth();
else
nWidth = nPageWidth;
- const SwNodeIndex* pSttNd = static_cast<const SwFmtCntnt&>(rFlySet.Get( RES_CNTNT )).
- GetCntntIdx();
+ const SwNodeIndex* pSttNd = static_cast<const SwFormatContent&>(rFlySet.Get( RES_CNTNT )).
+ GetContentIdx();
if( pSttNd )
{
bool bOnlyOneNode = true;
sal_uLong nMinFrm = 0;
sal_uLong nMaxFrm = 0;
- SwTxtNode* pFirstTxtNd = 0;
+ SwTextNode* pFirstTextNd = 0;
SwNodeIndex aIdx( *pSttNd, 1 );
SwNodeIndex aEnd( *pSttNd->GetNode().EndOfSectionNode() );
while( aIdx < aEnd )
{
- SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
- if( pTxtNd )
+ SwTextNode *pTextNd = aIdx.GetNode().GetTextNode();
+ if( pTextNd )
{
- if( !pFirstTxtNd )
- pFirstTxtNd = pTxtNd;
- else if( pFirstTxtNd != pTxtNd )
+ if( !pFirstTextNd )
+ pFirstTextNd = pTextNd;
+ else if( pFirstTextNd != pTextNd )
{
// forget it
bOnlyOneNode = false;
@@ -338,24 +338,24 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
}
sal_uLong nAbsMinCnts;
- pTxtNd->GetMinMaxSize( aIdx.GetIndex(), nMinFrm, nMaxFrm, nAbsMinCnts );
+ pTextNd->GetMinMaxSize( aIdx.GetIndex(), nMinFrm, nMaxFrm, nAbsMinCnts );
}
++aIdx;
}
if( bOnlyOneNode )
{
- if( nMinFrm < MINLAY && pFirstTxtNd )
+ if( nMinFrm < MINLAY && pFirstTextNd )
{
// if the first node dont contained any content, then
// insert one char in it calc again and delete once again
- SwIndex aNdIdx( pFirstTxtNd );
- pFirstTxtNd->InsertText(OUString("MM"), aNdIdx);
+ SwIndex aNdIdx( pFirstTextNd );
+ pFirstTextNd->InsertText(OUString("MM"), aNdIdx);
sal_uLong nAbsMinCnts;
- pFirstTxtNd->GetMinMaxSize( pFirstTxtNd->GetIndex(),
+ pFirstTextNd->GetMinMaxSize( pFirstTextNd->GetIndex(),
nMinFrm, nMaxFrm, nAbsMinCnts );
aNdIdx -= 2;
- pFirstTxtNd->EraseText( aNdIdx, 2 );
+ pFirstTextNd->EraseText( aNdIdx, 2 );
}
// consider border and distance to content
@@ -395,9 +395,9 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
aSz.SetHeight( MINFLY );
rFlySet.Put( aSz );
}
- else if( MINFLY > static_cast<const SwFmtFrmSize*>(pItem)->GetHeight() )
+ else if( MINFLY > static_cast<const SwFormatFrmSize*>(pItem)->GetHeight() )
{
- SwFmtFrmSize aSz( *static_cast<const SwFmtFrmSize*>(pItem) );
+ SwFormatFrmSize aSz( *static_cast<const SwFormatFrmSize*>(pItem) );
aSz.SetHeight( MINFLY );
rFlySet.Put( aSz );
}
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index 7a72d158f724..be5d9ebc5e48 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -67,9 +67,9 @@
using namespace com::sun::star;
-static SwCntntNode* GetCntntNode(SwDoc* pDoc, SwNodeIndex& rIdx, bool bNext)
+static SwContentNode* GetContentNode(SwDoc* pDoc, SwNodeIndex& rIdx, bool bNext)
{
- SwCntntNode * pCNd = rIdx.GetNode().GetCntntNode();
+ SwContentNode * pCNd = rIdx.GetNode().GetContentNode();
if(!pCNd && 0 == (pCNd = bNext ? pDoc->GetNodes().GoNext(&rIdx)
: SwNodes::GoPrevious(&rIdx)))
{
@@ -120,28 +120,28 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck,
// The only position of 0x0D will not be able to make region in the old logic
// because it is beyond the length of para...need special consideration here.
- SwCntntNode *const pCntntNode(
- SwNodeIndex(rMkPos.m_nNode, +1).GetNode().GetCntntNode());
+ SwContentNode *const pContentNode(
+ SwNodeIndex(rMkPos.m_nNode, +1).GetNode().GetContentNode());
if (rMkPos == rPtPos &&
- ((0 != rPtPos.m_nCntnt) || (pCntntNode && (0 != pCntntNode->Len())))
+ ((0 != rPtPos.m_nContent) || (pContentNode && (0 != pContentNode->Len())))
&& ( RES_TXTATR_FIELD != nWhich
&& RES_TXTATR_ANNOTATION != nWhich
&& RES_TXTATR_INPUTFIELD != nWhich )
- && !(bIsParaEnd && pCntntNode && pCntntNode->IsTxtNode() && 0 != pCntntNode->Len() ))
+ && !(bIsParaEnd && pContentNode && pContentNode->IsTextNode() && 0 != pContentNode->Len() ))
{
return false;
}
// The content indices always apply to the node!
rRegion.GetPoint()->nNode = rMkPos.m_nNode.GetIndex() + 1;
- SwCntntNode* pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, true);
- rRegion.GetPoint()->nContent.Assign(pCNd, rMkPos.m_nCntnt);
+ SwContentNode* pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode, true);
+ rRegion.GetPoint()->nContent.Assign(pCNd, rMkPos.m_nContent);
rRegion.SetMark();
if (rMkPos.m_nNode != rPtPos.m_nNode)
{
rRegion.GetPoint()->nNode = rPtPos.m_nNode.GetIndex() + 1;
- pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, false);
+ pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode, false);
}
- rRegion.GetPoint()->nContent.Assign(pCNd, rPtPos.m_nCntnt);
+ rRegion.GetPoint()->nContent.Assign(pCNd, rPtPos.m_nContent);
OSL_ENSURE( CheckNodesRange( rRegion.Start()->nNode,
rRegion.End()->nNode, true ),
"atttribute or similar crosses section-boundaries" );
@@ -186,22 +186,22 @@ void SwFltControlStack::MoveAttrs( const SwPosition& rPos )
SwFltStackEntry& rEntry = maEntries[i];
if (
(rEntry.m_aMkPos.m_nNode.GetIndex()+1 == nPosNd) &&
- (rEntry.m_aMkPos.m_nCntnt >= nPosCt)
+ (rEntry.m_aMkPos.m_nContent >= nPosCt)
)
{
- rEntry.m_aMkPos.m_nCntnt++;
- OSL_ENSURE( rEntry.m_aMkPos.m_nCntnt
- <= pDoc->GetNodes()[nPosNd]->GetCntntNode()->Len(),
+ rEntry.m_aMkPos.m_nContent++;
+ OSL_ENSURE( rEntry.m_aMkPos.m_nContent
+ <= pDoc->GetNodes()[nPosNd]->GetContentNode()->Len(),
"Attribute ends after end of line" );
}
if (
(rEntry.m_aPtPos.m_nNode.GetIndex()+1 == nPosNd) &&
- (rEntry.m_aPtPos.m_nCntnt >= nPosCt)
+ (rEntry.m_aPtPos.m_nContent >= nPosCt)
)
{
- rEntry.m_aPtPos.m_nCntnt++;
- OSL_ENSURE( rEntry.m_aPtPos.m_nCntnt
- <= pDoc->GetNodes()[nPosNd]->GetCntntNode()->Len(),
+ rEntry.m_aPtPos.m_nContent++;
+ OSL_ENSURE( rEntry.m_aPtPos.m_nContent
+ <= pDoc->GetNodes()[nPosNd]->GetContentNode()->Len(),
"Attribute ends after end of line" );
}
}
@@ -394,7 +394,7 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos,
if (rEntry.m_aPtPos.m_nNode.GetIndex() == aFltPos.m_nNode.GetIndex())
{
if (bLastEntry && nAttrId == rEntry.pAttr->Which() &&
- rEntry.m_aPtPos.m_nCntnt == aFltPos.m_nCntnt)
+ rEntry.m_aPtPos.m_nContent == aFltPos.m_nContent)
{
//potential candidate for merging with an identical
//property beginning at rPos
@@ -420,8 +420,8 @@ static void MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
// attribute's format needs to be set.
rRegion.DeleteMark();
rRegion.GetPoint()->nNode = rEntry.m_aMkPos.m_nNode.GetIndex() + 1;
- SwCntntNode* pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, true);
- rRegion.GetPoint()->nContent.Assign(pCNd, rEntry.m_aMkPos.m_nCntnt);
+ SwContentNode* pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode, true);
+ rRegion.GetPoint()->nContent.Assign(pCNd, rEntry.m_aMkPos.m_nContent);
}
// MakeBookRegionOrPoint() behaves like MakeRegionOrPoint, except that
@@ -456,12 +456,12 @@ static bool IterateNumrulePiece( const SwNodeIndex& rEnd,
SwNodeIndex& rTmpStart, SwNodeIndex& rTmpEnd )
{
while( ( rTmpStart <= rEnd )
- && !( rTmpStart.GetNode().IsTxtNode() ) ) // look for valid start
+ && !( rTmpStart.GetNode().IsTextNode() ) ) // look for valid start
++rTmpStart;
rTmpEnd = rTmpStart;
while( ( rTmpEnd <= rEnd )
- && ( rTmpEnd.GetNode().IsTxtNode() ) ) // look for valid end + 1
+ && ( rTmpEnd.GetNode().IsTextNode() ) ) // look for valid end + 1
++rTmpEnd;
--rTmpEnd; // valid end
@@ -500,19 +500,19 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
{
case RES_FLTR_ANCHOR:
{
- SwFrmFmt* pFmt = static_cast<SwFltAnchor*>(rEntry.pAttr)->GetFrmFmt();
- if (pFmt != NULL)
+ SwFrameFormat* pFormat = static_cast<SwFltAnchor*>(rEntry.pAttr)->GetFrameFormat();
+ if (pFormat != NULL)
{
MakePoint(rEntry, pDoc, aRegion);
- SwFmtAnchor aAnchor(pFmt->GetAnchor());
+ SwFormatAnchor aAnchor(pFormat->GetAnchor());
aAnchor.SetAnchor(aRegion.GetPoint());
- pFmt->SetFmtAttr(aAnchor);
+ pFormat->SetFormatAttr(aAnchor);
// So the frames will be created when inserting into
// existing doc (after setting the anchor!):
if(pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()
- && (FLY_AT_PARA == pFmt->GetAnchor().GetAnchorId()))
+ && (FLY_AT_PARA == pFormat->GetAnchor().GetAnchorId()))
{
- pFmt->MakeFrms();
+ pFormat->MakeFrms();
}
}
}
@@ -561,16 +561,16 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
if (IsFlagSet(BOOK_TO_VAR_REF))
{
- SwFieldType* pFT = pDoc->getIDocumentFieldsAccess().GetFldType(RES_SETEXPFLD, rName, false);
+ SwFieldType* pFT = pDoc->getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, rName, false);
if (!pFT)
{
SwSetExpFieldType aS(pDoc, rName, nsSwGetSetExpType::GSE_STRING);
- pFT = pDoc->getIDocumentFieldsAccess().InsertFldType(aS);
+ pFT = pDoc->getIDocumentFieldsAccess().InsertFieldType(aS);
}
- SwSetExpField aFld(static_cast<SwSetExpFieldType*>(pFT), pB->GetValSys());
- aFld.SetSubType( nsSwExtendedSubType::SUB_INVISIBLE );
+ SwSetExpField aField(static_cast<SwSetExpFieldType*>(pFT), pB->GetValSys());
+ aField.SetSubType( nsSwExtendedSubType::SUB_INVISIBLE );
MakePoint(rEntry, pDoc, aRegion);
- pDoc->getIDocumentContentOperations().InsertPoolItem(aRegion, SwFmtFld(aFld));
+ pDoc->getIDocumentContentOperations().InsertPoolItem(aRegion, SwFormatField(aField));
MoveAttrs( *(aRegion.GetPoint()) );
}
if ( ( !IsFlagSet(HYPO) || IsFlagSet(BOOK_AND_REF) ) &&
@@ -604,10 +604,10 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
// test if on this node there had been a pagebreak BEFORE the
// tox attribute was put on the stack
SfxItemSet aBkSet( pDoc->GetAttrPool(), RES_PAGEDESC, RES_BREAK );
- SwCntntNode* pNd = 0;
+ SwContentNode* pNd = 0;
if( !pTOXAttr->HadBreakItem() || !pTOXAttr->HadPageDescItem() )
{
- pNd = pPoint->nNode.GetNode().GetCntntNode();
+ pNd = pPoint->nNode.GetNode().GetContentNode();
if( pNd )
{
const SfxItemSet* pSet = pNd->GetpSwAttrSet();
@@ -709,7 +709,7 @@ bool SwFltControlStack::CheckSdOD(sal_Int32 /*nStart*/, sal_Int32 /*nEnd*/)
return false;
}
-SfxPoolItem* SwFltControlStack::GetFmtStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos)
+SfxPoolItem* SwFltControlStack::GetFormatStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos)
{
size_t nSize = maEntries.size();
@@ -768,11 +768,11 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
bool bEntryStartAfterSelStart =
(rEntry.m_aMkPos.m_nNode == aStartNode &&
- rEntry.m_aMkPos.m_nCntnt >= nStartIdx);
+ rEntry.m_aMkPos.m_nContent >= nStartIdx);
bool bEntryStartBeforeSelEnd =
(rEntry.m_aMkPos.m_nNode == aEndNode &&
- rEntry.m_aMkPos.m_nCntnt <= nEndIdx);
+ rEntry.m_aMkPos.m_nContent <= nEndIdx);
bool bEntryEndAfterSelStart = false;
bool bEntryEndBeforeSelEnd = false;
@@ -780,11 +780,11 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
{
bEntryEndAfterSelStart =
(rEntry.m_aPtPos.m_nNode == aStartNode &&
- rEntry.m_aPtPos.m_nCntnt >= nStartIdx);
+ rEntry.m_aPtPos.m_nContent >= nStartIdx);
bEntryEndBeforeSelEnd =
(rEntry.m_aPtPos.m_nNode == aEndNode &&
- rEntry.m_aPtPos.m_nCntnt <= nEndIdx);
+ rEntry.m_aPtPos.m_nContent <= nEndIdx);
}
bool bTotallyContained = false;
@@ -803,7 +803,7 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
continue;
}
- const sal_Int32 nCntntDiff = nEndIdx - nStartIdx;
+ const sal_Int32 nContentDiff = nEndIdx - nStartIdx;
// to be adjusted
if (bEntryStartAfterSelStart)
@@ -814,7 +814,7 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
rEntry.m_aMkPos.SetPos(aStartNode, nStartIdx);
}
else
- rEntry.m_aMkPos.m_nCntnt -= nCntntDiff;
+ rEntry.m_aMkPos.m_nContent -= nContentDiff;
}
if (bEntryEndAfterSelStart)
@@ -822,28 +822,28 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
if (bEntryEndBeforeSelEnd)
rEntry.m_aPtPos.SetPos(aStartNode, nStartIdx);
else
- rEntry.m_aPtPos.m_nCntnt -= nCntntDiff;
+ rEntry.m_aPtPos.m_nContent -= nContentDiff;
}
- //That's what Open is, end equal to start, and nPtCntnt is invalid
+ //That's what Open is, end equal to start, and nPtContent is invalid
if (rEntry.bOpen)
rEntry.m_aPtPos = rEntry.m_aMkPos;
}
}
// methods of SwFltAnchor follow
-SwFltAnchor::SwFltAnchor(SwFrmFmt* pFmt) :
- SfxPoolItem(RES_FLTR_ANCHOR), pFrmFmt(pFmt)
+SwFltAnchor::SwFltAnchor(SwFrameFormat* pFormat) :
+ SfxPoolItem(RES_FLTR_ANCHOR), pFrameFormat(pFormat)
{
pClient = new SwFltAnchorClient(this);
- pFrmFmt->Add(pClient);
+ pFrameFormat->Add(pClient);
}
SwFltAnchor::SwFltAnchor(const SwFltAnchor& rCpy) :
- SfxPoolItem(RES_FLTR_ANCHOR), pFrmFmt(rCpy.pFrmFmt)
+ SfxPoolItem(RES_FLTR_ANCHOR), pFrameFormat(rCpy.pFrameFormat)
{
pClient = new SwFltAnchorClient(this);
- pFrmFmt->Add(pClient);
+ pFrameFormat->Add(pClient);
}
SwFltAnchor::~SwFltAnchor()
@@ -851,16 +851,16 @@ SwFltAnchor::~SwFltAnchor()
delete pClient;
}
-void SwFltAnchor::SetFrmFmt(SwFrmFmt * _pFrmFmt)
+void SwFltAnchor::SetFrameFormat(SwFrameFormat * _pFrameFormat)
{
- pFrmFmt = _pFrmFmt;
+ pFrameFormat = _pFrameFormat;
}
bool SwFltAnchor::operator==(const SfxPoolItem& rItem) const
{
- return pFrmFmt == static_cast<const SwFltAnchor&>(rItem).pFrmFmt;
+ return pFrameFormat == static_cast<const SwFltAnchor&>(rItem).pFrameFormat;
}
SfxPoolItem* SwFltAnchor::Clone(SfxItemPool*) const
@@ -877,14 +877,14 @@ void SwFltAnchorClient::Modify(const SfxPoolItem *, const SfxPoolItem * pNew)
{
if (pNew->Which() == RES_FMT_CHG)
{
- const SwFmtChg * pFmtChg = dynamic_cast<const SwFmtChg *> (pNew);
+ const SwFormatChg * pFormatChg = dynamic_cast<const SwFormatChg *> (pNew);
- if (pFmtChg != NULL)
+ if (pFormatChg != NULL)
{
- SwFrmFmt * pFrmFmt = dynamic_cast<SwFrmFmt *> (pFmtChg->pChangedFmt);
+ SwFrameFormat * pFrameFormat = dynamic_cast<SwFrameFormat *> (pFormatChg->pChangedFormat);
- if (pFrmFmt != NULL)
- m_pFltAnchor->SetFrmFmt(pFrmFmt);
+ if (pFrameFormat != NULL)
+ m_pFltAnchor->SetFrameFormat(pFrameFormat);
}
}
}
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 0263e5a5cf6b..543dd4b8c592 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -60,7 +60,7 @@ const OUString SwIoSystem::GetSubStorageName( const SfxFilter& rFltr )
return OUString();
}
-const SfxFilter* SwIoSystem::GetFilterOfFormat(const OUString& rFmtNm,
+const SfxFilter* SwIoSystem::GetFilterOfFormat(const OUString& rFormatNm,
const SfxFilterContainer* pCnt)
{
SfxFilterContainer aCntSw( OUString(sSWRITER) );
@@ -75,7 +75,7 @@ const SfxFilter* SwIoSystem::GetFilterOfFormat(const OUString& rFmtNm,
const SfxFilter* pFilter = aIter.First();
while ( pFilter )
{
- if( pFilter->GetUserData().equals(rFmtNm) )
+ if( pFilter->GetUserData().equals(rFormatNm) )
return pFilter;
pFilter = aIter.Next();
}
@@ -92,10 +92,10 @@ bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::s
bool bRet = false;
try
{
- SotClipboardFormatId nStgFmtId = SotStorage::GetFormatID( rStg );
+ SotClipboardFormatId nStgFormatId = SotStorage::GetFormatID( rStg );
bRet = rStg->isStreamElement( OUString("content.xml") );
if ( bRet )
- bRet = ( nStgFmtId != SotClipboardFormatId::NONE && ( rFilter.GetFormat() == nStgFmtId ) );
+ bRet = ( nStgFormatId != SotClipboardFormatId::NONE && ( rFilter.GetFormat() == nStgFormatId ) );
}
catch (const com::sun::star::uno::Exception& )
{
@@ -106,13 +106,13 @@ bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::s
bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter)
{
- SotClipboardFormatId nStgFmtId = rStg.GetFormat();
+ SotClipboardFormatId nStgFormatId = rStg.GetFormat();
/*#i8409# We cannot trust the clipboard id anymore :-(*/
if (rFilter.GetUserData() == FILTER_WW8 || rFilter.GetUserData() == sWW6)
- nStgFmtId = SotClipboardFormatId::NONE;
+ nStgFormatId = SotClipboardFormatId::NONE;
bool bRet = SVSTREAM_OK == rStg.GetError() &&
- ( nStgFmtId == SotClipboardFormatId::NONE || rFilter.GetFormat() == nStgFmtId ) &&
+ ( nStgFormatId == SotClipboardFormatId::NONE || rFilter.GetFormat() == nStgFormatId ) &&
( rStg.IsContained( SwIoSystem::GetSubStorageName( rFilter )) );
if( bRet )
{
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index b9348732e380..d42b0642a52c 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -137,9 +137,9 @@ sal_uLong SwReader::Read( const Reader& rOptions )
RedlineMode_t ePostReadRedlineMode( nsRedlineMode_t::REDLINE_IGNORE );
// Array of FlyFormats
- SwFrmFmts aFlyFrmArr;
+ SwFrameFormats aFlyFrmArr;
// only read templates? then ignore multi selection!
- bool bFmtsOnly = po->aOpt.IsFmtsOnly();
+ bool bFormatsOnly = po->aOpt.IsFormatsOnly();
while( true )
{
@@ -159,15 +159,15 @@ sal_uLong SwReader::Read( const Reader& rOptions )
// store for now all Fly's
if( pCrsr )
{
- std::copy(pDoc->GetSpzFrmFmts()->begin(),
- pDoc->GetSpzFrmFmts()->end(), std::back_inserter(aFlyFrmArr));
+ std::copy(pDoc->GetSpzFrameFormats()->begin(),
+ pDoc->GetSpzFrameFormats()->end(), std::back_inserter(aFlyFrmArr));
}
- const sal_Int32 nSttCntnt = pPam->GetPoint()->nContent.GetIndex();
+ const sal_Int32 nSttContent = pPam->GetPoint()->nContent.GetIndex();
// make sure the End position is correct for all Readers
- SwCntntNode* pCNd = pPam->GetCntntNode();
- sal_Int32 nEndCntnt = pCNd ? pCNd->Len() - nSttCntnt : 0;
+ SwContentNode* pCNd = pPam->GetContentNode();
+ sal_Int32 nEndContent = pCNd ? pCNd->Len() - nSttContent : 0;
SwNodeIndex aEndPos( pPam->GetPoint()->nNode, 1 );
pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
@@ -182,25 +182,25 @@ sal_uLong SwReader::Read( const Reader& rOptions )
if( !IsError( nError )) // set the End position already
{
--aEndPos;
- pCNd = aEndPos.GetNode().GetCntntNode();
+ pCNd = aEndPos.GetNode().GetContentNode();
if( !pCNd && 0 == ( pCNd = SwNodes::GoPrevious( &aEndPos ) ))
pCNd = pDoc->GetNodes().GoNext( &aEndPos );
pPam->GetPoint()->nNode = aEndPos;
const sal_Int32 nLen = pCNd->Len();
- if( nLen < nEndCntnt )
- nEndCntnt = 0;
+ if( nLen < nEndContent )
+ nEndContent = 0;
else
- nEndCntnt = nLen - nEndCntnt;
- pPam->GetPoint()->nContent.Assign( pCNd, nEndCntnt );
+ nEndContent = nLen - nEndContent;
+ pPam->GetPoint()->nContent.Assign( pCNd, nEndContent );
- const SwStartNode* pTblBoxStart = pCNd->FindTableBoxStartNode();
- if ( pTblBoxStart )
+ const SwStartNode* pTableBoxStart = pCNd->FindTableBoxStartNode();
+ if ( pTableBoxStart )
{
- SwTableBox* pBox = pTblBoxStart->GetTblBox();
+ SwTableBox* pBox = pTableBoxStart->GetTableBox();
if ( pBox )
{
- pDoc->ChkBoxNumFmt( *pBox, true );
+ pDoc->ChkBoxNumFormat( *pBox, true );
}
}
}
@@ -210,9 +210,9 @@ sal_uLong SwReader::Read( const Reader& rOptions )
*pUndoPam->GetMark() = *pPam->GetPoint();
++pUndoPam->GetPoint()->nNode;
SwNode& rNd = pUndoPam->GetNode();
- if( rNd.IsCntntNode() )
+ if( rNd.IsContentNode() )
pUndoPam->GetPoint()->nContent.Assign(
- static_cast<SwCntntNode*>(&rNd), nSttCntnt );
+ static_cast<SwContentNode*>(&rNd), nSttContent );
else
pUndoPam->GetPoint()->nContent.Assign( 0, 0 );
@@ -220,14 +220,14 @@ sal_uLong SwReader::Read( const Reader& rOptions )
rNd.FindFooterStartNode();
// search all new Fly's, and store them as individual Undo Objects
- for( SwFrmFmts::size_type n = 0; n < pDoc->GetSpzFrmFmts()->size(); ++n )
+ for( SwFrameFormats::size_type n = 0; n < pDoc->GetSpzFrameFormats()->size(); ++n )
{
- SwFrmFmt* pFrmFmt = (*pDoc->GetSpzFrmFmts())[ n ];
- const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
- if( !aFlyFrmArr.Contains( pFrmFmt) )
+ SwFrameFormat* pFrameFormat = (*pDoc->GetSpzFrameFormats())[ n ];
+ const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+ if( !aFlyFrmArr.Contains( pFrameFormat) )
{
SwPosition const*const pFrameAnchor(
- rAnchor.GetCntntAnchor());
+ rAnchor.GetContentAnchor());
if ( (FLY_AT_PAGE == rAnchor.GetAnchorId())
|| ( pFrameAnchor
&& ( ( (FLY_AT_PARA == rAnchor.GetAnchorId())
@@ -251,11 +251,11 @@ sal_uLong SwReader::Read( const Reader& rOptions )
{
if( bChkHeaderFooter &&
(FLY_AT_PARA == rAnchor.GetAnchorId()) &&
- RES_DRAWFRMFMT == pFrmFmt->Which() )
+ RES_DRAWFRMFMT == pFrameFormat->Which() )
{
// DrawObjects are not allowed in Headers/Footers!
- pFrmFmt->DelFrms();
- pDoc->DelFrmFmt( pFrmFmt );
+ pFrameFormat->DelFrms();
+ pDoc->DelFrameFormat( pFrameFormat );
--n;
}
else
@@ -266,21 +266,21 @@ sal_uLong SwReader::Read( const Reader& rOptions )
// UGLY: temp. enable undo
pDoc->GetIDocumentUndoRedo().DoUndo(true);
pDoc->GetIDocumentUndoRedo().AppendUndo(
- new SwUndoInsLayFmt( pFrmFmt,0,0 ) );
+ new SwUndoInsLayFormat( pFrameFormat,0,0 ) );
pDoc->GetIDocumentUndoRedo().DoUndo(false);
pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE );
}
- if( pFrmFmt->HasWriterListeners() )
+ if( pFrameFormat->HasWriterListeners() )
{
// Draw-Objects create a Frame when being inserted; thus delete them
- pFrmFmt->DelFrms();
+ pFrameFormat->DelFrms();
}
if (FLY_AT_PAGE == rAnchor.GetAnchorId())
{
- if( !rAnchor.GetCntntAnchor() )
+ if( !rAnchor.GetContentAnchor() )
{
- pFrmFmt->MakeFrms();
+ pFrameFormat->MakeFrms();
}
else if( pCrsr )
{
@@ -288,7 +288,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
}
}
else
- pFrmFmt->MakeFrms();
+ pFrameFormat->MakeFrms();
}
}
}
@@ -321,7 +321,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
break;
// only read templates? then ignore multi selection! Bug 68593
- if( bFmtsOnly )
+ if( bFormatsOnly )
break;
/*
@@ -507,7 +507,7 @@ SwDoc* Reader::GetTemplateDoc()
// always FALSE
pTemplate->GetIDocumentUndoRedo().DoUndo( false );
pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::BROWSE_MODE, bTmplBrowseMode );
- pTemplate->RemoveAllFmtLanguageDependencies();
+ pTemplate->RemoveAllFormatLanguageDependencies();
ReadXML->SetOrganizerMode( true );
SfxMedium aMedium( aFileName, StreamMode::NONE );
@@ -534,7 +534,7 @@ bool Reader::SetTemplate( SwDoc& rDoc )
GetTemplateDoc();
if( pTemplate )
{
- rDoc.RemoveAllFmtLanguageDependencies();
+ rDoc.RemoveAllFormatLanguageDependencies();
rDoc.ReplaceStyles( *pTemplate );
rDoc.getIDocumentFieldsAccess().SetFixFields(false, NULL);
bRet = true;
@@ -569,7 +569,7 @@ void Reader::MakeHTMLDummyTemplateDoc()
pTemplate->acquire();
pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::BROWSE_MODE, bTmplBrowseMode );
pTemplate->getIDocumentDeviceAccess().getPrinter( true );
- pTemplate->RemoveAllFmtLanguageDependencies();
+ pTemplate->RemoveAllFormatLanguageDependencies();
aChkDateTime = Date( 1, 1, 2300 ); // year 2300 should be sufficient
aTemplateNm = "$$Dummy$$";
}
@@ -616,25 +616,25 @@ void Reader::SetFltName( const OUString& )
{
}
-void Reader::ResetFrmFmtAttrs( SfxItemSet &rFrmSet )
+void Reader::ResetFrameFormatAttrs( SfxItemSet &rFrmSet )
{
rFrmSet.Put( SvxLRSpaceItem(RES_LR_SPACE) );
rFrmSet.Put( SvxULSpaceItem(RES_UL_SPACE) );
rFrmSet.Put( SvxBoxItem(RES_BOX) );
}
-void Reader::ResetFrmFmts( SwDoc& rDoc )
+void Reader::ResetFrameFormats( SwDoc& rDoc )
{
sal_uInt16 const s_ids[3] = {
RES_POOLFRM_FRAME, RES_POOLFRM_GRAPHIC, RES_POOLFRM_OLE
};
for (size_t i = 0; i < SAL_N_ELEMENTS(s_ids); ++i)
{
- SwFrmFmt *const pFrmFmt = rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( s_ids[i] );
+ SwFrameFormat *const pFrameFormat = rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( s_ids[i] );
- pFrmFmt->ResetFmtAttr( RES_LR_SPACE );
- pFrmFmt->ResetFmtAttr( RES_UL_SPACE );
- pFrmFmt->ResetFmtAttr( RES_BOX );
+ pFrameFormat->ResetFormatAttr( RES_LR_SPACE );
+ pFrameFormat->ResetFormatAttr( RES_UL_SPACE );
+ pFrameFormat->ResetFormatAttr( RES_BOX );
}
}
@@ -756,13 +756,13 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
// search the layout for cells
SwSelBoxes aBoxes;
- GetTblSel( *pShell, aBoxes );
- const SwTableNode* pTblNd = static_cast<const SwTableNode*>(aBoxes[0]->GetSttNd()->StartOfSectionNode());
+ GetTableSel( *pShell, aBoxes );
+ const SwTableNode* pTableNd = static_cast<const SwTableNode*>(aBoxes[0]->GetSttNd()->StartOfSectionNode());
SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 2 );
- SwCntntNode *pNd = aIdx.GetNode().GetCntntNode();
+ SwContentNode *pNd = aIdx.GetNode().GetContentNode();
OSL_ENSURE( pNd, "Node not found" );
SwPosition aPos( aIdx, SwIndex( pNd ) );
- pTblNd->GetTable().MakeCopy( pDoc, aPos, aBoxes );
+ pTableNd->GetTable().MakeCopy( pDoc, aPos, aBoxes );
}
if( !bWriteAll && ( pShell || pOutPam ))
@@ -832,17 +832,17 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
{
const SwPageDesc& rPgDsc = pOutDoc->GetPageDesc( 0 );
//const SwPageDesc& rPgDsc = *pOutDoc->GetPageDescFromPool( RES_POOLPAGE_STANDARD );
- const SwFmtFrmSize& rSz = rPgDsc.GetMaster().GetFrmSize();
+ const SwFormatFrmSize& rSz = rPgDsc.GetMaster().GetFrmSize();
// Clipboard-Document is always created w/o printer; thus the
// default PageDesc is always aug LONG_MAX !! Set then to DIN A4
if( LONG_MAX == rSz.GetHeight() || LONG_MAX == rSz.GetWidth() )
{
SwPageDesc aNew( rPgDsc );
- SwFmtFrmSize aNewSz( rSz );
+ SwFormatFrmSize aNewSz( rSz );
Size a4(SvxPaperInfo::GetPaperSize( PAPER_A4 ));
aNewSz.SetHeight( a4.Width() );
aNewSz.SetWidth( a4.Height() );
- aNew.GetMaster().SetFmtAttr( aNewSz );
+ aNew.GetMaster().SetFormatAttr( aNewSz );
pOutDoc->ChgPageDesc( 0, aNew );
}
}
@@ -923,12 +923,12 @@ bool SetHTMLTemplate( SwDoc & rDoc )
SwNodes& rNds = rDoc.GetNodes();
SwNodeIndex aIdx( rNds.GetEndOfExtras(), 1 );
- SwCntntNode* pCNd = rNds.GoNext( &aIdx );
+ SwContentNode* pCNd = rNds.GoNext( &aIdx );
if( pCNd )
{
pCNd->SetAttr
- ( SwFmtPageDesc(rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_HTML, false) ) );
- pCNd->ChgFmtColl( rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT, false ));
+ ( SwFormatPageDesc(rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_HTML, false) ) );
+ pCNd->ChgFormatColl( rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT, false ));
}
return bRet;
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index fadc0722abf0..9f7bc09825e7 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -116,18 +116,18 @@ using editeng::SvxBorderLine;
extern SwAttrFnTab aCSS1AttrFnTab;
-static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
+static Writer& OutCSS1_SwFormat( Writer& rWrt, const SwFormat& rFormat,
IDocumentStylePoolAccess /*SwDoc*/ *pDoc, SwDoc *pTemplate );
-static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rFmt,
+static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rFormat,
IDocumentStylePoolAccess /*SwDoc*/ *pDoc, SwDoc *pTemplate,
sal_uInt16 nRefPoolId, bool bExtRef,
bool bPseudo=true );
-static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
+static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
SwDoc *pDoc, sal_uInt16 nNotes, bool bEndNote );
-static void OutCSS1_SwFmtDropAttrs( SwHTMLWriter& rHWrt,
- const SwFmtDrop& rDrop,
- const SfxItemSet *pCharFmtItemSet=0 );
-static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
+static void OutCSS1_SwFormatDropAttrs( SwHTMLWriter& rHWrt,
+ const SwFormatDrop& rDrop,
+ const SfxItemSet *pCharFormatItemSet=0 );
+static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt,
const SvxUnderlineItem *pUItem,
const SvxOverlineItem *pOItem,
const SvxCrossedOutItem *pCOItem,
@@ -145,12 +145,12 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
sal_uInt16 nMode );
static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt );
-static Writer& OutCSS1_SwFmtFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
+static Writer& OutCSS1_SwFormatFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
sal_uInt16 nMode );
-static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
+static Writer& OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( Writer& rWrt,
const SfxItemSet& rItemSet,
bool bDeep );
-static Writer& OutCSS1_SwFmtLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt );
+static Writer& OutCSS1_SwFormatLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt );
namespace
{
@@ -503,12 +503,12 @@ void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet,
pBlinkItem = static_cast<const SvxBlinkItem *>(pItem);
if( pUnderlineItem || pOverlineItem || pCrossedOutItem || pBlinkItem )
- OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( *this, pUnderlineItem,
+ OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( *this, pUnderlineItem,
pOverlineItem,
pCrossedOutItem,
pBlinkItem );
- OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( *this, rItemSet, bDeep );
+ OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( *this, rItemSet, bDeep );
}
if( !bFirstCSS1Property )
@@ -553,9 +553,9 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
// If other templates are used, only very simple cases are exported.
const SwPageDesc *pPageDesc = &rPageDesc;
const SwPageDesc *pFollow = rPageDesc.GetFollow();
- if( RES_POOLPAGE_FIRST == pPageDesc->GetPoolFmtId() &&
+ if( RES_POOLPAGE_FIRST == pPageDesc->GetPoolFormatId() &&
pFollow != pPageDesc &&
- !IsPoolUserFmt( pFollow->GetPoolFmtId() ) )
+ !IsPoolUserFormat( pFollow->GetPoolFormatId() ) )
{
// the document has a first page
pFirstPageDesc = pPageDesc;
@@ -570,12 +570,12 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
// The attribute is exported relative to the HTML page template.
OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, pTemplate,
RES_POOLPAGE_HTML, true, false );
- nFirstRefPoolId = pFollow->GetPoolFmtId();
+ nFirstRefPoolId = pFollow->GetPoolFormatId();
}
- else if( (RES_POOLPAGE_LEFT == pPageDesc->GetPoolFmtId() &&
- RES_POOLPAGE_RIGHT == pFollow->GetPoolFmtId()) ||
- (RES_POOLPAGE_RIGHT == pPageDesc->GetPoolFmtId() &&
- RES_POOLPAGE_LEFT == pFollow->GetPoolFmtId()) )
+ else if( (RES_POOLPAGE_LEFT == pPageDesc->GetPoolFormatId() &&
+ RES_POOLPAGE_RIGHT == pFollow->GetPoolFormatId()) ||
+ (RES_POOLPAGE_RIGHT == pPageDesc->GetPoolFormatId() &&
+ RES_POOLPAGE_LEFT == pFollow->GetPoolFormatId()) )
{
// the document is double-sided
OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, pTemplate,
@@ -596,46 +596,46 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
// The text body style has to be exported always (if it is changed compared
// to the template), because it is used as reference for any style
// that maps to <P>, and that's especially the standard style
- getIDocumentStylePoolAccess()->GetTxtCollFromPool( RES_POOLCOLL_TEXT, false );
+ getIDocumentStylePoolAccess()->GetTextCollFromPool( RES_POOLCOLL_TEXT, false );
// the Default-TextStyle is not also exported !!
// 0-Style is the Default; is never exported !!
- sal_uInt16 nArrLen = pDoc->GetTxtFmtColls()->size();
+ sal_uInt16 nArrLen = pDoc->GetTextFormatColls()->size();
sal_uInt16 i;
for( i = 1; i < nArrLen; i++ )
{
- const SwTxtFmtColl* pColl = (*pDoc->GetTxtFmtColls())[i];
- sal_uInt16 nPoolId = pColl->GetPoolFmtId();
+ const SwTextFormatColl* pColl = (*pDoc->GetTextFormatColls())[i];
+ sal_uInt16 nPoolId = pColl->GetPoolFormatId();
if( !bUsed || nPoolId == RES_POOLCOLL_TEXT ||
pDoc->IsUsed( *pColl ) )
- OutCSS1_SwFmt( *this, *pColl, &pDoc->getIDocumentStylePoolAccess(), pTemplate );
+ OutCSS1_SwFormat( *this, *pColl, &pDoc->getIDocumentStylePoolAccess(), pTemplate );
}
// the Default-TextStyle is not also exported !!
- nArrLen = pDoc->GetCharFmts()->size();
+ nArrLen = pDoc->GetCharFormats()->size();
for( i=1; i<nArrLen; i++ )
{
- const SwCharFmt *pCFmt = (*pDoc->GetCharFmts())[i];
- sal_uInt16 nPoolId = pCFmt->GetPoolFmtId();
+ const SwCharFormat *pCFormat = (*pDoc->GetCharFormats())[i];
+ sal_uInt16 nPoolId = pCFormat->GetPoolFormatId();
if( !bUsed || nPoolId == RES_POOLCHR_INET_NORMAL ||
nPoolId == RES_POOLCHR_INET_VISIT ||
- pDoc->IsUsed( *pCFmt ) )
- OutCSS1_SwFmt( *this, *pCFmt, &pDoc->getIDocumentStylePoolAccess(), pTemplate );
+ pDoc->IsUsed( *pCFormat ) )
+ OutCSS1_SwFormat( *this, *pCFormat, &pDoc->getIDocumentStylePoolAccess(), pTemplate );
}
- const SwFtnIdxs& rIdxs = pDoc->GetFtnIdxs();
+ const SwFootnoteIdxs& rIdxs = pDoc->GetFootnoteIdxs();
nArrLen = rIdxs.size();
- sal_uInt16 nEnd = 0, nFtn = 0;
+ sal_uInt16 nEnd = 0, nFootnote = 0;
for( i=0; i < nArrLen; i++ )
{
- if( rIdxs[i]->GetFtn().IsEndNote() )
+ if( rIdxs[i]->GetFootnote().IsEndNote() )
nEnd++;
else
- nFtn++;
+ nFootnote++;
}
- OutCSS1_SwFtnInfo( *this, pDoc->GetFtnInfo(), pDoc, nFtn, false );
- OutCSS1_SwFtnInfo( *this, pDoc->GetEndNoteInfo(), pDoc, nEnd, true );
+ OutCSS1_SwFootnoteInfo( *this, pDoc->GetFootnoteInfo(), pDoc, nFootnote, false );
+ OutCSS1_SwFootnoteInfo( *this, pDoc->GetEndNoteInfo(), pDoc, nEnd, true );
if( !bFirstCSS1Rule )
{
@@ -655,7 +655,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
// if pPseudo is set, Styles-Sheets will be exported;
// otherwise we only search for Token and Class for a Format
-sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
+sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFormat *pFormat, OString& rToken,
OUString& rClass, sal_uInt16& rRefPoolId,
OUString *pPseudo )
{
@@ -666,40 +666,40 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
if( pPseudo )
pPseudo->clear();
- bool bChrFmt = RES_CHRFMT==pFmt->Which();
+ bool bChrFormat = RES_CHRFMT==pFormat->Which();
// search formats above for the nearest standard or HTML-Tag template
- const SwFmt *pPFmt = pFmt;
- while( pPFmt && !pPFmt->IsDefault() )
+ const SwFormat *pPFormat = pFormat;
+ while( pPFormat && !pPFormat->IsDefault() )
{
bool bStop = false;
- sal_uInt16 nPoolId = pPFmt->GetPoolFmtId();
+ sal_uInt16 nPoolId = pPFormat->GetPoolFormatId();
if( USER_FMT & nPoolId )
{
// user templates
- const OUString aNm(pPFmt->GetName());
+ const OUString aNm(pPFormat->GetName());
- if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_blockquote)
+ if (!bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_blockquote)
{
rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_blockquote);
}
- else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_citiation)
+ else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_citiation)
{
rRefPoolId = RES_POOLCHR_HTML_CITIATION;
rToken = OString(OOO_STRING_SVTOOLS_HTML_citiation);
}
- else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_code)
+ else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_code)
{
rRefPoolId = RES_POOLCHR_HTML_CODE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_code);
}
- else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_definstance)
+ else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_definstance)
{
rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_definstance);
}
- else if (!bChrFmt && (aNm == OOO_STRING_SVTOOLS_HTML_dd ||
+ else if (!bChrFormat && (aNm == OOO_STRING_SVTOOLS_HTML_dd ||
aNm == OOO_STRING_SVTOOLS_HTML_dt))
{
sal_uInt16 nDefListLvl = GetDefListLvl(aNm, nPoolId);
@@ -724,54 +724,54 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
}
}
}
- else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_emphasis)
+ else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_emphasis)
{
rRefPoolId = RES_POOLCHR_HTML_EMPHASIS;
rToken = OString(OOO_STRING_SVTOOLS_HTML_emphasis);
}
- else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_horzrule)
+ else if (!bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_horzrule)
{
// do not export HR !
bStop = (nDeep==0);
}
- else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_keyboard)
+ else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_keyboard)
{
rRefPoolId = RES_POOLCHR_HTML_KEYBOARD;
rToken = OString(OOO_STRING_SVTOOLS_HTML_keyboard);
}
- else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_listing)
+ else if (!bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_listing)
{
// Export Listings as PRE or PRE-derived template
rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
rRefPoolId = RES_POOLCOLL_HTML_PRE;
nDeep = CSS1_FMT_CMPREF;
}
- else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_preformtxt)
+ else if (!bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_preformtxt)
{
rRefPoolId = RES_POOLCOLL_HTML_PRE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
}
- else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_sample)
+ else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_sample)
{
rRefPoolId = RES_POOLCHR_HTML_SAMPLE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_sample);
}
- else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_strong)
+ else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_strong)
{
rRefPoolId = RES_POOLCHR_HTML_STRONG;
rToken = OString(OOO_STRING_SVTOOLS_HTML_strong);
}
- else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_teletype)
+ else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_teletype)
{
rRefPoolId = RES_POOLCHR_HTML_TELETYPE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_teletype);
}
- else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_variable)
+ else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_variable)
{
rRefPoolId = RES_POOLCHR_HTML_VARIABLE;
rToken = OString(OOO_STRING_SVTOOLS_HTML_variable);
}
- else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_xmp)
+ else if (!bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_xmp)
{
// export XMP as PRE (but not the template as Style)
rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
@@ -932,7 +932,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
{
// continue otherwise
nDeep++;
- pPFmt = pPFmt->DerivedFrom();
+ pPFormat = pPFormat->DerivedFrom();
}
}
@@ -953,7 +953,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
// we export it as <TOKEN>.<CLASS>, otherwise as .<CLASS>.
// <CLASS> is the name of the template after removing all characters
// before and including the first '.'
- rClass = pFmt->GetName();
+ rClass = pFormat->GetName();
sal_Int32 nPos = rClass.indexOf( '.' );
if( nPos >= 0 && rClass.getLength() > nPos+1 )
{
@@ -969,14 +969,14 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
return nDeep;
}
-static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, OUString& rSelector,
+static sal_uInt16 GetCSS1Selector( const SwFormat *pFormat, OUString& rSelector,
sal_uInt16& rRefPoolId )
{
OString aToken;
OUString aClass;
OUString aPseudo;
- sal_uInt16 nDeep = SwHTMLWriter::GetCSS1Selector( pFmt, aToken, aClass,
+ sal_uInt16 nDeep = SwHTMLWriter::GetCSS1Selector( pFormat, aToken, aClass,
rRefPoolId, &aPseudo );
if( nDeep )
{
@@ -994,41 +994,41 @@ static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, OUString& rSelector,
return nDeep;
}
-const SwFmt *SwHTMLWriter::GetTemplateFmt( sal_uInt16 nPoolFmtId,
+const SwFormat *SwHTMLWriter::GetTemplateFormat( sal_uInt16 nPoolFormatId,
IDocumentStylePoolAccess* pTemplate /*SwDoc *pTemplate*/)
{
- const SwFmt *pRefFmt = 0;
+ const SwFormat *pRefFormat = 0;
if( pTemplate )
{
- OSL_ENSURE( !(USER_FMT & nPoolFmtId),
+ OSL_ENSURE( !(USER_FMT & nPoolFormatId),
"No user templates found" );
- if( POOLGRP_NOCOLLID & nPoolFmtId )
- pRefFmt = pTemplate->GetCharFmtFromPool( nPoolFmtId );
+ if( POOLGRP_NOCOLLID & nPoolFormatId )
+ pRefFormat = pTemplate->GetCharFormatFromPool( nPoolFormatId );
else
- pRefFmt = pTemplate->GetTxtCollFromPool( nPoolFmtId, false );
+ pRefFormat = pTemplate->GetTextCollFromPool( nPoolFormatId, false );
}
- return pRefFmt;
+ return pRefFormat;
}
-const SwFmt *SwHTMLWriter::GetParentFmt( const SwFmt& rFmt, sal_uInt16 nDeep )
+const SwFormat *SwHTMLWriter::GetParentFormat( const SwFormat& rFormat, sal_uInt16 nDeep )
{
OSL_ENSURE( nDeep != USHRT_MAX, "Called GetParent for HTML-template!" );
- const SwFmt *pRefFmt = 0;
+ const SwFormat *pRefFormat = 0;
if( nDeep > 0 )
{
// get the pointer for the HTML-Tag template, from which the template is derived
- pRefFmt = &rFmt;
+ pRefFormat = &rFormat;
for( sal_uInt16 i=nDeep; i>0; i-- )
- pRefFmt = pRefFmt->DerivedFrom();
+ pRefFormat = pRefFormat->DerivedFrom();
- if( pRefFmt && pRefFmt->IsDefault() )
- pRefFmt = 0;
+ if( pRefFormat && pRefFormat->IsDefault() )
+ pRefFormat = 0;
}
- return pRefFmt;
+ return pRefFormat;
}
bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 )
@@ -1268,13 +1268,13 @@ bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
SfxItemState::SET == rItemSet.GetItemState( RES_PARATR_DROP, true,
&pItem ) )
{
- const SwFmtDrop *pDrop = static_cast<const SwFmtDrop *>(pItem);
- const SwCharFmt *pDCCharFmt = pDrop->GetCharFmt();
- if( pDCCharFmt )
+ const SwFormatDrop *pDrop = static_cast<const SwFormatDrop *>(pItem);
+ const SwCharFormat *pDCCharFormat = pDrop->GetCharFormat();
+ if( pDCCharFormat )
{
//sequence of (start, end) property ranges we want to
//query
- SfxItemSet aTstItemSet( *pDCCharFmt->GetAttrSet().GetPool(),
+ SfxItemSet aTstItemSet( *pDCCharFormat->GetAttrSet().GetPool(),
RES_CHRATR_FONT, RES_CHRATR_FONT,
RES_CHRATR_POSTURE, RES_CHRATR_POSTURE,
RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT,
@@ -1283,7 +1283,7 @@ bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT,
RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT,
0 );
- aTstItemSet.Set( pDCCharFmt->GetAttrSet(), true );
+ aTstItemSet.Set( pDCCharFormat->GetAttrSet(), true );
return HasScriptDependentItems( aTstItemSet, false );
}
}
@@ -1400,12 +1400,12 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
static void OutCSS1DropCapRule(
SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
- const SwFmtDrop& rDrop, bool bHasClass,
+ const SwFormatDrop& rDrop, bool bHasClass,
bool bHasScriptDependencies )
{
- const SwCharFmt *pDCCharFmt = rDrop.GetCharFmt();
+ const SwCharFormat *pDCCharFormat = rDrop.GetCharFormat();
if( (bHasScriptDependencies && bHasClass) ||
- (pDCCharFmt && SwHTMLWriter::HasScriptDependentItems( pDCCharFmt->GetAttrSet(), false ) ) )
+ (pDCCharFormat && SwHTMLWriter::HasScriptDependentItems( pDCCharFormat->GetAttrSet(), false ) ) )
{
OUString aSelector( rSelector );
@@ -1425,7 +1425,7 @@ static void OutCSS1DropCapRule(
{
SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_NO_SCRIPT|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
true, &rSelector );
- OutCSS1_SwFmtDropAttrs( rHTMLWrt, rDrop );
+ OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop );
}
SfxItemSet aScriptItemSet( rHTMLWrt.pDoc->GetAttrPool(),
@@ -1434,29 +1434,29 @@ static void OutCSS1DropCapRule(
RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT,
RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT,
0 );
- if( pDCCharFmt )
- aScriptItemSet.Set( pDCCharFmt->GetAttrSet(), true );
+ if( pDCCharFormat )
+ aScriptItemSet.Set( pDCCharFormat->GetAttrSet(), true );
OUString aNewSelector( aSelector );
aNewSelector += ".western" + aPseudo;
{
SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_WESTERN|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
true, &aNewSelector );
- OutCSS1_SwFmtDropAttrs( rHTMLWrt, rDrop, &aScriptItemSet );
+ OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop, &aScriptItemSet );
}
aNewSelector = aSelector + ".cjk" + aPseudo;
{
SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CJK|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
true, &aNewSelector );
- OutCSS1_SwFmtDropAttrs( rHTMLWrt, rDrop, &aScriptItemSet );
+ OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop, &aScriptItemSet );
}
aNewSelector = aSelector + ".ctl" + aPseudo;
{
SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CTL|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
true, &aNewSelector );
- OutCSS1_SwFmtDropAttrs( rHTMLWrt, rDrop, &aScriptItemSet );
+ OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop, &aScriptItemSet );
}
}
else
@@ -1469,21 +1469,21 @@ static void OutCSS1DropCapRule(
{
SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_WESTERN|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
true, &aNewSelector );
- OutCSS1_SwFmtDropAttrs( rHTMLWrt, rDrop );
+ OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop );
}
aNewSelector = aSelector + "-cjk" + aPseudo;
{
SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CJK|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
true, &aNewSelector );
- OutCSS1_SwFmtDropAttrs( rHTMLWrt, rDrop );
+ OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop );
}
aNewSelector = aSelector + "-ctl" + aPseudo;
{
SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CTL|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
true, &aNewSelector );
- OutCSS1_SwFmtDropAttrs( rHTMLWrt, rDrop );
+ OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop );
}
}
}
@@ -1496,20 +1496,20 @@ static void OutCSS1DropCapRule(
SwCSS1OutMode aMode( rHTMLWrt,
rHTMLWrt.nCSS1Script|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
true, &rSelector );
- OutCSS1_SwFmtDropAttrs( rHTMLWrt, rDrop );
+ OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop );
}
}
-static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
+static Writer& OutCSS1_SwFormat( Writer& rWrt, const SwFormat& rFormat,
IDocumentStylePoolAccess/*SwDoc*/ *pDoc, SwDoc *pTemplate )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- bool bCharFmt = false;
- switch( rFmt.Which() )
+ bool bCharFormat = false;
+ switch( rFormat.Which() )
{
case RES_CHRFMT:
- bCharFmt = true;
+ bCharFormat = true;
break;
case RES_TXTFMTCOLL:
@@ -1525,11 +1525,11 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// determine Selector and the to-be-exported Attr-Set-depth
OUString aSelector;
sal_uInt16 nRefPoolId = 0;
- sal_uInt16 nDeep = GetCSS1Selector( &rFmt, aSelector, nRefPoolId );
+ sal_uInt16 nDeep = GetCSS1Selector( &rFormat, aSelector, nRefPoolId );
if( !nDeep )
return rWrt; // not derived from a HTML-template
- sal_uInt16 nPoolFmtId = rFmt.GetPoolFmtId();
+ sal_uInt16 nPoolFormatId = rFormat.GetPoolFormatId();
// Determine the to-be-exported Attr-Set. We have to distinguish 3 cases:
// - HTML-Tag templates (nDeep==USHRT_MAX):
@@ -1545,58 +1545,58 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// create Item-Set with all Attributes from the template
// (all but for nDeep==1)
- const SfxItemSet& rFmtItemSet = rFmt.GetAttrSet();
- SfxItemSet aItemSet( *rFmtItemSet.GetPool(), rFmtItemSet.GetRanges() );
- aItemSet.Set( rFmtItemSet, true ); // Was nDeep!=1 that is not working
+ const SfxItemSet& rFormatItemSet = rFormat.GetAttrSet();
+ SfxItemSet aItemSet( *rFormatItemSet.GetPool(), rFormatItemSet.GetRanges() );
+ aItemSet.Set( rFormatItemSet, true ); // Was nDeep!=1 that is not working
// for script dependent items buts should
// not make a difference for any other
bool bSetDefaults = true, bClearSame = true;
- const SwFmt *pRefFmt = 0;
- const SwFmt *pRefFmtScript = 0;
+ const SwFormat *pRefFormat = 0;
+ const SwFormat *pRefFormatScript = 0;
switch( nDeep )
{
case CSS1_FMT_ISTAG:
- pRefFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
+ pRefFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
break;
case CSS1_FMT_CMPREF:
- pRefFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId, pDoc );
- pRefFmtScript = SwHTMLWriter::GetTemplateFmt( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
+ pRefFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId, pDoc );
+ pRefFormatScript = SwHTMLWriter::GetTemplateFormat( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
bClearSame = false;
break;
default:
- pRefFmt = SwHTMLWriter::GetParentFmt( rFmt, nDeep );
- pRefFmtScript = SwHTMLWriter::GetTemplateFmt( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
+ pRefFormat = SwHTMLWriter::GetParentFormat( rFormat, nDeep );
+ pRefFormatScript = SwHTMLWriter::GetTemplateFormat( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
bSetDefaults = false;
break;
}
- if( pRefFmt )
+ if( pRefFormat )
{
// subtract Item-Set of the Reference template (incl. its Parents)
- SwHTMLWriter::SubtractItemSet( aItemSet, pRefFmt->GetAttrSet(),
+ SwHTMLWriter::SubtractItemSet( aItemSet, pRefFormat->GetAttrSet(),
bSetDefaults, bClearSame,
- pRefFmtScript
- ? &pRefFmtScript->GetAttrSet()
+ pRefFormatScript
+ ? &pRefFormatScript->GetAttrSet()
: 0 );
- if( !bCharFmt )
+ if( !bCharFormat )
{
- const SvxULSpaceItem& rULItem = pRefFmt->GetULSpace();
+ const SvxULSpaceItem& rULItem = pRefFormat->GetULSpace();
rHTMLWrt.nDfltTopMargin = rULItem.GetUpper();
rHTMLWrt.nDfltBottomMargin = rULItem.GetLower();
}
}
- else if( CSS1_FMT_ISTAG==nDeep && !bCharFmt )
+ else if( CSS1_FMT_ISTAG==nDeep && !bCharFormat )
{
// set Default-distance above and below (for the
// case that there is no reference template)
rHTMLWrt.nDfltTopMargin = 0;
rHTMLWrt.nDfltBottomMargin = HTML_PARSPACE;
- if( USER_FMT & nPoolFmtId )
+ if( USER_FMT & nPoolFormatId )
{
// user templates
- const OUString aNm(rFmt.GetName());
+ const OUString aNm(rFormat.GetName());
if (aNm == "DD 1" || aNm == "DT 1")
rHTMLWrt.nDfltBottomMargin = 0;
@@ -1610,7 +1610,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
else
{
// Pool templates
- switch( nPoolFmtId )
+ switch( nPoolFormatId )
{
case RES_POOLCOLL_HEADLINE1:
case RES_POOLCOLL_HEADLINE2:
@@ -1636,7 +1636,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// There is no support for script dependent hyperlinks by now.
bool bCheckForPseudo = false;
- if( bCharFmt &&
+ if( bCharFormat &&
(RES_POOLCHR_INET_NORMAL==nRefPoolId ||
RES_POOLCHR_INET_VISIT==nRefPoolId) )
bCheckForPseudo = true;
@@ -1646,18 +1646,18 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, CSS1_FMT_ISTAG != nDeep,
bCheckForPseudo ) )
{
- if( bCharFmt )
- rHTMLWrt.aScriptTextStyles.insert( rFmt.GetName() );
+ if( bCharFormat )
+ rHTMLWrt.aScriptTextStyles.insert( rFormat.GetName() );
else
{
- if( nPoolFmtId==RES_POOLCOLL_TEXT )
- rHTMLWrt.aScriptParaStyles.insert( pDoc->GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false )->GetName() );
- rHTMLWrt.aScriptParaStyles.insert( rFmt.GetName() );
+ if( nPoolFormatId==RES_POOLCOLL_TEXT )
+ rHTMLWrt.aScriptParaStyles.insert( pDoc->GetTextCollFromPool( RES_POOLCOLL_STANDARD, false )->GetName() );
+ rHTMLWrt.aScriptParaStyles.insert( rFormat.GetName() );
}
bHasScriptDependencies = true;
}
- if( nPoolFmtId==RES_POOLCOLL_TEXT && !rHTMLWrt.bFirstCSS1Property )
+ if( nPoolFormatId==RES_POOLCOLL_TEXT && !rHTMLWrt.bFirstCSS1Property )
rHTMLWrt.bPoolCollTextModified = true;
// export Drop-Caps
@@ -1666,7 +1666,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
{
OUString sOut( aSelector );
sOut += ":" + OStringToOUString( sCSS1_first_letter, RTL_TEXTENCODING_ASCII_US );
- const SwFmtDrop *pDrop = static_cast<const SwFmtDrop *>(pItem);
+ const SwFormatDrop *pDrop = static_cast<const SwFormatDrop *>(pItem);
OutCSS1DropCapRule( rHTMLWrt, sOut, *pDrop, CSS1_FMT_ISTAG != nDeep, bHasScriptDependencies );
}
@@ -1691,7 +1691,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
if( bPseudo )
{
const sal_Char *pPseudo = 0;
- switch( rPageDesc.GetPoolFmtId() )
+ switch( rPageDesc.GetPoolFormatId() )
{
case RES_POOLPAGE_FIRST: pPseudo = sCSS1_first; break;
case RES_POOLPAGE_LEFT: pPseudo = sCSS1_left; break;
@@ -1746,7 +1746,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
}
// Export the distance-Attributes as normally
- const SwFrmFmt &rMaster = rPageDesc.GetMaster();
+ const SwFrameFormat &rMaster = rPageDesc.GetMaster();
SfxItemSet aItemSet( *rMaster.GetAttrSet().GetPool(),
RES_LR_SPACE, RES_UL_SPACE );
aItemSet.Set( rMaster.GetAttrSet(), true );
@@ -1777,7 +1777,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
return rWrt;
}
-static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
+static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
SwDoc *pDoc, sal_uInt16 nNotes, bool bEndNote )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1796,12 +1796,12 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
rHTMLWrt.Strm().WriteCharPtr( sCSS1_rule_end );
}
- const SwCharFmt *pSymCharFmt = rInfo.GetCharFmt( *pDoc );
- if( pSymCharFmt )
+ const SwCharFormat *pSymCharFormat = rInfo.GetCharFormat( *pDoc );
+ if( pSymCharFormat )
{
- const SfxItemSet& rFmtItemSet = pSymCharFmt->GetAttrSet();
- SfxItemSet aItemSet( *rFmtItemSet.GetPool(), rFmtItemSet.GetRanges() );
- aItemSet.Set( rFmtItemSet, true );
+ const SfxItemSet& rFormatItemSet = pSymCharFormat->GetAttrSet();
+ SfxItemSet aItemSet( *rFormatItemSet.GetPool(), rFormatItemSet.GetRanges() );
+ aItemSet.Set( rFormatItemSet, true );
// If there are footnotes or endnotes, then all Attributes have to be
// exported, so that Netscape displays the document correctly.
@@ -1809,10 +1809,10 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
// footnote and endnote template.
if( nNotes == 0 && rHTMLWrt.pTemplate )
{
- SwFmt *pRefFmt = rHTMLWrt.pTemplate->getIDocumentStylePoolAccess().GetCharFmtFromPool(
+ SwFormat *pRefFormat = rHTMLWrt.pTemplate->getIDocumentStylePoolAccess().GetCharFormatFromPool(
static_cast< sal_uInt16 >(bEndNote ? RES_POOLCHR_ENDNOTE : RES_POOLCHR_FOOTNOTE) );
- if( pRefFmt )
- SwHTMLWriter::SubtractItemSet( aItemSet, pRefFmt->GetAttrSet(),
+ if( pRefFormat )
+ SwHTMLWriter::SubtractItemSet( aItemSet, pRefFormat->GetAttrSet(),
true );
}
if( aItemSet.Count() )
@@ -1821,7 +1821,7 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
( bEndNote ? OUString(OOO_STRING_SVTOOLS_HTML_sdendnote_sym)
: OUString(OOO_STRING_SVTOOLS_HTML_sdfootnote_sym));
if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, true, false ))
- rHTMLWrt.aScriptTextStyles.insert( pSymCharFmt->GetName() );
+ rHTMLWrt.aScriptTextStyles.insert( pSymCharFormat->GetName() );
}
}
@@ -1928,16 +1928,16 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_STYLE_OPT |
CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_PARA );
- const SwNumFmt& rNumFmt = rNumRule.Get( nLevel );
+ const SwNumFormat& rNumFormat = rNumRule.Get( nLevel );
- long nLSpace = rNumFmt.GetAbsLSpace();
- long nFirstLineOffset = rNumFmt.GetFirstLineOffset();
+ long nLSpace = rNumFormat.GetAbsLSpace();
+ long nFirstLineOffset = rNumFormat.GetFirstLineOffset();
long nDfltFirstLineOffset = HTML_NUMBUL_INDENT;
if( nLevel > 0 )
{
- const SwNumFmt& rPrevNumFmt = rNumRule.Get( nLevel-1 );
- nLSpace -= rPrevNumFmt.GetAbsLSpace();
- nDfltFirstLineOffset = rPrevNumFmt.GetFirstLineOffset();
+ const SwNumFormat& rPrevNumFormat = rNumRule.Get( nLevel-1 );
+ nLSpace -= rPrevNumFormat.GetAbsLSpace();
+ nDfltFirstLineOffset = rPrevNumFormat.GetFirstLineOffset();
}
if( rHTMLWrt.IsHTMLMode(HTMLMODE_LSPACE_IN_NUMBUL) &&
@@ -1954,7 +1954,7 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
return rWrt;
}
-void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
+void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat,
sal_uInt32 nFrmOpts,
const SdrObject *pSdrObj,
const SfxItemSet *pItemSet )
@@ -1963,12 +1963,12 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
CSS1_OUTMODE_ENCODE|
CSS1_OUTMODE_FRAME );
- const SwFmtHoriOrient& rHoriOri = rFrmFmt.GetHoriOrient();
- SvxLRSpaceItem aLRItem( rFrmFmt.GetLRSpace() );
- SvxULSpaceItem aULItem( rFrmFmt.GetULSpace() );
+ const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient();
+ SvxLRSpaceItem aLRItem( rFrameFormat.GetLRSpace() );
+ SvxULSpaceItem aULItem( rFrameFormat.GetULSpace() );
if( nFrmOpts & HTML_FRMOPT_S_ALIGN )
{
- const SwFmtAnchor& rAnchor = rFrmFmt.GetAnchor();
+ const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
switch( rAnchor.GetAnchorId() )
{
case FLY_AT_PARA:
@@ -2002,11 +2002,11 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
// top
long nXPos=0, nYPos=0;
bool bOutXPos = false, bOutYPos = false;
- if( RES_DRAWFRMFMT == rFrmFmt.Which() )
+ if( RES_DRAWFRMFMT == rFrameFormat.Which() )
{
OSL_ENSURE( pSdrObj, "Do not pass a SdrObject. Inefficient" );
if( !pSdrObj )
- pSdrObj = rFrmFmt.FindSdrObject();
+ pSdrObj = rFrameFormat.FindSdrObject();
OSL_ENSURE( pSdrObj, "Where is the SdrObject" );
if( pSdrObj )
{
@@ -2022,7 +2022,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
nXPos = text::HoriOrientation::NONE == rHoriOri.GetHoriOrient()
? rHoriOri.GetPos() : 0;
- const SwFmtVertOrient& rVertOri = rFrmFmt.GetVertOrient();
+ const SwFormatVertOrient& rVertOri = rFrameFormat.GetVertOrient();
bOutYPos = text::RelOrientation::CHAR != rVertOri.GetRelationOrient();
nYPos = text::VertOrientation::NONE == rVertOri.GetVertOrient()
? rVertOri.GetPos() : 0;
@@ -2069,11 +2069,11 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
// width/height
if( nFrmOpts & HTML_FRMOPT_S_SIZE )
{
- if( RES_DRAWFRMFMT == rFrmFmt.Which() )
+ if( RES_DRAWFRMFMT == rFrameFormat.Which() )
{
OSL_ENSURE( pSdrObj, "Do not pass a SdrObject. Inefficient" );
if( !pSdrObj )
- pSdrObj = rFrmFmt.FindSdrObject();
+ pSdrObj = rFrameFormat.FindSdrObject();
OSL_ENSURE( pSdrObj, "Where is the SdrObject" );
if( pSdrObj )
{
@@ -2110,11 +2110,11 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
if( nFrmOpts & HTML_FRMOPT_S_PIXSIZE )
nMode |= CSS1_FRMSIZE_PIXEL;
- OutCSS1_SwFmtFrmSize( *this, rFrmFmt.GetFrmSize(), nMode );
+ OutCSS1_SwFormatFrmSize( *this, rFrameFormat.GetFrmSize(), nMode );
}
}
- const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+ const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
// margin-*
if( (nFrmOpts & HTML_FRMOPT_S_SPACE) &&
IsHTMLMode( HTMLMODE_FLY_MARGINS) )
@@ -2134,14 +2134,14 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
{
const SfxPoolItem* pItem;
if( nFrmOpts & HTML_FRMOPT_S_NOBORDER )
- OutCSS1_SvxBox( *this, rFrmFmt.GetBox() );
+ OutCSS1_SvxBox( *this, rFrameFormat.GetBox() );
else if( SfxItemState::SET==rItemSet.GetItemState( RES_BOX, true, &pItem ) )
OutCSS1_SvxBox( *this, *pItem );
}
// background (if, then the color must be set also)
if( nFrmOpts & HTML_FRMOPT_S_BACKGROUND )
- OutCSS1_FrmFmtBackground( rFrmFmt );
+ OutCSS1_FrameFormatBackground( rFrameFormat );
if( pItemSet )
OutCSS1_SfxItemSet( *pItemSet, false );
@@ -2150,46 +2150,46 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
Strm().WriteChar( '\"' );
}
-void SwHTMLWriter::OutCSS1_TableFrmFmtOptions( const SwFrmFmt& rFrmFmt )
+void SwHTMLWriter::OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameFormat )
{
SwCSS1OutMode aMode( *this, CSS1_OUTMODE_STYLE_OPT_ON |
CSS1_OUTMODE_ENCODE|
CSS1_OUTMODE_TABLE );
const SfxPoolItem *pItem;
- const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+ const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
if( SfxItemState::SET==rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
OutCSS1_SvxBrush( *this, *pItem, CSS1_BACKGROUND_TABLE );
if( IsHTMLMode( HTMLMODE_PRINT_EXT ) )
- OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( *this, rItemSet, false );
+ OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( *this, rItemSet, false );
if( SfxItemState::SET==rItemSet.GetItemState( RES_LAYOUT_SPLIT, false, &pItem ) )
- OutCSS1_SwFmtLayoutSplit( *this, *pItem );
+ OutCSS1_SwFormatLayoutSplit( *this, *pItem );
if( !bFirstCSS1Property )
Strm().WriteChar( '\"' );
}
-void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrmFmt const& rFrmFmt)
+void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrameFormat const& rFrameFormat)
{
SwCSS1OutMode const aMode( *this,
CSS1_OUTMODE_STYLE_OPT_ON|CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_TABLEBOX );
- OutCSS1_SvxBox(*this, rFrmFmt.GetBox());
+ OutCSS1_SvxBox(*this, rFrameFormat.GetBox());
if (!bFirstCSS1Property)
{
this->Strm().WriteChar( cCSS1_style_opt_end );
}
}
-void SwHTMLWriter::OutCSS1_SectionFmtOptions( const SwFrmFmt& rFrmFmt, const SwFmtCol *pCol )
+void SwHTMLWriter::OutCSS1_SectionFormatOptions( const SwFrameFormat& rFrameFormat, const SwFormatCol *pCol )
{
SwCSS1OutMode aMode( *this, CSS1_OUTMODE_STYLE_OPT_ON |
CSS1_OUTMODE_ENCODE|
CSS1_OUTMODE_SECTION );
const SfxPoolItem *pItem;
- const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+ const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
if( SfxItemState::SET==rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
OutCSS1_SvxBrush( *this, *pItem, CSS1_BACKGROUND_SECTION );
@@ -2203,7 +2203,7 @@ void SwHTMLWriter::OutCSS1_SectionFmtOptions( const SwFrmFmt& rFrmFmt, const SwF
Strm().WriteChar( '\"' );
}
-static bool OutCSS1_FrmFmtBrush( SwHTMLWriter& rWrt,
+static bool OutCSS1_FrameFormatBrush( SwHTMLWriter& rWrt,
const SvxBrushItem& rBrushItem )
{
bool bWritten = false;
@@ -2219,25 +2219,25 @@ static bool OutCSS1_FrmFmtBrush( SwHTMLWriter& rWrt,
return bWritten;
}
-void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt )
+void SwHTMLWriter::OutCSS1_FrameFormatBackground( const SwFrameFormat& rFrameFormat )
{
// If the frame itself has a background, then export.
- if( OutCSS1_FrmFmtBrush( *this, rFrmFmt.makeBackgroundBrushItem() ) )
+ if( OutCSS1_FrameFormatBrush( *this, rFrameFormat.makeBackgroundBrushItem() ) )
return;
// If the frame is not linked to a page, we use the background of the anchor.
- const SwFmtAnchor& rAnchor = rFrmFmt.GetAnchor();
+ const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
RndStdIds eAnchorId = rAnchor.GetAnchorId();
- const SwPosition *pAnchorPos = rAnchor.GetCntntAnchor();
+ const SwPosition *pAnchorPos = rAnchor.GetContentAnchor();
if (FLY_AT_PAGE != eAnchorId && pAnchorPos)
{
const SwNode& rNode = pAnchorPos->nNode.GetNode();
- if( rNode.IsCntntNode() )
+ if( rNode.IsContentNode() )
{
// If the frame is linked to a content-node,
// we take the background of the content-node, if it has one.
- if( OutCSS1_FrmFmtBrush( *this,
- rNode.GetCntntNode()->GetSwAttrSet().GetBackground()) )
+ if( OutCSS1_FrameFormatBrush( *this,
+ rNode.GetContentNode()->GetSwAttrSet().GetBackground()) )
return;
// Otherwise we also could be in a table
@@ -2246,37 +2246,37 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt )
{
const SwStartNode *pBoxSttNd = rNode.FindTableBoxStartNode();
const SwTableBox *pBox =
- pTableNd->GetTable().GetTblBox( pBoxSttNd->GetIndex() );
+ pTableNd->GetTable().GetTableBox( pBoxSttNd->GetIndex() );
// If the box has a background, we take it.
- if( OutCSS1_FrmFmtBrush( *this,
- pBox->GetFrmFmt()->makeBackgroundBrushItem() ) )
+ if( OutCSS1_FrameFormatBrush( *this,
+ pBox->GetFrameFormat()->makeBackgroundBrushItem() ) )
return;
// Otherwise we use that of the lines
const SwTableLine *pLine = pBox->GetUpper();
while( pLine )
{
- if( OutCSS1_FrmFmtBrush( *this,
- pLine->GetFrmFmt()->makeBackgroundBrushItem() ) )
+ if( OutCSS1_FrameFormatBrush( *this,
+ pLine->GetFrameFormat()->makeBackgroundBrushItem() ) )
return;
pBox = pLine->GetUpper();
pLine = pBox ? pBox->GetUpper() : 0;
}
// If there was none either, we use the background of the table.
- if( OutCSS1_FrmFmtBrush( *this,
- pTableNd->GetTable().GetFrmFmt()->makeBackgroundBrushItem() ) )
+ if( OutCSS1_FrameFormatBrush( *this,
+ pTableNd->GetTable().GetFrameFormat()->makeBackgroundBrushItem() ) )
return;
}
}
// If the anchor is again in a Fly-Frame, use the background of the Fly-Frame.
- const SwFrmFmt *pFrmFmt = rNode.GetFlyFmt();
- if( pFrmFmt )
+ const SwFrameFormat *pFrameFormat = rNode.GetFlyFormat();
+ if( pFrameFormat )
{
- OutCSS1_FrmFmtBackground( *pFrmFmt );
+ OutCSS1_FrameFormatBackground( *pFrameFormat );
return;
}
}
@@ -2284,7 +2284,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt )
// At last there is the background of the page, and as the final rescue
// the value of the Config.
OSL_ENSURE( pCurrPageDesc, "no page template found" );
- if( !OutCSS1_FrmFmtBrush( *this,
+ if( !OutCSS1_FrameFormatBrush( *this,
pCurrPageDesc->GetMaster().makeBackgroundBrushItem() ) )
{
Color aColor( COL_WHITE );
@@ -2305,7 +2305,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt )
}
}
-static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
+static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt,
const SvxUnderlineItem *pUItem,
const SvxOverlineItem *pOItem,
const SvxCrossedOutItem *pCOItem,
@@ -2484,10 +2484,10 @@ static Writer& OutCSS1_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutCSS1_SvxCrossedOut( Writer& rWrt, const SfxPoolItem& rHt )
{
// This function only exports Hints!
- // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly.
+ // Otherwise OutCSS1_SvxTextLn_SvxCrOut_SvxBlink() is called directly.
if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) )
- OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt,
+ OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( rWrt,
0, 0, static_cast<const SvxCrossedOutItem *>(&rHt), 0 );
return rWrt;
@@ -2654,10 +2654,10 @@ static Writer& OutCSS1_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutCSS1_SvxUnderline( Writer& rWrt, const SfxPoolItem& rHt )
{
// This function only exports Hints!
- // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly.
+ // Otherwise OutCSS1_SvxTextLn_SvxCrOut_SvxBlink() is called directly.
if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) )
- OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt,
+ OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( rWrt,
static_cast<const SvxUnderlineItem *>(&rHt), 0, 0, 0 );
return rWrt;
@@ -2666,10 +2666,10 @@ static Writer& OutCSS1_SvxUnderline( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutCSS1_SvxOverline( Writer& rWrt, const SfxPoolItem& rHt )
{
// This function only exports Hints!
- // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly.
+ // Otherwise OutCSS1_SvxTextLn_SvxCrOut_SvxBlink() is called directly.
if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) )
- OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt,
+ OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( rWrt,
0, static_cast<const SvxOverlineItem *>(&rHt), 0, 0 );
return rWrt;
@@ -2730,10 +2730,10 @@ static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutCSS1_SvxBlink( Writer& rWrt, const SfxPoolItem& rHt )
{
// This function only exports Hints!
- // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly.
+ // Otherwise OutCSS1_SvxTextLn_SvxCrOut_SvxBlink() is called directly.
if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) )
- OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt,
+ OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( rWrt,
0, 0, 0, static_cast<const SvxBlinkItem *>(&rHt) );
return rWrt;
@@ -2819,11 +2819,11 @@ static Writer& OutCSS1_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-static Writer& OutCSS1_SvxFmtSplit( Writer& rWrt, const SfxPoolItem& rHt )
+static Writer& OutCSS1_SvxFormatSplit( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- const sal_Char *pStr = static_cast<const SvxFmtSplitItem&>(rHt).GetValue()
+ const sal_Char *pStr = static_cast<const SvxFormatSplitItem&>(rHt).GetValue()
? sCSS1_PV_auto
: sCSS1_PV_avoid;
rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_page_break_inside, pStr );
@@ -2831,11 +2831,11 @@ static Writer& OutCSS1_SvxFmtSplit( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-static Writer& OutCSS1_SwFmtLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt )
+static Writer& OutCSS1_SwFormatLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- const sal_Char *pStr = static_cast<const SwFmtLayoutSplit&>(rHt).GetValue()
+ const sal_Char *pStr = static_cast<const SwFormatLayoutSplit&>(rHt).GetValue()
? sCSS1_PV_auto
: sCSS1_PV_avoid;
rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_page_break_inside, pStr );
@@ -2863,9 +2863,9 @@ static Writer& OutCSS1_SvxOrphans( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-static void OutCSS1_SwFmtDropAttrs( SwHTMLWriter& rHWrt,
- const SwFmtDrop& rDrop,
- const SfxItemSet *pCharFmtItemSet )
+static void OutCSS1_SwFormatDropAttrs( SwHTMLWriter& rHWrt,
+ const SwFormatDrop& rDrop,
+ const SfxItemSet *pCharFormatItemSet )
{
// Text flows around on right side
rHWrt.OutCSS1_PropertyAscii( sCSS1_P_float, sCSS1_PV_left );
@@ -2879,17 +2879,17 @@ static void OutCSS1_SwFmtDropAttrs( SwHTMLWriter& rHWrt,
if( nDistance > 0 )
rHWrt.OutCSS1_UnitProperty( sCSS1_P_margin_right, nDistance );
- const SwCharFmt *pDCCharFmt = rDrop.GetCharFmt();
- if( pCharFmtItemSet )
- rHWrt.OutCSS1_SfxItemSet( *pCharFmtItemSet );
- else if( pDCCharFmt )
- rHWrt.OutCSS1_SfxItemSet( pDCCharFmt->GetAttrSet() );
+ const SwCharFormat *pDCCharFormat = rDrop.GetCharFormat();
+ if( pCharFormatItemSet )
+ rHWrt.OutCSS1_SfxItemSet( *pCharFormatItemSet );
+ else if( pDCCharFormat )
+ rHWrt.OutCSS1_SfxItemSet( pDCCharFormat->GetAttrSet() );
else if( (rHWrt.nCSS1OutMode & CSS1_OUTMODE_ANY_OFF) == CSS1_OUTMODE_RULE_OFF )
rHWrt.Strm().WriteCharPtr( sCSS1_rule_end );
}
-static Writer& OutCSS1_SwFmtDrop( Writer& rWrt, const SfxPoolItem& rHt )
+static Writer& OutCSS1_SwFormatDrop( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -2903,7 +2903,7 @@ static Writer& OutCSS1_SwFmtDrop( Writer& rWrt, const SfxPoolItem& rHt )
rHTMLWrt.nCSS1Script|CSS1_OUTMODE_SPAN_TAG1_ON|CSS1_OUTMODE_ENCODE|
CSS1_OUTMODE_DROPCAP );
- OutCSS1_SwFmtDropAttrs( rHTMLWrt, static_cast<const SwFmtDrop&>(rHt) );
+ OutCSS1_SwFormatDropAttrs( rHTMLWrt, static_cast<const SwFormatDrop&>(rHt) );
// A "> is already printed by the calling OutCSS1_HintAsSpanTag.
}
else
@@ -2914,12 +2914,12 @@ static Writer& OutCSS1_SwFmtDrop( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-static Writer& OutCSS1_SwFmtFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
+static Writer& OutCSS1_SwFormatFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
sal_uInt16 nMode )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- const SwFmtFrmSize& rFSItem = static_cast<const SwFmtFrmSize&>(rHt);
+ const SwFormatFrmSize& rFSItem = static_cast<const SwFormatFrmSize&>(rHt);
if( nMode & CSS1_FRMSIZE_WIDTH )
{
@@ -2995,7 +2995,7 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const SfxPoolItem& rHt )
// match that of the current template
// A left margin can exist because of a list nearby
- long nLeftMargin = (long)rLRItem.GetTxtLeft() - rHTMLWrt.nLeftMargin;
+ long nLeftMargin = (long)rLRItem.GetTextLeft() - rHTMLWrt.nLeftMargin;
if( rHTMLWrt.nDfltLeftMargin != nLeftMargin )
{
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_left, nLeftMargin );
@@ -3013,7 +3013,7 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const SfxPoolItem& rHt )
}
// The LineIndent of the first line might contain the room for numbering
- long nFirstLineIndent = (long)rLRItem.GetTxtFirstLineOfst() -
+ long nFirstLineIndent = (long)rLRItem.GetTextFirstLineOfst() -
rHTMLWrt.nFirstLineIndent;
if( rHTMLWrt.nDfltFirstLineIndent != nFirstLineIndent )
{
@@ -3092,10 +3092,10 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
return rWrt;
}
-static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
- const SvxFmtBreakItem *pBreakItem,
- const SwFmtPageDesc *pPDescItem,
- const SvxFmtKeepItem *pKeepItem )
+static Writer& OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( Writer& rWrt,
+ const SvxFormatBreakItem *pBreakItem,
+ const SwFormatPageDesc *pPDescItem,
+ const SvxFormatKeepItem *pKeepItem )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -3136,7 +3136,7 @@ static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
const SwPageDesc *pPDesc = pPDescItem->GetPageDesc();
if( pPDesc )
{
- switch( pPDesc->GetPoolFmtId() )
+ switch( pPDesc->GetPoolFormatId() )
{
case RES_POOLPAGE_LEFT: pBreakBefore = sCSS1_PV_left; break;
case RES_POOLPAGE_RIGHT: pBreakBefore = sCSS1_PV_right; break;
@@ -3159,30 +3159,30 @@ static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
return rWrt;
}
-static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
+static Writer& OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( Writer& rWrt,
const SfxItemSet& rItemSet,
bool bDeep )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
const SfxPoolItem *pItem;
- const SvxFmtBreakItem *pBreakItem = 0;
+ const SvxFormatBreakItem *pBreakItem = 0;
if( SfxItemState::SET==rItemSet.GetItemState( RES_BREAK, bDeep, &pItem ))
- pBreakItem = static_cast<const SvxFmtBreakItem *>(pItem);
+ pBreakItem = static_cast<const SvxFormatBreakItem *>(pItem);
- const SwFmtPageDesc *pPDescItem = 0;
+ const SwFormatPageDesc *pPDescItem = 0;
if( ( !rHTMLWrt.IsCSS1Source( CSS1_OUTMODE_PARA ) ||
!rHTMLWrt.bCSS1IgnoreFirstPageDesc ||
rHTMLWrt.pStartNdIdx->GetIndex() !=
rHTMLWrt.pCurPam->GetPoint()->nNode.GetIndex() ) &&
SfxItemState::SET==rItemSet.GetItemState( RES_PAGEDESC, bDeep, &pItem ))
- pPDescItem = static_cast<const SwFmtPageDesc*>(pItem);
+ pPDescItem = static_cast<const SwFormatPageDesc*>(pItem);
- const SvxFmtKeepItem *pKeepItem = 0;
+ const SvxFormatKeepItem *pKeepItem = 0;
if( SfxItemState::SET==rItemSet.GetItemState( RES_KEEP, bDeep, &pItem ))
- pKeepItem = static_cast<const SvxFmtKeepItem *>(pItem);
+ pKeepItem = static_cast<const SvxFormatKeepItem *>(pItem);
if( pBreakItem || pPDescItem || pKeepItem )
- OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( rWrt, pBreakItem,
+ OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( rWrt, pBreakItem,
pPDescItem, pKeepItem );
return rWrt;
@@ -3605,12 +3605,12 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_PARATR_LINESPACING */ OutCSS1_SvxLineSpacing,
/* RES_PARATR_ADJUST */ OutCSS1_SvxAdjust,
-/* RES_PARATR_SPLIT */ OutCSS1_SvxFmtSplit,
+/* RES_PARATR_SPLIT */ OutCSS1_SvxFormatSplit,
/* RES_PARATR_ORPHANS */ OutCSS1_SvxOrphans,
/* RES_PARATR_WIDOWS */ OutCSS1_SvxWidows,
/* RES_PARATR_TABSTOP */ 0,
/* RES_PARATR_HYPHENZONE*/ 0,
-/* RES_PARATR_DROP */ OutCSS1_SwFmtDrop,
+/* RES_PARATR_DROP */ OutCSS1_SwFormatDrop,
/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit
/* RES_PARATR_NUMRULE */ 0,
/* RES_PARATR_SCRIPTSPACE */ 0,
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 5eb03147a750..879ac21a481e 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -122,7 +122,7 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl )
if( nDefListLvl < nNewLvl )
{
// output </pre> for the previous(!) pararagraph, if required.
- // Preferable, the <pre> is exported by OutHTML_SwFmtOff for the
+ // Preferable, the <pre> is exported by OutHTML_SwFormatOff for the
// previous paragraph already, but that's not possible, because a very
// deep look at the next paragraph (this one) is required to figure
// out that a def list starts here.
@@ -189,17 +189,17 @@ sal_uInt16 SwHTMLWriter::GetCSS1ScriptForScriptType( sal_uInt16 nScriptType )
* Formate wie folgt ausgeben:
* - fuer Formate, fuer die es entsprechende HTML-Tags gibt wird das
* Tag ausgegeben
- * - fuer alle anderen wird ein Absatz-Tag <P> ausgegeben und bUserFmt
+ * - fuer alle anderen wird ein Absatz-Tag <P> ausgegeben und bUserFormat
* gesetzt
* - Wenn eine Absatz-Ausrichtung am uebergebenen Item-Set des Nodes
* oder im Item-Set des Format gesetzt ist, wird ein ALIGN=xxx ausgegeben,
* sofern HTML es zulaesst
* - in jedem Fall wird harte Attributierung als STYLE-Option geschrieben.
- * Wenn bUserFmt nicht gesetzt ist, wird nur der uebergebene Item-Set
+ * Wenn bUserFormat nicht gesetzt ist, wird nur der uebergebene Item-Set
* betrachtet. Sonst werden auch Attribute des Formats ausgegeben.
*/
-struct SwHTMLTxtCollOutputInfo
+struct SwHTMLTextCollOutputInfo
{
OString aToken; // auszugendens End-Token
std::unique_ptr<SfxItemSet> pItemSet; // harte Attributierung
@@ -209,29 +209,29 @@ struct SwHTMLTxtCollOutputInfo
bool bOutPara; // ein </P> soll ausgegeben werden
bool bOutDiv; // write a </DIV>
- SwHTMLTxtCollOutputInfo() :
+ SwHTMLTextCollOutputInfo() :
bInNumBulList( false ),
bParaPossible( false ),
bOutPara( false ),
bOutDiv( false )
{}
- ~SwHTMLTxtCollOutputInfo();
+ ~SwHTMLTextCollOutputInfo();
bool HasParaToken() const { return aToken.getLength()==1 && aToken[0]=='P'; }
bool ShouldOutputToken() const { return bOutPara || !HasParaToken(); }
};
-SwHTMLTxtCollOutputInfo::~SwHTMLTxtCollOutputInfo()
+SwHTMLTextCollOutputInfo::~SwHTMLTextCollOutputInfo()
{
}
-SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
+SwHTMLFormatInfo::SwHTMLFormatInfo( const SwFormat *pF, SwDoc *pDoc, SwDoc *pTemplate,
bool bOutStyles,
LanguageType eDfltLang,
sal_uInt16 nCSS1Script, bool bHardDrop )
- : pFmt(pF)
- , pRefFmt(0)
+ : pFormat(pF)
+ , pRefFormat(0)
, pItemSet(0)
, nLeftMargin(0)
, nRightMargin(0)
@@ -242,17 +242,17 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
{
sal_uInt16 nRefPoolId = 0;
// Den Selektor des Formats holen
- sal_uInt16 nDeep = SwHTMLWriter::GetCSS1Selector( pFmt, aToken, aClass,
+ sal_uInt16 nDeep = SwHTMLWriter::GetCSS1Selector( pFormat, aToken, aClass,
nRefPoolId );
OSL_ENSURE( nDeep ? !aToken.isEmpty() : aToken.isEmpty(),
"Hier stimmt doch was mit dem Token nicht!" );
OSL_ENSURE( nDeep ? nRefPoolId != 0 : nRefPoolId == 0,
"Hier stimmt doch was mit der Vergleichs-Vorlage nicht!" );
- bool bTxtColl = pFmt->Which() == RES_TXTFMTCOLL ||
- pFmt->Which() == RES_CONDTXTFMTCOLL;
+ bool bTextColl = pFormat->Which() == RES_TXTFMTCOLL ||
+ pFormat->Which() == RES_CONDTXTFMTCOLL;
- const SwFmt *pReferenceFmt = 0; // Vergleichs-Format
+ const SwFormat *pReferenceFormat = 0; // Vergleichs-Format
bool bSetDefaults = true, bClearSame = true;
if( nDeep != 0 )
{
@@ -268,7 +268,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
case CSS1_FMT_CMPREF:
// fuer HTML-Tag-Vorlagen die Unterscheide zum Original
// (sofern verfuegbar)
- pReferenceFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId,
+ pReferenceFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId,
&pTemplate->getIDocumentStylePoolAccess() );
break;
@@ -276,38 +276,38 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
// sonst die zur HTML-Tag-Vorlage des Originals oder des
// aktuellen Doks, wenn die nicht verfuegbar ist
if( pTemplate )
- pReferenceFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId,
+ pReferenceFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId,
&pTemplate->getIDocumentStylePoolAccess() );
else
- pReferenceFmt = SwHTMLWriter::GetParentFmt( *pFmt, nDeep );
+ pReferenceFormat = SwHTMLWriter::GetParentFormat( *pFormat, nDeep );
break;
}
}
}
- else if( bTxtColl )
+ else if( bTextColl )
{
// Nicht von einer HTML-Tag-Vorlage abgeleitete Absatz-Vorlagen
// muessen als harte Attributierung relativ zur Textkoerper-Volage
// exportiert werden. Fuer Nicht-Styles-Export sollte die der
// HTML-Vorlage als Referenz dienen
if( !bOutStyles && pTemplate )
- pReferenceFmt = pTemplate->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT, false );
+ pReferenceFormat = pTemplate->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT, false );
else
- pReferenceFmt = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT, false );
+ pReferenceFormat = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT, false );
}
- if( pReferenceFmt || nDeep==0 )
+ if( pReferenceFormat || nDeep==0 )
{
- pItemSet = new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
- pFmt->GetAttrSet().GetRanges() );
+ pItemSet = new SfxItemSet( *pFormat->GetAttrSet().GetPool(),
+ pFormat->GetAttrSet().GetRanges() );
// wenn Unterschiede zu einer anderen Vorlage geschrieben werden
// sollen ist harte Attributierung noetig. Fuer Vorlagen, die
// nicht von HTML-Tag-Vorlagen abgeleitet sind, gilt das immer
- pItemSet->Set( pFmt->GetAttrSet(), true );
+ pItemSet->Set( pFormat->GetAttrSet(), true );
- if( pReferenceFmt )
- SwHTMLWriter::SubtractItemSet( *pItemSet, pReferenceFmt->GetAttrSet(),
+ if( pReferenceFormat )
+ SwHTMLWriter::SubtractItemSet( *pItemSet, pReferenceFormat->GetAttrSet(),
bSetDefaults, bClearSame );
// einen leeren Item-Set gleich loeschen, das spart speater
@@ -319,7 +319,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
}
}
- if( bTxtColl )
+ if( bTextColl )
{
if( bOutStyles )
{
@@ -357,15 +357,15 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
}
for( sal_uInt16 i=0; i<4; i++ )
{
- const SfxPoolItem& rRef = pFmt->GetFmtAttr( aWhichIds[nRef][i] );
+ const SfxPoolItem& rRef = pFormat->GetFormatAttr( aWhichIds[nRef][i] );
for( sal_uInt16 j=0; j<2; j++ )
{
- const SfxPoolItem& rSet = pFmt->GetFmtAttr( aWhichIds[aSets[j]][i] );
+ const SfxPoolItem& rSet = pFormat->GetFormatAttr( aWhichIds[aSets[j]][i] );
if( rSet != rRef )
{
if( !pItemSet )
- pItemSet = new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
- pFmt->GetAttrSet().GetRanges() );
+ pItemSet = new SfxItemSet( *pFormat->GetAttrSet().GetPool(),
+ pFormat->GetAttrSet().GetRanges() );
pItemSet->Put( rSet );
}
}
@@ -376,24 +376,24 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
if( bOutStyles && bHardDrop && nDeep != 0 )
{
const SfxPoolItem *pItem;
- if( SfxItemState::SET==pFmt->GetAttrSet().GetItemState(
+ if( SfxItemState::SET==pFormat->GetAttrSet().GetItemState(
RES_PARATR_DROP, true, &pItem ) )
{
bool bPut = true;
if( pTemplate )
{
- pReferenceFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
+ pReferenceFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
const SfxPoolItem *pRefItem;
bool bRefItemSet =
- SfxItemState::SET==pReferenceFmt->GetAttrSet().GetItemState(
+ SfxItemState::SET==pReferenceFormat->GetAttrSet().GetItemState(
RES_PARATR_DROP, true, &pRefItem );
bPut = !bRefItemSet || *pItem!=*pRefItem;
}
if( bPut )
{
if( !pItemSet )
- pItemSet = new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
- pFmt->GetAttrSet().GetRanges() );
+ pItemSet = new SfxItemSet( *pFormat->GetAttrSet().GetPool(),
+ pFormat->GetAttrSet().GetRanges() );
pItemSet->Put( *pItem );
}
}
@@ -402,13 +402,13 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
// Die diversen default-Abstaende aus der Vorlage oder der
// Vergleischs-Vorlage merken
const SvxLRSpaceItem &rLRSpace =
- (pReferenceFmt ? pReferenceFmt : pFmt)->GetLRSpace();
- nLeftMargin = rLRSpace.GetTxtLeft();
+ (pReferenceFormat ? pReferenceFormat : pFormat)->GetLRSpace();
+ nLeftMargin = rLRSpace.GetTextLeft();
nRightMargin = rLRSpace.GetRight();
- nFirstLineIndent = rLRSpace.GetTxtFirstLineOfst();
+ nFirstLineIndent = rLRSpace.GetTextFirstLineOfst();
const SvxULSpaceItem &rULSpace =
- (pReferenceFmt ? pReferenceFmt : pFmt)->GetULSpace();
+ (pReferenceFormat ? pReferenceFormat : pFormat)->GetULSpace();
nTopMargin = rULSpace.GetUpper();
nBottomMargin = rULSpace.GetLower();
@@ -416,13 +416,13 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
sal_uInt16 nWhichId =
SwHTMLWriter::GetLangWhichIdFromScript( nCSS1Script );
const SvxLanguageItem& rLang =
- static_cast<const SvxLanguageItem&>(pFmt->GetFmtAttr( nWhichId ));
+ static_cast<const SvxLanguageItem&>(pFormat->GetFormatAttr( nWhichId ));
LanguageType eLang = rLang.GetLanguage();
if( eLang != eDfltLang )
{
if( !pItemSet )
- pItemSet = new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
- pFmt->GetAttrSet().GetRanges() );
+ pItemSet = new SfxItemSet( *pFormat->GetAttrSet().GetPool(),
+ pFormat->GetAttrSet().GetRanges() );
pItemSet->Put( rLang );
}
@@ -434,12 +434,12 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
if( aWhichIds[i] != nWhichId )
{
const SvxLanguageItem& rTmpLang =
- static_cast<const SvxLanguageItem&>(pFmt->GetFmtAttr(aWhichIds[i]));
+ static_cast<const SvxLanguageItem&>(pFormat->GetFormatAttr(aWhichIds[i]));
if( rTmpLang.GetLanguage() != eLang )
{
if( !pItemSet )
- pItemSet = new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
- pFmt->GetAttrSet().GetRanges() );
+ pItemSet = new SfxItemSet( *pFormat->GetAttrSet().GetPool(),
+ pFormat->GetAttrSet().GetRanges() );
pItemSet->Put( rTmpLang );
}
}
@@ -447,16 +447,16 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
}
}
-SwHTMLFmtInfo::~SwHTMLFmtInfo()
+SwHTMLFormatInfo::~SwHTMLFormatInfo()
{
delete pItemSet;
}
-void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
+void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
const SfxItemSet *pNodeItemSet,
- SwHTMLTxtCollOutputInfo& rInfo )
+ SwHTMLTextCollOutputInfo& rInfo )
{
- OSL_ENSURE( RES_CONDTXTFMTCOLL==rFmt.Which() || RES_TXTFMTCOLL==rFmt.Which(),
+ OSL_ENSURE( RES_CONDTXTFMTCOLL==rFormat.Which() || RES_TXTFMTCOLL==rFormat.Which(),
"keine Absatz-Vorlage" );
SwHTMLWriter & rHWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -477,7 +477,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
sal_uInt8 nBulletGrfLvl = 255; // Die auszugebende Bullet-Grafik
// Sind wir in einer Aufzaehlungs- oder Numerierungliste?
- const SwTxtNode* pTxtNd = rWrt.pCurPam->GetNode().GetTxtNode();
+ const SwTextNode* pTextNd = rWrt.pCurPam->GetNode().GetTextNode();
SwHTMLNumRuleInfo aNumInfo;
if( rHWrt.GetNextNumInfo() )
@@ -487,7 +487,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
else
{
- aNumInfo.Set( *pTxtNd );
+ aNumInfo.Set( *pTextNd );
}
if( aNumInfo.GetNumRule() )
@@ -499,9 +499,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
bNumbered = aNumInfo.IsNumbered();
sal_uInt8 nLvl = aNumInfo.GetLevel();
- OSL_ENSURE( pTxtNd->GetActualListLevel() == nLvl,
+ OSL_ENSURE( pTextNd->GetActualListLevel() == nLvl,
"Gemerkter Num-Level ist falsch" );
- OSL_ENSURE( bNumbered == pTxtNd->IsCountedInList(),
+ OSL_ENSURE( bNumbered == pTextNd->IsCountedInList(),
"Gemerkter Numerierungs-Zustand ist falsch" );
if( bNumbered )
@@ -512,9 +512,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// - <nNumStart> has to contain the restart value, if the
// numbering is restarted at this text node. Value <USHRT_MAX>
// indicates, that no additional restart value has to be written.
- if ( pTxtNd->IsListRestart() )
+ if ( pTextNd->IsListRestart() )
{
- nNumStart = static_cast< sal_uInt16 >(pTxtNd->GetActualListStartValue());
+ nNumStart = static_cast< sal_uInt16 >(pTextNd->GetActualListStartValue());
}
OSL_ENSURE( rHWrt.nLastParaToken == 0,
"<PRE> wurde nicht vor <LI> beendet." );
@@ -522,32 +522,32 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
// Jetzt holen wir das Token und ggf. die Klasse
- SwHTMLFmtInfo aFmtInfo( &rFmt );
- SwHTMLFmtInfo *pFmtInfo;
- SwHTMLFmtInfos::iterator it = rHWrt.aTxtCollInfos.find( aFmtInfo );
- if( it != rHWrt.aTxtCollInfos.end() )
+ SwHTMLFormatInfo aFormatInfo( &rFormat );
+ SwHTMLFormatInfo *pFormatInfo;
+ SwHTMLFormatInfos::iterator it = rHWrt.aTextCollInfos.find( aFormatInfo );
+ if( it != rHWrt.aTextCollInfos.end() )
{
- pFmtInfo = &*it;
+ pFormatInfo = &*it;
}
else
{
- pFmtInfo = new SwHTMLFmtInfo( &rFmt, rWrt.pDoc, rHWrt.pTemplate,
+ pFormatInfo = new SwHTMLFormatInfo( &rFormat, rWrt.pDoc, rHWrt.pTemplate,
rHWrt.bCfgOutStyles, rHWrt.eLang,
rHWrt.nCSS1Script,
false );
- rHWrt.aTxtCollInfos.insert( pFmtInfo );
- if( rHWrt.aScriptParaStyles.count( rFmt.GetName() ) )
- pFmtInfo->bScriptDependent = true;
+ rHWrt.aTextCollInfos.insert( pFormatInfo );
+ if( rHWrt.aScriptParaStyles.count( rFormat.GetName() ) )
+ pFormatInfo->bScriptDependent = true;
}
// Jetzt wird festgelegt, was aufgrund des Tokens so moeglich ist
sal_uInt16 nToken = 0; // Token fuer Tag-Wechsel
bool bOutNewLine = false; // nur ein LF ausgeben?
- if( !pFmtInfo->aToken.isEmpty() )
+ if( !pFormatInfo->aToken.isEmpty() )
{
// Es ist eine HTML-Tag-Vorlage oder die Vorlage ist von einer
// solchen abgeleitet
- rInfo.aToken = pFmtInfo->aToken;
+ rInfo.aToken = pFormatInfo->aToken;
if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_address)
{
@@ -594,10 +594,10 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
// Falls noetig, die harte Attributierung der Vorlage uebernehmen
- if( pFmtInfo->pItemSet )
+ if( pFormatInfo->pItemSet )
{
OSL_ENSURE( !rInfo.pItemSet.get(), "Wo kommt der Item-Set her?" );
- rInfo.pItemSet.reset(new SfxItemSet( *pFmtInfo->pItemSet ));
+ rInfo.pItemSet.reset(new SfxItemSet( *pFormatInfo->pItemSet ));
}
// und noch die harte Attributierung des Absatzes dazunehmen
@@ -612,7 +612,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// den unteren Absatz-Abstand brauchen wir noch
const SvxULSpaceItem& rULSpace =
pNodeItemSet ? static_cast<const SvxULSpaceItem &>(pNodeItemSet->Get(RES_UL_SPACE))
- : rFmt.GetULSpace();
+ : rFormat.GetULSpace();
if( (rHWrt.bOutHeader &&
rWrt.pCurPam->GetPoint()->nNode.GetIndex() ==
@@ -629,7 +629,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
if (!rInfo.pItemSet.get())
{
- rInfo.pItemSet.reset(new SfxItemSet(*rFmt.GetAttrSet().GetPool(), RES_UL_SPACE, RES_UL_SPACE));
+ rInfo.pItemSet.reset(new SfxItemSet(*rFormat.GetAttrSet().GetPool(), RES_UL_SPACE, RES_UL_SPACE));
}
rInfo.pItemSet->Put( aULSpaceItem );
}
@@ -667,15 +667,15 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// eine Definitions-Liste
const SvxLRSpaceItem& rLRSpace =
pNodeItemSet ? static_cast<const SvxLRSpaceItem &>(pNodeItemSet->Get(RES_LR_SPACE))
- : rFmt.GetLRSpace();
+ : rFormat.GetLRSpace();
if( (!rHWrt.bCfgOutStyles || bForceDL) && !rInfo.bInNumBulList )
{
sal_Int32 nLeftMargin;
if( bForceDL )
- nLeftMargin = rLRSpace.GetTxtLeft();
+ nLeftMargin = rLRSpace.GetTextLeft();
else
- nLeftMargin = rLRSpace.GetTxtLeft() > pFmtInfo->nLeftMargin
- ? rLRSpace.GetTxtLeft() - pFmtInfo->nLeftMargin
+ nLeftMargin = rLRSpace.GetTextLeft() > pFormatInfo->nLeftMargin
+ ? rLRSpace.GetTextLeft() - pFormatInfo->nLeftMargin
: 0;
if( nLeftMargin > 0 && rHWrt.nDefListMargin > 0 )
@@ -693,9 +693,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
nNewDefListLvl = (bForceDL&& !bDT) ? 1 : 0;
}
- bool bIsNextTxtNode =
+ bool bIsNextTextNode =
rWrt.pDoc->GetNodes()[rWrt.pCurPam->GetPoint()->nNode.GetIndex()+1]
- ->IsTxtNode();
+ ->IsTextNode();
if( bForceDL && bDT )
{
@@ -705,7 +705,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
else if( !nNewDefListLvl && !rHWrt.bCfgOutStyles && bPara &&
rULSpace.GetLower()==0 &&
- ((bUseParSpace && bIsNextTxtNode) || rHWrt.nDefListLvl==1) &&
+ ((bUseParSpace && bIsNextTextNode) || rHWrt.nDefListLvl==1) &&
(!pAdjItem || SVX_ADJUST_LEFT==
static_cast<const SvxAdjustItem *>(pAdjItem)->GetAdjust()) )
{
@@ -737,17 +737,17 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// Die Defaults aus der Vorlage merken, denn sie muessen nicht
// exportiert werden
- rHWrt.nDfltLeftMargin = pFmtInfo->nLeftMargin;
- rHWrt.nDfltRightMargin = pFmtInfo->nRightMargin;
- rHWrt.nDfltFirstLineIndent = pFmtInfo->nFirstLineIndent;
+ rHWrt.nDfltLeftMargin = pFormatInfo->nLeftMargin;
+ rHWrt.nDfltRightMargin = pFormatInfo->nRightMargin;
+ rHWrt.nDfltFirstLineIndent = pFormatInfo->nFirstLineIndent;
if( rInfo.bInNumBulList )
{
if( !rHWrt.IsHTMLMode( HTMLMODE_LSPACE_IN_NUMBUL ) )
- rHWrt.nDfltLeftMargin = rLRSpace.GetTxtLeft();
+ rHWrt.nDfltLeftMargin = rLRSpace.GetTextLeft();
// In Numerierungs-Listen keinen Ertzeilen-Einzug ausgeben.
- rHWrt.nFirstLineIndent = rLRSpace.GetTxtFirstLineOfst();
+ rHWrt.nFirstLineIndent = rLRSpace.GetTextFirstLineOfst();
}
if( rInfo.bInNumBulList && bNumbered && bPara && !rHWrt.bCfgOutStyles )
@@ -764,7 +764,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
else
{
- rHWrt.nDfltTopMargin = pFmtInfo->nTopMargin;
+ rHWrt.nDfltTopMargin = pFormatInfo->nTopMargin;
// Wenn im letzten Absatz einer Tabelle der
// untere Absatz-Abstand veraendert wird, vertut sich
// Netscape total. Deshalb exportieren wir hier erstmal
@@ -773,7 +773,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
if( rHWrt.bCfgNetscape4 && !bUseParSpace )
rHWrt.nDfltBottomMargin = rULSpace.GetLower();
else
- rHWrt.nDfltBottomMargin = pFmtInfo->nBottomMargin;
+ rHWrt.nDfltBottomMargin = pFormatInfo->nBottomMargin;
}
if( rHWrt.nDefListLvl )
@@ -816,7 +816,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_division);
rWrt.Strm().WriteOString( sOut );
- rHWrt.bTxtAttr = false;
+ rHWrt.bTextAttr = false;
rHWrt.bOutOpts = true;
OutHTML_SvxAdjust( rWrt, *pAdjItem );
rWrt.Strm().WriteChar( '>' );
@@ -868,7 +868,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
sal_uInt16 nDir = rHWrt.GetHTMLDirection(
(pNodeItemSet ? static_cast < const SvxFrameDirectionItem& >(
pNodeItemSet->Get( RES_FRAMEDIR ) )
- : rFmt.GetFrmDir() ).GetValue() );
+ : rFormat.GetFrmDir() ).GetValue() );
// Ein <P> wird nur geschrieben, wenn
// - wir in keiner OL/UL/DL sind, oder
@@ -890,7 +890,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
rHWrt.bCfgOutStyles )
{
// jetzt werden Optionen ausgegeben
- rHWrt.bTxtAttr = false;
+ rHWrt.bTextAttr = false;
rHWrt.bOutOpts = true;
OString sOut = "<" + aToken;
@@ -913,13 +913,13 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
if( rHWrt.bCfgOutStyles &&
- (!pFmtInfo->aClass.isEmpty() || pFmtInfo->bScriptDependent) )
+ (!pFormatInfo->aClass.isEmpty() || pFormatInfo->bScriptDependent) )
{
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_class) + "=\"";
rWrt.Strm().WriteOString( sOut );
sOut = "";
- OUString aClass( pFmtInfo->aClass );
- if( pFmtInfo->bScriptDependent )
+ OUString aClass( pFormatInfo->aClass );
+ if( pFormatInfo->bScriptDependent )
{
if( !aClass.isEmpty() )
aClass += "-";
@@ -948,7 +948,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
OutHTML_SvxAdjust( rWrt, *pAdjItem );
rHWrt.bParaDotLeaders = bPara && rHWrt.bCfgPrintLayout && rHWrt.indexOfDotLeaders(
- pTxtNd->GetAnyFmtColl().GetPoolFmtId(), pTxtNd->GetTxt()) > -1;
+ pTextNd->GetAnyFormatColl().GetPoolFormatId(), pTextNd->GetText()) > -1;
// und nun ggf. noch die STYLE-Option
if( rHWrt.bCfgOutStyles && rInfo.pItemSet && !bNoStyle)
@@ -981,8 +981,8 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
{
OSL_ENSURE( aNumInfo.GetNumRule(), "Wo ist die Numerierung geblieben???" );
OSL_ENSURE( nBulletGrfLvl < MAXLEVEL, "So viele Ebenen gibt's nicht" );
- const SwNumFmt& rNumFmt = aNumInfo.GetNumRule()->Get(nBulletGrfLvl);
- OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, rNumFmt.GetBrush() );
+ const SwNumFormat& rNumFormat = aNumInfo.GetNumRule()->Get(nBulletGrfLvl);
+ OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, rNumFormat.GetBrush() );
}
rHWrt.GetNumInfo() = aNumInfo;
@@ -997,7 +997,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
rHWrt.nFirstLineIndent = 0;
}
-void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
+void OutHTML_SwFormatOff( Writer& rWrt, const SwHTMLTextCollOutputInfo& rInfo )
{
SwHTMLWriter & rHWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1116,7 +1116,7 @@ class HTMLEndPosLst
SwDoc *pDoc; // das aktuelle Dokument
SwDoc* pTemplate; // die HTML-Vorlage (oder 0)
const Color* pDfltColor;// die Default-Vordergrund-Farbe
- std::set<OUString>& rScriptTxtStyles;
+ std::set<OUString>& rScriptTextStyles;
sal_uLong nHTMLMode;
bool bOutStyles : 1; // werden Styles exportiert
@@ -1155,11 +1155,11 @@ class HTMLEndPosLst
// Insert without taking care of script
void InsertNoScript( const SfxPoolItem& rItem, sal_Int32 nStart,
- sal_Int32 nEnd, SwHTMLFmtInfos& rFmtInfos,
+ sal_Int32 nEnd, SwHTMLFormatInfos& rFormatInfos,
bool bParaAttrs=false );
- const SwHTMLFmtInfo *GetFmtInfo( const SwFmt& rFmt,
- SwHTMLFmtInfos& rFmtInfos );
+ const SwHTMLFormatInfo *GetFormatInfo( const SwFormat& rFormat,
+ SwHTMLFormatInfos& rFormatInfos );
public:
@@ -1170,12 +1170,12 @@ public:
// Ein Attribut einfuegen
void Insert( const SfxPoolItem& rItem, sal_Int32 nStart, sal_Int32 nEnd,
- SwHTMLFmtInfos& rFmtInfos, bool bParaAttrs=false );
+ SwHTMLFormatInfos& rFormatInfos, bool bParaAttrs=false );
void Insert( const SfxItemSet& rItemSet, sal_Int32 nStart, sal_Int32 nEnd,
- SwHTMLFmtInfos& rFmtInfos, bool bDeep,
+ SwHTMLFormatInfos& rFormatInfos, bool bDeep,
bool bParaAttrs=false );
- void Insert( const SwDrawFrmFmt& rFmt, sal_Int32 nPos,
- SwHTMLFmtInfos& rFmtInfos );
+ void Insert( const SwDrawFrameFormat& rFormat, sal_Int32 nPos,
+ SwHTMLFormatInfos& rFormatInfos );
sal_uInt16 GetScriptAtPos( sal_Int32 nPos,
sal_uInt16 nWeak=CSS1_OUTMODE_ANY_SCRIPT );
@@ -1611,26 +1611,26 @@ void HTMLEndPosLst::SplitItem( const SfxPoolItem& rItem, sal_Int32 nStart,
}
}
-const SwHTMLFmtInfo *HTMLEndPosLst::GetFmtInfo( const SwFmt& rFmt,
- SwHTMLFmtInfos& rFmtInfos )
+const SwHTMLFormatInfo *HTMLEndPosLst::GetFormatInfo( const SwFormat& rFormat,
+ SwHTMLFormatInfos& rFormatInfos )
{
- SwHTMLFmtInfo *pFmtInfo;
- const SwHTMLFmtInfo aFmtInfo( &rFmt );
- SwHTMLFmtInfos::iterator it = rFmtInfos.find( aFmtInfo );
- if( it != rFmtInfos.end() )
+ SwHTMLFormatInfo *pFormatInfo;
+ const SwHTMLFormatInfo aFormatInfo( &rFormat );
+ SwHTMLFormatInfos::iterator it = rFormatInfos.find( aFormatInfo );
+ if( it != rFormatInfos.end() )
{
- pFmtInfo = &*it;
+ pFormatInfo = &*it;
}
else
{
- pFmtInfo = new SwHTMLFmtInfo( &rFmt, pDoc, pTemplate,
+ pFormatInfo = new SwHTMLFormatInfo( &rFormat, pDoc, pTemplate,
bOutStyles );
- rFmtInfos.insert( pFmtInfo );
- if ( rScriptTxtStyles.count( rFmt.GetName() ) )
- pFmtInfo->bScriptDependent = true;
+ rFormatInfos.insert( pFormatInfo );
+ if ( rScriptTextStyles.count( rFormat.GetName() ) )
+ pFormatInfo->bScriptDependent = true;
}
- return pFmtInfo;
+ return pFormatInfo;
}
HTMLEndPosLst::HTMLEndPosLst( SwDoc *pD, SwDoc* pTempl,
@@ -1640,7 +1640,7 @@ HTMLEndPosLst::HTMLEndPosLst( SwDoc *pD, SwDoc* pTempl,
pDoc( pD ),
pTemplate( pTempl ),
pDfltColor( pDfltCol ),
- rScriptTxtStyles( rStyles ),
+ rScriptTextStyles( rStyles ),
nHTMLMode( nMode ),
bOutStyles( bStyles )
{
@@ -1663,7 +1663,7 @@ HTMLEndPosLst::~HTMLEndPosLst()
void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
sal_Int32 nStart, sal_Int32 nEnd,
- SwHTMLFmtInfos& rFmtInfos, bool bParaAttrs )
+ SwHTMLFormatInfos& rFormatInfos, bool bParaAttrs )
{
// kein Bereich ?? dann nicht aufnehmen, wird nie wirksam !!
if( nStart != nEnd )
@@ -1711,30 +1711,30 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
{
OSL_ENSURE( RES_TXTATR_CHARFMT == rItem.Which(),
"Doch keine Zeichen-Vorlage" );
- const SwFmtCharFmt& rChrFmt = static_cast<const SwFmtCharFmt&>(rItem);
- const SwCharFmt* pFmt = rChrFmt.GetCharFmt();
+ const SwFormatCharFormat& rChrFormat = static_cast<const SwFormatCharFormat&>(rItem);
+ const SwCharFormat* pFormat = rChrFormat.GetCharFormat();
- const SwHTMLFmtInfo *pFmtInfo = GetFmtInfo( *pFmt, rFmtInfos );
- if( !pFmtInfo->aToken.isEmpty() )
+ const SwHTMLFormatInfo *pFormatInfo = GetFormatInfo( *pFormat, rFormatInfos );
+ if( !pFormatInfo->aToken.isEmpty() )
{
// das Zeichenvorlagen-Tag muss vor den harten
// Attributen ausgegeben werden
InsertItem( rItem, nStart, nEnd );
}
- if( pFmtInfo->pItemSet )
+ if( pFormatInfo->pItemSet )
{
- Insert( *pFmtInfo->pItemSet, nStart, nEnd,
- rFmtInfos, true, bParaAttrs );
+ Insert( *pFormatInfo->pItemSet, nStart, nEnd,
+ rFormatInfos, true, bParaAttrs );
}
}
break;
case HTML_AUTOFMT_VALUE:
{
- const SwFmtAutoFmt& rAutoFmt = static_cast<const SwFmtAutoFmt&>(rItem);
- const std::shared_ptr<SfxItemSet> pSet = rAutoFmt.GetStyleHandle();
+ const SwFormatAutoFormat& rAutoFormat = static_cast<const SwFormatAutoFormat&>(rItem);
+ const std::shared_ptr<SfxItemSet> pSet = rAutoFormat.GetStyleHandle();
if( pSet.get() )
- Insert( *pSet.get(), nStart, nEnd, rFmtInfos, true, bParaAttrs );
+ Insert( *pSet.get(), nStart, nEnd, rFormatInfos, true, bParaAttrs );
}
break;
@@ -1756,16 +1756,16 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
{
OSL_ENSURE( RES_PARATR_DROP == rItem.Which(),
"Doch kein Drop-Cap" );
- const SwFmtDrop& rDrop = static_cast<const SwFmtDrop&>(rItem);
+ const SwFormatDrop& rDrop = static_cast<const SwFormatDrop&>(rItem);
nEnd = nStart + rDrop.GetChars();
if( !bOutStyles )
{
// Zumindest die Attribute der Zeichenvorlage uebernehmen
- const SwCharFmt *pCharFmt = rDrop.GetCharFmt();
- if( pCharFmt )
+ const SwCharFormat *pCharFormat = rDrop.GetCharFormat();
+ if( pCharFormat )
{
- Insert( pCharFmt->GetAttrSet(), nStart, nEnd,
- rFmtInfos, true, bParaAttrs );
+ Insert( pCharFormat->GetAttrSet(), nStart, nEnd,
+ rFormatInfos, true, bParaAttrs );
}
}
else
@@ -1787,7 +1787,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
sal_Int32 nStart, sal_Int32 nEnd,
- SwHTMLFmtInfos& rFmtInfos, bool bParaAttrs )
+ SwHTMLFormatInfos& rFormatInfos, bool bParaAttrs )
{
bool bDependsOnScript = false, bDependsOnAnyScript = false;
sal_uInt16 nScript = i18n::ScriptType::LATIN;
@@ -1821,10 +1821,10 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
break;
case RES_TXTATR_CHARFMT:
{
- const SwFmtCharFmt& rChrFmt = static_cast<const SwFmtCharFmt&>(rItem);
- const SwCharFmt* pFmt = rChrFmt.GetCharFmt();
- const SwHTMLFmtInfo *pFmtInfo = GetFmtInfo( *pFmt, rFmtInfos );
- if( pFmtInfo->bScriptDependent )
+ const SwFormatCharFormat& rChrFormat = static_cast<const SwFormatCharFormat&>(rItem);
+ const SwCharFormat* pFormat = rChrFormat.GetCharFormat();
+ const SwHTMLFormatInfo *pFormatInfo = GetFormatInfo( *pFormat, rFormatInfos );
+ if( pFormatInfo->bScriptDependent )
{
bDependsOnScript = true;
bDependsOnAnyScript = true;
@@ -1833,10 +1833,10 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
break;
case RES_TXTATR_INETFMT:
{
- if( GetFmtInfo( *pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
- RES_POOLCHR_INET_NORMAL), rFmtInfos )->bScriptDependent ||
- GetFmtInfo( *pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
- RES_POOLCHR_INET_VISIT), rFmtInfos )->bScriptDependent )
+ if( GetFormatInfo( *pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
+ RES_POOLCHR_INET_NORMAL), rFormatInfos )->bScriptDependent ||
+ GetFormatInfo( *pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
+ RES_POOLCHR_INET_VISIT), rFormatInfos )->bScriptDependent )
{
bDependsOnScript = true;
bDependsOnAnyScript = true;
@@ -1863,7 +1863,7 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
// change, so we can insert it, but only if it belongs
// to the current script.
if( bDependsOnAnyScript || nScript == aScriptLst[i] )
- InsertNoScript( rItem, nPos, nEnd, rFmtInfos,
+ InsertNoScript( rItem, nPos, nEnd, rFormatInfos,
bParaAttrs );
break;
}
@@ -1872,19 +1872,19 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
// it, so we can insert a hint up to the next script change and
// continue with the rest of the hint.
if( bDependsOnAnyScript || nScript == aScriptLst[i] )
- InsertNoScript( rItem, nPos, nChgPos, rFmtInfos, bParaAttrs );
+ InsertNoScript( rItem, nPos, nChgPos, rFormatInfos, bParaAttrs );
nPos = nChgPos;
}
}
else
{
- InsertNoScript( rItem, nStart, nEnd, rFmtInfos, bParaAttrs );
+ InsertNoScript( rItem, nStart, nEnd, rFormatInfos, bParaAttrs );
}
}
void HTMLEndPosLst::Insert( const SfxItemSet& rItemSet,
sal_Int32 nStart, sal_Int32 nEnd,
- SwHTMLFmtInfos& rFmtInfos,
+ SwHTMLFormatInfos& rFormatInfos,
bool bDeep, bool bParaAttrs )
{
SfxWhichIter aIter( rItemSet );
@@ -1895,30 +1895,30 @@ void HTMLEndPosLst::Insert( const SfxItemSet& rItemSet,
const SfxPoolItem *pItem;
if( SfxItemState::SET == rItemSet.GetItemState( nWhich, bDeep, &pItem ) )
{
- Insert( *pItem, nStart, nEnd, rFmtInfos, bParaAttrs );
+ Insert( *pItem, nStart, nEnd, rFormatInfos, bParaAttrs );
}
nWhich = aIter.NextWhich();
}
}
-void HTMLEndPosLst::Insert( const SwDrawFrmFmt& rFmt, sal_Int32 nPos,
- SwHTMLFmtInfos& rFmtInfos )
+void HTMLEndPosLst::Insert( const SwDrawFrameFormat& rFormat, sal_Int32 nPos,
+ SwHTMLFormatInfos& rFormatInfos )
{
- const SdrObject* pTextObj = SwHTMLWriter::GetMarqueeTextObj( rFmt );
+ const SdrObject* pTextObj = SwHTMLWriter::GetMarqueeTextObj( rFormat );
if( pTextObj )
{
// die Edit-Engine-Attribute des Objekts als SW-Attribute holen
// und als Hints einsortieren. Wegen der Menge der Hints werden
// Styles hierbei nicht beruecksichtigt!
- const SfxItemSet& rFmtItemSet = rFmt.GetAttrSet();
- SfxItemSet aItemSet( *rFmtItemSet.GetPool(), RES_CHRATR_BEGIN,
+ const SfxItemSet& rFormatItemSet = rFormat.GetAttrSet();
+ SfxItemSet aItemSet( *rFormatItemSet.GetPool(), RES_CHRATR_BEGIN,
RES_CHRATR_END );
SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, pTextObj, true );
bool bOutStylesOld = bOutStyles;
bOutStyles = false;
- Insert( aItemSet, nPos, nPos+1, rFmtInfos, false, false );
+ Insert( aItemSet, nPos, nPos+1, rFormatInfos, false, false );
bOutStyles = bOutStylesOld;
}
}
@@ -2060,21 +2060,21 @@ void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
}
/* Ausgabe der Nodes */
-Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
+Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
{
- const SwTxtNode * pNd = &static_cast<const SwTxtNode&>(rNode);
+ const SwTextNode * pNd = &static_cast<const SwTextNode&>(rNode);
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- const OUString& rStr = pNd->GetTxt();
+ const OUString& rStr = pNd->GetText();
sal_Int32 nEnd = rStr.getLength();
// Besonderheit: leere Node und HR-Vorlage (horizontaler Strich)
// nur ein <HR> ausgeben
- sal_uInt16 nPoolId = pNd->GetAnyFmtColl().GetPoolFmtId();
+ sal_uInt16 nPoolId = pNd->GetAnyFormatColl().GetPoolFormatId();
// Handle horizontal rule <hr>
if (!nEnd &&
- (RES_POOLCOLL_HTML_HR==nPoolId || pNd->GetAnyFmtColl().GetName() == OOO_STRING_SVTOOLS_HTML_horzrule))
+ (RES_POOLCOLL_HTML_HR==nPoolId || pNd->GetAnyFormatColl().GetName() == OOO_STRING_SVTOOLS_HTML_horzrule))
{
// dann die absatz-gebundenen Grafiken/OLE-Objekte im Absatz
// MIB 8.7.97: Ein <PRE> spannen wir um die Linie auf. Dann stimmen
@@ -2106,25 +2106,25 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
sal_Int32 nRight = static_cast<const SvxLRSpaceItem*>(pItem)->GetRight();
if( nLeft || nRight )
{
- const SwFrmFmt& rPgFmt =
+ const SwFrameFormat& rPgFormat =
rHTMLWrt.pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool
( RES_POOLPAGE_HTML, false )->GetMaster();
- const SwFmtFrmSize& rSz = rPgFmt.GetFrmSize();
- const SvxLRSpaceItem& rLR = rPgFmt.GetLRSpace();
- const SwFmtCol& rCol = rPgFmt.GetCol();
+ const SwFormatFrmSize& rSz = rPgFormat.GetFrmSize();
+ const SvxLRSpaceItem& rLR = rPgFormat.GetLRSpace();
+ const SwFormatCol& rCol = rPgFormat.GetCol();
long nPageWidth = rSz.GetWidth() - rLR.GetLeft() - rLR.GetRight();
if( 1 < rCol.GetNumCols() )
nPageWidth /= rCol.GetNumCols();
- const SwTableNode* pTblNd = pNd->FindTableNode();
- if( pTblNd )
+ const SwTableNode* pTableNd = pNd->FindTableNode();
+ if( pTableNd )
{
- const SwTableBox* pBox = pTblNd->GetTable().GetTblBox(
+ const SwTableBox* pBox = pTableNd->GetTable().GetTableBox(
pNd->StartOfSectionIndex() );
if( pBox )
- nPageWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+ nPageWidth = pBox->GetFrameFormat()->GetFrmSize().GetWidth();
}
OString sWidth = OString::number(SwHTMLWriter::ToPixel(nPageWidth - nLeft - nRight, false));
@@ -2217,13 +2217,13 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
if( pItemSet )
{
if( SfxItemState::SET == pItemSet->GetItemState( RES_PAGEDESC, true, &pItem ) &&
- static_cast<const SwFmtPageDesc *>(pItem)->GetPageDesc() )
+ static_cast<const SwFormatPageDesc *>(pItem)->GetPageDesc() )
{
bPageBreakBefore = true;
}
else if( SfxItemState::SET == pItemSet->GetItemState( RES_BREAK, true, &pItem ) )
{
- switch( static_cast<const SvxFmtBreakItem *>(pItem)->GetBreak() )
+ switch( static_cast<const SvxFormatBreakItem *>(pItem)->GetBreak() )
{
case SVX_BREAK_PAGE_BEFORE:
bPageBreakBefore = true;
@@ -2267,10 +2267,10 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
rHTMLWrt.bTagOn = true;
// jetzt das Tag des Absatzes ausgeben
- const SwFmt& rFmt = pNd->GetAnyFmtColl();
- SwHTMLTxtCollOutputInfo aFmtInfo;
+ const SwFormat& rFormat = pNd->GetAnyFormatColl();
+ SwHTMLTextCollOutputInfo aFormatInfo;
bool bOldLFPossible = rHTMLWrt.bLFPossible;
- OutHTML_SwFmt( rWrt, rFmt, pNd->GetpSwAttrSet(), aFmtInfo );
+ OutHTML_SwFormat( rWrt, rFormat, pNd->GetpSwAttrSet(), aFormatInfo );
// Wenn vor dem Absatz-Tag keine neue Zeile aufgemacht wurde, dann
// tun wir das jetzt
@@ -2293,7 +2293,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
// Text, der aus einer Outline-Numerierung kommt ermitteln
sal_Int32 nOffset = 0;
- OUString aOutlineTxt;
+ OUString aOutlineText;
OUString aFullText;
// export numbering string as plain text only for the outline numbering,
@@ -2301,14 +2301,14 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
if ( pNd->IsOutline() &&
pNd->GetNumRule() == pNd->GetDoc()->GetOutlineNumRule() )
{
- aOutlineTxt = pNd->GetNumString();
- nOffset = nOffset + aOutlineTxt.getLength();
- aFullText = aOutlineTxt;
+ aOutlineText = pNd->GetNumString();
+ nOffset = nOffset + aOutlineText.getLength();
+ aFullText = aOutlineText;
}
OUString aFootEndNoteSym;
- if( rHTMLWrt.pFmtFtn )
+ if( rHTMLWrt.pFormatFootnote )
{
- aFootEndNoteSym = rHTMLWrt.GetFootEndNoteSym( *rHTMLWrt.pFmtFtn );
+ aFootEndNoteSym = rHTMLWrt.GetFootEndNoteSym( *rHTMLWrt.pFormatFootnote );
nOffset = nOffset + aFootEndNoteSym.getLength();
aFullText += aFootEndNoteSym;
}
@@ -2325,13 +2325,13 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
rHTMLWrt.pDfltColor, rHTMLWrt.bCfgOutStyles,
rHTMLWrt.GetHTMLMode(), aFullText,
rHTMLWrt.aScriptTextStyles );
- if( aFmtInfo.pItemSet )
+ if( aFormatInfo.pItemSet )
{
- aEndPosLst.Insert( *aFmtInfo.pItemSet, 0, nEnd + nOffset,
- rHTMLWrt.aChrFmtInfos, false, true );
+ aEndPosLst.Insert( *aFormatInfo.pItemSet, 0, nEnd + nOffset,
+ rHTMLWrt.aChrFormatInfos, false, true );
}
- if( !aOutlineTxt.isEmpty() || rHTMLWrt.pFmtFtn )
+ if( !aOutlineText.isEmpty() || rHTMLWrt.pFormatFootnote )
{
// Absatz-Attribute ausgeben, damit der Text die Attribute des
// Absatzes bekommt.
@@ -2341,25 +2341,25 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
// beachten. Da man die ueber die UI nicht setzen kann, ignorieren
// wir sie erstmal.
- if( !aOutlineTxt.isEmpty() )
- HTMLOutFuncs::Out_String( rWrt.Strm(), aOutlineTxt,
+ if( !aOutlineText.isEmpty() )
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aOutlineText,
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters);
- if( rHTMLWrt.pFmtFtn )
+ if( rHTMLWrt.pFormatFootnote )
{
- rHTMLWrt.OutFootEndNoteSym( *rHTMLWrt.pFmtFtn, aFootEndNoteSym,
- aEndPosLst.GetScriptAtPos( aOutlineTxt.getLength(), rHTMLWrt.nCSS1Script ) );
- rHTMLWrt.pFmtFtn = 0;
+ rHTMLWrt.OutFootEndNoteSym( *rHTMLWrt.pFormatFootnote, aFootEndNoteSym,
+ aEndPosLst.GetScriptAtPos( aOutlineText.getLength(), rHTMLWrt.nCSS1Script ) );
+ rHTMLWrt.pFormatFootnote = 0;
}
}
// erstmal den Start berichtigen. D.h. wird nur ein Teil vom Satz
// ausgegeben, so muessen auch da die Attribute stimmen!!
- rHTMLWrt.bTxtAttr = true;
+ rHTMLWrt.bTextAttr = true;
size_t nAttrPos = 0;
sal_Int32 nStrPos = rHTMLWrt.pCurPam->GetPoint()->nContent.GetIndex();
- const SwTxtAttr * pHt = 0;
+ const SwTextAttr * pHt = 0;
const size_t nCntAttr = pNd->HasHints() ? pNd->GetSwpHints().Count() : 0;
if( nCntAttr && nStrPos > ( pHt = pNd->GetSwpHints()[ 0 ] )->GetStart() )
{
@@ -2387,14 +2387,14 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
if( rHTMLWrt.bWriteAll )
aEndPosLst.Insert( pHt->GetAttr(), nHtStt + nOffset,
nHtEnd + nOffset,
- rHTMLWrt.aChrFmtInfos );
+ rHTMLWrt.aChrFormatInfos );
else
{
sal_Int32 nTmpStt = nHtStt < nStrPos ? nStrPos : nHtStt;
sal_Int32 nTmpEnd = nHtEnd < nEnd ? nHtEnd : nEnd;
aEndPosLst.Insert( pHt->GetAttr(), nTmpStt + nOffset,
nTmpEnd + nOffset,
- rHTMLWrt.aChrFmtInfos );
+ rHTMLWrt.aChrFormatInfos );
}
continue;
// aber nicht ausgeben, das erfolgt spaeter !!
@@ -2428,7 +2428,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
}
bool bOutChar = true;
- const SwTxtAttr * pTxtHt = 0;
+ const SwTextAttr * pTextHt = 0;
if( nAttrPos < nCntAttr && pHt->GetStart() == nStrPos
&& nStrPos != nEnd )
{
@@ -2442,24 +2442,24 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
// Bereich aufspannen werden ignoriert
aEndPosLst.Insert( pHt->GetAttr(), nStrPos + nOffset,
*pHt->End() + nOffset,
- rHTMLWrt.aChrFmtInfos );
+ rHTMLWrt.aChrFormatInfos );
}
}
else
{
// Hints ohne-Ende werden als letztes ausgebeben
- OSL_ENSURE( !pTxtHt, "Wieso gibt es da schon ein Attribut ohne Ende?" );
- if( rHTMLWrt.nTxtAttrsToIgnore>0 )
+ OSL_ENSURE( !pTextHt, "Wieso gibt es da schon ein Attribut ohne Ende?" );
+ if( rHTMLWrt.nTextAttrsToIgnore>0 )
{
- rHTMLWrt.nTxtAttrsToIgnore--;
+ rHTMLWrt.nTextAttrsToIgnore--;
}
else
{
- pTxtHt = pHt;
- sal_uInt16 nFldWhich;
+ pTextHt = pHt;
+ sal_uInt16 nFieldWhich;
if( RES_TXTATR_FIELD != pHt->Which()
- || ( RES_POSTITFLD != (nFldWhich = static_cast<const SwFmtFld&>(pHt->GetAttr()).GetField()->Which())
- && RES_SCRIPTFLD != nFldWhich ) )
+ || ( RES_POSTITFLD != (nFieldWhich = static_cast<const SwFormatField&>(pHt->GetAttr()).GetField()->Which())
+ && RES_SCRIPTFLD != nFieldWhich ) )
{
bWriteBreak = false;
}
@@ -2471,21 +2471,21 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
}
// Manche Draw-Formate koennen auch noch Attribute mitbringen
- if( pTxtHt && RES_TXTATR_FLYCNT == pTxtHt->Which() )
+ if( pTextHt && RES_TXTATR_FLYCNT == pTextHt->Which() )
{
- const SwFrmFmt* pFrmFmt =
- static_cast<const SwFmtFlyCnt &>(pTxtHt->GetAttr()).GetFrmFmt();
+ const SwFrameFormat* pFrameFormat =
+ static_cast<const SwFormatFlyCnt &>(pTextHt->GetAttr()).GetFrameFormat();
- if( RES_DRAWFRMFMT == pFrmFmt->Which() )
- aEndPosLst.Insert( *static_cast<const SwDrawFrmFmt *>(pFrmFmt),
+ if( RES_DRAWFRMFMT == pFrameFormat->Which() )
+ aEndPosLst.Insert( *static_cast<const SwDrawFrameFormat *>(pFrameFormat),
nStrPos + nOffset,
- rHTMLWrt.aChrFmtInfos );
+ rHTMLWrt.aChrFormatInfos );
}
aEndPosLst.OutEndAttrs( rHTMLWrt, nStrPos + nOffset, &aContext );
aEndPosLst.OutStartAttrs( rHTMLWrt, nStrPos + nOffset, &aContext );
- if( pTxtHt )
+ if( pTextHt )
{
rHTMLWrt.bLFPossible = !rHTMLWrt.nLastParaToken && nStrPos > 0 &&
rStr[nStrPos-1] == ' ';
@@ -2493,7 +2493,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
rHTMLWrt.nCSS1Script = aEndPosLst.GetScriptAtPos(
nStrPos + nOffset, nCSS1Script );
HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext );
- Out( aHTMLAttrFnTab, pTxtHt->GetAttr(), rHTMLWrt );
+ Out( aHTMLAttrFnTab, pTextHt->GetAttr(), rHTMLWrt );
rHTMLWrt.nCSS1Script = nCSS1Script;
rHTMLWrt.bLFPossible = false;
}
@@ -2586,7 +2586,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
nEnd, HTML_POS_INSIDE );
OSL_ENSURE( !bFlysLeft, "Es wurden nicht alle Rahmen gespeichert!" );
- rHTMLWrt.bTxtAttr = false;
+ rHTMLWrt.bTextAttr = false;
if( bWriteBreak )
{
@@ -2656,7 +2656,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
}
rHTMLWrt.bTagOn = false;
- OutHTML_SwFmtOff( rWrt, aFmtInfo );
+ OutHTML_SwFormatOff( rWrt, aFormatInfo );
// eventuell eine Form schliessen
rHTMLWrt.OutForm( false );
@@ -2685,7 +2685,7 @@ static Writer& OutHTML_CSS1Attr( Writer& rWrt, const SfxPoolItem& rHt )
// wenn gerade Hints geschrieben werden versuchen wir den Hint als
// CSS1-Attribut zu schreiben
- if( static_cast<SwHTMLWriter&>(rWrt).bCfgOutStyles && static_cast<SwHTMLWriter&>(rWrt).bTxtAttr )
+ if( static_cast<SwHTMLWriter&>(rWrt).bCfgOutStyles && static_cast<SwHTMLWriter&>(rWrt).bTextAttr )
OutCSS1_HintSpanTag( rWrt, rHt );
return rWrt;
@@ -2699,7 +2699,7 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
if( rHTMLWrt.bOutOpts )
return rWrt;
- if( !rHTMLWrt.bTxtAttr && rHTMLWrt.bCfgOutStyles && rHTMLWrt.bCfgPreferStyles )
+ if( !rHTMLWrt.bTextAttr && rHTMLWrt.bCfgOutStyles && rHTMLWrt.bCfgPreferStyles )
{
// Font-Farbe nicht als Tag schreiben, wenn Styles normalen Tags
// vorgezogen werden
@@ -2734,7 +2734,7 @@ static Writer& OutHTML_SwPosture( Writer& rWrt, const SfxPoolItem& rHt )
{
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_italic, rHTMLWrt.bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+ else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2782,7 +2782,7 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt )
OString::number(static_cast<sal_Int32>(nSize)) + "\"";
rWrt.Strm().WriteOString( sOut );
- if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+ if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
{
// always export font size as CSS option, too
OutCSS1_HintStyleOpt( rWrt, rHt );
@@ -2832,7 +2832,7 @@ static Writer& OutHTML_SwWeight( Writer& rWrt, const SfxPoolItem& rHt )
{
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_bold, rHTMLWrt.bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+ else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2853,7 +2853,7 @@ static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt )
{
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_strike, rHTMLWrt.bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+ else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2883,7 +2883,7 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt )
{
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, rHTMLWrt.bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+ else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2903,7 +2903,7 @@ static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt )
{
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_underline, rHTMLWrt.bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+ else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2915,15 +2915,15 @@ static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt )
static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- const SwFmtFlyCnt& rFlyCnt = static_cast<const SwFmtFlyCnt&>(rHt);
+ const SwFormatFlyCnt& rFlyCnt = static_cast<const SwFormatFlyCnt&>(rHt);
- const SwFrmFmt& rFmt = *rFlyCnt.GetFrmFmt();
+ const SwFrameFormat& rFormat = *rFlyCnt.GetFrameFormat();
const SdrObject *pSdrObj = 0;
SwHTMLFrmType eType =
- (SwHTMLFrmType)rHTMLWrt.GuessFrmType( rFmt, pSdrObj );
+ (SwHTMLFrmType)rHTMLWrt.GuessFrmType( rFormat, pSdrObj );
sal_uInt8 nMode = aHTMLOutFrmAsCharTable[eType][rHTMLWrt.nExportMode];
- rHTMLWrt.OutFrmFmt( nMode, rFmt, pSdrObj );
+ rHTMLWrt.OutFrameFormat( nMode, rFormat, pSdrObj );
return rWrt;
}
@@ -2939,7 +2939,7 @@ static Writer& OutHTML_SwBlink( Writer& rWrt, const SfxPoolItem& rHt )
{
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_blink, rHTMLWrt.bTagOn );
}
- else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+ else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
{
// vielleicht als CSS1-Attribut ?
OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2948,16 +2948,16 @@ static Writer& OutHTML_SwBlink( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, bool bOn )
+Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat, bool bOn )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- OUString aURL( rINetFmt.GetValue() );
- const SvxMacroTableDtor *pMacTable = rINetFmt.GetMacroTbl();
+ OUString aURL( rINetFormat.GetValue() );
+ const SvxMacroTableDtor *pMacTable = rINetFormat.GetMacroTable();
bool bEvents = pMacTable != 0 && !pMacTable->empty();
// Anything to output at all?
- if( aURL.isEmpty() && !bEvents && rINetFmt.GetName().isEmpty() )
+ if( aURL.isEmpty() && !bEvents && rINetFormat.GetName().isEmpty() )
return rWrt;
// bOn controls if we are writing the opening or closing tag
@@ -2971,22 +2971,22 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, bool bOn )
bool bScriptDependent = false;
{
- const SwCharFmt* pFmt = rWrt.pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
+ const SwCharFormat* pFormat = rWrt.pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
RES_POOLCHR_INET_NORMAL );
- SwHTMLFmtInfo aFmtInfo( pFmt );
- SwHTMLFmtInfos::const_iterator it = rHTMLWrt.aChrFmtInfos.find( aFmtInfo );
- if( it != rHTMLWrt.aChrFmtInfos.end() )
+ SwHTMLFormatInfo aFormatInfo( pFormat );
+ SwHTMLFormatInfos::const_iterator it = rHTMLWrt.aChrFormatInfos.find( aFormatInfo );
+ if( it != rHTMLWrt.aChrFormatInfos.end() )
{
bScriptDependent = it->bScriptDependent;
}
}
if( !bScriptDependent )
{
- const SwCharFmt* pFmt = rWrt.pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
+ const SwCharFormat* pFormat = rWrt.pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
RES_POOLCHR_INET_VISIT );
- SwHTMLFmtInfo aFmtInfo( pFmt );
- SwHTMLFmtInfos::const_iterator it = rHTMLWrt.aChrFmtInfos.find( aFmtInfo );
- if( it != rHTMLWrt.aChrFmtInfos.end() )
+ SwHTMLFormatInfo aFormatInfo( pFormat );
+ SwHTMLFormatInfos::const_iterator it = rHTMLWrt.aChrFormatInfos.find( aFormatInfo );
+ if( it != rHTMLWrt.aChrFormatInfos.end() )
{
bScriptDependent = it->bScriptDependent;
}
@@ -3033,16 +3033,16 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, bool bOn )
sOut = "\"";
}
- if( !rINetFmt.GetName().isEmpty() )
+ if( !rINetFormat.GetName().isEmpty() )
{
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\"";
rWrt.Strm().WriteOString( sOut );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rINetFmt.GetName(),
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rINetFormat.GetName(),
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut = "\"";
}
- const OUString& rTarget = rINetFmt.GetTargetFrame();
+ const OUString& rTarget = rINetFormat.GetTargetFrame();
if( !rTarget.isEmpty() )
{
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_target) + "=\"";
@@ -3066,95 +3066,95 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, bool bOn )
return rWrt;
}
-static Writer& OutHTML_SwFmtINetFmt( Writer& rWrt, const SfxPoolItem& rHt )
+static Writer& OutHTML_SwFormatINetFormat( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
if( rHTMLWrt.bOutOpts )
return rWrt;
- const SwFmtINetFmt& rINetFmt = static_cast<const SwFmtINetFmt&>(rHt);
+ const SwFormatINetFormat& rINetFormat = static_cast<const SwFormatINetFormat&>(rHt);
if( rHTMLWrt.bTagOn )
{
// ggf. ein noch offenes Attribut voruebergehend beenden
- if( rHTMLWrt.aINetFmts.size() )
+ if( rHTMLWrt.aINetFormats.size() )
{
- SwFmtINetFmt *pINetFmt =
- rHTMLWrt.aINetFmts.back();
- OutHTML_INetFmt( rWrt, *pINetFmt, false );
+ SwFormatINetFormat *pINetFormat =
+ rHTMLWrt.aINetFormats.back();
+ OutHTML_INetFormat( rWrt, *pINetFormat, false );
}
// jetzt das neue aufmachen
- OutHTML_INetFmt( rWrt, rINetFmt, true );
+ OutHTML_INetFormat( rWrt, rINetFormat, true );
// und merken
- SwFmtINetFmt *pINetFmt = new SwFmtINetFmt( rINetFmt );
- rHTMLWrt.aINetFmts.push_back( pINetFmt );
+ SwFormatINetFormat *pINetFormat = new SwFormatINetFormat( rINetFormat );
+ rHTMLWrt.aINetFormats.push_back( pINetFormat );
}
else
{
// das
- OutHTML_INetFmt( rWrt, rINetFmt, false );
+ OutHTML_INetFormat( rWrt, rINetFormat, false );
- OSL_ENSURE( rHTMLWrt.aINetFmts.size(), "da fehlt doch ein URL-Attribut" );
- if( rHTMLWrt.aINetFmts.size() )
+ OSL_ENSURE( rHTMLWrt.aINetFormats.size(), "da fehlt doch ein URL-Attribut" );
+ if( rHTMLWrt.aINetFormats.size() )
{
// das eigene Attribut vom Stack holen
- SwFmtINetFmt *pINetFmt = rHTMLWrt.aINetFmts.back();
- rHTMLWrt.aINetFmts.pop_back();
- delete pINetFmt;
+ SwFormatINetFormat *pINetFormat = rHTMLWrt.aINetFormats.back();
+ rHTMLWrt.aINetFormats.pop_back();
+ delete pINetFormat;
}
- if( !rHTMLWrt.aINetFmts.empty() )
+ if( !rHTMLWrt.aINetFormats.empty() )
{
// es ist noch ein Attribut auf dem Stack, das wieder geoeffnet
// werden muss
- SwFmtINetFmt *pINetFmt = rHTMLWrt.aINetFmts.back();
- OutHTML_INetFmt( rWrt, *pINetFmt, true );
+ SwFormatINetFormat *pINetFormat = rHTMLWrt.aINetFormats.back();
+ OutHTML_INetFormat( rWrt, *pINetFormat, true );
}
}
return rWrt;
}
-static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
+static Writer& OutHTML_SwTextCharFormat( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
if( rHTMLWrt.bOutOpts )
return rWrt;
- const SwFmtCharFmt& rChrFmt = static_cast<const SwFmtCharFmt&>(rHt);
- const SwCharFmt* pFmt = rChrFmt.GetCharFmt();
+ const SwFormatCharFormat& rChrFormat = static_cast<const SwFormatCharFormat&>(rHt);
+ const SwCharFormat* pFormat = rChrFormat.GetCharFormat();
- if( !pFmt )
+ if( !pFormat )
{
return rWrt;
}
- SwHTMLFmtInfo aFmtInfo( pFmt );
- SwHTMLFmtInfos::const_iterator it = rHTMLWrt.aChrFmtInfos.find( aFmtInfo );
- if( it == rHTMLWrt.aChrFmtInfos.end())
+ SwHTMLFormatInfo aFormatInfo( pFormat );
+ SwHTMLFormatInfos::const_iterator it = rHTMLWrt.aChrFormatInfos.find( aFormatInfo );
+ if( it == rHTMLWrt.aChrFormatInfos.end())
return rWrt;
- const SwHTMLFmtInfo *pFmtInfo = &*it;
- OSL_ENSURE( pFmtInfo, "Wieso gint es keine Infos ueber die Zeichenvorlage?" );
+ const SwHTMLFormatInfo *pFormatInfo = &*it;
+ OSL_ENSURE( pFormatInfo, "Wieso gint es keine Infos ueber die Zeichenvorlage?" );
if( rHTMLWrt.bTagOn )
{
OString sOut = "<";
- if( !pFmtInfo->aToken.isEmpty() )
- sOut += pFmtInfo->aToken;
+ if( !pFormatInfo->aToken.isEmpty() )
+ sOut += pFormatInfo->aToken;
else
sOut += OString(OOO_STRING_SVTOOLS_HTML_span);
if( rHTMLWrt.bCfgOutStyles &&
- (!pFmtInfo->aClass.isEmpty() || pFmtInfo->bScriptDependent) )
+ (!pFormatInfo->aClass.isEmpty() || pFormatInfo->bScriptDependent) )
{
sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_class) + "=\"";
rWrt.Strm().WriteOString( sOut );
- OUString aClass( pFmtInfo->aClass );
- if( pFmtInfo->bScriptDependent )
+ OUString aClass( pFormatInfo->aClass );
+ if( pFormatInfo->bScriptDependent )
{
if( !aClass.isEmpty() )
aClass += "-";
@@ -3181,7 +3181,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
else
{
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
- !pFmtInfo->aToken.isEmpty() ? pFmtInfo->aToken.getStr()
+ !pFormatInfo->aToken.isEmpty() ? pFormatInfo->aToken.getStr()
: OOO_STRING_SVTOOLS_HTML_span,
false );
}
@@ -3275,16 +3275,16 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_TXTATR_META */ 0,
/* RES_TXTATR_METAFIELD */ 0,
/* RES_TXTATR_AUTOFMT */ 0,
-/* RES_TXTATR_INETFMT */ OutHTML_SwFmtINetFmt,
-/* RES_TXTATR_CHARFMT */ OutHTML_SwTxtCharFmt,
+/* RES_TXTATR_INETFMT */ OutHTML_SwFormatINetFormat,
+/* RES_TXTATR_CHARFMT */ OutHTML_SwTextCharFormat,
/* RES_TXTATR_CJK_RUBY */ 0,
/* RES_TXTATR_UNKNOWN_CONTAINER */ 0,
-/* RES_TXTATR_INPUTFIELD */ OutHTML_SwFmtFld,
+/* RES_TXTATR_INPUTFIELD */ OutHTML_SwFormatField,
-/* RES_TXTATR_FIELD */ OutHTML_SwFmtFld,
+/* RES_TXTATR_FIELD */ OutHTML_SwFormatField,
/* RES_TXTATR_FLYCNT */ OutHTML_SwFlyCnt,
-/* RES_TXTATR_FTN */ OutHTML_SwFmtFtn,
-/* RES_TXTATR_ANNOTATION */ OutHTML_SwFmtFld,
+/* RES_TXTATR_FTN */ OutHTML_SwFormatFootnote,
+/* RES_TXTATR_ANNOTATION */ OutHTML_SwFormatField,
/* RES_TXTATR_DUMMY3 */ 0,
/* RES_TXTATR_DUMMY1 */ 0, // Dummy:
/* RES_TXTATR_DUMMY2 */ 0, // Dummy:
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 51ebc2f276d7..ec4143e5d38e 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -73,7 +73,7 @@ void SwHTMLParser::NewScript()
void SwHTMLParser::EndScript()
{
bool bInsIntoBasic = false,
- bInsSrcIntoFld = false;
+ bInsSrcIntoField = false;
switch( eScriptLang )
{
@@ -81,7 +81,7 @@ void SwHTMLParser::EndScript()
bInsIntoBasic = true;
break;
default:
- bInsSrcIntoFld = true;
+ bInsSrcIntoField = true;
break;
}
@@ -90,15 +90,15 @@ void SwHTMLParser::EndScript()
// Ausser StarBasic und unbenutzem JavaScript jedes Script oder den
// Modulnamen in einem Feld merken merken
- if( bInsSrcIntoFld && !bIgnoreHTMLComments )
+ if( bInsSrcIntoField && !bIgnoreHTMLComments )
{
SwScriptFieldType *pType =
- static_cast<SwScriptFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_SCRIPTFLD ));
+ static_cast<SwScriptFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_SCRIPTFLD ));
- SwScriptField aFld( pType, aScriptType,
+ SwScriptField aField( pType, aScriptType,
!aScriptURL.isEmpty() ? aScriptURL : aScriptSource,
!aScriptURL.isEmpty() );
- InsertAttr( SwFmtFld( aFld ) );
+ InsertAttr( SwFormatField( aField ) );
}
SwDocShell *pDocSh = pDoc->GetDocShell();
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 487549411f20..a756cdcae417 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -69,19 +69,19 @@ using namespace ::com::sun::star;
#define MAX_DROPCAP_LINES 9
#define MAX_DROPCAP_CHARS 9
-static void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc );
+static void lcl_swcss1_setEncoding( SwFormat& rFormat, rtl_TextEncoding eEnc );
// Implementierung des SwCSS1Parsers (eigentlich swcss1.cxx)
static struct SwCSS1ItemIds
{
- sal_uInt16 nFmtBreak;
- sal_uInt16 nFmtPageDesc;
- sal_uInt16 nFmtKeep;
+ sal_uInt16 nFormatBreak;
+ sal_uInt16 nFormatPageDesc;
+ sal_uInt16 nFormatKeep;
SwCSS1ItemIds() :
- nFmtBreak( RES_BREAK ),
- nFmtPageDesc( RES_PAGEDESC ),
- nFmtKeep( RES_KEEP )
+ nFormatBreak( RES_BREAK ),
+ nFormatPageDesc( RES_PAGEDESC ),
+ nFormatKeep( RES_KEEP )
{}
} aItemIds;
@@ -109,9 +109,9 @@ SwCSS1Parser::SwCSS1Parser( SwDoc *pD, sal_uInt32 aFHeights[7], const OUString&
bBodyVLinkSet( false ),
bSetFirstPageDesc( false ),
bSetRightPageDesc( false ),
- bTableHeaderTxtCollSet( false ),
- bTableTxtCollSet( false ),
- bLinkCharFmtsSet( false )
+ bTableHeaderTextCollSet( false ),
+ bTableTextCollSet( false ),
+ bLinkCharFormatsSet( false )
{
aFontHeights[0] = aFHeights[0];
aFontHeights[1] = aFHeights[1];
@@ -127,7 +127,7 @@ SwCSS1Parser::~SwCSS1Parser()
}
// Feature: PrintExt
-bool SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet,
+bool SwCSS1Parser::SetFormatBreak( SfxItemSet& rItemSet,
const SvxCSS1PropertyInfo& rPropInfo )
{
SvxBreak eBreak = SVX_BREAK_NONE;
@@ -174,17 +174,17 @@ bool SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet,
}
if( bSetBreak )
- rItemSet.Put( SvxFmtBreakItem( eBreak, RES_BREAK ) );
+ rItemSet.Put( SvxFormatBreakItem( eBreak, RES_BREAK ) );
if( bSetPageDesc )
- rItemSet.Put( SwFmtPageDesc( pPageDesc ) );
+ rItemSet.Put( SwFormatPageDesc( pPageDesc ) );
if( bSetKeep )
- rItemSet.Put( SvxFmtKeepItem( bKeep, RES_KEEP ) );
+ rItemSet.Put( SvxFormatKeepItem( bKeep, RES_KEEP ) );
return bSetBreak;
}
// /Feature: PrintExt
-static void SetCharFmtAttrs( SwCharFmt *pCharFmt, SfxItemSet& rItemSet )
+static void SetCharFormatAttrs( SwCharFormat *pCharFormat, SfxItemSet& rItemSet )
{
const SfxPoolItem *pItem;
static const sal_uInt16 aWhichIds[3] = { RES_CHRATR_FONTSIZE,RES_CHRATR_CJK_FONTSIZE,
@@ -200,7 +200,7 @@ static void SetCharFmtAttrs( SwCharFmt *pCharFmt, SfxItemSet& rItemSet )
}
}
- pCharFmt->SetFmtAttr( rItemSet );
+ pCharFormat->SetFormatAttr( rItemSet );
if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
{
@@ -209,35 +209,35 @@ static void SetCharFmtAttrs( SwCharFmt *pCharFmt, SfxItemSet& rItemSet )
SvxBrushItem aBrushItem( *static_cast<const SvxBrushItem *>(pItem) );
aBrushItem.SetWhich( RES_CHRATR_BACKGROUND );
- pCharFmt->SetFmtAttr( aBrushItem );
+ pCharFormat->SetFormatAttr( aBrushItem );
}
if( SfxItemState::SET == rItemSet.GetItemState( RES_BOX, false, &pItem ) )
{
SvxBoxItem aBoxItem( *static_cast<const SvxBoxItem *>(pItem) );
aBoxItem.SetWhich( RES_CHRATR_BOX );
- pCharFmt->SetFmtAttr( aBoxItem );
+ pCharFormat->SetFormatAttr( aBoxItem );
}
}
-void SwCSS1Parser::SetLinkCharFmts()
+void SwCSS1Parser::SetLinkCharFormats()
{
- OSL_ENSURE( !bLinkCharFmtsSet, "Aufruf von SetLinkCharFmts unnoetig" );
+ OSL_ENSURE( !bLinkCharFormatsSet, "Aufruf von SetLinkCharFormats unnoetig" );
SvxCSS1MapEntry *pStyleEntry =
GetTag( OUString(OOO_STRING_SVTOOLS_HTML_anchor) );
- SwCharFmt *pUnvisited = 0, *pVisited = 0;
+ SwCharFormat *pUnvisited = 0, *pVisited = 0;
if( pStyleEntry )
{
SfxItemSet& rItemSet = pStyleEntry->GetItemSet();
bool bColorSet = (SfxItemState::SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
false));
- pUnvisited = GetCharFmtFromPool( RES_POOLCHR_INET_NORMAL );
- SetCharFmtAttrs( pUnvisited, rItemSet );
+ pUnvisited = GetCharFormatFromPool( RES_POOLCHR_INET_NORMAL );
+ SetCharFormatAttrs( pUnvisited, rItemSet );
bBodyLinkSet |= bColorSet;
- pVisited = GetCharFmtFromPool( RES_POOLCHR_INET_VISIT );
- SetCharFmtAttrs( pVisited, rItemSet );
+ pVisited = GetCharFormatFromPool( RES_POOLCHR_INET_VISIT );
+ SetCharFormatAttrs( pVisited, rItemSet );
bBodyVLinkSet |= bColorSet;
}
@@ -250,8 +250,8 @@ void SwCSS1Parser::SetLinkCharFmts()
bool bColorSet = (SfxItemState::SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
false));
if( !pUnvisited )
- pUnvisited = GetCharFmtFromPool( RES_POOLCHR_INET_NORMAL );
- SetCharFmtAttrs( pUnvisited, rItemSet );
+ pUnvisited = GetCharFormatFromPool( RES_POOLCHR_INET_NORMAL );
+ SetCharFormatAttrs( pUnvisited, rItemSet );
bBodyLinkSet |= bColorSet;
}
@@ -264,15 +264,15 @@ void SwCSS1Parser::SetLinkCharFmts()
bool bColorSet = (SfxItemState::SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
false));
if( !pVisited )
- pVisited = GetCharFmtFromPool( RES_POOLCHR_INET_VISIT );
- SetCharFmtAttrs( pVisited, rItemSet );
+ pVisited = GetCharFormatFromPool( RES_POOLCHR_INET_VISIT );
+ SetCharFormatAttrs( pVisited, rItemSet );
bBodyVLinkSet |= bColorSet;
}
- bLinkCharFmtsSet = true;
+ bLinkCharFormatsSet = true;
}
-static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet,
+static void SetTextCollAttrs( SwTextFormatColl *pColl, SfxItemSet& rItemSet,
SvxCSS1PropertyInfo& rPropInfo,
SwCSS1Parser *pCSS1Parser )
{
@@ -291,11 +291,11 @@ static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet,
SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem *>(pCollItem) );
if( rPropInfo.bLeftMargin )
- aLRItem.SetTxtLeft( pLRItem->GetTxtLeft() );
+ aLRItem.SetTextLeft( pLRItem->GetTextLeft() );
if( rPropInfo.bRightMargin )
aLRItem.SetRight( pLRItem->GetRight() );
if( rPropInfo.bTextIndent )
- aLRItem.SetTxtFirstLineOfst( pLRItem->GetTxtFirstLineOfst() );
+ aLRItem.SetTextFirstLineOfst( pLRItem->GetTextFirstLineOfst() );
rItemSet.Put( aLRItem );
}
@@ -332,16 +332,16 @@ static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet,
}
// Feature: PrintExt
- pCSS1Parser->SetFmtBreak( rItemSet, rPropInfo );
+ pCSS1Parser->SetFormatBreak( rItemSet, rPropInfo );
// /Feature: PrintExt
- pColl->SetFmtAttr( rItemSet );
+ pColl->SetFormatAttr( rItemSet );
}
-void SwCSS1Parser::SetTableTxtColl( bool bHeader )
+void SwCSS1Parser::SetTableTextColl( bool bHeader )
{
- OSL_ENSURE( !(bHeader ? bTableHeaderTxtCollSet : bTableTxtCollSet),
- "Aufruf von SetTableTxtColl unnoetig" );
+ OSL_ENSURE( !(bHeader ? bTableHeaderTextCollSet : bTableTextCollSet),
+ "Aufruf von SetTableTextColl unnoetig" );
sal_uInt16 nPoolId;
OUString sTag;
@@ -356,14 +356,14 @@ void SwCSS1Parser::SetTableTxtColl( bool bHeader )
sTag = OOO_STRING_SVTOOLS_HTML_tabledata;
}
- SwTxtFmtColl *pColl = 0;
+ SwTextFormatColl *pColl = 0;
// The following entries will never be used again and may be changed.
SvxCSS1MapEntry *pStyleEntry = GetTag( sTag );
if( pStyleEntry )
{
- pColl = GetTxtFmtColl( nPoolId, aEmptyOUStr );
- SetTxtCollAttrs( pColl, pStyleEntry->GetItemSet(),
+ pColl = GetTextFormatColl( nPoolId, aEmptyOUStr );
+ SetTextCollAttrs( pColl, pStyleEntry->GetItemSet(),
pStyleEntry->GetPropertyInfo(), this );
}
@@ -372,15 +372,15 @@ void SwCSS1Parser::SetTableTxtColl( bool bHeader )
if( pStyleEntry )
{
if( !pColl )
- pColl = GetTxtFmtColl( nPoolId, aEmptyOUStr );
- SetTxtCollAttrs( pColl, pStyleEntry->GetItemSet(),
+ pColl = GetTextFormatColl( nPoolId, aEmptyOUStr );
+ SetTextCollAttrs( pColl, pStyleEntry->GetItemSet(),
pStyleEntry->GetPropertyInfo(), this );
}
if( bHeader )
- bTableHeaderTxtCollSet = true;
+ bTableHeaderTextCollSet = true;
else
- bTableTxtCollSet = true;
+ bTableTextCollSet = true;
}
void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
@@ -432,13 +432,13 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
if( pPageDesc )
{
SwPageDesc aNewPageDesc( *pPageDesc );
- SwFrmFmt &rMaster = aNewPageDesc.GetMaster();
+ SwFrameFormat &rMaster = aNewPageDesc.GetMaster();
if( bSetBrush )
- rMaster.SetFmtAttr( aBrushItem );
+ rMaster.SetFormatAttr( aBrushItem );
if( bSetBox )
- rMaster.SetFmtAttr( aBoxItem );
+ rMaster.SetFormatAttr( aBoxItem );
if( bSetFrmDir )
- rMaster.SetFmtAttr( aFrmDirItem );
+ rMaster.SetFormatAttr( aFrmDirItem );
ChgPageDesc( pPageDesc, aNewPageDesc );
}
@@ -455,7 +455,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
return;
SwPageDesc aNewPageDesc( *pPageDesc );
- SwFrmFmt &rMaster = aNewPageDesc.GetMaster();
+ SwFrameFormat &rMaster = aNewPageDesc.GetMaster();
const SfxItemSet& rPageItemSet = rMaster.GetAttrSet();
const SfxPoolItem *pPageItem, *pItem;
bool bChanged = false;
@@ -476,11 +476,11 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
if( rPropInfo.bRightMargin )
aLRItem.SetRight( pLRItem->GetRight() );
- rMaster.SetFmtAttr( aLRItem );
+ rMaster.SetFormatAttr( aLRItem );
}
else
{
- rMaster.SetFmtAttr( *pItem );
+ rMaster.SetFormatAttr( *pItem );
}
bChanged = true;
}
@@ -501,11 +501,11 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
if( rPropInfo.bBottomMargin )
aULItem.SetLower( pULItem->GetLower() );
- rMaster.SetFmtAttr( aULItem );
+ rMaster.SetFormatAttr( aULItem );
}
else
{
- rMaster.SetFmtAttr( *pItem );
+ rMaster.SetFormatAttr( *pItem );
}
bChanged = true;
}
@@ -515,7 +515,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
{
if( rPropInfo.eSizeType == SVX_CSS1_STYPE_TWIP )
{
- rMaster.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, rPropInfo.nWidth,
+ rMaster.SetFormatAttr( SwFormatFrmSize( ATT_FIX_SIZE, rPropInfo.nWidth,
rPropInfo.nHeight ) );
bChanged = true;
}
@@ -525,7 +525,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
// Groesse der Vorlage erhalten. Bei "landscape" und "portrait"
// wird das Landscape-Flag gesetzt und evtl. die Breite/Hoehe
// vertauscht.
- SwFmtFrmSize aFrmSz( rMaster.GetFrmSize() );
+ SwFormatFrmSize aFrmSz( rMaster.GetFrmSize() );
bool bLandscape = aNewPageDesc.GetLandscape();
if( ( bLandscape &&
rPropInfo.eSizeType == SVX_CSS1_STYPE_PORTRAIT ) ||
@@ -535,7 +535,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
SwTwips nTmp = aFrmSz.GetHeight();
aFrmSz.SetHeight( aFrmSz.GetWidth() );
aFrmSz.SetWidth( nTmp );
- rMaster.SetFmtAttr( aFrmSz );
+ rMaster.SetFormatAttr( aFrmSz );
aNewPageDesc.SetLandscape( !bLandscape );
bChanged = true;
}
@@ -546,7 +546,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
{
// eine Umrandung wird gesetzt
- rMaster.SetFmtAttr( *pItem );
+ rMaster.SetFormatAttr( *pItem );
rItemSet.ClearItem( RES_BACKGROUND );
bChanged = true;
}
@@ -835,8 +835,8 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
// gesetzt werden und gelten dann automatisch als defaults
if( SfxItemState::SET==rItemSet.GetItemState(RES_CHRATR_COLOR,false) )
bBodyTextSet = true;
- SetTxtCollAttrs(
- GetTxtCollFromPool( RES_POOLCOLL_STANDARD ),
+ SetTextCollAttrs(
+ GetTextCollFromPool( RES_POOLCOLL_STANDARD ),
rItemSet, rPropInfo, this );
return false;
@@ -848,22 +848,22 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
!pNext && aClass.getLength() >= 9 &&
('s' == aClass[0] || 'S' == aClass[0]) )
{
- sal_uInt16 nPoolFmtId = 0;
+ sal_uInt16 nPoolFormatId = 0;
if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdendnote_sym) )
- nPoolFmtId = RES_POOLCHR_ENDNOTE;
+ nPoolFormatId = RES_POOLCHR_ENDNOTE;
else if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdfootnote_sym) )
- nPoolFmtId = RES_POOLCHR_FOOTNOTE;
- if( nPoolFmtId )
+ nPoolFormatId = RES_POOLCHR_FOOTNOTE;
+ if( nPoolFormatId )
{
if( CSS1_SCRIPT_ALL == nScript )
{
- SetCharFmtAttrs( GetCharFmtFromPool(nPoolFmtId), rItemSet );
+ SetCharFormatAttrs( GetCharFormatFromPool(nPoolFormatId), rItemSet );
}
else
{
SfxItemSet aScriptItemSet( rItemSet );
RemoveScriptItems( aScriptItemSet, nScript );
- SetCharFmtAttrs( GetCharFmtFromPool(nPoolFmtId),
+ SetCharFormatAttrs( GetCharFormatFromPool(nPoolFormatId),
aScriptItemSet);
}
return false;
@@ -989,17 +989,17 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
// ein X:first-line { float: left; ... }
// Die Vorlage Suchen bzw. Anlegen
- SwTxtFmtColl *pColl = GetTxtFmtColl( nPoolCollId, aEmptyOUStr );
- SwTxtFmtColl* pParentColl = 0;
+ SwTextFormatColl *pColl = GetTextFormatColl( nPoolCollId, aEmptyOUStr );
+ SwTextFormatColl* pParentColl = 0;
if( !aClass.isEmpty() )
{
OUString aName( pColl->GetName() );
AddClassName( aName, aClass );
pParentColl = pColl;
- pColl = pDoc->FindTxtFmtCollByName( aName );
+ pColl = pDoc->FindTextFormatCollByName( aName );
if( !pColl )
- pColl = pDoc->MakeTxtFmtColl( aName, pParentColl );
+ pColl = pDoc->MakeTextFormatColl( aName, pParentColl );
}
if( !pNext )
{
@@ -1012,20 +1012,20 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
rPropInfo.SetBoxItem( rItemSet, MIN_BORDER_DIST, pBoxItem );
if( CSS1_SCRIPT_ALL == nScript && !pParentColl )
{
- SetTxtCollAttrs( pColl, rItemSet, rPropInfo, this );
+ SetTextCollAttrs( pColl, rItemSet, rPropInfo, this );
}
else
{
SfxItemSet aScriptItemSet( rItemSet );
RemoveScriptItems( aScriptItemSet, nScript,
pParentColl ? &pParentColl->GetAttrSet() : 0 );
- SetTxtCollAttrs( pColl, aScriptItemSet, rPropInfo, this );
+ SetTextCollAttrs( pColl, aScriptItemSet, rPropInfo, this );
}
}
else
{
// ein Drop-Cap-Attribut basteln
- SwFmtDrop aDrop( pColl->GetDrop() );
+ SwFormatDrop aDrop( pColl->GetDrop() );
aDrop.GetChars() = 1;
// die Attribute in das DropCap-Attribut einfuegen
@@ -1070,7 +1070,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
(SVX_ADJUST_LEFT == rPropInfo.eFloat ||
CSS1_SCRIPT_ALL == nScript) )
{
- pColl->SetFmtAttr( aDrop );
+ pColl->SetFormatAttr( aDrop );
}
}
@@ -1085,34 +1085,34 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
if( pNext )
return true;
- SwCharFmt *pCFmt = GetChrFmt( static_cast< sal_uInt16 >(nToken2), aEmptyOUStr );
- if( pCFmt )
+ SwCharFormat *pCFormat = GetChrFormat( static_cast< sal_uInt16 >(nToken2), aEmptyOUStr );
+ if( pCFormat )
{
- SwCharFmt *pParentCFmt = 0;
+ SwCharFormat *pParentCFormat = 0;
if( !aClass.isEmpty() )
{
- OUString aName( pCFmt->GetName() );
+ OUString aName( pCFormat->GetName() );
AddClassName( aName, aClass );
- pParentCFmt = pCFmt;
+ pParentCFormat = pCFormat;
- pCFmt = pDoc->FindCharFmtByName( aName );
- if( !pCFmt )
+ pCFormat = pDoc->FindCharFormatByName( aName );
+ if( !pCFormat )
{
- pCFmt = pDoc->MakeCharFmt( aName, pParentCFmt );
- pCFmt->SetAuto( false );
+ pCFormat = pDoc->MakeCharFormat( aName, pParentCFormat );
+ pCFormat->SetAuto( false );
}
}
- if( CSS1_SCRIPT_ALL == nScript && !pParentCFmt )
+ if( CSS1_SCRIPT_ALL == nScript && !pParentCFormat )
{
- SetCharFmtAttrs( pCFmt, rItemSet );
+ SetCharFormatAttrs( pCFormat, rItemSet );
}
else
{
SfxItemSet aScriptItemSet( rItemSet );
RemoveScriptItems( aScriptItemSet, nScript,
- pParentCFmt ? &pParentCFmt->GetAttrSet() : 0 );
- SetCharFmtAttrs( pCFmt, aScriptItemSet );
+ pParentCFormat ? &pParentCFormat->GetAttrSet() : 0 );
+ SetCharFormatAttrs( pCFormat, aScriptItemSet );
}
return false;
}
@@ -1140,7 +1140,7 @@ const FontList *SwCSS1Parser::GetFontList() const
return pFList;
}
-SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const OUString& rClass ) const
+SwCharFormat* SwCSS1Parser::GetChrFormat( sal_uInt16 nToken2, const OUString& rClass ) const
{
// die entsprechende Vorlage suchen
sal_uInt16 nPoolId = 0;
@@ -1172,23 +1172,23 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const OUString& rClass )
return 0;
// Die Vorlage (ohne Class) suchen oder anlegen
- SwCharFmt *pCFmt = 0;
+ SwCharFormat *pCFormat = 0;
if( nPoolId )
{
- pCFmt = GetCharFmtFromPool( nPoolId );
+ pCFormat = GetCharFormatFromPool( nPoolId );
}
else
{
OUString sCName( OUString::createFromAscii(sName) );
- pCFmt = pDoc->FindCharFmtByName( sCName );
- if( !pCFmt )
+ pCFormat = pDoc->FindCharFormatByName( sCName );
+ if( !pCFormat )
{
- pCFmt = pDoc->MakeCharFmt( sCName, pDoc->GetDfltCharFmt() );
- pCFmt->SetAuto( false );
+ pCFormat = pDoc->MakeCharFormat( sCName, pDoc->GetDfltCharFormat() );
+ pCFormat->SetAuto( false );
}
}
- OSL_ENSURE( pCFmt, "Keine Zeichen-Vorlage???" );
+ OSL_ENSURE( pCFormat, "Keine Zeichen-Vorlage???" );
// Wenn es eine Klasse gibt, die Klassen-Vorlage suchen aber nicht
// neu anlegen.
@@ -1196,94 +1196,94 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const OUString& rClass )
GetScriptFromClass( aClass, false );
if( !aClass.isEmpty() )
{
- OUString aTmp( pCFmt->GetName() );
+ OUString aTmp( pCFormat->GetName() );
AddClassName( aTmp, aClass );
- SwCharFmt *pClassCFmt = pDoc->FindCharFmtByName( aTmp );
- if( pClassCFmt )
+ SwCharFormat *pClassCFormat = pDoc->FindCharFormatByName( aTmp );
+ if( pClassCFormat )
{
- pCFmt = pClassCFmt;
+ pCFormat = pClassCFormat;
}
else
{
const SvxCSS1MapEntry *pClass = GetClass( aClass );
if( pClass )
{
- pCFmt = pDoc->MakeCharFmt( aTmp, pCFmt );
- pCFmt->SetAuto( false );
+ pCFormat = pDoc->MakeCharFormat( aTmp, pCFormat );
+ pCFormat->SetAuto( false );
SfxItemSet aItemSet( pClass->GetItemSet() );
- SetCharFmtAttrs( pCFmt, aItemSet );
+ SetCharFormatAttrs( pCFormat, aItemSet );
}
}
}
- return pCFmt;
+ return pCFormat;
}
-SwTxtFmtColl *SwCSS1Parser::GetTxtCollFromPool( sal_uInt16 nPoolId ) const
+SwTextFormatColl *SwCSS1Parser::GetTextCollFromPool( sal_uInt16 nPoolId ) const
{
- sal_uInt16 nOldArrLen = pDoc->GetTxtFmtColls()->size();
+ sal_uInt16 nOldArrLen = pDoc->GetTextFormatColls()->size();
- SwTxtFmtColl *pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nPoolId, false );
+ SwTextFormatColl *pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nPoolId, false );
if( bIsNewDoc )
{
- sal_uInt16 nArrLen = pDoc->GetTxtFmtColls()->size();
+ sal_uInt16 nArrLen = pDoc->GetTextFormatColls()->size();
for( sal_uInt16 i=nOldArrLen; i<nArrLen; i++ )
- lcl_swcss1_setEncoding( *(*pDoc->GetTxtFmtColls())[i],
+ lcl_swcss1_setEncoding( *(*pDoc->GetTextFormatColls())[i],
GetDfltEncoding() );
}
return pColl;
}
-SwCharFmt *SwCSS1Parser::GetCharFmtFromPool( sal_uInt16 nPoolId ) const
+SwCharFormat *SwCSS1Parser::GetCharFormatFromPool( sal_uInt16 nPoolId ) const
{
- sal_uInt16 nOldArrLen = pDoc->GetCharFmts()->size();
+ sal_uInt16 nOldArrLen = pDoc->GetCharFormats()->size();
- SwCharFmt *pCharFmt = pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( nPoolId );
+ SwCharFormat *pCharFormat = pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( nPoolId );
if( bIsNewDoc )
{
- sal_uInt16 nArrLen = pDoc->GetCharFmts()->size();
+ sal_uInt16 nArrLen = pDoc->GetCharFormats()->size();
for( sal_uInt16 i=nOldArrLen; i<nArrLen; i++ )
- lcl_swcss1_setEncoding( *(*pDoc->GetCharFmts())[i],
+ lcl_swcss1_setEncoding( *(*pDoc->GetCharFormats())[i],
GetDfltEncoding() );
}
- return pCharFmt;
+ return pCharFormat;
}
-SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 nTxtColl,
+SwTextFormatColl *SwCSS1Parser::GetTextFormatColl( sal_uInt16 nTextColl,
const OUString& rClass )
{
- SwTxtFmtColl* pColl = 0;
+ SwTextFormatColl* pColl = 0;
OUString aClass( rClass );
GetScriptFromClass( aClass, false );
- if( RES_POOLCOLL_TEXT == nTxtColl && aClass.getLength() >= 9 &&
+ if( RES_POOLCOLL_TEXT == nTextColl && aClass.getLength() >= 9 &&
('s' == aClass[0] || 'S' == aClass[0] ) )
{
if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdendnote) )
{
- nTxtColl = RES_POOLCOLL_ENDNOTE;
+ nTextColl = RES_POOLCOLL_ENDNOTE;
aClass = aEmptyOUStr;
}
else if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdfootnote) )
{
- nTxtColl = RES_POOLCOLL_FOOTNOTE;
+ nTextColl = RES_POOLCOLL_FOOTNOTE;
aClass = aEmptyOUStr;
}
}
- if( USER_FMT & nTxtColl ) // eine vom Reader angelegte
+ if( USER_FMT & nTextColl ) // eine vom Reader angelegte
{
OSL_ENSURE( false, "Wo kommt die Benutzer-Vorlage her?" );
- pColl = GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
+ pColl = GetTextCollFromPool( RES_POOLCOLL_STANDARD );
}
else
{
- pColl = GetTxtCollFromPool( nTxtColl );
+ pColl = GetTextCollFromPool( nTextColl );
}
OSL_ENSURE( pColl, "Keine Absatz-Vorlage???" );
@@ -1291,20 +1291,20 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 nTxtColl,
{
OUString aTmp( pColl->GetName() );
AddClassName( aTmp, aClass );
- SwTxtFmtColl* pClassColl = pDoc->FindTxtFmtCollByName( aTmp );
+ SwTextFormatColl* pClassColl = pDoc->FindTextFormatCollByName( aTmp );
if( !pClassColl &&
- (nTxtColl==RES_POOLCOLL_TABLE ||
- nTxtColl==RES_POOLCOLL_TABLE_HDLN) )
+ (nTextColl==RES_POOLCOLL_TABLE ||
+ nTextColl==RES_POOLCOLL_TABLE_HDLN) )
{
// Wenn dieser Fall eintritt, dann wurde ein <TD><P CLASS=foo>
// gelesen, aber die TD.foo Vorlage nicht gefunden. Dann muessen
// wir P.foo nehmen, wenn es sie gibt.
- SwTxtFmtColl* pCollText =
- GetTxtCollFromPool( RES_POOLCOLL_TEXT );
+ SwTextFormatColl* pCollText =
+ GetTextCollFromPool( RES_POOLCOLL_TEXT );
aTmp = pCollText->GetName();
AddClassName( aTmp, aClass );
- pClassColl = pDoc->FindTxtFmtCollByName( aTmp );
+ pClassColl = pDoc->FindTextFormatCollByName( aTmp );
}
if( pClassColl )
@@ -1316,14 +1316,14 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 nTxtColl,
const SvxCSS1MapEntry *pClass = GetClass( aClass );
if( pClass )
{
- pColl = pDoc->MakeTxtFmtColl( aTmp, pColl );
+ pColl = pDoc->MakeTextFormatColl( aTmp, pColl );
SfxItemSet aItemSet( pClass->GetItemSet() );
SvxCSS1PropertyInfo aPropInfo( pClass->GetPropertyInfo() );
aPropInfo.SetBoxItem( aItemSet, MIN_BORDER_DIST );
bool bPositioned = MayBePositioned( pClass->GetPropertyInfo() );
if( bPositioned )
aItemSet.ClearItem( RES_BACKGROUND );
- SetTxtCollAttrs( pColl, aItemSet, aPropInfo,
+ SetTextCollAttrs( pColl, aItemSet, aPropInfo,
this );
}
}
@@ -1346,7 +1346,7 @@ static SwPageDesc *FindPageDesc(SwDoc *pDoc, sal_uInt16 nPoolId)
size_t nPageDescs = pDoc->GetPageDescCnt();
size_t nPage;
for (nPage=0; nPage < nPageDescs &&
- pDoc->GetPageDesc(nPage).GetPoolFmtId() != nPoolId; ++nPage)
+ pDoc->GetPageDesc(nPage).GetPoolFormatId() != nPoolId; ++nPage)
;
return nPage < nPageDescs ? &pDoc->GetPageDesc(nPage) : 0;
@@ -1461,14 +1461,14 @@ bool SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
SVX_CSS1_LTYPE_PERCENTAGE == rPropInfo.eWidthType );
}
-void SwCSS1Parser::AddClassName( OUString& rFmtName, const OUString& rClass )
+void SwCSS1Parser::AddClassName( OUString& rFormatName, const OUString& rClass )
{
OSL_ENSURE( !rClass.isEmpty(), "Style-Klasse ohne Laenge?" );
- rFmtName += "." + rClass;
+ rFormatName += "." + rClass;
}
-void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop,
+void SwCSS1Parser::FillDropCap( SwFormatDrop& rDrop,
SfxItemSet& rItemSet,
const OUString *pName )
{
@@ -1513,13 +1513,13 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop,
// Fuer alle anderen Attribute eine Zeichen-Vorlage anlegen
if( rItemSet.Count() )
{
- SwCharFmt *pCFmt = 0;
+ SwCharFormat *pCFormat = 0;
OUString aName;
if( pName )
{
aName = *pName;
AddFirstLetterExt( aName );
- pCFmt = pDoc->FindCharFmtByName( aName );
+ pCFormat = pDoc->FindCharFormatByName( aName );
}
else
{
@@ -1527,20 +1527,20 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop,
{
aName = "first-letter " + OUString::number( (sal_Int32)(++nDropCapCnt) );
}
- while( pDoc->FindCharFmtByName(aName) );
+ while( pDoc->FindCharFormatByName(aName) );
}
- if( !pCFmt )
+ if( !pCFormat )
{
- pCFmt = pDoc->MakeCharFmt( aName, pDoc->GetDfltCharFmt() );
- pCFmt->SetAuto( false );
+ pCFormat = pDoc->MakeCharFormat( aName, pDoc->GetDfltCharFormat() );
+ pCFormat->SetAuto( false );
}
- SetCharFmtAttrs( pCFmt, rItemSet );
+ SetCharFormatAttrs( pCFormat, rItemSet );
// Die Zeichenvorlage braucht nur im Attribut gesetzt werden, wenn
// auch das Attribut gesetzt wird.
if( nLines > 1 )
- rDrop.SetCharFmt( pCFmt );
+ rDrop.SetCharFormat( pCFormat );
}
}
@@ -1949,7 +1949,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
const SvxCSS1PropertyInfo &rPropInfo,
SfxItemSet &rFrmItemSet )
{
- SwFmtAnchor aAnchor;
+ SwFormatAnchor aAnchor;
sal_Int16 eHoriOri = text::HoriOrientation::NONE;
sal_Int16 eVertOri = text::VertOrientation::NONE;
@@ -2006,8 +2006,8 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
// der Absatz noch leer ist und sonst auto-gebunden.
// Auto-gebundene Rahmen werden zunaechst an der Position davor
// eingefuegt und erst spaeter verschoben.
- const sal_Int32 nCntnt = pPam->GetPoint()->nContent.GetIndex();
- if( nCntnt )
+ const sal_Int32 nContent = pPam->GetPoint()->nContent.GetIndex();
+ if( nContent )
{
aAnchor.SetType( FLY_AT_CHAR );
pPam->Move( fnMoveBackward );
@@ -2023,7 +2023,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
aAnchor.SetAnchor( pPam->GetPoint() );
- if( nCntnt )
+ if( nContent )
pPam->Move( fnMoveForward );
sal_uInt16 nLeftSpace = 0, nRightSpace = 0;
@@ -2046,9 +2046,9 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
rFrmItemSet.Put( aAnchor );
// Absolut Positioniert mit Durchlauf
- rFrmItemSet.Put( SwFmtHoriOrient( nHoriPos, eHoriOri, eHoriRel ) );
- rFrmItemSet.Put( SwFmtVertOrient( nVertPos, eVertOri, eVertRel ) );
- rFrmItemSet.Put( SwFmtSurround( eSurround ) );
+ rFrmItemSet.Put( SwFormatHoriOrient( nHoriPos, eHoriOri, eHoriRel ) );
+ rFrmItemSet.Put( SwFormatVertOrient( nVertPos, eVertOri, eVertRel ) );
+ rFrmItemSet.Put( SwFormatSurround( eSurround ) );
}
void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
@@ -2086,13 +2086,13 @@ void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
;
}
- SwFmtFrmSize aFrmSize( eSize, nWidth, nHeight );
+ SwFormatFrmSize aFrmSize( eSize, nWidth, nHeight );
aFrmSize.SetWidthPercent( nPrcWidth );
aFrmSize.SetHeightPercent( nPrcHeight );
rFrmItemSet.Put( aFrmSize );
}
-void SwHTMLParser::SetFrmFmtAttrs( SfxItemSet &rItemSet,
+void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet,
SvxCSS1PropertyInfo & /*rPropInfo*/,
sal_uInt16 nFlags,
SfxItemSet &rFrmItemSet )
@@ -2208,9 +2208,9 @@ bool SwHTMLParser::GetMarginsFromContextWithNumBul( sal_uInt16& nLeft,
{
sal_uInt8 nLevel = (sal_uInt8)( (rInfo.GetDepth() <= MAXLEVEL ? rInfo.GetDepth()
: MAXLEVEL) - 1 );
- const SwNumFmt& rNumFmt = rInfo.GetNumRule()->Get(nLevel);
- nLeft = nLeft + rNumFmt.GetAbsLSpace();
- nIndent = rNumFmt.GetFirstLineOffset();
+ const SwNumFormat& rNumFormat = rInfo.GetNumRule()->Get(nLevel);
+ nLeft = nLeft + rNumFormat.GetAbsLSpace();
+ nIndent = rNumFormat.GetFirstLineOffset();
}
return bRet;
@@ -2233,7 +2233,7 @@ void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper,
}
else if( !nDfltColl )
{
- nDfltColl = pCntxt->GetDfltTxtFmtColl();
+ nDfltColl = pCntxt->GetDfltTextFormatColl();
if( nDfltColl )
aDfltClass = pCntxt->GetClass();
}
@@ -2242,8 +2242,8 @@ void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper,
if( !nDfltColl )
nDfltColl = RES_POOLCOLL_TEXT;
- const SwTxtFmtColl *pColl =
- pCSS1Parser->GetTxtFmtColl( nDfltColl, aDfltClass );
+ const SwTextFormatColl *pColl =
+ pCSS1Parser->GetTextFormatColl( nDfltColl, aDfltClass );
const SvxULSpaceItem& rULSpace = pColl->GetULSpace();
nUpper = rULSpace.GetUpper();
nLower = rULSpace.GetLower();
@@ -2266,7 +2266,7 @@ void SwHTMLParser::EndContextAttrs( _HTMLAttrContext *pContext, bool bRemove )
pAttr->Invalidate();
else if( nChars > MAX_DROPCAP_CHARS )
nChars = MAX_DROPCAP_CHARS;
- static_cast<SwFmtDrop&>(pAttr->GetItem()).GetChars() = (sal_uInt8)nChars;
+ static_cast<SwFormatDrop&>(pAttr->GetItem()).GetChars() = (sal_uInt8)nChars;
}
EndAttr( pAttr );
@@ -2302,12 +2302,12 @@ void SwHTMLParser::InsertParaAttrs( const SfxItemSet& rItemSet )
}
}
-static void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc )
+static void lcl_swcss1_setEncoding( SwFormat& rFormat, rtl_TextEncoding eEnc )
{
if( RTL_TEXTENCODING_DONTKNOW == eEnc )
return;
- const SfxItemSet& rItemSet = rFmt.GetAttrSet();
+ const SfxItemSet& rItemSet = rFormat.GetAttrSet();
static const sal_uInt16 aWhichIds[3] = { RES_CHRATR_FONT, RES_CHRATR_CJK_FONT,
RES_CHRATR_CTL_FONT };
const SfxPoolItem *pItem;
@@ -2321,7 +2321,7 @@ static void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc )
SvxFontItem aFont( rFont.GetFamily(), rFont.GetFamilyName(),
rFont.GetStyleName(), rFont.GetPitch(),
eEnc, aWhichIds[i]);
- rFmt.SetFmtAttr( aFont );
+ rFormat.SetFormatAttr( aFont );
}
}
}
@@ -2350,14 +2350,14 @@ void SwCSS1Parser::SetDfltEncoding( rtl_TextEncoding eEnc )
}
// Change all paragraph styles that do specify a font.
- sal_uInt16 nArrLen = pDoc->GetTxtFmtColls()->size();
+ sal_uInt16 nArrLen = pDoc->GetTextFormatColls()->size();
for( i=1; i<nArrLen; i++ )
- lcl_swcss1_setEncoding( *(*pDoc->GetTxtFmtColls())[i], eEnc );
+ lcl_swcss1_setEncoding( *(*pDoc->GetTextFormatColls())[i], eEnc );
// Change all character styles that do specify a font.
- nArrLen = pDoc->GetCharFmts()->size();
+ nArrLen = pDoc->GetCharFormats()->size();
for( i=1; i<nArrLen; i++ )
- lcl_swcss1_setEncoding( *(*pDoc->GetCharFmts())[i], eEnc );
+ lcl_swcss1_setEncoding( *(*pDoc->GetCharFormats())[i], eEnc );
}
SvxCSS1Parser::SetDfltEncoding( eEnc );
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 07b6a8db3b79..e3673e5c2359 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -210,8 +210,8 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
// den Start des Attributs neu setzen
pAttr->nSttPara = rNewSttPara;
pAttr->nEndPara = rNewSttPara;
- pAttr->nSttCntnt = nNewSttCnt;
- pAttr->nEndCntnt = nNewSttCnt;
+ pAttr->nSttContent = nNewSttCnt;
+ pAttr->nEndContent = nNewSttCnt;
pAttr->pPrev = 0;
pAttr = pNext;
@@ -361,7 +361,7 @@ void SwHTMLParser::EndContext( _HTMLAttrContext *pContext )
// Ggf. noch einen Ansatz-Umbruch einfuegen
if( AM_NONE != pContext->GetAppendMode() &&
pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( pContext->GetAppendMode() );
+ AppendTextNode( pContext->GetAppendMode() );
// PRE-/LISTING- und XMP-Umgebungen wieder starten
if( pContext->IsFinishPREListingXMP() )
@@ -426,7 +426,7 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs(aFrmItemSet );
+ Reader::ResetFrameFormatAttrs(aFrmItemSet );
// Ausrichtung setzen
SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, rItemSet, rPropInfo,
@@ -439,7 +439,7 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
SetSpace( Size(0,0), rItemSet, rPropInfo, aFrmItemSet );
// Sonstige CSS1-Attribute Setzen
- SetFrmFmtAttrs( rItemSet, rPropInfo,
+ SetFrameFormatAttrs( rItemSet, rPropInfo,
HTML_FF_BOX|HTML_FF_PADDING|HTML_FF_BACKGROUND|HTML_FF_DIRECTION,
aFrmItemSet );
@@ -465,7 +465,7 @@ bool SwHTMLParser::CreateContainer( const OUString& rClass,
// Container-Klasse
SfxItemSet *pFrmItemSet = pContext->GetFrmItemSet( pDoc );
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs( *pFrmItemSet );
+ Reader::ResetFrameFormatAttrs( *pFrmItemSet );
SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE,
rItemSet, rPropInfo, *pFrmItemSet );
@@ -473,7 +473,7 @@ bool SwHTMLParser::CreateContainer( const OUString& rClass,
SetFixSize( aDummy, aDummy, false, false, rItemSet, rPropInfo,
*pFrmItemSet );
SetSpace( aDummy, rItemSet, rPropInfo, *pFrmItemSet );
- SetFrmFmtAttrs( rItemSet, rPropInfo, HTML_FF_BOX|HTML_FF_BACKGROUND|HTML_FF_DIRECTION,
+ SetFrameFormatAttrs( rItemSet, rPropInfo, HTML_FF_BOX|HTML_FF_BACKGROUND|HTML_FF_DIRECTION,
*pFrmItemSet );
bRet = true;
@@ -492,7 +492,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
if( bCharLvl && !pPam->GetPoint()->nContent.GetIndex() &&
SVX_ADJUST_LEFT == rPropInfo.eFloat )
{
- SwFmtDrop aDrop;
+ SwFormatDrop aDrop;
aDrop.GetChars() = 1;
pCSS1Parser->FillDropCap( aDrop, rItemSet );
@@ -512,7 +512,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
// Feature: PrintExt
if( !bCharLvl )
- pCSS1Parser->SetFmtBreak( rItemSet, rPropInfo );
+ pCSS1Parser->SetFormatBreak( rItemSet, rPropInfo );
// /Feature: PrintExt
OSL_ENSURE(aContexts.size() <= nContextStAttrMin ||
@@ -532,7 +532,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
{
// Absatz-Einzuege muessen addiert werden und werden immer
// nur absatzweise gesetzt (fuer den ersten Absatz hier,
- // fuer alle folgenden in SetTxtCollAttrs)
+ // fuer alle folgenden in SetTextCollAttrs)
const SvxLRSpaceItem *pLRItem =
static_cast<const SvxLRSpaceItem *>(pItem);
@@ -560,7 +560,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
if( rPropInfo.bLeftMargin )
{
OSL_ENSURE( rPropInfo.nLeftMargin < 0 ||
- rPropInfo.nLeftMargin == pLRItem->GetTxtLeft(),
+ rPropInfo.nLeftMargin == pLRItem->GetTextLeft(),
"linker Abstand stimmt nicht mit Item ueberein" );
if( rPropInfo.nLeftMargin < 0 &&
-rPropInfo.nLeftMargin > nOldLeft )
@@ -580,15 +580,15 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
nRight = nOldRight + static_cast< sal_uInt16 >(rPropInfo.nRightMargin);
}
if( rPropInfo.bTextIndent )
- nIndent = pLRItem->GetTxtFirstLineOfst();
+ nIndent = pLRItem->GetTextFirstLineOfst();
// und die Werte fuer nachfolgende Absaetze merken
pContext->SetMargins( nLeft, nRight, nIndent );
// das Attribut noch am aktuellen Absatz setzen
SvxLRSpaceItem aLRItem( *pLRItem );
- aLRItem.SetTxtFirstLineOfst( nIndent );
- aLRItem.SetTxtLeft( nLeft );
+ aLRItem.SetTextFirstLineOfst( nIndent );
+ aLRItem.SetTextLeft( nLeft );
aLRItem.SetRight( nRight );
NewAttr( &aAttrTab.pLRSpace, aLRItem );
EndAttr( aAttrTab.pLRSpace, 0, false );
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index 2a29c7b454bf..73ca7cc619c2 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -86,7 +86,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
SfxItemSet aFrmSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs( aFrmSet );
+ Reader::ResetFrameFormatAttrs( aFrmSet );
sal_uInt16 nLeftSpace = 0, nRightSpace = 0, nUpperSpace = 0, nLowerSpace = 0;
if( (rPixSpace.Width() || rPixSpace.Height()) && Application::GetDefaultDevice() )
@@ -106,7 +106,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
// Ggf. den Erstzeilen-Einzug noch plaetten
const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
SvxLRSpaceItem aLRItem( *pLRItem );
- aLRItem.SetTxtFirstLineOfst( 0 );
+ aLRItem.SetTextFirstLineOfst( 0 );
if( rCSS1PropInfo.bLeftMargin )
{
nLeftSpace = static_cast< sal_uInt16 >(aLRItem.GetLeft());
@@ -153,7 +153,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
aFrmSet.Put( aULItem );
}
- SwFmtAnchor aAnchor( FLY_AS_CHAR );
+ SwFormatAnchor aAnchor( FLY_AS_CHAR );
if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.ePosition &&
SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eLeftType &&
SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
@@ -174,20 +174,20 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
// #i26791# - direct positioning for <SwDoc::Insert(..)>
pNewDrawObj->SetRelativePos( Point(rCSS1PropInfo.nLeft + nLeftSpace,
rCSS1PropInfo.nTop + nUpperSpace) );
- aFrmSet.Put( SwFmtSurround(SURROUND_THROUGHT) );
+ aFrmSet.Put( SwFormatSurround(SURROUND_THROUGHT) );
}
else if( SVX_ADJUST_LEFT == rCSS1PropInfo.eFloat ||
text::HoriOrientation::LEFT == eHoriOri )
{
aAnchor.SetType( FLY_AT_PARA );
- aFrmSet.Put( SwFmtSurround(bHidden ? SURROUND_THROUGHT
+ aFrmSet.Put( SwFormatSurround(bHidden ? SURROUND_THROUGHT
: SURROUND_RIGHT) );
// #i26791# - direct positioning for <SwDoc::Insert(..)>
pNewDrawObj->SetRelativePos( Point(nLeftSpace, nUpperSpace) );
}
else if( text::VertOrientation::NONE != eVertOri )
{
- aFrmSet.Put( SwFmtVertOrient( 0, eVertOri ) );
+ aFrmSet.Put( SwFormatVertOrient( 0, eVertOri ) );
}
if (FLY_AT_PAGE == aAnchor.GetAnchorId())
@@ -358,7 +358,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
}
}
- // Ein DrawTxtobj anlegen
+ // Ein DrawTextobj anlegen
// #i52858# - method name changed
SwDrawModel* pModel = pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
SdrPage* pPg = pModel->GetPage( 0 );
@@ -401,7 +401,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// die Default-Farbe (aus der Standard-Vorlage) setzen, damit ueberhaupt
// eine sinnvolle Farbe gesetzt ist.
const Color& rDfltColor =
- pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_STANDARD )
+ pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
->GetColor().GetValue();
aItemSet.Put( SvxColorItem( rDfltColor, EE_CHAR_COLOR ) );
@@ -418,11 +418,11 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT,
0
};
- SwTxtNode const*const pTxtNd =
- pPam->GetPoint()->nNode.GetNode().GetTxtNode();
- if( pTxtNd )
+ SwTextNode const*const pTextNd =
+ pPam->GetPoint()->nNode.GetNode().GetTextNode();
+ if( pTextNd )
{
- const SfxItemSet& rItemSet = pTxtNd->GetAnyFmtColl().GetAttrSet();
+ const SfxItemSet& rItemSet = pTextNd->GetAnyFormatColl().GetAttrSet();
const SfxPoolItem *pItem;
for( sal_uInt16 i=0; nWhichIds[i]; i++ )
{
diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx
index 74dd118e6927..17638a235bb0 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -63,9 +63,9 @@ const sal_uInt32 HTML_FRMOPTS_MARQUEE_CSS1 =
HTML_FRMOPT_S_ALIGN |
HTML_FRMOPT_S_SPACE;
-const SdrObject *SwHTMLWriter::GetMarqueeTextObj( const SwDrawFrmFmt& rFmt )
+const SdrObject *SwHTMLWriter::GetMarqueeTextObj( const SwDrawFrameFormat& rFormat )
{
- const SdrObject* pObj = rFmt.FindSdrObject();
+ const SdrObject* pObj = rFormat.FindSdrObject();
return (pObj && ::IsMarqueeTextObj( *pObj )) ? pObj : 0;
}
@@ -129,8 +129,8 @@ void SwHTMLWriter::GetEEAttrsFromDrwObj( SfxItemSet& rItemSet,
}
}
-Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
- const SwDrawFrmFmt& rFmt,
+Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt,
+ const SwDrawFrameFormat& rFormat,
const SdrObject& rSdrObject )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -286,9 +286,9 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
sal_uInt32 nFrmFlags = HTML_FRMOPTS_MARQUEE;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
nFrmFlags |= HTML_FRMOPTS_MARQUEE_CSS1;
- OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyOUStr, nFrmFlags );
+ OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrmFlags );
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
- rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmFlags, &rSdrObject );
+ rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrmFlags, &rSdrObject );
rWrt.Strm().WriteChar( '>' );
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index a052f71feda3..6f12c4dbf327 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -37,13 +37,13 @@
using namespace nsSwDocInfoSubType;
using namespace ::com::sun::star;
-struct HTMLNumFmtTblEntry
+struct HTMLNumFormatTableEntry
{
const sal_Char *pName;
- NfIndexTableOffset eFmt;
+ NfIndexTableOffset eFormat;
};
-static HTMLOptionEnum aHTMLFldTypeTable[] =
+static HTMLOptionEnum aHTMLFieldTypeTable[] =
{
{ OOO_STRING_SW_HTML_FT_author, RES_AUTHORFLD },
{ OOO_STRING_SW_HTML_FT_sender, RES_EXTUSERFLD },
@@ -57,7 +57,7 @@ static HTMLOptionEnum aHTMLFldTypeTable[] =
{ 0, 0 }
};
-static HTMLNumFmtTblEntry aHTMLDateFldFmtTable[] =
+static HTMLNumFormatTableEntry aHTMLDateFieldFormatTable[] =
{
{ "SSYS", NF_DATE_SYSTEM_SHORT },
{ "LSYS", NF_DATE_SYSTEM_LONG },
@@ -79,7 +79,7 @@ static HTMLNumFmtTblEntry aHTMLDateFldFmtTable[] =
{ 0, NF_NUMERIC_START }
};
-static HTMLNumFmtTblEntry aHTMLTimeFldFmtTable[] =
+static HTMLNumFormatTableEntry aHTMLTimeFieldFormatTable[] =
{
{ "SYS", NF_TIME_HHMMSS },
{ "SSMM24", NF_TIME_HHMM },
@@ -87,7 +87,7 @@ static HTMLNumFmtTblEntry aHTMLTimeFldFmtTable[] =
{ 0, NF_NUMERIC_START }
};
-static HTMLOptionEnum aHTMLPageNumFldFmtTable[] =
+static HTMLOptionEnum aHTMLPageNumFieldFormatTable[] =
{
{ OOO_STRING_SW_HTML_FF_uletter, SVX_NUM_CHARS_UPPER_LETTER },
{ OOO_STRING_SW_HTML_FF_lletter, SVX_NUM_CHARS_LOWER_LETTER },
@@ -102,7 +102,7 @@ static HTMLOptionEnum aHTMLPageNumFldFmtTable[] =
{ 0, 0 }
};
-static HTMLOptionEnum aHTMLExtUsrFldSubTable[] =
+static HTMLOptionEnum aHTMLExtUsrFieldSubTable[] =
{
{ OOO_STRING_SW_HTML_FS_company, EU_COMPANY },
{ OOO_STRING_SW_HTML_FS_firstname, EU_FIRSTNAME },
@@ -122,14 +122,14 @@ static HTMLOptionEnum aHTMLExtUsrFldSubTable[] =
{ 0, 0 }
};
-static HTMLOptionEnum aHTMLAuthorFldFmtTable[] =
+static HTMLOptionEnum aHTMLAuthorFieldFormatTable[] =
{
{ OOO_STRING_SW_HTML_FF_name, AF_NAME },
{ OOO_STRING_SW_HTML_FF_shortcut, AF_SHORTCUT },
{ 0, 0 }
};
-static HTMLOptionEnum aHTMLPageNumFldSubTable[] =
+static HTMLOptionEnum aHTMLPageNumFieldSubTable[] =
{
{ OOO_STRING_SW_HTML_FS_random, PG_RANDOM },
{ OOO_STRING_SW_HTML_FS_next, PG_NEXT },
@@ -145,7 +145,7 @@ static HTMLOptionEnum aHTMLPageNumFldSubTable[] =
const SwDocInfoSubType DI_INFO3 = DI_SUBTYPE_END + 3;
const SwDocInfoSubType DI_INFO4 = DI_SUBTYPE_END + 4;
-static HTMLOptionEnum aHTMLDocInfoFldSubTable[] =
+static HTMLOptionEnum aHTMLDocInfoFieldSubTable[] =
{
{ OOO_STRING_SW_HTML_FS_title, DI_TITEL },
{ OOO_STRING_SW_HTML_FS_theme, DI_THEMA },
@@ -161,7 +161,7 @@ static HTMLOptionEnum aHTMLDocInfoFldSubTable[] =
{ 0, 0 }
};
-static HTMLOptionEnum aHTMLDocInfoFldFmtTable[] =
+static HTMLOptionEnum aHTMLDocInfoFieldFormatTable[] =
{
{ OOO_STRING_SW_HTML_FF_author, DI_SUB_AUTHOR },
{ OOO_STRING_SW_HTML_FF_time, DI_SUB_TIME },
@@ -169,7 +169,7 @@ static HTMLOptionEnum aHTMLDocInfoFldFmtTable[] =
{ 0, 0 }
};
-static HTMLOptionEnum aHTMLDocStatFldSubTable[] =
+static HTMLOptionEnum aHTMLDocStatFieldSubTable[] =
{
{ OOO_STRING_SW_HTML_FS_page, DS_PAGE },
{ OOO_STRING_SW_HTML_FS_para, DS_PARA },
@@ -181,7 +181,7 @@ static HTMLOptionEnum aHTMLDocStatFldSubTable[] =
{ 0, 0 }
};
-static HTMLOptionEnum aHTMLFileNameFldFmtTable[] =
+static HTMLOptionEnum aHTMLFileNameFieldFormatTable[] =
{
{ OOO_STRING_SW_HTML_FF_name, FF_NAME },
{ OOO_STRING_SW_HTML_FF_pathname, FF_PATHNAME },
@@ -193,7 +193,7 @@ static HTMLOptionEnum aHTMLFileNameFldFmtTable[] =
sal_uInt16 SwHTMLParser::GetNumType( const OUString& rStr, sal_uInt16 nDfltType )
{
sal_uInt16 nType = nDfltType;
- const HTMLOptionEnum *pOptEnums = aHTMLPageNumFldFmtTable;
+ const HTMLOptionEnum *pOptEnums = aHTMLPageNumFieldFormatTable;
while( pOptEnums->pName )
if( !rStr.equalsIgnoreAsciiCaseAscii( pOptEnums->pName ) )
pOptEnums++;
@@ -209,10 +209,10 @@ sal_uInt16 SwHTMLParser::GetNumType( const OUString& rStr, sal_uInt16 nDfltType
void SwHTMLParser::NewField()
{
bool bKnownType = false, bFixed = false,
- bHasNumFmt = false, bHasNumValue = false;
+ bHasNumFormat = false, bHasNumValue = false;
sal_uInt16 nType = 0;
- OUString aValue, aNumFmt, aNumValue, aName;
- const HTMLOption *pSubOption=0, *pFmtOption=0;
+ OUString aValue, aNumFormat, aNumValue, aName;
+ const HTMLOption *pSubOption=0, *pFormatOption=0;
const HTMLOptions& rHTMLOptions = GetOptions();
size_t i;
@@ -223,13 +223,13 @@ void SwHTMLParser::NewField()
switch( rOption.GetToken() )
{
case HTML_O_TYPE:
- bKnownType = rOption.GetEnum( nType, aHTMLFldTypeTable );
+ bKnownType = rOption.GetEnum( nType, aHTMLFieldTypeTable );
break;
case HTML_O_SUBTYPE:
pSubOption = &rOption;
break;
case HTML_O_FORMAT:
- pFmtOption = &rOption;
+ pFormatOption = &rOption;
break;
case HTML_O_NAME:
aName = rOption.GetString();
@@ -238,8 +238,8 @@ void SwHTMLParser::NewField()
aValue = rOption.GetString();
break;
case HTML_O_SDNUM:
- aNumFmt = rOption.GetString();
- bHasNumFmt = true;
+ aNumFormat = rOption.GetString();
+ bHasNumFormat = true;
break;
case HTML_O_SDVAL:
aNumValue = rOption.GetString();
@@ -284,7 +284,7 @@ void SwHTMLParser::NewField()
if( RES_DATEFLD==nType || RES_TIMEFLD==nType )
nWhich = RES_DATETIMEFLD;
- SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetSysFldType( nWhich );
+ SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetSysFieldType( nWhich );
SwField *pNewField = 0;
bool bInsOnEndTag = false;
@@ -294,53 +294,53 @@ void SwHTMLParser::NewField()
if( pSubOption )
{
sal_uInt16 nSub;
- sal_uLong nFmt = 0;
+ sal_uLong nFormat = 0;
if( bFixed )
{
- nFmt |= AF_FIXED;
+ nFormat |= AF_FIXED;
bInsOnEndTag = true;
}
- if( pSubOption->GetEnum( nSub, aHTMLExtUsrFldSubTable ) )
- pNewField = new SwExtUserField(static_cast<SwExtUserFieldType*>(pType), nSub, nFmt);
+ if( pSubOption->GetEnum( nSub, aHTMLExtUsrFieldSubTable ) )
+ pNewField = new SwExtUserField(static_cast<SwExtUserFieldType*>(pType), nSub, nFormat);
}
break;
case RES_AUTHORFLD:
{
- sal_uInt16 nFmt = AF_NAME;
- if( pFmtOption )
- pFmtOption->GetEnum( nFmt, aHTMLAuthorFldFmtTable );
+ sal_uInt16 nFormat = AF_NAME;
+ if( pFormatOption )
+ pFormatOption->GetEnum( nFormat, aHTMLAuthorFieldFormatTable );
if( bFixed )
{
- nFmt |= AF_FIXED;
+ nFormat |= AF_FIXED;
bInsOnEndTag = true;
}
- pNewField = new SwAuthorField(static_cast<SwAuthorFieldType*>(pType), nFmt);
+ pNewField = new SwAuthorField(static_cast<SwAuthorFieldType*>(pType), nFormat);
}
break;
case RES_DATEFLD:
case RES_TIMEFLD:
{
- sal_uLong nNumFmt = 0;
+ sal_uLong nNumFormat = 0;
sal_Int64 nTime = tools::Time( tools::Time::SYSTEM ).GetTime();
sal_Int32 nDate = Date( Date::SYSTEM ).GetDate();
sal_uInt16 nSub = 0;
- bool bValidFmt = false;
- HTMLNumFmtTblEntry * pFmtTbl;
+ bool bValidFormat = false;
+ HTMLNumFormatTableEntry * pFormatTable;
if( RES_DATEFLD==nType )
{
nSub = DATEFLD;
- pFmtTbl = aHTMLDateFldFmtTable;
+ pFormatTable = aHTMLDateFieldFormatTable;
if( !aValue.isEmpty() )
nDate = aValue.toInt32();
}
else
{
nSub = TIMEFLD;
- pFmtTbl = aHTMLTimeFldFmtTable;
+ pFormatTable = aHTMLTimeFieldFormatTable;
if( !aValue.isEmpty() )
nTime = (sal_uLong)aValue.toInt32();
}
@@ -348,25 +348,25 @@ void SwHTMLParser::NewField()
nSub |= FIXEDFLD;
SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
- if( pFmtOption )
+ if( pFormatOption )
{
- const OUString& rFmt = pFmtOption->GetString();
- for( sal_uInt16 k = 0; pFmtTbl[k].pName; k++ )
+ const OUString& rFormat = pFormatOption->GetString();
+ for( sal_uInt16 k = 0; pFormatTable[k].pName; k++ )
{
- if( rFmt.equalsIgnoreAsciiCaseAscii( pFmtTbl[k].pName ) )
+ if( rFormat.equalsIgnoreAsciiCaseAscii( pFormatTable[k].pName ) )
{
- nNumFmt = pFormatter->GetFormatIndex(
- pFmtTbl[k].eFmt, LANGUAGE_SYSTEM);
- bValidFmt = true;
+ nNumFormat = pFormatter->GetFormatIndex(
+ pFormatTable[k].eFormat, LANGUAGE_SYSTEM);
+ bValidFormat = true;
break;
}
}
}
- if( !bValidFmt )
- nNumFmt = pFormatter->GetFormatIndex( pFmtTbl[i].eFmt,
+ if( !bValidFormat )
+ nNumFormat = pFormatter->GetFormatIndex( pFormatTable[i].eFormat,
LANGUAGE_SYSTEM);
- pNewField = new SwDateTimeField(static_cast<SwDateTimeFieldType *>(pType), nSub, nNumFmt);
+ pNewField = new SwDateTimeField(static_cast<SwDateTimeFieldType *>(pType), nSub, nNumFormat);
if (nSub & FIXEDFLD)
static_cast<SwDateTimeField *>(pNewField)->SetDateTime(DateTime(Date(nDate), tools::Time(nTime)));
@@ -374,18 +374,18 @@ void SwHTMLParser::NewField()
break;
case RES_DATETIMEFLD:
- if( bHasNumFmt )
+ if( bHasNumFormat )
{
sal_uInt16 nSub = 0;
SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
- sal_uInt32 nNumFmt;
+ sal_uInt32 nNumFormat;
LanguageType eLang;
double dValue = GetTableDataOptionsValNum(
- nNumFmt, eLang, aNumValue, aNumFmt,
+ nNumFormat, eLang, aNumValue, aNumFormat,
*pDoc->GetNumberFormatter() );
- short nFmtType = pFormatter->GetType( nNumFmt );
- switch( nFmtType )
+ short nFormatType = pFormatter->GetType( nNumFormat );
+ switch( nFormatType )
{
case css::util::NumberFormat::DATE: nSub = DATEFLD; break;
case css::util::NumberFormat::TIME: nSub = TIMEFLD; break;
@@ -396,7 +396,7 @@ void SwHTMLParser::NewField()
if( bHasNumValue )
nSub |= FIXEDFLD;
- pNewField = new SwDateTimeField(static_cast<SwDateTimeFieldType *>(pType), nSub, nNumFmt);
+ pNewField = new SwDateTimeField(static_cast<SwDateTimeFieldType *>(pType), nSub, nNumFormat);
if (bHasNumValue)
static_cast<SwDateTimeField *>(pNewField)->SetValue(dValue);
}
@@ -407,27 +407,27 @@ void SwHTMLParser::NewField()
if( pSubOption )
{
sal_uInt16 nSub;
- if( pSubOption->GetEnum( nSub, aHTMLPageNumFldSubTable ) )
+ if( pSubOption->GetEnum( nSub, aHTMLPageNumFieldSubTable ) )
{
- sal_uInt16 nFmt = SVX_NUM_PAGEDESC;
- if( pFmtOption )
- pFmtOption->GetEnum( nFmt, aHTMLPageNumFldFmtTable );
+ sal_uInt16 nFormat = SVX_NUM_PAGEDESC;
+ if( pFormatOption )
+ pFormatOption->GetEnum( nFormat, aHTMLPageNumFieldFormatTable );
short nOff = 0;
- if( (SvxExtNumType)nFmt!=SVX_NUM_CHAR_SPECIAL && !aValue.isEmpty() )
+ if( (SvxExtNumType)nFormat!=SVX_NUM_CHAR_SPECIAL && !aValue.isEmpty() )
nOff = (short)aValue.toInt32();
else if( (SwPageNumSubType)nSub == PG_NEXT )
nOff = 1;
else if( (SwPageNumSubType)nSub == PG_PREV )
nOff = -1;
- if( (SvxExtNumType)nFmt==SVX_NUM_CHAR_SPECIAL &&
+ if( (SvxExtNumType)nFormat==SVX_NUM_CHAR_SPECIAL &&
(SwPageNumSubType)nSub==PG_RANDOM )
- nFmt = SVX_NUM_PAGEDESC;
+ nFormat = SVX_NUM_PAGEDESC;
- pNewField = new SwPageNumberField(static_cast<SwPageNumberFieldType*>(pType), nSub, nFmt, nOff);
- if ((SvxExtNumType)nFmt == SVX_NUM_CHAR_SPECIAL)
+ pNewField = new SwPageNumberField(static_cast<SwPageNumberFieldType*>(pType), nSub, nFormat, nOff);
+ if ((SvxExtNumType)nFormat == SVX_NUM_CHAR_SPECIAL)
static_cast<SwPageNumberField *>(pNewField)->SetUserString(aValue);
}
}
@@ -437,25 +437,25 @@ void SwHTMLParser::NewField()
if( pSubOption )
{
sal_uInt16 nSub;
- if( pSubOption->GetEnum( nSub, aHTMLDocInfoFldSubTable ) )
+ if( pSubOption->GetEnum( nSub, aHTMLDocInfoFieldSubTable ) )
{
sal_uInt16 nExtSub = 0;
if( DI_CREATE==(SwDocInfoSubType)nSub ||
DI_CHANGE==(SwDocInfoSubType)nSub )
{
nExtSub = DI_SUB_AUTHOR;
- if( pFmtOption )
- pFmtOption->GetEnum( nExtSub, aHTMLDocInfoFldFmtTable );
+ if( pFormatOption )
+ pFormatOption->GetEnum( nExtSub, aHTMLDocInfoFieldFormatTable );
nSub |= nExtSub;
}
- sal_uInt32 nNumFmt = 0;
+ sal_uInt32 nNumFormat = 0;
double dValue = 0;
- if( bHasNumFmt && (DI_SUB_DATE==nExtSub || DI_SUB_TIME==nExtSub) )
+ if( bHasNumFormat && (DI_SUB_DATE==nExtSub || DI_SUB_TIME==nExtSub) )
{
LanguageType eLang;
dValue = GetTableDataOptionsValNum(
- nNumFmt, eLang, aNumValue, aNumFmt,
+ nNumFormat, eLang, aNumValue, aNumFormat,
*pDoc->GetNumberFormatter() );
bFixed &= bHasNumValue;
}
@@ -476,7 +476,7 @@ void SwHTMLParser::NewField()
bInsOnEndTag = true;
}
- pNewField = new SwDocInfoField(static_cast<SwDocInfoFieldType *>(pType), nSub, aName, nNumFmt);
+ pNewField = new SwDocInfoField(static_cast<SwDocInfoFieldType *>(pType), nSub, aName, nNumFormat);
if (bHasNumValue)
static_cast<SwDocInfoField*>(pNewField)->SetValue(dValue);
}
@@ -487,29 +487,29 @@ void SwHTMLParser::NewField()
if( pSubOption )
{
sal_uInt16 nSub;
- if( pSubOption->GetEnum( nSub, aHTMLDocStatFldSubTable ) )
+ if( pSubOption->GetEnum( nSub, aHTMLDocStatFieldSubTable ) )
{
- sal_uInt16 nFmt = SVX_NUM_ARABIC;
- if( pFmtOption )
- pFmtOption->GetEnum( nFmt, aHTMLPageNumFldFmtTable );
- pNewField = new SwDocStatField(static_cast<SwDocStatFieldType*>(pType), nSub, nFmt);
- bUpdateDocStat |= (DS_PAGE != nFmt);
+ sal_uInt16 nFormat = SVX_NUM_ARABIC;
+ if( pFormatOption )
+ pFormatOption->GetEnum( nFormat, aHTMLPageNumFieldFormatTable );
+ pNewField = new SwDocStatField(static_cast<SwDocStatFieldType*>(pType), nSub, nFormat);
+ bUpdateDocStat |= (DS_PAGE != nFormat);
}
}
break;
case RES_FILENAMEFLD:
{
- sal_uInt16 nFmt = FF_NAME;
- if( pFmtOption )
- pFmtOption->GetEnum( nFmt, aHTMLFileNameFldFmtTable );
+ sal_uInt16 nFormat = FF_NAME;
+ if( pFormatOption )
+ pFormatOption->GetEnum( nFormat, aHTMLFileNameFieldFormatTable );
if( bFixed )
{
- nFmt |= FF_FIXED;
+ nFormat |= FF_FIXED;
bInsOnEndTag = true;
}
- pNewField = new SwFileNameField(static_cast<SwFileNameFieldType*>(pType), nFmt);
+ pNewField = new SwFileNameField(static_cast<SwFileNameFieldType*>(pType), nFormat);
}
break;
default:
@@ -524,7 +524,7 @@ void SwHTMLParser::NewField()
}
else
{
- pDoc->getIDocumentContentOperations().InsertPoolItem(*pPam, SwFmtFld(*pNewField));
+ pDoc->getIDocumentContentOperations().InsertPoolItem(*pPam, SwFormatField(*pNewField));
delete pNewField;
}
bInField = true;
@@ -562,7 +562,7 @@ void SwHTMLParser::EndField()
break;
}
- pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, SwFmtFld(*pField) );
+ pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, SwFormatField(*pField) );
delete pField;
pField = 0;
}
@@ -608,9 +608,9 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
// werden soll, fuegen wir es vor dem Space ein. Dann gibt es
// weniger Probleme beim Formatieren (bug #40483#)
const sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
- SwTxtNode *pTxtNd = pPam->GetNode().GetTxtNode();
+ SwTextNode *pTextNd = pPam->GetNode().GetTextNode();
bool bMoveFwd = false;
- if (nPos>0 && pTxtNd && (' ' == pTxtNd->GetTxt()[nPos-1]))
+ if (nPos>0 && pTextNd && (' ' == pTextNd->GetText()[nPos-1]))
{
bMoveFwd = true;
@@ -624,7 +624,7 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
break;
if( RES_TXTATR_FIELD == pAttr->pItem->Which() &&
- RES_SCRIPTFLD == static_cast<const SwFmtFld *>(pAttr->pItem)->GetField()->GetTyp()->Which() )
+ RES_SCRIPTFLD == static_cast<const SwFormatField *>(pAttr->pItem)->GetField()->GetTyp()->Which() )
{
bMoveFwd = false;
break;
@@ -635,10 +635,10 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
pPam->Move( fnMoveBackward );
}
- SwPostItField aPostItFld(
- static_cast<SwPostItFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_POSTITFLD )),
+ SwPostItField aPostItField(
+ static_cast<SwPostItFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )),
aEmptyOUStr, aComment, aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) );
- InsertAttr( SwFmtFld( aPostItFld ) );
+ InsertAttr( SwFormatField( aPostItField ) );
if( bMoveFwd )
pPam->Move( fnMoveForward );
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 9a2557d8c901..09501c173865 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -37,43 +37,43 @@
using namespace nsSwDocInfoSubType;
-const sal_Char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFmt )
+const sal_Char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFormat )
{
- const sal_Char *pFmtStr = 0;
+ const sal_Char *pFormatStr = 0;
- switch( (SvxExtNumType)nFmt )
+ switch( (SvxExtNumType)nFormat )
{
- case SVX_NUM_CHARS_UPPER_LETTER: pFmtStr = OOO_STRING_SW_HTML_FF_uletter; break;
- case SVX_NUM_CHARS_LOWER_LETTER: pFmtStr = OOO_STRING_SW_HTML_FF_lletter; break;
- case SVX_NUM_ROMAN_UPPER: pFmtStr = OOO_STRING_SW_HTML_FF_uroman; break;
- case SVX_NUM_ROMAN_LOWER: pFmtStr = OOO_STRING_SW_HTML_FF_lroman; break;
- case SVX_NUM_ARABIC: pFmtStr = OOO_STRING_SW_HTML_FF_arabic; break;
- case SVX_NUM_NUMBER_NONE: pFmtStr = OOO_STRING_SW_HTML_FF_none; break;
- case SVX_NUM_CHAR_SPECIAL: pFmtStr = OOO_STRING_SW_HTML_FF_char; break;
- case SVX_NUM_PAGEDESC: pFmtStr = OOO_STRING_SW_HTML_FF_page; break;
- case SVX_NUM_CHARS_UPPER_LETTER_N: pFmtStr = OOO_STRING_SW_HTML_FF_ulettern; break;
- case SVX_NUM_CHARS_LOWER_LETTER_N: pFmtStr = OOO_STRING_SW_HTML_FF_llettern; break;
+ case SVX_NUM_CHARS_UPPER_LETTER: pFormatStr = OOO_STRING_SW_HTML_FF_uletter; break;
+ case SVX_NUM_CHARS_LOWER_LETTER: pFormatStr = OOO_STRING_SW_HTML_FF_lletter; break;
+ case SVX_NUM_ROMAN_UPPER: pFormatStr = OOO_STRING_SW_HTML_FF_uroman; break;
+ case SVX_NUM_ROMAN_LOWER: pFormatStr = OOO_STRING_SW_HTML_FF_lroman; break;
+ case SVX_NUM_ARABIC: pFormatStr = OOO_STRING_SW_HTML_FF_arabic; break;
+ case SVX_NUM_NUMBER_NONE: pFormatStr = OOO_STRING_SW_HTML_FF_none; break;
+ case SVX_NUM_CHAR_SPECIAL: pFormatStr = OOO_STRING_SW_HTML_FF_char; break;
+ case SVX_NUM_PAGEDESC: pFormatStr = OOO_STRING_SW_HTML_FF_page; break;
+ case SVX_NUM_CHARS_UPPER_LETTER_N: pFormatStr = OOO_STRING_SW_HTML_FF_ulettern; break;
+ case SVX_NUM_CHARS_LOWER_LETTER_N: pFormatStr = OOO_STRING_SW_HTML_FF_llettern; break;
default:
;
}
- return pFmtStr;
+ return pFormatStr;
}
-static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
- const SwTxtNode& rTxtNd, sal_Int32 nFldPos )
+static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
+ const SwTextNode& rTextNd, sal_Int32 nFieldPos )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- const SwFieldType* pFldTyp = pFld->GetTyp();
- sal_uInt16 nField = pFldTyp->Which();
- sal_uLong nFmt = pFld->GetFormat();
+ const SwFieldType* pFieldTyp = pField->GetTyp();
+ sal_uInt16 nField = pFieldTyp->Which();
+ sal_uLong nFormat = pField->GetFormat();
const sal_Char *pTypeStr=0, // TYPE
*pSubStr=0, // SUBTYPE
- *pFmtStr=0; // FORMAT (SW)
+ *pFormatStr=0; // FORMAT (SW)
OUString aValue; // VALUE (SW)
- bool bNumFmt=false; // SDNUM (Number-Formatter-Format)
+ bool bNumFormat=false; // SDNUM (Number-Formatter-Format)
bool bNumValue=false; // SDVAL (Number-Formatter-Value)
double dNumValue = 0.0; // SDVAL (Number-Formatter-Value)
bool bFixed=false; // SDFIXED
@@ -83,7 +83,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
{
case RES_EXTUSERFLD:
pTypeStr = OOO_STRING_SW_HTML_FT_sender;
- switch( (SwExtUserSubType)pFld->GetSubType() )
+ switch( (SwExtUserSubType)pField->GetSubType() )
{
case EU_COMPANY: pSubStr = OOO_STRING_SW_HTML_FS_company; break;
case EU_FIRSTNAME: pSubStr = OOO_STRING_SW_HTML_FS_firstname; break;
@@ -104,34 +104,34 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
;
}
OSL_ENSURE( pSubStr, "ubekannter Subtyp fuer SwExtUserField" );
- bFixed = static_cast<const SwExtUserField*>(pFld)->IsFixed();
+ bFixed = static_cast<const SwExtUserField*>(pField)->IsFixed();
break;
case RES_AUTHORFLD:
pTypeStr = OOO_STRING_SW_HTML_FT_author;
- switch( (SwAuthorFormat)nFmt & 0xff)
+ switch( (SwAuthorFormat)nFormat & 0xff)
{
- case AF_NAME: pFmtStr = OOO_STRING_SW_HTML_FF_name; break;
- case AF_SHORTCUT: pFmtStr = OOO_STRING_SW_HTML_FF_shortcut; break;
+ case AF_NAME: pFormatStr = OOO_STRING_SW_HTML_FF_name; break;
+ case AF_SHORTCUT: pFormatStr = OOO_STRING_SW_HTML_FF_shortcut; break;
}
- OSL_ENSURE( pFmtStr, "ubekanntes Format fuer SwAuthorField" );
- bFixed = static_cast<const SwAuthorField*>(pFld)->IsFixed();
+ OSL_ENSURE( pFormatStr, "ubekanntes Format fuer SwAuthorField" );
+ bFixed = static_cast<const SwAuthorField*>(pField)->IsFixed();
break;
case RES_DATETIMEFLD:
pTypeStr = OOO_STRING_SW_HTML_FT_datetime;
- bNumFmt = true;
- if( static_cast<const SwDateTimeField*>(pFld)->IsFixed() )
+ bNumFormat = true;
+ if( static_cast<const SwDateTimeField*>(pField)->IsFixed() )
{
bNumValue = true;
- dNumValue = static_cast<const SwDateTimeField*>(pFld)->GetValue();
+ dNumValue = static_cast<const SwDateTimeField*>(pField)->GetValue();
}
break;
case RES_PAGENUMBERFLD:
{
pTypeStr = OOO_STRING_SW_HTML_FT_page;
- SwPageNumSubType eSubType = (SwPageNumSubType)pFld->GetSubType();
+ SwPageNumSubType eSubType = (SwPageNumSubType)pField->GetSubType();
switch( eSubType )
{
case PG_RANDOM: pSubStr = OOO_STRING_SW_HTML_FS_random; break;
@@ -139,15 +139,15 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
case PG_PREV: pSubStr = OOO_STRING_SW_HTML_FS_prev; break;
}
OSL_ENSURE( pSubStr, "ubekannter Subtyp fuer SwPageNumberField" );
- pFmtStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFmt) );
+ pFormatStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFormat) );
- if( (SvxExtNumType)nFmt==SVX_NUM_CHAR_SPECIAL )
+ if( (SvxExtNumType)nFormat==SVX_NUM_CHAR_SPECIAL )
{
- aValue = static_cast<const SwPageNumberField *>(pFld)->GetUserString();
+ aValue = static_cast<const SwPageNumberField *>(pField)->GetUserString();
}
else
{
- const OUString& rValue = pFld->GetPar2();
+ const OUString& rValue = pField->GetPar2();
short nValue = (short)rValue.toInt32();
if( (eSubType == PG_NEXT && nValue!=1) ||
(eSubType == PG_PREV && nValue!=-1) ||
@@ -160,7 +160,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
break;
case RES_DOCINFOFLD:
{
- sal_uInt16 nSubType = pFld->GetSubType();
+ sal_uInt16 nSubType = pField->GetSubType();
pTypeStr = OOO_STRING_SW_HTML_FT_docinfo;
sal_uInt16 nExtSubType = nSubType & 0x0f00;
nSubType &= 0x00ff;
@@ -178,7 +178,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
}
if( DI_CUSTOM == nSubType ) {
- aName = static_cast<const SwDocInfoField*>(pFld)->GetName();
+ aName = static_cast<const SwDocInfoField*>(pField)->GetName();
}
if( DI_CREATE == nSubType || DI_CHANGE == nSubType )
@@ -186,34 +186,34 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
switch( nExtSubType )
{
case DI_SUB_AUTHOR:
- pFmtStr = OOO_STRING_SW_HTML_FF_author;
+ pFormatStr = OOO_STRING_SW_HTML_FF_author;
break;
case DI_SUB_TIME:
- pFmtStr = OOO_STRING_SW_HTML_FF_time;
- bNumFmt = true;
+ pFormatStr = OOO_STRING_SW_HTML_FF_time;
+ bNumFormat = true;
break;
case DI_SUB_DATE:
- pFmtStr = OOO_STRING_SW_HTML_FF_date;
- bNumFmt = true;
+ pFormatStr = OOO_STRING_SW_HTML_FF_date;
+ bNumFormat = true;
break;
}
}
- bFixed = static_cast<const SwDocInfoField*>(pFld)->IsFixed();
- if( bNumFmt )
+ bFixed = static_cast<const SwDocInfoField*>(pField)->IsFixed();
+ if( bNumFormat )
{
if( bFixed )
{
// Fuer ein fixes Feld och den Num-Value ausgeben.
// Fixe Felder ohne Zahlenformate sollte es
// eigentlich nicht geben. OSL_ENSURE(ist unten.
- dNumValue = static_cast<const SwDocInfoField*>(pFld)->GetValue();
+ dNumValue = static_cast<const SwDocInfoField*>(pField)->GetValue();
bNumValue = true;
}
- else if( !nFmt )
+ else if( !nFormat )
{
// Nicht fixe Felder muessen kein Zahlenformat haben,
// wenn sie aus 4.0-Dokumenten stammen.
- bNumFmt = false;
+ bNumFormat = false;
}
}
}
@@ -222,7 +222,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
case RES_DOCSTATFLD:
{
pTypeStr = OOO_STRING_SW_HTML_FT_docstat;
- sal_uInt16 nSubType = pFld->GetSubType();
+ sal_uInt16 nSubType = pField->GetSubType();
switch( nSubType )
{
case DS_PAGE: pSubStr = OOO_STRING_SW_HTML_FS_page; break;
@@ -234,23 +234,23 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
case DS_OLE: pSubStr = OOO_STRING_SW_HTML_FS_ole; break;
default: pTypeStr = 0; break;
}
- pFmtStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFmt) );
+ pFormatStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFormat) );
}
break;
case RES_FILENAMEFLD:
pTypeStr = OOO_STRING_SW_HTML_FT_filename;
- switch( (SwFileNameFormat)(nFmt & ~FF_FIXED) )
+ switch( (SwFileNameFormat)(nFormat & ~FF_FIXED) )
{
- case FF_NAME: pFmtStr = OOO_STRING_SW_HTML_FF_name; break;
- case FF_PATHNAME: pFmtStr = OOO_STRING_SW_HTML_FF_pathname; break;
- case FF_PATH: pFmtStr = OOO_STRING_SW_HTML_FF_path; break;
- case FF_NAME_NOEXT: pFmtStr = OOO_STRING_SW_HTML_FF_name_noext; break;
+ case FF_NAME: pFormatStr = OOO_STRING_SW_HTML_FF_name; break;
+ case FF_PATHNAME: pFormatStr = OOO_STRING_SW_HTML_FF_pathname; break;
+ case FF_PATH: pFormatStr = OOO_STRING_SW_HTML_FF_path; break;
+ case FF_NAME_NOEXT: pFormatStr = OOO_STRING_SW_HTML_FF_name_noext; break;
default:
;
}
- bFixed = static_cast<const SwFileNameField*>(pFld)->IsFixed();
- OSL_ENSURE( pFmtStr, "unbekanntes Format fuer SwFileNameField" );
+ bFixed = static_cast<const SwFileNameField*>(pField)->IsFixed();
+ OSL_ENSURE( pFormatStr, "unbekanntes Format fuer SwFileNameField" );
break;
}
@@ -267,10 +267,10 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_subtype).
append('=').append(pSubStr);
}
- if( pFmtStr )
+ if( pFormatStr )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_format).
- append('=').append(pFmtStr);
+ append('=').append(pFormatStr);
}
if( !aName.isEmpty() )
{
@@ -288,11 +288,11 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
HTMLOutFuncs::Out_String( rWrt.Strm(), aValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
}
- if( bNumFmt )
+ if( bNumFormat )
{
- OSL_ENSURE( nFmt, "Zahlenformat ist 0" );
+ OSL_ENSURE( nFormat, "Zahlenformat ist 0" );
sOut.append(HTMLOutFuncs::CreateTableDataOptionsValNum(
- bNumValue, dNumValue, nFmt,
+ bNumValue, dNumValue, nFormat,
*rHTMLWrt.pDoc->GetNumberFormatter(), rHTMLWrt.eDestEnc,
&rHTMLWrt.aNonConvertableCharacters));
}
@@ -305,7 +305,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
}
// Inhalt des Feldes ausgeben
- OUString const sExpand( pFld->ExpandField(true) );
+ OUString const sExpand( pField->ExpandField(true) );
bool bNeedsCJKProcessing = false;
if( !sExpand.isEmpty() )
{
@@ -331,7 +331,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT,
RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT,
0 );
- rTxtNd.GetAttr( aScriptItemSet, nFldPos, nFldPos+1 );
+ rTextNd.GetAttr( aScriptItemSet, nFieldPos, nFieldPos+1 );
sal_uInt16 aWesternWhichIds[4] =
{ RES_CHRATR_FONT, RES_CHRATR_FONTSIZE,
@@ -431,34 +431,34 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
return rWrt;
}
-Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
+Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt )
{
- const SwFmtFld & rFld = static_cast<const SwFmtFld&>(rHt);
- const SwField* pFld = rFld.GetField();
- const SwFieldType* pFldTyp = pFld->GetTyp();
+ const SwFormatField & rField = static_cast<const SwFormatField&>(rHt);
+ const SwField* pField = rField.GetField();
+ const SwFieldType* pFieldTyp = pField->GetTyp();
- if( RES_SETEXPFLD == pFldTyp->Which() &&
- (nsSwGetSetExpType::GSE_STRING & pFld->GetSubType()) )
+ if( RES_SETEXPFLD == pFieldTyp->Which() &&
+ (nsSwGetSetExpType::GSE_STRING & pField->GetSubType()) )
{
- const bool bOn = pFldTyp->GetName() == "HTML_ON";
- if (!bOn && pFldTyp->GetName() != "HTML_OFF")
+ const bool bOn = pFieldTyp->GetName() == "HTML_ON";
+ if (!bOn && pFieldTyp->GetName() != "HTML_OFF")
return rWrt;
- OUString rTxt(comphelper::string::strip(pFld->GetPar2(), ' '));
+ OUString rText(comphelper::string::strip(pField->GetPar2(), ' '));
rWrt.Strm().WriteChar( '<' );
if( !bOn )
rWrt.Strm().WriteChar( '/' );
// TODO: HTML-Tags are written without entitities, that for, characters
// not contained in the destination encoding are lost!
- OString sTmp(OUStringToOString(rTxt,
+ OString sTmp(OUStringToOString(rText,
static_cast<SwHTMLWriter&>(rWrt).eDestEnc));
rWrt.Strm().WriteCharPtr( sTmp.getStr() ).WriteChar( '>' );
}
- else if( RES_POSTITFLD == pFldTyp->Which() )
+ else if( RES_POSTITFLD == pFieldTyp->Which() )
{
// Kommentare werden im ANSI-Zeichensetz, aber mit System-Zeilen-
// Umbruechen gesschrieben.
- const OUString& rComment = pFld->GetPar2();
+ const OUString& rComment = pField->GetPar2();
bool bWritten = false;
if( (rComment.getLength() >= 6 && rComment.startsWith("<") && rComment.endsWith(">") &&
@@ -506,19 +506,19 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
rWrt.Strm().WriteCharPtr( sOut.getStr() );
}
}
- else if( RES_SCRIPTFLD == pFldTyp->Which() )
+ else if( RES_SCRIPTFLD == pFieldTyp->Which() )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
if( rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine( true );
- bool bURL = static_cast<const SwScriptField *>(pFld)->IsCodeURL();
- const OUString& rType = pFld->GetPar1();
+ bool bURL = static_cast<const SwScriptField *>(pField)->IsCodeURL();
+ const OUString& rType = pField->GetPar1();
OUString aContents, aURL;
if(bURL)
- aURL = pFld->GetPar2();
+ aURL = pField->GetPar2();
else
- aContents = pFld->GetPar2();
+ aContents = pField->GetPar2();
// sonst ist es der Script-Inhalt selbst. Da nur noh JavaScript
// in Feldern landet, muss es sich um JavaSrript handeln ...:)
@@ -530,11 +530,11 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
}
else
{
- const SwTxtFld *pTxtFld = rFld.GetTxtFld();
- OSL_ENSURE( pTxtFld, "Where is the txt fld?" );
- if( pTxtFld )
- OutHTML_SwField( rWrt, pFld, pTxtFld->GetTxtNode(),
- pTxtFld->GetStart() );
+ const SwTextField *pTextField = rField.GetTextField();
+ OSL_ENSURE( pTextField, "Where is the txt fld?" );
+ if( pTextField )
+ OutHTML_SwField( rWrt, pField, pTextField->GetTextNode(),
+ pTextField->GetStart() );
}
return rWrt;
}
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 15fcdb99b92c..d7320398f63d 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -38,32 +38,32 @@ using namespace css;
SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly,
const SdrObject *pSdrObj,
sal_uInt8 nOutMode ) :
- pFrmFmt( &rPosFly.GetFmt() ),
+ pFrameFormat( &rPosFly.GetFormat() ),
pSdrObject( pSdrObj ),
pNdIdx( new SwNodeIndex( rPosFly.GetNdIndex() ) ),
nOrdNum( rPosFly.GetOrdNum() ),
- nCntntIdx( 0 ),
+ nContentIdx( 0 ),
nOutputMode( nOutMode )
{
- const SwFmtAnchor& rAnchor = rPosFly.GetFmt().GetAnchor();
+ const SwFormatAnchor& rAnchor = rPosFly.GetFormat().GetAnchor();
if ((FLY_AT_CHAR == rAnchor.GetAnchorId()) &&
HTML_POS_INSIDE == GetOutPos() )
{
// Auto-gebundene Rahmen werden ein Zeichen weiter hinten
// ausgegeben, weil dann die Positionierung mit Netscape
// uebereinstimmt.
- OSL_ENSURE( rAnchor.GetCntntAnchor(), "Keine Anker-Position?" );
- if( rAnchor.GetCntntAnchor() )
+ OSL_ENSURE( rAnchor.GetContentAnchor(), "Keine Anker-Position?" );
+ if( rAnchor.GetContentAnchor() )
{
- nCntntIdx = rAnchor.GetCntntAnchor()->nContent.GetIndex();
- sal_Int16 eHoriRel = rPosFly.GetFmt().GetHoriOrient().
+ nContentIdx = rAnchor.GetContentAnchor()->nContent.GetIndex();
+ sal_Int16 eHoriRel = rPosFly.GetFormat().GetHoriOrient().
GetRelationOrient();
if( text::RelOrientation::FRAME == eHoriRel || text::RelOrientation::PRINT_AREA == eHoriRel )
{
- const SwCntntNode *pCNd = pNdIdx->GetNode().GetCntntNode();
+ const SwContentNode *pCNd = pNdIdx->GetNode().GetContentNode();
OSL_ENSURE( pCNd, "Kein Content-Node an PaM-Position" );
- if( pCNd && nCntntIdx < pCNd->Len() )
- nCntntIdx++;
+ if( pCNd && nContentIdx < pCNd->Len() )
+ nContentIdx++;
}
}
}
@@ -73,7 +73,7 @@ bool SwHTMLPosFlyFrm::operator<( const SwHTMLPosFlyFrm& rFrm ) const
{
if( pNdIdx->GetIndex() == rFrm.pNdIdx->GetIndex() )
{
- if( nCntntIdx == rFrm.nCntntIdx )
+ if( nContentIdx == rFrm.nContentIdx )
{
if( GetOutPos() == rFrm.GetOutPos() )
return nOrdNum < rFrm.nOrdNum;
@@ -81,7 +81,7 @@ bool SwHTMLPosFlyFrm::operator<( const SwHTMLPosFlyFrm& rFrm ) const
return GetOutPos() < rFrm.GetOutPos();
}
else
- return nCntntIdx < rFrm.nCntntIdx;
+ return nContentIdx < rFrm.nContentIdx;
}
else
return pNdIdx->GetIndex() < rFrm.pNdIdx->GetIndex();
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index 3cdee81cd1ca..d3bce6bbaa46 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -24,7 +24,7 @@
#include <o3tl/sorted_vector.hxx>
class SdrObject;
-class SwFrmFmt;
+class SwFrameFormat;
class SwNodeIndex;
class SwPosFlyFrm;
@@ -84,11 +84,11 @@ extern sal_uInt8 aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS];
class SwHTMLPosFlyFrm
{
- const SwFrmFmt *pFrmFmt; // der Rahmen
+ const SwFrameFormat *pFrameFormat; // der Rahmen
const SdrObject *pSdrObject; // ggf. Sdr-Objekt
SwNodeIndex *pNdIdx; // Node-Index
sal_uInt32 nOrdNum; // Aus SwPosFlyFrm
- sal_Int32 nCntntIdx; // seine Position im Content
+ sal_Int32 nContentIdx; // seine Position im Content
sal_uInt8 nOutputMode; // Ausgabe-Infos
public:
@@ -99,12 +99,12 @@ public:
bool operator==( const SwHTMLPosFlyFrm& ) const { return false; }
bool operator<( const SwHTMLPosFlyFrm& ) const;
- const SwFrmFmt& GetFmt() const { return *pFrmFmt; }
+ const SwFrameFormat& GetFormat() const { return *pFrameFormat; }
const SdrObject *GetSdrObject() const { return pSdrObject; }
const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
- sal_Int32 GetCntntIndex() const { return nCntntIdx; }
+ sal_Int32 GetContentIndex() const { return nContentIdx; }
sal_uInt8 GetOutMode() const { return nOutputMode; }
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index ff4104f4c253..fe05420c5b31 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -126,19 +126,19 @@ const sal_uLong HTML_FRMOPTS_CNTNR =
HTML_FRMOPT_ABSSIZE |
HTML_FRMOPT_S_PIXSIZE;
-static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt );
-static Writer& OutHTML_FrmFmtAsMulticol( Writer& rWrt, const SwFrmFmt& rFmt,
+static Writer& OutHTML_FrameFormatTableNode( Writer& rWrt, const SwFrameFormat& rFrameFormat );
+static Writer& OutHTML_FrameFormatAsMulticol( Writer& rWrt, const SwFrameFormat& rFormat,
bool bInCntnr );
-static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFmt );
-static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
- const SwFrmFmt& rFrmFmt, bool bSpan );
-static Writer& OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFmt,
+static Writer& OutHTML_FrameFormatAsSpacer( Writer& rWrt, const SwFrameFormat& rFormat );
+static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
+ const SwFrameFormat& rFrameFormat, bool bSpan );
+static Writer& OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& rFormat,
bool bInCntnr );
-static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFmt,
+static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rFormat,
bool bInCntnr );
-static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+static Writer& OutHTML_FrameFormatAsMarquee( Writer& rWrt, const SwFrameFormat& rFrameFormat,
const SdrObject& rSdrObj );
extern HTMLOutEvent aAnchorEventTable[];
@@ -158,18 +158,18 @@ static HTMLOutEvent aIMapEventTable[] =
{ 0, 0, 0 }
};
-sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
+sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrameFormat& rFrameFormat,
const SdrObject*& rpSdrObj )
{
SwHTMLFrmType eType;
- if( RES_DRAWFRMFMT == rFrmFmt.Which() )
+ if( RES_DRAWFRMFMT == rFrameFormat.Which() )
{
// Als Default irgendein Zeichen-Objekt
eType = HTML_FRMTYPE_DRAW;
const SdrObject *pObj =
- SwHTMLWriter::GetMarqueeTextObj( static_cast<const SwDrawFrmFmt &>(rFrmFmt) );
+ SwHTMLWriter::GetMarqueeTextObj( static_cast<const SwDrawFrameFormat &>(rFrameFormat) );
if( pObj )
{
// Laufschrift
@@ -178,7 +178,7 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
}
else
{
- pObj = GetHTMLControl( static_cast<const SwDrawFrmFmt &>(rFrmFmt) );
+ pObj = GetHTMLControl( static_cast<const SwDrawFrameFormat &>(rFrameFormat) );
if( pObj )
{
@@ -193,8 +193,8 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
// Als Default ein Textrahmen
eType = HTML_FRMTYPE_TEXT;
- const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
- sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
+ const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+ sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex()+1;
const SwNode* pNd = pDoc->GetNodes()[ nStt ];
if( pNd->IsGrfNode() )
@@ -212,36 +212,36 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
sal_uLong nEnd = pDoc->GetNodes()[nStt-1]->EndOfSectionIndex();
const SfxPoolItem* pItem;
- const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+ const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
if( SfxItemState::SET == rItemSet.GetItemState( RES_COL,
true, &pItem ) &&
- static_cast<const SwFmtCol *>(pItem)->GetNumCols() > 1 )
+ static_cast<const SwFormatCol *>(pItem)->GetNumCols() > 1 )
{
// spaltiger Rahmen
eType = HTML_FRMTYPE_MULTICOL;
}
else if( pNd->IsTableNode() )
{
- const SwTableNode *pTblNd = pNd->GetTableNode();
- sal_uLong nTblEnd = pTblNd->EndOfSectionIndex();
+ const SwTableNode *pTableNd = pNd->GetTableNode();
+ sal_uLong nTableEnd = pTableNd->EndOfSectionIndex();
- if( nTblEnd+1 == nEnd )
+ if( nTableEnd+1 == nEnd )
{
// Tabelle
eType = HTML_FRMTYPE_TABLE;
}
- else if( nTblEnd+2 == nEnd )
+ else if( nTableEnd+2 == nEnd )
{
// Tabelle mit Unterschrft
eType = HTML_FRMTYPE_TABLE_CAP;
}
}
- else if( pNd->IsTxtNode() )
+ else if( pNd->IsTextNode() )
{
- const SwTxtNode *pTxtNd = pNd->GetTxtNode();
+ const SwTextNode *pTextNd = pNd->GetTextNode();
bool bEmpty = false;
- if( nStt==nEnd-1 && !pTxtNd->Len() )
+ if( nStt==nEnd-1 && !pTextNd->Len() )
{
// leerer Rahmen? Nur wenn kein Rahmen am
// Text- oder Start-Node verankert ist.
@@ -260,7 +260,7 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
}
if( bEmpty )
{
- SvxBrushItem aBrush = rFrmFmt.makeBackgroundBrushItem();
+ SvxBrushItem aBrush = rFrameFormat.makeBackgroundBrushItem();
/// background is not empty, if it has a background graphic
/// or its background color is not "no fill"/"auto fill".
if( GPOS_NONE != aBrush.GetGraphicPos() ||
@@ -274,9 +274,9 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
}
else if( pDoc->GetNodes()[nStt+1]->IsTableNode() )
{
- const SwTableNode *pTblNd =
+ const SwTableNode *pTableNd =
pDoc->GetNodes()[nStt+1]->GetTableNode();
- if( pTblNd->EndOfSectionIndex()+1 == nEnd )
+ if( pTableNd->EndOfSectionIndex()+1 == nEnd )
{
// Tabelle mit Ueberschrift
eType = HTML_FRMTYPE_TABLE_CAP;
@@ -294,19 +294,19 @@ void SwHTMLWriter::CollectFlyFrms()
OSL_ENSURE( HTML_CFG_MAX+1 == MAX_BROWSERS,
"number of browser configurations has changed" );
- SwPosFlyFrms aFlyPos(pDoc->GetAllFlyFmts(bWriteAll ? 0 : pCurPam, true));
+ SwPosFlyFrms aFlyPos(pDoc->GetAllFlyFormats(bWriteAll ? 0 : pCurPam, true));
for(SwPosFlyFrms::const_iterator aIter(aFlyPos.begin()); aIter != aFlyPos.end(); ++aIter)
{
- const SwFrmFmt& rFrmFmt = (*aIter)->GetFmt();
+ const SwFrameFormat& rFrameFormat = (*aIter)->GetFormat();
const SdrObject *pSdrObj = 0;
const SwPosition *pAPos;
- const SwCntntNode *pACNd;
- SwHTMLFrmType eType = (SwHTMLFrmType)GuessFrmType( rFrmFmt, pSdrObj );
+ const SwContentNode *pACNd;
+ SwHTMLFrmType eType = (SwHTMLFrmType)GuessFrmType( rFrameFormat, pSdrObj );
sal_uInt8 nMode;
- const SwFmtAnchor& rAnchor = rFrmFmt.GetAnchor();
- sal_Int16 eHoriRel = rFrmFmt.GetHoriOrient().GetRelationOrient();
+ const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
+ sal_Int16 eHoriRel = rFrameFormat.GetHoriOrient().GetRelationOrient();
switch( rAnchor.GetAnchorId() )
{
case FLY_AT_PAGE:
@@ -319,12 +319,12 @@ void SwHTMLWriter::CollectFlyFrms()
// Absatz geschrieben, wenn der Absatz einen Abstand
// hat.
if( text::RelOrientation::FRAME == eHoriRel &&
- (pAPos = rAnchor.GetCntntAnchor()) != 0 &&
- (pACNd = pAPos->nNode.GetNode().GetCntntNode()) != 0 )
+ (pAPos = rAnchor.GetContentAnchor()) != 0 &&
+ (pACNd = pAPos->nNode.GetNode().GetContentNode()) != 0 )
{
const SvxLRSpaceItem& rLRItem =
static_cast<const SvxLRSpaceItem&>(pACNd->GetAttr(RES_LR_SPACE));
- if( rLRItem.GetTxtLeft() || rLRItem.GetRight() )
+ if( rLRItem.GetTextLeft() || rLRItem.GetRight() )
{
nMode = aHTMLOutFrmParaFrameTable[eType][nExportMode];
break;
@@ -353,7 +353,7 @@ void SwHTMLWriter::CollectFlyFrms()
}
}
-bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uInt8 nPos,
+bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8 nPos,
HTMLOutContext *pContext )
{
bool bFlysLeft = false; // Noch Flys an aktueller Node-Position da?
@@ -378,7 +378,7 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uInt8 n
SwHTMLPosFlyFrm *pPosFly = (*pHTMLPosFlyFrms)[i];
if( ( HTML_POS_ANY == nPos ||
pPosFly->GetOutPos() == nPos ) &&
- pPosFly->GetCntntIndex() == nCntntIdx )
+ pPosFly->GetContentIndex() == nContentIdx )
{
// Erst entfernen ist wichtig, weil in tieferen
// Rekursionen evtl. weitere Eintraege oder das
@@ -399,7 +399,7 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uInt8 n
pContext = 0; // one time only
}
- OutFrmFmt( pPosFly->GetOutMode(), pPosFly->GetFmt(),
+ OutFrameFormat( pPosFly->GetOutMode(), pPosFly->GetFormat(),
pPosFly->GetSdrObject() );
switch( pPosFly->GetOutFn() )
{
@@ -422,7 +422,7 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uInt8 n
return bFlysLeft;
}
-void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
+void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameFormat,
const SdrObject *pSdrObject )
{
sal_uInt8 nCntnrMode = SwHTMLPosFlyFrm::GetOutCntnr( nMode );
@@ -452,7 +452,7 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
if( IsHTMLMode( HTMLMODE_BORDER_NONE ) )
nFrmFlags |= HTML_FRMOPT_S_NOBORDER;
- OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags, pSdrObject );
+ OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags, pSdrObject );
Strm().WriteChar( '>' );
if( HTML_CNTNR_DIV == nCntnrMode )
@@ -466,44 +466,44 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
{
case HTML_OUT_TBLNODE: // OK
OSL_ENSURE( !pCntnrStr, "Table: Container ist hier nicht vorgesehen" );
- OutHTML_FrmFmtTableNode( *this, rFrmFmt );
+ OutHTML_FrameFormatTableNode( *this, rFrameFormat );
break;
case HTML_OUT_GRFNODE: // OK
- OutHTML_FrmFmtGrfNode( *this, rFrmFmt, pCntnrStr != 0 );
+ OutHTML_FrameFormatGrfNode( *this, rFrameFormat, pCntnrStr != 0 );
break;
case HTML_OUT_OLENODE: // OK
- OutHTML_FrmFmtOLENode( *this, rFrmFmt, pCntnrStr != 0 );
+ OutHTML_FrameFormatOLENode( *this, rFrameFormat, pCntnrStr != 0 );
break;
case HTML_OUT_OLEGRF: // OK
- OutHTML_FrmFmtOLENodeGrf( *this, rFrmFmt, pCntnrStr != 0 );
+ OutHTML_FrameFormatOLENodeGrf( *this, rFrameFormat, pCntnrStr != 0 );
break;
case HTML_OUT_DIV:
case HTML_OUT_SPAN:
OSL_ENSURE( !pCntnrStr, "Div: Container ist hier nicht vorgesehen" );
- OutHTML_FrmFmtAsDivOrSpan( *this, rFrmFmt, HTML_OUT_SPAN==nOutMode );
+ OutHTML_FrameFormatAsDivOrSpan( *this, rFrameFormat, HTML_OUT_SPAN==nOutMode );
break;
case HTML_OUT_MULTICOL: // OK
- OutHTML_FrmFmtAsMulticol( *this, rFrmFmt, pCntnrStr != 0 );
+ OutHTML_FrameFormatAsMulticol( *this, rFrameFormat, pCntnrStr != 0 );
break;
case HTML_OUT_SPACER: // OK
OSL_ENSURE( !pCntnrStr, "Spacer: Container ist hier nicht vorgesehen" );
- OutHTML_FrmFmtAsSpacer( *this, rFrmFmt );
+ OutHTML_FrameFormatAsSpacer( *this, rFrameFormat );
break;
case HTML_OUT_CONTROL: // OK
- OutHTML_DrawFrmFmtAsControl( *this,
- static_cast<const SwDrawFrmFmt &>(rFrmFmt), dynamic_cast<const SdrUnoObj&>(*pSdrObject),
+ OutHTML_DrawFrameFormatAsControl( *this,
+ static_cast<const SwDrawFrameFormat &>(rFrameFormat), dynamic_cast<const SdrUnoObj&>(*pSdrObject),
pCntnrStr != 0 );
break;
case HTML_OUT_AMARQUEE:
- OutHTML_FrmFmtAsMarquee( *this, rFrmFmt, *pSdrObject );
+ OutHTML_FrameFormatAsMarquee( *this, rFrameFormat, *pSdrObject );
break;
case HTML_OUT_MARQUEE:
OSL_ENSURE( !pCntnrStr, "Marquee: Container ist hier nicht vorgesehen" );
- OutHTML_DrawFrmFmtAsMarquee( *this,
- static_cast<const SwDrawFrmFmt &>(rFrmFmt), *pSdrObject );
+ OutHTML_DrawFrameFormatAsMarquee( *this,
+ static_cast<const SwDrawFrameFormat &>(rFrameFormat), *pSdrObject );
break;
case HTML_OUT_GRFFRM:
- OutHTML_FrmFmtAsImage( *this, rFrmFmt, pCntnrStr != 0 );
+ OutHTML_FrameFormatAsImage( *this, rFrameFormat, pCntnrStr != 0 );
break;
}
@@ -519,26 +519,26 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, false );
}
-OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
- const OUString& rAlternateTxt,
+OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
+ const OUString& rAlternateText,
sal_uInt32 nFrmOpts,
const OString &rEndTags )
{
OString sRetEndTags(rEndTags);
OStringBuffer sOut;
const SfxPoolItem* pItem;
- const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+ const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
// Name
if( (nFrmOpts & (HTML_FRMOPT_ID|HTML_FRMOPT_NAME)) &&
- !rFrmFmt.GetName().isEmpty() )
+ !rFrameFormat.GetName().isEmpty() )
{
const sal_Char *pStr =
(nFrmOpts & HTML_FRMOPT_ID) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name;
sOut.append(' ').append(pStr).
append("=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), rFrmFmt.GetName(), eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), rFrameFormat.GetName(), eDestEnc, &aNonConvertableCharacters );
sOut.append('\"');
}
@@ -551,25 +551,25 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
}
// ALT
- if( (nFrmOpts & HTML_FRMOPT_ALT) && !rAlternateTxt.isEmpty() )
+ if( (nFrmOpts & HTML_FRMOPT_ALT) && !rAlternateText.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_alt).
append("=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), rAlternateTxt, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), rAlternateText, eDestEnc, &aNonConvertableCharacters );
sOut.append('\"');
}
// ALIGN
const sal_Char *pStr = 0;
- RndStdIds eAnchorId = rFrmFmt.GetAnchor().GetAnchorId();
+ RndStdIds eAnchorId = rFrameFormat.GetAnchor().GetAnchorId();
if( (nFrmOpts & HTML_FRMOPT_ALIGN) &&
((FLY_AT_PARA == eAnchorId) || (FLY_AT_CHAR == eAnchorId)) )
{
// MIB 12.3.98: Ist es nicht schlauer, absatzgebundene
// Rahmen notfalls links auszurichten als sie
// zeichengebunden einzufuegen???
- const SwFmtHoriOrient& rHoriOri = rFrmFmt.GetHoriOrient();
+ const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient();
if( !(nFrmOpts & HTML_FRMOPT_S_ALIGN) ||
text::RelOrientation::FRAME == rHoriOri.GetRelationOrient() ||
text::RelOrientation::PRINT_AREA == rHoriOri.GetRelationOrient() )
@@ -584,7 +584,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
(FLY_AS_CHAR == eAnchorId) ) &&
SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, true, &pItem ))
{
- switch( static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() )
+ switch( static_cast<const SwFormatVertOrient*>(pItem)->GetVertOrient() )
{
case text::VertOrientation::LINE_TOP: pStr = OOO_STRING_SVTOOLS_HTML_VA_top; break;
case text::VertOrientation::CHAR_TOP:
@@ -677,9 +677,9 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
if( (nFrmOpts & HTML_FRMOPT_SIZE) &&
SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ) &&
( (nFrmOpts & HTML_FRMOPT_ANYSIZE) ||
- ATT_FIX_SIZE == static_cast<const SwFmtFrmSize *>(pItem)->GetHeightSizeType()) )
+ ATT_FIX_SIZE == static_cast<const SwFormatFrmSize *>(pItem)->GetHeightSizeType()) )
{
- const SwFmtFrmSize *pFSItem = static_cast<const SwFmtFrmSize *>(pItem);
+ const SwFormatFrmSize *pFSItem = static_cast<const SwFormatFrmSize *>(pItem);
sal_uInt8 nPrcWidth = pFSItem->GetWidthPercent();
sal_uInt8 nPrcHeight = pFSItem->GetHeightPercent();
@@ -740,12 +740,12 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
// Umlauf fuer absatzgeb. Grafiken als <BR CLEAR=...> in den String
// schreiben
if( (nFrmOpts & HTML_FRMOPT_BRCLEAR) &&
- ((FLY_AT_PARA == rFrmFmt.GetAnchor().GetAnchorId()) ||
- (FLY_AT_CHAR == rFrmFmt.GetAnchor().GetAnchorId())) &&
+ ((FLY_AT_PARA == rFrameFormat.GetAnchor().GetAnchorId()) ||
+ (FLY_AT_CHAR == rFrameFormat.GetAnchor().GetAnchorId())) &&
SfxItemState::SET == rItemSet.GetItemState( RES_SURROUND, true, &pItem ))
{
- const SwFmtSurround* pSurround = static_cast<const SwFmtSurround*>(pItem);
- sal_Int16 eHoriOri = rFrmFmt.GetHoriOrient().GetHoriOrient();
+ const SwFormatSurround* pSurround = static_cast<const SwFormatSurround*>(pItem);
+ sal_Int16 eHoriOri = rFrameFormat.GetHoriOrient().GetHoriOrient();
pStr = 0;
SwSurround eSurround = pSurround->GetSurround();
bool bAnchorOnly = pSurround->IsAnchorOnly();
@@ -805,17 +805,17 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
return sRetEndTags;
}
-void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rFrmFmt, const OUString& rAlternateText, sal_uInt32 nFrameOptions)
+void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAlternateText, sal_uInt32 nFrameOptions)
{
const SfxPoolItem* pItem;
- const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+ const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
// Name
if( (nFrameOptions & (HTML_FRMOPT_ID|HTML_FRMOPT_NAME)) &&
- !rFrmFmt.GetName().isEmpty() )
+ !rFrameFormat.GetName().isEmpty() )
{
const sal_Char* pAttributeName = (nFrameOptions & HTML_FRMOPT_ID) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name;
- aHtml.attribute(pAttributeName, rFrmFmt.GetName());
+ aHtml.attribute(pAttributeName, rFrameFormat.GetName());
}
// Name
@@ -834,11 +834,11 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF
// align
const sal_Char* pAlignString = 0;
- RndStdIds eAnchorId = rFrmFmt.GetAnchor().GetAnchorId();
+ RndStdIds eAnchorId = rFrameFormat.GetAnchor().GetAnchorId();
if( (nFrameOptions & HTML_FRMOPT_ALIGN) &&
((FLY_AT_PARA == eAnchorId) || (FLY_AT_CHAR == eAnchorId)) )
{
- const SwFmtHoriOrient& rHoriOri = rFrmFmt.GetHoriOrient();
+ const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient();
if( !(nFrameOptions & HTML_FRMOPT_S_ALIGN) ||
text::RelOrientation::FRAME == rHoriOri.GetRelationOrient() ||
text::RelOrientation::PRINT_AREA == rHoriOri.GetRelationOrient() )
@@ -853,7 +853,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF
(FLY_AS_CHAR == eAnchorId) ) &&
SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, true, &pItem ))
{
- switch( static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() )
+ switch( static_cast<const SwFormatVertOrient*>(pItem)->GetVertOrient() )
{
case text::VertOrientation::LINE_TOP: pAlignString = OOO_STRING_SVTOOLS_HTML_VA_top; break;
case text::VertOrientation::CHAR_TOP:
@@ -943,9 +943,9 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF
if( (nFrameOptions & HTML_FRMOPT_SIZE) &&
SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ) &&
( (nFrameOptions & HTML_FRMOPT_ANYSIZE) ||
- ATT_FIX_SIZE == static_cast<const SwFmtFrmSize *>(pItem)->GetHeightSizeType()) )
+ ATT_FIX_SIZE == static_cast<const SwFormatFrmSize *>(pItem)->GetHeightSizeType()) )
{
- const SwFmtFrmSize *pFSItem = static_cast<const SwFmtFrmSize *>(pItem);
+ const SwFormatFrmSize *pFSItem = static_cast<const SwFormatFrmSize *>(pItem);
sal_uInt8 nPrcWidth = pFSItem->GetWidthPercent();
sal_uInt8 nPrcHeight = pFSItem->GetHeightPercent();
@@ -1002,14 +1002,14 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF
// schreiben
if( (nFrameOptions & HTML_FRMOPT_BRCLEAR) &&
- ((FLY_AT_PARA == rFrmFmt.GetAnchor().GetAnchorId()) ||
- (FLY_AT_CHAR == rFrmFmt.GetAnchor().GetAnchorId())) &&
+ ((FLY_AT_PARA == rFrameFormat.GetAnchor().GetAnchorId()) ||
+ (FLY_AT_CHAR == rFrameFormat.GetAnchor().GetAnchorId())) &&
SfxItemState::SET == rItemSet.GetItemState( RES_SURROUND, true, &pItem ))
{
const sal_Char* pSurroundString = 0;
- const SwFmtSurround* pSurround = static_cast<const SwFmtSurround*>(pItem);
- sal_Int16 eHoriOri = rFrmFmt.GetHoriOrient().GetHoriOrient();
+ const SwFormatSurround* pSurround = static_cast<const SwFormatSurround*>(pItem);
+ sal_Int16 eHoriOri = rFrameFormat.GetHoriOrient().GetHoriOrient();
SwSurround eSurround = pSurround->GetSurround();
bool bAnchorOnly = pSurround->IsAnchorOnly();
switch( eHoriOri )
@@ -1067,8 +1067,8 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF
namespace
{
-OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, const SwFrmFmt& rFrmFmt,
- const Size& rRealSize, const ImageMap* pAltImgMap, const SwFmtURL*& pURLItem)
+OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, const SwFrameFormat& rFrameFormat,
+ const Size& rRealSize, const ImageMap* pAltImgMap, const SwFormatURL*& pURLItem)
{
OUString aIMapName;
@@ -1078,7 +1078,7 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
// uebergeben wurde
if (!pAltImgMap && SfxItemState::SET == rItemSet.GetItemState( RES_URL, true, &pItem))
{
- pURLItem = static_cast<const SwFmtURL*>( pItem);
+ pURLItem = static_cast<const SwFormatURL*>( pItem);
}
// Image-Map rausschreiben
@@ -1126,8 +1126,8 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
Fraction aScaleX(1, 1);
Fraction aScaleY(1, 1);
- const SwFmtFrmSize& rFrmSize = rFrmFmt.GetFrmSize();
- const SvxBoxItem& rBox = rFrmFmt.GetBox();
+ const SwFormatFrmSize& rFrmSize = rFrameFormat.GetFrmSize();
+ const SvxBoxItem& rBox = rFrameFormat.GetBox();
if (!rFrmSize.GetWidthPercent() && rRealSize.Width())
{
@@ -1202,8 +1202,8 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
}
-Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
- Graphic& rGraphic, const OUString& rAlternateTxt,
+Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
+ Graphic& rGraphic, const OUString& rAlternateText,
const Size &rRealSize, sal_uInt32 nFrmOpts,
const sal_Char *pMarkType,
const ImageMap *pAltImgMap )
@@ -1214,17 +1214,17 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
return rHTMLWrt;
// ggf. ein noch offenes Attribut voruebergehend beenden
- if( !rHTMLWrt.aINetFmts.empty() )
+ if( !rHTMLWrt.aINetFormats.empty() )
{
- SwFmtINetFmt* pINetFmt = rHTMLWrt.aINetFmts.back();
- OutHTML_INetFmt( rWrt, *pINetFmt, false );
+ SwFormatINetFormat* pINetFormat = rHTMLWrt.aINetFormats.back();
+ OutHTML_INetFormat( rWrt, *pINetFormat, false );
}
const SfxPoolItem* pItem;
- const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+ const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
- const SwFmtURL* pURLItem = 0;
- OUString aIMapName = lclWriteOutImap(rHTMLWrt, rItemSet, rFrmFmt, rRealSize, pAltImgMap, pURLItem);
+ const SwFormatURL* pURLItem = 0;
+ OUString aIMapName = lclWriteOutImap(rHTMLWrt, rItemSet, rFrameFormat, rRealSize, pAltImgMap, pURLItem);
// put img into new line
if( rHTMLWrt.bLFPossible )
@@ -1233,9 +1233,9 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
HtmlWriter aHtml(rWrt.Strm());
// <a name=...></a>...<img ...>
- if( pMarkType && !rFrmFmt.GetName().isEmpty() )
+ if( pMarkType && !rFrameFormat.GetName().isEmpty() )
{
- rHTMLWrt.OutImplicitMark( rFrmFmt.GetName(), pMarkType );
+ rHTMLWrt.OutImplicitMark( rFrameFormat.GetName(), pMarkType );
}
// URL -> <a>...<img ... >...</a>
@@ -1382,9 +1382,9 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
}
// alt, align, width, height, hspace, vspace
- rHTMLWrt.writeFrameFormatOptions(aHtml, rFrmFmt, rAlternateTxt, nFrmOpts);
+ rHTMLWrt.writeFrameFormatOptions(aHtml, rFrameFormat, rAlternateText, nFrmOpts);
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) )
- rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts );
+ rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmOpts );
if( nFrmOpts & HTML_FRMOPT_BORDER )
{
@@ -1403,12 +1403,12 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
aHtml.flushStack();
- if( !rHTMLWrt.aINetFmts.empty() )
+ if( !rHTMLWrt.aINetFormats.empty() )
{
// es ist noch ein Attribut auf dem Stack, das wieder geoeffnet
// werden muss
- SwFmtINetFmt *pINetFmt = rHTMLWrt.aINetFmts.back();
- OutHTML_INetFmt( rWrt, *pINetFmt, true );
+ SwFormatINetFormat *pINetFormat = rHTMLWrt.aINetFormats.back();
+ OutHTML_INetFormat( rWrt, *pINetFormat, true );
}
return rHTMLWrt;
@@ -1453,12 +1453,12 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
return rWrt;
}
-static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
+static Writer& OutHTML_FrameFormatTableNode( Writer& rWrt, const SwFrameFormat& rFrameFormat )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
- sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
+ const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+ sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex()+1;
sal_uLong nEnd = rHTMLWrt.pDoc->GetNodes()[nStt-1]->EndOfSectionIndex();
OUString aCaption;
@@ -1466,43 +1466,43 @@ static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
// Nicht const, weil GetTable spater mal nicht const ist
SwNode *pNd = rHTMLWrt.pDoc->GetNodes()[ nStt ];
- SwTableNode *pTblNd = pNd->GetTableNode();
- const SwTxtNode *pTxtNd = pNd->GetTxtNode();
- if( !pTblNd && pTxtNd )
+ SwTableNode *pTableNd = pNd->GetTableNode();
+ const SwTextNode *pTextNd = pNd->GetTextNode();
+ if( !pTableNd && pTextNd )
{
// Tabelle mit Ueberschrift
bTopCaption = true;
- pTblNd = rHTMLWrt.pDoc->GetNodes()[nStt+1]->GetTableNode();
+ pTableNd = rHTMLWrt.pDoc->GetNodes()[nStt+1]->GetTableNode();
}
- OSL_ENSURE( pTblNd, "Rahmen enthaelt keine Tabelle" );
- if( pTblNd )
+ OSL_ENSURE( pTableNd, "Rahmen enthaelt keine Tabelle" );
+ if( pTableNd )
{
- sal_uLong nTblEnd = pTblNd->EndOfSectionIndex();
- OSL_ENSURE( nTblEnd == nEnd - 1 ||
- (nTblEnd == nEnd - 2 && !bTopCaption),
+ sal_uLong nTableEnd = pTableNd->EndOfSectionIndex();
+ OSL_ENSURE( nTableEnd == nEnd - 1 ||
+ (nTableEnd == nEnd - 2 && !bTopCaption),
"Ungeuelter Rahmen-Inhalt fuer Tabelle" );
- if( nTblEnd == nEnd - 2 )
- pTxtNd = rHTMLWrt.pDoc->GetNodes()[nTblEnd+1]->GetTxtNode();
+ if( nTableEnd == nEnd - 2 )
+ pTextNd = rHTMLWrt.pDoc->GetNodes()[nTableEnd+1]->GetTextNode();
}
- if( pTxtNd )
- aCaption = pTxtNd->GetTxt();
+ if( pTextNd )
+ aCaption = pTextNd->GetText();
- if( pTblNd )
+ if( pTableNd )
{
- HTMLSaveData aSaveData( rHTMLWrt, pTblNd->GetIndex()+1,
- pTblNd->EndOfSectionIndex(),
- true, &rFrmFmt );
+ HTMLSaveData aSaveData( rHTMLWrt, pTableNd->GetIndex()+1,
+ pTableNd->EndOfSectionIndex(),
+ true, &rFrameFormat );
rHTMLWrt.bOutFlyFrame = true;
- OutHTML_SwTblNode( rHTMLWrt, *pTblNd, &rFrmFmt, &aCaption,
+ OutHTML_SwTableNode( rHTMLWrt, *pTableNd, &rFrameFormat, &aCaption,
bTopCaption );
}
return rWrt;
}
-static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
- const SwFrmFmt& rFrmFmt,
+static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt,
+ const SwFrameFormat& rFrameFormat,
bool bInCntnr )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1519,10 +1519,10 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_multicol);
- const SwFmtCol& rFmtCol = rFrmFmt.GetCol();
+ const SwFormatCol& rFormatCol = rFrameFormat.GetCol();
// die Anzahl der Spalten als COLS ausgeben
- sal_uInt16 nCols = rFmtCol.GetNumCols();
+ sal_uInt16 nCols = rFormatCol.GetNumCols();
if( nCols )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_cols).
@@ -1530,7 +1530,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
}
// die Gutter-Breite (Minimalwert) als GUTTER
- sal_uInt16 nGutter = rFmtCol.GetGutterWidth( true );
+ sal_uInt16 nGutter = rFormatCol.GetGutterWidth( true );
if( nGutter!=USHRT_MAX )
{
if( nGutter && Application::GetDefaultDevice() )
@@ -1550,17 +1550,17 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
: HTML_FRMOPTS_MULTICOL;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
nFrmFlags |= HTML_FRMOPTS_MULTICOL_CSS1;
- rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, nFrmFlags );
+ rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrmFlags );
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
- rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
+ rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags );
rWrt.Strm().WriteChar( '>' );
rHTMLWrt.bLFPossible = true;
rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken;
- const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
- sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
+ const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+ sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex();
const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode();
OSL_ENSURE( pSttNd, "Wo ist der Start-Node" );
@@ -1569,7 +1569,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
// wieder hergestellt wird.
HTMLSaveData aSaveData( rHTMLWrt, nStt+1,
pSttNd->EndOfSectionIndex(),
- true, &rFrmFmt );
+ true, &rFrameFormat );
rHTMLWrt.bOutFlyFrame = true;
rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
}
@@ -1583,7 +1583,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
return rWrt;
}
-static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
+static Writer& OutHTML_FrameFormatAsSpacer( Writer& rWrt, const SwFrameFormat& rFrameFormat )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1598,7 +1598,7 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// ALIGN, WIDTH, HEIGHT
- OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, HTML_FRMOPTS_SPACER );
+ OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, HTML_FRMOPTS_SPACER );
rWrt.Strm().WriteChar( '>' );
if( !aEndTags.isEmpty() )
@@ -1607,8 +1607,8 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
return rWrt;
}
-static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
- const SwFrmFmt& rFrmFmt, bool bSpan)
+static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
+ const SwFrameFormat& rFrameFormat, bool bSpan)
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1635,15 +1635,15 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
sal_uLong nFrmFlags = HTML_FRMOPTS_DIV;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) )
nFrmFlags |= HTML_FRMOPT_S_NOBORDER;
- OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, nFrmFlags );
- rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
+ OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrmFlags );
+ rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags );
rWrt.Strm().WriteChar( '>' );
rHTMLWrt.IncIndentLevel(); // den Inhalt einruecken
rHTMLWrt.bLFPossible = true;
- const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
- sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
+ const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+ sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex();
// Am Start-Node verankerte Rahmen-gebundene Rahmen ausgeben
rHTMLWrt.OutFlyFrm( nStt, 0, HTML_POS_ANY );
@@ -1656,7 +1656,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
// wieder hergestellt wird.
HTMLSaveData aSaveData( rHTMLWrt, nStt+1,
pSttNd->EndOfSectionIndex(),
- true, &rFrmFmt );
+ true, &rFrameFormat );
rHTMLWrt.bOutFlyFrame = true;
rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
}
@@ -1672,7 +1672,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
return rWrt;
}
-static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+static Writer & OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& rFrameFormat,
bool /*bInCntnr*/ )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1681,16 +1681,16 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt,
return rWrt;
ImageMap aIMap;
- Graphic aGraphic( ((SwFrmFmt &)rFrmFmt).MakeGraphic( &aIMap ) );
+ Graphic aGraphic( ((SwFrameFormat &)rFrameFormat).MakeGraphic( &aIMap ) );
Size aSz( 0, 0 );
- OutHTML_Image( rWrt, rFrmFmt, aGraphic, rFrmFmt.GetName(), aSz,
+ OutHTML_Image( rWrt, rFrameFormat, aGraphic, rFrameFormat.GetName(), aSz,
HTML_FRMOPTS_GENIMG, "frame",
aIMap.GetIMapObjectCount() ? &aIMap : 0 );
return rWrt;
}
-static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rFrameFormat,
bool bInCntnr )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1698,8 +1698,8 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
if (rHTMLWrt.mbSkipImages)
return rWrt;
- const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
- sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
+ const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+ sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex()+1;
SwGrfNode *pGrfNd = rHTMLWrt.pDoc->GetNodes()[ nStt ]->GetGrfNode();
OSL_ENSURE( pGrfNd, "Grf-Node erwartet" );
if( !pGrfNd )
@@ -1710,43 +1710,43 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
nFrmFlags |= HTML_FRMOPTS_IMG_CSS1;
Graphic aGraphic = pGrfNd->GetGraphic();
- OutHTML_Image( rWrt, rFrmFmt, aGraphic, pGrfNd->GetTitle(),
+ OutHTML_Image( rWrt, rFrameFormat, aGraphic, pGrfNd->GetTitle(),
pGrfNd->GetTwipSize(), nFrmFlags, "graphic" );
return rWrt;
}
-static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+static Writer& OutHTML_FrameFormatAsMarquee( Writer& rWrt, const SwFrameFormat& rFrameFormat,
const SdrObject& rSdrObj )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
// die Edit-Engine-Attribute des Objekts als SW-Attribute holen
// und als Hints einsortieren
- const SfxItemSet& rFmtItemSet = rFrmFmt.GetAttrSet();
- SfxItemSet aItemSet( *rFmtItemSet.GetPool(), RES_CHRATR_BEGIN,
+ const SfxItemSet& rFormatItemSet = rFrameFormat.GetAttrSet();
+ SfxItemSet aItemSet( *rFormatItemSet.GetPool(), RES_CHRATR_BEGIN,
RES_CHRATR_END );
SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, &rSdrObj, true );
bool bCfgOutStylesOld = rHTMLWrt.bCfgOutStyles;
rHTMLWrt.bCfgOutStyles = false;
- rHTMLWrt.bTxtAttr = true;
+ rHTMLWrt.bTextAttr = true;
rHTMLWrt.bTagOn = true;
Out_SfxItemSet( aHTMLAttrFnTab, rWrt, aItemSet, false );
- rHTMLWrt.bTxtAttr = false;
+ rHTMLWrt.bTextAttr = false;
- OutHTML_DrawFrmFmtAsMarquee( rHTMLWrt,
- static_cast<const SwDrawFrmFmt &>(rFrmFmt),
+ OutHTML_DrawFrameFormatAsMarquee( rHTMLWrt,
+ static_cast<const SwDrawFrameFormat &>(rFrameFormat),
rSdrObj );
- rHTMLWrt.bTxtAttr = true;
+ rHTMLWrt.bTextAttr = true;
rHTMLWrt.bTagOn = false;
Out_SfxItemSet( aHTMLAttrFnTab, rWrt, aItemSet, false );
- rHTMLWrt.bTxtAttr = false;
+ rHTMLWrt.bTextAttr = false;
rHTMLWrt.bCfgOutStyles = bCfgOutStylesOld;
return rWrt;
}
-Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrameFormat& rFrameFormat,
bool bHeader )
{
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1764,7 +1764,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
// Einen Spacer fuer den Absatnd zusammenbasteln. Da durch das
// <DL> bzw. </DL> immer einer Absatz-Abstand entsteht, wird der
// ggf. abgezogen.
- const SvxULSpaceItem& rULSpace = rFrmFmt.GetULSpace();
+ const SvxULSpaceItem& rULSpace = rFrameFormat.GetULSpace();
sal_uInt16 nSize = bHeader ? rULSpace.GetLower() : rULSpace.GetUpper();
rHTMLWrt.nHeaderFooterSpace = nSize;
@@ -1784,8 +1784,8 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
makeStringAndClear();
}
- const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
- sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
+ const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+ sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex();
const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode();
OSL_ENSURE( pSttNd, "Wo ist der Start-Node" );
@@ -1797,7 +1797,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
{
// in einem Block damit rechtzeitig vor dem Ende der alte Zustand
- // wieder hergestellt wird. pFlyFmt braucht hier nicht gestzt zu
+ // wieder hergestellt wird. pFlyFormat braucht hier nicht gestzt zu
// werden, denn PageDesc-Attribute koennen hier nicht vorkommen
HTMLSaveData aSaveData( rHTMLWrt, nStt+1,
pSttNd->EndOfSectionIndex() );
@@ -1911,29 +1911,29 @@ void SwHTMLWriter::AddLinkTarget( const OUString& rURL )
void SwHTMLWriter::CollectLinkTargets()
{
- const SwFmtINetFmt* pINetFmt;
- const SwTxtINetFmt* pTxtAttr;
+ const SwFormatINetFormat* pINetFormat;
+ const SwTextINetFormat* pTextAttr;
sal_uInt32 n, nMaxItems = pDoc->GetAttrPool().GetItemCount2( RES_TXTATR_INETFMT );
for( n = 0; n < nMaxItems; ++n )
{
- const SwTxtNode* pTxtNd;
+ const SwTextNode* pTextNd;
- if( 0 != (pINetFmt = static_cast<const SwFmtINetFmt*>(pDoc->GetAttrPool().GetItem2(
+ if( 0 != (pINetFormat = static_cast<const SwFormatINetFormat*>(pDoc->GetAttrPool().GetItem2(
RES_TXTATR_INETFMT, n ) ) ) &&
- 0 != ( pTxtAttr = pINetFmt->GetTxtINetFmt()) &&
- 0 != ( pTxtNd = pTxtAttr->GetpTxtNode() ) &&
- pTxtNd->GetNodes().IsDocNodes() )
+ 0 != ( pTextAttr = pINetFormat->GetTextINetFormat()) &&
+ 0 != ( pTextNd = pTextAttr->GetpTextNode() ) &&
+ pTextNd->GetNodes().IsDocNodes() )
{
- AddLinkTarget( pINetFmt->GetValue() );
+ AddLinkTarget( pINetFormat->GetValue() );
}
}
- const SwFmtURL *pURL;
+ const SwFormatURL *pURL;
nMaxItems = pDoc->GetAttrPool().GetItemCount2( RES_URL );
for( n = 0; n < nMaxItems; ++n )
{
- if( 0 != (pURL = static_cast<const SwFmtURL*>(pDoc->GetAttrPool().GetItem2(
+ if( 0 != (pURL = static_cast<const SwFormatURL*>(pDoc->GetAttrPool().GetItem2(
RES_URL, n ) ) ) )
{
AddLinkTarget( pURL->GetURL() );
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 13469b1569f1..1f5dd09da113 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -280,11 +280,11 @@ const uno::Reference< drawing::XDrawPage >& SwHTMLForm_Impl::GetDrawPage()
{
if( !xDrawPage.is() && pDocSh )
{
- uno::Reference< drawing::XDrawPageSupplier > xTxtDoc( pDocSh->GetBaseModel(),
+ uno::Reference< drawing::XDrawPageSupplier > xTextDoc( pDocSh->GetBaseModel(),
UNO_QUERY );
- OSL_ENSURE( xTxtDoc.is(),
+ OSL_ENSURE( xTextDoc.is(),
"drawing::XDrawPageSupplier nicht vom XModel erhalten" );
- xDrawPage = xTxtDoc->getDrawPage();
+ xDrawPage = xTextDoc->getDrawPage();
OSL_ENSURE( xDrawPage.is(), "drawing::XDrawPage nicht erhalten" );
}
return xDrawPage;
@@ -517,19 +517,19 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
OSL_ENSURE( pSwShape, "Wo ist das SW-Shape?" );
if( pSwShape )
{
- SwFrmFmt *pFrmFmt = pSwShape->GetFrmFmt();
+ SwFrameFormat *pFrameFormat = pSwShape->GetFrameFormat();
- const SwDoc *pDoc = pFrmFmt->GetDoc();
- const SwPosition* pAPos = pFrmFmt->GetAnchor().GetCntntAnchor();
+ const SwDoc *pDoc = pFrameFormat->GetDoc();
+ const SwPosition* pAPos = pFrameFormat->GetAnchor().GetContentAnchor();
SwNode *pANd;
- SwTableNode *pTblNd;
+ SwTableNode *pTableNd;
if( pAPos &&
0 != (pANd = & pAPos->nNode.GetNode()) &&
- 0 != (pTblNd = pANd->FindTableNode()) )
+ 0 != (pTableNd = pANd->FindTableNode()) )
{
- const bool bLastGrf = !pTblNd->GetTable().DecGrfsThatResize();
+ const bool bLastGrf = !pTableNd->GetTable().DecGrfsThatResize();
SwHTMLTableLayout *pLayout =
- pTblNd->GetTable().GetHTMLTableLayout();
+ pTableNd->GetTable().GetHTMLTableLayout();
if( pLayout )
{
const sal_uInt16 nBrowseWidth =
@@ -678,11 +678,11 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha
OSL_ENSURE( pSwShape, "Wo ist das SW-Shape?" );
// es muss ein Draw-Format sein
- SwFrmFmt *pFrmFmt = pSwShape ? pSwShape->GetFrmFmt() : NULL ;
- OSL_ENSURE( pFrmFmt && RES_DRAWFRMFMT == pFrmFmt->Which(), "Kein DrawFrmFmt" );
+ SwFrameFormat *pFrameFormat = pSwShape ? pSwShape->GetFrameFormat() : NULL ;
+ OSL_ENSURE( pFrameFormat && RES_DRAWFRMFMT == pFrameFormat->Which(), "Kein DrawFrameFormat" );
// Schauen, ob es ein SdrObject dafuer gibt
- const SdrObject *pObj = pFrmFmt ? pFrmFmt->FindSdrObject() : NULL;
+ const SdrObject *pObj = pFrameFormat ? pFrameFormat->FindSdrObject() : NULL;
OSL_ENSURE( pObj, "SdrObject nicht gefunden" );
OSL_ENSURE( pObj && FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" );
@@ -755,9 +755,9 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha
static void lcl_html_setEvents(
const uno::Reference< script::XEventAttacherManager > & rEvtMn,
- sal_uInt32 nPos, const SvxMacroTableDtor& rMacroTbl,
- const std::vector<OUString>& rUnoMacroTbl,
- const std::vector<OUString>& rUnoMacroParamTbl,
+ sal_uInt32 nPos, const SvxMacroTableDtor& rMacroTable,
+ const std::vector<OUString>& rUnoMacroTable,
+ const std::vector<OUString>& rUnoMacroParamTable,
const OUString& rType )
{
// Erstmal muss die Anzahl der Events ermittelt werden ...
@@ -766,15 +766,15 @@ static void lcl_html_setEvents(
for( i = 0; HTML_ET_END != aEventTypeTable[i]; i++ )
{
- const SvxMacro *pMacro = rMacroTbl.Get( aEventTypeTable[i] );
+ const SvxMacro *pMacro = rMacroTable.Get( aEventTypeTable[i] );
// Solange nicht alle Events implementiert sind, enthaelt die
// Tabelle auch Leerstrings!
if( pMacro && aEventListenerTable[i] )
nEvents++;
}
- for( i=0; i< rUnoMacroTbl.size(); i++ )
+ for( i=0; i< rUnoMacroTable.size(); i++ )
{
- const OUString& rStr(rUnoMacroTbl[i]);
+ const OUString& rStr(rUnoMacroTable[i]);
sal_Int32 nIndex = 0;
if( rStr.getToken( 0, '-', nIndex ).isEmpty() || -1 == nIndex )
continue;
@@ -793,7 +793,7 @@ static void lcl_html_setEvents(
for( i=0; HTML_ET_END != aEventTypeTable[i]; i++ )
{
- const SvxMacro *pMacro = rMacroTbl.Get( aEventTypeTable[i] );
+ const SvxMacro *pMacro = rMacroTable.Get( aEventTypeTable[i] );
if( pMacro && aEventListenerTable[i] )
{
script::ScriptEventDescriptor& rDesc = pDescs[nEvent++];
@@ -805,9 +805,9 @@ static void lcl_html_setEvents(
}
}
- for( i=0; i< rUnoMacroTbl.size(); ++i )
+ for( i=0; i< rUnoMacroTable.size(); ++i )
{
- const OUString& rStr = rUnoMacroTbl[i];
+ const OUString& rStr = rUnoMacroTable[i];
sal_Int32 nIndex = 0;
OUString sListener( rStr.getToken( 0, '-', nIndex ) );
if( sListener.isEmpty() || -1 == nIndex )
@@ -828,14 +828,14 @@ static void lcl_html_setEvents(
rDesc.ScriptCode = sCode;
rDesc.AddListenerParam.clear();
- if(!rUnoMacroParamTbl.empty())
+ if(!rUnoMacroParamTable.empty())
{
OUString sSearch( sListener );
sSearch += "-" +sMethod + "-";
sal_Int32 nLen = sSearch.getLength();
- for(size_t j = 0; j < rUnoMacroParamTbl.size(); ++j)
+ for(size_t j = 0; j < rUnoMacroParamTable.size(); ++j)
{
- const OUString& rParam = rUnoMacroParamTbl[j];
+ const OUString& rParam = rUnoMacroParamTable[j];
if( rParam.startsWith( sSearch ) && rParam.getLength() > nLen )
{
rDesc.AddListenerParam = rParam.copy(nLen);
@@ -848,20 +848,20 @@ static void lcl_html_setEvents(
}
static void lcl_html_getEvents( const OUString& rOption, const OUString& rValue,
- std::vector<OUString>& rUnoMacroTbl,
- std::vector<OUString>& rUnoMacroParamTbl )
+ std::vector<OUString>& rUnoMacroTable,
+ std::vector<OUString>& rUnoMacroParamTable )
{
if( rOption.startsWithIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_sdevent ) )
{
OUString aEvent( rOption.copy( strlen( OOO_STRING_SVTOOLS_HTML_O_sdevent ) ) );
aEvent += "-" + rValue;
- rUnoMacroTbl.push_back(aEvent);
+ rUnoMacroTable.push_back(aEvent);
}
else if( rOption.startsWithIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_sdaddparam ) )
{
OUString aParam( rOption.copy( strlen( OOO_STRING_SVTOOLS_HTML_O_sdaddparam ) ) );
aParam += "-" + rValue;
- rUnoMacroParamTbl.push_back(aParam);
+ rUnoMacroParamTable.push_back(aParam);
}
}
@@ -870,8 +870,8 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
const uno::Reference< beans::XPropertySet > & rFCompPropSet,
const Size& rSize, sal_Int16 eVertOri, sal_Int16 eHoriOri,
SfxItemSet& rCSS1ItemSet, SvxCSS1PropertyInfo& rCSS1PropInfo,
- const SvxMacroTableDtor& rMacroTbl, const std::vector<OUString>& rUnoMacroTbl,
- const std::vector<OUString>& rUnoMacroParamTbl, bool bSetFCompPropSet,
+ const SvxMacroTableDtor& rMacroTable, const std::vector<OUString>& rUnoMacroTable,
+ const std::vector<OUString>& rUnoMacroParamTable, bool bSetFCompPropSet,
bool bHidden )
{
uno::Reference< drawing::XShape > xShape;
@@ -916,7 +916,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
// Ggf. den Erstzeilen-Einzug noch plaetten
const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
SvxLRSpaceItem aLRItem( *pLRItem );
- aLRItem.SetTxtFirstLineOfst( 0 );
+ aLRItem.SetTextFirstLineOfst( 0 );
if( rCSS1PropInfo.bLeftMargin )
{
nLeftSpace = static_cast< sal_uInt16 >(convertTwipToMm100( aLRItem.GetLeft() ));
@@ -1081,7 +1081,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- uno::Reference< text::XTextRange > xTxtRg;
+ uno::Reference< text::XTextRange > xTextRg;
sal_Int16 nAnchorType = text::TextContentAnchorType_AS_CHARACTER;
bool bSetPos = false, bSetSurround = false;
sal_Int32 nXPos = 0, nYPos = 0;
@@ -1098,8 +1098,8 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
nAnchorType = text::TextContentAnchorType_AT_FRAME;
SwPaM aPaM( *pFlySttNd );
- uno::Reference< text::XText > xDummyTxtRef; // unsauber, aber laut OS geht das ...
- xTxtRg = new SwXTextRange( aPaM, xDummyTxtRef );
+ uno::Reference< text::XText > xDummyTextRef; // unsauber, aber laut OS geht das ...
+ xTextRg = new SwXTextRange( aPaM, xDummyTextRef );
}
else
{
@@ -1173,13 +1173,13 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
}
else
{
- if( !xTxtRg.is() )
+ if( !xTextRg.is() )
{
- uno::Reference< text::XText > xDummyTxtRef; // unsauber, aber laut OS geht das ...
- xTxtRg = new SwXTextRange( *pPam, xDummyTxtRef );
+ uno::Reference< text::XText > xDummyTextRef; // unsauber, aber laut OS geht das ...
+ xTextRg = new SwXTextRange( *pPam, xDummyTextRef );
}
- aTmp.setValue( &xTxtRg,
+ aTmp.setValue( &xTextRg,
cppu::UnoType<text::XTextRange>::get());
xShapePropSet->setPropertyValue("TextRange", aTmp );
}
@@ -1214,11 +1214,11 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
// auch schon Fokus-Events verschickt. Damit die nicht evtl. schon
// vorhendene JavaSCript-Eents rufen, werden die Events nachtraeglich
// gesetzt.
- if( !rMacroTbl.empty() || !rUnoMacroTbl.empty() )
+ if( !rMacroTable.empty() || !rUnoMacroTable.empty() )
{
lcl_html_setEvents( pFormImpl->GetControlEventManager(),
rFormComps->getCount() - 1,
- rMacroTbl, rUnoMacroTbl, rUnoMacroParamTbl,
+ rMacroTable, rUnoMacroTable, rUnoMacroParamTable,
GetScriptTypeString(pFormImpl->GetHeaderAttrs()) );
}
@@ -1239,7 +1239,7 @@ void SwHTMLParser::NewForm( bool bAppend )
if( bAppend )
{
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( AM_SPACE );
+ AppendTextNode( AM_SPACE );
else
AddParSpace();
}
@@ -1251,9 +1251,9 @@ void SwHTMLParser::NewForm( bool bAppend )
OUString sName, sTarget;
sal_uInt16 nEncType = FormSubmitEncoding_URL;
sal_uInt16 nMethod = FormSubmitMethod_GET;
- SvxMacroTableDtor aMacroTbl;
- std::vector<OUString> aUnoMacroTbl;
- std::vector<OUString> aUnoMacroParamTbl;
+ SvxMacroTableDtor aMacroTable;
+ std::vector<OUString> aUnoMacroTable;
+ std::vector<OUString> aUnoMacroParamTable;
SvKeyValueIterator *pHeaderAttrs = pFormImpl->GetHeaderAttrs();
ScriptType eDfltScriptType = GetScriptType( pHeaderAttrs );
const OUString& rDfltScriptType = GetScriptTypeString( pHeaderAttrs );
@@ -1303,7 +1303,7 @@ void SwHTMLParser::NewForm( bool bAppend )
default:
lcl_html_getEvents( rOption.GetTokenString(),
rOption.GetString(),
- aUnoMacroTbl, aUnoMacroParamTbl );
+ aUnoMacroTable, aUnoMacroParamTable );
break;
}
@@ -1316,7 +1316,7 @@ void SwHTMLParser::NewForm( bool bAppend )
OUString aScriptType2;
if( EXTENDED_STYPE==eScriptType2 )
aScriptType2 = rDfltScriptType;
- aMacroTbl.Insert( nEvent, SvxMacro( sEvent, aScriptType2, eScriptType2 ) );
+ aMacroTable.Insert( nEvent, SvxMacro( sEvent, aScriptType2, eScriptType2 ) );
}
}
}
@@ -1376,10 +1376,10 @@ void SwHTMLParser::NewForm( bool bAppend )
pFormImpl->GetForms();
Any aAny( &xForm, cppu::UnoType<XForm>::get());
rForms->insertByIndex( rForms->getCount(), aAny );
- if( !aMacroTbl.empty() )
+ if( !aMacroTable.empty() )
lcl_html_setEvents( pFormImpl->GetFormEventManager(),
rForms->getCount() - 1,
- aMacroTbl, aUnoMacroTbl, aUnoMacroParamTbl,
+ aMacroTable, aUnoMacroTable, aUnoMacroParamTable,
rDfltScriptType );
}
@@ -1390,7 +1390,7 @@ void SwHTMLParser::EndForm( bool bAppend )
if( bAppend )
{
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( AM_SPACE );
+ AppendTextNode( AM_SPACE );
else
AddParSpace();
}
@@ -1408,9 +1408,9 @@ void SwHTMLParser::InsertInput()
OUString sImgSrc, aId, aClass, aStyle, sName;
OUString sText;
- SvxMacroTableDtor aMacroTbl;
- std::vector<OUString> aUnoMacroTbl;
- std::vector<OUString> aUnoMacroParamTbl;
+ SvxMacroTableDtor aMacroTable;
+ std::vector<OUString> aUnoMacroTable;
+ std::vector<OUString> aUnoMacroParamTable;
sal_uInt16 nSize = 0;
sal_Int16 nMaxLen = 0;
sal_Int16 nChecked = TRISTATE_FALSE;
@@ -1533,7 +1533,7 @@ void SwHTMLParser::InsertInput()
default:
lcl_html_getEvents( rOption.GetTokenString(),
rOption.GetString(),
- aUnoMacroTbl, aUnoMacroParamTbl );
+ aUnoMacroTable, aUnoMacroParamTable );
break;
}
@@ -1546,7 +1546,7 @@ void SwHTMLParser::InsertInput()
OUString aScriptType2;
if( EXTENDED_STYPE==eScriptType2 )
aScriptType2 = rDfltScriptType;
- aMacroTbl.Insert( nEvent, SvxMacro( sEvent, aScriptType2, eScriptType2 ) );
+ aMacroTable.Insert( nEvent, SvxMacro( sEvent, aScriptType2, eScriptType2 ) );
}
}
}
@@ -1680,11 +1680,11 @@ void SwHTMLParser::InsertInput()
xPropSet->setPropertyValue("DefaultState", aTmp );
}
- const SvxMacro* pMacro = aMacroTbl.Get( HTML_ET_ONCLICK );
+ const SvxMacro* pMacro = aMacroTable.Get( HTML_ET_ONCLICK );
if( pMacro )
{
- aMacroTbl.Insert( HTML_ET_ONCLICK_ITEM, *pMacro );
- aMacroTbl.Erase( HTML_ET_ONCLICK );
+ aMacroTable.Insert( HTML_ET_ONCLICK_ITEM, *pMacro );
+ aMacroTable.Erase( HTML_ET_ONCLICK );
}
// SIZE auszuwerten duerfte hier keinen Sinn machen???
bMinWidth = bMinHeight = true;
@@ -1846,8 +1846,8 @@ void SwHTMLParser::InsertInput()
xFComp, xPropSet, aSz,
eVertOri, eHoriOri,
aCSS1ItemSet, aCSS1PropInfo,
- aMacroTbl, aUnoMacroTbl,
- aUnoMacroParamTbl, false,
+ aMacroTable, aUnoMacroTable,
+ aUnoMacroParamTable, false,
bHidden );
if( aTextSz.Width() || aTextSz.Height() || bMinWidth || bMinHeight )
{
@@ -1898,9 +1898,9 @@ void SwHTMLParser::NewTextArea()
OUString aId, aClass, aStyle;
OUString sName;
sal_Int32 nTabIndex = TABINDEX_MAX + 1;
- SvxMacroTableDtor aMacroTbl;
- std::vector<OUString> aUnoMacroTbl;
- std::vector<OUString> aUnoMacroParamTbl;
+ SvxMacroTableDtor aMacroTable;
+ std::vector<OUString> aUnoMacroTable;
+ std::vector<OUString> aUnoMacroParamTable;
sal_uInt16 nRows = 0, nCols = 0;
sal_uInt16 nWrap = HTML_WM_OFF;
bool bDisabled = false;
@@ -1990,7 +1990,7 @@ void SwHTMLParser::NewTextArea()
default:
lcl_html_getEvents( rOption.GetTokenString(),
rOption.GetString(),
- aUnoMacroTbl, aUnoMacroParamTbl );
+ aUnoMacroTable, aUnoMacroParamTable );
break;
}
@@ -2002,7 +2002,7 @@ void SwHTMLParser::NewTextArea()
sEvent = convertLineEnd(sEvent, GetSystemLineEnd());
if( EXTENDED_STYPE==eScriptType2 )
aScriptType = rDfltScriptType;
- aMacroTbl.Insert( nEvent, SvxMacro( sEvent, aScriptType, eScriptType2 ) );
+ aMacroTable.Insert( nEvent, SvxMacro( sEvent, aScriptType, eScriptType2 ) );
}
}
}
@@ -2089,8 +2089,8 @@ void SwHTMLParser::NewTextArea()
uno::Reference< drawing::XShape > xShape = InsertControl( xFComp, xPropSet, aSz,
text::VertOrientation::TOP, text::HoriOrientation::NONE,
aCSS1ItemSet, aCSS1PropInfo,
- aMacroTbl, aUnoMacroTbl,
- aUnoMacroParamTbl );
+ aMacroTable, aUnoMacroTable,
+ aUnoMacroParamTable );
if( aTextSz.Width() || aTextSz.Height() )
SetControlSize( xShape, aTextSz, false, false );
@@ -2177,9 +2177,9 @@ void SwHTMLParser::NewSelect()
OUString aId, aClass, aStyle;
OUString sName;
sal_Int32 nTabIndex = TABINDEX_MAX + 1;
- SvxMacroTableDtor aMacroTbl;
- std::vector<OUString> aUnoMacroTbl;
- std::vector<OUString> aUnoMacroParamTbl;
+ SvxMacroTableDtor aMacroTable;
+ std::vector<OUString> aUnoMacroTable;
+ std::vector<OUString> aUnoMacroParamTable;
bool bMultiple = false;
bool bDisabled = false;
nSelectEntryCnt = 1;
@@ -2258,7 +2258,7 @@ void SwHTMLParser::NewSelect()
default:
lcl_html_getEvents( rOption.GetTokenString(),
rOption.GetString(),
- aUnoMacroTbl, aUnoMacroParamTbl );
+ aUnoMacroTable, aUnoMacroParamTable );
break;
}
@@ -2270,7 +2270,7 @@ void SwHTMLParser::NewSelect()
sEvent = convertLineEnd(sEvent, GetSystemLineEnd());
if( EXTENDED_STYPE==eScriptType2 )
aScriptType = rDfltScriptType;
- aMacroTbl.Insert( nEvent, SvxMacro( sEvent, aScriptType, eScriptType2 ) );
+ aMacroTable.Insert( nEvent, SvxMacro( sEvent, aScriptType, eScriptType2 ) );
}
}
}
@@ -2360,8 +2360,8 @@ void SwHTMLParser::NewSelect()
uno::Reference< drawing::XShape > xShape = InsertControl( xFComp, xPropSet, aSz,
text::VertOrientation::TOP, text::HoriOrientation::NONE,
aCSS1ItemSet, aCSS1PropInfo,
- aMacroTbl, aUnoMacroTbl,
- aUnoMacroParamTbl );
+ aMacroTable, aUnoMacroTable,
+ aUnoMacroParamTable );
if( bFixSelectWidth )
pFormImpl->SetShape( xShape );
if( aTextSz.Height() || bMinWidth || bMinHeight )
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 6ae81f73e066..7d5a9aa667b0 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -630,14 +630,14 @@ void SwHTMLWriter::OutHiddenControls(
// hier folgen die Ausgabe-Routinen, dadurch sind die form::Forms gebuendelt:
-const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt )
+const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrameFormat& rFormat )
{
// es muss ein Draw-Format sein
- OSL_ENSURE( RES_DRAWFRMFMT == rFmt.Which(),
+ OSL_ENSURE( RES_DRAWFRMFMT == rFormat.Which(),
"GetHTMLControl nuer fuer Draw-Formate erlaubt" );
// Schauen, ob es ein SdrObject dafuer gibt
- const SdrObject *pObj = rFmt.FindSdrObject();
+ const SdrObject *pObj = rFormat.FindSdrObject();
if( !pObj || FmFormInventor != pObj->GetObjInventor() )
return 0;
@@ -687,8 +687,8 @@ static void GetControlSize(const SdrUnoObj& rFormObj, Size& rSz, SwDoc *pDoc)
rSz.Height() = nLines;
}
-Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
- const SwDrawFrmFmt& rFmt,
+Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
+ const SwDrawFrameFormat& rFormat,
const SdrUnoObj& rFormObj,
bool bInCntnr )
{
@@ -1031,7 +1031,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
OString aEndTags;
if( nFrmOpts != 0 )
- aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyOUStr, nFrmOpts );
+ aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrmOpts );
if( rHTMLWrt.bCfgOutStyles )
{
@@ -1139,7 +1139,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
}
- rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmOpts, &rFormObj,
+ rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrmOpts, &rFormObj,
&aItemSet );
}
@@ -1335,20 +1335,20 @@ void SwHTMLWriter::GetControls()
}
// und jetzt die in einem zeichengebundenen Rahmen
- const SwFrmFmts* pSpzFrmFmts = pDoc->GetSpzFrmFmts();
- for( size_t i=0; i<pSpzFrmFmts->size(); i++ )
+ const SwFrameFormats* pSpzFrameFormats = pDoc->GetSpzFrameFormats();
+ for( size_t i=0; i<pSpzFrameFormats->size(); i++ )
{
- const SwFrmFmt *pFrmFmt = (*pSpzFrmFmts)[i];
- if( RES_DRAWFRMFMT != pFrmFmt->Which() )
+ const SwFrameFormat *pFrameFormat = (*pSpzFrameFormats)[i];
+ if( RES_DRAWFRMFMT != pFrameFormat->Which() )
continue;
- const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
- const SwPosition *pPos = rAnchor.GetCntntAnchor();
+ const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+ const SwPosition *pPos = rAnchor.GetContentAnchor();
if ((FLY_AS_CHAR != rAnchor.GetAnchorId()) || !pPos)
continue;
const SdrObject *pSdrObj =
- SwHTMLWriter::GetHTMLControl( *static_cast<const SwDrawFrmFmt*>(pFrmFmt) );
+ SwHTMLWriter::GetHTMLControl( *static_cast<const SwDrawFrameFormat*>(pFrameFormat) );
if( !pSdrObj )
continue;
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 975cb4216da1..e71d5372ab51 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -33,7 +33,7 @@
struct SwHTMLFootEndNote_Impl
{
- SwHTMLTxtFtns aTxtFtns;
+ SwHTMLTextFootnotes aTextFootnotes;
std::vector<OUString> aNames;
OUString sName;
@@ -98,14 +98,14 @@ sal_Int32 lcl_html_getEndNoteInfo( SwEndNoteInfo& rInfo,
switch( nPart )
{
case 0:
- rInfo.aFmt.SetNumberingType( static_cast< sal_Int16 >(bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC));
+ rInfo.aFormat.SetNumberingType( static_cast< sal_Int16 >(bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC));
if( !aPart.isEmpty() )
- rInfo.aFmt.SetNumberingType(SwHTMLParser::GetNumType( aPart,
- rInfo.aFmt.GetNumberingType() ));
+ rInfo.aFormat.SetNumberingType(SwHTMLParser::GetNumType( aPart,
+ rInfo.aFormat.GetNumberingType() ));
break;
case 1:
- rInfo.nFtnOffset = aPart.isEmpty() ? 0 : (sal_uInt16)aPart.toInt32();
+ rInfo.nFootnoteOffset = aPart.isEmpty() ? 0 : (sal_uInt16)aPart.toInt32();
break;
case 2:
@@ -130,7 +130,7 @@ void SwHTMLParser::FillEndNoteInfo( const OUString& rContent )
void SwHTMLParser::FillFootNoteInfo( const OUString& rContent )
{
- SwFtnInfo aInfo( pDoc->GetFtnInfo() );
+ SwFootnoteInfo aInfo( pDoc->GetFootnoteInfo() );
sal_Int32 nStrPos = lcl_html_getEndNoteInfo( aInfo, rContent, false );
@@ -177,7 +177,7 @@ void SwHTMLParser::FillFootNoteInfo( const OUString& rContent )
}
}
- pDoc->SetFtnInfo( aInfo );
+ pDoc->SetFootnoteInfo( aInfo );
}
void SwHTMLParser::InsertFootEndNote( const OUString& rName, bool bEndNote,
@@ -200,18 +200,18 @@ void SwHTMLParser::FinishFootEndNote()
if( !pFootEndNoteImpl )
return;
- SwFmtFtn aFtn( pFootEndNoteImpl->bEndNote );
+ SwFormatFootnote aFootnote( pFootEndNoteImpl->bEndNote );
if( pFootEndNoteImpl->bFixed )
- aFtn.SetNumStr( pFootEndNoteImpl->sContent );
+ aFootnote.SetNumStr( pFootEndNoteImpl->sContent );
- pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, aFtn );
- SwTxtFtn * const pTxtFtn = static_cast<SwTxtFtn *>(
- pPam->GetNode().GetTxtNode()->GetTxtAttrForCharAt(
+ pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, aFootnote );
+ SwTextFootnote * const pTextFootnote = static_cast<SwTextFootnote *>(
+ pPam->GetNode().GetTextNode()->GetTextAttrForCharAt(
pPam->GetPoint()->nContent.GetIndex() - 1, RES_TXTATR_FTN ) );
// In Kopf- und Fusszeilen duerfen keine Fussnoten eingefuegt werden.
- if( pTxtFtn )
+ if( pTextFootnote )
{
- pFootEndNoteImpl->aTxtFtns.push_back( pTxtFtn );
+ pFootEndNoteImpl->aTextFootnotes.push_back( pTextFootnote );
pFootEndNoteImpl->aNames.push_back(pFootEndNoteImpl->sName);
}
pFootEndNoteImpl->sName = aEmptyOUStr;
@@ -244,9 +244,9 @@ SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const OUString& rName )
{
if(pFootEndNoteImpl->aNames[i] == aName)
{
- pStartNodeIdx = pFootEndNoteImpl->aTxtFtns[i]->GetStartNode();
+ pStartNodeIdx = pFootEndNoteImpl->aTextFootnotes[i]->GetStartNode();
pFootEndNoteImpl->aNames.erase(pFootEndNoteImpl->aNames.begin() + i);
- pFootEndNoteImpl->aTxtFtns.erase( pFootEndNoteImpl->aTxtFtns.begin() + i );
+ pFootEndNoteImpl->aTextFootnotes.erase( pFootEndNoteImpl->aTextFootnotes.begin() + i );
if(pFootEndNoteImpl->aNames.empty())
{
delete pFootEndNoteImpl;
@@ -261,35 +261,35 @@ SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const OUString& rName )
return pStartNodeIdx;
}
-Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
+Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- SwFmtFtn& rFmtFtn = const_cast<SwFmtFtn&>(static_cast<const SwFmtFtn&>(rHt));
- SwTxtFtn *pTxtFtn = rFmtFtn.GetTxtFtn();
- if( !pTxtFtn )
+ SwFormatFootnote& rFormatFootnote = const_cast<SwFormatFootnote&>(static_cast<const SwFormatFootnote&>(rHt));
+ SwTextFootnote *pTextFootnote = rFormatFootnote.GetTextFootnote();
+ if( !pTextFootnote )
return rWrt;
- OUString sFtnName, sClass;
+ OUString sFootnoteName, sClass;
sal_uInt16 nPos;
- if( rFmtFtn.IsEndNote() )
+ if( rFormatFootnote.IsEndNote() )
{
nPos = rHTMLWrt.pFootEndNotes ? rHTMLWrt.pFootEndNotes->size() : 0;
OSL_ENSURE( nPos == rHTMLWrt.nFootNote + rHTMLWrt.nEndNote,
- "OutHTML_SwFmtFtn: Position falsch" );
+ "OutHTML_SwFormatFootnote: Position falsch" );
sClass = OOO_STRING_SVTOOLS_HTML_sdendnote_anc;
- sFtnName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number( (sal_Int32)(++rHTMLWrt.nEndNote) );
+ sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number( (sal_Int32)(++rHTMLWrt.nEndNote) );
}
else
{
nPos = rHTMLWrt.nFootNote;
sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote_anc;
- sFtnName = OOO_STRING_SVTOOLS_HTML_sdfootnote + OUString::number( (sal_Int32)(++rHTMLWrt.nFootNote));
+ sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote + OUString::number( (sal_Int32)(++rHTMLWrt.nFootNote));
}
if( !rHTMLWrt.pFootEndNotes )
- rHTMLWrt.pFootEndNotes = new SwHTMLTxtFtns;
- rHTMLWrt.pFootEndNotes->insert( rHTMLWrt.pFootEndNotes->begin() + nPos, pTxtFtn );
+ rHTMLWrt.pFootEndNotes = new SwHTMLTextFootnotes;
+ rHTMLWrt.pFootEndNotes->insert( rHTMLWrt.pFootEndNotes->begin() + nPos, pTextFootnote );
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
@@ -298,19 +298,19 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
HTMLOutFuncs::Out_String( rWrt.Strm(), sClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\" ")
.append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append('\"');
- if( !rFmtFtn.GetNumStr().isEmpty() )
+ if( !rFormatFootnote.GetNumStr().isEmpty() )
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed);
sOut.append('>');
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, true );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rFmtFtn.GetViewNumStr(*rWrt.pDoc),
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rFormatFootnote.GetViewNumStr(*rWrt.pDoc),
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, false );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_anchor, false );
@@ -326,27 +326,27 @@ void SwHTMLWriter::OutFootEndNotes()
return;
#if OSL_DEBUG_LEVEL > 0
- sal_uInt16 nFtn = nFootNote, nEn = nEndNote;
+ sal_uInt16 nFootnote = nFootNote, nEn = nEndNote;
#endif
nFootNote = 0, nEndNote = 0;
for( sal_uInt16 i=0; i<pFootEndNotes->size(); i++ )
{
- SwTxtFtn *pTxtFtn = (*pFootEndNotes)[i];
- pFmtFtn = &pTxtFtn->GetFtn();
+ SwTextFootnote *pTextFootnote = (*pFootEndNotes)[i];
+ pFormatFootnote = &pTextFootnote->GetFootnote();
- OUString sFtnName, sClass;
- if( pFmtFtn->IsEndNote() )
+ OUString sFootnoteName, sClass;
+ if( pFormatFootnote->IsEndNote() )
{
sClass = OOO_STRING_SVTOOLS_HTML_sdendnote;
- sFtnName = OOO_STRING_SVTOOLS_HTML_sdendnote;
- sFtnName += OUString::number((sal_Int32)(++nEndNote));
+ sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote;
+ sFootnoteName += OUString::number((sal_Int32)(++nEndNote));
}
else
{
sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote;
- sFtnName = OOO_STRING_SVTOOLS_HTML_sdfootnote;
- sFtnName += OUString::number((sal_Int32)(++nFootNote));
+ sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote;
+ sFootnoteName += OUString::number((sal_Int32)(++nFootNote));
}
if( bLFPossible )
@@ -355,14 +355,14 @@ void SwHTMLWriter::OutFootEndNotes()
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division)
.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id).append("=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sFootnoteName, eDestEnc, &aNonConvertableCharacters );
Strm().WriteCharPtr( "\">" );
bLFPossible = true;
IncIndentLevel(); // Inhalt von <DIV> einruecken
- OSL_ENSURE( pTxtFtn, "SwHTMLWriter::OutFootEndNotes: SwTxtFtn fehlt" );
- SwNodeIndex *pSttNdIdx = pTxtFtn->GetStartNode();
+ OSL_ENSURE( pTextFootnote, "SwHTMLWriter::OutFootEndNotes: SwTextFootnote fehlt" );
+ SwNodeIndex *pSttNdIdx = pTextFootnote->GetStartNode();
OSL_ENSURE( pSttNdIdx,
"SwHTMLWriter::OutFootEndNotes: StartNode-Index fehlt" );
if( pSttNdIdx )
@@ -378,21 +378,21 @@ void SwHTMLWriter::OutFootEndNotes()
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
bLFPossible = true;
- OSL_ENSURE( !pFmtFtn,
- "SwHTMLWriter::OutFootEndNotes: Ftn wurde nicht ausgegeben" );
- if( pFmtFtn )
+ OSL_ENSURE( !pFormatFootnote,
+ "SwHTMLWriter::OutFootEndNotes: Footnote wurde nicht ausgegeben" );
+ if( pFormatFootnote )
{
- if( pFmtFtn->IsEndNote() )
+ if( pFormatFootnote->IsEndNote() )
nEndNote++;
else
nFootNote++;
- pFmtFtn = 0;
+ pFormatFootnote = 0;
}
}
#if OSL_DEBUG_LEVEL > 0
- OSL_ENSURE( nFtn == nFootNote,
+ OSL_ENSURE( nFootnote == nFootNote,
"SwHTMLWriter::OutFootEndNotes: Anzahl Fussnoten stimmt nicht" );
OSL_ENSURE( nEn == nEndNote,
"SwHTMLWriter::OutFootEndNotes: Anzahl Endnoten stimmt nicht" );
@@ -403,47 +403,47 @@ void SwHTMLWriter::OutFootEndNotes()
nFootNote = nEndNote = 0;
}
-OUString SwHTMLWriter::GetFootEndNoteSym( const SwFmtFtn& rFmtFtn )
+OUString SwHTMLWriter::GetFootEndNoteSym( const SwFormatFootnote& rFormatFootnote )
{
const SwEndNoteInfo * pInfo = 0;
- if( rFmtFtn.GetNumStr().isEmpty() )
- pInfo = rFmtFtn.IsEndNote() ? &pDoc->GetEndNoteInfo()
- : &pDoc->GetFtnInfo();
+ if( rFormatFootnote.GetNumStr().isEmpty() )
+ pInfo = rFormatFootnote.IsEndNote() ? &pDoc->GetEndNoteInfo()
+ : &pDoc->GetFootnoteInfo();
OUString sRet;
if( pInfo )
sRet = pInfo->GetPrefix();
- sRet += rFmtFtn.GetViewNumStr( *pDoc );
+ sRet += rFormatFootnote.GetViewNumStr( *pDoc );
if( pInfo )
sRet += pInfo->GetSuffix();
return sRet;
}
-void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn,
+void SwHTMLWriter::OutFootEndNoteSym( const SwFormatFootnote& rFormatFootnote,
const OUString& rNum,
sal_uInt16 nScript )
{
const SwEndNoteInfo *pInfo;
- OUString sFtnName, sClass;
- if( rFmtFtn.IsEndNote() )
+ OUString sFootnoteName, sClass;
+ if( rFormatFootnote.IsEndNote() )
{
sClass = OOO_STRING_SVTOOLS_HTML_sdendnote_sym;
- sFtnName = OOO_STRING_SVTOOLS_HTML_sdendnote;
- sFtnName += OUString::number((sal_Int32)nEndNote);
+ sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote;
+ sFootnoteName += OUString::number((sal_Int32)nEndNote);
pInfo = &pDoc->GetEndNoteInfo();
}
else
{
sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote_sym;
- sFtnName = OOO_STRING_SVTOOLS_HTML_sdfootnote;
- sFtnName += OUString::number((sal_Int32)nFootNote);
- pInfo = &pDoc->GetFtnInfo();
+ sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote;
+ sFootnoteName += OUString::number((sal_Int32)nFootNote);
+ pInfo = &pDoc->GetFootnoteInfo();
}
- const SwCharFmt *pSymCharFmt = pInfo->GetCharFmt( *pDoc );
- if( pSymCharFmt && 0 != aScriptTextStyles.count( pSymCharFmt->GetName() ) )
+ const SwCharFormat *pSymCharFormat = pInfo->GetCharFormat( *pDoc );
+ if( pSymCharFormat && 0 != aScriptTextStyles.count( pSymCharFormat->GetName() ) )
{
switch( nScript )
{
@@ -466,11 +466,11 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn,
HTMLOutFuncs::Out_String( Strm(), sClass, eDestEnc, &aNonConvertableCharacters );
sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sFootnoteName, eDestEnc, &aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append("\" ")
.append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sFootnoteName, eDestEnc, &aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\">");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
@@ -483,19 +483,19 @@ static sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
bool bEndNote )
{
sal_uInt16 nParts = 0;
- sal_Int16 eFmt = rInfo.aFmt.GetNumberingType();
- if( (bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC) != eFmt )
+ sal_Int16 eFormat = rInfo.aFormat.GetNumberingType();
+ if( (bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC) != eFormat )
{
- const sal_Char *pStr = SwHTMLWriter::GetNumFormat( eFmt );
+ const sal_Char *pStr = SwHTMLWriter::GetNumFormat( eFormat );
if( pStr )
{
pParts[0] = OUString::createFromAscii( pStr );
nParts = 1;
}
}
- if( rInfo.nFtnOffset > 0 )
+ if( rInfo.nFootnoteOffset > 0 )
{
- pParts[1] = OUString::number(rInfo.nFtnOffset);
+ pParts[1] = OUString::number(rInfo.nFootnoteOffset);
nParts = 2;
}
if( !rInfo.GetPrefix().isEmpty() )
@@ -550,7 +550,7 @@ void SwHTMLWriter::OutFootEndNoteInfo()
// Beginn
{
- const SwFtnInfo& rInfo = pDoc->GetFtnInfo();
+ const SwFootnoteInfo& rInfo = pDoc->GetFootnoteInfo();
OUString aParts[8];
sal_uInt16 nParts = lcl_html_fillEndNoteInfo( rInfo, aParts, false );
if( rInfo.eNum != FTNNUM_DOC )
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 28117fdd5e33..ab51592c16d7 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -126,8 +126,8 @@ void SwHTMLParser::ConnectImageMaps()
SwNode *pNd = rNds[nIdx + 1];
if( 0 != (pGrfNd = pNd->GetGrfNode()) )
{
- SwFrmFmt *pFmt = pGrfNd->GetFlyFmt();
- SwFmtURL aURL( pFmt->GetURL() );
+ SwFrameFormat *pFormat = pGrfNd->GetFlyFormat();
+ SwFormatURL aURL( pFormat->GetURL() );
const ImageMap *pIMap = aURL.GetMap();
if( pIMap && pIMap->GetIMapObjectCount()==0 )
{
@@ -137,7 +137,7 @@ void SwHTMLParser::ConnectImageMaps()
ImageMap *pNewIMap =
FindImageMap( pIMap->GetName() );
aURL.SetMap( pNewIMap );
- pFmt->SetFmtAttr( aURL );
+ pFormat->SetFormatAttr( aURL );
if( !pGrfNd->IsScaleImageMap() )
{
// die Grafikgroesse ist mitlerweile da oder dir
@@ -190,7 +190,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
bool bDontAppend )
{
bool bMoveBackward = false;
- SwFmtAnchor aAnchor( FLY_AS_CHAR );
+ SwFormatAnchor aAnchor( FLY_AS_CHAR );
sal_Int16 eVertRel = text::RelOrientation::FRAME;
if( text::HoriOrientation::NONE != eHoriOri )
@@ -235,7 +235,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
GetULSpaceFromContext( nUpper, nLower );
InsertAttr( SvxULSpaceItem( nUpper, 0, RES_UL_SPACE ), false, true );
- AppendTxtNode( AM_NOSPACE );
+ AppendTextNode( AM_NOSPACE );
if( nUpper )
{
@@ -246,8 +246,8 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
}
// Vertikale Ausrichtung und Verankerung bestimmen.
- const sal_Int32 nCntnt = pPam->GetPoint()->nContent.GetIndex();
- if( nCntnt )
+ const sal_Int32 nContent = pPam->GetPoint()->nContent.GetIndex();
+ if( nContent )
{
aAnchor.SetType( FLY_AT_CHAR );
bMoveBackward = true;
@@ -261,11 +261,11 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
eVertRel = text::RelOrientation::PRINT_AREA;
}
- rFrmSet.Put( SwFmtHoriOrient( 0, eHoriOri, eHoriRel) );
+ rFrmSet.Put( SwFormatHoriOrient( 0, eHoriOri, eHoriRel) );
- rFrmSet.Put( SwFmtSurround( eSurround ) );
+ rFrmSet.Put( SwFormatSurround( eSurround ) );
}
- rFrmSet.Put( SwFmtVertOrient( 0, eVertOri, eVertRel) );
+ rFrmSet.Put( SwFormatVertOrient( 0, eVertOri, eVertRel) );
if( bMoveBackward )
pPam->Move( fnMoveBackward );
@@ -278,15 +278,15 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
rFrmSet.Put( aAnchor );
}
-void SwHTMLParser::RegisterFlyFrm( SwFrmFmt *pFlyFmt )
+void SwHTMLParser::RegisterFlyFrm( SwFrameFormat *pFlyFormat )
{
// automatisch verankerte Rahmen muessen noch um eine Position
// nach vorne verschoben werden.
- if( RES_DRAWFRMFMT != pFlyFmt->Which() &&
- (FLY_AT_PARA == pFlyFmt->GetAnchor().GetAnchorId()) &&
- SURROUND_THROUGHT == pFlyFmt->GetSurround().GetSurround() )
+ if( RES_DRAWFRMFMT != pFlyFormat->Which() &&
+ (FLY_AT_PARA == pFlyFormat->GetAnchor().GetAnchorId()) &&
+ SURROUND_THROUGHT == pFlyFormat->GetSurround().GetSurround() )
{
- aMoveFlyFrms.push_back( pFlyFmt );
+ aMoveFlyFrms.push_back( pFlyFormat );
aMoveFlyCnts.push_back( pPam->GetPoint()->nContent.GetIndex() );
}
}
@@ -316,7 +316,7 @@ void SwHTMLParser::InsertImage()
long nWidth=0, nHeight=0;
long nVSpace=0, nHSpace=0;
- sal_uInt16 nBorder = (aAttrTab.pINetFmt ? 1 : 0);
+ sal_uInt16 nBorder = (aAttrTab.pINetFormat ? 1 : 0);
bool bIsMap = false;
bool bPrcWidth = false;
bool bPrcHeight = false;
@@ -442,14 +442,14 @@ IMAGE_SETEVENT:
!aBulletGrfs[GetNumInfo().GetDepth()-1].isEmpty() &&
aBulletGrfs[GetNumInfo().GetDepth()-1]==sGrfNm )
{
- SwTxtNode* pTxtNode = pPam->GetNode().GetTxtNode();
+ SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
- if( pTxtNode && ! pTxtNode->IsCountedInList())
+ if( pTextNode && ! pTextNode->IsCountedInList())
{
- OSL_ENSURE( pTxtNode->GetActualListLevel() == GetNumInfo().GetLevel(),
+ OSL_ENSURE( pTextNode->GetActualListLevel() == GetNumInfo().GetLevel(),
"Numerierungs-Ebene stimmt nicht" );
- pTxtNode->SetCountedInList( true );
+ pTextNode->SetCountedInList( true );
// Rule invalisieren ist noetig, weil zwischem dem einlesen
// des LI und der Grafik ein EndAction gerufen worden sein kann.
@@ -458,7 +458,7 @@ IMAGE_SETEVENT:
// Die Vorlage novh mal setzen. Ist noetig, damit der
// Erstzeilen-Einzug stimmt.
- SetTxtCollAttrs();
+ SetTextCollAttrs();
return;
}
@@ -503,7 +503,7 @@ IMAGE_SETEVENT:
SfxItemSet aFrmSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs( aFrmSet );
+ Reader::ResetFrameFormatAttrs( aFrmSet );
// Umrandung setzen
long nHBorderWidth = 0, nVBorderWidth = 0;
@@ -516,17 +516,17 @@ IMAGE_SETEVENT:
::editeng::SvxBorderLine aHBorderLine( NULL, nHBorderWidth );
::editeng::SvxBorderLine aVBorderLine( NULL, nVBorderWidth );
- if( aAttrTab.pINetFmt )
+ if( aAttrTab.pINetFormat )
{
const OUString& rURL =
- static_cast<const SwFmtINetFmt&>(aAttrTab.pINetFmt->GetItem()).GetValue();
+ static_cast<const SwFormatINetFormat&>(aAttrTab.pINetFormat->GetItem()).GetValue();
pCSS1Parser->SetATagStyles();
sal_uInt16 nPoolId = static_cast< sal_uInt16 >(pDoc->IsVisitedURL( rURL )
? RES_POOLCHR_INET_VISIT
: RES_POOLCHR_INET_NORMAL);
- const SwCharFmt *pCharFmt = pCSS1Parser->GetCharFmtFromPool( nPoolId );
- aHBorderLine.SetColor( pCharFmt->GetColor().GetValue() );
+ const SwCharFormat *pCharFormat = pCSS1Parser->GetCharFormatFromPool( nPoolId );
+ aHBorderLine.SetColor( pCharFormat->GetColor().GetValue() );
aVBorderLine.SetColor( aHBorderLine.GetColor() );
}
else
@@ -553,7 +553,7 @@ IMAGE_SETEVENT:
SetSpace( Size( nHSpace, nVSpace), aItemSet, aPropInfo, aFrmSet );
// Sonstige CSS1-Attribute Setzen
- SetFrmFmtAttrs( aItemSet, aPropInfo, HTML_FF_BOX, aFrmSet );
+ SetFrameFormatAttrs( aItemSet, aPropInfo, HTML_FF_BOX, aFrmSet );
Size aTwipSz( bPrcWidth ? 0 : nWidth, bPrcHeight ? 0 : nHeight );
if( (aTwipSz.Width() || aTwipSz.Height()) && Application::GetDefaultDevice() )
@@ -676,7 +676,7 @@ IMAGE_SETEVENT:
ImageMap *pImgMap = FindImageMap( aName );
if( pImgMap )
{
- SwFmtURL aURL; aURL.SetMap( pImgMap );//wird kopieiert
+ SwFormatURL aURL; aURL.SetMap( pImgMap );//wird kopieiert
bSetScaleImageMap = !nPrcWidth || !nPrcHeight;
aFrmSet.Put( aURL );
@@ -684,7 +684,7 @@ IMAGE_SETEVENT:
else
{
ImageMap aEmptyImgMap( aName );
- SwFmtURL aURL; aURL.SetMap( &aEmptyImgMap );//wird kopieiert
+ SwFormatURL aURL; aURL.SetMap( &aEmptyImgMap );//wird kopieiert
aFrmSet.Put( aURL );
nMissingImgMaps++; // es fehlen noch Image-Maps
@@ -723,20 +723,20 @@ IMAGE_SETEVENT:
aTwipSz.Height() = MINFLY;
}
- SwFmtFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
+ SwFormatFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
aFrmSize.SetWidthPercent( nPrcWidth );
aFrmSize.SetHeightPercent( nPrcHeight );
aFrmSet.Put( aFrmSize );
// passing empty sGrfNm here, means we don't want the graphic to be linked
- SwFrmFmt *pFlyFmt = pDoc->getIDocumentContentOperations().Insert( *pPam, sGrfNm, aEmptyOUStr, &aGraphic,
+ SwFrameFormat *pFlyFormat = pDoc->getIDocumentContentOperations().Insert( *pPam, sGrfNm, aEmptyOUStr, &aGraphic,
&aFrmSet, NULL, NULL );
- SwGrfNode *pGrfNd = pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()
+ SwGrfNode *pGrfNd = pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
->GetIndex()+1 ]->GetGrfNode();
if( !sHTMLGrfName.isEmpty() )
{
- pFlyFmt->SetName( sHTMLGrfName );
+ pFlyFormat->SetName( sHTMLGrfName );
// ggfs. eine Grafik anspringen
if( JUMPTO_GRAPHIC == eJumpTo && sHTMLGrfName == sJmpMark )
@@ -760,17 +760,17 @@ IMAGE_SETEVENT:
pGrfNd->SetScaleImageMap( true );
}
- if( aAttrTab.pINetFmt )
+ if( aAttrTab.pINetFormat )
{
- const SwFmtINetFmt &rINetFmt =
- static_cast<const SwFmtINetFmt&>(aAttrTab.pINetFmt->GetItem());
+ const SwFormatINetFormat &rINetFormat =
+ static_cast<const SwFormatINetFormat&>(aAttrTab.pINetFormat->GetItem());
- SwFmtURL aURL( pFlyFmt->GetURL() );
+ SwFormatURL aURL( pFlyFormat->GetURL() );
- aURL.SetURL( rINetFmt.GetValue(), bIsMap );
- aURL.SetTargetFrameName( rINetFmt.GetTargetFrame() );
- aURL.SetName( rINetFmt.GetName() );
- pFlyFmt->SetFmtAttr( aURL );
+ aURL.SetURL( rINetFormat.GetValue(), bIsMap );
+ aURL.SetTargetFrameName( rINetFormat.GetTargetFrame() );
+ aURL.SetName( rINetFormat.GetName() );
+ pFlyFormat->SetFormatAttr( aURL );
{
static const sal_uInt16 aEvents[] = {
@@ -781,29 +781,29 @@ IMAGE_SETEVENT:
for( sal_uInt16 n = 0; aEvents[ n ]; ++n )
{
- const SvxMacro *pMacro = rINetFmt.GetMacro( aEvents[ n ] );
+ const SvxMacro *pMacro = rINetFormat.GetMacro( aEvents[ n ] );
if( 0 != pMacro )
aMacroItem.SetMacro( aEvents[ n ], *pMacro );
}
}
- if ((FLY_AS_CHAR == pFlyFmt->GetAnchor().GetAnchorId()) &&
- aAttrTab.pINetFmt->GetSttPara() ==
+ if ((FLY_AS_CHAR == pFlyFormat->GetAnchor().GetAnchorId()) &&
+ aAttrTab.pINetFormat->GetSttPara() ==
pPam->GetPoint()->nNode &&
- aAttrTab.pINetFmt->GetSttCnt() ==
+ aAttrTab.pINetFormat->GetSttCnt() ==
pPam->GetPoint()->nContent.GetIndex() - 1 )
{
// das Attribut wurde unmitellbar vor einer zeichengeb.
// Grafik eingefuegt, also verschieben wir es
- aAttrTab.pINetFmt->SetStart( *pPam->GetPoint() );
+ aAttrTab.pINetFormat->SetStart( *pPam->GetPoint() );
// Wenn das Attribut auch ein Sprungziel ist, fuegen
// wir noch eine Bookmark vor der Grafik ein, weil das
- // SwFmtURL kein Sprungziel ist.
- if( !rINetFmt.GetName().isEmpty() )
+ // SwFormatURL kein Sprungziel ist.
+ if( !rINetFormat.GetName().isEmpty() )
{
pPam->Move( fnMoveBackward );
- InsertBookmark( rINetFmt.GetName() );
+ InsertBookmark( rINetFormat.GetName() );
pPam->Move( fnMoveForward );
}
}
@@ -811,7 +811,7 @@ IMAGE_SETEVENT:
}
if( !aMacroItem.GetMacroTable().empty() )
- pFlyFmt->SetFmtAttr( aMacroItem );
+ pFlyFormat->SetFormatAttr( aMacroItem );
// tdf#87083 If the graphic has not been loaded yet, then load it now.
// Otherwise it may be loaded during the first paint of the object and it
@@ -823,7 +823,7 @@ IMAGE_SETEVENT:
}
// Ggf. Frames anlegen und Auto-gebundenen Rahmen registrieren
- RegisterFlyFrm( pFlyFmt );
+ RegisterFlyFrm( pFlyFormat );
if( !aId.isEmpty() )
InsertBookmark( aId );
@@ -833,8 +833,8 @@ IMAGE_SETEVENT:
void SwHTMLParser::InsertBodyOptions()
{
- pDoc->SetTxtFmtColl( *pPam,
- pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_TEXT ) );
+ pDoc->SetTextFormatColl( *pPam,
+ pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TEXT ) );
OUString aBackGround, aId, aStyle, aLang, aDir;
Color aBGColor, aTextColor, aLinkColor, aVLinkColor;
@@ -937,8 +937,8 @@ void SwHTMLParser::InsertBodyOptions()
if( bTextColor && !pCSS1Parser->IsBodyTextSet() )
{
// Die Textfarbe wird an der Standard-Vorlage gesetzt
- pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_STANDARD )
- ->SetFmtAttr( SvxColorItem(aTextColor, RES_CHRATR_COLOR) );
+ pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
+ ->SetFormatAttr( SvxColorItem(aTextColor, RES_CHRATR_COLOR) );
pCSS1Parser->SetBodyTextSet();
}
@@ -1007,8 +1007,8 @@ void SwHTMLParser::InsertBodyOptions()
// alle noch uebrigen Optionen koennen an der Standard-Vorlage
// gesetzt werden und gelten dann automatisch als defaults
- pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_STANDARD )
- ->SetFmtAttr( aItemSet );
+ pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
+ ->SetFormatAttr( aItemSet );
}
else if( bSetBrush )
{
@@ -1017,16 +1017,16 @@ void SwHTMLParser::InsertBodyOptions()
if( bLinkColor && !pCSS1Parser->IsBodyLinkSet() )
{
- SwCharFmt *pCharFmt =
- pCSS1Parser->GetCharFmtFromPool(RES_POOLCHR_INET_NORMAL);
- pCharFmt->SetFmtAttr( SvxColorItem(aLinkColor, RES_CHRATR_COLOR) );
+ SwCharFormat *pCharFormat =
+ pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_INET_NORMAL);
+ pCharFormat->SetFormatAttr( SvxColorItem(aLinkColor, RES_CHRATR_COLOR) );
pCSS1Parser->SetBodyLinkSet();
}
if( bVLinkColor && !pCSS1Parser->IsBodyVLinkSet() )
{
- SwCharFmt *pCharFmt =
- pCSS1Parser->GetCharFmtFromPool(RES_POOLCHR_INET_VISIT);
- pCharFmt->SetFmtAttr( SvxColorItem(aVLinkColor, RES_CHRATR_COLOR) );
+ SwCharFormat *pCharFormat =
+ pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_INET_VISIT);
+ pCharFormat->SetFormatAttr( SvxColorItem(aVLinkColor, RES_CHRATR_COLOR) );
pCSS1Parser->SetBodyVLinkSet();
}
if( !aLang.isEmpty() )
@@ -1074,7 +1074,7 @@ void SwHTMLParser::NewAnchor()
delete pOldCntxt;
}
- SvxMacroTableDtor aMacroTbl;
+ SvxMacroTableDtor aMacroTable;
OUString sHRef, aName, sTarget;
OUString aId, aStyle, aClass, aLang, aDir;
bool bHasHRef = false, bFixed = false;
@@ -1151,7 +1151,7 @@ ANCHOR_SETEVENT:
OUString sScriptType;
if( EXTENDED_STYPE == eScriptType2 )
sScriptType = sDfltScriptType;
- aMacroTbl.Insert( nEvent, SvxMacro( sTmp, sScriptType, eScriptType2 ));
+ aMacroTable.Insert( nEvent, SvxMacro( sTmp, sScriptType, eScriptType2 ));
}
}
break;
@@ -1190,8 +1190,8 @@ ANCHOR_SETEVENT:
// einen neuen Kontext anlegen
_HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_ANCHOR_ON );
- bool bEnAnchor = false, bFtnAnchor = false, bFtnEnSymbol = false;
- OUString aFtnName;
+ bool bEnAnchor = false, bFootnoteAnchor = false, bFootnoteEnSymbol = false;
+ OUString aFootnoteName;
OUString aStrippedClass( aClass );
SwCSS1Parser::GetScriptFromClass( aStrippedClass, false );
if( aStrippedClass.getLength() >=9 && bHasHRef && sHRef.getLength() > 1 &&
@@ -1201,13 +1201,13 @@ ANCHOR_SETEVENT:
if( aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdendnote_anc ) )
bEnAnchor = true;
else if( aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdfootnote_anc ) )
- bFtnAnchor = true;
+ bFootnoteAnchor = true;
else if( aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdendnote_sym ) ||
aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdfootnote_sym ) )
- bFtnEnSymbol = true;
- if( bEnAnchor || bFtnAnchor || bFtnEnSymbol )
+ bFootnoteEnSymbol = true;
+ if( bEnAnchor || bFootnoteAnchor || bFootnoteEnSymbol )
{
- aFtnName = sHRef.copy( 1 );
+ aFootnoteName = sHRef.copy( 1 );
aClass = aStrippedClass = aName = aEmptyOUStr;
bHasHRef = false;
}
@@ -1240,26 +1240,26 @@ ANCHOR_SETEVENT:
}
pCSS1Parser->SetATagStyles();
- SwFmtINetFmt aINetFmt( sHRef, sTarget );
- aINetFmt.SetName( aName );
+ SwFormatINetFormat aINetFormat( sHRef, sTarget );
+ aINetFormat.SetName( aName );
- if( !aMacroTbl.empty() )
- aINetFmt.SetMacroTbl( &aMacroTbl );
+ if( !aMacroTable.empty() )
+ aINetFormat.SetMacroTable( &aMacroTable );
// das Default-Attribut setzen
- InsertAttr( &aAttrTab.pINetFmt, aINetFmt, pCntxt );
+ InsertAttr( &aAttrTab.pINetFormat, aINetFormat, pCntxt );
}
else if( !aName.isEmpty() )
{
InsertBookmark( aName );
}
- if( bEnAnchor || bFtnAnchor )
+ if( bEnAnchor || bFootnoteAnchor )
{
- InsertFootEndNote( aFtnName, bEnAnchor, bFixed );
+ InsertFootEndNote( aFootnoteName, bEnAnchor, bFixed );
bInFootEndNoteAnchor = bCallNextToken = true;
}
- else if( bFtnEnSymbol )
+ else if( bFootnoteEnSymbol )
{
bInFootEndNoteSymbol = bCallNextToken = true;
}
@@ -1344,7 +1344,7 @@ void SwHTMLParser::StripTrailingPara()
{
bool bSetSmallFont = false;
- SwCntntNode* pCNd = pPam->GetCntntNode();
+ SwContentNode* pCNd = pPam->GetContentNode();
if( !pPam->GetPoint()->nContent.GetIndex() )
{
if( pCNd && pCNd->StartOfSectionIndex()+2 <
@@ -1352,13 +1352,13 @@ void SwHTMLParser::StripTrailingPara()
{
sal_uLong nNodeIdx = pPam->GetPoint()->nNode.GetIndex();
- const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
+ const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
- for( sal_uInt16 i=0; i<rFrmFmtTbl.size(); i++ )
+ for( sal_uInt16 i=0; i<rFrameFormatTable.size(); i++ )
{
- SwFrmFmt const*const pFmt = rFrmFmtTbl[i];
- SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
- SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+ SwFrameFormat const*const pFormat = rFrameFormatTable[i];
+ SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+ SwPosition const*const pAPos = pAnchor->GetContentAnchor();
if (pAPos &&
((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
(FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
@@ -1372,15 +1372,15 @@ void SwHTMLParser::StripTrailingPara()
// geloescht wird, weil sonst der
// End-Index in die Botanik zeigt
- if( pCNd->Len() && pCNd->IsTxtNode() )
+ if( pCNd->Len() && pCNd->IsTextNode() )
{
// es wurden Felder in den Node eingefuegt, die muessen
// wir jetzt verschieben
- SwTxtNode *pPrvNd = pDoc->GetNodes()[nNodeIdx-1]->GetTxtNode();
+ SwTextNode *pPrvNd = pDoc->GetNodes()[nNodeIdx-1]->GetTextNode();
if( pPrvNd )
{
SwIndex aSrc( pCNd, 0 );
- pCNd->GetTxtNode()->CutText( pPrvNd, aSrc, pCNd->Len() );
+ pCNd->GetTextNode()->CutText( pPrvNd, aSrc, pCNd->Len() );
}
}
@@ -1396,7 +1396,7 @@ void SwHTMLParser::StripTrailingPara()
if(nBookNdIdx==nNodeIdx)
{
SwNodeIndex nNewNdIdx(pPam->GetPoint()->nNode);
- SwCntntNode* pNd = SwNodes::GoPrevious(&nNewNdIdx);
+ SwContentNode* pNd = SwNodes::GoPrevious(&nNewNdIdx);
if(!pNd)
{
OSL_ENSURE(false, "Hoppla, wo ist mein Vorgaenger-Node");
@@ -1421,7 +1421,7 @@ void SwHTMLParser::StripTrailingPara()
pDoc->GetNodes().Delete( pPam->GetPoint()->nNode );
pPam->Move( fnMoveBackward, fnGoNode );
}
- else if( pCNd && pCNd->IsTxtNode() && pTable )
+ else if( pCNd && pCNd->IsTextNode() && pTable )
{
// In leeren Zellen stellen wir einen kleinen Font ein, damit die
// Zelle nicht hoeher wird als die Grafik bzw. so niedrig wie
@@ -1429,22 +1429,22 @@ void SwHTMLParser::StripTrailingPara()
bSetSmallFont = true;
}
}
- else if( pCNd && pCNd->IsTxtNode() && pTable &&
+ else if( pCNd && pCNd->IsTextNode() && pTable &&
pCNd->StartOfSectionIndex()+2 ==
pCNd->EndOfSectionIndex() )
{
// Wenn die Zelle nur zeichengebundene Grafiken/Rahmen enthaelt
// stellen wir ebenfalls einen kleinen Font ein.
bSetSmallFont = true;
- SwTxtNode* pTxtNd = pCNd->GetTxtNode();
+ SwTextNode* pTextNd = pCNd->GetTextNode();
sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
while( bSetSmallFont && nPos>0 )
{
--nPos;
bSetSmallFont =
- (CH_TXTATR_BREAKWORD == pTxtNd->GetTxt()[nPos]) &&
- (0 != pTxtNd->GetTxtAttrForCharAt( nPos, RES_TXTATR_FLYCNT ));
+ (CH_TXTATR_BREAKWORD == pTextNd->GetText()[nPos]) &&
+ (0 != pTextNd->GetTextAttrForCharAt( nPos, RES_TXTATR_FLYCNT ));
}
}
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 7580afb0b9cb..d4b566a73412 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -21,21 +21,21 @@
#include <ndtxt.hxx>
#include <doc.hxx>
-void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd )
+void SwHTMLNumRuleInfo::Set( const SwTextNode& rTextNd )
{
- const SwNumRule* pTxtNdNumRule( rTxtNd.GetNumRule() );
- if ( pTxtNdNumRule &&
- pTxtNdNumRule != rTxtNd.GetDoc()->GetOutlineNumRule() )
+ const SwNumRule* pTextNdNumRule( rTextNd.GetNumRule() );
+ if ( pTextNdNumRule &&
+ pTextNdNumRule != rTextNd.GetDoc()->GetOutlineNumRule() )
{
- pNumRule = const_cast<SwNumRule*>(pTxtNdNumRule);
- nDeep = static_cast< sal_uInt16 >(pNumRule ? rTxtNd.GetActualListLevel() + 1 : 0);
- bNumbered = rTxtNd.IsCountedInList();
+ pNumRule = const_cast<SwNumRule*>(pTextNdNumRule);
+ nDeep = static_cast< sal_uInt16 >(pNumRule ? rTextNd.GetActualListLevel() + 1 : 0);
+ bNumbered = rTextNd.IsCountedInList();
// #i57919# - correction of refactoring done by cws swnumtree:
// <bRestart> has to be set to <true>, if numbering is restarted at this
// text node and the start value equals <USHRT_MAX>.
// Start value <USHRT_MAX> indicates, that at this text node the numbering
// is restarted with the value given at the corresponding level.
- bRestart = rTxtNd.IsListRestart() && !rTxtNd.HasAttrListRestartValue();
+ bRestart = rTextNd.IsListRestart() && !rTextNd.HasAttrListRestartValue();
}
else
{
diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx
index f67190f4aaf5..5b7d861a8c19 100644
--- a/sw/source/filter/html/htmlnum.hxx
+++ b/sw/source/filter/html/htmlnum.hxx
@@ -25,7 +25,7 @@
#define HTML_NUMBUL_MARGINLEFT (MM50*2 + MM50/2)
#define HTML_NUMBUL_INDENT (-MM50)
-class SwTxtNode;
+class SwTextNode;
class SwNumRule;
// TODO: Unicode: Are these characters the correct ones?
@@ -44,7 +44,7 @@ class SwHTMLNumRuleInfo
public:
inline void Set( const SwHTMLNumRuleInfo& rInf );
- void Set( const SwTxtNode& rTxtNd );
+ void Set( const SwTextNode& rTextNd );
SwHTMLNumRuleInfo() :
pNumRule( 0 ), nDeep( 0 ),
@@ -60,7 +60,7 @@ public:
memcpy( &aNumStarts, &rInf.aNumStarts, sizeof( aNumStarts ) );
}
- SwHTMLNumRuleInfo( const SwTxtNode& rTxtNd ) { Set( rTxtNd ); }
+ SwHTMLNumRuleInfo( const SwTextNode& rTextNd ) { Set( rTextNd ); }
inline SwHTMLNumRuleInfo& operator=( const SwHTMLNumRuleInfo& rInf );
inline void Clear();
diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx
index 69a2c28868ce..dc1d49b846f1 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -59,7 +59,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
// Erstmal einen neuen Absatz aufmachen
bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 0;
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
+ AppendTextNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
else if( bSpace )
AddParSpace();
@@ -72,24 +72,24 @@ void SwHTMLParser::NewNumBulList( int nToken )
if( !rInfo.GetNumRule() )
{
sal_uInt16 nPos = pDoc->MakeNumRule( pDoc->GetUniqueNumRuleName() );
- rInfo.SetNumRule( pDoc->GetNumRuleTbl()[nPos] );
+ rInfo.SetNumRule( pDoc->GetNumRuleTable()[nPos] );
}
// das Format anpassen, falls es fuer den Level noch nicht
// geschehen ist!
- bool bNewNumFmt = rInfo.GetNumRule()->GetNumFmt( nLevel ) == 0;
- bool bChangeNumFmt = false;
+ bool bNewNumFormat = rInfo.GetNumRule()->GetNumFormat( nLevel ) == 0;
+ bool bChangeNumFormat = false;
// das default Numerierungsformat erstellen
- SwNumFmt aNumFmt( rInfo.GetNumRule()->Get(nLevel) );
+ SwNumFormat aNumFormat( rInfo.GetNumRule()->Get(nLevel) );
rInfo.SetNodeStartValue( nLevel );
- if( bNewNumFmt )
+ if( bNewNumFormat )
{
- sal_uInt16 nChrFmtPoolId = 0;
+ sal_uInt16 nChrFormatPoolId = 0;
if( HTML_ORDERLIST_ON == nToken )
{
- aNumFmt.SetNumberingType(SVX_NUM_ARABIC);
- nChrFmtPoolId = RES_POOLCHR_NUM_LEVEL;
+ aNumFormat.SetNumberingType(SVX_NUM_ARABIC);
+ nChrFormatPoolId = RES_POOLCHR_NUM_LEVEL;
}
else
{
@@ -100,11 +100,11 @@ void SwHTMLParser::NewNumBulList( int nToken )
// #i63395# - Only apply user defined default bullet font
if ( numfunc::IsDefBulletFontUserDefined() )
{
- aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
+ aNumFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
}
- aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
- aNumFmt.SetBulletChar( cBulletChar ); // das Bulletzeichen !!
- nChrFmtPoolId = RES_POOLCHR_BUL_LEVEL;
+ aNumFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+ aNumFormat.SetBulletChar( cBulletChar ); // das Bulletzeichen !!
+ nChrFormatPoolId = RES_POOLCHR_BUL_LEVEL;
}
sal_uInt16 nAbsLSpace = HTML_NUMBUL_MARGINLEFT;
@@ -112,17 +112,17 @@ void SwHTMLParser::NewNumBulList( int nToken )
short nFirstLineIndent = HTML_NUMBUL_INDENT;
if( nLevel > 0 )
{
- const SwNumFmt& rPrevNumFmt = rInfo.GetNumRule()->Get( nLevel-1 );
- nAbsLSpace = nAbsLSpace + rPrevNumFmt.GetAbsLSpace();
- nFirstLineIndent = rPrevNumFmt.GetFirstLineOffset();
+ const SwNumFormat& rPrevNumFormat = rInfo.GetNumRule()->Get( nLevel-1 );
+ nAbsLSpace = nAbsLSpace + rPrevNumFormat.GetAbsLSpace();
+ nFirstLineIndent = rPrevNumFormat.GetFirstLineOffset();
}
- aNumFmt.SetAbsLSpace( nAbsLSpace );
- aNumFmt.SetFirstLineOffset( nFirstLineIndent );
- aNumFmt.SetCharFmt( pCSS1Parser->GetCharFmtFromPool(nChrFmtPoolId) );
+ aNumFormat.SetAbsLSpace( nAbsLSpace );
+ aNumFormat.SetFirstLineOffset( nFirstLineIndent );
+ aNumFormat.SetCharFormat( pCSS1Parser->GetCharFormatFromPool(nChrFormatPoolId) );
- bChangeNumFmt = true;
+ bChangeNumFormat = true;
}
- else if( 1 != aNumFmt.GetStart() )
+ else if( 1 != aNumFormat.GetStart() )
{
// Wenn die Ebene schon mal benutzt wurde, muss der Start-Wert
// ggf. hart am Absatz gesetzt werden.
@@ -144,26 +144,26 @@ void SwHTMLParser::NewNumBulList( int nToken )
aId = rOption.GetString();
break;
case HTML_O_TYPE:
- if( bNewNumFmt && !rOption.GetString().isEmpty() )
+ if( bNewNumFormat && !rOption.GetString().isEmpty() )
{
switch( nToken )
{
case HTML_ORDERLIST_ON:
- bChangeNumFmt = true;
+ bChangeNumFormat = true;
switch( rOption.GetString()[0] )
{
- case 'A': aNumFmt.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER); break;
- case 'a': aNumFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); break;
- case 'I': aNumFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER); break;
- case 'i': aNumFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER); break;
- default: bChangeNumFmt = false;
+ case 'A': aNumFormat.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER); break;
+ case 'a': aNumFormat.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); break;
+ case 'I': aNumFormat.SetNumberingType(SVX_NUM_ROMAN_UPPER); break;
+ case 'i': aNumFormat.SetNumberingType(SVX_NUM_ROMAN_LOWER); break;
+ default: bChangeNumFormat = false;
}
break;
case HTML_UNORDERLIST_ON:
- aNumFmt.SetBulletChar( (sal_Unicode)rOption.GetEnum(
- aHTMLULTypeTable,aNumFmt.GetBulletChar() ) );
- bChangeNumFmt = true;
+ aNumFormat.SetBulletChar( (sal_Unicode)rOption.GetEnum(
+ aHTMLULTypeTable,aNumFormat.GetBulletChar() ) );
+ bChangeNumFormat = true;
break;
}
}
@@ -171,10 +171,10 @@ void SwHTMLParser::NewNumBulList( int nToken )
case HTML_O_START:
{
sal_uInt16 nStart = (sal_uInt16)rOption.GetNumber();
- if( bNewNumFmt )
+ if( bNewNumFormat )
{
- aNumFmt.SetStart( nStart );
- bChangeNumFmt = true;
+ aNumFormat.SetStart( nStart );
+ bChangeNumFormat = true;
}
else
{
@@ -195,7 +195,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
aDir = rOption.GetString();
break;
case HTML_O_SRC:
- if( bNewNumFmt )
+ if( bNewNumFormat )
{
aBulletSrc = rOption.GetString();
if( !InternalImgToPrivateURL(aBulletSrc) )
@@ -219,7 +219,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
if( !aBulletSrc.isEmpty() )
{
// Eine Bullet-Liste mit Grafiken
- aNumFmt.SetNumberingType(SVX_NUM_BITMAP);
+ aNumFormat.SetNumberingType(SVX_NUM_BITMAP);
// Die Grafik als Brush anlegen
SvxBrushItem aBrushItem( RES_BACKGROUND );
@@ -238,13 +238,13 @@ void SwHTMLParser::NewNumBulList( int nToken )
// Die Ausrichtung auch nur beachten, wenn eine Ausrichtung
// angegeben wurde
- aNumFmt.SetGraphicBrush( &aBrushItem, pTwipSz,
+ aNumFormat.SetGraphicBrush( &aBrushItem, pTwipSz,
text::VertOrientation::NONE!=eVertOri ? &eVertOri : 0);
// Und noch die Grafik merken, um sie in den Absaetzen nicht
// einzufuegen
aBulletGrfs[nLevel] = aBulletSrc;
- bChangeNumFmt = true;
+ bChangeNumFormat = true;
}
else
aBulletGrfs[nLevel].clear();
@@ -266,13 +266,13 @@ void SwHTMLParser::NewNumBulList( int nToken )
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
{
- if( bNewNumFmt )
+ if( bNewNumFormat )
{
if( aPropInfo.bLeftMargin )
{
// Der Der Default-Einzug wurde schon eingefuegt.
sal_uInt16 nAbsLSpace =
- aNumFmt.GetAbsLSpace() - HTML_NUMBUL_MARGINLEFT;
+ aNumFormat.GetAbsLSpace() - HTML_NUMBUL_MARGINLEFT;
if( aPropInfo.nLeftMargin < 0 &&
nAbsLSpace < -aPropInfo.nLeftMargin )
nAbsLSpace = 0U;
@@ -283,16 +283,16 @@ void SwHTMLParser::NewNumBulList( int nToken )
else
nAbsLSpace = nAbsLSpace + (sal_uInt16)aPropInfo.nLeftMargin;
- aNumFmt.SetAbsLSpace( nAbsLSpace );
- bChangeNumFmt = true;
+ aNumFormat.SetAbsLSpace( nAbsLSpace );
+ bChangeNumFormat = true;
}
if( aPropInfo.bTextIndent )
{
short nTextIndent =
static_cast<const SvxLRSpaceItem &>(aItemSet.Get( RES_LR_SPACE ))
- .GetTxtFirstLineOfst();
- aNumFmt.SetFirstLineOffset( nTextIndent );
- bChangeNumFmt = true;
+ .GetTextFirstLineOfst();
+ aNumFormat.SetFirstLineOffset( nTextIndent );
+ bChangeNumFormat = true;
}
}
aPropInfo.bLeftMargin = aPropInfo.bTextIndent = false;
@@ -302,11 +302,11 @@ void SwHTMLParser::NewNumBulList( int nToken )
// #i89812# - Perform change to list style before calling <DoPositioning(..)>,
// because <DoPositioning(..)> may open a new context and thus may
// clear the <SwHTMLNumRuleInfo> instance hold by local variable <rInfo>.
- if( bChangeNumFmt )
+ if( bChangeNumFormat )
{
- rInfo.GetNumRule()->Set( nLevel, aNumFmt );
- pDoc->ChgNumRuleFmts( *rInfo.GetNumRule() );
- bChangeNumFmt = false;
+ rInfo.GetNumRule()->Set( nLevel, aNumFormat );
+ pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
+ bChangeNumFormat = false;
}
DoPositioning( aItemSet, aPropInfo, pCntxt );
@@ -315,16 +315,16 @@ void SwHTMLParser::NewNumBulList( int nToken )
}
}
- if( bChangeNumFmt )
+ if( bChangeNumFormat )
{
- rInfo.GetNumRule()->Set( nLevel, aNumFmt );
- pDoc->ChgNumRuleFmts( *rInfo.GetNumRule() );
+ rInfo.GetNumRule()->Set( nLevel, aNumFormat );
+ pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
}
PushContext( pCntxt );
// die Attribute der neuen Vorlage setzen
- SetTxtCollAttrs( pCntxt );
+ SetTextCollAttrs( pCntxt );
}
void SwHTMLParser::EndNumBulList( int nToken )
@@ -338,16 +338,16 @@ void SwHTMLParser::EndNumBulList( int nToken )
bool bAppend = pPam->GetPoint()->nContent.GetIndex() > 0;
if( !bAppend )
{
- SwTxtNode* pTxtNode = pPam->GetNode().GetTxtNode();
+ SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
- bAppend = (pTxtNode && ! pTxtNode->IsOutline() && pTxtNode->IsCountedInList()) ||
+ bAppend = (pTextNode && ! pTextNode->IsOutline() && pTextNode->IsCountedInList()) ||
HasCurrentParaFlys();
}
bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 1;
if( bAppend )
- AppendTxtNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
+ AppendTextNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
else if( bSpace )
AddParSpace();
@@ -363,43 +363,43 @@ void SwHTMLParser::EndNumBulList( int nToken )
{
// Die noch nicht angepassten Formate werden jetzt noch
// angepasst, damit es sich besser Editieren laesst.
- const SwNumFmt *pRefNumFmt = 0;
+ const SwNumFormat *pRefNumFormat = 0;
bool bChanged = false;
for( sal_uInt16 i=0; i<MAXLEVEL; i++ )
{
- const SwNumFmt *pNumFmt = rInfo.GetNumRule()->GetNumFmt(i);
- if( pNumFmt )
+ const SwNumFormat *pNumFormat = rInfo.GetNumRule()->GetNumFormat(i);
+ if( pNumFormat )
{
- pRefNumFmt = pNumFmt;
+ pRefNumFormat = pNumFormat;
}
- else if( pRefNumFmt )
+ else if( pRefNumFormat )
{
- SwNumFmt aNumFmt( rInfo.GetNumRule()->Get(i) );
- aNumFmt.SetNumberingType(pRefNumFmt->GetNumberingType() != SVX_NUM_BITMAP
- ? pRefNumFmt->GetNumberingType() : style::NumberingType::CHAR_SPECIAL);
- if( SVX_NUM_CHAR_SPECIAL == aNumFmt.GetNumberingType() )
+ SwNumFormat aNumFormat( rInfo.GetNumRule()->Get(i) );
+ aNumFormat.SetNumberingType(pRefNumFormat->GetNumberingType() != SVX_NUM_BITMAP
+ ? pRefNumFormat->GetNumberingType() : style::NumberingType::CHAR_SPECIAL);
+ if( SVX_NUM_CHAR_SPECIAL == aNumFormat.GetNumberingType() )
{
// #i63395# - Only apply user defined default bullet font
if ( numfunc::IsDefBulletFontUserDefined() )
{
- aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
+ aNumFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
}
- aNumFmt.SetBulletChar( cBulletChar );
+ aNumFormat.SetBulletChar( cBulletChar );
}
- aNumFmt.SetAbsLSpace( (i+1) * HTML_NUMBUL_MARGINLEFT );
- aNumFmt.SetFirstLineOffset( HTML_NUMBUL_INDENT );
- aNumFmt.SetCharFmt( pRefNumFmt->GetCharFmt() );
- rInfo.GetNumRule()->Set( i, aNumFmt );
+ aNumFormat.SetAbsLSpace( (i+1) * HTML_NUMBUL_MARGINLEFT );
+ aNumFormat.SetFirstLineOffset( HTML_NUMBUL_INDENT );
+ aNumFormat.SetCharFormat( pRefNumFormat->GetCharFormat() );
+ rInfo.GetNumRule()->Set( i, aNumFormat );
bChanged = true;
}
}
if( bChanged )
- pDoc->ChgNumRuleFmts( *rInfo.GetNumRule() );
+ pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
// Beim letzen Append wurde das NumRule-Item und das
// NodeNum-Objekt mit kopiert. Beides muessen wir noch
// loeschen. Das ResetAttr loescht das NodeNum-Objekt mit!
- pPam->GetNode().GetTxtNode()->ResetAttr( RES_PARATR_NUMRULE );
+ pPam->GetNode().GetTextNode()->ResetAttr( RES_PARATR_NUMRULE );
rInfo.Clear();
}
@@ -420,7 +420,7 @@ void SwHTMLParser::EndNumBulList( int nToken )
}
if( nToken )
- SetTxtCollAttrs();
+ SetTextCollAttrs();
if( bSetAttrs )
SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
@@ -466,7 +466,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
// einen neuen Absatz aufmachen
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( AM_NOSPACE, false );
+ AppendTextNode( AM_NOSPACE, false );
bNoParSpace = false; // In <LI> wird kein Abstand eingefuegt!
const bool bCountedInList = nToken != HTML_LISTHEADER_ON;
@@ -483,17 +483,17 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
aNumRuleName = pDoc->GetUniqueNumRuleName();
SwNumRule aNumRule( aNumRuleName,
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
- SwNumFmt aNumFmt( aNumRule.Get( 0 ) );
+ SwNumFormat aNumFormat( aNumRule.Get( 0 ) );
// #i63395# - Only apply user defined default bullet font
if ( numfunc::IsDefBulletFontUserDefined() )
{
- aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
+ aNumFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
}
- aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
- aNumFmt.SetBulletChar( cBulletChar ); // das Bulletzeichen !!
- aNumFmt.SetCharFmt( pCSS1Parser->GetCharFmtFromPool(RES_POOLCHR_BUL_LEVEL) );
- aNumFmt.SetFirstLineOffset( HTML_NUMBUL_INDENT );
- aNumRule.Set( 0, aNumFmt );
+ aNumFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+ aNumFormat.SetBulletChar( cBulletChar ); // das Bulletzeichen !!
+ aNumFormat.SetCharFormat( pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_BUL_LEVEL) );
+ aNumFormat.SetFirstLineOffset( HTML_NUMBUL_INDENT );
+ aNumRule.Set( 0, aNumFormat );
pDoc->MakeNumRule( aNumRuleName, &aNumRule );
@@ -501,18 +501,18 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
"Jetzt geht ein offenes Absatz-Element verloren" );
// Wir tun so, als ob wir in einem Absatz sind. Dann wird
// beim naechsten Absatz wenigstens die Numerierung
- // weggeschmissen, die nach dem naechsten AppendTxtNode uebernommen
+ // weggeschmissen, die nach dem naechsten AppendTextNode uebernommen
// wird.
nOpenParaToken = static_cast< sal_uInt16 >(nToken);
}
- SwTxtNode* pTxtNode = pPam->GetNode().GetTxtNode();
- ((SwCntntNode *)pTxtNode)->SetAttr( SwNumRuleItem(aNumRuleName) );
- pTxtNode->SetAttrListLevel(nLevel);
+ SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
+ ((SwContentNode *)pTextNode)->SetAttr( SwNumRuleItem(aNumRuleName) );
+ pTextNode->SetAttrListLevel(nLevel);
// #i57656# - <IsCounted()> state of text node has to be adjusted accordingly.
if ( nLevel < MAXLEVEL )
{
- pTxtNode->SetCountedInList( bCountedInList );
+ pTextNode->SetCountedInList( bCountedInList );
}
// #i57919#
// correction of refactoring done by cws swnumtree
@@ -521,8 +521,8 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
// restarted at this text node
if ( nStart != USHRT_MAX )
{
- pTxtNode->SetListRestart( true );
- pTxtNode->SetAttrListRestartValue( nStart );
+ pTextNode->SetListRestart( true );
+ pTextNode->SetAttrListRestartValue( nStart );
}
if( GetNumInfo().GetNumRule() )
@@ -544,7 +544,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
PushContext( pCntxt );
// die neue Vorlage setzen
- SetTxtCollAttrs( pCntxt );
+ SetTextCollAttrs( pCntxt );
// Laufbalkenanzeige aktualisieren
ShowStatline();
@@ -555,7 +555,7 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl,
{
// einen neuen Absatz aufmachen
if( !nToken && pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( AM_NOSPACE );
+ AppendTextNode( AM_NOSPACE );
// Kontext zu dem Token suchen und vom Stack holen
_HTMLAttrContext *pCntxt = 0;
@@ -594,20 +594,20 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl,
// und die bisherige Vorlage setzen
if( bSetColl )
- SetTxtCollAttrs();
+ SetTextCollAttrs();
}
void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList )
{
- SwTxtNode* pTxtNode = pPam->GetNode().GetTxtNode();
- OSL_ENSURE( pTxtNode, "Kein Text-Node an PaM-Position" );
+ SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
+ OSL_ENSURE( pTextNode, "Kein Text-Node an PaM-Position" );
OSL_ENSURE( GetNumInfo().GetNumRule(), "Kein Numerierungs-Regel" );
const OUString& rName = GetNumInfo().GetNumRule()->GetName();
- ((SwCntntNode *)pTxtNode)->SetAttr( SwNumRuleItem(rName) );
+ ((SwContentNode *)pTextNode)->SetAttr( SwNumRuleItem(rName) );
- pTxtNode->SetAttrListLevel( nLevel );
- pTxtNode->SetCountedInList( bCountedInList );
+ pTextNode->SetAttrListLevel( nLevel );
+ pTextNode->SetCountedInList( bCountedInList );
// NumRule invalidieren, weil sie durch ein EndAction bereits
// auf valid geschaltet worden sein kann.
diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx
index 94c57e303e4f..127d08c22fc2 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -53,10 +53,10 @@ void SwHTMLWriter::FillNextNumInfo()
do
{
const SwNode* pNd = pDoc->GetNodes()[nPos];
- if( pNd->IsTxtNode() )
+ if( pNd->IsTextNode() )
{
// Der naechste wird als naechstes ausgegeben.
- pNextNumRuleInfo = new SwHTMLNumRuleInfo( *pNd->GetTxtNode() );
+ pNextNumRuleInfo = new SwHTMLNumRuleInfo( *pNd->GetTextNode() );
// Vor einer Tabelle behalten wir erst einmal die alte Ebene bei,
// wenn die gleiche Numerierung hinter der Tabelle
@@ -126,19 +126,19 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
do
{
const SwNode* pNd = rWrt.pDoc->GetNodes()[nPos];
- if( pNd->IsTxtNode() )
+ if( pNd->IsTextNode() )
{
- const SwTxtNode *pTxtNd = pNd->GetTxtNode();
- if( !pTxtNd->GetNumRule() )
+ const SwTextNode *pTextNd = pNd->GetTextNode();
+ if( !pTextNd->GetNumRule() )
{
// node isn't numbered => check completed
break;
}
- OSL_ENSURE(! pTxtNd->IsOutline(),
+ OSL_ENSURE(! pTextNd->IsOutline(),
"outline not expected");
- if( pTxtNd->GetActualListLevel() + 1 <
+ if( pTextNd->GetActualListLevel() + 1 <
rInfo.GetDepth() )
{
// node is numbered, but level is lower
@@ -182,8 +182,8 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
rWrt.aBulletGrfs[i].clear();
OStringBuffer sOut;
sOut.append('<');
- const SwNumFmt& rNumFmt = rInfo.GetNumRule()->Get( i );
- sal_Int16 eType = rNumFmt.GetNumberingType();
+ const SwNumFormat& rNumFormat = rInfo.GetNumRule()->Get( i );
+ sal_Int16 eType = rNumFormat.GetNumberingType();
if( SVX_NUM_CHAR_SPECIAL == eType )
{
// Aufzaehlungs-Liste: <OL>
@@ -191,7 +191,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
// den Typ ueber das Bullet-Zeichen bestimmen
const sal_Char *pStr = 0;
- switch( rNumFmt.GetBulletChar() )
+ switch( rNumFormat.GetBulletChar() )
{
case HTML_BULLETCHAR_DISC:
pStr = OOO_STRING_SVTOOLS_HTML_ULTYPE_disc;
@@ -217,7 +217,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
OutHTML_BulletImage( rWrt,
0,
- rNumFmt.GetBrush() );
+ rNumFormat.GetBrush() );
}
else
{
@@ -249,14 +249,14 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
append("=\"").append(cType).append("\"");
}
- sal_uInt16 nStartVal = rNumFmt.GetStart();
+ sal_uInt16 nStartVal = rNumFormat.GetStart();
if( bStartValue && 1 == nStartVal && i == rInfo.GetDepth()-1 )
{
// #i51089 - TUNING#
- if ( rWrt.pCurPam->GetNode().GetTxtNode()->GetNum() )
+ if ( rWrt.pCurPam->GetNode().GetTextNode()->GetNum() )
{
nStartVal = static_cast< sal_uInt16 >( rWrt.pCurPam->GetNode()
- .GetTxtNode()->GetNumberVector()[i] );
+ .GetTextNode()->GetNumberVector()[i] );
}
else
{
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 213b6b08a445..b9e14257454a 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -196,7 +196,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize,
}
// Size setzen
- SwFmtFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
+ SwFormatFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
aFrmSize.SetWidthPercent( nPrcWidth );
aFrmSize.SetHeightPercent( nPrcHeight );
rFlyItemSet.Put( aFrmSize );
@@ -226,7 +226,7 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
// Ggf. den Erstzeilen-Einzug noch plaetten
const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
SvxLRSpaceItem aLRItem( *pLRItem );
- aLRItem.SetTxtFirstLineOfst( 0 );
+ aLRItem.SetTextFirstLineOfst( 0 );
if( rCSS1PropInfo.bLeftMargin )
{
nLeftSpace = aLRItem.GetLeft();
@@ -247,11 +247,11 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
rFlyItemSet.Put( aLRItem );
if( nLeftSpace )
{
- const SwFmtHoriOrient& rHoriOri =
- static_cast<const SwFmtHoriOrient&>(rFlyItemSet.Get( RES_HORI_ORIENT ));
+ const SwFormatHoriOrient& rHoriOri =
+ static_cast<const SwFormatHoriOrient&>(rFlyItemSet.Get( RES_HORI_ORIENT ));
if( text::HoriOrientation::NONE == rHoriOri.GetHoriOrient() )
{
- SwFmtHoriOrient aHoriOri( rHoriOri );
+ SwFormatHoriOrient aHoriOri( rHoriOri );
aHoriOri.SetPos( aHoriOri.GetPos() + nLeftSpace );
rFlyItemSet.Put( aHoriOri );
}
@@ -283,11 +283,11 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
rFlyItemSet.Put( aULItem );
if( nUpperSpace )
{
- const SwFmtVertOrient& rVertOri =
- static_cast<const SwFmtVertOrient&>(rFlyItemSet.Get( RES_VERT_ORIENT ));
+ const SwFormatVertOrient& rVertOri =
+ static_cast<const SwFormatVertOrient&>(rFlyItemSet.Get( RES_VERT_ORIENT ));
if( text::VertOrientation::NONE == rVertOri.GetVertOrient() )
{
- SwFmtVertOrient aVertOri( rVertOri );
+ SwFormatVertOrient aVertOri( rVertOri );
aVertOri.SetPos( aVertOri.GetPos() + nUpperSpace );
rFlyItemSet.Put( aVertOri );
}
@@ -440,7 +440,7 @@ void SwHTMLParser::InsertEmbed()
SfxItemSet aFrmSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs( aFrmSet );
+ Reader::ResetFrameFormatAttrs( aFrmSet );
// den Anker setzen
if( !bHidden )
@@ -449,12 +449,12 @@ void SwHTMLParser::InsertEmbed()
}
else
{
- SwFmtAnchor aAnchor( FLY_AT_PARA );
+ SwFormatAnchor aAnchor( FLY_AT_PARA );
aAnchor.SetAnchor( pPam->GetPoint() );
aFrmSet.Put( aAnchor );
- aFrmSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME) );
- aFrmSet.Put( SwFmtSurround( SURROUND_THROUGHT ) );
- aFrmSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) );
+ aFrmSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME) );
+ aFrmSet.Put( SwFormatSurround( SURROUND_THROUGHT ) );
+ aFrmSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) );
}
// und noch die Groesse des Rahmens
@@ -464,18 +464,18 @@ void SwHTMLParser::InsertEmbed()
SetSpace( aSpace, aItemSet, aPropInfo, aFrmSet );
// und in das Dok einfuegen
- SwFrmFmt* pFlyFmt =
+ SwFrameFormat* pFlyFormat =
pDoc->getIDocumentContentOperations().Insert( *pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, NULL, NULL );
- // Namen am FrmFmt setzen
+ // Namen am FrameFormat setzen
if( !aName.isEmpty() )
- pFlyFmt->SetName( aName );
+ pFlyFormat->SetName( aName );
// den alternativen Text setzen
- SwNoTxtNode *pNoTxtNd =
- pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()
- ->GetIndex()+1 ]->GetNoTxtNode();
- pNoTxtNd->SetTitle( aAlt );
+ SwNoTextNode *pNoTextNd =
+ pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+ ->GetIndex()+1 ]->GetNoTextNode();
+ pNoTextNd->SetTitle( aAlt );
// Ggf Frames anlegen und auto-geb. Rahmen registrieren
if( !bHidden )
@@ -483,7 +483,7 @@ void SwHTMLParser::InsertEmbed()
// HIDDEN-Plugins sollen absatzgebunden bleiben. Da RegisterFlyFrm
// absatzgebundene Rahmen mit DUrchlauf in am Zeichen gebundene
// Rahmen umwandelt, muessen die Frames hier von Hand angelegt werden.
- RegisterFlyFrm( pFlyFmt );
+ RegisterFlyFrm( pFlyFormat );
}
}
@@ -613,7 +613,7 @@ void SwHTMLParser::NewObject()
SfxItemSet& rFrmSet = pAppletImpl->GetItemSet();
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs( rFrmSet );
+ Reader::ResetFrameFormatAttrs( rFrmSet );
// den Anker und die Ausrichtung setzen
SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrmSet );
@@ -636,7 +636,7 @@ void SwHTMLParser::EndObject()
pAppletImpl->FinishApplet();
// und in das Dok einfuegen
- SwFrmFmt* pFlyFmt =
+ SwFrameFormat* pFlyFormat =
pDoc->getIDocumentContentOperations().Insert( *pPam,
::svt::EmbeddedObjectRef( pAppletImpl->GetApplet(), embed::Aspects::MSOLE_CONTENT ),
&pAppletImpl->GetItemSet(),
@@ -644,13 +644,13 @@ void SwHTMLParser::EndObject()
NULL );
// den alternativen Namen setzen
- SwNoTxtNode *pNoTxtNd =
- pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()
- ->GetIndex()+1 ]->GetNoTxtNode();
- pNoTxtNd->SetTitle( pAppletImpl->GetAltText() );
+ SwNoTextNode *pNoTextNd =
+ pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+ ->GetIndex()+1 ]->GetNoTextNode();
+ pNoTextNd->SetTitle( pAppletImpl->GetAltText() );
// Ggf Frames anlegen und auto-geb. Rahmen registrieren
- RegisterFlyFrm( pFlyFmt );
+ RegisterFlyFrm( pFlyFormat );
delete pAppletImpl;
pAppletImpl = 0;
@@ -746,7 +746,7 @@ void SwHTMLParser::InsertApplet()
SfxItemSet& rFrmSet = pAppletImpl->GetItemSet();
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs( rFrmSet );
+ Reader::ResetFrameFormatAttrs( rFrmSet );
// den Anker und die Ausrichtung setzen
SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrmSet );
@@ -768,7 +768,7 @@ void SwHTMLParser::EndApplet()
pAppletImpl->FinishApplet();
// und in das Dok einfuegen
- SwFrmFmt* pFlyFmt =
+ SwFrameFormat* pFlyFormat =
pDoc->getIDocumentContentOperations().Insert( *pPam,
::svt::EmbeddedObjectRef( pAppletImpl->GetApplet(), embed::Aspects::MSOLE_CONTENT ),
&pAppletImpl->GetItemSet(),
@@ -776,13 +776,13 @@ void SwHTMLParser::EndApplet()
NULL );
// den alternativen Namen setzen
- SwNoTxtNode *pNoTxtNd =
- pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()
- ->GetIndex()+1 ]->GetNoTxtNode();
- pNoTxtNd->SetTitle( pAppletImpl->GetAltText() );
+ SwNoTextNode *pNoTextNd =
+ pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+ ->GetIndex()+1 ]->GetNoTextNode();
+ pNoTextNd->SetTitle( pAppletImpl->GetAltText() );
// Ggf Frames anlegen und auto-geb. Rahmen registrieren
- RegisterFlyFrm( pFlyFmt );
+ RegisterFlyFrm( pFlyFormat );
delete pAppletImpl;
pAppletImpl = 0;
@@ -926,7 +926,7 @@ void SwHTMLParser::InsertFloatingFrame()
SfxItemSet aFrmSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs( aFrmSet );
+ Reader::ResetFrameFormatAttrs( aFrmSet );
// den Anker und die Ausrichtung setzen
SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrmSet );
@@ -938,17 +938,17 @@ void SwHTMLParser::InsertFloatingFrame()
SetSpace( aSpace, aItemSet, aPropInfo, aFrmSet );
// und in das Dok einfuegen
- SwFrmFmt* pFlyFmt =
+ SwFrameFormat* pFlyFormat =
pDoc->getIDocumentContentOperations().Insert( *pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, NULL, NULL );
// den alternativen Namen setzen
- SwNoTxtNode *pNoTxtNd =
- pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()
- ->GetIndex()+1 ]->GetNoTxtNode();
- pNoTxtNd->SetTitle( aAlt );
+ SwNoTextNode *pNoTextNd =
+ pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+ ->GetIndex()+1 ]->GetNoTextNode();
+ pNoTextNd->SetTitle( aAlt );
// Ggf Frames anlegen und auto-geb. Rahmen registrieren
- RegisterFlyFrm( pFlyFmt );
+ RegisterFlyFrm( pFlyFormat );
bInFloatingFrame = true;
}
@@ -979,13 +979,13 @@ sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode )
return static_cast< sal_uInt16 >(eType);
}
-Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFormat,
bool bInCntnr )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
- sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
+ const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+ sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex()+1;
SwOLENode *pOLENd = rHTMLWrt.pDoc->GetNodes()[ nStt ]->GetOLENode();
OSL_ENSURE( pOLENd, "OLE-Node erwartet" );
@@ -1013,8 +1013,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
if( rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine( true );
- if( !rFrmFmt.GetName().isEmpty() )
- rHTMLWrt.OutImplicitMark( rFrmFmt.GetName(),
+ if( !rFrameFormat.GetName().isEmpty() )
+ rHTMLWrt.OutImplicitMark( rFrameFormat.GetName(),
"ole" );
uno::Any aAny;
SvGlobalName aGlobName( xObj->getClassID() );
@@ -1054,8 +1054,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
sOut.append('\"');
}
- if ((FLY_AT_PARA == rFrmFmt.GetAnchor().GetAnchorId()) &&
- SURROUND_THROUGHT == rFrmFmt.GetSurround().GetSurround() )
+ if ((FLY_AT_PARA == rFrameFormat.GetAnchor().GetAnchorId()) &&
+ SURROUND_THROUGHT == rFrameFormat.GetSurround().GetSurround() )
{
// Das Plugin ist HIDDEN
sOut.append(' ').append(OOO_STRING_SW_HTML_O_Hidden);
@@ -1143,9 +1143,9 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
// ALT, WIDTH, HEIGHT, HSPACE, VSPACE, ALIGN
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
nFrmOpts |= HTML_FRMOPTS_OLE_CSS1;
- OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, pOLENd->GetTitle(), nFrmOpts );
+ OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, pOLENd->GetTitle(), nFrmOpts );
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
- rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts );
+ rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmOpts );
if( aGlobName == SvGlobalName( SO3_APPLET_CLASSID ) )
{
@@ -1248,13 +1248,13 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
return rWrt;
}
-Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+Writer& OutHTML_FrameFormatOLENodeGrf( Writer& rWrt, const SwFrameFormat& rFrameFormat,
bool bInCntnr )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
- const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
- sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
+ const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+ sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex()+1;
SwOLENode *pOLENd = rHTMLWrt.pDoc->GetNodes()[ nStt ]->GetOLENode();
OSL_ENSURE( pOLENd, "OLE-Node erwartet" );
@@ -1265,10 +1265,10 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
{
// If we skip images, embedded objects would be completely lost.
// Instead, try to use the HTML export of the embedded object.
- uno::Reference<text::XTextContent> xTextContent = SwXTextEmbeddedObject::CreateXTextEmbeddedObject(*rHTMLWrt.pDoc, const_cast<SwFrmFmt*>(&rFrmFmt));
+ uno::Reference<text::XTextContent> xTextContent = SwXTextEmbeddedObject::CreateXTextEmbeddedObject(*rHTMLWrt.pDoc, const_cast<SwFrameFormat*>(&rFrameFormat));
uno::Reference<document::XEmbeddedObjectSupplier2> xEmbeddedObjectSupplier(xTextContent, uno::UNO_QUERY);
uno::Reference<frame::XStorable> xStorable(xEmbeddedObjectSupplier->getEmbeddedObject(), uno::UNO_QUERY);
- SAL_WARN_IF(!xStorable.is(), "sw.html", "OutHTML_FrmFmtOLENodeGrf: no embedded object");
+ SAL_WARN_IF(!xStorable.is(), "sw.html", "OutHTML_FrameFormatOLENodeGrf: no embedded object");
// Figure out what is the filter name of the embedded object.
uno::Reference<lang::XServiceInfo> xServiceInfo(xStorable, uno::UNO_QUERY);
@@ -1310,7 +1310,7 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
Graphic aGraphic( *pOLENd->GetGraphic() );
sal_uLong nFlags = bInCntnr ? HTML_FRMOPTS_GENIMG_CNTNR
: HTML_FRMOPTS_GENIMG;
- OutHTML_Image( rWrt, rFrmFmt, aGraphic,
+ OutHTML_Image( rWrt, rFrameFormat, aGraphic,
pOLENd->GetTitle(), pOLENd->GetTwipSize(),
nFlags, "ole" );
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 3c495d0f4c73..9b5325d8af4e 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -112,7 +112,7 @@ void SwHTMLParser::NewDivision( int nToken )
bool bAppended = false;
if( pPam->GetPoint()->nContent.GetIndex() )
{
- AppendTxtNode( bHeader||bFooter||!aId.isEmpty()|| !aHRef.isEmpty() ? AM_NORMAL
+ AppendTextNode( bHeader||bFooter||!aId.isEmpty()|| !aHRef.isEmpty() ? AM_NORMAL
: AM_NOSPACE );
bAppended = true;
}
@@ -145,58 +145,58 @@ void SwHTMLParser::NewDivision( int nToken )
if( !bPositioned && (bHeader || bFooter) && IsNewDoc() )
{
SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc();
- SwFrmFmt& rPageFmt = pPageDesc->GetMaster();
+ SwFrameFormat& rPageFormat = pPageDesc->GetMaster();
- SwFrmFmt *pHdFtFmt;
+ SwFrameFormat *pHdFtFormat;
bool bNew = false;
sal_uInt16 nFlags = CONTEXT_FLAGS_HDRFTR;
if( bHeader )
{
- pHdFtFmt = const_cast<SwFrmFmt*>(rPageFmt.GetHeader().GetHeaderFmt());
- if( !pHdFtFmt )
+ pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetHeader().GetHeaderFormat());
+ if( !pHdFtFormat )
{
// noch keine Header, dann erzeuge einen.
- rPageFmt.SetFmtAttr( SwFmtHeader( true ));
- pHdFtFmt = const_cast<SwFrmFmt*>(rPageFmt.GetHeader().GetHeaderFmt());
+ rPageFormat.SetFormatAttr( SwFormatHeader( true ));
+ pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetHeader().GetHeaderFormat());
bNew = true;
}
nFlags |= HTML_CNTXT_HEADER_DIST;
}
else
{
- pHdFtFmt = const_cast<SwFrmFmt*>(rPageFmt.GetFooter().GetFooterFmt());
- if( !pHdFtFmt )
+ pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetFooter().GetFooterFormat());
+ if( !pHdFtFormat )
{
// noch keine Footer, dann erzeuge einen.
- rPageFmt.SetFmtAttr( SwFmtFooter( true ));
- pHdFtFmt = const_cast<SwFrmFmt*>(rPageFmt.GetFooter().GetFooterFmt());
+ rPageFormat.SetFormatAttr( SwFormatFooter( true ));
+ pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetFooter().GetFooterFormat());
bNew = true;
}
nFlags |= HTML_CNTXT_FOOTER_DIST;
}
- const SwFmtCntnt& rFlyCntnt = pHdFtFmt->GetCntnt();
- const SwNodeIndex& rCntntStIdx = *rFlyCntnt.GetCntntIdx();
- SwCntntNode *pCNd;
+ const SwFormatContent& rFlyContent = pHdFtFormat->GetContent();
+ const SwNodeIndex& rContentStIdx = *rFlyContent.GetContentIdx();
+ SwContentNode *pCNd;
if( bNew )
{
- pCNd = pDoc->GetNodes()[rCntntStIdx.GetIndex()+1]
- ->GetCntntNode();
+ pCNd = pDoc->GetNodes()[rContentStIdx.GetIndex()+1]
+ ->GetContentNode();
}
else
{
// Einen neuen Node zu Beginn der Section anlegen
- SwNodeIndex aSttIdx( rCntntStIdx, 1 );
- pCNd = pDoc->GetNodes().MakeTxtNode( aSttIdx,
- pCSS1Parser->GetTxtCollFromPool(RES_POOLCOLL_TEXT));
+ SwNodeIndex aSttIdx( rContentStIdx, 1 );
+ pCNd = pDoc->GetNodes().MakeTextNode( aSttIdx,
+ pCSS1Parser->GetTextCollFromPool(RES_POOLCOLL_TEXT));
// Den bisherigen Inhalt der Section loeschen
SwPaM aDelPam( aSttIdx );
aDelPam.SetMark();
const SwStartNode *pStNd =
- static_cast<const SwStartNode *>( &rCntntStIdx.GetNode() );
+ static_cast<const SwStartNode *>( &rContentStIdx.GetNode() );
aDelPam.GetPoint()->nNode = pStNd->EndOfSectionIndex() - 1;
pDoc->getIDocumentContentOperations().DelFullPara( aDelPam );
@@ -204,7 +204,7 @@ void SwHTMLParser::NewDivision( int nToken )
// Die Seitenvorlage aktualisieren
for( size_t i=0; i < pDoc->GetPageDescCnt(); i++ )
{
- if( RES_POOLPAGE_HTML == pDoc->GetPageDesc(i).GetPoolFmtId() )
+ if( RES_POOLPAGE_HTML == pDoc->GetPageDesc(i).GetPoolFormatId() )
{
pDoc->ChgPageDesc( i, *pPageDesc );
break;
@@ -212,7 +212,7 @@ void SwHTMLParser::NewDivision( int nToken )
}
}
- SwPosition aNewPos( SwNodeIndex( rCntntStIdx, 1 ), SwIndex( pCNd, 0 ) );
+ SwPosition aNewPos( SwNodeIndex( rContentStIdx, 1 ), SwIndex( pCNd, 0 ) );
SaveDocContext( pCntxt, nFlags, &aNewPos );
}
else if( !bPositioned && aId.getLength() > 9 &&
@@ -229,8 +229,8 @@ void SwHTMLParser::NewDivision( int nToken )
SwNodeIndex *pStartNdIdx = GetFootEndNoteSection( aId );
if( pStartNdIdx )
{
- SwCntntNode *pCNd =
- pDoc->GetNodes()[pStartNdIdx->GetIndex()+1]->GetCntntNode();
+ SwContentNode *pCNd =
+ pDoc->GetNodes()[pStartNdIdx->GetIndex()+1]->GetContentNode();
SwNodeIndex aTmpSwNodeIndex = SwNodeIndex(*pCNd);
SwPosition aNewPos( aTmpSwNodeIndex, SwIndex( pCNd, 0 ) );
SaveDocContext( pCntxt, CONTEXT_FLAGS_FTN, &aNewPos );
@@ -255,7 +255,7 @@ void SwHTMLParser::NewDivision( int nToken )
SwNodeIndex aPrvNdIdx( pPam->GetPoint()->nNode, -1 );
if (aPrvNdIdx.GetNode().IsSectionNode())
{
- AppendTxtNode();
+ AppendTextNode();
bAppended = true;
}
}
@@ -316,7 +316,7 @@ void SwHTMLParser::NewDivision( int nToken )
SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs(aFrmItemSet );
+ Reader::ResetFrameFormatAttrs(aFrmItemSet );
const SfxPoolItem *pItem;
if( SfxItemState::SET == aItemSet.GetItemState( RES_BACKGROUND, false,
@@ -341,15 +341,15 @@ void SwHTMLParser::NewDivision( int nToken )
eJumpTo = JUMPTO_NONE;
}
- SwTxtNode* pOldTxtNd =
- (bAppended) ? 0 : pPam->GetPoint()->nNode.GetNode().GetTxtNode();
+ SwTextNode* pOldTextNd =
+ (bAppended) ? 0 : pPam->GetPoint()->nNode.GetNode().GetTextNode();
pPam->Move( fnMoveBackward );
- // PageDesc- und SwFmtBreak Attribute vom aktuellen Node in den
+ // PageDesc- und SwFormatBreak Attribute vom aktuellen Node in den
// (ersten) Node des Bereich verschieben.
- if( pOldTxtNd )
- MovePageDescAttrs( pOldTxtNd, pPam->GetPoint()->nNode.GetIndex(),
+ if( pOldTextNd )
+ MovePageDescAttrs( pOldTextNd, pPam->GetPoint()->nNode.GetIndex(),
true );
if( pPostIts )
@@ -416,20 +416,20 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
const SwPosition *pOldPos )
{
SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc();
- SwFrmFmt& rPageFmt = pPageDesc->GetMaster();
+ SwFrameFormat& rPageFormat = pPageDesc->GetMaster();
- SwFrmFmt *pHdFtFmt =
- bHeader ? const_cast<SwFrmFmt*>(rPageFmt.GetHeader().GetHeaderFmt())
- : const_cast<SwFrmFmt*>(rPageFmt.GetFooter().GetFooterFmt());
- OSL_ENSURE( pHdFtFmt, "Doch keine Kopf- oder Fusszeile" );
+ SwFrameFormat *pHdFtFormat =
+ bHeader ? const_cast<SwFrameFormat*>(rPageFormat.GetHeader().GetHeaderFormat())
+ : const_cast<SwFrameFormat*>(rPageFormat.GetFooter().GetFooterFormat());
+ OSL_ENSURE( pHdFtFormat, "Doch keine Kopf- oder Fusszeile" );
- const SwFmtCntnt& rFlyCntnt = pHdFtFmt->GetCntnt();
- const SwNodeIndex& rCntntStIdx = *rFlyCntnt.GetCntntIdx();
+ const SwFormatContent& rFlyContent = pHdFtFormat->GetContent();
+ const SwNodeIndex& rContentStIdx = *rFlyContent.GetContentIdx();
sal_uLong nPrvNxtIdx;
if( bHeader )
{
- nPrvNxtIdx = rCntntStIdx.GetNode().EndOfSectionIndex()-1;
+ nPrvNxtIdx = rContentStIdx.GetNode().EndOfSectionIndex()-1;
}
else
{
@@ -437,12 +437,12 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
}
sal_uInt16 nSpace = 0;
- SwTxtNode *pTxtNode = pDoc->GetNodes()[nPrvNxtIdx]->GetTxtNode();
- if( pTxtNode )
+ SwTextNode *pTextNode = pDoc->GetNodes()[nPrvNxtIdx]->GetTextNode();
+ if( pTextNode )
{
const SvxULSpaceItem& rULSpace =
- static_cast<const SvxULSpaceItem&>(pTxtNode
- ->SwCntntNode::GetAttr( RES_UL_SPACE ));
+ static_cast<const SvxULSpaceItem&>(pTextNode
+ ->SwContentNode::GetAttr( RES_UL_SPACE ));
// Der untere Absatz-Abstand wird zum Abstand zur
// Kopf- oder Fusszeile
@@ -451,11 +451,11 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
// und anschliessend auf einen vernuenftigen Wert
// gesetzt
const SvxULSpaceItem& rCollULSpace =
- pTxtNode->GetAnyFmtColl().GetULSpace();
+ pTextNode->GetAnyFormatColl().GetULSpace();
if( rCollULSpace.GetUpper() == rULSpace.GetUpper() )
- pTxtNode->ResetAttr( RES_UL_SPACE );
+ pTextNode->ResetAttr( RES_UL_SPACE );
else
- pTxtNode->SetAttr(
+ pTextNode->SetAttr(
SvxULSpaceItem( rULSpace.GetUpper(),
rCollULSpace.GetLower(), RES_UL_SPACE ) );
}
@@ -466,16 +466,16 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
}
else
{
- nPrvNxtIdx = rCntntStIdx.GetIndex() + 1;
+ nPrvNxtIdx = rContentStIdx.GetIndex() + 1;
}
- pTxtNode = pDoc->GetNodes()[nPrvNxtIdx]
- ->GetTxtNode();
- if( pTxtNode )
+ pTextNode = pDoc->GetNodes()[nPrvNxtIdx]
+ ->GetTextNode();
+ if( pTextNode )
{
const SvxULSpaceItem& rULSpace =
- static_cast<const SvxULSpaceItem&>(pTxtNode
- ->SwCntntNode::GetAttr( RES_UL_SPACE ));
+ static_cast<const SvxULSpaceItem&>(pTextNode
+ ->SwContentNode::GetAttr( RES_UL_SPACE ));
// Der obere Absatz-Abstand wird zum Abstand zur
// Kopf- oder Fusszeile, wenn er groesser ist als
@@ -485,11 +485,11 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
// und anschliessend auf einen vernuenftigen Wert gesetzt
const SvxULSpaceItem& rCollULSpace =
- pTxtNode->GetAnyFmtColl().GetULSpace();
+ pTextNode->GetAnyFormatColl().GetULSpace();
if( rCollULSpace.GetLower() == rULSpace.GetLower() )
- pTxtNode->ResetAttr( RES_UL_SPACE );
+ pTextNode->ResetAttr( RES_UL_SPACE );
else
- pTxtNode->SetAttr(
+ pTextNode->SetAttr(
SvxULSpaceItem( rCollULSpace.GetUpper(),
rULSpace.GetLower(), RES_UL_SPACE ) );
}
@@ -500,7 +500,7 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
else
aULSpace.SetUpper( nSpace );
- pHdFtFmt->SetFmtAttr( aULSpace );
+ pHdFtFormat->SetFormatAttr( aULSpace );
}
bool SwHTMLParser::EndSection( bool bLFStripped )
@@ -621,7 +621,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs(aFrmItemSet );
+ Reader::ResetFrameFormatAttrs(aFrmItemSet );
SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, aItemSet, aPropInfo,
aFrmItemSet );
@@ -635,7 +635,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
// Set some other frame attributes. If the background is set, its
// it will be cleared here. That for, it won't be set at the section,
// too.
- SetFrmFmtAttrs( aItemSet, aPropInfo,
+ SetFrameFormatAttrs( aItemSet, aPropInfo,
HTML_FF_BOX|HTML_FF_BACKGROUND|HTML_FF_PADDING|HTML_FF_DIRECTION,
aFrmItemSet );
@@ -659,7 +659,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
{
if( pPam->GetPoint()->nContent.GetIndex() )
{
- AppendTxtNode( AM_SPACE );
+ AppendTextNode( AM_SPACE );
bAppended = true;
}
else
@@ -679,7 +679,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
SwNodeIndex aPrvNdIdx( pPam->GetPoint()->nNode, -1 );
if (aPrvNdIdx.GetNode().IsSectionNode())
{
- AppendTxtNode();
+ AppendTextNode();
bAppended = true;
}
}
@@ -693,7 +693,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs(aFrmItemSet );
+ Reader::ResetFrameFormatAttrs(aFrmItemSet );
if( nGutter && Application::GetDefaultDevice() )
{
@@ -702,11 +702,11 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
MapMode(MAP_TWIP) ).Width();
}
- SwFmtCol aFmtCol;
+ SwFormatCol aFormatCol;
nPrcWidth = 100;
- aFmtCol.Init( nCols, nGutter, USHRT_MAX );
- aFrmItemSet.Put( aFmtCol );
+ aFormatCol.Init( nCols, nGutter, USHRT_MAX );
+ aFrmItemSet.Put( aFormatCol );
const SfxPoolItem *pItem;
if( SfxItemState::SET == aItemSet.GetItemState( RES_BACKGROUND, false,
@@ -730,15 +730,15 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
eJumpTo = JUMPTO_NONE;
}
- SwTxtNode* pOldTxtNd =
- (bAppended) ? 0 : pPam->GetPoint()->nNode.GetNode().GetTxtNode();
+ SwTextNode* pOldTextNd =
+ (bAppended) ? 0 : pPam->GetPoint()->nNode.GetNode().GetTextNode();
pPam->Move( fnMoveBackward );
- // Move PageDesc and SwFmtBreak attributes of the current node
+ // Move PageDesc and SwFormatBreak attributes of the current node
// to the section's first node.
- if( pOldTxtNd )
- MovePageDescAttrs( pOldTxtNd, pPam->GetPoint()->nNode.GetIndex(),
+ if( pOldTextNd )
+ MovePageDescAttrs( pOldTextNd, pPam->GetPoint()->nNode.GetIndex(),
true );
if( pPostIts )
@@ -769,21 +769,21 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
sal_uInt16 nFlags )
{
RndStdIds eAnchorId =
- static_cast<const SwFmtAnchor&>(rItemSet.Get( RES_ANCHOR )).GetAnchorId();
+ static_cast<const SwFormatAnchor&>(rItemSet.Get( RES_ANCHOR )).GetAnchorId();
// Den Rahmen anlegen
- SwFlyFrmFmt* pFlyFmt = pDoc->MakeFlySection( eAnchorId, pPam->GetPoint(),
+ SwFlyFrameFormat* pFlyFormat = pDoc->MakeFlySection( eAnchorId, pPam->GetPoint(),
&rItemSet );
// Ggf. den Namen setzen
if( !rName.isEmpty() )
- pFlyFmt->SetName( rName );
+ pFlyFormat->SetName( rName );
- RegisterFlyFrm( pFlyFmt );
+ RegisterFlyFrm( pFlyFormat );
- const SwFmtCntnt& rFlyCntnt = pFlyFmt->GetCntnt();
- const SwNodeIndex& rFlyCntIdx = *rFlyCntnt.GetCntntIdx();
- SwCntntNode *pCNd = pDoc->GetNodes()[rFlyCntIdx.GetIndex()+1]
- ->GetCntntNode();
+ const SwFormatContent& rFlyContent = pFlyFormat->GetContent();
+ const SwNodeIndex& rFlyCntIdx = *rFlyContent.GetContentIdx();
+ SwContentNode *pCNd = pDoc->GetNodes()[rFlyCntIdx.GetIndex()+1]
+ ->GetContentNode();
SwPosition aNewPos( SwNodeIndex( rFlyCntIdx, 1 ), SwIndex( pCNd, 0 ) );
SaveDocContext( pCntxt, nFlags, &aNewPos );
@@ -791,36 +791,36 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
sal_uLong nDestIdx,
- bool bFmtBreak )
+ bool bFormatBreak )
{
- SwCntntNode* pDestCntntNd =
- pDoc->GetNodes()[nDestIdx]->GetCntntNode();
+ SwContentNode* pDestContentNd =
+ pDoc->GetNodes()[nDestIdx]->GetContentNode();
- OSL_ENSURE( pDestCntntNd, "Wieso ist das Ziel kein Content-Node?" );
+ OSL_ENSURE( pDestContentNd, "Wieso ist das Ziel kein Content-Node?" );
- if( pSrcNd->IsCntntNode() )
+ if( pSrcNd->IsContentNode() )
{
- SwCntntNode* pSrcCntntNd = pSrcNd->GetCntntNode();
+ SwContentNode* pSrcContentNd = pSrcNd->GetContentNode();
const SfxPoolItem* pItem;
- if( SfxItemState::SET == pSrcCntntNd->GetSwAttrSet()
+ if( SfxItemState::SET == pSrcContentNd->GetSwAttrSet()
.GetItemState( RES_PAGEDESC, false, &pItem ) &&
- static_cast<const SwFmtPageDesc *>(pItem)->GetPageDesc() )
+ static_cast<const SwFormatPageDesc *>(pItem)->GetPageDesc() )
{
- pDestCntntNd->SetAttr( *pItem );
- pSrcCntntNd->ResetAttr( RES_PAGEDESC );
+ pDestContentNd->SetAttr( *pItem );
+ pSrcContentNd->ResetAttr( RES_PAGEDESC );
}
- if( SfxItemState::SET == pSrcCntntNd->GetSwAttrSet()
+ if( SfxItemState::SET == pSrcContentNd->GetSwAttrSet()
.GetItemState( RES_BREAK, false, &pItem ) )
{
- switch( static_cast<const SvxFmtBreakItem *>(pItem)->GetBreak() )
+ switch( static_cast<const SvxFormatBreakItem *>(pItem)->GetBreak() )
{
case SVX_BREAK_PAGE_BEFORE:
case SVX_BREAK_PAGE_AFTER:
case SVX_BREAK_PAGE_BOTH:
- if( bFmtBreak )
- pDestCntntNd->SetAttr( *pItem );
- pSrcCntntNd->ResetAttr( RES_BREAK );
+ if( bFormatBreak )
+ pDestContentNd->SetAttr( *pItem );
+ pSrcContentNd->ResetAttr( RES_BREAK );
default:
;
}
@@ -828,14 +828,14 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
}
else if( pSrcNd->IsTableNode() )
{
- SwFrmFmt *pFrmFmt = pSrcNd->GetTableNode()->GetTable().GetFrmFmt();
+ SwFrameFormat *pFrameFormat = pSrcNd->GetTableNode()->GetTable().GetFrameFormat();
const SfxPoolItem* pItem;
- if( SfxItemState::SET == pFrmFmt->GetAttrSet().
+ if( SfxItemState::SET == pFrameFormat->GetAttrSet().
GetItemState( RES_PAGEDESC, false, &pItem ) )
{
- pDestCntntNd->SetAttr( *pItem );
- pFrmFmt->ResetFmtAttr( RES_PAGEDESC );
+ pDestContentNd->SetAttr( *pItem );
+ pFrameFormat->ResetFormatAttr( RES_PAGEDESC );
}
}
}
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index f99a616bb9fa..0b9e7e1aaef3 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -62,7 +62,7 @@
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
-static HTMLOptionEnum aHTMLTblVAlignTable[] =
+static HTMLOptionEnum aHTMLTableVAlignTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::NONE },
{ OOO_STRING_SVTOOLS_HTML_VA_middle, text::VertOrientation::CENTER },
@@ -104,8 +104,8 @@ class _HTMLTableContext
{
SwHTMLNumRuleInfo aNumRuleInfo; // Numbering valid before the table
- SwTableNode *pTblNd; // table node
- SwFrmFmt *pFrmFmt; // der Fly frame::Frame, containing the table
+ SwTableNode *pTableNd; // table node
+ SwFrameFormat *pFrameFormat; // der Fly frame::Frame, containing the table
SwPosition *pPos; // position behind the table
sal_uInt16 nContextStAttrMin;
@@ -121,8 +121,8 @@ public:
_HTMLTableContext( SwPosition *pPs, sal_uInt16 nCntxtStMin,
sal_uInt16 nCntxtStAttrMin ) :
- pTblNd( 0 ),
- pFrmFmt( 0 ),
+ pTableNd( 0 ),
+ pFrameFormat( 0 ),
pPos( pPs ),
nContextStAttrMin( nCntxtStAttrMin ),
nContextStMin( nCntxtStMin ),
@@ -143,11 +143,11 @@ public:
SwPosition *GetPos() const { return pPos; }
- void SetTableNode( SwTableNode *pNd ) { pTblNd = pNd; }
- SwTableNode *GetTableNode() const { return pTblNd; }
+ void SetTableNode( SwTableNode *pNd ) { pTableNd = pNd; }
+ SwTableNode *GetTableNode() const { return pTableNd; }
- void SetFrmFmt( SwFrmFmt *pFmt ) { pFrmFmt = pFmt; }
- SwFrmFmt *GetFrmFmt() const { return pFrmFmt; }
+ void SetFrameFormat( SwFrameFormat *pFormat ) { pFrameFormat = pFormat; }
+ SwFrameFormat *GetFrameFormat() const { return pFrameFormat; }
sal_uInt16 GetContextStMin() const { return nContextStMin; }
sal_uInt16 GetContextStAttrMin() const { return nContextStAttrMin; }
@@ -206,7 +206,7 @@ class HTMLTableCell
// !!!ATTENTION!!!!!
::boost::shared_ptr<SvxBoxItem> m_pBoxItem;
- sal_uInt32 nNumFmt;
+ sal_uInt32 nNumFormat;
sal_uInt16 nRowSpan; // cell ROWSPAN
sal_uInt16 nColSpan; // cell COLSPAN
sal_uInt16 nWidth; // cell WIDTH
@@ -214,7 +214,7 @@ class HTMLTableCell
sal_Int16 eVertOri; // vertical alignment of the cell
bool bProtected : 1; // cell must not filled
bool bRelWidth : 1; // nWidth is given in %
- bool bHasNumFmt : 1;
+ bool bHasNumFormat : 1;
bool bHasValue : 1;
bool bNoWrap : 1;
bool mbCovered : 1;
@@ -229,7 +229,7 @@ public:
void Set( HTMLTableCnts *pCnts, sal_uInt16 nRSpan, sal_uInt16 nCSpan,
sal_Int16 eVertOri, SvxBrushItem *pBGBrush,
::boost::shared_ptr<SvxBoxItem> const& rBoxItem,
- bool bHasNumFmt, sal_uInt32 nNumFmt,
+ bool bHasNumFormat, sal_uInt32 nNumFormat,
bool bHasValue, double nValue, bool bNoWrap, bool bCovered );
// Protect an empty 1x1 cell
@@ -251,7 +251,7 @@ public:
const SvxBrushItem *GetBGBrush() const { return pBGBrush; }
::boost::shared_ptr<SvxBoxItem> GetBoxItem() const { return m_pBoxItem; }
- inline bool GetNumFmt( sal_uInt32& rNumFmt ) const;
+ inline bool GetNumFormat( sal_uInt32& rNumFormat ) const;
inline bool GetValue( double& rValue ) const;
sal_Int16 GetVertOri() const { return eVertOri; }
@@ -326,9 +326,9 @@ class HTMLTableColumn
SvxAdjust eAdjust;
sal_Int16 eVertOri;
- SwFrmFmt *aFrmFmts[6];
+ SwFrameFormat *aFrameFormats[6];
- static inline sal_uInt16 GetFrmFmtIdx( bool bBorderLine,
+ static inline sal_uInt16 GetFrameFormatIdx( bool bBorderLine,
sal_Int16 eVertOri );
public:
@@ -348,9 +348,9 @@ public:
inline void SetEndOfGroup() { bIsEndOfGroup = true; }
inline bool IsEndOfGroup() const { return bIsEndOfGroup; }
- inline void SetFrmFmt( SwFrmFmt *pFmt, bool bBorderLine,
+ inline void SetFrameFormat( SwFrameFormat *pFormat, bool bBorderLine,
sal_Int16 eVertOri );
- inline SwFrmFmt *GetFrmFmt( bool bBorderLine,
+ inline SwFrameFormat *GetFrameFormat( bool bBorderLine,
sal_Int16 eVertOri ) const;
SwHTMLTableLayoutColumn *CreateLayoutInfo();
@@ -396,9 +396,9 @@ class HTMLTable
const SwStartNode *pPrevStNd; // the Table-Node or the Start-Node of the section before
const SwTable *pSwTable; // SW-Table (only on Top-Level)
SwTableBox *pBox1; // TableBox, generated when the Top-Level-Table was build
- SwTableBoxFmt *pBoxFmt; // frame::Frame-Format from SwTableBox
- SwTableLineFmt *pLineFmt; // frame::Frame-Format from SwTableLine
- SwTableLineFmt *pLineFrmFmtNoHeight;
+ SwTableBoxFormat *pBoxFormat; // frame::Frame-Format from SwTableBox
+ SwTableLineFormat *pLineFormat; // frame::Frame-Format from SwTableLine
+ SwTableLineFormat *pLineFrameFormatNoHeight;
SvxBrushItem *pBGBrush; // background of the table
SvxBrushItem *pInhBGBrush; // "inherited" background of the table
const SwStartNode *pCaptionStartNode; // Start-Node of the table-caption
@@ -465,10 +465,10 @@ class HTMLTable
bool bSwBorders=true ) const;
// Conforming of the frame::Frame-Format of the box
- void FixFrameFmt( SwTableBox *pBox, sal_uInt16 nRow, sal_uInt16 nCol,
+ void FixFrameFormat( SwTableBox *pBox, sal_uInt16 nRow, sal_uInt16 nCol,
sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
bool bFirstPara=true, bool bLastPara=true ) const;
- void FixFillerFrameFmt( SwTableBox *pBox, bool bRight ) const;
+ void FixFillerFrameFormat( SwTableBox *pBox, bool bRight ) const;
// Create a table with the content (lines/boxes)
void _MakeTable( SwTableBox *pUpper=0 );
@@ -549,7 +549,7 @@ public:
sal_uInt16 nWidth, bool bRelWidth, sal_uInt16 nHeight,
sal_Int16 eVertOri, SvxBrushItem *pBGBrush,
boost::shared_ptr<SvxBoxItem> const& rBoxItem,
- bool bHasNumFmt, sal_uInt32 nNumFmt,
+ bool bHasNumFormat, sal_uInt32 nNumFormat,
bool bHasValue, double nValue, bool bNoWrap );
// announce the start/end of a new row
@@ -677,7 +677,7 @@ SwHTMLTableLayoutCnts *HTMLTableCnts::CreateLayoutInfo()
HTMLTableCell::HTMLTableCell():
pContents(0),
pBGBrush(0),
- nNumFmt(0),
+ nNumFormat(0),
nRowSpan(1),
nColSpan(1),
nWidth( 0 ),
@@ -685,7 +685,7 @@ HTMLTableCell::HTMLTableCell():
eVertOri( text::VertOrientation::NONE ),
bProtected(false),
bRelWidth( false ),
- bHasNumFmt(false),
+ bHasNumFormat(false),
bHasValue(false),
bNoWrap(false),
mbCovered(false)
@@ -716,9 +716,9 @@ void HTMLTableCell::Set( HTMLTableCnts *pCnts, sal_uInt16 nRSpan, sal_uInt16 nCS
pBGBrush = pBrush;
m_pBoxItem = rBoxItem;
- bHasNumFmt = bHasNF;
+ bHasNumFormat = bHasNF;
bHasValue = bHasV;
- nNumFmt = nNF;
+ nNumFormat = nNF;
nValue = nVal;
bNoWrap = bNWrap;
@@ -748,10 +748,10 @@ void HTMLTableCell::SetProtected()
bProtected = true;
}
-inline bool HTMLTableCell::GetNumFmt( sal_uInt32& rNumFmt ) const
+inline bool HTMLTableCell::GetNumFormat( sal_uInt32& rNumFormat ) const
{
- rNumFmt = nNumFmt;
- return bHasNumFmt;
+ rNumFormat = nNumFormat;
+ return bHasNumFormat;
}
inline bool HTMLTableCell::GetValue( double& rValue ) const
@@ -873,7 +873,7 @@ HTMLTableColumn::HTMLTableColumn():
bLeftBorder(false)
{
for( sal_uInt16 i=0; i<6; i++ )
- aFrmFmts[i] = 0;
+ aFrameFormats[i] = 0;
}
inline void HTMLTableColumn::SetWidth( sal_uInt16 nWdth, bool bRelWdth )
@@ -893,7 +893,7 @@ inline SwHTMLTableLayoutColumn *HTMLTableColumn::CreateLayoutInfo()
return new SwHTMLTableLayoutColumn( nWidth, bRelWidth, bLeftBorder );
}
-inline sal_uInt16 HTMLTableColumn::GetFrmFmtIdx( bool bBorderLine,
+inline sal_uInt16 HTMLTableColumn::GetFrameFormatIdx( bool bBorderLine,
sal_Int16 eVertOrient )
{
OSL_ENSURE( text::VertOrientation::TOP != eVertOrient, "Top ist nicht erlaubt" );
@@ -908,16 +908,16 @@ inline sal_uInt16 HTMLTableColumn::GetFrmFmtIdx( bool bBorderLine,
return n;
}
-inline void HTMLTableColumn::SetFrmFmt( SwFrmFmt *pFmt, bool bBorderLine,
+inline void HTMLTableColumn::SetFrameFormat( SwFrameFormat *pFormat, bool bBorderLine,
sal_Int16 eVertOrient )
{
- aFrmFmts[GetFrmFmtIdx(bBorderLine,eVertOrient)] = pFmt;
+ aFrameFormats[GetFrameFormatIdx(bBorderLine,eVertOrient)] = pFormat;
}
-inline SwFrmFmt *HTMLTableColumn::GetFrmFmt( bool bBorderLine,
+inline SwFrameFormat *HTMLTableColumn::GetFrameFormat( bool bBorderLine,
sal_Int16 eVertOrient ) const
{
- return aFrmFmts[GetFrmFmtIdx(bBorderLine,eVertOrient)];
+ return aFrameFormats[GetFrameFormatIdx(bBorderLine,eVertOrient)];
}
void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
@@ -931,8 +931,8 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
nCurRow = 0; nCurCol = 0;
pBox1 = 0;
- pBoxFmt = 0; pLineFmt = 0;
- pLineFrmFmtNoHeight = 0;
+ pBoxFormat = 0; pLineFormat = 0;
+ pLineFrameFormatNoHeight = 0;
pInhBGBrush = 0;
pPrevStNd = 0;
@@ -1245,8 +1245,8 @@ static bool IsBoxEmpty( const SwTableBox *pBox )
if( pSttNd &&
pSttNd->GetIndex() + 2 == pSttNd->EndOfSectionIndex() )
{
- const SwCntntNode *pCNd =
- pSttNd->GetNodes()[pSttNd->GetIndex()+1]->GetCntntNode();
+ const SwContentNode *pCNd =
+ pSttNd->GetNodes()[pSttNd->GetIndex()+1]->GetContentNode();
if( pCNd && !pCNd->Len() )
return true;
}
@@ -1325,21 +1325,21 @@ sal_uInt16 HTMLTable::GetBottomCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
return nSpace;
}
-void HTMLTable::FixFrameFmt( SwTableBox *pBox,
+void HTMLTable::FixFrameFormat( SwTableBox *pBox,
sal_uInt16 nRow, sal_uInt16 nCol,
sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
bool bFirstPara, bool bLastPara ) const
{
- SwFrmFmt *pFrmFmt = 0; // frame::Frame-Format
+ SwFrameFormat *pFrameFormat = 0; // frame::Frame-Format
sal_Int16 eVOri = text::VertOrientation::NONE;
const SvxBrushItem *pBGBrushItem = 0; // Hintergrund
boost::shared_ptr<SvxBoxItem> pBoxItem;
bool bTopLine = false, bBottomLine = false, bLastBottomLine = false;
bool bReUsable = false; // Format nochmals verwendbar?
sal_uInt16 nEmptyRows = 0;
- bool bHasNumFmt = false;
+ bool bHasNumFormat = false;
bool bHasValue = false;
- sal_uInt32 nNumFmt = 0;
+ sal_uInt32 nNumFormat = 0;
double nValue = 0.0;
HTMLTableColumn *pColumn = &(*pColumns)[nCol];
@@ -1382,21 +1382,21 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
}
eVOri = pCell->GetVertOri();
- bHasNumFmt = pCell->GetNumFmt( nNumFmt );
- if( bHasNumFmt )
+ bHasNumFormat = pCell->GetNumFormat( nNumFormat );
+ if( bHasNumFormat )
bHasValue = pCell->GetValue( nValue );
if( nColSpan==1 && !bTopLine && !bLastBottomLine && !nEmptyRows &&
- !pBGBrushItem && !bHasNumFmt && !pBoxItem)
+ !pBGBrushItem && !bHasNumFormat && !pBoxItem)
{
- pFrmFmt = pColumn->GetFrmFmt( bBottomLine, eVOri );
- bReUsable = !pFrmFmt;
+ pFrameFormat = pColumn->GetFrameFormat( bBottomLine, eVOri );
+ bReUsable = !pFrameFormat;
}
}
- if( !pFrmFmt )
+ if( !pFrameFormat )
{
- pFrmFmt = pBox->ClaimFrmFmt();
+ pFrameFormat = pBox->ClaimFrameFormat();
// die Breite der Box berechnen
SwTwips nFrmWidth = (SwTwips)pLayoutInfo->GetColumn(nCol)
@@ -1464,7 +1464,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
if (pBoxItem)
{
- pFrmFmt->SetFmtAttr( *pBoxItem );
+ pFrameFormat->SetFormatAttr( *pBoxItem );
}
else if (bSet)
{
@@ -1477,32 +1477,32 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
// dann gibt es eine Umrandung, und wir muessen die Distanz
// setzen
aBoxItem.SetDistance( nBDist ? nBDist : MIN_BORDER_DIST );
- pFrmFmt->SetFmtAttr( aBoxItem );
+ pFrameFormat->SetFormatAttr( aBoxItem );
}
else
- pFrmFmt->ResetFmtAttr( RES_BOX );
+ pFrameFormat->ResetFormatAttr( RES_BOX );
if( pBGBrushItem )
{
- pFrmFmt->SetFmtAttr( *pBGBrushItem );
+ pFrameFormat->SetFormatAttr( *pBGBrushItem );
}
else
- pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
+ pFrameFormat->ResetFormatAttr( RES_BACKGROUND );
// Format nur setzten, wenn es auch einen Value gibt oder die Box leer ist.
- if( bHasNumFmt && (bHasValue || IsBoxEmpty(pBox)) )
+ if( bHasNumFormat && (bHasValue || IsBoxEmpty(pBox)) )
{
- bool bLock = pFrmFmt->GetDoc()->GetNumberFormatter()
- ->IsTextFormat( nNumFmt );
- SfxItemSet aItemSet( *pFrmFmt->GetAttrSet().GetPool(),
+ bool bLock = pFrameFormat->GetDoc()->GetNumberFormatter()
+ ->IsTextFormat( nNumFormat );
+ SfxItemSet aItemSet( *pFrameFormat->GetAttrSet().GetPool(),
RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
SvxAdjust eAdjust = SVX_ADJUST_END;
- SwCntntNode *pCNd = 0;
+ SwContentNode *pCNd = 0;
if( !bLock )
{
const SwStartNode *pSttNd = pBox->GetSttNd();
pCNd = pSttNd->GetNodes()[pSttNd->GetIndex()+1]
- ->GetCntntNode();
+ ->GetContentNode();
const SfxPoolItem *pItem;
if( pCNd && pCNd->HasSwAttrSet() &&
SfxItemState::SET==pCNd->GetpSwAttrSet()->GetItemState(
@@ -1512,15 +1512,15 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
->GetAdjust();
}
}
- aItemSet.Put( SwTblBoxNumFormat(nNumFmt) );
+ aItemSet.Put( SwTableBoxNumFormat(nNumFormat) );
if( bHasValue )
- aItemSet.Put( SwTblBoxValue(nValue) );
+ aItemSet.Put( SwTableBoxValue(nValue) );
if( bLock )
- pFrmFmt->LockModify();
- pFrmFmt->SetFmtAttr( aItemSet );
+ pFrameFormat->LockModify();
+ pFrameFormat->SetFormatAttr( aItemSet );
if( bLock )
- pFrmFmt->UnlockModify();
+ pFrameFormat->UnlockModify();
else if( pCNd && SVX_ADJUST_END != eAdjust )
{
SvxAdjustItem aAdjItem( eAdjust, RES_PARATR_ADJUST );
@@ -1528,41 +1528,41 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
}
}
else
- pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
+ pFrameFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
OSL_ENSURE( eVOri != text::VertOrientation::TOP, "text::VertOrientation::TOP ist nicht erlaubt!" );
if( text::VertOrientation::NONE != eVOri )
{
- pFrmFmt->SetFmtAttr( SwFmtVertOrient( 0, eVOri ) );
+ pFrameFormat->SetFormatAttr( SwFormatVertOrient( 0, eVOri ) );
}
else
- pFrmFmt->ResetFmtAttr( RES_VERT_ORIENT );
+ pFrameFormat->ResetFormatAttr( RES_VERT_ORIENT );
if( bReUsable )
- pColumn->SetFrmFmt( pFrmFmt, bBottomLine, eVOri );
+ pColumn->SetFrameFormat( pFrameFormat, bBottomLine, eVOri );
}
else
{
- pFrmFmt->ResetFmtAttr( RES_BOX );
- pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
- pFrmFmt->ResetFmtAttr( RES_VERT_ORIENT );
- pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
+ pFrameFormat->ResetFormatAttr( RES_BOX );
+ pFrameFormat->ResetFormatAttr( RES_BACKGROUND );
+ pFrameFormat->ResetFormatAttr( RES_VERT_ORIENT );
+ pFrameFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
}
}
else
{
OSL_ENSURE( pBox->GetSttNd() ||
- SfxItemState::SET!=pFrmFmt->GetAttrSet().GetItemState(
+ SfxItemState::SET!=pFrameFormat->GetAttrSet().GetItemState(
RES_VERT_ORIENT, false ),
"Box ohne Inhalt hat vertikale Ausrichtung" );
- pBox->ChgFrmFmt( static_cast<SwTableBoxFmt*>(pFrmFmt) );
+ pBox->ChgFrameFormat( static_cast<SwTableBoxFormat*>(pFrameFormat) );
}
}
-void HTMLTable::FixFillerFrameFmt( SwTableBox *pBox, bool bRight ) const
+void HTMLTable::FixFillerFrameFormat( SwTableBox *pBox, bool bRight ) const
{
- SwFrmFmt *pFrmFmt = pBox->ClaimFrmFmt();
+ SwFrameFormat *pFrameFormat = pBox->ClaimFrameFormat();
if( bFillerTopBorder || bFillerBottomBorder ||
(!bRight && bInhLeftBorder) || (bRight && bInhRightBorder) )
@@ -1577,20 +1577,20 @@ void HTMLTable::FixFillerFrameFmt( SwTableBox *pBox, bool bRight ) const
if( bRight && bInhRightBorder )
aBoxItem.SetLine( &aInhRightBorderLine, SvxBoxItemLine::RIGHT );
aBoxItem.SetDistance( MIN_BORDER_DIST );
- pFrmFmt->SetFmtAttr( aBoxItem );
+ pFrameFormat->SetFormatAttr( aBoxItem );
}
else
{
- pFrmFmt->ResetFmtAttr( RES_BOX );
+ pFrameFormat->ResetFormatAttr( RES_BOX );
}
if( GetInhBGBrush() )
- pFrmFmt->SetFmtAttr( *GetInhBGBrush() );
+ pFrameFormat->SetFormatAttr( *GetInhBGBrush() );
else
- pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
+ pFrameFormat->ResetFormatAttr( RES_BACKGROUND );
- pFrmFmt->ResetFmtAttr( RES_VERT_ORIENT );
- pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
+ pFrameFormat->ResetFormatAttr( RES_VERT_ORIENT );
+ pFrameFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
}
SwTableBox *HTMLTable::NewTableBox( const SwStartNode *pStNd,
@@ -1608,16 +1608,16 @@ SwTableBox *HTMLTable::NewTableBox( const SwStartNode *pStNd,
pTopTable->pBox1 = 0;
}
else
- pBox = new SwTableBox( pBoxFmt, *pStNd, pUpper );
+ pBox = new SwTableBox( pBoxFormat, *pStNd, pUpper );
return pBox;
}
-static void ResetLineFrmFmtAttrs( SwFrmFmt *pFrmFmt )
+static void ResetLineFrameFormatAttrs( SwFrameFormat *pFrameFormat )
{
- pFrmFmt->ResetFmtAttr( RES_FRM_SIZE );
- pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
- OSL_ENSURE( SfxItemState::SET!=pFrmFmt->GetAttrSet().GetItemState(
+ pFrameFormat->ResetFormatAttr( RES_FRM_SIZE );
+ pFrameFormat->ResetFormatAttr( RES_BACKGROUND );
+ OSL_ENSURE( SfxItemState::SET!=pFrameFormat->GetAttrSet().GetItemState(
RES_VERT_ORIENT, false ),
"Zeile hat vertikale Ausrichtung" );
}
@@ -1631,8 +1631,8 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
if( this==pTopTable && !pUpper && 0==nTopRow )
pLine = (pSwTable->GetTabLines())[0];
else
- pLine = new SwTableLine( pLineFrmFmtNoHeight ? pLineFrmFmtNoHeight
- : pLineFmt,
+ pLine = new SwTableLine( pLineFrameFormatNoHeight ? pLineFrameFormatNoHeight
+ : pLineFormat,
0, pUpper );
HTMLTableRow *pTopRow = &(*pRows)[nTopRow];
@@ -1657,8 +1657,8 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
}
if( nTopRow==nBottomRow-1 && (nRowHeight || pBGBrushItem) )
{
- SwTableLineFmt *pFrmFmt = static_cast<SwTableLineFmt*>(pLine->ClaimFrmFmt());
- ResetLineFrmFmtAttrs( pFrmFmt );
+ SwTableLineFormat *pFrameFormat = static_cast<SwTableLineFormat*>(pLine->ClaimFrameFormat());
+ ResetLineFrameFormatAttrs( pFrameFormat );
if( nRowHeight )
{
@@ -1669,22 +1669,22 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
nRowHeight += GetTopCellSpace( nTopRow, 1, false ) +
GetBottomCellSpace( nTopRow, 1, false );
- pFrmFmt->SetFmtAttr( SwFmtFrmSize( ATT_MIN_SIZE, 0, nRowHeight ) );
+ pFrameFormat->SetFormatAttr( SwFormatFrmSize( ATT_MIN_SIZE, 0, nRowHeight ) );
}
if( pBGBrushItem )
{
- pFrmFmt->SetFmtAttr( *pBGBrushItem );
+ pFrameFormat->SetFormatAttr( *pBGBrushItem );
}
}
- else if( !pLineFrmFmtNoHeight )
+ else if( !pLineFrameFormatNoHeight )
{
// sonst muessen wir die Hoehe aus dem Attribut entfernen
// und koennen uns das Format merken
- pLineFrmFmtNoHeight = static_cast<SwTableLineFmt*>(pLine->ClaimFrmFmt());
+ pLineFrameFormatNoHeight = static_cast<SwTableLineFormat*>(pLine->ClaimFrameFormat());
- ResetLineFrmFmtAttrs( pLineFrmFmtNoHeight );
+ ResetLineFrameFormatAttrs( pLineFrameFormatNoHeight );
}
SwTableBoxes& rBoxes = pLine->GetTabBoxes();
@@ -1789,7 +1789,7 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
// und die ist eine Tabelle: dann bauen wir eine neue
// Box und fuegen die Zeilen der Tabelle in die Zeilen
// der Box ein
- pBox = new SwTableBox( pBoxFmt, 0, pUpper );
+ pBox = new SwTableBox( pBoxFormat, 0, pUpper );
sal_uInt16 nAbs, nRel;
pLayoutInfo->GetAvail( nLeftCol, nColSpan, nAbs, nRel );
sal_uInt16 nLSpace = pLayoutInfo->GetLeftCellSpace( nLeftCol, nColSpan );
@@ -1802,7 +1802,7 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
else
{
// mehrere Inhalts Sections: dann brauchen wir eine Box mit Zeilen
- pBox = new SwTableBox( pBoxFmt, 0, pUpper );
+ pBox = new SwTableBox( pBoxFormat, 0, pUpper );
SwTableLines& rLines = pBox->GetTabLines();
bool bFirstPara = true;
@@ -1812,21 +1812,21 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
{
// normale Absaetze werden zu einer Box in einer Zeile
SwTableLine *pLine =
- new SwTableLine( pLineFrmFmtNoHeight ? pLineFrmFmtNoHeight
- : pLineFmt, 0, pBox );
- if( !pLineFrmFmtNoHeight )
+ new SwTableLine( pLineFrameFormatNoHeight ? pLineFrameFormatNoHeight
+ : pLineFormat, 0, pBox );
+ if( !pLineFrameFormatNoHeight )
{
// Wenn es noch kein Line-Format ohne Hoehe gibt, koennen
// wir uns dieses her als soleches merken
- pLineFrmFmtNoHeight = static_cast<SwTableLineFmt*>(pLine->ClaimFrmFmt());
+ pLineFrameFormatNoHeight = static_cast<SwTableLineFormat*>(pLine->ClaimFrameFormat());
- ResetLineFrmFmtAttrs( pLineFrmFmtNoHeight );
+ ResetLineFrameFormatAttrs( pLineFrameFormatNoHeight );
}
SwTableBox* pCntBox = NewTableBox( pCnts->GetStartNode(),
pLine );
pCnts->SetTableBox( pCntBox );
- FixFrameFmt( pCntBox, nTopRow, nLeftCol, nRowSpan, nColSpan,
+ FixFrameFormat( pCntBox, nTopRow, nLeftCol, nRowSpan, nColSpan,
bFirstPara, 0==pCnts->Next() );
pLine->GetTabBoxes().push_back( pCntBox );
@@ -1853,7 +1853,7 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
}
}
- FixFrameFmt( pBox, nTopRow, nLeftCol, nRowSpan, nColSpan );
+ FixFrameFormat( pBox, nTopRow, nLeftCol, nRowSpan, nColSpan );
return pBox;
}
@@ -2061,7 +2061,7 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
sal_uInt16 nCellWidth, bool bRelWidth, sal_uInt16 nCellHeight,
sal_Int16 eVertOrient, SvxBrushItem *pBGBrushItem,
boost::shared_ptr<SvxBoxItem> const& rBoxItem,
- bool bHasNumFmt, sal_uInt32 nNumFmt,
+ bool bHasNumFormat, sal_uInt32 nNumFormat,
bool bHasValue, double nValue, bool bNoWrap )
{
if( !nRowSpan || (sal_uInt32)nCurRow + nRowSpan > USHRT_MAX )
@@ -2140,7 +2140,7 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
const bool bCovered = i != nColSpan || j != nRowSpan;
GetCell( nRowsReq-j, nColsReq-i )
->Set( pCnts, j, i, eVertOrient, pBGBrushItem, rBoxItem,
- bHasNumFmt, nNumFmt, bHasValue, nValue, bNoWrap, bCovered );
+ bHasNumFormat, nNumFormat, bHasValue, nValue, bNoWrap, bCovered );
}
}
@@ -2499,27 +2499,27 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
}
// das Tabellenform holen und anpassen
- SwFrmFmt *pFrmFmt = pSwTable->GetFrmFmt();
- pFrmFmt->SetFmtAttr( SwFmtHoriOrient(0,eHoriOri) );
+ SwFrameFormat *pFrameFormat = pSwTable->GetFrameFormat();
+ pFrameFormat->SetFormatAttr( SwFormatHoriOrient(0,eHoriOri) );
if( text::HoriOrientation::LEFT_AND_WIDTH==eHoriOri )
{
OSL_ENSURE( nLeftMargin || nRightMargin,
"Da gibt's wohl noch Reste von relativen Breiten" );
// The right margin will be ignored anyway.
- SvxLRSpaceItem aLRItem( pSwTable->GetFrmFmt()->GetLRSpace() );
+ SvxLRSpaceItem aLRItem( pSwTable->GetFrameFormat()->GetLRSpace() );
aLRItem.SetLeft( nLeftMargin );
aLRItem.SetRight( nRightMargin );
- pFrmFmt->SetFmtAttr( aLRItem );
+ pFrameFormat->SetFormatAttr( aLRItem );
}
if( bPrcWidth && text::HoriOrientation::FULL!=eHoriOri )
{
- pFrmFmt->LockModify();
- SwFmtFrmSize aFrmSize( pFrmFmt->GetFrmSize() );
+ pFrameFormat->LockModify();
+ SwFormatFrmSize aFrmSize( pFrameFormat->GetFrmSize() );
aFrmSize.SetWidthPercent( (sal_uInt8)nWidth );
- pFrmFmt->SetFmtAttr( aFrmSize );
- pFrmFmt->UnlockModify();
+ pFrameFormat->SetFormatAttr( aFrmSize );
+ pFrameFormat->UnlockModify();
}
}
@@ -2531,13 +2531,13 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
pBox1 = (pLine1->GetTabBoxes())[0];
pLine1->GetTabBoxes().erase(pLine1->GetTabBoxes().begin());
- pLineFmt = static_cast<SwTableLineFmt*>(pLine1->GetFrmFmt());
- pBoxFmt = static_cast<SwTableBoxFmt*>(pBox1->GetFrmFmt());
+ pLineFormat = static_cast<SwTableLineFormat*>(pLine1->GetFrameFormat());
+ pBoxFormat = static_cast<SwTableBoxFormat*>(pBox1->GetFrameFormat());
}
else
{
- pLineFmt = pTopTable->pLineFmt;
- pBoxFmt = pTopTable->pBoxFmt;
+ pLineFormat = pTopTable->pLineFormat;
+ pBoxFormat = pTopTable->pBoxFormat;
}
// ggf. muessen fuer Tabellen in Tabellen "Filler"-Zellen eingefuegt
@@ -2552,18 +2552,18 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
// dazu brauchen wir erstmal ein eine neue Table-Line in der Box
SwTableLine *pLine =
- new SwTableLine( pLineFrmFmtNoHeight ? pLineFrmFmtNoHeight
- : pLineFmt, 0, pBox );
+ new SwTableLine( pLineFrameFormatNoHeight ? pLineFrameFormatNoHeight
+ : pLineFormat, 0, pBox );
rLines.push_back( pLine );
// Sicherstellen, dass wie ein Format ohne Hoehe erwischt haben
- if( !pLineFrmFmtNoHeight )
+ if( !pLineFrameFormatNoHeight )
{
// sonst muessen wir die Hoehe aus dem Attribut entfernen
// und koennen uns das Format merken
- pLineFrmFmtNoHeight = static_cast<SwTableLineFmt*>(pLine->ClaimFrmFmt());
+ pLineFrameFormatNoHeight = static_cast<SwTableLineFormat*>(pLine->ClaimFrameFormat());
- ResetLineFrmFmtAttrs( pLineFrmFmtNoHeight );
+ ResetLineFrameFormatAttrs( pLineFrameFormatNoHeight );
}
SwTableBoxes& rBoxes = pLine->GetTabBoxes();
@@ -2578,19 +2578,19 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
pNewBox = NewTableBox( pPrevStNd, pLine );
rBoxes.push_back( pNewBox );
- FixFillerFrameFmt( pNewBox, false );
+ FixFillerFrameFormat( pNewBox, false );
pLayoutInfo->SetLeftFillerBox( pNewBox );
}
// jetzt die Tabelle bearbeiten
- pNewBox = new SwTableBox( pBoxFmt, 0, pLine );
+ pNewBox = new SwTableBox( pBoxFormat, 0, pLine );
rBoxes.push_back( pNewBox );
- SwFrmFmt *pFrmFmt = pNewBox->ClaimFrmFmt();
- pFrmFmt->ResetFmtAttr( RES_BOX );
- pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
- pFrmFmt->ResetFmtAttr( RES_VERT_ORIENT );
- pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
+ SwFrameFormat *pFrameFormat = pNewBox->ClaimFrameFormat();
+ pFrameFormat->ResetFormatAttr( RES_BOX );
+ pFrameFormat->ResetFormatAttr( RES_BACKGROUND );
+ pFrameFormat->ResetFormatAttr( RES_VERT_ORIENT );
+ pFrameFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
_MakeTable( pNewBox );
@@ -2604,7 +2604,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
pNewBox = NewTableBox( pStNd, pLine );
rBoxes.push_back( pNewBox );
- FixFillerFrameFmt( pNewBox, true );
+ FixFillerFrameFormat( pNewBox, true );
pLayoutInfo->SetRightFillerBox( pNewBox );
}
}
@@ -2627,18 +2627,18 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
if( nHeight < MINLAY )
nHeight = MINLAY;
- (pSwTable->GetTabLines())[0]->ClaimFrmFmt();
- (pSwTable->GetTabLines())[0]->GetFrmFmt()
- ->SetFmtAttr( SwFmtFrmSize( ATT_MIN_SIZE, 0, nHeight ) );
+ (pSwTable->GetTabLines())[0]->ClaimFrameFormat();
+ (pSwTable->GetTabLines())[0]->GetFrameFormat()
+ ->SetFormatAttr( SwFormatFrmSize( ATT_MIN_SIZE, 0, nHeight ) );
}
if( GetBGBrush() )
- pSwTable->GetFrmFmt()->SetFmtAttr( *GetBGBrush() );
+ pSwTable->GetFrameFormat()->SetFormatAttr( *GetBGBrush() );
const_cast<SwTable *>(pSwTable)->SetRowsToRepeat( static_cast< sal_uInt16 >(nHeadlineRepeat) );
const_cast<SwTable *>(pSwTable)->GCLines();
- bool bIsInFlyFrame = pContext && pContext->GetFrmFmt();
+ bool bIsInFlyFrame = pContext && pContext->GetFrameFormat();
if( bIsInFlyFrame && !nWidth )
{
SvxAdjust eAdjust = GetTableAdjust(false);
@@ -2653,9 +2653,9 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
sal_uInt32 nMin = pLayoutInfo->GetMin();
if( nMin > USHRT_MAX )
nMin = USHRT_MAX;
- SwFmtFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMin, MINLAY );
+ SwFormatFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMin, MINLAY );
aFlyFrmSize.SetWidthPercent( 100 );
- pContext->GetFrmFmt()->SetFmtAttr( aFlyFrmSize );
+ pContext->GetFrameFormat()->SetFormatAttr( aFlyFrmSize );
bIsInFlyFrame = false;
}
else
@@ -2664,14 +2664,14 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
// duerfen leider nicht in der Breite angepasst werden, denn
// sie wuerden nur schrumpfen aber nie wachsen.
pLayoutInfo->SetMustNotRecalc( true );
- if( pContext->GetFrmFmt()->GetAnchor().GetCntntAnchor()
+ if( pContext->GetFrameFormat()->GetAnchor().GetContentAnchor()
->nNode.GetNode().FindTableNode() )
{
sal_uInt32 nMax = pLayoutInfo->GetMax();
if( nMax > USHRT_MAX )
nMax = USHRT_MAX;
- SwFmtFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMax, MINLAY );
- pContext->GetFrmFmt()->SetFmtAttr( aFlyFrmSize );
+ SwFormatFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMax, MINLAY );
+ pContext->GetFrameFormat()->SetFormatAttr( aFlyFrmSize );
bIsInFlyFrame = false;
}
else
@@ -2787,13 +2787,13 @@ const SwStartNode *SwHTMLParser::InsertTableSection
OSL_ENSURE( pPrevStNd, "Start-Node ist NULL" );
pCSS1Parser->SetTDTagStyles();
- SwTxtFmtColl *pColl = pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_TABLE );
+ SwTextFormatColl *pColl = pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TABLE );
const SwStartNode *pStNd;
if (pTable->bFirstCell )
{
SwNode *const pNd = & pPam->GetPoint()->nNode.GetNode();
- pNd->GetTxtNode()->ChgFmtColl( pColl );
+ pNd->GetTextNode()->ChgFormatColl( pColl );
pStNd = pNd->FindTableBoxStartNode();
pTable->bFirstCell = false;
}
@@ -2811,7 +2811,7 @@ const SwStartNode *SwHTMLParser::InsertTableSection
}
//Added defaults to CJK and CTL
- SwCntntNode *pCNd = pDoc->GetNodes()[pStNd->GetIndex()+1] ->GetCntntNode();
+ SwContentNode *pCNd = pDoc->GetNodes()[pStNd->GetIndex()+1] ->GetContentNode();
SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE );
pCNd->SetAttr( aFontHeight );
SvxFontHeightItem aFontHeightCJK( 40, 100, RES_CHRATR_CJK_FONTSIZE );
@@ -2834,35 +2834,35 @@ const SwStartNode *SwHTMLParser::InsertTableSection( sal_uInt16 nPoolId )
break;
}
- SwTxtFmtColl *pColl = pCSS1Parser->GetTxtCollFromPool( nPoolId );
+ SwTextFormatColl *pColl = pCSS1Parser->GetTextCollFromPool( nPoolId );
SwNode *const pNd = & pPam->GetPoint()->nNode.GetNode();
const SwStartNode *pStNd;
if (pTable->bFirstCell)
{
- pNd->GetTxtNode()->ChgFmtColl( pColl );
+ pNd->GetTextNode()->ChgFormatColl( pColl );
pTable->bFirstCell = false;
pStNd = pNd->FindTableBoxStartNode();
}
else
{
- SwTableNode *pTblNd = pNd->FindTableNode();
- if( pTblNd->GetTable().GetHTMLTableLayout() )
+ SwTableNode *pTableNd = pNd->FindTableNode();
+ if( pTableNd->GetTable().GetHTMLTableLayout() )
{ // if there is already a HTMTableLayout, this table is already finished
// and we have to look for the right table in the environment
- SwTableNode *pOutTbl = pTblNd;
+ SwTableNode *pOutTable = pTableNd;
do {
- pTblNd = pOutTbl;
- pOutTbl = pOutTbl->StartOfSectionNode()->FindTableNode();
- } while( pOutTbl && pTblNd->GetTable().GetHTMLTableLayout() );
+ pTableNd = pOutTable;
+ pOutTable = pOutTable->StartOfSectionNode()->FindTableNode();
+ } while( pOutTable && pTableNd->GetTable().GetHTMLTableLayout() );
}
- SwNodeIndex aIdx( *pTblNd->EndOfSectionNode() );
+ SwNodeIndex aIdx( *pTableNd->EndOfSectionNode() );
pStNd = pDoc->GetNodes().MakeTextSection( aIdx, SwTableBoxStartNode,
pColl );
pPam->GetPoint()->nNode = pStNd->GetIndex() + 1;
- SwTxtNode *pTxtNd = pPam->GetPoint()->nNode.GetNode().GetTxtNode();
- pPam->GetPoint()->nContent.Assign( pTxtNd, 0 );
+ SwTextNode *pTextNd = pPam->GetPoint()->nNode.GetNode().GetTextNode();
+ pPam->GetPoint()->nContent.Assign( pTextNd, 0 );
pTable->IncBoxCount();
}
@@ -2871,14 +2871,14 @@ const SwStartNode *SwHTMLParser::InsertTableSection( sal_uInt16 nPoolId )
SwStartNode *SwHTMLParser::InsertTempTableCaptionSection()
{
- SwTxtFmtColl *pColl = pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_TEXT );
+ SwTextFormatColl *pColl = pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TEXT );
SwNodeIndex& rIdx = pPam->GetPoint()->nNode;
rIdx = pDoc->GetNodes().GetEndOfExtras();
SwStartNode *pStNd = pDoc->GetNodes().MakeTextSection( rIdx,
SwNormalStartNode, pColl );
rIdx = pStNd->GetIndex() + 1;
- pPam->GetPoint()->nContent.Assign( rIdx.GetNode().GetTxtNode(), 0 );
+ pPam->GetPoint()->nContent.Assign( rIdx.GetNode().GetTextNode(), 0 );
return pStNd;
}
@@ -2890,13 +2890,13 @@ sal_Int32 SwHTMLParser::StripTrailingLF()
const sal_Int32 nLen = pPam->GetPoint()->nContent.GetIndex();
if( nLen )
{
- SwTxtNode* pTxtNd = pPam->GetPoint()->nNode.GetNode().GetTxtNode();
+ SwTextNode* pTextNd = pPam->GetPoint()->nNode.GetNode().GetTextNode();
// vorsicht, wenn Kommentare nicht uebrlesen werden!!!
- if( pTxtNd )
+ if( pTextNd )
{
sal_Int32 nPos = nLen;
sal_Int32 nLFCount = 0;
- while (nPos && ('\x0a' == pTxtNd->GetTxt()[--nPos]))
+ while (nPos && ('\x0a' == pTextNd->GetText()[--nPos]))
nLFCount++;
if( nLFCount )
@@ -2916,8 +2916,8 @@ sal_Int32 SwHTMLParser::StripTrailingLF()
}
nPos = nLen - nLFCount;
- SwIndex nIdx( pTxtNd, nPos );
- pTxtNd->EraseText( nIdx, nLFCount );
+ SwIndex nIdx( pTextNd, nPos );
+ pTextNd->EraseText( nIdx, nLFCount );
nStripped = nLFCount;
}
}
@@ -3073,17 +3073,17 @@ class _CellSaveStruct : public _SectionSaveStruct
double nValue;
- sal_uInt32 nNumFmt;
+ sal_uInt32 nNumFormat;
sal_uInt16 nRowSpan, nColSpan, nWidth, nHeight;
- sal_Int32 nNoBreakEndCntntPos; // Zeichen-Index eines </NOBR>
+ sal_Int32 nNoBreakEndContentPos; // Zeichen-Index eines </NOBR>
SvxAdjust eAdjust;
sal_Int16 eVertOri;
bool bHead : 1;
bool bPrcWidth : 1;
- bool bHasNumFmt : 1;
+ bool bHasNumFormat : 1;
bool bHasValue : 1;
bool bBGColor : 1;
bool bNoWrap : 1; // NOWRAP-Option
@@ -3118,23 +3118,23 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
pCurrCnts( 0 ),
pNoBreakEndParaIdx( 0 ),
nValue( 0.0 ),
- nNumFmt( 0 ),
+ nNumFormat( 0 ),
nRowSpan( 1 ),
nColSpan( 1 ),
nWidth( 0 ),
nHeight( 0 ),
- nNoBreakEndCntntPos( 0 ),
+ nNoBreakEndContentPos( 0 ),
eAdjust( pCurTable->GetInheritedAdjust() ),
eVertOri( pCurTable->GetInheritedVertOri() ),
bHead( bHd ),
bPrcWidth( false ),
- bHasNumFmt( false ),
+ bHasNumFormat( false ),
bHasValue( false ),
bBGColor( false ),
bNoWrap( false ),
bNoBreak( false )
{
- OUString aNumFmt, aValue;
+ OUString aNumFormat, aValue;
if( bReadOpt )
{
@@ -3159,7 +3159,7 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
break;
case HTML_O_VALIGN:
eVertOri = rOption.GetEnum(
- aHTMLTblVAlignTable, eVertOri );
+ aHTMLTableVAlignTable, eVertOri );
break;
case HTML_O_WIDTH:
nWidth = (sal_uInt16)rOption.GetNumber(); // nur fuer Netscape
@@ -3197,8 +3197,8 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
aDir = rOption.GetString();
break;
case HTML_O_SDNUM:
- aNumFmt = rOption.GetString();
- bHasNumFmt = true;
+ aNumFormat = rOption.GetString();
+ bHasNumFormat = true;
break;
case HTML_O_SDVAL:
bHasValue = true;
@@ -3214,11 +3214,11 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
rParser.InsertBookmark( aId );
}
- if( bHasNumFmt )
+ if( bHasNumFormat )
{
LanguageType eLang;
nValue = SfxHTMLParser::GetTableDataOptionsValNum(
- nNumFmt, eLang, aValue, aNumFmt,
+ nNumFormat, eLang, aValue, aNumFormat,
*rParser.pDoc->GetNumberFormatter() );
}
@@ -3252,7 +3252,7 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
{
SfxPoolItem const* pItem;
if (SfxItemState::SET == aItemSet.GetItemState(RES_BOX, false, &pItem))
- { // fdo#41796: steal box item to set it in FixFrameFmt later!
+ { // fdo#41796: steal box item to set it in FixFrameFormat later!
m_pBoxItem.reset(dynamic_cast<SvxBoxItem *>(pItem->Clone()));
aItemSet.ClearItem(RES_BOX);
}
@@ -3301,12 +3301,12 @@ void _CellSaveStruct::InsertCell( SwHTMLParser& rParser,
if( rParser.nContextStAttrMin == GetContextStAttrMin() )
{
- _HTMLAttr** pTbl = reinterpret_cast<_HTMLAttr**>(&rParser.aAttrTab);
+ _HTMLAttr** pTable = reinterpret_cast<_HTMLAttr**>(&rParser.aAttrTab);
for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* );
- nCnt--; ++pTbl )
+ nCnt--; ++pTable )
{
- OSL_ENSURE( !*pTbl, "Die Attribut-Tabelle ist nicht leer" );
+ OSL_ENSURE( !*pTable, "Die Attribut-Tabelle ist nicht leer" );
}
}
#endif
@@ -3317,7 +3317,7 @@ void _CellSaveStruct::InsertCell( SwHTMLParser& rParser,
aStyle, aId, aClass );
pCurTable->InsertCell( pCnts, nRowSpan, nColSpan, nWidth,
bPrcWidth, nHeight, eVertOri, pBrushItem, m_pBoxItem,
- bHasNumFmt, nNumFmt, bHasValue, nValue,
+ bHasNumFormat, nNumFormat, bHasValue, nValue,
bNoWrap );
Restore( rParser );
}
@@ -3340,7 +3340,7 @@ void _CellSaveStruct::EndNoBreak( const SwPosition& rPos )
{
delete pNoBreakEndParaIdx;
pNoBreakEndParaIdx = new SwNodeIndex( rPos.nNode );
- nNoBreakEndCntntPos = rPos.nContent.GetIndex();
+ nNoBreakEndContentPos = rPos.nContent.GetIndex();
bNoBreak = false;
}
}
@@ -3357,18 +3357,18 @@ void _CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc * /*pDoc*/ )
else if( pNoBreakEndParaIdx &&
pNoBreakEndParaIdx->GetIndex() == rPos.nNode.GetIndex() )
{
- if( nNoBreakEndCntntPos == rPos.nContent.GetIndex() )
+ if( nNoBreakEndContentPos == rPos.nContent.GetIndex() )
{
// <NOBR> wurde unmittelbar vor dem Zellen-Ende beendet
pCnts->SetNoBreak();
}
- else if( nNoBreakEndCntntPos + 1 == rPos.nContent.GetIndex() )
+ else if( nNoBreakEndContentPos + 1 == rPos.nContent.GetIndex() )
{
- SwTxtNode const*const pTxtNd(rPos.nNode.GetNode().GetTxtNode());
- if( pTxtNd )
+ SwTextNode const*const pTextNd(rPos.nNode.GetNode().GetTextNode());
+ if( pTextNd )
{
sal_Unicode const cLast =
- pTxtNd->GetTxt()[nNoBreakEndCntntPos];
+ pTextNd->GetText()[nNoBreakEndContentPos];
if( ' '==cLast || '\x0a'==cLast )
{
// Zwischem dem </NOBR> und dem Zellen-Ende gibt es nur
@@ -3410,8 +3410,8 @@ HTMLTableCnts *SwHTMLParser::InsertTableContents(
OSL_ENSURE( !pAttr->GetPrev(), "Attribut hat Previous-Liste" );
pAttr->nSttPara = rSttPara;
pAttr->nEndPara = rSttPara;
- pAttr->nSttCntnt = nSttCnt;
- pAttr->nEndCntnt = nSttCnt;
+ pAttr->nSttContent = nSttCnt;
+ pAttr->nEndContent = nSttCnt;
pAttr = pAttr->GetNext();
}
@@ -3502,7 +3502,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
RES_PARATR_SPLIT, false, &pItem ) )
{
aItemSet.Put(
- SwFmtLayoutSplit( static_cast<const SvxFmtSplitItem *>(pItem)
+ SwFormatLayoutSplit( static_cast<const SvxFormatSplitItem *>(pItem)
->GetValue() ) );
aItemSet.ClearItem( RES_PARATR_SPLIT );
}
@@ -3521,13 +3521,13 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
bool bParentLFStripped = false;
if( bTopTable )
{
- SvxAdjust eTblAdjust = pTable->GetTableAdjust(false);
+ SvxAdjust eTableAdjust = pTable->GetTableAdjust(false);
// Wenn die Tabelle links oder rechts ausgerivchtet ist,
// oder in einen Rahmen soll, dann kommt sie auch in einen
// solchen.
- bForceFrame = eTblAdjust == SVX_ADJUST_LEFT ||
- eTblAdjust == SVX_ADJUST_RIGHT ||
+ bForceFrame = eTableAdjust == SVX_ADJUST_LEFT ||
+ eTableAdjust == SVX_ADJUST_RIGHT ||
pCurTable->HasToFly();
// Entweder kommt die Tabelle in keinen Rahmen und befindet
@@ -3559,8 +3559,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
if( !pPam->GetPoint()->nContent.GetIndex() )
{
//Set default to CJK and CTL
- pDoc->SetTxtFmtColl( *pPam,
- pCSS1Parser->GetTxtCollFromPool(RES_POOLCOLL_STANDARD) );
+ pDoc->SetTextFormatColl( *pPam,
+ pCSS1Parser->GetTextCollFromPool(RES_POOLCOLL_STANDARD) );
SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE );
_HTMLAttr* pTmp =
@@ -3583,7 +3583,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
// vom Tabellenende vorher
// was gesetzt sein kann.
}
- AppendTxtNode( AM_NOSPACE );
+ AppendTextNode( AM_NOSPACE );
bAppended = true;
}
else if( !aParaAttrs.empty() )
@@ -3665,7 +3665,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
SfxItemSet aFrmSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !pCurTable->IsNewDoc() )
- Reader::ResetFrmFmtAttrs( aFrmSet );
+ Reader::ResetFrameFormatAttrs( aFrmSet );
SwSurround eSurround = SURROUND_NONE;
sal_Int16 eHori;
@@ -3688,9 +3688,9 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
}
SetAnchorAndAdjustment( text::VertOrientation::NONE, eHori, aFrmSet,
true );
- aFrmSet.Put( SwFmtSurround(eSurround) );
+ aFrmSet.Put( SwFormatSurround(eSurround) );
- SwFmtFrmSize aFrmSize( ATT_VAR_SIZE, 20*MM50, MINLAY );
+ SwFormatFrmSize aFrmSize( ATT_VAR_SIZE, 20*MM50, MINLAY );
aFrmSize.SetWidthPercent( 100 );
aFrmSet.Put( aFrmSize );
@@ -3701,16 +3701,16 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
if( nSpace )
aFrmSet.Put( SvxULSpaceItem(nSpace,nSpace, RES_UL_SPACE) );
- RndStdIds eAnchorId = static_cast<const SwFmtAnchor&>(aFrmSet.
+ RndStdIds eAnchorId = static_cast<const SwFormatAnchor&>(aFrmSet.
Get( RES_ANCHOR )).
GetAnchorId();
- SwFrmFmt *pFrmFmt = pDoc->MakeFlySection(
+ SwFrameFormat *pFrameFormat = pDoc->MakeFlySection(
eAnchorId, pPam->GetPoint(), &aFrmSet );
- pTCntxt->SetFrmFmt( pFrmFmt );
- const SwFmtCntnt& rFlyCntnt = pFrmFmt->GetCntnt();
- pPam->GetPoint()->nNode = *rFlyCntnt.GetCntntIdx();
- SwCntntNode *pCNd =
+ pTCntxt->SetFrameFormat( pFrameFormat );
+ const SwFormatContent& rFlyContent = pFrameFormat->GetContent();
+ pPam->GetPoint()->nNode = *rFlyContent.GetContentIdx();
+ SwContentNode *pCNd =
pDoc->GetNodes().GoNext( &(pPam->GetPoint()->nNode) );
pPam->GetPoint()->nContent.Assign( pCNd, 0 );
@@ -3736,8 +3736,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
{
if( bStyleParsed )
{
- pCSS1Parser->SetFmtBreak( aItemSet, aPropInfo );
- pSwTable->GetFrmFmt()->SetFmtAttr( aItemSet );
+ pCSS1Parser->SetFormatBreak( aItemSet, aPropInfo );
+ pSwTable->GetFrameFormat()->SetFormatAttr( aItemSet );
}
pPam->Move( fnMoveBackward );
}
@@ -3745,29 +3745,29 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
SwNode const*const pNd = & pPam->GetPoint()->nNode.GetNode();
if( !bAppended && !bForceFrame )
{
- SwTxtNode *const pOldTxtNd =
- pSavePos->nNode.GetNode().GetTxtNode();
- OSL_ENSURE( pOldTxtNd, "Wieso stehen wir in keinem Txt-Node?" );
- SwFrmFmt *pFrmFmt = pSwTable->GetFrmFmt();
+ SwTextNode *const pOldTextNd =
+ pSavePos->nNode.GetNode().GetTextNode();
+ OSL_ENSURE( pOldTextNd, "Wieso stehen wir in keinem Text-Node?" );
+ SwFrameFormat *pFrameFormat = pSwTable->GetFrameFormat();
const SfxPoolItem* pItem2;
- if( SfxItemState::SET == pOldTxtNd->GetSwAttrSet()
+ if( SfxItemState::SET == pOldTextNd->GetSwAttrSet()
.GetItemState( RES_PAGEDESC, false, &pItem2 ) &&
- static_cast<const SwFmtPageDesc *>(pItem2)->GetPageDesc() )
+ static_cast<const SwFormatPageDesc *>(pItem2)->GetPageDesc() )
{
- pFrmFmt->SetFmtAttr( *pItem2 );
- pOldTxtNd->ResetAttr( RES_PAGEDESC );
+ pFrameFormat->SetFormatAttr( *pItem2 );
+ pOldTextNd->ResetAttr( RES_PAGEDESC );
}
- if( SfxItemState::SET == pOldTxtNd->GetSwAttrSet()
+ if( SfxItemState::SET == pOldTextNd->GetSwAttrSet()
.GetItemState( RES_BREAK, true, &pItem2 ) )
{
- switch( static_cast<const SvxFmtBreakItem *>(pItem2)->GetBreak() )
+ switch( static_cast<const SvxFormatBreakItem *>(pItem2)->GetBreak() )
{
case SVX_BREAK_PAGE_BEFORE:
case SVX_BREAK_PAGE_AFTER:
case SVX_BREAK_PAGE_BOTH:
- pFrmFmt->SetFmtAttr( *pItem2 );
- pOldTxtNd->ResetAttr( RES_BREAK );
+ pFrameFormat->SetFormatAttr( *pItem2 );
+ pOldTextNd->ResetAttr( RES_BREAK );
default:
;
}
@@ -3957,7 +3957,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
if( pSubTable->GetContext() )
{
- OSL_ENSURE( !pSubTable->GetContext()->GetFrmFmt(),
+ OSL_ENSURE( !pSubTable->GetContext()->GetFrameFormat(),
"Tabelle steht im Rahmen" );
if( pCapStNd && pSubTable->IsTopCaption() )
@@ -4076,7 +4076,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
? RES_POOLCOLL_TABLE_HDLN
: RES_POOLCOLL_TABLE ));
const SwEndNode *pEndNd = pStNd->EndOfSectionNode();
- SwCntntNode *pCNd = pDoc->GetNodes()[pEndNd->GetIndex()-1] ->GetCntntNode();
+ SwContentNode *pCNd = pDoc->GetNodes()[pEndNd->GetIndex()-1] ->GetContentNode();
//Added defaults to CJK and CTL
SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE );
pCNd->SetAttr( aFontHeight );
@@ -4198,7 +4198,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
break;
case HTML_O_VALIGN:
eVertOri = rOption.GetEnum(
- aHTMLTblVAlignTable, eVertOri );
+ aHTMLTableVAlignTable, eVertOri );
break;
case HTML_O_BGCOLOR:
// Leere BGCOLOR bei <TABLE>, <TR> und <TD>/<TH> wie Netsc.
@@ -4399,7 +4399,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
break;
case HTML_O_VALIGN:
pSaveStruct->eVertOri =
- rOption.GetEnum( aHTMLTblVAlignTable,
+ rOption.GetEnum( aHTMLTableVAlignTable,
pSaveStruct->eVertOri );
break;
}
@@ -4515,7 +4515,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
// now we stand (perhaps) in front of <TBODY>,... or </TABLE>
}
-struct _TblColGrpSaveStruct : public SwPendingStackData
+struct _TableColGrpSaveStruct : public SwPendingStackData
{
sal_uInt16 nColGrpSpan;
sal_uInt16 nColGrpWidth;
@@ -4523,18 +4523,18 @@ struct _TblColGrpSaveStruct : public SwPendingStackData
SvxAdjust eColGrpAdjust;
sal_Int16 eColGrpVertOri;
- inline _TblColGrpSaveStruct();
+ inline _TableColGrpSaveStruct();
inline void CloseColGroup( HTMLTable *pTable );
};
-inline _TblColGrpSaveStruct::_TblColGrpSaveStruct() :
+inline _TableColGrpSaveStruct::_TableColGrpSaveStruct() :
nColGrpSpan( 1 ), nColGrpWidth( 0 ),
bRelColGrpWidth( false ), eColGrpAdjust( SVX_ADJUST_END ),
eColGrpVertOri( text::VertOrientation::TOP )
{}
-inline void _TblColGrpSaveStruct::CloseColGroup( HTMLTable *pTable )
+inline void _TableColGrpSaveStruct::CloseColGroup( HTMLTable *pTable )
{
pTable->CloseColGroup( nColGrpSpan, nColGrpWidth,
bRelColGrpWidth, eColGrpAdjust, eColGrpVertOri );
@@ -4550,11 +4550,11 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
int nToken = 0;
bool bPending = false;
- _TblColGrpSaveStruct* pSaveStruct;
+ _TableColGrpSaveStruct* pSaveStruct;
if( pPendStack )
{
- pSaveStruct = static_cast<_TblColGrpSaveStruct*>(pPendStack->pData);
+ pSaveStruct = static_cast<_TableColGrpSaveStruct*>(pPendStack->pData);
SwPendingStack* pTmp = pPendStack->pNext;
delete pPendStack;
@@ -4567,7 +4567,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
else
{
- pSaveStruct = new _TblColGrpSaveStruct;
+ pSaveStruct = new _TableColGrpSaveStruct;
if( bReadOptions )
{
const HTMLOptions& rColGrpOptions = GetOptions();
@@ -4594,7 +4594,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
break;
case HTML_O_VALIGN:
pSaveStruct->eColGrpVertOri =
- rOption.GetEnum( aHTMLTblVAlignTable,
+ rOption.GetEnum( aHTMLTableVAlignTable,
pSaveStruct->eColGrpVertOri );
break;
}
@@ -4678,7 +4678,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
break;
case HTML_O_VALIGN:
eColVertOri =
- rOption.GetEnum( aHTMLTblVAlignTable,
+ rOption.GetEnum( aHTMLTableVAlignTable,
eColVertOri );
break;
}
@@ -4932,7 +4932,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
// Deshalb muss sich am Ende der Section immer ein leerer
// Absatz befinden.
if( pPam->GetPoint()->nContent.GetIndex() || bLFStripped )
- AppendTxtNode( AM_NOSPACE );
+ AppendTextNode( AM_NOSPACE );
}
else
{
@@ -4958,16 +4958,16 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
delete pSaveStruct;
}
-class _TblSaveStruct : public SwPendingStackData
+class _TableSaveStruct : public SwPendingStackData
{
public:
HTMLTable *m_pCurrentTable;
- _TblSaveStruct( HTMLTable *pCurTbl ) :
- m_pCurrentTable( pCurTbl )
+ _TableSaveStruct( HTMLTable *pCurTable ) :
+ m_pCurrentTable( pCurTable )
{}
- virtual ~_TblSaveStruct();
+ virtual ~_TableSaveStruct();
// Aufbau der Tabelle anstossen und die Tabelle ggf. in einen
// Rahmen packen. Wenn true zurueckgegeben wird muss noch ein
@@ -4975,37 +4975,37 @@ public:
void MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc );
};
-_TblSaveStruct::~_TblSaveStruct()
+_TableSaveStruct::~_TableSaveStruct()
{}
-void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc )
+void _TableSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc )
{
m_pCurrentTable->MakeTable(0, nWidth);
_HTMLTableContext *pTCntxt = m_pCurrentTable->GetContext();
OSL_ENSURE( pTCntxt, "Wo ist der Tabellen-Kontext" );
- SwTableNode *pTblNd = pTCntxt->GetTableNode();
- OSL_ENSURE( pTblNd, "Wo ist der Tabellen-Node" );
+ SwTableNode *pTableNd = pTCntxt->GetTableNode();
+ OSL_ENSURE( pTableNd, "Wo ist der Tabellen-Node" );
- if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() && pTblNd )
+ if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() && pTableNd )
{
// Existiert schon ein Layout, dann muss an dieser Tabelle die
// BoxFrames neu erzeugt werden.
- if( pTCntxt->GetFrmFmt() )
+ if( pTCntxt->GetFrameFormat() )
{
- pTCntxt->GetFrmFmt()->DelFrms();
- pTblNd->DelFrms();
- pTCntxt->GetFrmFmt()->MakeFrms();
+ pTCntxt->GetFrameFormat()->DelFrms();
+ pTableNd->DelFrms();
+ pTCntxt->GetFrameFormat()->MakeFrms();
}
else
{
- pTblNd->DelFrms();
- SwNodeIndex aIdx( *pTblNd->EndOfSectionNode(), 1 );
+ pTableNd->DelFrms();
+ SwNodeIndex aIdx( *pTableNd->EndOfSectionNode(), 1 );
OSL_ENSURE( aIdx.GetIndex() <= pTCntxt->GetPos()->nNode.GetIndex(),
"unerwarteter Node fuer das Tabellen-Layout" );
- pTblNd->MakeFrms( &aIdx );
+ pTableNd->MakeFrms( &aIdx );
}
}
@@ -5068,7 +5068,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
}
break;
case HTML_O_VALIGN:
- eVertOri = rOption.GetEnum( aHTMLTblVAlignTable, eVertOri );
+ eVertOri = rOption.GetEnum( aHTMLTableVAlignTable, eVertOri );
break;
case HTML_O_BORDER:
// BORDER und BORDER=BORDER wie BORDER=1 behandeln
@@ -5157,11 +5157,11 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
int nToken = 0;
bool bPending = false;
- _TblSaveStruct* pSaveStruct;
+ _TableSaveStruct* pSaveStruct;
if( pPendStack )
{
- pSaveStruct = static_cast<_TblSaveStruct*>(pPendStack->pData);
+ pSaveStruct = static_cast<_TableSaveStruct*>(pPendStack->pData);
SwPendingStack* pTmp = pPendStack->pNext;
delete pPendStack;
@@ -5174,23 +5174,23 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
else
{
pTable = 0;
- HTMLTableOptions *pTblOptions =
+ HTMLTableOptions *pTableOptions =
new HTMLTableOptions( GetOptions(), eParentAdjust );
- if( !pTblOptions->aId.isEmpty() )
- InsertBookmark( pTblOptions->aId );
+ if( !pTableOptions->aId.isEmpty() )
+ InsertBookmark( pTableOptions->aId );
HTMLTable *pCurTable = new HTMLTable( this, pTable,
bIsParentHead,
bHasParentSection,
bHasToFly,
- pTblOptions );
+ pTableOptions );
if( !pTable )
pTable = pCurTable;
- pSaveStruct = new _TblSaveStruct( pCurTable );
+ pSaveStruct = new _TableSaveStruct( pCurTable );
- delete pTblOptions;
+ delete pTableOptions;
// ist beim ersten GetNextToken schon pending, muss bei
// wiederaufsetzen auf jedenfall neu gelesen werden!
@@ -5334,17 +5334,17 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
*pCapStNd->EndOfSectionNode(), -1 );
bool bTop = pTable->IsTopCaption();
- SwStartNode *pTblStNd = pTCntxt->GetTableNode();
+ SwStartNode *pTableStNd = pTCntxt->GetTableNode();
- OSL_ENSURE( pTblStNd, "Wo ist der Tabellen-Node" );
- OSL_ENSURE( pTblStNd==pPam->GetNode().FindTableNode(),
+ OSL_ENSURE( pTableStNd, "Wo ist der Tabellen-Node" );
+ OSL_ENSURE( pTableStNd==pPam->GetNode().FindTableNode(),
"Stehen wir in der falschen Tabelle?" );
SwNode* pNd;
if( bTop )
- pNd = pTblStNd;
+ pNd = pTableStNd;
else
- pNd = pTblStNd->EndOfSectionNode();
+ pNd = pTableStNd->EndOfSectionNode();
SwNodeIndex aDstIdx( *pNd, bTop ? 0 : 1 );
pDoc->getIDocumentContentOperations().MoveNodeRange( aSrcRg, aDstIdx,
@@ -5357,7 +5357,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
// Tabellen-Node zeigen noch verschoben werden.
if( bTop )
{
- MovePageDescAttrs( pTblStNd, aSrcRg.aStart.GetIndex(),
+ MovePageDescAttrs( pTableStNd, aSrcRg.aStart.GetIndex(),
false );
}
}
@@ -5382,14 +5382,14 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
{
// oberen Absatz-Abstand einstellen
bUpperSpace = true;
- SetTxtCollAttrs();
+ SetTextCollAttrs();
nParaCnt = nParaCnt - std::min(nParaCnt,
pTCntxt->GetTableNode()->GetTable().GetTabSortBoxes().size());
// ggfs. eine Tabelle anspringen
if( JUMPTO_TABLE == eJumpTo && pTable->GetSwTable() &&
- pTable->GetSwTable()->GetFrmFmt()->GetName() == sJmpMark )
+ pTable->GetSwTable()->GetFrameFormat()->GetName() == sJmpMark )
{
bChkJumpMark = true;
eJumpTo = JUMPTO_NONE;
@@ -5427,10 +5427,10 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
pTable = 0;
}
- HTMLTable* pRetTbl = pSaveStruct->m_pCurrentTable;
+ HTMLTable* pRetTable = pSaveStruct->m_pCurrentTable;
delete pSaveStruct;
- return pRetTbl;
+ return pRetTable;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 8e5bda56276c..9b1158257ffe 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -89,7 +89,7 @@ public:
SwHTMLWrtTable( const SwHTMLTableLayout *pLayoutInfo );
void Write( SwHTMLWriter& rWrt, sal_Int16 eAlign=text::HoriOrientation::NONE,
- bool bTHead=false, const SwFrmFmt *pFrmFmt=0,
+ bool bTHead=false, const SwFrameFormat *pFrameFormat=0,
const OUString *pCaption=0, bool bTopCaption=false,
sal_uInt16 nHSpace=0, sal_uInt16 nVSpace=0 ) const;
};
@@ -141,7 +141,7 @@ bool SwHTMLWrtTable::HasTabBackground( const SwTableBox& rBox,
if( rBox.GetSttNd() )
{
SvxBrushItem aBrushItem =
- rBox.GetFrmFmt()->makeBackgroundBrushItem();
+ rBox.GetFrameFormat()->makeBackgroundBrushItem();
/// The table box has a background, if its background color is not "no fill"/
/// "auto fill" or it has a background graphic.
@@ -171,7 +171,7 @@ bool SwHTMLWrtTable::HasTabBackground( const SwTableLine& rLine,
OSL_ENSURE( bTop || bBottom || bLeft || bRight,
"HasTabBackground: darf nicht aufgerufen werden" );
- SvxBrushItem aBrushItem = rLine.GetFrmFmt()->makeBackgroundBrushItem();
+ SvxBrushItem aBrushItem = rLine.GetFrameFormat()->makeBackgroundBrushItem();
/// The table line has a background, if its background color is not "no fill"/
/// "auto fill" or it has a background graphic.
bool bRet = aBrushItem.GetColor() != COL_TRANSPARENT ||
@@ -213,7 +213,7 @@ static bool lcl_TableBox_HasTabBorders( const SwTableBox* pBox, bool *pBorders )
else
{
const SvxBoxItem& rBoxItem =
- static_cast<const SvxBoxItem&>(pBox->GetFrmFmt()->GetFmtAttr( RES_BOX ));
+ static_cast<const SvxBoxItem&>(pBox->GetFrameFormat()->GetFormatAttr( RES_BOX ));
*pBorders = rBoxItem.GetTop() || rBoxItem.GetBottom() ||
rBoxItem.GetLeft() || rBoxItem.GetRight();
@@ -282,22 +282,22 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
SwNode* pNd;
while( !( pNd = rWrt.pDoc->GetNodes()[nNdPos])->IsEndNode() )
{
- if( pNd->IsTxtNode() )
+ if( pNd->IsTextNode() )
{
// nur Absaetzte betrachten, an denen man was erkennt
// Das ist der Fall, wenn die Vorlage eine der Tabellen-Vorlagen
// ist oder von einer der beiden abgelitten ist.
- const SwFmt *pFmt = &static_cast<SwTxtNode*>(pNd)->GetAnyFmtColl();
- sal_uInt16 nPoolId = pFmt->GetPoolFmtId();
- while( !pFmt->IsDefault() &&
+ const SwFormat *pFormat = &static_cast<SwTextNode*>(pNd)->GetAnyFormatColl();
+ sal_uInt16 nPoolId = pFormat->GetPoolFormatId();
+ while( !pFormat->IsDefault() &&
RES_POOLCOLL_TABLE_HDLN!=nPoolId &&
RES_POOLCOLL_TABLE!=nPoolId )
{
- pFmt = pFmt->DerivedFrom();
- nPoolId = pFmt->GetPoolFmtId();
+ pFormat = pFormat->DerivedFrom();
+ nPoolId = pFormat->GetPoolFormatId();
}
- if( !pFmt->IsDefault() )
+ if( !pFormat->IsDefault() )
{
bHead = (RES_POOLCOLL_TABLE_HDLN==nPoolId);
break;
@@ -391,7 +391,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
.append("=\"").append(static_cast<sal_Int32>(aPixelSz.Height())).append("\"");
}
- const SfxItemSet& rItemSet = pBox->GetFrmFmt()->GetAttrSet();
+ const SfxItemSet& rItemSet = pBox->GetFrameFormat()->GetAttrSet();
const SfxPoolItem *pItem;
// ALIGN wird jetzt nur noch an den Absaetzen ausgegeben
@@ -412,7 +412,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- rWrt.bTxtAttr = false;
+ rWrt.bTextAttr = false;
rWrt.bOutOpts = true;
const SvxBrushItem *pBrushItem = 0;
if( SfxItemState::SET==rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
@@ -431,28 +431,28 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
}
- rWrt.OutCSS1_TableCellBorderHack(*pBox->GetFrmFmt());
+ rWrt.OutCSS1_TableCellBorderHack(*pBox->GetFrameFormat());
- sal_uInt32 nNumFmt = 0;
+ sal_uInt32 nNumFormat = 0;
double nValue = 0.0;
- bool bNumFmt = false, bValue = false;
+ bool bNumFormat = false, bValue = false;
if( SfxItemState::SET==rItemSet.GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
{
- nNumFmt = static_cast<const SwTblBoxNumFormat *>(pItem)->GetValue();
- bNumFmt = true;
+ nNumFormat = static_cast<const SwTableBoxNumFormat *>(pItem)->GetValue();
+ bNumFormat = true;
}
if( SfxItemState::SET==rItemSet.GetItemState( RES_BOXATR_VALUE, false, &pItem ) )
{
- nValue = static_cast<const SwTblBoxValue *>(pItem)->GetValue();
+ nValue = static_cast<const SwTableBoxValue *>(pItem)->GetValue();
bValue = true;
- if( !bNumFmt )
- nNumFmt = pBox->GetFrmFmt()->GetTblBoxNumFmt().GetValue();
+ if( !bNumFormat )
+ nNumFormat = pBox->GetFrameFormat()->GetTableBoxNumFormat().GetValue();
}
- if( bNumFmt || bValue )
+ if( bNumFormat || bValue )
{
sOut.append(HTMLOutFuncs::CreateTableDataOptionsValNum(bValue, nValue,
- nNumFmt, *rWrt.pDoc->GetNumberFormatter(), rWrt.eDestEnc,
+ nNumFormat, *rWrt.pDoc->GetNumberFormatter(), rWrt.eDestEnc,
&rWrt.aNonConvertableCharacters));
}
sOut.append('>');
@@ -534,7 +534,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
{
rWrt.OutBackground( pBrushItem, false );
- rWrt.bTxtAttr = false;
+ rWrt.bTextAttr = false;
rWrt.bOutOpts = true;
if( rWrt.bCfgOutStyles )
OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
@@ -563,7 +563,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
}
void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
- bool bTHead, const SwFrmFmt *pFrmFmt,
+ bool bTHead, const SwFrameFormat *pFrameFormat,
const OUString *pCaption, bool bTopCaption,
sal_uInt16 nHSpace, sal_uInt16 nVSpace ) const
{
@@ -628,8 +628,8 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_table);
sal_uInt16 nOldDirection = rWrt.nDirection;
- if( pFrmFmt )
- rWrt.nDirection = rWrt.GetHTMLDirection( pFrmFmt->GetAttrSet() );
+ if( pFrameFormat )
+ rWrt.nDirection = rWrt.GetHTMLDirection( pFrameFormat->GetAttrSet() );
if( rWrt.bOutFlyFrame || nOldDirection != rWrt.nDirection )
{
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
@@ -711,12 +711,12 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// Hintergrund ausgeben
- if( pFrmFmt )
+ if( pFrameFormat )
{
- rWrt.OutBackground( pFrmFmt->GetAttrSet(), false );
+ rWrt.OutBackground( pFrameFormat->GetAttrSet(), false );
- if( rWrt.bCfgOutStyles && pFrmFmt )
- rWrt.OutCSS1_TableFrmFmtOptions( *pFrmFmt );
+ if( rWrt.bCfgOutStyles && pFrameFormat )
+ rWrt.OutCSS1_TableFrameFormatOptions( *pFrameFormat );
}
sOut.append('>');
@@ -884,12 +884,12 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
rWrt.nDirection = nOldDirection;
}
-Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
- const SwFrmFmt *pFlyFrmFmt,
+Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
+ const SwFrameFormat *pFlyFrameFormat,
const OUString *pCaption, bool bTopCaption )
{
- SwTable& rTbl = rNode.GetTable();
+ SwTable& rTable = rNode.GetTable();
SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
rHTMLWrt.bOutTable = true;
@@ -903,21 +903,21 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
long nFlyWidth = 0;
sal_uInt16 nFlyHSpace = 0;
sal_uInt16 nFlyVSpace = 0;
- if( pFlyFrmFmt )
+ if( pFlyFrameFormat )
{
- eSurround = pFlyFrmFmt->GetSurround().GetSurround();
- const SwFmtFrmSize& rFrmSize = pFlyFrmFmt->GetFrmSize();
+ eSurround = pFlyFrameFormat->GetSurround().GetSurround();
+ const SwFormatFrmSize& rFrmSize = pFlyFrameFormat->GetFrmSize();
nFlyPrcWidth = rFrmSize.GetWidthPercent();
nFlyWidth = rFrmSize.GetSize().Width();
- eFlyHoriOri = pFlyFrmFmt->GetHoriOrient().GetHoriOrient();
+ eFlyHoriOri = pFlyFrameFormat->GetHoriOrient().GetHoriOrient();
if( text::HoriOrientation::NONE == eFlyHoriOri )
eFlyHoriOri = text::HoriOrientation::LEFT;
- const SvxLRSpaceItem& rLRSpace = pFlyFrmFmt->GetLRSpace();
+ const SvxLRSpaceItem& rLRSpace = pFlyFrameFormat->GetLRSpace();
nFlyHSpace = static_cast< sal_uInt16 >((rLRSpace.GetLeft() + rLRSpace.GetRight()) / 2);
- const SvxULSpaceItem& rULSpace = pFlyFrmFmt->GetULSpace();
+ const SvxULSpaceItem& rULSpace = pFlyFrameFormat->GetULSpace();
nFlyVSpace = (rULSpace.GetUpper() + rULSpace.GetLower()) / 2;
}
@@ -930,14 +930,14 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
rHTMLWrt.bPreserveForm = bPreserveForm;
}
- SwFrmFmt *pFmt = rTbl.GetFrmFmt();
+ SwFrameFormat *pFormat = rTable.GetFrameFormat();
- const SwFmtFrmSize& rFrmSize = pFmt->GetFrmSize();
+ const SwFormatFrmSize& rFrmSize = pFormat->GetFrmSize();
long nWidth = rFrmSize.GetSize().Width();
sal_uInt8 nPrcWidth = rFrmSize.GetWidthPercent();
sal_uInt16 nBaseWidth = (sal_uInt16)nWidth;
- sal_Int16 eTabHoriOri = pFmt->GetHoriOrient().GetHoriOrient();
+ sal_Int16 eTabHoriOri = pFormat->GetHoriOrient().GetHoriOrient();
// text::HoriOrientation::NONE und text::HoriOrientation::FULL Tabellen benoetigen relative Breiten
sal_uInt16 nNewDefListLvl = 0;
@@ -954,7 +954,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
break;
case text::HoriOrientation::NONE:
{
- const SvxLRSpaceItem& aLRItem = pFmt->GetLRSpace();
+ const SvxLRSpaceItem& aLRItem = pFormat->GetLRSpace();
if( aLRItem.GetRight() )
{
// Die Tabellenbreite wird anhand des linken und rechten
@@ -962,7 +962,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
// tatsaechliche Breite der Tabelle zu bestimmen. Wenn
// das nicht geht, machen wir eine 100% breite Tabelle
// draus.
- nWidth = pFmt->FindLayoutRect(true).Width();
+ nWidth = pFormat->FindLayoutRect(true).Width();
if( !nWidth )
{
bRelWidths = true;
@@ -981,7 +981,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
// Ohne rechten Rand bleibt auch eine absolute Breite erhalten
// Wir versuchen aber trotzdem ueber das Layout die
// tatsachliche Breite zu ermitteln.
- long nRealWidth = pFmt->FindLayoutRect(true).Width();
+ long nRealWidth = pFormat->FindLayoutRect(true).Width();
if( nRealWidth )
nWidth = nRealWidth;
}
@@ -1008,7 +1008,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
OSL_ENSURE( !rHTMLWrt.GetNumInfo().GetNumRule() ||
rHTMLWrt.GetNextNumInfo(),
"NumInfo fuer naechsten Absatz fehlt!" );
- const SvxLRSpaceItem& aLRItem = pFmt->GetLRSpace();
+ const SvxLRSpaceItem& aLRItem = pFormat->GetLRSpace();
if( aLRItem.GetLeft() > 0 && rHTMLWrt.nDefListMargin > 0 &&
( !rHTMLWrt.GetNumInfo().GetNumRule() ||
( rHTMLWrt.GetNextNumInfo() &&
@@ -1027,7 +1027,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
}
}
- if( !pFlyFrmFmt && nNewDefListLvl != rHTMLWrt.nDefListLvl )
+ if( !pFlyFrameFormat && nNewDefListLvl != rHTMLWrt.nDefListLvl )
rHTMLWrt.OutAndSetDefList( nNewDefListLvl );
if( nNewDefListLvl )
@@ -1084,8 +1084,8 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
if( text::HoriOrientation::NONE==eTabHoriOri )
nFlyHSpace = nFlyVSpace = 0;
- if( !pFmt->GetName().isEmpty() )
- rHTMLWrt.OutImplicitMark( pFmt->GetName(), "table" );
+ if( !pFormat->GetName().isEmpty() )
+ rHTMLWrt.OutImplicitMark( pFormat->GetName(), "table" );
if( text::HoriOrientation::NONE!=eDivHoriOri )
{
@@ -1108,7 +1108,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
if( text::HoriOrientation::NONE==eTabHoriOri )
rHTMLWrt.bLFPossible = true;
- const SwHTMLTableLayout *pLayout = rTbl.GetHTMLTableLayout();
+ const SwHTMLTableLayout *pLayout = rTable.GetHTMLTableLayout();
#ifdef DBG_UTIL
{
@@ -1121,16 +1121,16 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
if( pLayout && pLayout->IsExportable() )
{
SwHTMLWrtTable aTableWrt( pLayout );
- aTableWrt.Write( rHTMLWrt, eTabHoriOri, rTbl.GetRowsToRepeat() > 0,
- pFmt, pCaption, bTopCaption,
+ aTableWrt.Write( rHTMLWrt, eTabHoriOri, rTable.GetRowsToRepeat() > 0,
+ pFormat, pCaption, bTopCaption,
nFlyHSpace, nFlyVSpace );
}
else
{
- SwHTMLWrtTable aTableWrt( rTbl.GetTabLines(), nWidth,
- nBaseWidth, bRelWidths, 0, 0, rTbl.GetRowsToRepeat() );
- aTableWrt.Write( rHTMLWrt, eTabHoriOri, rTbl.GetRowsToRepeat() > 0,
- pFmt, pCaption, bTopCaption,
+ SwHTMLWrtTable aTableWrt( rTable.GetTabLines(), nWidth,
+ nBaseWidth, bRelWidths, 0, 0, rTable.GetRowsToRepeat() );
+ aTableWrt.Write( rHTMLWrt, eTabHoriOri, rTable.GetRowsToRepeat() > 0,
+ pFormat, pCaption, bTopCaption,
nFlyHSpace, nFlyVSpace );
}
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 084289c1bbe9..3f5ec0c27726 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -253,7 +253,7 @@ struct SvxCSS1ItemIds
sal_uInt16 nAdjust;
sal_uInt16 nWidows;
sal_uInt16 nOrphans;
- sal_uInt16 nFmtSplit;
+ sal_uInt16 nFormatSplit;
sal_uInt16 nLRSpace;
sal_uInt16 nULSpace;
@@ -739,7 +739,7 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sal_
aItemIds.nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, false );
aItemIds.nWidows = rPool.GetTrueWhich( SID_ATTR_PARA_WIDOWS, false );
aItemIds.nOrphans = rPool.GetTrueWhich( SID_ATTR_PARA_ORPHANS, false );
- aItemIds.nFmtSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, false );
+ aItemIds.nFormatSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, false );
aItemIds.nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, false );
aItemIds.nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, false );
@@ -752,10 +752,10 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sal_
aItemIds.nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, false );
aWhichMap.insert( aWhichMap.begin(), 0 );
- SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16 *>(&aItemIds),
+ SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16 *>(&aItemIds),
sizeof(aItemIds) / sizeof(sal_uInt16) );
if( pWhichIds && nWhichIds )
- SvParser::BuildWhichTbl( aWhichMap, pWhichIds, nWhichIds );
+ SvParser::BuildWhichTable( aWhichMap, pWhichIds, nWhichIds );
pSheetItemSet = new SfxItemSet( rPool, &aWhichMap[0] );
pSheetPropInfo = new SvxCSS1PropertyInfo;
@@ -970,7 +970,7 @@ void SvxCSS1Parser::MergeStyles( const SfxItemSet& rSrcSet,
if( rSrcInfo.bRightMargin )
aLRSpace.SetRight( rNewLRSpace.GetRight() );
if( rSrcInfo.bTextIndent )
- aLRSpace.SetTxtFirstLineOfst( rNewLRSpace.GetTxtFirstLineOfst() );
+ aLRSpace.SetTextFirstLineOfst( rNewLRSpace.GetTextFirstLineOfst() );
rTargetSet.Put( aLRSpace );
}
@@ -2005,13 +2005,13 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr,
&pItem ) )
{
SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem*>(pItem) );
- aLRItem.SetTxtFirstLineOfst( nIndent );
+ aLRItem.SetTextFirstLineOfst( nIndent );
rItemSet.Put( aLRItem );
}
else
{
SvxLRSpaceItem aLRItem( aItemIds.nLRSpace );
- aLRItem.SetTxtFirstLineOfst( nIndent );
+ aLRItem.SetTextFirstLineOfst( nIndent );
rItemSet.Put( aLRItem );
}
rPropInfo.bTextIndent = true;
@@ -2060,13 +2060,13 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr,
&pItem ) )
{
SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem*>(pItem) );
- aLRItem.SetTxtLeft( (sal_uInt16)nLeft );
+ aLRItem.SetTextLeft( (sal_uInt16)nLeft );
rItemSet.Put( aLRItem );
}
else
{
SvxLRSpaceItem aLRItem( aItemIds.nLRSpace );
- aLRItem.SetTxtLeft( (sal_uInt16)nLeft );
+ aLRItem.SetTextLeft( (sal_uInt16)nLeft );
rItemSet.Put( aLRItem );
}
rPropInfo.bLeftMargin = true;
@@ -2998,7 +2998,7 @@ static void ParseCSS1_page_break_inside( const CSS1Expression *pExpr,
}
if( bSetSplit )
- rItemSet.Put( SvxFmtSplitItem( bSplit, aItemIds.nFmtSplit ) );
+ rItemSet.Put( SvxFormatSplitItem( bSplit, aItemIds.nFormatSplit ) );
}
static void ParseCSS1_widows( const CSS1Expression *pExpr,
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index 5789844db5ce..9beac833570d 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -25,10 +25,10 @@
#include "svxcss1.hxx"
class SwDoc;
-class SwCharFmt;
-class SwTxtFmtColl;
+class SwCharFormat;
+class SwTextFormatColl;
class SvxBrushItem;
-class SwFmtDrop;
+class SwFormatDrop;
class SwPageDesc;
// Dieser Header seiht zwar harmlos aus, included aber eben doch
@@ -54,18 +54,18 @@ class SwCSS1Parser : public SvxCSS1Parser
bool bSetFirstPageDesc : 1;
bool bSetRightPageDesc : 1;
- bool bTableHeaderTxtCollSet : 1;
- bool bTableTxtCollSet : 1;
+ bool bTableHeaderTextCollSet : 1;
+ bool bTableTextCollSet : 1;
- bool bLinkCharFmtsSet : 1;
+ bool bLinkCharFormatsSet : 1;
// die Vorlagen fuer DL anlegen
- SwTxtFmtColl* GetDefListTxtFmtColl( sal_uInt16 nCollId, sal_uInt16 nDeep );
+ SwTextFormatColl* GetDefListTextFormatColl( sal_uInt16 nCollId, sal_uInt16 nDeep );
const SwPageDesc* GetPageDesc( sal_uInt16 nPoolId, bool bCreate );
- void SetTableTxtColl( bool bHeader );
- void SetLinkCharFmts();
+ void SetTableTextColl( bool bHeader );
+ void SetLinkCharFormats();
protected:
virtual bool StyleParsed( const CSS1Selector *pSelector,
@@ -88,15 +88,15 @@ public:
// das Zeichen-Format zu einem Token und einer ggf leeren Klasse
// ermitteln
- SwCharFmt* GetChrFmt( sal_uInt16 nToken, const OUString& rClass ) const;
+ SwCharFormat* GetChrFormat( sal_uInt16 nToken, const OUString& rClass ) const;
- // eine TextFmtColl zu einer Pool-Id ermitteln
- SwTxtFmtColl *GetTxtFmtColl( sal_uInt16 nTxtColl, const OUString& rClass );
+ // eine TextFormatColl zu einer Pool-Id ermitteln
+ SwTextFormatColl *GetTextFormatColl( sal_uInt16 nTextColl, const OUString& rClass );
// This methods do the same as the one of SwDoc, but change the
// encoding if required.
- SwTxtFmtColl *GetTxtCollFromPool( sal_uInt16 nPoolId ) const;
- SwCharFmt *GetCharFmtFromPool( sal_uInt16 nPoolId ) const;
+ SwTextFormatColl *GetTextCollFromPool( sal_uInt16 nPoolId ) const;
+ SwCharFormat *GetCharFormatFromPool( sal_uInt16 nPoolId ) const;
// Die linke oder rechte Seiten-Vorlage holen. In Dokumenten mit nur
// einer Vorlage gibt es nur eine rechtee Seite.
@@ -122,15 +122,15 @@ public:
const SvxCSS1PropertyInfo& rPropInfo );
// Fuellen eines DropCap-Attributs
- void FillDropCap( SwFmtDrop& rDrop, SfxItemSet& rItemSet,
+ void FillDropCap( SwFormatDrop& rDrop, SfxItemSet& rItemSet,
const OUString *pName=0 );
- bool SetFmtBreak( SfxItemSet& rItemSet,
+ bool SetFormatBreak( SfxItemSet& rItemSet,
const SvxCSS1PropertyInfo& rPropInfo );
- static void AddClassName( OUString& rFmtName, const OUString& rClass );
+ static void AddClassName( OUString& rFormatName, const OUString& rClass );
- static inline void AddFirstLetterExt( OUString& rFmtName );
+ static inline void AddFirstLetterExt( OUString& rFormatName );
static bool MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
bool bAutoWidth=false );
@@ -163,9 +163,9 @@ public:
virtual void SetDfltEncoding( rtl_TextEncoding eEnc ) SAL_OVERRIDE;
};
-inline void SwCSS1Parser::AddFirstLetterExt( OUString& rFmtName )
+inline void SwCSS1Parser::AddFirstLetterExt( OUString& rFormatName )
{
- rFmtName += ".FL"; // first letter
+ rFormatName += ".FL"; // first letter
}
inline const SwPageDesc* SwCSS1Parser::GetFirstPageDesc( bool bCreate )
@@ -185,20 +185,20 @@ inline const SwPageDesc* SwCSS1Parser::GetLeftPageDesc( bool bCreate )
inline void SwCSS1Parser::SetTHTagStyles()
{
- if( !bTableHeaderTxtCollSet )
- SetTableTxtColl( true );
+ if( !bTableHeaderTextCollSet )
+ SetTableTextColl( true );
}
inline void SwCSS1Parser::SetTDTagStyles()
{
- if( !bTableTxtCollSet )
- SetTableTxtColl( false );
+ if( !bTableTextCollSet )
+ SetTableTextColl( false );
}
inline void SwCSS1Parser::SetATagStyles()
{
- if( !bLinkCharFmtsSet )
- SetLinkCharFmts();
+ if( !bLinkCharFormatsSet )
+ SetLinkCharFormats();
}
inline void SwCSS1Parser::SetDelayedStyles()
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 90ac4505f5c5..4ab6dee8fda1 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -197,13 +197,13 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam,
if( !bInsertMode )
{
- Reader::ResetFrmFmts( rDoc );
+ Reader::ResetFrameFormats( rDoc );
// Die HTML-Seitenvorlage setzen, wenn des kein HTML-Dokument ist,
// sonst ist sie schon gesetzt.
if( !rDoc.getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) )
{
- rDoc.getIDocumentContentOperations().InsertPoolItem( rPam, SwFmtPageDesc(
+ rDoc.getIDocumentContentOperations().InsertPoolItem( rPam, SwFormatPageDesc(
rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool( RES_POOLPAGE_HTML, false )) );
}
}
@@ -335,7 +335,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn,
// #i18732# - adjust default of option 'FollowTextFlow'
// TODO: not sure what the appropriate default for HTML should be?
- pDoc->SetDefault( SwFmtFollowTextFlow(true) );
+ pDoc->SetDefault( SwFormatFollowTextFlow(true) );
}
// Waehrend des Imports in den HTML-Modus schalten, damit die
@@ -529,8 +529,8 @@ SvParserState SwHTMLParser::CallParser()
aInsertionRangePam.Move( fnMoveBackward );
pDoc->getIDocumentRedlineAccess().SplitRedline( aInsertionRangePam );
- pDoc->SetTxtFmtColl( *pPam,
- pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+ pDoc->SetTextFormatColl( *pPam,
+ pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
}
if( GetMedium() )
@@ -642,11 +642,11 @@ void SwHTMLParser::Continue( int nToken )
if( !aScriptSource.isEmpty() )
{
SwScriptFieldType *pType =
- static_cast<SwScriptFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_SCRIPTFLD ));
+ static_cast<SwScriptFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_SCRIPTFLD ));
- SwScriptField aFld( pType, aScriptType, aScriptSource,
+ SwScriptField aField( pType, aScriptType, aScriptSource,
false );
- InsertAttr( SwFmtFld( aFld ) );
+ InsertAttr( SwFormatField( aField ) );
}
if( pAppletImpl )
@@ -689,16 +689,16 @@ void SwHTMLParser::Continue( int nToken )
// den Start wieder korrigieren
if( !IsNewDoc() && pSttNdIdx->GetIndex() )
{
- SwTxtNode* pTxtNode = pSttNdIdx->GetNode().GetTxtNode();
+ SwTextNode* pTextNode = pSttNdIdx->GetNode().GetTextNode();
SwNodeIndex aNxtIdx( *pSttNdIdx );
- if( pTxtNode && pTxtNode->CanJoinNext( &aNxtIdx ))
+ if( pTextNode && pTextNode->CanJoinNext( &aNxtIdx ))
{
- const sal_Int32 nStt = pTxtNode->GetTxt().getLength();
+ const sal_Int32 nStt = pTextNode->GetText().getLength();
// wenn der Cursor noch in dem Node steht, dann setze in an das Ende
if( pPam->GetPoint()->nNode == aNxtIdx )
{
pPam->GetPoint()->nNode = *pSttNdIdx;
- pPam->GetPoint()->nContent.Assign( pTxtNode, nStt );
+ pPam->GetPoint()->nContent.Assign( pTextNode, nStt );
}
#if OSL_DEBUG_LEVEL > 0
@@ -711,23 +711,23 @@ OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( false ).nNode.GetIndex(),
if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( true ).nNode.GetIndex() )
{
const sal_Int32 nCntPos = pPam->GetBound( true ).nContent.GetIndex();
- pPam->GetBound( true ).nContent.Assign( pTxtNode,
- pTxtNode->GetTxt().getLength() + nCntPos );
+ pPam->GetBound( true ).nContent.Assign( pTextNode,
+ pTextNode->GetText().getLength() + nCntPos );
}
if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
{
const sal_Int32 nCntPos = pPam->GetBound( false ).nContent.GetIndex();
- pPam->GetBound( false ).nContent.Assign( pTxtNode,
- pTxtNode->GetTxt().getLength() + nCntPos );
+ pPam->GetBound( false ).nContent.Assign( pTextNode,
+ pTextNode->GetText().getLength() + nCntPos );
}
#endif
// Zeichen Attribute beibehalten!
- SwTxtNode* pDelNd = aNxtIdx.GetNode().GetTxtNode();
- if (pTxtNode->GetTxt().getLength())
- pDelNd->FmtToTxtAttr( pTxtNode );
+ SwTextNode* pDelNd = aNxtIdx.GetNode().GetTextNode();
+ if (pTextNode->GetText().getLength())
+ pDelNd->FormatToTextAttr( pTextNode );
else
- pTxtNode->ChgFmtColl( pDelNd->GetTxtColl() );
- pTxtNode->JoinNext();
+ pTextNode->ChgFormatColl( pDelNd->GetTextColl() );
+ pTextNode->JoinNext();
}
}
}
@@ -745,7 +745,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
SwPosition* pPos = pPam->GetPoint();
if( !pPos->nContent.GetIndex() && !bLFStripped )
{
- SwTxtNode* pAktNd;
+ SwTextNode* pAktNd;
sal_uLong nNodeIdx = pPos->nNode.GetIndex();
bool bHasFlysOrMarks =
@@ -755,11 +755,11 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
{
const SwNode *pPrev = pDoc->GetNodes()[nNodeIdx -1];
if( !pPam->GetPoint()->nContent.GetIndex() &&
- ( pPrev->IsCntntNode() ||
+ ( pPrev->IsContentNode() ||
(pPrev->IsEndNode() &&
pPrev->StartOfSectionNode()->IsSectionNode()) ) )
{
- SwCntntNode* pCNd = pPam->GetCntntNode();
+ SwContentNode* pCNd = pPam->GetContentNode();
if( pCNd && pCNd->StartOfSectionIndex()+2 <
pCNd->EndOfSectionIndex() && !bHasFlysOrMarks )
{
@@ -781,16 +781,16 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
}
}
}
- else if( 0 != ( pAktNd = pDoc->GetNodes()[ nNodeIdx ]->GetTxtNode()) && !bHasFlysOrMarks )
+ else if( 0 != ( pAktNd = pDoc->GetNodes()[ nNodeIdx ]->GetTextNode()) && !bHasFlysOrMarks )
{
if( pAktNd->CanJoinNext( &pPos->nNode ))
{
- SwTxtNode* pNextNd = pPos->nNode.GetNode().GetTxtNode();
+ SwTextNode* pNextNd = pPos->nNode.GetNode().GetTextNode();
pPos->nContent.Assign( pNextNd, 0 );
pPam->SetMark(); pPam->DeleteMark();
pNextNd->JoinPrev();
}
- else if (pAktNd->GetTxt().isEmpty())
+ else if (pAktNd->GetText().isEmpty())
{
pPos->nContent.Assign( 0, 0 );
pPam->SetMark(); pPam->DeleteMark();
@@ -805,31 +805,31 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
{
if( pPos->nContent.GetIndex() ) // dann gabs am Ende kein <P>,
pPam->Move( fnMoveForward, fnGoNode ); // als zum naechsten Node
- SwTxtNode* pTxtNode = pPos->nNode.GetNode().GetTxtNode();
+ SwTextNode* pTextNode = pPos->nNode.GetNode().GetTextNode();
SwNodeIndex aPrvIdx( pPos->nNode );
- if( pTxtNode && pTxtNode->CanJoinPrev( &aPrvIdx ) &&
+ if( pTextNode && pTextNode->CanJoinPrev( &aPrvIdx ) &&
*pSttNdIdx <= aPrvIdx )
{
// eigentlich muss hier ein JoinNext erfolgen, aber alle Cursor
- // usw. sind im pTxtNode angemeldet, so dass der bestehen
+ // usw. sind im pTextNode angemeldet, so dass der bestehen
// bleiben MUSS.
// Absatz in Zeichen-Attribute umwandeln, aus dem Prev die
// Absatzattribute und die Vorlage uebernehmen!
- SwTxtNode* pPrev = aPrvIdx.GetNode().GetTxtNode();
- pTxtNode->ChgFmtColl( pPrev->GetTxtColl() );
- pTxtNode->FmtToTxtAttr( pPrev );
- pTxtNode->ResetAllAttr();
+ SwTextNode* pPrev = aPrvIdx.GetNode().GetTextNode();
+ pTextNode->ChgFormatColl( pPrev->GetTextColl() );
+ pTextNode->FormatToTextAttr( pPrev );
+ pTextNode->ResetAllAttr();
if( pPrev->HasSwAttrSet() )
- pTxtNode->SetAttr( *pPrev->GetpSwAttrSet() );
+ pTextNode->SetAttr( *pPrev->GetpSwAttrSet() );
if( &pPam->GetBound(true).nNode.GetNode() == pPrev )
- pPam->GetBound(true).nContent.Assign( pTxtNode, 0 );
+ pPam->GetBound(true).nContent.Assign( pTextNode, 0 );
if( &pPam->GetBound(false).nNode.GetNode() == pPrev )
- pPam->GetBound(false).nContent.Assign( pTxtNode, 0 );
+ pPam->GetBound(false).nContent.Assign( pTextNode, 0 );
- pTxtNode->JoinPrev();
+ pTextNode->JoinPrev();
}
}
@@ -1274,7 +1274,7 @@ void SwHTMLParser::NextToken( int nToken )
if( pPageDesc )
{
- pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, SwFmtPageDesc( pPageDesc ) );
+ pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, SwFormatPageDesc( pPageDesc ) );
}
}
break;
@@ -1419,9 +1419,9 @@ void SwHTMLParser::NextToken( int nToken )
if( HTML_NEWPARA==nToken ||
pPam->GetPoint()->nContent.GetIndex() )
{
- AppendTxtNode(); // there is no LF at this place
+ AppendTextNode(); // there is no LF at this place
// therefore it will cause no problems
- SetTxtCollAttrs();
+ SetTextCollAttrs();
}
// progress bar
if( !GetMedium() || !GetMedium()->IsRemote() )
@@ -1439,10 +1439,10 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_LINEFEEDCHAR:
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode();
+ AppendTextNode();
if( !pTable && !pDoc->IsInHeaderFooter( pPam->GetPoint()->nNode ) )
{
- NewAttr( &aAttrTab.pBreak, SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
+ NewAttr( &aAttrTab.pBreak, SvxFormatBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
EndAttr( aAttrTab.pBreak, 0, false );
}
break;
@@ -1455,7 +1455,7 @@ void SwHTMLParser::NextToken( int nToken )
if( nPos )
{
const OUString& rText =
- pPam->GetPoint()->nNode.GetNode().GetTxtNode()->GetTxt();
+ pPam->GetPoint()->nNode.GetNode().GetTextNode()->GetText();
sal_Unicode cLast = rText[--nPos];
if( ' ' == cLast || '\x0a' == cLast)
aToken = aToken.copy(1);
@@ -1605,27 +1605,27 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_ADDRESS_ON:
if( nOpenParaToken )
EndPara();
- NewTxtFmtColl( HTML_ADDRESS_ON, RES_POOLCOLL_SENDADRESS );
+ NewTextFormatColl( HTML_ADDRESS_ON, RES_POOLCOLL_SENDADRESS );
break;
case HTML_ADDRESS_OFF:
if( nOpenParaToken )
EndPara();
- EndTxtFmtColl( HTML_ADDRESS_OFF );
+ EndTextFormatColl( HTML_ADDRESS_OFF );
break;
case HTML_BLOCKQUOTE_ON:
case HTML_BLOCKQUOTE30_ON:
if( nOpenParaToken )
EndPara();
- NewTxtFmtColl( HTML_BLOCKQUOTE_ON, RES_POOLCOLL_HTML_BLOCKQUOTE );
+ NewTextFormatColl( HTML_BLOCKQUOTE_ON, RES_POOLCOLL_HTML_BLOCKQUOTE );
break;
case HTML_BLOCKQUOTE_OFF:
case HTML_BLOCKQUOTE30_OFF:
if( nOpenParaToken )
EndPara();
- EndTxtFmtColl( HTML_BLOCKQUOTE_ON );
+ EndTextFormatColl( HTML_BLOCKQUOTE_ON );
break;
case HTML_PREFORMTXT_ON:
@@ -1633,17 +1633,17 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_XMP_ON:
if( nOpenParaToken )
EndPara();
- NewTxtFmtColl( nToken, RES_POOLCOLL_HTML_PRE );
+ NewTextFormatColl( nToken, RES_POOLCOLL_HTML_PRE );
break;
case HTML_PREFORMTXT_OFF:
bNoParSpace = true; // the last PRE-paragraph gets a spacing
- EndTxtFmtColl( HTML_PREFORMTXT_OFF );
+ EndTextFormatColl( HTML_PREFORMTXT_OFF );
break;
case HTML_LISTING_OFF:
case HTML_XMP_OFF:
- EndTxtFmtColl( nToken );
+ EndTextFormatColl( nToken );
break;
case HTML_HEAD1_ON:
@@ -1852,7 +1852,7 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_DELETEDTEXT_ON:
case HTML_TELETYPE_ON:
- NewCharFmt( nToken );
+ NewCharFormat( nToken );
break;
case HTML_SDFIELD_ON:
@@ -2086,7 +2086,7 @@ static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
}
}
-bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
+bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum )
{
// Ein harter Zeilen-Umbruch am Ende muss immer entfernt werden.
// Einen zweiten ersetzen wir durch einen Absatz-Abstand.
@@ -2100,11 +2100,11 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
if( AM_SPACE==eMode || AM_NOSPACE==eMode )
{
- SwTxtNode *pTxtNode =
- pPam->GetPoint()->nNode.GetNode().GetTxtNode();
+ SwTextNode *pTextNode =
+ pPam->GetPoint()->nNode.GetNode().GetTextNode();
const SvxULSpaceItem& rULSpace =
- static_cast<const SvxULSpaceItem&>(pTxtNode->SwCntntNode::GetAttr( RES_UL_SPACE ));
+ static_cast<const SvxULSpaceItem&>(pTextNode->SwContentNode::GetAttr( RES_UL_SPACE ));
bool bChange = AM_NOSPACE==eMode ? rULSpace.GetLower() > 0
: rULSpace.GetLower() == 0;
@@ -2112,7 +2112,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
if( bChange )
{
const SvxULSpaceItem& rCollULSpace =
- pTxtNode->GetAnyFmtColl().GetULSpace();
+ pTextNode->GetAnyFormatColl().GetULSpace();
bool bMayReset = AM_NOSPACE==eMode ? rCollULSpace.GetLower() == 0
: rCollULSpace.GetLower() > 0;
@@ -2120,11 +2120,11 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
if( bMayReset &&
rCollULSpace.GetUpper() == rULSpace.GetUpper() )
{
- pTxtNode->ResetAttr( RES_UL_SPACE );
+ pTextNode->ResetAttr( RES_UL_SPACE );
}
else
{
- pTxtNode->SetAttr(
+ pTextNode->SetAttr(
SvxULSpaceItem( rULSpace.GetUpper(),
AM_NOSPACE==eMode ? 0 : HTML_PARSPACE, RES_UL_SPACE ) );
}
@@ -2134,7 +2134,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
SwPosition aOldPos( *pPam->GetPoint() );
- bool bRet = pDoc->getIDocumentContentOperations().AppendTxtNode( *pPam->GetPoint() );
+ bool bRet = pDoc->getIDocumentContentOperations().AppendTextNode( *pPam->GetPoint() );
// Zeichen-Attribute aufspalten und ggf keine setzen, die ueber den
// ganzen Absatz gesetzt sind
@@ -2162,7 +2162,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
pAttr->GetSttPara() == rEndIdx &&
pAttr->GetSttCnt() == 0;
- sal_Int32 nStt = pAttr->nSttCntnt;
+ sal_Int32 nStt = pAttr->nSttContent;
bool bScript = false, bFont = false;
sal_uInt16 nScriptItem;
bool bInsert = true;
@@ -2171,24 +2171,24 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
// den besehrigen Teil setzen
if( bInsert && bScript )
{
- const SwTxtNode *pTxtNd =
- pAttr->GetSttPara().GetNode().GetTxtNode();
- OSL_ENSURE( pTxtNd, "No text node" );
- if( pTxtNd )
+ const SwTextNode *pTextNd =
+ pAttr->GetSttPara().GetNode().GetTextNode();
+ OSL_ENSURE( pTextNd, "No text node" );
+ if( pTextNd )
{
- const OUString& rText = pTxtNd->GetTxt();
- sal_uInt16 nScriptTxt =
+ const OUString& rText = pTextNd->GetText();
+ sal_uInt16 nScriptText =
g_pBreakIt->GetBreakIter()->getScriptType(
rText, pAttr->GetSttCnt() );
sal_Int32 nScriptEnd = g_pBreakIt->GetBreakIter()
- ->endOfScript( rText, nStt, nScriptTxt );
+ ->endOfScript( rText, nStt, nScriptText );
while( nScriptEnd < nEndCnt )
{
- if( nScriptItem == nScriptTxt )
+ if( nScriptItem == nScriptText )
{
_HTMLAttr *pSetAttr =
pAttr->Clone( rEndIdx, nScriptEnd );
- pSetAttr->nSttCntnt = nStt;
+ pSetAttr->nSttContent = nStt;
pSetAttr->ClearPrev();
if( !pNext || bWholePara )
{
@@ -2201,19 +2201,19 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
pNext->InsertPrev( pSetAttr );
}
nStt = nScriptEnd;
- nScriptTxt = g_pBreakIt->GetBreakIter()->getScriptType(
+ nScriptText = g_pBreakIt->GetBreakIter()->getScriptType(
rText, nStt );
nScriptEnd = g_pBreakIt->GetBreakIter()
- ->endOfScript( rText, nStt, nScriptTxt );
+ ->endOfScript( rText, nStt, nScriptText );
}
- bInsert = nScriptItem == nScriptTxt;
+ bInsert = nScriptItem == nScriptText;
}
}
if( bInsert )
{
_HTMLAttr *pSetAttr =
pAttr->Clone( rEndIdx, nEndCnt );
- pSetAttr->nSttCntnt = nStt;
+ pSetAttr->nSttContent = nStt;
// Wenn das Attribut den gesamten Absatz umspannt, werden
// alle auesseren Attribute nicht mehr beachtet. Deshalb
@@ -2265,7 +2265,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
SetNodeNum( nLvl, false );
}
else
- pPam->GetNode().GetTxtNode()->ResetAttr( RES_PARATR_NUMRULE );
+ pPam->GetNode().GetTextNode()->ResetAttr( RES_PARATR_NUMRULE );
}
// Attrubute im Absatz davor sollte man jetzt setzen (wegen JavaScript)
@@ -2273,10 +2273,10 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
// Now it is time to get rid of all script dependent hints that are
// equal to the settings in the style
- SwTxtNode *pTxtNd = rEndIdx.GetNode().GetTxtNode();
- OSL_ENSURE( pTxtNd, "There is the txt node" );
- size_t nCntAttr = (pTxtNd && pTxtNd->GetpSwpHints())
- ? pTxtNd->GetSwpHints().Count() : 0;
+ SwTextNode *pTextNd = rEndIdx.GetNode().GetTextNode();
+ OSL_ENSURE( pTextNd, "There is the txt node" );
+ size_t nCntAttr = (pTextNd && pTextNd->GetpSwpHints())
+ ? pTextNd->GetSwpHints().Count() : 0;
if( nCntAttr )
{
// These are the end position of all script depenent hints.
@@ -2288,10 +2288,10 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
// is remembered.
sal_Int32 aEndPos[15] =
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
- SwpHints& rHints = pTxtNd->GetSwpHints();
+ SwpHints& rHints = pTextNd->GetSwpHints();
for( size_t i=0; i < nCntAttr; i++ )
{
- SwTxtAttr *pHt = rHints.GetTextHint( i );
+ SwTextAttr *pHt = rHints.GetTextHint( i );
sal_uInt16 nWhich = pHt->Which();
sal_Int16 nIdx = -1;
//In 'hintids.hxx', the following five attributes don't follow
@@ -2347,7 +2347,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
{
bool bFont = (nIdx % 5) == 0;
const SfxPoolItem& rItem =
- static_cast<const SwCntntNode *>(pTxtNd)->GetAttr( nWhich );
+ static_cast<const SwContentNode *>(pTextNd)->GetAttr( nWhich );
if( bFont ? swhtml_css1atr_equalFontItems(rItem,pHt->GetAttr())
: rItem == pHt->GetAttr() )
{
@@ -2357,7 +2357,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
// also delete the SwpHints!!! To avoid any trouble
// we leave the loop immediately if this is the last
// hint.
- pTxtNd->DeleteAttribute( pHt );
+ pTextNd->DeleteAttribute( pHt );
if( 1 == nCntAttr )
break;
i--;
@@ -2397,20 +2397,20 @@ void SwHTMLParser::AddParSpace()
sal_uLong nNdIdx = pPam->GetPoint()->nNode.GetIndex() - 1;
- SwTxtNode *pTxtNode = pDoc->GetNodes()[nNdIdx]->GetTxtNode();
- if( !pTxtNode )
+ SwTextNode *pTextNode = pDoc->GetNodes()[nNdIdx]->GetTextNode();
+ if( !pTextNode )
return;
SvxULSpaceItem rULSpace =
- static_cast<const SvxULSpaceItem&>(pTxtNode->SwCntntNode::GetAttr( RES_UL_SPACE ));
+ static_cast<const SvxULSpaceItem&>(pTextNode->SwContentNode::GetAttr( RES_UL_SPACE ));
if( !rULSpace.GetLower() )
{
const SvxULSpaceItem& rCollULSpace =
- pTxtNode->GetAnyFmtColl().GetULSpace();
+ pTextNode->GetAnyFormatColl().GetULSpace();
if( rCollULSpace.GetLower() &&
rCollULSpace.GetUpper() == rULSpace.GetUpper() )
{
- pTxtNode->ResetAttr( RES_UL_SPACE );
+ pTextNode->ResetAttr( RES_UL_SPACE );
}
else
{
@@ -2421,12 +2421,12 @@ void SwHTMLParser::AddParSpace()
bool bIsCJK = false;
bool bIsCTL = false;
- const size_t nCntAttr = (pTxtNode && pTxtNode->GetpSwpHints())
- ? pTxtNode->GetSwpHints().Count() : 0;
+ const size_t nCntAttr = (pTextNode && pTextNode->GetpSwpHints())
+ ? pTextNode->GetSwpHints().Count() : 0;
for(size_t i = 0; i < nCntAttr; ++i)
{
- SwTxtAttr *const pHt = pTxtNode->GetSwpHints().GetTextHint(i);
+ SwTextAttr *const pHt = pTextNode->GetSwpHints().GetTextHint(i);
sal_uInt16 const nWhich = pHt->Which();
if (RES_CHRATR_CJK_FONT == nWhich ||
RES_CHRATR_CJK_FONTSIZE == nWhich ||
@@ -2450,15 +2450,15 @@ void SwHTMLParser::AddParSpace()
if( bIsCTL )
{
- pTxtNode->SetAttr(
+ pTextNode->SetAttr(
SvxULSpaceItem( rULSpace.GetUpper(), HTML_CTL_PARSPACE, RES_UL_SPACE ) );
}
else if( bIsCJK )
{
- pTxtNode->SetAttr(
+ pTextNode->SetAttr(
SvxULSpaceItem( rULSpace.GetUpper(), HTML_CJK_PARSPACE, RES_UL_SPACE ) );
} else {
- pTxtNode->SetAttr(
+ pTextNode->SetAttr(
SvxULSpaceItem( rULSpace.GetUpper(), HTML_PARSPACE, RES_UL_SPACE ) );
}
}
@@ -2648,7 +2648,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
const SwNodeIndex& rEndIdx = pPam->GetPoint()->nNode;
const sal_Int32 nEndCnt = pPam->GetPoint()->nContent.GetIndex();
_HTMLAttr* pAttr;
- SwCntntNode* pCNd;
+ SwContentNode* pCNd;
sal_uInt16 n;
_HTMLAttrs aFields;
@@ -2716,7 +2716,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
continue;
}
- pCNd = pAttr->nSttPara.GetNode().GetCntntNode();
+ pCNd = pAttr->nSttPara.GetNode().GetContentNode();
if( !pCNd )
{
// durch die elende Loescherei von Nodes kann auch mal
@@ -2733,7 +2733,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
}
pCNd = pDoc->GetNodes().GoNext( &(pAttr->nSttPara) );
if( pCNd )
- pAttr->nSttCntnt = 0;
+ pAttr->nSttContent = 0;
else
{
OSL_ENSURE( false, "SetAttr: GoNext() failed!" );
@@ -2746,20 +2746,20 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
// durch das Loeschen von BRs kann der Start-Index
// auch mal hinter das Ende des Textes zeigen
- if( pAttr->nSttCntnt > pCNd->Len() )
- pAttr->nSttCntnt = pCNd->Len();
- pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nSttCntnt );
+ if( pAttr->nSttContent > pCNd->Len() )
+ pAttr->nSttContent = pCNd->Len();
+ pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nSttContent );
pAttrPam->SetMark();
if ( (pAttr->GetSttPara() != pAttr->GetEndPara()) &&
!isTXTATR_NOEND(nWhich) )
{
- pCNd = pAttr->nEndPara.GetNode().GetCntntNode();
+ pCNd = pAttr->nEndPara.GetNode().GetContentNode();
if( !pCNd )
{
pCNd = SwNodes::GoPrevious( &(pAttr->nEndPara) );
if( pCNd )
- pAttr->nEndCntnt = pCNd->Len();
+ pAttr->nEndContent = pCNd->Len();
else
{
OSL_ENSURE( false, "SetAttr: GoPrevious() failed!" );
@@ -2774,15 +2774,15 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
}
else if( pAttr->IsLikePara() )
{
- pAttr->nEndCntnt = pCNd->Len();
+ pAttr->nEndContent = pCNd->Len();
}
// durch das Loeschen von BRs kann der End-Index
// auch mal hinter das Ende des Textes zeigen
- if( pAttr->nEndCntnt > pCNd->Len() )
- pAttr->nEndCntnt = pCNd->Len();
+ if( pAttr->nEndContent > pCNd->Len() )
+ pAttr->nEndContent = pCNd->Len();
- pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nEndCntnt );
+ pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nEndContent );
if( bBeforeTable &&
pAttrPam->GetPoint()->nNode.GetIndex() ==
rEndIdx.GetIndex() )
@@ -2839,12 +2839,12 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
case RES_TXTATR_ANNOTATION:
case RES_TXTATR_INPUTFIELD:
{
- sal_uInt16 nFldWhich =
+ sal_uInt16 nFieldWhich =
pPostIts
- ? static_cast<const SwFmtFld *>(pAttr->pItem)->GetField()->GetTyp()->Which()
+ ? static_cast<const SwFormatField *>(pAttr->pItem)->GetField()->GetTyp()->Which()
: 0;
- if( pPostIts && (RES_POSTITFLD == nFldWhich ||
- RES_SCRIPTFLD == nFldWhich) )
+ if( pPostIts && (RES_POSTITFLD == nFieldWhich ||
+ RES_SCRIPTFLD == nFieldWhich) )
{
pPostIts->push_front( pAttr );
}
@@ -2875,7 +2875,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
// ggfs. ein Bookmark anspringen
if( RES_TXTATR_INETFMT == nWhich &&
JUMPTO_MARK == eJumpTo &&
- sJmpMark == static_cast<SwFmtINetFmt*>(pAttr->pItem)->GetName() )
+ sJmpMark == static_cast<SwFormatINetFormat*>(pAttr->pItem)->GetName() )
{
bChkJumpMark = true;
eJumpTo = JUMPTO_NONE;
@@ -2893,12 +2893,12 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
for( n = aMoveFlyFrms.size(); n; )
{
- SwFrmFmt *pFrmFmt = aMoveFlyFrms[ --n ];
+ SwFrameFormat *pFrameFormat = aMoveFlyFrms[ --n ];
- const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
+ const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
OSL_ENSURE( FLY_AT_PARA == rAnchor.GetAnchorId(),
"Nur Auto-Rahmen brauchen eine Spezialbehandlung" );
- const SwPosition *pFlyPos = rAnchor.GetCntntAnchor();
+ const SwPosition *pFlyPos = rAnchor.GetContentAnchor();
sal_uLong nFlyParaIdx = pFlyPos->nNode.GetIndex();
bool bMoveFly;
if( bChkEnd )
@@ -2916,31 +2916,31 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
}
if( bMoveFly )
{
- pFrmFmt->DelFrms();
+ pFrameFormat->DelFrms();
*pAttrPam->GetPoint() = *pFlyPos;
- pAttrPam->GetPoint()->nContent.Assign( pAttrPam->GetCntntNode(),
+ pAttrPam->GetPoint()->nContent.Assign( pAttrPam->GetContentNode(),
aMoveFlyCnts[n] );
- SwFmtAnchor aAnchor( rAnchor );
+ SwFormatAnchor aAnchor( rAnchor );
aAnchor.SetType( FLY_AT_CHAR );
aAnchor.SetAnchor( pAttrPam->GetPoint() );
- pFrmFmt->SetFmtAttr( aAnchor );
+ pFrameFormat->SetFormatAttr( aAnchor );
- const SwFmtHoriOrient& rHoriOri = pFrmFmt->GetHoriOrient();
+ const SwFormatHoriOrient& rHoriOri = pFrameFormat->GetHoriOrient();
if( text::HoriOrientation::LEFT == rHoriOri.GetHoriOrient() )
{
- SwFmtHoriOrient aHoriOri( rHoriOri );
+ SwFormatHoriOrient aHoriOri( rHoriOri );
aHoriOri.SetRelationOrient( text::RelOrientation::CHAR );
- pFrmFmt->SetFmtAttr( aHoriOri );
+ pFrameFormat->SetFormatAttr( aHoriOri );
}
- const SwFmtVertOrient& rVertOri = pFrmFmt->GetVertOrient();
+ const SwFormatVertOrient& rVertOri = pFrameFormat->GetVertOrient();
if( text::VertOrientation::TOP == rVertOri.GetVertOrient() )
{
- SwFmtVertOrient aVertOri( rVertOri );
+ SwFormatVertOrient aVertOri( rVertOri );
aVertOri.SetRelationOrient( text::RelOrientation::CHAR );
- pFrmFmt->SetFmtAttr( aVertOri );
+ pFrameFormat->SetFormatAttr( aVertOri );
}
- pFrmFmt->MakeFrms();
+ pFrameFormat->MakeFrms();
aMoveFlyFrms.erase( aMoveFlyFrms.begin() + n );
aMoveFlyCnts.erase( aMoveFlyCnts.begin() + n );
}
@@ -2949,9 +2949,9 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
{
pAttr = aFields[0];
- pCNd = pAttr->nSttPara.GetNode().GetCntntNode();
+ pCNd = pAttr->nSttPara.GetNode().GetContentNode();
pAttrPam->GetPoint()->nNode = pAttr->nSttPara;
- pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nSttCntnt );
+ pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nSttContent );
if( bBeforeTable &&
pAttrPam->GetPoint()->nNode.GetIndex() == rEndIdx.GetIndex() )
@@ -3027,7 +3027,7 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
if( !nEndCnt && RES_PARATR_BEGIN <= nWhich &&
*pEndIdx != pAttr->GetSttPara() )
{
- // dann eine Cntntnt Position zurueck!
+ // dann eine Contentnt Position zurueck!
bMoveBack = pPam->Move( fnMoveBackward );
nEndCnt = pPam->GetPoint()->nContent.GetIndex();
}
@@ -3058,17 +3058,17 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
if( bInsert && bScript )
{
- const SwTxtNode *pTxtNd = pAttr->GetSttPara().GetNode()
- .GetTxtNode();
- OSL_ENSURE( pTxtNd, "No text node" );
- const OUString& rText = pTxtNd->GetTxt();
- sal_uInt16 nScriptTxt = g_pBreakIt->GetBreakIter()->getScriptType(
+ const SwTextNode *pTextNd = pAttr->GetSttPara().GetNode()
+ .GetTextNode();
+ OSL_ENSURE( pTextNd, "No text node" );
+ const OUString& rText = pTextNd->GetText();
+ sal_uInt16 nScriptText = g_pBreakIt->GetBreakIter()->getScriptType(
rText, pAttr->GetSttCnt() );
sal_Int32 nScriptEnd = g_pBreakIt->GetBreakIter()
- ->endOfScript( rText, pAttr->GetSttCnt(), nScriptTxt );
+ ->endOfScript( rText, pAttr->GetSttCnt(), nScriptText );
while (nScriptEnd < nEndCnt && nScriptEnd != -1)
{
- if( nScriptItem == nScriptTxt )
+ if( nScriptItem == nScriptText )
{
_HTMLAttr *pSetAttr = pAttr->Clone( *pEndIdx, nScriptEnd );
pSetAttr->ClearPrev();
@@ -3082,18 +3082,18 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
aSetAttrTab.push_back( pSetAttr );
}
}
- pAttr->nSttCntnt = nScriptEnd;
- nScriptTxt = g_pBreakIt->GetBreakIter()->getScriptType(
+ pAttr->nSttContent = nScriptEnd;
+ nScriptText = g_pBreakIt->GetBreakIter()->getScriptType(
rText, nScriptEnd );
nScriptEnd = g_pBreakIt->GetBreakIter()
- ->endOfScript( rText, nScriptEnd, nScriptTxt );
+ ->endOfScript( rText, nScriptEnd, nScriptText );
}
- bInsert = nScriptItem == nScriptTxt;
+ bInsert = nScriptItem == nScriptText;
}
if( bInsert )
{
pAttr->nEndPara = *pEndIdx;
- pAttr->nEndCntnt = nEndCnt;
+ pAttr->nEndContent = nEndCnt;
pAttr->bInsAtStart = RES_TXTATR_INETFMT != nWhich &&
RES_TXTATR_CHARFMT != nWhich;
@@ -3276,7 +3276,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab,
{
nTmpIdx = pDoc->GetNodes().GetEndOfInserts().GetIndex();
}
- SwCntntNode* pCNd = SwNodes::GoPrevious(&nEndIdx);
+ SwContentNode* pCNd = SwNodes::GoPrevious(&nEndIdx);
// keine Attribute setzen, wenn der PaM aus dem Content-Bereich
// herausgeschoben wurde.
@@ -3385,8 +3385,8 @@ void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab,
{
pAttr->nSttPara = rSttPara;
pAttr->nEndPara = rSttPara;
- pAttr->nSttCntnt = nSttCnt;
- pAttr->nEndCntnt = nSttCnt;
+ pAttr->nSttContent = nSttCnt;
+ pAttr->nEndContent = nSttCnt;
}
pAttr = pAttr->GetNext();
}
@@ -3718,7 +3718,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
// in Ueberschriften bestimmt die aktuelle Ueberschrift
// die Font-Hoehe und nicht BASEFONT
- sal_uInt16 nPoolId = GetCurrFmtColl()->GetPoolFmtId();
+ sal_uInt16 nPoolId = GetCurrFormatColl()->GetPoolFormatId();
if( (nPoolId>=RES_POOLCOLL_HEADLINE1 &&
nPoolId<=RES_POOLCOLL_HEADLINE6) )
{
@@ -3739,7 +3739,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
// den Vorlagen geholt.
if( nPoolId && nSize>=1 && nSize <=6 )
nFontHeight =
- pCSS1Parser->GetTxtCollFromPool(
+ pCSS1Parser->GetTextCollFromPool(
RES_POOLCOLL_HEADLINE1+6-nSize )->GetSize().GetHeight();
else
nFontHeight = aFontHeights[nSize-1];
@@ -3870,7 +3870,7 @@ void SwHTMLParser::EndFontAttr( int nToken )
void SwHTMLParser::NewPara()
{
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( AM_SPACE );
+ AppendTextNode( AM_SPACE );
else
AddParSpace();
@@ -3933,7 +3933,7 @@ void SwHTMLParser::NewPara()
PushContext( pCntxt );
// die aktuelle Vorlage oder deren Attribute setzen
- SetTxtCollAttrs( !aClass.isEmpty() ? pCntxt : 0 );
+ SetTextCollAttrs( !aClass.isEmpty() ? pCntxt : 0 );
// Laufbalkenanzeige
ShowStatline();
@@ -3947,7 +3947,7 @@ void SwHTMLParser::EndPara( bool bReal )
if( HTML_LI_ON==nOpenParaToken && pTable )
{
#if OSL_DEBUG_LEVEL > 0
- const SwNumRule *pNumRule = pPam->GetNode().GetTxtNode()->GetNumRule();
+ const SwNumRule *pNumRule = pPam->GetNode().GetTextNode()->GetNumRule();
OSL_ENSURE( pNumRule, "Wo ist die Numrule geblieben" );
#endif
}
@@ -3956,7 +3956,7 @@ void SwHTMLParser::EndPara( bool bReal )
if( bReal )
{
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( AM_SPACE );
+ AppendTextNode( AM_SPACE );
else
AddParSpace();
}
@@ -3985,7 +3985,7 @@ void SwHTMLParser::EndPara( bool bReal )
// und die bisherige Vorlage neu setzen
if( bReal )
- SetTxtCollAttrs();
+ SetTextCollAttrs();
nOpenParaToken = 0;
}
@@ -4025,25 +4025,25 @@ void SwHTMLParser::NewHeading( int nToken )
// einen neuen Absatz aufmachen
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( AM_SPACE );
+ AppendTextNode( AM_SPACE );
else
AddParSpace();
// die passende Vorlage suchen
- sal_uInt16 nTxtColl;
+ sal_uInt16 nTextColl;
switch( nToken )
{
- case HTML_HEAD1_ON: nTxtColl = RES_POOLCOLL_HEADLINE1; break;
- case HTML_HEAD2_ON: nTxtColl = RES_POOLCOLL_HEADLINE2; break;
- case HTML_HEAD3_ON: nTxtColl = RES_POOLCOLL_HEADLINE3; break;
- case HTML_HEAD4_ON: nTxtColl = RES_POOLCOLL_HEADLINE4; break;
- case HTML_HEAD5_ON: nTxtColl = RES_POOLCOLL_HEADLINE5; break;
- case HTML_HEAD6_ON: nTxtColl = RES_POOLCOLL_HEADLINE6; break;
- default: nTxtColl = RES_POOLCOLL_STANDARD; break;
+ case HTML_HEAD1_ON: nTextColl = RES_POOLCOLL_HEADLINE1; break;
+ case HTML_HEAD2_ON: nTextColl = RES_POOLCOLL_HEADLINE2; break;
+ case HTML_HEAD3_ON: nTextColl = RES_POOLCOLL_HEADLINE3; break;
+ case HTML_HEAD4_ON: nTextColl = RES_POOLCOLL_HEADLINE4; break;
+ case HTML_HEAD5_ON: nTextColl = RES_POOLCOLL_HEADLINE5; break;
+ case HTML_HEAD6_ON: nTextColl = RES_POOLCOLL_HEADLINE6; break;
+ default: nTextColl = RES_POOLCOLL_STANDARD; break;
}
// den Kontext anlegen
- _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken), nTxtColl, aClass );
+ _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken), nTextColl, aClass );
// Styles parsen (zu Class siehe auch NewPara)
if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
@@ -4067,7 +4067,7 @@ void SwHTMLParser::NewHeading( int nToken )
PushContext( pCntxt );
// und die Vorlage oder deren Attribute setzen
- SetTxtCollAttrs( pCntxt );
+ SetTextCollAttrs( pCntxt );
nFontStHeadStart = aFontStack.size();
@@ -4079,7 +4079,7 @@ void SwHTMLParser::EndHeading()
{
// einen neuen Absatz aufmachen
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( AM_SPACE );
+ AppendTextNode( AM_SPACE );
else
AddParSpace();
@@ -4111,12 +4111,12 @@ void SwHTMLParser::EndHeading()
}
// die bisherige Vorlage neu setzen
- SetTxtCollAttrs();
+ SetTextCollAttrs();
nFontStHeadStart = nFontStMin;
}
-void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl )
+void SwHTMLParser::NewTextFormatColl( int nToken, sal_uInt16 nColl )
{
OUString aId, aStyle, aClass, aLang, aDir;
@@ -4172,7 +4172,7 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl )
break;
}
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( eMode );
+ AppendTextNode( eMode );
else if( AM_SPACE==eMode )
AddParSpace();
@@ -4197,13 +4197,13 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl )
PushContext( pCntxt );
// die neue Vorlage setzen
- SetTxtCollAttrs( pCntxt );
+ SetTextCollAttrs( pCntxt );
// Laufbalkenanzeige aktualisieren
ShowStatline();
}
-void SwHTMLParser::EndTxtFmtColl( int nToken )
+void SwHTMLParser::EndTextFormatColl( int nToken )
{
SwHTMLAppendMode eMode = AM_NORMAL;
switch( nToken & ~1 )
@@ -4225,7 +4225,7 @@ void SwHTMLParser::EndTxtFmtColl( int nToken )
break;
}
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( eMode );
+ AppendTextNode( eMode );
else if( AM_SPACE==eMode )
AddParSpace();
@@ -4241,7 +4241,7 @@ void SwHTMLParser::EndTxtFmtColl( int nToken )
}
// und die bisherige Vorlage setzen
- SetTxtCollAttrs();
+ SetTextCollAttrs();
}
void SwHTMLParser::NewDefList()
@@ -4275,7 +4275,7 @@ void SwHTMLParser::NewDefList()
// einen neuen Absatz aufmachen
bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 0;
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
+ AppendTextNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
else if( bSpace )
AddParSpace();
@@ -4319,9 +4319,9 @@ void SwHTMLParser::NewDefList()
// und den der DT-Vorlage des aktuellen Levels
SvxLRSpaceItem rLRSpace =
- pCSS1Parser->GetTxtFmtColl( RES_POOLCOLL_HTML_DD, aEmptyOUStr )
+ pCSS1Parser->GetTextFormatColl( RES_POOLCOLL_HTML_DD, aEmptyOUStr )
->GetLRSpace();
- nLeft = nLeft + static_cast< sal_uInt16 >(rLRSpace.GetTxtLeft());
+ nLeft = nLeft + static_cast< sal_uInt16 >(rLRSpace.GetTextLeft());
}
pCntxt->SetMargins( nLeft, nRight, nIndent );
@@ -4343,14 +4343,14 @@ void SwHTMLParser::NewDefList()
// die Attribute der neuen Vorlage setzen
if( nDefListDeep > 1 )
- SetTxtCollAttrs( pCntxt );
+ SetTextCollAttrs( pCntxt );
}
void SwHTMLParser::EndDefList()
{
bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 1;
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
+ AppendTextNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
else if( bSpace )
AddParSpace();
@@ -4370,7 +4370,7 @@ void SwHTMLParser::EndDefList()
}
// und Vorlage setzen
- SetTxtCollAttrs();
+ SetTextCollAttrs();
}
void SwHTMLParser::NewDefListItem( int nToken )
@@ -4404,7 +4404,7 @@ void SwHTMLParser::NewDefListItem( int nToken )
nOpenParaToken = static_cast< sal_uInt16 >(nToken);
}
- NewTxtFmtColl( nToken, static_cast< sal_uInt16 >(nToken==HTML_DD_ON ? RES_POOLCOLL_HTML_DD
+ NewTextFormatColl( nToken, static_cast< sal_uInt16 >(nToken==HTML_DD_ON ? RES_POOLCOLL_HTML_DD
: RES_POOLCOLL_HTML_DT) );
}
@@ -4413,7 +4413,7 @@ void SwHTMLParser::EndDefListItem( int nToken, bool bSetColl,
{
// einen neuen Absatz aufmachen
if( !nToken && pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( AM_SOFTNOSPACE );
+ AppendTextNode( AM_SOFTNOSPACE );
// Kontext zu dem Token suchen und vom Stack holen
nToken &= ~1;
@@ -4454,7 +4454,7 @@ void SwHTMLParser::EndDefListItem( int nToken, bool bSetColl,
// und die bisherige Vorlage setzen
if( bSetColl )
- SetTxtCollAttrs();
+ SetTextCollAttrs();
}
bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
@@ -4467,20 +4467,20 @@ bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
// sonst: Der Absatz enthaelt irgendeinen Rahmen
SwNodeIndex& rNodeIdx = pPam->GetPoint()->nNode;
- const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
+ const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
bool bFound = false;
- for ( sal_uInt16 i=0; i<rFrmFmtTbl.size(); i++ )
+ for ( sal_uInt16 i=0; i<rFrameFormatTable.size(); i++ )
{
- const SwFrmFmt *const pFmt = rFrmFmtTbl[i];
- SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
+ const SwFrameFormat *const pFormat = rFrameFormatTable[i];
+ SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
// Ein Rahmen wurde gefunden, wenn
// - er absatzgebunden ist, und
// - im aktuellen Absatz verankert ist, und
// - jeder absatzgebunene Rahmen zaehlt, oder
// - (nur Rahmen oder umlauf zaehlen und ) der Rahmen keinen
// Umlauf besitzt
- SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+ SwPosition const*const pAPos = pAnchor->GetContentAnchor();
if (pAPos &&
((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
(FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
@@ -4497,7 +4497,7 @@ bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
// auch keine mit Durchlauf beachten. Dabei handelt es
// sich (noch) um HIDDEN-Controls, und denen weicht man
// besser auch nicht aus.
- SwSurround eSurround = pFmt->GetSurround().GetSurround();
+ SwSurround eSurround = pFormat->GetSurround().GetSurround();
if( bNoSurroundOnly )
{
if( SURROUND_NONE==eSurround )
@@ -4529,17 +4529,17 @@ bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
// die speziellen Methoden zum Einfuegen von Objecten
-const SwFmtColl *SwHTMLParser::GetCurrFmtColl() const
+const SwFormatColl *SwHTMLParser::GetCurrFormatColl() const
{
- const SwCntntNode* pCNd = pPam->GetCntntNode();
- return &pCNd->GetAnyFmtColl();
+ const SwContentNode* pCNd = pPam->GetContentNode();
+ return &pCNd->GetAnyFormatColl();
}
-void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
+void SwHTMLParser::SetTextCollAttrs( _HTMLAttrContext *pContext )
{
- SwTxtFmtColl *pCollToSet = 0; // die zu setzende Vorlage
+ SwTextFormatColl *pCollToSet = 0; // die zu setzende Vorlage
SfxItemSet *pItemSet = 0; // der Set fuer harte Attrs
- sal_uInt16 nTopColl = pContext ? pContext->GetTxtFmtColl() : 0;
+ sal_uInt16 nTopColl = pContext ? pContext->GetTextFormatColl() : 0;
const OUString& rTopClass = pContext ? pContext->GetClass() : aEmptyOUStr;
sal_uInt16 nDfltColl = RES_POOLCOLL_TEXT;
@@ -4553,7 +4553,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
{
const _HTMLAttrContext *pCntxt = aContexts[i];
- sal_uInt16 nColl = pCntxt->GetTxtFmtColl();
+ sal_uInt16 nColl = pCntxt->GetTextFormatColl();
if( nColl )
{
// Es gibt eine Vorlage, die zu setzen ist. Dann
@@ -4581,8 +4581,8 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
break;
}
- SwTxtFmtColl *pNewColl =
- pCSS1Parser->GetTxtFmtColl( nColl, pCntxt->GetClass() );
+ SwTextFormatColl *pNewColl =
+ pCSS1Parser->GetTextFormatColl( nColl, pCntxt->GetClass() );
if( bSetThis )
{
@@ -4630,7 +4630,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
else
{
// vielliecht gibt es ja eine Default-Vorlage?
- nColl = pCntxt->GetDfltTxtFmtColl();
+ nColl = pCntxt->GetDfltTextFormatColl();
if( nColl )
nDfltColl = nColl;
}
@@ -4656,8 +4656,8 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
nDfltColl==RES_POOLCOLL_TABLE_HDLN) )
nTopColl = nDfltColl;
- const SwTxtFmtColl *pTopColl =
- pCSS1Parser->GetTxtFmtColl( nTopColl, rTopClass );
+ const SwTextFormatColl *pTopColl =
+ pCSS1Parser->GetTextFormatColl( nTopColl, rTopClass );
const SfxItemSet& rItemSet = pTopColl->GetAttrSet();
const SfxPoolItem *pItem;
if( SfxItemState::SET == rItemSet.GetItemState(RES_LR_SPACE,true, &pItem) )
@@ -4665,18 +4665,18 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
const SvxLRSpaceItem *pLRItem =
static_cast<const SvxLRSpaceItem *>(pItem);
- sal_Int32 nLeft = pLRItem->GetTxtLeft();
+ sal_Int32 nLeft = pLRItem->GetTextLeft();
sal_Int32 nRight = pLRItem->GetRight();
- nFirstLineIndent = pLRItem->GetTxtFirstLineOfst();
+ nFirstLineIndent = pLRItem->GetTextFirstLineOfst();
// In Definitions-Listen enthalten die Abstaende auch die der
// vorhergehenden Level
if( RES_POOLCOLL_HTML_DD == nTopColl )
{
const SvxLRSpaceItem& rDTLRSpace = pCSS1Parser
- ->GetTxtFmtColl( RES_POOLCOLL_HTML_DT, aEmptyOUStr )
+ ->GetTextFormatColl( RES_POOLCOLL_HTML_DT, aEmptyOUStr )
->GetLRSpace();
- nLeft -= rDTLRSpace.GetTxtLeft();
+ nLeft -= rDTLRSpace.GetTextLeft();
nRight -= rDTLRSpace.GetRight();
}
else if( RES_POOLCOLL_HTML_DT == nTopColl )
@@ -4703,14 +4703,14 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
// wenn gar keine Vorlage im Kontext gesetzt ist, Textkoerper nehmen
if( !pCollToSet )
{
- pCollToSet = pCSS1Parser->GetTxtCollFromPool( nDfltColl );
+ pCollToSet = pCSS1Parser->GetTextCollFromPool( nDfltColl );
const SvxLRSpaceItem& rLRItem = pCollToSet->GetLRSpace();
if( !nLeftMargin )
- nLeftMargin = static_cast< sal_uInt16 >(rLRItem.GetTxtLeft());
+ nLeftMargin = static_cast< sal_uInt16 >(rLRItem.GetTextLeft());
if( !nRightMargin )
nRightMargin = static_cast< sal_uInt16 >(rLRItem.GetRight());
if( !nFirstLineIndent )
- nFirstLineIndent = rLRItem.GetTxtFirstLineOfst();
+ nFirstLineIndent = rLRItem.GetTextFirstLineOfst();
}
// bisherige harte Attributierung des Absatzes entfernen
@@ -4723,22 +4723,22 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
}
// Die Vorlage setzen
- pDoc->SetTxtFmtColl( *pPam, pCollToSet );
+ pDoc->SetTextFormatColl( *pPam, pCollToSet );
// ggf. noch den Absatz-Einzug korrigieren
const SvxLRSpaceItem& rLRItem = pCollToSet->GetLRSpace();
bool bSetLRSpace;
- bSetLRSpace = nLeftMargin != rLRItem.GetTxtLeft() ||
- nFirstLineIndent != rLRItem.GetTxtFirstLineOfst() ||
+ bSetLRSpace = nLeftMargin != rLRItem.GetTextLeft() ||
+ nFirstLineIndent != rLRItem.GetTextFirstLineOfst() ||
nRightMargin != rLRItem.GetRight();
if( bSetLRSpace )
{
SvxLRSpaceItem aLRItem( rLRItem );
- aLRItem.SetTxtLeft( nLeftMargin );
+ aLRItem.SetTextLeft( nLeftMargin );
aLRItem.SetRight( nRightMargin );
- aLRItem.SetTxtFirstLineOfst( nFirstLineIndent );
+ aLRItem.SetTextFirstLineOfst( nFirstLineIndent );
if( pItemSet )
pItemSet->Put( aLRItem );
else
@@ -4758,7 +4758,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
}
}
-void SwHTMLParser::NewCharFmt( int nToken )
+void SwHTMLParser::NewCharFormat( int nToken )
{
OUString aId, aStyle, aLang, aDir;
OUString aClass;
@@ -4791,8 +4791,8 @@ void SwHTMLParser::NewCharFmt( int nToken )
_HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) );
// die Vorlage setzen und im Kontext merken
- SwCharFmt* pCFmt = pCSS1Parser->GetChrFmt( static_cast< sal_uInt16 >(nToken), aClass );
- OSL_ENSURE( pCFmt, "keine Zeichenvorlage zu Token gefunden" );
+ SwCharFormat* pCFormat = pCSS1Parser->GetChrFormat( static_cast< sal_uInt16 >(nToken), aClass );
+ OSL_ENSURE( pCFormat, "keine Zeichenvorlage zu Token gefunden" );
// Styles parsen (zu Class siehe auch NewPara)
if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
@@ -4812,8 +4812,8 @@ void SwHTMLParser::NewCharFmt( int nToken )
// Zeichen-Vorlagen werden in einem eigenen Stack gehalten und
// koennen nie durch Styles eingefuegt werden. Das Attribut ist deshalb
// auch gar nicht im CSS1-Which-Range enthalten
- if( pCFmt )
- InsertAttr( &aAttrTab.pCharFmts, SwFmtCharFmt( pCFmt ), pCntxt );
+ if( pCFormat )
+ InsertAttr( &aAttrTab.pCharFormats, SwFormatCharFormat( pCFormat ), pCntxt );
// den Kontext merken
PushContext( pCntxt );
@@ -4878,7 +4878,7 @@ void SwHTMLParser::InsertSpacer()
SfxItemSet aFrmSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
- Reader::ResetFrmFmtAttrs( aFrmSet );
+ Reader::ResetFrameFormatAttrs( aFrmSet );
// den Anker und die Ausrichtung setzen
SetAnchorAndAdjustment( eVertOri, eHoriOri, aFrmSet );
@@ -4896,16 +4896,16 @@ void SwHTMLParser::InsertSpacer()
// den Inhalt schuetzen
SvxProtectItem aProtectItem( RES_PROTECT) ;
- aProtectItem.SetCntntProtect( true );
+ aProtectItem.SetContentProtect( true );
aFrmSet.Put( aProtectItem );
// der Rahmen anlegen
RndStdIds eAnchorId =
- static_cast<const SwFmtAnchor &>(aFrmSet.Get(RES_ANCHOR)).GetAnchorId();
- SwFrmFmt *pFlyFmt = pDoc->MakeFlySection( eAnchorId,
+ static_cast<const SwFormatAnchor &>(aFrmSet.Get(RES_ANCHOR)).GetAnchorId();
+ SwFrameFormat *pFlyFormat = pDoc->MakeFlySection( eAnchorId,
pPam->GetPoint(), &aFrmSet );
// Ggf Frames anlegen und auto-geb. Rahmen registrieren
- RegisterFlyFrm( pFlyFmt );
+ RegisterFlyFrm( pFlyFormat );
}
break;
case HTML_SPTYPE_VERT:
@@ -4919,7 +4919,7 @@ void SwHTMLParser::InsertSpacer()
}
// einen Absatz-Abstand setzen
- SwTxtNode *pTxtNode = 0;
+ SwTextNode *pTextNode = 0;
if( !pPam->GetPoint()->nContent.GetIndex() )
{
// den unteren Absatz-Abstand des vorherigen Nodes aendern,
@@ -4927,29 +4927,29 @@ void SwHTMLParser::InsertSpacer()
SetAttr(); // noch offene Absatz-Attribute setzen
- pTxtNode = pDoc->GetNodes()[pPam->GetPoint()->nNode.GetIndex()-1]
- ->GetTxtNode();
+ pTextNode = pDoc->GetNodes()[pPam->GetPoint()->nNode.GetIndex()-1]
+ ->GetTextNode();
- // Wenn der Abstz davor kein Txtenode ist, dann wird jetzt
+ // Wenn der Abstz davor kein Textenode ist, dann wird jetzt
// ein leere Absatz angelegt, der eh schon eine Zeilenhoehe
// Abstand erzeugt.
- if( !pTxtNode )
+ if( !pTextNode )
nSize = nSize>HTML_PARSPACE ? nSize-HTML_PARSPACE : 0;
}
- if( pTxtNode )
+ if( pTextNode )
{
- SvxULSpaceItem aULSpace( static_cast<const SvxULSpaceItem&>(pTxtNode
- ->SwCntntNode::GetAttr( RES_UL_SPACE )) );
+ SvxULSpaceItem aULSpace( static_cast<const SvxULSpaceItem&>(pTextNode
+ ->SwContentNode::GetAttr( RES_UL_SPACE )) );
aULSpace.SetLower( aULSpace.GetLower() + (sal_uInt16)nSize );
- pTxtNode->SetAttr( aULSpace );
+ pTextNode->SetAttr( aULSpace );
}
else
{
NewAttr( &aAttrTab.pULSpace, SvxULSpaceItem( 0, (sal_uInt16)nSize, RES_UL_SPACE ) );
EndAttr( aAttrTab.pULSpace, 0, false );
- AppendTxtNode(); // nicht am Abstand drehen!
+ AppendTextNode(); // nicht am Abstand drehen!
}
}
break;
@@ -4975,9 +4975,9 @@ void SwHTMLParser::InsertSpacer()
nIndent = nIndent + (short)nSize;
SvxLRSpaceItem aLRItem( RES_LR_SPACE );
- aLRItem.SetTxtLeft( nLeft );
+ aLRItem.SetTextLeft( nLeft );
aLRItem.SetRight( nRight );
- aLRItem.SetTxtFirstLineOfst( nIndent );
+ aLRItem.SetTextFirstLineOfst( nIndent );
NewAttr( &aAttrTab.pLRSpace, aLRItem );
EndAttr( aAttrTab.pLRSpace, 0, false );
@@ -5013,12 +5013,12 @@ SwTwips SwHTMLParser::GetCurrentBrowseWidth()
if( !aHTMLPageSize.Width() )
{
- const SwFrmFmt& rPgFmt = pCSS1Parser->GetMasterPageDesc()->GetMaster();
+ const SwFrameFormat& rPgFormat = pCSS1Parser->GetMasterPageDesc()->GetMaster();
- const SwFmtFrmSize& rSz = rPgFmt.GetFrmSize();
- const SvxLRSpaceItem& rLR = rPgFmt.GetLRSpace();
- const SvxULSpaceItem& rUL = rPgFmt.GetULSpace();
- const SwFmtCol& rCol = rPgFmt.GetCol();
+ const SwFormatFrmSize& rSz = rPgFormat.GetFrmSize();
+ const SvxLRSpaceItem& rLR = rPgFormat.GetLRSpace();
+ const SvxULSpaceItem& rUL = rPgFormat.GetULSpace();
+ const SwFormatCol& rCol = rPgFormat.GetCol();
aHTMLPageSize.Width() = rSz.GetWidth() - rLR.GetLeft() - rLR.GetRight();
aHTMLPageSize.Height() = rSz.GetHeight() - rUL.GetUpper() - rUL.GetLower();
@@ -5107,25 +5107,25 @@ void SwHTMLParser::InsertLineBreak()
if( bClearLeft || bClearRight )
{
SwNodeIndex& rNodeIdx = pPam->GetPoint()->nNode;
- SwTxtNode* pTxtNd = rNodeIdx.GetNode().GetTxtNode();
- if( pTxtNd )
+ SwTextNode* pTextNd = rNodeIdx.GetNode().GetTextNode();
+ if( pTextNd )
{
- const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
+ const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
- for( sal_uInt16 i=0; i<rFrmFmtTbl.size(); i++ )
+ for( sal_uInt16 i=0; i<rFrameFormatTable.size(); i++ )
{
- SwFrmFmt *const pFmt = rFrmFmtTbl[i];
- SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
- SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+ SwFrameFormat *const pFormat = rFrameFormatTable[i];
+ SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+ SwPosition const*const pAPos = pAnchor->GetContentAnchor();
if (pAPos &&
((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
(FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
pAPos->nNode == rNodeIdx &&
- pFmt->GetSurround().GetSurround() != SURROUND_NONE )
+ pFormat->GetSurround().GetSurround() != SURROUND_NONE )
{
- sal_Int16 eHori = RES_DRAWFRMFMT == pFmt->Which()
+ sal_Int16 eHori = RES_DRAWFRMFMT == pFormat->Which()
? text::HoriOrientation::LEFT
- : pFmt->GetHoriOrient().GetHoriOrient();
+ : pFormat->GetHoriOrient().GetHoriOrient();
SwSurround eSurround = SURROUND_PARALLEL;
if( pPam->GetPoint()->nContent.GetIndex() )
@@ -5143,10 +5143,10 @@ void SwHTMLParser::InsertLineBreak()
if( SURROUND_PARALLEL != eSurround )
{
- SwFmtSurround aSurround( eSurround );
+ SwFormatSurround aSurround( eSurround );
if( SURROUND_NONE != eSurround )
aSurround.SetAnchorOnly( true );
- pFmt->SetFmtAttr( aSurround );
+ pFormat->SetFormatAttr( aSurround );
bCleared = true;
}
} // Anker ist nicht im Node
@@ -5155,7 +5155,7 @@ void SwHTMLParser::InsertLineBreak()
} // kein CLEAR
// Styles parsen
- SvxFmtBreakItem aBreakItem( SVX_BREAK_NONE, RES_BREAK );
+ SvxFormatBreakItem aBreakItem( SVX_BREAK_NONE, RES_BREAK );
bool bBreakItem = false;
if( HasStyleOptions( aStyle, aId, aClass ) )
{
@@ -5164,9 +5164,9 @@ void SwHTMLParser::InsertLineBreak()
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo ) )
{
- if( pCSS1Parser->SetFmtBreak( aItemSet, aPropInfo ) )
+ if( pCSS1Parser->SetFormatBreak( aItemSet, aPropInfo ) )
{
- aBreakItem = static_cast<const SvxFmtBreakItem &>(aItemSet.Get( RES_BREAK ));
+ aBreakItem = static_cast<const SvxFormatBreakItem &>(aItemSet.Get( RES_BREAK ));
bBreakItem = true;
}
if( !aPropInfo.aId.isEmpty() )
@@ -5194,7 +5194,7 @@ void SwHTMLParser::InsertLineBreak()
// MIB 21.02.97: Eigentlich muesste man hier den unteren Absatz-
// Absatnd auf 0 drehen. Das geht aber bei sowas wie <BR ..><P>
// schief (>Netacpe). Deshalb lassen wir das erstmal.
- AppendTxtNode( AM_NOSPACE );
+ AppendTextNode( AM_NOSPACE );
}
if( bBreakItem && SVX_BREAK_PAGE_BEFORE==aBreakItem.GetBreak() )
{
@@ -5255,10 +5255,10 @@ void SwHTMLParser::InsertHorzRule()
}
if( pPam->GetPoint()->nContent.GetIndex() )
- AppendTxtNode( AM_NOSPACE );
+ AppendTextNode( AM_NOSPACE );
if( nOpenParaToken )
EndPara();
- AppendTxtNode();
+ AppendTextNode();
pPam->Move( fnMoveBackward );
// ... und in einem Kontext merken
@@ -5268,7 +5268,7 @@ void SwHTMLParser::InsertHorzRule()
PushContext( pCntxt );
// die neue Vorlage setzen
- SetTxtCollAttrs( pCntxt );
+ SetTextCollAttrs( pCntxt );
// die harten Attribute an diesem Absatz werden nie mehr ungueltig
if( !aParaAttrs.empty() )
@@ -5325,14 +5325,14 @@ void SwHTMLParser::InsertHorzRule()
if( (long)nWidth < nBrowseWidth )
{
- const SwFmtColl *pColl = GetCurrFmtColl();
+ const SwFormatColl *pColl = GetCurrFormatColl();
SvxLRSpaceItem aLRItem( pColl->GetLRSpace() );
long nDist = nBrowseWidth - nWidth;
switch( eAdjust )
{
case SVX_ADJUST_RIGHT:
- aLRItem.SetTxtLeft( (sal_uInt16)nDist );
+ aLRItem.SetTextLeft( (sal_uInt16)nDist );
break;
case SVX_ADJUST_LEFT:
aLRItem.SetRight( (sal_uInt16)nDist );
@@ -5340,7 +5340,7 @@ void SwHTMLParser::InsertHorzRule()
case SVX_ADJUST_CENTER:
default:
nDist /= 2;
- aLRItem.SetTxtLeft( (sal_uInt16)nDist );
+ aLRItem.SetTextLeft( (sal_uInt16)nDist );
aLRItem.SetRight( (sal_uInt16)nDist );
break;
}
@@ -5363,7 +5363,7 @@ void SwHTMLParser::InsertHorzRule()
pPam->Move( fnMoveForward );
// und im Absatz danach die dort aktuelle Vorlage setzen
- SetTxtCollAttrs();
+ SetTextCollAttrs();
}
void SwHTMLParser::ParseMoreMetaOptions()
@@ -5432,19 +5432,19 @@ void SwHTMLParser::ParseMoreMetaOptions()
sText.append(aContent);
sText.append("\">");
- SwPostItField aPostItFld(
- static_cast<SwPostItFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_POSTITFLD )),
+ SwPostItField aPostItField(
+ static_cast<SwPostItFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )),
aEmptyOUStr, sText.makeStringAndClear(), aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) );
- SwFmtFld aFmtFld( aPostItFld );
- InsertAttr( aFmtFld );
+ SwFormatField aFormatField( aPostItField );
+ InsertAttr( aFormatField );
}
_HTMLAttr::_HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem,
_HTMLAttr **ppHd ) :
nSttPara( rPos.nNode ),
nEndPara( rPos.nNode ),
- nSttCntnt( rPos.nContent.GetIndex() ),
- nEndCntnt(rPos.nContent.GetIndex() ),
+ nSttContent( rPos.nContent.GetIndex() ),
+ nEndContent(rPos.nContent.GetIndex() ),
bInsAtStart( true ),
bLikePara( false ),
bValid( true ),
@@ -5460,8 +5460,8 @@ _HTMLAttr::_HTMLAttr( const _HTMLAttr &rAttr, const SwNodeIndex &rEndPara,
sal_Int32 nEndCnt, _HTMLAttr **ppHd ) :
nSttPara( rAttr.nSttPara ),
nEndPara( rEndPara ),
- nSttCntnt( rAttr.nSttCntnt ),
- nEndCntnt( nEndCnt ),
+ nSttContent( rAttr.nSttContent ),
+ nEndContent( nEndCnt ),
bInsAtStart( rAttr.bInsAtStart ),
bLikePara( rAttr.bLikePara ),
bValid( rAttr.bValid ),
@@ -5494,9 +5494,9 @@ void _HTMLAttr::Reset(const SwNodeIndex& rSttPara, sal_Int32 nSttCnt,
{
// den Anfang (und das Ende) neu setzen
nSttPara = rSttPara;
- nSttCntnt = nSttCnt;
+ nSttContent = nSttCnt;
nEndPara = rSttPara;
- nEndCntnt = nSttCnt;
+ nEndContent = nSttCnt;
// den Head korrigieren und die Verkettungen aufheben
pNext = 0;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 7ac4f65700fd..cc7efaedb844 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -41,7 +41,7 @@ class SwDoc;
class SwPaM;
class SwViewShell;
class SwStartNode;
-class SwFmtColl;
+class SwFormatColl;
class SwField;
class SwHTMLForm_Impl;
class SwApplet_Impl;
@@ -74,7 +74,7 @@ class _HTMLAttr
friend class _CellSaveStruct;
SwNodeIndex nSttPara, nEndPara;
- sal_Int32 nSttCntnt, nEndCntnt;
+ sal_Int32 nSttContent, nEndContent;
bool bInsAtStart : 1;
bool bLikePara : 1; // Attribut ueber dem gesamten Absatz setzen
bool bValid : 1; // ist das Attribut gueltig?
@@ -106,8 +106,8 @@ public:
const SwNodeIndex& GetSttPara() const { return nSttPara; }
const SwNodeIndex& GetEndPara() const { return nEndPara; }
- sal_Int32 GetSttCnt() const { return nSttCntnt; }
- sal_Int32 GetEndCnt() const { return nEndCntnt; }
+ sal_Int32 GetSttCnt() const { return nSttContent; }
+ sal_Int32 GetEndCnt() const { return nEndContent; }
bool IsLikePara() const { return bLikePara; }
void SetLikePara( bool bPara=true ) { bLikePara = bPara; }
@@ -154,8 +154,8 @@ struct _HTMLAttrTable
*pOrphans,
*pDirection,
- *pCharFmts, // Text-Attribute
- *pINetFmt,
+ *pCharFormats, // Text-Attribute
+ *pINetFormat,
*pBold, // Zeichen-Attribute
*pBoldCJK,
@@ -205,7 +205,7 @@ class _HTMLAttrContext
sal_uInt16 nToken; // das Token, zu dem der Kontext gehoehrt
- sal_uInt16 nTxtFmtColl; // eine in dem Kontext begonnene Vorlage oder 0
+ sal_uInt16 nTextFormatColl; // eine in dem Kontext begonnene Vorlage oder 0
sal_uInt16 nLeftMargin; // ein veraenderter linker Rand
sal_uInt16 nRightMargin; // ein veraenderter rechter Rand
@@ -218,7 +218,7 @@ class _HTMLAttrContext
bool bLRSpaceChanged : 1;// linker/rechtr Rand, Einzug veraendert?
bool bULSpaceChanged : 1;// oberer/unterer Rand veraendert?
- bool bDfltTxtFmtColl : 1;// nTxtFmtColl ist nur ein default
+ bool bDfltTextFormatColl : 1;// nTextFormatColl ist nur ein default
bool bSpansSection : 1; // Der Kontext spannt eine SwSection auf
bool bPopStack : 1; // Oberhalb liegende Stack-Elemente entf.
bool bFinishPREListingXMP : 1;
@@ -235,7 +235,7 @@ public:
pSaveDocContext( 0 ),
pFrmItemSet( 0 ),
nToken( nTokn ),
- nTxtFmtColl( nPoolId ),
+ nTextFormatColl( nPoolId ),
nLeftMargin( 0 ),
nRightMargin( 0 ),
nFirstLineIndent( 0 ),
@@ -244,7 +244,7 @@ public:
eAppend( AM_NONE ),
bLRSpaceChanged( false ),
bULSpaceChanged( false ),
- bDfltTxtFmtColl( bDfltColl ),
+ bDfltTextFormatColl( bDfltColl ),
bSpansSection( false ),
bPopStack( false ),
bFinishPREListingXMP( false ),
@@ -257,7 +257,7 @@ public:
pSaveDocContext( 0 ),
pFrmItemSet( 0 ),
nToken( nTokn ),
- nTxtFmtColl( 0 ),
+ nTextFormatColl( 0 ),
nLeftMargin( 0 ),
nRightMargin( 0 ),
nFirstLineIndent( 0 ),
@@ -266,7 +266,7 @@ public:
eAppend( AM_NONE ),
bLRSpaceChanged( false ),
bULSpaceChanged( false ),
- bDfltTxtFmtColl( false ),
+ bDfltTextFormatColl( false ),
bSpansSection( false ),
bPopStack( false ),
bFinishPREListingXMP( false ),
@@ -279,8 +279,8 @@ public:
sal_uInt16 GetToken() const { return nToken; }
- sal_uInt16 GetTxtFmtColl() const { return bDfltTxtFmtColl ? 0 : nTxtFmtColl; }
- sal_uInt16 GetDfltTxtFmtColl() const { return bDfltTxtFmtColl ? nTxtFmtColl : 0; }
+ sal_uInt16 GetTextFormatColl() const { return bDfltTextFormatColl ? 0 : nTextFormatColl; }
+ sal_uInt16 GetDfltTextFormatColl() const { return bDfltTextFormatColl ? nTextFormatColl : 0; }
const OUString& GetClass() const { return aClass; }
@@ -333,7 +333,7 @@ class SwCSS1Parser;
class SwHTMLNumRuleInfo;
typedef boost::ptr_vector<ImageMap> ImageMaps;
-typedef std::vector<SwFrmFmt *> SwHTMLFrmFmts;
+typedef std::vector<SwFrameFormat *> SwHTMLFrameFormats;
#define HTML_CNTXT_PROTECT_STACK 0x0001
#define HTML_CNTXT_STRIP_PARA 0x0002
@@ -382,7 +382,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
_HTMLAttrs aParaAttrs; // vorlauefige Absatz-Attribute
_HTMLAttrTable aAttrTab; // "offene" Attribute
_HTMLAttrContexts aContexts;// der aktuelle Attribut/Token-Kontext
- SwHTMLFrmFmts aMoveFlyFrms;// Fly-Frames, the anchor is moved
+ SwHTMLFrameFormats aMoveFlyFrms;// Fly-Frames, the anchor is moved
std::deque<sal_Int32> aMoveFlyCnts;// and the Content-Positions
SwApplet_Impl *pAppletImpl; // das aktuelle Applet
@@ -502,7 +502,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
_HTMLAttr **GetAttrTabEntry( sal_uInt16 nWhich );
// Einen neuen Textknoten an PaM-Position anlegen
- bool AppendTxtNode( SwHTMLAppendMode eMode=AM_NORMAL, bool bUpdateNum=true );
+ bool AppendTextNode( SwHTMLAppendMode eMode=AM_NORMAL, bool bUpdateNum=true );
void AddParSpace();
// Ein Attribut beginnen/beenden
@@ -541,7 +541,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
void EndContext( _HTMLAttrContext *pContext );
void ClearContext( _HTMLAttrContext *pContext );
- const SwFmtColl *GetCurrFmtColl() const;
+ const SwFormatColl *GetCurrFormatColl() const;
SwTwips GetCurrentBrowseWidth();
@@ -552,7 +552,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
// Verwalten von Absatz-Vorlagen
// die Vorlagen auf dem Stack bzw. deren Attribute setzen
- void SetTxtCollAttrs( _HTMLAttrContext *pContext = 0 );
+ void SetTextCollAttrs( _HTMLAttrContext *pContext = 0 );
void InsertParaAttrs( const SfxItemSet& rItemSet );
@@ -574,7 +574,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
short& nIndent ) const;
void GetULSpaceFromContext( sal_uInt16 &rUpper, sal_uInt16 &rLower ) const;
- void MovePageDescAttrs( SwNode *pSrcNd, sal_uLong nDestIdx, bool bFmtBreak );
+ void MovePageDescAttrs( SwNode *pSrcNd, sal_uLong nDestIdx, bool bFormatBreak );
// Behandlung von Tags auf Absatz-Ebene
@@ -585,8 +585,8 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
void EndHeading();
// <ADDRESS>, <BLOCKQUOTE> und <PRE>
- void NewTxtFmtColl( int nToken, sal_uInt16 nPoolId );
- void EndTxtFmtColl( int nToken );
+ void NewTextFormatColl( int nToken, sal_uInt16 nPoolId );
+ void EndTextFormatColl( int nToken );
// <DIV> und <CENTER>
void NewDivision( int nToken );
@@ -646,7 +646,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
void EndFontAttr( int nToken );
// Tags, die durch Zeichenvorlagen realisiert werden
- void NewCharFmt( int nToken );
+ void NewCharFormat( int nToken );
// <SDFIELD>
public:
@@ -680,11 +680,11 @@ private:
const SvxCSS1PropertyInfo &rPropInfo,
SfxItemSet &rFrmItemSet );
- static void SetFrmFmtAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
+ static void SetFrameFormatAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
sal_uInt16 nFlags, SfxItemSet &rFrmItemSet );
// Frames anlegen und Auto-gebundene Rahmen registrieren
- void RegisterFlyFrm( SwFrmFmt *pFlyFrm );
+ void RegisterFlyFrm( SwFrameFormat *pFlyFrm );
// Die Groesse des Fly-Frames an die Vorgaben und Gegebenheiten anpassen
// (nicht fuer Grafiken, deshalb htmlplug.cxx)
@@ -784,9 +784,9 @@ private:
sal_Int16 eHoriOri,
SfxItemSet& rCSS1ItemSet,
SvxCSS1PropertyInfo& rCSS1PropInfo,
- const SvxMacroTableDtor& rMacroTbl,
- const std::vector<OUString>& rUnoMacroTbl,
- const std::vector<OUString>& rUnoMacroParamTbl,
+ const SvxMacroTableDtor& rMacroTable,
+ const std::vector<OUString>& rUnoMacroTable,
+ const std::vector<OUString>& rUnoMacroParamTable,
bool bSetPropSet = true,
bool bHidden = false );
void SetControlSize( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rShape, const Size& rTextSz,
@@ -928,9 +928,9 @@ struct SwPendingStack
inline void _HTMLAttr::SetStart( const SwPosition& rPos )
{
nSttPara = rPos.nNode;
- nSttCntnt = rPos.nContent.GetIndex();
+ nSttContent = rPos.nContent.GetIndex();
nEndPara = nSttPara;
- nEndCntnt = nSttCntnt;
+ nEndContent = nSttContent;
}
inline void _HTMLAttrContext::SetMargins( sal_uInt16 nLeft, sal_uInt16 nRight,
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 6cc813d68b5a..ad50a1440578 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -102,7 +102,7 @@ SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL )
, pDfltColor(NULL)
, pStartNdIdx(NULL)
, pCurrPageDesc(NULL)
- , pFmtFtn(NULL)
+ , pFormatFootnote(NULL)
, nWarn(0)
, nLastLFPos(0)
, nLastParaToken(0)
@@ -123,7 +123,7 @@ SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL )
, nDefListLvl(0)
, nDefListMargin(0)
, nHeaderFooterSpace(0)
- , nTxtAttrsToIgnore(0)
+ , nTextAttrsToIgnore(0)
, nExportMode(0)
, nCSS1OutMode(0)
, nCSS1Script(CSS1_OUTMODE_WESTERN)
@@ -137,7 +137,7 @@ SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL )
, bCfgCpyLinkedGrfs( false )
, bFirstLine(true)
, bTagOn( false )
- , bTxtAttr( false )
+ , bTextAttr( false )
, bOutOpts( false )
, bOutTable( false )
, bOutHeader( false )
@@ -262,7 +262,7 @@ sal_uLong SwHTMLWriter::WriteStream()
// die HTML-Vorlage holen
bool bOldHTMLMode = false;
- sal_uInt16 nOldTxtFmtCollCnt = 0, nOldCharFmtCnt = 0;
+ sal_uInt16 nOldTextFormatCollCnt = 0, nOldCharFormatCnt = 0;
OSL_ENSURE( !pTemplate, "Wo kommt denn die HTML-Vorlage hier her?" );
pTemplate = static_cast<HTMLReader*>(ReadHTML)->GetTemplateDoc();
@@ -272,8 +272,8 @@ sal_uLong SwHTMLWriter::WriteStream()
bOldHTMLMode = pTemplate->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE);
pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, true);
- nOldTxtFmtCollCnt = pTemplate->GetTxtFmtColls()->size();
- nOldCharFmtCnt = pTemplate->GetCharFmts()->size();
+ nOldTextFormatCollCnt = pTemplate->GetTextFormatColls()->size();
+ nOldCharFormatCnt = pTemplate->GetCharFormats()->size();
}
if( bShowProgress )
@@ -282,7 +282,7 @@ sal_uLong SwHTMLWriter::WriteStream()
pDfltColor = 0;
pFootEndNotes = 0;
- pFmtFtn = 0;
+ pFormatFootnote = 0;
bOutTable = bOutHeader = bOutFooter = bOutFlyFrame = false;
pxFormComps = 0;
nFormCntrlCnt = 0;
@@ -301,10 +301,10 @@ sal_uLong SwHTMLWriter::WriteStream()
nLastLFPos = 0;
nDefListLvl = 0;
nDefListMargin = ((pTemplate && !bCfgOutStyles) ? pTemplate : pDoc)
- ->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_HTML_DD, false )
- ->GetLRSpace().GetTxtLeft();
+ ->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_HTML_DD, false )
+ ->GetLRSpace().GetTextLeft();
nHeaderFooterSpace = 0;
- nTxtAttrsToIgnore = 0;
+ nTextAttrsToIgnore = 0;
nCSS1OutMode = 0;
SvtScriptType nScript = SvtLanguageOptions::GetScriptTypeOfLanguage( GetAppLanguage() );
switch( nScript )
@@ -401,15 +401,15 @@ sal_uLong SwHTMLWriter::WriteStream()
!pDoc->getIDocumentSettingAccess().get(DocumentSettingId::BROWSE_MODE)) &&
SfxItemState::SET == rPageItemSet.GetItemState( RES_HEADER, true, &pItem) )
{
- const SwFrmFmt *pHeaderFmt =
- static_cast<const SwFmtHeader *>(pItem)->GetHeaderFmt();
- if( pHeaderFmt )
- OutHTML_HeaderFooter( *this, *pHeaderFmt, true );
+ const SwFrameFormat *pHeaderFormat =
+ static_cast<const SwFormatHeader *>(pItem)->GetHeaderFormat();
+ if( pHeaderFormat )
+ OutHTML_HeaderFooter( *this, *pHeaderFormat, true );
}
- nTxtAttrsToIgnore = nHeaderAttrs;
+ nTextAttrsToIgnore = nHeaderAttrs;
Out_SwDoc( pOrigPam );
- nTxtAttrsToIgnore = 0;
+ nTextAttrsToIgnore = 0;
if( pxFormComps && pxFormComps->is() )
OutForm( false, *pxFormComps );
@@ -421,10 +421,10 @@ sal_uLong SwHTMLWriter::WriteStream()
(!pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) && !pDoc->getIDocumentSettingAccess().get(DocumentSettingId::BROWSE_MODE)) &&
SfxItemState::SET == rPageItemSet.GetItemState( RES_FOOTER, true, &pItem) )
{
- const SwFrmFmt *pFooterFmt =
- static_cast<const SwFmtFooter *>(pItem)->GetFooterFmt();
- if( pFooterFmt )
- OutHTML_HeaderFooter( *this, *pFooterFmt, false );
+ const SwFrameFormat *pFooterFormat =
+ static_cast<const SwFormatFooter *>(pItem)->GetFooterFormat();
+ if( pFooterFormat )
+ OutHTML_HeaderFooter( *this, *pFooterFormat, false );
}
if( bLFPossible )
@@ -448,11 +448,11 @@ sal_uLong SwHTMLWriter::WriteStream()
aHTMLControls.DeleteAndDestroyAll();
- if( !aChrFmtInfos.empty() )
- aChrFmtInfos.clear();
+ if( !aChrFormatInfos.empty() )
+ aChrFormatInfos.clear();
- if( !aTxtCollInfos.empty() )
- aTxtCollInfos.clear();
+ if( !aTextCollInfos.empty() )
+ aTextCollInfos.clear();
if(!aImgMapNames.empty())
aImgMapNames.clear();
@@ -478,7 +478,7 @@ sal_uLong SwHTMLWriter::WriteStream()
pxFormComps = 0;
OSL_ENSURE( !pFootEndNotes,
- "SwHTMLWriter::Write: Ftns nicht durch OutFootEndNotes geloescht" );
+ "SwHTMLWriter::Write: Footnotes nicht durch OutFootEndNotes geloescht" );
pCurrPageDesc = 0;
@@ -496,17 +496,17 @@ sal_uLong SwHTMLWriter::WriteStream()
{
// Waehrend des Exports angelegte Zeichen- und Abastzvorlagen
// loeschen
- sal_uInt16 nTxtFmtCollCnt = pTemplate->GetTxtFmtColls()->size();
- while( nTxtFmtCollCnt > nOldTxtFmtCollCnt )
- pTemplate->DelTxtFmtColl( --nTxtFmtCollCnt );
- OSL_ENSURE( pTemplate->GetTxtFmtColls()->size() == nOldTxtFmtCollCnt,
- "falsche Anzahl TxtFmtColls geloescht" );
-
- sal_uInt16 nCharFmtCnt = pTemplate->GetCharFmts()->size();
- while( nCharFmtCnt > nOldCharFmtCnt )
- pTemplate->DelCharFmt( --nCharFmtCnt );
- OSL_ENSURE( pTemplate->GetCharFmts()->size() == nOldCharFmtCnt,
- "falsche Anzahl CharFmts geloescht" );
+ sal_uInt16 nTextFormatCollCnt = pTemplate->GetTextFormatColls()->size();
+ while( nTextFormatCollCnt > nOldTextFormatCollCnt )
+ pTemplate->DelTextFormatColl( --nTextFormatCollCnt );
+ OSL_ENSURE( pTemplate->GetTextFormatColls()->size() == nOldTextFormatCollCnt,
+ "falsche Anzahl TextFormatColls geloescht" );
+
+ sal_uInt16 nCharFormatCnt = pTemplate->GetCharFormats()->size();
+ while( nCharFormatCnt > nOldCharFormatCnt )
+ pTemplate->DelCharFormat( --nCharFormatCnt );
+ OSL_ENSURE( pTemplate->GetCharFormats()->size() == nOldCharFormatCnt,
+ "falsche Anzahl CharFormats geloescht" );
// HTML-Modus wieder restaurieren
pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, bOldHTMLMode);
@@ -520,17 +520,17 @@ sal_uLong SwHTMLWriter::WriteStream()
return nWarn;
}
-static const SwFmtCol *lcl_html_GetFmtCol( const SwSection& rSection,
- const SwSectionFmt& rFmt )
+static const SwFormatCol *lcl_html_GetFormatCol( const SwSection& rSection,
+ const SwSectionFormat& rFormat )
{
- const SwFmtCol *pCol = 0;
+ const SwFormatCol *pCol = 0;
const SfxPoolItem* pItem;
if( FILE_LINK_SECTION != rSection.GetType() &&
- SfxItemState::SET == rFmt.GetAttrSet().GetItemState(RES_COL,false,&pItem) &&
- static_cast<const SwFmtCol *>(pItem)->GetNumCols() > 1 )
+ SfxItemState::SET == rFormat.GetAttrSet().GetItemState(RES_COL,false,&pItem) &&
+ static_cast<const SwFormatCol *>(pItem)->GetNumCols() > 1 )
{
- pCol = static_cast<const SwFmtCol *>(pItem);
+ pCol = static_cast<const SwFormatCol *>(pItem);
}
return pCol;
@@ -544,8 +544,8 @@ static bool lcl_html_IsMultiColStart( const SwHTMLWriter& rHTMLWrt, sal_uLong nI
if( pSectNd )
{
const SwSection& rSection = pSectNd->GetSection();
- const SwSectionFmt *pFmt = rSection.GetFmt();
- if( pFmt && lcl_html_GetFmtCol( rSection, *pFmt ) )
+ const SwSectionFormat *pFormat = rSection.GetFormat();
+ if( pFormat && lcl_html_GetFormatCol( rSection, *pFormat ) )
bRet = true;
}
@@ -565,8 +565,8 @@ static bool lcl_html_IsMultiColEnd( const SwHTMLWriter& rHTMLWrt, sal_uLong nInd
static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
const SwSection& rSection,
- const SwSectionFmt& rFmt,
- const SwFmtCol *pCol,
+ const SwSectionFormat& rFormat,
+ const SwFormatCol *pCol,
bool bContinued=false )
{
OSL_ENSURE( pCol || !bContinued, "Continuation of DIV" );
@@ -586,7 +586,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
sOut.append('\"');
}
- sal_uInt16 nDir = rHTMLWrt.GetHTMLDirection( rFmt.GetAttrSet() );
+ sal_uInt16 nDir = rHTMLWrt.GetHTMLDirection( rFormat.GetAttrSet() );
rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rHTMLWrt.OutDirection( nDir );
@@ -650,7 +650,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
if( rHTMLWrt.IsHTMLMode( rHTMLWrt.bCfgOutStyles ? HTMLMODE_ON : 0 ) )
- rHTMLWrt.OutCSS1_SectionFmtOptions( rFmt, pCol );
+ rHTMLWrt.OutCSS1_SectionFormatOptions( rFormat, pCol );
rHTMLWrt.Strm().WriteChar( '>' );
@@ -680,19 +680,19 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
rHTMLWrt.OutAndSetDefList( 0 );
const SwSection& rSection = rSectNd.GetSection();
- const SwSectionFmt *pFmt = rSection.GetFmt();
- OSL_ENSURE( pFmt, "Section without a format?" );
+ const SwSectionFormat *pFormat = rSection.GetFormat();
+ OSL_ENSURE( pFormat, "Section without a format?" );
bool bStartTag = true;
bool bEndTag = true;
- const SwSectionFmt *pSurrFmt = 0;
+ const SwSectionFormat *pSurrFormat = 0;
const SwSectionNode *pSurrSectNd = 0;
const SwSection *pSurrSection = 0;
- const SwFmtCol *pSurrCol = 0;
+ const SwFormatCol *pSurrCol = 0;
sal_uInt32 nSectSttIdx = rSectNd.GetIndex();
sal_uInt32 nSectEndIdx = rSectNd.EndOfSectionIndex();
- const SwFmtCol *pCol = lcl_html_GetFmtCol( rSection, *pFmt );
+ const SwFormatCol *pCol = lcl_html_GetFormatCol( rSection, *pFormat );
if( pCol )
{
// If the next node is a columned section node, too, don't export
@@ -716,10 +716,10 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
pBoxSttNd->GetIndex() < pSurrSectNd->GetIndex() )
{
pSurrSection = &pSurrSectNd->GetSection();
- pSurrFmt = pSurrSection->GetFmt();
- if( pSurrFmt )
- pSurrCol = lcl_html_GetFmtCol( *pSurrSection,
- *pSurrFmt );
+ pSurrFormat = pSurrSection->GetFormat();
+ if( pSurrFormat )
+ pSurrCol = lcl_html_GetFormatCol( *pSurrSection,
+ *pSurrFormat );
}
}
}
@@ -733,13 +733,13 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
lcl_html_OutSectionEndTag( rHTMLWrt );
if( bStartTag )
- lcl_html_OutSectionStartTag( rHTMLWrt, rSection, *pFmt, pCol );
+ lcl_html_OutSectionStartTag( rHTMLWrt, rSection, *pFormat, pCol );
{
HTMLSaveData aSaveData( rHTMLWrt,
rHTMLWrt.pCurPam->GetPoint()->nNode.GetIndex()+1,
rSectNd.EndOfSectionIndex(),
- false, pFmt );
+ false, pFormat );
rHTMLWrt.Out_SwDoc( rHTMLWrt.pCurPam );
}
@@ -753,7 +753,7 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
if( pSurrCol &&
pSurrSectNd->EndOfSectionIndex() - nSectEndIdx > 1 &&
!lcl_html_IsMultiColStart( rHTMLWrt, nSectEndIdx+1 ) )
- lcl_html_OutSectionStartTag( rHTMLWrt, *pSurrSection, *pSurrFmt,
+ lcl_html_OutSectionStartTag( rHTMLWrt, *pSurrSection, *pSurrFormat,
pSurrCol, true );
return rWrt;
@@ -782,18 +782,18 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
OSL_ENSURE( !(rNd.IsGrfNode() || rNd.IsOLENode()),
"Grf- oder OLE-Node hier unerwartet" );
- if( rNd.IsTxtNode() )
+ if( rNd.IsTextNode() )
{
- SwTxtNode* pTxtNd = rNd.GetTxtNode();
+ SwTextNode* pTextNd = rNd.GetTextNode();
if( !bFirstLine )
- pCurPam->GetPoint()->nContent.Assign( pTxtNd, 0 );
+ pCurPam->GetPoint()->nContent.Assign( pTextNd, 0 );
- OutHTML_SwTxtNode( *this, *pTxtNd );
+ OutHTML_SwTextNode( *this, *pTextNd );
}
else if( rNd.IsTableNode() )
{
- OutHTML_SwTblNode( *this, *rNd.GetTableNode(), 0 );
+ OutHTML_SwTableNode( *this, *rNd.GetTableNode(), 0 );
nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1;
}
else if( rNd.IsSectionNode() )
@@ -831,23 +831,23 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
}
// schreibe die StyleTabelle, algemeine Angaben,Header/Footer/Footnotes
-static void OutBodyColor( const sal_Char* pTag, const SwFmt *pFmt,
+static void OutBodyColor( const sal_Char* pTag, const SwFormat *pFormat,
SwHTMLWriter& rHWrt )
{
- const SwFmt *pRefFmt = 0;
+ const SwFormat *pRefFormat = 0;
if( rHWrt.pTemplate )
- pRefFmt = SwHTMLWriter::GetTemplateFmt( pFmt->GetPoolFmtId(),
+ pRefFormat = SwHTMLWriter::GetTemplateFormat( pFormat->GetPoolFormatId(),
&rHWrt.pTemplate->getIDocumentStylePoolAccess() );
const SvxColorItem *pColorItem = 0;
- const SfxItemSet& rItemSet = pFmt->GetAttrSet();
+ const SfxItemSet& rItemSet = pFormat->GetAttrSet();
const SfxPoolItem *pRefItem = 0, *pItem = 0;
bool bItemSet = SfxItemState::SET == rItemSet.GetItemState( RES_CHRATR_COLOR,
true, &pItem);
- bool bRefItemSet = pRefFmt &&
- SfxItemState::SET == pRefFmt->GetAttrSet().GetItemState( RES_CHRATR_COLOR,
+ bool bRefItemSet = pRefFormat &&
+ SfxItemState::SET == pRefFormat->GetAttrSet().GetItemState( RES_CHRATR_COLOR,
true, &pRefItem);
if( bItemSet )
{
@@ -891,7 +891,7 @@ static void OutBodyColor( const sal_Char* pTag, const SwFmt *pFmt,
if( COL_AUTO == aColor.GetColor() )
aColor.SetColor( COL_BLACK );
HTMLOutFuncs::Out_Color( rHWrt.Strm(), aColor, rHWrt.eDestEnc );
- if( RES_POOLCOLL_STANDARD==pFmt->GetPoolFmtId() )
+ if( RES_POOLCOLL_STANDARD==pFormat->GetPoolFormatId() )
rHWrt.pDfltColor = new Color( aColor );
}
}
@@ -901,21 +901,21 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs()
sal_uLong nIdx = pCurPam->GetPoint()->nNode.GetIndex();
sal_uLong nEndIdx = pCurPam->GetMark()->nNode.GetIndex();
- SwTxtNode *pTxtNd = 0;
+ SwTextNode *pTextNd = 0;
while( nIdx<=nEndIdx &&
- 0==(pTxtNd=pDoc->GetNodes()[nIdx]->GetTxtNode()) )
+ 0==(pTextNd=pDoc->GetNodes()[nIdx]->GetTextNode()) )
nIdx++;
- OSL_ENSURE( pTxtNd, "Kein Text-Node gefunden" );
- if( !pTxtNd || !pTxtNd->HasHints() )
+ OSL_ENSURE( pTextNd, "Kein Text-Node gefunden" );
+ if( !pTextNd || !pTextNd->HasHints() )
return 0;
sal_uInt16 nAttrs = 0;
- const size_t nCntAttr = pTxtNd->GetSwpHints().Count();
+ const size_t nCntAttr = pTextNd->GetSwpHints().Count();
sal_Int32 nOldPos = 0;
for( size_t i=0;