summaryrefslogtreecommitdiff
path: root/sw/source/uibase/utlui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/utlui')
-rw-r--r--sw/source/uibase/utlui/attrdesc.cxx68
-rw-r--r--sw/source/uibase/utlui/content.cxx136
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx8
-rw-r--r--sw/source/uibase/utlui/initui.cxx28
-rw-r--r--sw/source/uibase/utlui/navipi.cxx38
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx48
-rw-r--r--sw/source/uibase/utlui/uiitems.cxx58
-rw-r--r--sw/source/uibase/utlui/uitool.cxx124
8 files changed, 254 insertions, 254 deletions
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 67479ebb562c..513a98a8b8db 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -59,7 +59,7 @@
using namespace com::sun::star;
-TYPEINIT2(SwFmtCharFmt,SfxPoolItem,SwClient);
+TYPEINIT2(SwFormatCharFormat,SfxPoolItem,SwClient);
// query the attribute descriptions
void SwAttrSet::GetPresentation(
@@ -92,7 +92,7 @@ void SwAttrSet::GetPresentation(
}
}
-bool SwFmtCharFmt::GetPresentation
+bool SwFormatCharFormat::GetPresentation
(
SfxItemPresentation ePres,
SfxMapUnit eCoreUnit,
@@ -101,12 +101,12 @@ bool SwFmtCharFmt::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- const SwCharFmt *pCharFmt = GetCharFmt();
- if ( pCharFmt )
+ const SwCharFormat *pCharFormat = GetCharFormat();
+ if ( pCharFormat )
{
OUString aStr;
rText = OUString( SW_RESSTR( STR_CHARFMT ) );
- pCharFmt->GetPresentation( ePres, eCoreUnit, ePresUnit, aStr );
+ pCharFormat->GetPresentation( ePres, eCoreUnit, ePresUnit, aStr );
rText = rText + "(" + aStr + ")";
}
else
@@ -114,7 +114,7 @@ bool SwFmtCharFmt::GetPresentation
return true;
}
-bool SwFmtAutoFmt::GetPresentation
+bool SwFormatAutoFormat::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -127,7 +127,7 @@ bool SwFmtAutoFmt::GetPresentation
return true;
}
-bool SwFmtINetFmt::GetPresentation
+bool SwFormatINetFormat::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -140,7 +140,7 @@ bool SwFmtINetFmt::GetPresentation
return true;
}
-bool SwFmtRuby::GetPresentation( SfxItemPresentation /*ePres*/,
+bool SwFormatRuby::GetPresentation( SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
OUString &rText, const IntlWrapper* /*pIntl*/ ) const
{
@@ -148,7 +148,7 @@ bool SwFmtRuby::GetPresentation( SfxItemPresentation /*ePres*/,
return true;
}
-bool SwFmtDrop::GetPresentation
+bool SwFormatDrop::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -223,7 +223,7 @@ bool SwParaConnectBorderItem::GetPresentation
// Frame attribute
-bool SwFmtFrmSize::GetPresentation
+bool SwFormatFrmSize::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit eCoreUnit,
@@ -263,9 +263,9 @@ bool SwFmtFrmSize::GetPresentation
}
//Header for page formats.
-//Client of FrmFmt which describes the header.
+//Client of FrameFormat which describes the header.
-bool SwFmtHeader::GetPresentation
+bool SwFormatHeader::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -274,15 +274,15 @@ bool SwFmtHeader::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- const sal_uInt16 nId = GetHeaderFmt() ? STR_HEADER : STR_NO_HEADER;
+ const sal_uInt16 nId = GetHeaderFormat() ? STR_HEADER : STR_NO_HEADER;
rText = SW_RESSTR( nId );
return true;
}
//Footer for page formats.
-//Client of FrmFmt which describes the footer.
+//Client of FrameFormat which describes the footer.
-bool SwFmtFooter::GetPresentation
+bool SwFormatFooter::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -291,12 +291,12 @@ bool SwFmtFooter::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- const sal_uInt16 nId = GetFooterFmt() ? STR_FOOTER : STR_NO_FOOTER;
+ const sal_uInt16 nId = GetFooterFormat() ? STR_FOOTER : STR_NO_FOOTER;
rText = SW_RESSTR( nId );
return true;
}
-bool SwFmtSurround::GetPresentation
+bool SwFormatSurround::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -340,7 +340,7 @@ bool SwFmtSurround::GetPresentation
//VertOrientation, how and by what orientate the FlyFrm in the vertical?
-bool SwFmtVertOrient::GetPresentation
+bool SwFormatVertOrient::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit eCoreUnit,
@@ -386,7 +386,7 @@ bool SwFmtVertOrient::GetPresentation
//HoriOrientation, how and by what orientate the FlyFrm in the horizontal?
-bool SwFmtHoriOrient::GetPresentation
+bool SwFormatHoriOrient::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit eCoreUnit,
@@ -432,7 +432,7 @@ bool SwFmtHoriOrient::GetPresentation
// FlyAnchor, Anchor of the free-flying frame
-bool SwFmtAnchor::GetPresentation
+bool SwFormatAnchor::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -460,7 +460,7 @@ bool SwFmtAnchor::GetPresentation
return true;
}
-bool SwFmtPageDesc::GetPresentation
+bool SwFormatPageDesc::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -479,7 +479,7 @@ bool SwFmtPageDesc::GetPresentation
//The ColumnDescriptor
-bool SwFmtCol::GetPresentation
+bool SwFormatCol::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit eCoreUnit,
@@ -507,7 +507,7 @@ bool SwFmtCol::GetPresentation
//URL's and maps
-bool SwFmtURL::GetPresentation
+bool SwFormatURL::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -534,7 +534,7 @@ bool SwFmtURL::GetPresentation
return true;
}
-bool SwFmtEditInReadonly::GetPresentation
+bool SwFormatEditInReadonly::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -549,15 +549,15 @@ bool SwFmtEditInReadonly::GetPresentation
return true;
}
-void SwFmtEditInReadonly::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatEditInReadonly::dumpAsXml(xmlTextWriterPtr pWriter) const
{
- xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtEditInReadonly"));
+ xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatEditInReadonly"));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::boolean(GetValue()).getStr()));
xmlTextWriterEndElement(pWriter);
}
-bool SwFmtLayoutSplit::GetPresentation
+bool SwFormatLayoutSplit::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -571,7 +571,7 @@ bool SwFmtLayoutSplit::GetPresentation
return true;
}
-bool SwFmtRowSplit::GetPresentation
+bool SwFormatRowSplit::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -583,7 +583,7 @@ bool SwFmtRowSplit::GetPresentation
return false;
}
-bool SwFmtFtnEndAtTxtEnd::GetPresentation
+bool SwFormatFootnoteEndAtTextEnd::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -595,7 +595,7 @@ bool SwFmtFtnEndAtTxtEnd::GetPresentation
return true;
}
-bool SwFmtChain::GetPresentation
+bool SwFormatChain::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -619,7 +619,7 @@ bool SwFmtChain::GetPresentation
return true;
}
-bool SwFmtLineNumber::GetPresentation
+bool SwFormatLineNumber::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -828,7 +828,7 @@ bool SwDrawModeGrf::GetPresentation(
return true;
}
-bool SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation ePres,
+bool SwFormatFollowTextFlow::GetPresentation( SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresMetric*/,
OUString &rText,
@@ -843,9 +843,9 @@ bool SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation ePres,
return true;
}
-void SwFmtFollowTextFlow::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatFollowTextFlow::dumpAsXml(xmlTextWriterPtr pWriter) const
{
- xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtFollowTextFlow"));
+ xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatFollowTextFlow"));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::boolean(GetValue()).getStr()));
xmlTextWriterEndElement(pWriter);
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 85bd0b19ceda..f79b378abc98 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -163,7 +163,7 @@ namespace
pCntType,
p->sText,
INetURLObject::decode(
- p->rINetAttr.GetINetFmt().GetValue(),
+ p->rINetAttr.GetINetFormat().GetValue(),
INetURLObject::DECODE_UNAMBIGUOUS,
RTL_TEXTENCODING_UTF8 ),
&p->rINetAttr,
@@ -198,7 +198,7 @@ bool SwContent::IsProtect() const
bool SwPostItContent::IsProtect() const
{
if (mbPostIt)
- return pFld->IsProtect();
+ return pField->IsProtect();
else
return false;
}
@@ -261,7 +261,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
case CONTENT_TYPE_TABLE :
sTypeToken = "table";
- nMemberCount = static_cast<sal_uInt16>(pWrtShell->GetTblFrmFmtCount(true));
+ nMemberCount = static_cast<sal_uInt16>(pWrtShell->GetTableFrameFormatCount(true));
bEdit = true;
break;
@@ -310,31 +310,31 @@ void SwContentType::Init(bool* pbInvalidateWindow)
pMember = new SwContentArr;
}
const Point aNullPt;
- nMemberCount = pWrtShell->GetSectionFmtCount();
+ nMemberCount = pWrtShell->GetSectionFormatCount();
for(sal_uInt16 i = 0; i < nMemberCount; i++)
{
- const SwSectionFmt* pFmt;
+ const SwSectionFormat* pFormat;
SectionType eTmpType;
- if( (pFmt = &pWrtShell->GetSectionFmt(i))->IsInNodesArr() &&
- (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
+ if( (pFormat = &pWrtShell->GetSectionFormat(i))->IsInNodesArr() &&
+ (eTmpType = pFormat->GetSection()->GetType()) != TOX_CONTENT_SECTION
&& TOX_HEADER_SECTION != eTmpType )
{
const OUString& rSectionName =
- pFmt->GetSection()->GetSectionName();
+ pFormat->GetSection()->GetSectionName();
sal_uInt8 nLevel = 0;
- SwSectionFmt* pParentFmt = pFmt->GetParent();
- while(pParentFmt)
+ SwSectionFormat* pParentFormat = pFormat->GetParent();
+ while(pParentFormat)
{
nLevel++;
- pParentFmt = pParentFmt->GetParent();
+ pParentFormat = pParentFormat->GetParent();
}
SwContent* pCnt = new SwRegionContent(this, rSectionName,
nLevel,
- pFmt->FindLayoutRect( false, &aNullPt ).Top());
+ pFormat->FindLayoutRect( false, &aNullPt ).Top());
SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, 0 );
- if( !pFmt->GetInfo( aAskItem ) &&
+ if( !pFormat->GetInfo( aAskItem ) &&
!aAskItem.pObject ) // not visible
pCnt->SetInvisible();
pMember->insert(pCnt);
@@ -400,18 +400,18 @@ void SwContentType::Init(bool* pbInvalidateWindow)
{
for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i)
{
- if ( (*i)->GetBroadCaster()->ISA(SwFmtFld)) // SwPostit
+ if ( (*i)->GetBroadCaster()->ISA(SwFormatField)) // SwPostit
{
- const SwFmtFld* aFmtFld = static_cast<const SwFmtFld*>((*i)->GetBroadCaster());
- if (aFmtFld->GetTxtFld() && aFmtFld->IsFldInDoc() &&
+ const SwFormatField* aFormatField = static_cast<const SwFormatField*>((*i)->GetBroadCaster());
+ if (aFormatField->GetTextField() && aFormatField->IsFieldInDoc() &&
(*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )
{
- OUString sEntry = aFmtFld->GetField()->GetPar2();
+ OUString sEntry = aFormatField->GetField()->GetPar2();
sEntry = RemoveNewline(sEntry);
SwPostItContent* pCnt = new SwPostItContent(
this,
sEntry,
- aFmtFld,
+ aFormatField,
nMemberCount);
pMember->insert(pCnt);
nMemberCount++;
@@ -531,18 +531,18 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
case CONTENT_TYPE_TABLE :
{
- OSL_ENSURE(nMemberCount == static_cast<sal_uInt16>(pWrtShell->GetTblFrmFmtCount(true)),
+ OSL_ENSURE(nMemberCount == static_cast<sal_uInt16>(pWrtShell->GetTableFrameFormatCount(true)),
"MemberCount differs");
Point aNullPt;
- nMemberCount = static_cast<sal_uInt16>(pWrtShell->GetTblFrmFmtCount(true));
+ nMemberCount = static_cast<sal_uInt16>(pWrtShell->GetTableFrameFormatCount(true));
for(sal_uInt16 i = 0; i < nMemberCount; i++)
{
- const SwFrmFmt& rTblFmt = pWrtShell->GetTblFrmFmt(i, true);
- const OUString sTblName( rTblFmt.GetName() );
+ const SwFrameFormat& rTableFormat = pWrtShell->GetTableFrameFormat(i, true);
+ const OUString sTableName( rTableFormat.GetName() );
- SwContent* pCnt = new SwContent(this, sTblName,
- rTblFmt.FindLayoutRect(false, &aNullPt).Top() );
- if( !rTblFmt.GetInfo( aAskItem ) &&
+ SwContent* pCnt = new SwContent(this, sTableName,
+ rTableFormat.FindLayoutRect(false, &aNullPt).Top() );
+ if( !rTableFormat.GetInfo( aAskItem ) &&
!aAskItem.pObject ) // not visible
pCnt->SetInvisible();
@@ -569,26 +569,26 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
nMemberCount = pWrtShell->GetFlyCount(eType, /*bIgnoreTextBoxes=*/true);
for(size_t i = 0; i < nMemberCount; ++i)
{
- const SwFrmFmt* pFrmFmt = pWrtShell->GetFlyNum(i,eType,/*bIgnoreTextBoxes=*/true);
- const OUString sFrmName = pFrmFmt->GetName();
+ const SwFrameFormat* pFrameFormat = pWrtShell->GetFlyNum(i,eType,/*bIgnoreTextBoxes=*/true);
+ const OUString sFrmName = pFrameFormat->GetName();
SwContent* pCnt;
if(CONTENT_TYPE_GRAPHIC == nContentType)
{
OUString sLink;
- pWrtShell->GetGrfNms( &sLink, 0, static_cast<const SwFlyFrmFmt*>( pFrmFmt));
+ pWrtShell->GetGrfNms( &sLink, 0, static_cast<const SwFlyFrameFormat*>( pFrameFormat));
pCnt = new SwGraphicContent(this, sFrmName,
INetURLObject::decode( sLink,
INetURLObject::DECODE_UNAMBIGUOUS,
RTL_TEXTENCODING_UTF8 ),
- pFrmFmt->FindLayoutRect(false, &aNullPt).Top());
+ pFrameFormat->FindLayoutRect(false, &aNullPt).Top());
}
else
{
pCnt = new SwContent(this, sFrmName,
- pFrmFmt->FindLayoutRect(false, &aNullPt).Top() );
+ pFrameFormat->FindLayoutRect(false, &aNullPt).Top() );
}
- if( !pFrmFmt->GetInfo( aAskItem ) &&
+ if( !pFrameFormat->GetInfo( aAskItem ) &&
!aAskItem.pObject ) // not visible
pCnt->SetInvisible();
pMember->insert(pCnt);
@@ -618,29 +618,29 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
case CONTENT_TYPE_REGION :
{
const Point aNullPt;
- nMemberCount = pWrtShell->GetSectionFmtCount();
+ nMemberCount = pWrtShell->GetSectionFormatCount();
for(sal_uInt16 i = 0; i < nMemberCount; i++)
{
- const SwSectionFmt* pFmt;
+ const SwSectionFormat* pFormat;
SectionType eTmpType;
- if( (pFmt = &pWrtShell->GetSectionFmt(i))->IsInNodesArr() &&
- (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
+ if( (pFormat = &pWrtShell->GetSectionFormat(i))->IsInNodesArr() &&
+ (eTmpType = pFormat->GetSection()->GetType()) != TOX_CONTENT_SECTION
&& TOX_HEADER_SECTION != eTmpType )
{
- OUString sSectionName = pFmt->GetSection()->GetSectionName();
+ OUString sSectionName = pFormat->GetSection()->GetSectionName();
sal_uInt8 nLevel = 0;
- SwSectionFmt* pParentFmt = pFmt->GetParent();
- while(pParentFmt)
+ SwSectionFormat* pParentFormat = pFormat->GetParent();
+ while(pParentFormat)
{
nLevel++;
- pParentFmt = pParentFmt->GetParent();
+ pParentFormat = pParentFormat->GetParent();
}
SwContent* pCnt = new SwRegionContent(this, sSectionName,
nLevel,
- pFmt->FindLayoutRect( false, &aNullPt ).Top());
- if( !pFmt->GetInfo( aAskItem ) &&
+ pFormat->FindLayoutRect( false, &aNullPt ).Top());
+ if( !pFormat->GetInfo( aAskItem ) &&
!aAskItem.pObject ) // not visible
pCnt->SetInvisible();
pMember->insert(pCnt);
@@ -708,18 +708,18 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
{
for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i)
{
- if ( (*i)->GetBroadCaster()->ISA(SwFmtFld)) // SwPostit
+ if ( (*i)->GetBroadCaster()->ISA(SwFormatField)) // SwPostit
{
- const SwFmtFld* aFmtFld = static_cast<const SwFmtFld*>((*i)->GetBroadCaster());
- if (aFmtFld->GetTxtFld() && aFmtFld->IsFldInDoc() &&
+ const SwFormatField* aFormatField = static_cast<const SwFormatField*>((*i)->GetBroadCaster());
+ if (aFormatField->GetTextField() && aFormatField->IsFieldInDoc() &&
(*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )
{
- OUString sEntry = aFmtFld->GetField()->GetPar2();
+ OUString sEntry = aFormatField->GetField()->GetPar2();
sEntry = RemoveNewline(sEntry);
SwPostItContent* pCnt = new SwPostItContent(
this,
sEntry,
- aFmtFld,
+ aFormatField,
nMemberCount);
pMember->insert(pCnt);
nMemberCount++;
@@ -752,8 +752,8 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
SwContact* pContact = static_cast<SwContact*>(pTemp->GetUserCall());
long nYPos = 0;
const Point aNullPt;
- if(pContact && pContact->GetFmt())
- nYPos = pContact->GetFmt()->FindLayoutRect(false, &aNullPt).Top();
+ if(pContact && pContact->GetFormat())
+ nYPos = pContact->GetFormat()->FindLayoutRect(false, &aNullPt).Top();
SwContent* pCnt = new SwContent(
this,
pTemp->GetName(),
@@ -784,7 +784,7 @@ SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId)
, sSpace(OUString(" "))
, sRemoveIdx(SW_RES(ST_REMOVE_INDEX))
, sUpdateIdx(SW_RES(ST_UPDATE))
- , sUnprotTbl(SW_RES(ST_REMOVE_TBL_PROTECTION))
+ , sUnprotTable(SW_RES(ST_REMOVE_TBL_PROTECTION))
, sRename(SW_RES(ST_RENAME))
, sReadonlyIdx(SW_RES(ST_READONLY_IDX))
, sInvisible(SW_RES(ST_INVISIBLE))
@@ -916,14 +916,14 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
{
if( pActiveShell && pActiveShell->GetDoc() )
{
- const SwFlyFrmFmt* pFrmFmt = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
- if( pFrmFmt )
+ const SwFlyFrameFormat* pFrameFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
+ if( pFrameFormat )
{
-// SwNodeIndex aIdx( *(pFrmFmt->GetCntnt().GetCntntIdx()), 1 );
+// SwNodeIndex aIdx( *(pFrameFormat->GetContent().GetContentIdx()), 1 );
// const SwGrfNode* pGrfNd = aIdx.GetNode().GetGrfNode();
// if( pGrfNd )
// return pGrfNd->GetAlternateText();
- return pFrmFmt->GetObjTitle();
+ return pFrameFormat->GetObjTitle();
}
}
}
@@ -932,9 +932,9 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
case CONTENT_TYPE_FRAME :
{
//Can't find the GetAlternateText function. Need to verify again.
- const SwFlyFrmFmt* pFlyFmt = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
- if( pFlyFmt )
- return pFlyFmt->/*GetAlternateText*/GetName();
+ const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
+ if( pFlyFormat )
+ return pFlyFormat->/*GetAlternateText*/GetName();
}
break;
}
@@ -1009,9 +1009,9 @@ OUString SwContentTree::GetEntryLongDescription( SvTreeListEntry* pEntry ) const
case CONTENT_TYPE_FRAME :
{
//Can't find the function "GetLongDescription". Need to verify again.
- const SwFlyFrmFmt* pFlyFmt = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
- if( pFlyFmt )
- return pFlyFmt->GetDescription();
+ const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
+ if( pFlyFormat )
+ return pFlyFormat->GetDescription();
}
break;
}
@@ -1214,10 +1214,10 @@ PopupMenu* SwContentTree::CreateContextMenu()
{
bSubPop4 = true;
pSubPop4->InsertItem(403, aContextStrings[ST_EDIT_ENTRY - ST_CONTEXT_FIRST]);
- pSubPop4->InsertItem(404, sUnprotTbl);
+ pSubPop4->InsertItem(404, sUnprotTable);
bool bFull = false;
- OUString sTblName = static_cast<SwContent*>(pEntry->GetUserData())->GetName();
- bool bProt = pActiveShell->HasTblAnyProtection( &sTblName, &bFull );
+ OUString sTableName = static_cast<SwContent*>(pEntry->GetUserData())->GetName();
+ bool bProt = pActiveShell->HasTableAnyProtection( &sTableName, &bFull );
pSubPop4->EnableItem(403, !bFull );
pSubPop4->EnableItem(404, bProt );
pSubPop4->InsertItem(501, aContextStrings[ST_DELETE_ENTRY - ST_CONTEXT_FIRST]);
@@ -1791,14 +1791,14 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
if( pWrtShell->IsOutlineCopyable( nPos ) )
{
const SwNumRule* pOutlRule = pWrtShell->GetOutlineNumRule();
- const SwTxtNode* pTxtNd =
+ const SwTextNode* pTextNd =
pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNode(nPos);
- if( pTxtNd && pOutlRule && pTxtNd->IsNumbered())
+ if( pTextNd && pOutlRule && pTextNd->IsNumbered())
{
SwNumberTree::tNumberVector aNumVector =
- pTxtNd->GetNumberVector();
+ pTextNd->GetNumberVector();
for( sal_Int8 nLevel = 0;
- nLevel <= pTxtNd->GetActualListLevel();
+ nLevel <= pTextNd->GetActualListLevel();
nLevel++ )
{
const SwNumberTree::tSwNumTreeNumber nVal = aNumVector[nLevel] + 1;
@@ -3346,7 +3346,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
*static_cast<SwURLFieldContent*>(pCnt)->GetINetAttr() ))
{
pActiveShell->Right( CRSR_SKIP_CHARS, true, 1, false);
- pActiveShell->SwCrsrShell::SelectTxtAttr( RES_TXTATR_INETFMT, true );
+ pActiveShell->SwCrsrShell::SelectTextAttr( RES_TXTATR_INETFMT, true );
}
}
@@ -3366,7 +3366,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
case CONTENT_TYPE_POSTIT:
pActiveShell->GetView().GetPostItMgr()->AssureStdModeAtShell();
if (static_cast<SwPostItContent*>(pCnt)->IsPostIt())
- pActiveShell->GotoFld(*static_cast<SwPostItContent*>(pCnt)->GetPostIt());
+ pActiveShell->GotoFormatField(*static_cast<SwPostItContent*>(pCnt)->GetPostIt());
else
pActiveShell->GetView().GetDocShell()->GetWrtShell()->GotoRedline(
pActiveShell->GetView().GetDocShell()->GetWrtShell()->FindRedlineOfData(static_cast<SwPostItContent*>(pCnt)->GetRedline()->GetRedlineData()));
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index eba6232f3bba..e068da231e33 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -1317,16 +1317,16 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen
aFileUrl.SetSmartURL( sFileName );
OUString sSectionName(aFileUrl.GetLastName(
INetURLObject::DECODE_UNAMBIGUOUS).getToken(0, sfx2::cTokenSeparator));
- sal_uInt16 nSectCount = rSh.GetSectionFmtCount();
+ sal_uInt16 nSectCount = rSh.GetSectionFormatCount();
OUString sTempSectionName(sSectionName);
sal_uInt16 nAddNumber = 0;
sal_uInt16 nCount = 0;
// if applicable: add index if the range name is already in use.
while ( nCount < nSectCount )
{
- const SwSectionFmt& rFmt = rSh.GetSectionFmt(nCount);
- if ((rFmt.GetSection()->GetSectionName() == sTempSectionName)
- && rFmt.IsInNodesArr())
+ const SwSectionFormat& rFormat = rSh.GetSectionFormat(nCount);
+ if ((rFormat.GetSection()->GetSectionName() == sTempSectionName)
+ && rFormat.IsInNodesArr())
{
nCount = 0;
nAddNumber++;
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index 18744550338d..cfadf1b74209 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -155,7 +155,7 @@ void _FinitUI()
DELETEZ(pGlossaries);
- delete SwFieldType::s_pFldNames;
+ delete SwFieldType::s_pFieldNames;
ClearStringCache();
delete pGlossaryList;
@@ -189,10 +189,10 @@ ShellResource::ShellResource()
aCalc_Default( SW_RES( STR_CALC_DEFAULT ) ),
aCalc_Error( SW_RES( STR_CALC_ERROR ) ),
- aGetRefFld_Up( SW_RES( STR_GETREFFLD_UP ) ),
- aGetRefFld_Down( SW_RES( STR_GETREFFLD_DOWN ) ),
+ aGetRefField_Up( SW_RES( STR_GETREFFLD_UP ) ),
+ aGetRefField_Down( SW_RES( STR_GETREFFLD_DOWN ) ),
// #i81002#
- aGetRefFld_RefItemNotFound( SW_RES( STR_GETREFFLD_REFITEMNOTFOUND ) ),
+ aGetRefField_RefItemNotFound( SW_RES( STR_GETREFFLD_REFITEMNOTFOUND ) ),
aStrAllPageHeadFoot( SW_RES( STR_ALLPAGE_HEADFOOT ) ),
aStrNone( SW_RES( STR_TEMPLATE_NONE )),
aFixedStr( SW_RES( STR_FIELD_FIXED )),
@@ -208,7 +208,7 @@ ShellResource::ShellResource()
aTOXCitationName( SW_RES(STR_TOX_CITATION)),
aLinkCtrlClick(SW_RESSTR(STR_LINK_CTRL_CLICK)),
aLinkClick(SW_RESSTR(STR_LINK_CLICK)),
- pAutoFmtNameLst(0),
+ pAutoFormatNameLst(0),
sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)),
sPageDescFollowName( SW_RES(STR_PAGEDESC_FOLLOWNAME)),
sPageDescName( SW_RES(STR_PAGEDESC_NAME))
@@ -230,7 +230,7 @@ ShellResource::ShellResource()
ShellResource::~ShellResource()
{
- delete pAutoFmtNameLst;
+ delete pAutoFormatNameLst;
}
OUString ShellResource::GetPageDescName(sal_uInt16 nNo, PageNameMode eMode)
@@ -273,20 +273,20 @@ SwGlossaryList* GetGlossaryList()
return pGlossaryList;
}
-struct ImpAutoFmtNameListLoader : public Resource
+struct ImpAutoFormatNameListLoader : public Resource
{
- ImpAutoFmtNameListLoader( std::vector<OUString>& rLst );
+ ImpAutoFormatNameListLoader( std::vector<OUString>& rLst );
};
-void ShellResource::_GetAutoFmtNameLst() const
+void ShellResource::_GetAutoFormatNameLst() const
{
- assert(!pAutoFmtNameLst);
- pAutoFmtNameLst = new std::vector<OUString>;
- pAutoFmtNameLst->reserve(STR_AUTOFMTREDL_END);
- ImpAutoFmtNameListLoader aTmp(*pAutoFmtNameLst);
+ assert(!pAutoFormatNameLst);
+ pAutoFormatNameLst = new std::vector<OUString>;
+ pAutoFormatNameLst->reserve(STR_AUTOFMTREDL_END);
+ ImpAutoFormatNameListLoader aTmp(*pAutoFormatNameLst);
}
-ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( std::vector<OUString>& rLst )
+ImpAutoFormatNameListLoader::ImpAutoFormatNameListLoader( std::vector<OUString>& rLst )
: Resource( ResId(RID_SHELLRES_AUTOFMTSTRS, *pSwResMgr) )
{
for( sal_uInt16 n = 0; n < STR_AUTOFMTREDL_END; ++n )
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 85c9c835d1d8..25e7277c8844 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -250,7 +250,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void )
if (rSh.EndPg())
nFuncId = FN_END_OF_PAGE;
}
- else if (rSh.GotoFooterTxt())
+ else if (rSh.GotoFooterText())
nFuncId = FN_TO_FOOTER;
bFocusToDoc = true;
}
@@ -264,7 +264,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void )
if (rSh.SttPg())
nFuncId = FN_START_OF_PAGE;
}
- else if (rSh.GotoHeaderTxt())
+ else if (rSh.GotoHeaderText())
nFuncId = FN_TO_HEADER;
bFocusToDoc = true;
}
@@ -276,7 +276,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void )
// Jump from the footnote to the anchor.
if (eFrmType & FrmTypeFlags::FOOTNOTE)
{
- if (rSh.GotoFtnAnchor())
+ if (rSh.GotoFootnoteAnchor())
nFuncId = FN_FOOTNOTE_TO_ANCHOR;
}
// Otherwise, jump to the first footnote text;
@@ -284,11 +284,11 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void )
// if this is also not possible got to the footnote before.
else
{
- if (rSh.GotoFtnTxt())
+ if (rSh.GotoFootnoteText())
nFuncId = FN_FOOTNOTE_TO_ANCHOR;
- else if (rSh.GotoNextFtnAnchor())
+ else if (rSh.GotoNextFootnoteAnchor())
nFuncId = FN_NEXT_FOOTNOTE;
- else if (rSh.GotoPrevFtnAnchor())
+ else if (rSh.GotoPrevFootnoteAnchor())
nFuncId = FN_PREV_FOOTNOTE;
}
bFocusToDoc = true;
@@ -1103,27 +1103,27 @@ IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
{
OUString sFileName;
- SotClipboardFormatId nFmt;
- if( rData.HasFormat( nFmt = SotClipboardFormatId::FILE_LIST ))
+ SotClipboardFormatId nFormat;
+ if( rData.HasFormat( nFormat = SotClipboardFormatId::FILE_LIST ))
{
FileList aFileList;
- rData.GetFileList( nFmt, aFileList );
+ rData.GetFileList( nFormat, aFileList );
sFileName = aFileList.GetFile( 0 );
}
- else if( rData.HasFormat( nFmt = SotClipboardFormatId::STRING ) ||
- rData.HasFormat( nFmt = SotClipboardFormatId::SIMPLE_FILE ) ||
- rData.HasFormat( nFmt = SotClipboardFormatId::FILENAME ))
+ else if( rData.HasFormat( nFormat = SotClipboardFormatId::STRING ) ||
+ rData.HasFormat( nFormat = SotClipboardFormatId::SIMPLE_FILE ) ||
+ rData.HasFormat( nFormat = SotClipboardFormatId::FILENAME ))
{
- (void)rData.GetString(nFmt, sFileName);
+ (void)rData.GetString(nFormat, sFileName);
}
- else if( rData.HasFormat( nFmt = SotClipboardFormatId::SOLK ) ||
- rData.HasFormat( nFmt = SotClipboardFormatId::NETSCAPE_BOOKMARK )||
- rData.HasFormat( nFmt = SotClipboardFormatId::FILECONTENT ) ||
- rData.HasFormat( nFmt = SotClipboardFormatId::FILEGRPDESCRIPTOR ) ||
- rData.HasFormat( nFmt = SotClipboardFormatId::UNIFORMRESOURCELOCATOR ))
+ else if( rData.HasFormat( nFormat = SotClipboardFormatId::SOLK ) ||
+ rData.HasFormat( nFormat = SotClipboardFormatId::NETSCAPE_BOOKMARK )||
+ rData.HasFormat( nFormat = SotClipboardFormatId::FILECONTENT ) ||
+ rData.HasFormat( nFormat = SotClipboardFormatId::FILEGRPDESCRIPTOR ) ||
+ rData.HasFormat( nFormat = SotClipboardFormatId::UNIFORMRESOURCELOCATOR ))
{
INetBookmark aBkmk( aEmptyOUStr, aEmptyOUStr );
- if (rData.GetINetBookmark(nFmt, aBkmk))
+ if (rData.GetINetBookmark(nFormat, aBkmk))
sFileName = aBkmk.GetURL();
}
if( !sFileName.isEmpty() )
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index a12a7ceb6e77..c5d3b8baa2c7 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -88,7 +88,7 @@ VCL_BUILDER_DECL_FACTORY(NumFormatListBox)
rRet = pListBox;
}
-void NumFormatListBox::Init(short nFormatType, bool bUsrFmts)
+void NumFormatListBox::Init(short nFormatType, bool bUsrFormats)
{
SwView *pView = GetView();
@@ -97,7 +97,7 @@ void NumFormatListBox::Init(short nFormatType, bool bUsrFmts)
else
eCurLanguage = SvtSysLocale().GetLanguageTag().getLanguageType();
- if (!bUsrFmts)
+ if (!bUsrFormats)
{
pOwnFormatter = new SvNumberFormatter(comphelper::getProcessComponentContext(), eCurLanguage);
}
@@ -212,41 +212,41 @@ void NumFormatListBox::SetFormatType(const short nFormatType)
break;
}
- const SvNumberformat* pFmt;
+ const SvNumberformat* pFormat;
sal_Int32 i = 0;
sal_uLong nFormat;
Color* pCol;
double fVal = GetDefValue( nFormatType );
OUString sValue;
- sal_uLong nSysNumFmt = pFormatter->GetFormatIndex(
+ sal_uLong nSysNumFormat = pFormatter->GetFormatIndex(
NF_NUMBER_SYSTEM, eCurLanguage );
- sal_uLong nSysShortDateFmt = pFormatter->GetFormatIndex(
+ sal_uLong nSysShortDateFormat = pFormatter->GetFormatIndex(
NF_DATE_SYSTEM_SHORT, eCurLanguage );
- sal_uLong nSysLongDateFmt = pFormatter->GetFormatIndex(
+ sal_uLong nSysLongDateFormat = pFormatter->GetFormatIndex(
NF_DATE_SYSTEM_LONG, eCurLanguage );
for( long nIndex = eOffsetStart; nIndex <= eOffsetEnd; ++nIndex )
{
nFormat = pFormatter->GetFormatIndex(
(NfIndexTableOffset)nIndex, eCurLanguage );
- pFmt = pFormatter->GetEntry( nFormat );
+ pFormat = pFormatter->GetEntry( nFormat );
if( nFormat == pFormatter->GetFormatIndex( NF_NUMBER_STANDARD,
eCurLanguage )
- || const_cast<SvNumberformat*>(pFmt)->GetOutputString( fVal, sValue, &pCol )
+ || const_cast<SvNumberformat*>(pFormat)->GetOutputString( fVal, sValue, &pCol )
|| nFormatType == css::util::NumberFormat::UNDEFINED )
{
- sValue = pFmt->GetFormatstring();
+ sValue = pFormat->GetFormatstring();
}
else if( nFormatType == css::util::NumberFormat::TEXT )
{
pFormatter->GetOutputString( "\"ABC\"", nFormat, sValue, &pCol);
}
- if (nFormat != nSysNumFmt &&
- nFormat != nSysShortDateFmt &&
- nFormat != nSysLongDateFmt)
+ if (nFormat != nSysNumFormat &&
+ nFormat != nSysShortDateFormat &&
+ nFormat != nSysLongDateFormat)
{
const sal_Int32 nPos = InsertEntry( sValue );
SetEntryData( nPos, reinterpret_cast<void*>(nFormat) );
@@ -326,20 +326,20 @@ void NumFormatListBox::SetDefFormat(const sal_uLong nDefaultFormat)
while (reinterpret_cast<sal_uLong>(GetEntryData(nPos)) == ULONG_MAX)
nPos++;
- sal_uLong nSysNumFmt = pFormatter->GetFormatIndex( NF_NUMBER_SYSTEM, eCurLanguage);
- sal_uLong nSysShortDateFmt = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eCurLanguage);
- sal_uLong nSysLongDateFmt = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eCurLanguage);
+ sal_uLong nSysNumFormat = pFormatter->GetFormatIndex( NF_NUMBER_SYSTEM, eCurLanguage);
+ sal_uLong nSysShortDateFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eCurLanguage);
+ sal_uLong nSysLongDateFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eCurLanguage);
bool bSysLang = false;
if( eCurLanguage == GetAppLanguage() )
bSysLang = true;
- sal_uLong nNumFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysNumFmt, LANGUAGE_SYSTEM );
- sal_uLong nShortDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysShortDateFmt, LANGUAGE_SYSTEM );
- sal_uLong nLongDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysLongDateFmt, LANGUAGE_SYSTEM );
+ sal_uLong nNumFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysNumFormat, LANGUAGE_SYSTEM );
+ sal_uLong nShortDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysShortDateFormat, LANGUAGE_SYSTEM );
+ sal_uLong nLongDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysLongDateFormat, LANGUAGE_SYSTEM );
if (
- nDefaultFormat == nSysNumFmt ||
- nDefaultFormat == nSysShortDateFmt ||
- nDefaultFormat == nSysLongDateFmt ||
+ nDefaultFormat == nSysNumFormat ||
+ nDefaultFormat == nSysShortDateFormat ||
+ nDefaultFormat == nSysLongDateFormat ||
(
bSysLang &&
(
@@ -427,9 +427,9 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox )
{
sal_uInt32 nNumberFormat = static_cast<const SfxUInt32Item*>(pItem)->GetValue();
// oj #105473# change order of calls
- const SvNumberformat* pFmt = pFormatter->GetEntry(nNumberFormat);
- if( pFmt )
- eCurLanguage = pFmt->GetLanguage();
+ const SvNumberformat* pFormat = pFormatter->GetEntry(nNumberFormat);
+ if( pFormat )
+ eCurLanguage = pFormat->GetLanguage();
// SetDefFormat uses eCurLanguage to look for if this format already in the list
SetDefFormat(nNumberFormat);
}
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index 087dd8a13b85..16823c94e688 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -32,34 +32,34 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-SwPageFtnInfoItem::SwPageFtnInfoItem( const sal_uInt16 nId, SwPageFtnInfo& rInfo) :
+SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( const sal_uInt16 nId, SwPageFootnoteInfo& rInfo) :
SfxPoolItem( nId ),
- aFtnInfo(rInfo)
+ aFootnoteInfo(rInfo)
{
}
-SwPageFtnInfoItem::SwPageFtnInfoItem( const SwPageFtnInfoItem& rItem ) :
+SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( const SwPageFootnoteInfoItem& rItem ) :
SfxPoolItem( rItem ),
- aFtnInfo(rItem.GetPageFtnInfo())
+ aFootnoteInfo(rItem.GetPageFootnoteInfo())
{
}
- SwPageFtnInfoItem::~SwPageFtnInfoItem()
+ SwPageFootnoteInfoItem::~SwPageFootnoteInfoItem()
{
}
-SfxPoolItem* SwPageFtnInfoItem::Clone( SfxItemPool * /*pPool*/ ) const
+SfxPoolItem* SwPageFootnoteInfoItem::Clone( SfxItemPool * /*pPool*/ ) const
{
- return new SwPageFtnInfoItem( *this );
+ return new SwPageFootnoteInfoItem( *this );
}
-bool SwPageFtnInfoItem::operator==( const SfxPoolItem& rAttr ) const
+bool SwPageFootnoteInfoItem::operator==( const SfxPoolItem& rAttr ) const
{
OSL_ENSURE( Which() == rAttr.Which(), "no equal attributes" );
- return ( aFtnInfo == static_cast<const SwPageFtnInfoItem&>(rAttr).GetPageFtnInfo());
+ return ( aFootnoteInfo == static_cast<const SwPageFootnoteInfoItem&>(rAttr).GetPageFootnoteInfo());
}
-bool SwPageFtnInfoItem::GetPresentation
+bool SwPageFootnoteInfoItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit eCoreUnit,
@@ -68,7 +68,7 @@ bool SwPageFtnInfoItem::GetPresentation
const IntlWrapper* pIntl
) const
{
- const SwTwips nHght = GetPageFtnInfo().GetHeight();
+ const SwTwips nHght = GetPageFootnoteInfo().GetHeight();
if ( nHght )
{
rText = SW_RESSTR( STR_MAX_FTN_HEIGHT ) + " " +
@@ -78,27 +78,27 @@ bool SwPageFtnInfoItem::GetPresentation
return true;
}
-bool SwPageFtnInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
+bool SwPageFootnoteInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
{
bool bRet = true;
switch(nMemberId & ~CONVERT_TWIPS)
{
- case MID_FTN_HEIGHT : rVal <<= (sal_Int32)convertTwipToMm100(aFtnInfo.GetHeight());break;
- case MID_LINE_WEIGHT : rVal <<= (sal_Int16)convertTwipToMm100(aFtnInfo.GetLineWidth());break;
- case MID_LINE_COLOR : rVal <<= (sal_Int32)aFtnInfo.GetLineColor().GetColor();break;
+ case MID_FTN_HEIGHT : rVal <<= (sal_Int32)convertTwipToMm100(aFootnoteInfo.GetHeight());break;
+ case MID_LINE_WEIGHT : rVal <<= (sal_Int16)convertTwipToMm100(aFootnoteInfo.GetLineWidth());break;
+ case MID_LINE_COLOR : rVal <<= (sal_Int32)aFootnoteInfo.GetLineColor().GetColor();break;
case MID_LINE_RELWIDTH :
{
Fraction aTmp( 100, 1 );
- aTmp *= aFtnInfo.GetWidth();
+ aTmp *= aFootnoteInfo.GetWidth();
rVal <<= (sal_Int8)(long)aTmp;
}
break;
- case MID_LINE_ADJUST : rVal <<= (sal_Int16)aFtnInfo.GetAdj();break;//text::HorizontalAdjust
- case MID_LINE_TEXT_DIST : rVal <<= (sal_Int32)convertTwipToMm100(aFtnInfo.GetTopDist());break;
- case MID_LINE_FOOTNOTE_DIST: rVal <<= (sal_Int32)convertTwipToMm100(aFtnInfo.GetBottomDist());break;
+ case MID_LINE_ADJUST : rVal <<= (sal_Int16)aFootnoteInfo.GetAdj();break;//text::HorizontalAdjust
+ case MID_LINE_TEXT_DIST : rVal <<= (sal_Int32)convertTwipToMm100(aFootnoteInfo.GetTopDist());break;
+ case MID_LINE_FOOTNOTE_DIST: rVal <<= (sal_Int32)convertTwipToMm100(aFootnoteInfo.GetBottomDist());break;
case MID_FTN_LINE_STYLE :
{
- switch ( aFtnInfo.GetLineStyle( ) )
+ switch ( aFootnoteInfo.GetLineStyle( ) )
{
default:
case table::BorderLineStyle::NONE : rVal <<= sal_Int8(0); break;
@@ -114,7 +114,7 @@ bool SwPageFtnInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
return bRet;
}
-bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
+bool SwPageFootnoteInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
{
sal_Int32 nSet32 = 0;
bool bRet = true;
@@ -122,7 +122,7 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
{
case MID_LINE_COLOR :
rVal >>= nSet32;
- aFtnInfo.SetLineColor(nSet32);
+ aFootnoteInfo.SetLineColor(nSet32);
break;
case MID_FTN_HEIGHT:
case MID_LINE_TEXT_DIST :
@@ -135,9 +135,9 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
nSet32 = convertMm100ToTwip(nSet32);
switch(nMemberId & ~CONVERT_TWIPS)
{
- case MID_FTN_HEIGHT: aFtnInfo.SetHeight(nSet32); break;
- case MID_LINE_TEXT_DIST: aFtnInfo.SetTopDist(nSet32);break;
- case MID_LINE_FOOTNOTE_DIST: aFtnInfo.SetBottomDist(nSet32);break;
+ case MID_FTN_HEIGHT: aFootnoteInfo.SetHeight(nSet32); break;
+ case MID_LINE_TEXT_DIST: aFootnoteInfo.SetTopDist(nSet32);break;
+ case MID_LINE_FOOTNOTE_DIST: aFootnoteInfo.SetBottomDist(nSet32);break;
}
}
break;
@@ -146,7 +146,7 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
sal_Int16 nSet = 0;
rVal >>= nSet;
if(nSet >= 0)
- aFtnInfo.SetLineWidth(convertMm100ToTwip(nSet));
+ aFootnoteInfo.SetLineWidth(convertMm100ToTwip(nSet));
else
bRet = false;
}
@@ -158,7 +158,7 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
if(nSet < 0)
bRet = false;
else
- aFtnInfo.SetWidth(Fraction(nSet, 100));
+ aFootnoteInfo.SetWidth(Fraction(nSet, 100));
}
break;
case MID_LINE_ADJUST :
@@ -166,7 +166,7 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
sal_Int16 nSet = 0;
rVal >>= nSet;
if(nSet >= 0 && nSet < 3) //text::HorizontalAdjust
- aFtnInfo.SetAdj((SwFtnAdj)nSet);
+ aFootnoteInfo.SetAdj((SwFootnoteAdj)nSet);
else
bRet = false;
}
@@ -183,7 +183,7 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
case 3: eStyle = table::BorderLineStyle::DASHED; break;
default: break;
}
- aFtnInfo.SetLineStyle( eStyle );
+ aFootnoteInfo.SetLineStyle( eStyle );
}
break;
default:
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index d7b30ac76096..d793a99775cf 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -232,20 +232,20 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const SfxItemSet& rOrigSet, const sa
// Fill header footer
-void FillHdFt(SwFrmFmt* pFmt, const SfxItemSet& rSet)
+void FillHdFt(SwFrameFormat* pFormat, const SfxItemSet& rSet)
{
- SwAttrSet aSet(pFmt->GetAttrSet());
+ SwAttrSet aSet(pFormat->GetAttrSet());
aSet.Put(rSet);
const SvxSizeItem& rSize = static_cast<const SvxSizeItem&>(rSet.Get(SID_ATTR_PAGE_SIZE));
const SfxBoolItem& rDynamic = static_cast<const SfxBoolItem&>(rSet.Get(SID_ATTR_PAGE_DYNAMIC));
// Convert size
- SwFmtFrmSize aFrmSize(rDynamic.GetValue() ? ATT_MIN_SIZE : ATT_FIX_SIZE,
+ SwFormatFrmSize aFrmSize(rDynamic.GetValue() ? ATT_MIN_SIZE : ATT_FIX_SIZE,
rSize.GetSize().Width(),
rSize.GetSize().Height());
aSet.Put(aFrmSize);
- pFmt->SetFmtAttr(aSet);
+ pFormat->SetFormatAttr(aSet);
}
/// Convert from UseOnPage to SvxPageUsage.
@@ -282,11 +282,11 @@ UseOnPage lcl_convertUseFromSvx(UseOnPage nUse)
void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
{
- SwFrmFmt& rMaster = rPageDesc.GetMaster();
+ SwFrameFormat& rMaster = rPageDesc.GetMaster();
int nFirstShare = -1;
// Transfer all general frame attributes
- rMaster.SetFmtAttr(rSet);
+ rMaster.SetFormatAttr(rSet);
// PageData
if(rSet.GetItemState(SID_ATTR_PAGE) == SfxItemState::SET)
@@ -305,9 +305,9 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
if(rSet.GetItemState(SID_ATTR_PAGE_SIZE) == SfxItemState::SET)
{
const SvxSizeItem& rSizeItem = static_cast<const SvxSizeItem&>(rSet.Get(SID_ATTR_PAGE_SIZE));
- SwFmtFrmSize aSize(ATT_FIX_SIZE);
+ SwFormatFrmSize aSize(ATT_FIX_SIZE);
aSize.SetSize(rSizeItem.GetSize());
- rMaster.SetFmtAttr(aSize);
+ rMaster.SetFormatAttr(aSize);
}
// Evaluate header attributes
const SfxPoolItem* pItem;
@@ -321,14 +321,14 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
{
// Take over values
if(!rMaster.GetHeader().IsActive())
- rMaster.SetFmtAttr(SwFmtHeader(true));
+ rMaster.SetFormatAttr(SwFormatHeader(true));
// Pick out everything and adapt the header format
- SwFmtHeader aHeaderFmt(rMaster.GetHeader());
- SwFrmFmt *pHeaderFmt = aHeaderFmt.GetHeaderFmt();
- OSL_ENSURE(pHeaderFmt != 0, "no header format");
+ SwFormatHeader aHeaderFormat(rMaster.GetHeader());
+ SwFrameFormat *pHeaderFormat = aHeaderFormat.GetHeaderFormat();
+ OSL_ENSURE(pHeaderFormat != 0, "no header format");
- ::FillHdFt(pHeaderFmt, rHeaderSet);
+ ::FillHdFt(pHeaderFormat, rHeaderSet);
rPageDesc.ChgHeaderShare(static_cast<const SfxBoolItem&>(
rHeaderSet.Get(SID_ATTR_PAGE_SHARED)).GetValue());
@@ -344,7 +344,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
// Disable header
if(rMaster.GetHeader().IsActive())
{
- rMaster.SetFmtAttr(SwFmtHeader(false));
+ rMaster.SetFormatAttr(SwFormatHeader(false));
rPageDesc.ChgHeaderShare(false);
}
}
@@ -361,14 +361,14 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
{
// Take over values
if(!rMaster.GetFooter().IsActive())
- rMaster.SetFmtAttr(SwFmtFooter(true));
+ rMaster.SetFormatAttr(SwFormatFooter(true));
// Pick out everything and adapt the footer format
- SwFmtFooter aFooterFmt(rMaster.GetFooter());
- SwFrmFmt *pFooterFmt = aFooterFmt.GetFooterFmt();
- OSL_ENSURE(pFooterFmt != 0, "no footer format");
+ SwFormatFooter aFooterFormat(rMaster.GetFooter());
+ SwFrameFormat *pFooterFormat = aFooterFormat.GetFooterFormat();
+ OSL_ENSURE(pFooterFormat != 0, "no footer format");
- ::FillHdFt(pFooterFmt, rFooterSet);
+ ::FillHdFt(pFooterFormat, rFooterSet);
rPageDesc.ChgFooterShare(static_cast<const SfxBoolItem&>(
rFooterSet.Get(SID_ATTR_PAGE_SHARED)).GetValue());
@@ -384,7 +384,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
// Disable footer
if(rMaster.GetFooter().IsActive())
{
- rMaster.SetFmtAttr(SwFmtFooter(false));
+ rMaster.SetFormatAttr(SwFormatFooter(false));
rPageDesc.ChgFooterShare(false);
}
}
@@ -394,7 +394,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
if( SfxItemState::SET == rSet.GetItemState( FN_PARAM_FTN_INFO,
false, &pItem ) )
- rPageDesc.SetFtnInfo( static_cast<const SwPageFtnInfoItem*>(pItem)->GetPageFtnInfo() );
+ rPageDesc.SetFootnoteInfo( static_cast<const SwPageFootnoteInfoItem*>(pItem)->GetPageFootnoteInfo() );
// Columns
@@ -405,33 +405,33 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
{
bool bSet = static_cast<const SfxBoolItem*>(pItem)->GetValue();
if(!bSet)
- rPageDesc.SetRegisterFmtColl(0);
+ rPageDesc.SetRegisterFormatColl(0);
else if(SfxItemState::SET == rSet.GetItemState(
SID_SWREGISTER_COLLECTION, false, &pItem))
{
const OUString& rColl = static_cast<const SfxStringItem*>(pItem)->GetValue();
SwDoc& rDoc = *rMaster.GetDoc();
- SwTxtFmtColl* pColl = rDoc.FindTxtFmtCollByName( rColl );
+ SwTextFormatColl* pColl = rDoc.FindTextFormatCollByName( rColl );
if( !pColl )
{
const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(
rColl, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
if( USHRT_MAX != nId )
- pColl = rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( nId );
+ pColl = rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( nId );
else
- pColl = rDoc.MakeTxtFmtColl( rColl,
- rDoc.GetDfltTxtFmtColl() );
+ pColl = rDoc.MakeTextFormatColl( rColl,
+ rDoc.GetDfltTextFormatColl() );
}
if( pColl )
- pColl->SetFmtAttr( SwRegisterItem ( true ));
- rPageDesc.SetRegisterFmtColl( pColl );
+ pColl->SetFormatAttr( SwRegisterItem ( true ));
+ rPageDesc.SetRegisterFormatColl( pColl );
}
}
}
void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
{
- const SwFrmFmt& rMaster = rPageDesc.GetMaster();
+ const SwFrameFormat& rMaster = rPageDesc.GetMaster();
// Page data
SvxPageItem aPageItem(SID_ATTR_PAGE);
@@ -477,9 +477,9 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
// Header
if(rMaster.GetHeader().IsActive())
{
- const SwFmtHeader &rHeaderFmt = rMaster.GetHeader();
- const SwFrmFmt *pHeaderFmt = rHeaderFmt.GetHeaderFmt();
- OSL_ENSURE(pHeaderFmt != 0, "no header format");
+ const SwFormatHeader &rHeaderFormat = rMaster.GetHeader();
+ const SwFrameFormat *pHeaderFormat = rHeaderFormat.GetHeaderFormat();
+ OSL_ENSURE(pHeaderFormat != 0, "no header format");
// HeaderInfo, margins, background, border
SfxItemSet aHeaderSet(*rSet.GetPool(),
@@ -495,13 +495,13 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
0, 0);
//UUUU set correct parent to get the XFILL_NONE FillStyle as needed
- aHeaderSet.SetParent(&rMaster.GetDoc()->GetDfltFrmFmt()->GetAttrSet());
+ aHeaderSet.SetParent(&rMaster.GetDoc()->GetDfltFrameFormat()->GetAttrSet());
// Dynamic or fixed height
SfxBoolItem aOn(SID_ATTR_PAGE_ON, true);
aHeaderSet.Put(aOn);
- const SwFmtFrmSize &rFrmSize = pHeaderFmt->GetFrmSize();
+ const SwFormatFrmSize &rFrmSize = pHeaderFormat->GetFrmSize();
const SwFrmSize eSizeType = rFrmSize.GetHeightSizeType();
SfxBoolItem aDynamic(SID_ATTR_PAGE_DYNAMIC, eSizeType != ATT_FIX_SIZE);
aHeaderSet.Put(aDynamic);
@@ -517,7 +517,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
aHeaderSet.Put(aSize);
// Shifting frame attributes
- aHeaderSet.Put(pHeaderFmt->GetAttrSet());
+ aHeaderSet.Put(pHeaderFormat->GetAttrSet());
aHeaderSet.Put( aBoxInfo );
// Create SetItem
@@ -528,9 +528,9 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
// Footer
if(rMaster.GetFooter().IsActive())
{
- const SwFmtFooter &rFooterFmt = rMaster.GetFooter();
- const SwFrmFmt *pFooterFmt = rFooterFmt.GetFooterFmt();
- OSL_ENSURE(pFooterFmt != 0, "no footer format");
+ const SwFormatFooter &rFooterFormat = rMaster.GetFooter();
+ const SwFrameFormat *pFooterFormat = rFooterFormat.GetFooterFormat();
+ OSL_ENSURE(pFooterFormat != 0, "no footer format");
// FooterInfo, margins, background, border
SfxItemSet aFooterSet(*rSet.GetPool(),
@@ -546,13 +546,13 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
0, 0);
//UUUU set correct parent to get the XFILL_NONE FillStyle as needed
- aFooterSet.SetParent(&rMaster.GetDoc()->GetDfltFrmFmt()->GetAttrSet());
+ aFooterSet.SetParent(&rMaster.GetDoc()->GetDfltFrameFormat()->GetAttrSet());
// Dynamic or fixed height
SfxBoolItem aOn(SID_ATTR_PAGE_ON, true);
aFooterSet.Put(aOn);
- const SwFmtFrmSize &rFrmSize = pFooterFmt->GetFrmSize();
+ const SwFormatFrmSize &rFrmSize = pFooterFormat->GetFrmSize();
const SwFrmSize eSizeType = rFrmSize.GetHeightSizeType();
SfxBoolItem aDynamic(SID_ATTR_PAGE_DYNAMIC, eSizeType != ATT_FIX_SIZE);
aFooterSet.Put(aDynamic);
@@ -568,7 +568,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
aFooterSet.Put(aSize);
// Shifting Frame attributes
- aFooterSet.Put(pFooterFmt->GetAttrSet());
+ aFooterSet.Put(pFooterFormat->GetAttrSet());
aFooterSet.Put( aBoxInfo );
// Create SetItem
@@ -577,12 +577,12 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
}
// Integrate footnotes
- SwPageFtnInfo& rInfo = (SwPageFtnInfo&)rPageDesc.GetFtnInfo();
- SwPageFtnInfoItem aFtnItem(FN_PARAM_FTN_INFO, rInfo);
- rSet.Put(aFtnItem);
+ SwPageFootnoteInfo& rInfo = (SwPageFootnoteInfo&)rPageDesc.GetFootnoteInfo();
+ SwPageFootnoteInfoItem aFootnoteItem(FN_PARAM_FTN_INFO, rInfo);
+ rSet.Put(aFootnoteItem);
// Register compliant
- const SwTxtFmtColl* pCol = rPageDesc.GetRegisterFmtColl();
+ const SwTextFormatColl* pCol = rPageDesc.GetRegisterFormatColl();
SwRegisterItem aReg(pCol != 0);
aReg.SetWhich(SID_SWREGISTER_MODE);
rSet.Put(aReg);
@@ -614,7 +614,7 @@ SwTwips GetTabDist(const SvxTabStopItem& rTabs)
void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
- SwFmtPageDesc aPgDesc;
+ SwFormatPageDesc aPgDesc;
bool bChanged = false;
// Page number
@@ -644,9 +644,9 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet )
rShell.GetCurAttr( aCoreSet );
if(SfxItemState::SET == aCoreSet.GetItemState( RES_PAGEDESC, true, &pItem ) )
{
- if( static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc() )
+ if( static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc() )
{
- aPgDesc.RegisterToPageDesc( *const_cast<SwFmtPageDesc*>(static_cast<const SwFmtPageDesc*>(pItem))->GetPageDesc() );
+ aPgDesc.RegisterToPageDesc( *const_cast<SwFormatPageDesc*>(static_cast<const SwFormatPageDesc*>(pItem))->GetPageDesc() );
}
}
}
@@ -666,10 +666,10 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet )
{
case SfxItemState::SET:
{
- if( static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc() )
+ if( static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc() )
{
- aName = static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc()->GetName();
- oNumOffset = static_cast<const SwFmtPageDesc*>(pItem)->GetNumOffset();
+ aName = static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc()->GetName();
+ oNumOffset = static_cast<const SwFormatPageDesc*>(pItem)->GetNumOffset();
}
rCoreSet.ClearItem( RES_PAGEDESC );
// Page number
@@ -742,13 +742,13 @@ void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bo
pBase = pPool->Next();
}
// non-pool styles
- const SwCharFmts* pFmts = pDoc->GetCharFmts();
- for(size_t i = 0; i < pFmts->size(); ++i)
+ const SwCharFormats* pFormats = pDoc->GetCharFormats();
+ for(size_t i = 0; i < pFormats->size(); ++i)
{
- const SwCharFmt* pFmt = (*pFmts)[i];
- if(pFmt->IsDefault())
+ const SwCharFormat* pFormat = (*pFormats)[i];
+ if(pFormat->IsDefault())
continue;
- const OUString& rName = pFmt->GetName();
+ const OUString& rName = pFormat->GetName();
if(rToFill.GetEntryPos(rName) == LISTBOX_ENTRY_NOTFOUND)
{
const sal_Int32 nPos = bSorted
@@ -760,12 +760,12 @@ void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bo
}
};
-SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent,
+SwTwips GetTableWidth( SwFrameFormat* pFormat, SwTabCols& rCols, sal_uInt16 *pPercent,
SwWrtShell* pSh )
{
// To get the width is slightly more complicated.
SwTwips nWidth = 0;
- const sal_Int16 eOri = pFmt->GetHoriOrient().GetHoriOrient();
+ const sal_Int16 eOri = pFormat->GetHoriOrient().GetHoriOrient();
switch(eOri)
{
case text::HoriOrientation::FULL: nWidth = rCols.GetRight(); break;
@@ -773,13 +773,13 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent,
case text::HoriOrientation::LEFT:
case text::HoriOrientation::RIGHT:
case text::HoriOrientation::CENTER:
- nWidth = pFmt->GetFrmSize().GetWidth();
+ nWidth = pFormat->GetFrmSize().GetWidth();
break;
default:
{
if(pSh)
{
- if ( 0 == pSh->GetFlyFrmFmt() )
+ if ( 0 == pSh->GetFlyFrameFormat() )
{
nWidth = pSh->GetAnyCurRect(RECT_PAGE_PRT).Width();
}
@@ -792,12 +792,12 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent,
{
OSL_FAIL("where to get the actual width from?");
}
- const SvxLRSpaceItem& rLRSpace = pFmt->GetLRSpace();
+ const SvxLRSpaceItem& rLRSpace = pFormat->GetLRSpace();
nWidth -= (rLRSpace.GetRight() + rLRSpace.GetLeft());
}
}
if (pPercent)
- *pPercent = pFmt->GetFrmSize().GetWidthPercent();
+ *pPercent = pFormat->GetFrmSize().GetWidthPercent();
return nWidth;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 06:36:21 +0000