summaryrefslogtreecommitdiff
path: root/sw/source/core/view
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/view')
-rw-r--r--sw/source/core/view/printdata.cxx2
-rw-r--r--sw/source/core/view/vdraw.cxx2
-rw-r--r--sw/source/core/view/viewimp.cxx22
-rw-r--r--sw/source/core/view/viewsh.cxx90
-rw-r--r--sw/source/core/view/vnew.cxx30
-rw-r--r--sw/source/core/view/vprint.cxx64
6 files changed, 105 insertions, 105 deletions
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 076e8933c039..73363ae8e46d 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -48,7 +48,7 @@ SwRenderData::~SwRenderData()
void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev )
{
DeletePostItData();
- m_pPostItFields.reset(new _SetGetExpFlds);
+ m_pPostItFields.reset(new _SetGetExpFields);
sw_GetPostIts( &pDoc->getIDocumentFieldsAccess(), m_pPostItFields.get() );
//!! Disable spell and grammar checking in the temporary document.
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 01cf7e6f77b5..5c160b84caa4 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -223,7 +223,7 @@ void SwViewShellImp::NotifySizeChg( const Size &rNewSz )
const SwFrm *pAnchor = static_cast<const SwDrawContact*>(pCont)->GetAnchorFrm();
if ( !pAnchor || pAnchor->IsInFly() || !pAnchor->IsValid() ||
!pAnchor->GetUpper() || !pAnchor->FindPageFrm() ||
- (FLY_AS_CHAR == pCont->GetFmt()->GetAnchor().GetAnchorId()) )
+ (FLY_AS_CHAR == pCont->GetFormat()->GetAnchor().GetAnchorId()) )
{
continue;
}
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index e759fcf0a0b4..6f9068a71562 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -159,11 +159,11 @@ bool SwViewShellImp::IsCalcLayoutProgress() const
return pLayAct && pLayAct->IsCalcLayout();
}
-bool SwViewShellImp::IsUpdateExpFlds()
+bool SwViewShellImp::IsUpdateExpFields()
{
if ( pLayAct && pLayAct->IsCalcLayout() )
{
- pLayAct->SetUpdateExpFlds();
+ pLayAct->SetUpdateExpFields();
return true;
}
return false;
@@ -359,10 +359,10 @@ void SwViewShellImp::InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster,
}
/// invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs
-void SwViewShellImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm,
- const SwTxtFrm* _pToTxtFrm )
+void SwViewShellImp::_InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm,
+ const SwTextFrm* _pToTextFrm )
{
- if ( !_pFromTxtFrm && !_pToTxtFrm )
+ if ( !_pFromTextFrm && !_pToTextFrm )
{
// No text frame provided. Thus, nothing to do.
return;
@@ -372,15 +372,15 @@ void SwViewShellImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFr
{
if ( rTmp.Imp()->IsAccessible() )
{
- if ( _pFromTxtFrm )
+ if ( _pFromTextFrm )
{
rTmp.Imp()->GetAccessibleMap().
- InvalidateParaFlowRelation( *_pFromTxtFrm, true );
+ InvalidateParaFlowRelation( *_pFromTextFrm, true );
}
- if ( _pToTxtFrm )
+ if ( _pToTextFrm )
{
rTmp.Imp()->GetAccessibleMap().
- InvalidateParaFlowRelation( *_pToTxtFrm, false );
+ InvalidateParaFlowRelation( *_pToTextFrm, false );
}
}
}
@@ -399,13 +399,13 @@ void SwViewShellImp::_InvalidateAccessibleParaTextSelection()
}
/// invalidate attributes for paragraphs
-void SwViewShellImp::_InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm )
+void SwViewShellImp::_InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm )
{
for(SwViewShell& rTmp : GetShell()->GetRingContainer())
{
if ( rTmp.Imp()->IsAccessible() )
{
- rTmp.Imp()->GetAccessibleMap().InvalidateAttr( rTxtFrm );
+ rTmp.Imp()->GetAccessibleMap().InvalidateAttr( rTextFrm );
}
}
}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index bedaee9f038b..37762b416e99 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -615,9 +615,9 @@ bool SwViewShell::IsDummyPage( sal_uInt16 nPageNum ) const
* Forces update of each field.
* It notifies all fields with pNewHt. If that is 0 (default), the field
* type is sent (???).
- * @param[in] bCloseDB Passed in to GetDoc()->UpdateFlds. [TODO] Purpose???
+ * @param[in] bCloseDB Passed in to GetDoc()->UpdateFields. [TODO] Purpose???
*/
-void SwViewShell::UpdateFlds(bool bCloseDB)
+void SwViewShell::UpdateFields(bool bCloseDB)
{
SET_CURR_SHELL( this );
@@ -627,7 +627,7 @@ void SwViewShell::UpdateFlds(bool bCloseDB)
else
StartAction();
- GetDoc()->getIDocumentFieldsAccess().UpdateFlds(0, bCloseDB);
+ GetDoc()->getIDocumentFieldsAccess().UpdateFields(0, bCloseDB);
if ( bCrsr )
static_cast<SwCrsrShell*>(this)->EndAction();
@@ -652,7 +652,7 @@ bool SwViewShell::HasCharts() const
{
++aIdx;
const SwOLENode *pNd = aIdx.GetNode().GetOLENode();
- if( pNd && !pNd->GetChartTblName().isEmpty() )
+ if( pNd && !pNd->GetChartTableName().isEmpty() )
{
bRet = true;
break;
@@ -684,8 +684,8 @@ void SwViewShell::LayoutIdle()
{
//Prepare and recover cache, so that it will not get fouled.
- SwSaveSetLRUOfst aSave( *SwTxtFrm::GetTxtCache(),
- SwTxtFrm::GetTxtCache()->GetCurMax() - 50 );
+ SwSaveSetLRUOfst aSave( *SwTextFrm::GetTextCache(),
+ SwTextFrm::GetTextCache()->GetCurMax() - 50 );
// #125243# there are lots of stacktraces indicating that Imp() returns NULL
// this SwViewShell seems to be invalid - but it's not clear why
// this return is only a workaround!
@@ -696,14 +696,14 @@ void SwViewShell::LayoutIdle()
}
}
-static void lcl_InvalidateAllCntnt( SwViewShell& rSh, sal_uInt8 nInv )
+static void lcl_InvalidateAllContent( SwViewShell& rSh, sal_uInt8 nInv )
{
bool bCrsr = rSh.ISA(SwCrsrShell);
if ( bCrsr )
static_cast<SwCrsrShell&>(rSh).StartAction();
else
rSh.StartAction();
- rSh.GetLayout()->InvalidateAllCntnt( nInv );
+ rSh.GetLayout()->InvalidateAllContent( nInv );
if ( bCrsr )
static_cast<SwCrsrShell&>(rSh).EndAction();
else
@@ -742,7 +742,7 @@ void SwViewShell::SetParaSpaceMax( bool bNew )
SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(DocumentSettingId::PARA_SPACE_MAX, bNew );
const sal_uInt8 nInv = INV_PRTAREA | INV_TABLE | INV_SECTION;
- lcl_InvalidateAllCntnt( *this, nInv );
+ lcl_InvalidateAllContent( *this, nInv );
}
}
@@ -754,7 +754,7 @@ void SwViewShell::SetParaSpaceMaxAtPages( bool bNew )
SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(DocumentSettingId::PARA_SPACE_MAX_AT_PAGES, bNew );
const sal_uInt8 nInv = INV_PRTAREA | INV_TABLE | INV_SECTION;
- lcl_InvalidateAllCntnt( *this, nInv );
+ lcl_InvalidateAllContent( *this, nInv );
}
}
@@ -766,7 +766,7 @@ void SwViewShell::SetTabCompat( bool bNew )
SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(DocumentSettingId::TAB_COMPAT, bNew );
const sal_uInt8 nInv = INV_PRTAREA | INV_SIZE | INV_TABLE | INV_SECTION;
- lcl_InvalidateAllCntnt( *this, nInv );
+ lcl_InvalidateAllContent( *this, nInv );
}
}
@@ -781,7 +781,7 @@ void SwViewShell::SetAddExtLeading( bool bNew )
if ( pTmpDrawModel )
pTmpDrawModel->SetAddExtLeading( bNew );
const sal_uInt8 nInv = INV_PRTAREA | INV_SIZE | INV_TABLE | INV_SECTION;
- lcl_InvalidateAllCntnt( *this, nInv );
+ lcl_InvalidateAllContent( *this, nInv );
}
}
@@ -809,7 +809,7 @@ void SwViewShell::SetAddParaSpacingToTableCells( bool _bAddParaSpacingToTableCel
SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS, _bAddParaSpacingToTableCells );
const sal_uInt8 nInv = INV_PRTAREA;
- lcl_InvalidateAllCntnt( *this, nInv );
+ lcl_InvalidateAllContent( *this, nInv );
}
}
@@ -826,7 +826,7 @@ void SwViewShell::SetUseFormerLineSpacing( bool _bUseFormerLineSpacing )
SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(DocumentSettingId::OLD_LINE_SPACING, _bUseFormerLineSpacing );
const sal_uInt8 nInv = INV_PRTAREA;
- lcl_InvalidateAllCntnt( *this, nInv );
+ lcl_InvalidateAllContent( *this, nInv );
}
}
@@ -866,7 +866,7 @@ void SwViewShell::SetUseFormerTextWrapping( bool _bUseFormerTextWrapping )
SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(DocumentSettingId::USE_FORMER_TEXT_WRAPPING, _bUseFormerTextWrapping );
const sal_uInt8 nInv = INV_PRTAREA | INV_SIZE | INV_TABLE | INV_SECTION;
- lcl_InvalidateAllCntnt( *this, nInv );
+ lcl_InvalidateAllContent( *this, nInv );
}
}
@@ -879,7 +879,7 @@ void SwViewShell::SetDoNotJustifyLinesWithManualBreak( bool _bDoNotJustifyLinesW
SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(DocumentSettingId::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, _bDoNotJustifyLinesWithManualBreak );
const sal_uInt8 nInv = INV_PRTAREA | INV_SIZE | INV_TABLE | INV_SECTION;
- lcl_InvalidateAllCntnt( *this, nInv );
+ lcl_InvalidateAllContent( *this, nInv );
}
}
@@ -896,7 +896,7 @@ void SwViewShell::Reformat()
{
StartAction();
- GetLayout()->InvalidateAllCntnt( INV_SIZE | INV_POS | INV_PRTAREA );
+ GetLayout()->InvalidateAllContent( INV_SIZE | INV_POS | INV_PRTAREA );
EndAction();
}
}
@@ -919,8 +919,8 @@ void SwViewShell::CalcLayout()
SwWait aWait( *GetDoc()->GetDocShell(), true );
//prepare and recover cache, so that it will not get fouled.
- SwSaveSetLRUOfst aSaveLRU( *SwTxtFrm::GetTxtCache(),
- SwTxtFrm::GetTxtCache()->GetCurMax() - 50 );
+ SwSaveSetLRUOfst aSaveLRU( *SwTextFrm::GetTextCache(),
+ SwTextFrm::GetTextCache()->GetCurMax() - 50 );
//switch on Progress when none is running yet.
const bool bEndProgress = SfxProgress::GetActiveProgress( GetDoc()->GetDocShell() ) == 0;
@@ -936,22 +936,22 @@ void SwViewShell::CalcLayout()
aAction.SetStatBar( true );
aAction.SetCalcLayout( true );
aAction.SetReschedule( true );
- GetDoc()->getIDocumentFieldsAccess().LockExpFlds();
+ GetDoc()->getIDocumentFieldsAccess().LockExpFields();
aAction.Action();
- GetDoc()->getIDocumentFieldsAccess().UnlockExpFlds();
+ GetDoc()->getIDocumentFieldsAccess().UnlockExpFields();
- //the SetNewFldLst() on the Doc was cut off and must be fetched again
+ //the SetNewFieldLst() on the Doc was cut off and must be fetched again
//(see flowfrm.cxx, txtfld.cxx)
- if ( aAction.IsExpFlds() )
+ if ( aAction.IsExpFields() )
{
aAction.Reset();
aAction.SetPaint( false );
aAction.SetStatBar( true );
aAction.SetReschedule( true );
- SwDocPosUpdate aMsgHnt( 0 );
- GetDoc()->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt );
- GetDoc()->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+ SwDocPosUpdate aMsgHint( 0 );
+ GetDoc()->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint );
+ GetDoc()->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
aAction.Action();
}
@@ -1910,14 +1910,14 @@ void SwViewShell::CheckBrowseView( bool bBrowseChgd )
} while ( pPg );
// When the size ratios in browse mode change,
- // the Position and PrtArea of the Cntnt and Tab frames must be Invalidated.
+ // the Position and PrtArea of the Content and Tab frames must be Invalidated.
sal_uInt8 nInv = INV_PRTAREA | INV_TABLE | INV_POS;
- // In case of browse mode change the CntntFrms need a size-Invalidate
+ // In case of browse mode change the ContentFrms need a size-Invalidate
// because of printer/screen formatting
if( bBrowseChgd )
nInv |= INV_SIZE | INV_DIRECTION;
- GetLayout()->InvalidateAllCntnt( nInv );
+ GetLayout()->InvalidateAllContent( nInv );
SwFrm::CheckPageDescs( static_cast<SwPageFrm*>(GetLayout()->Lower()) );
@@ -1986,7 +1986,7 @@ void SwViewShell::ApplyViewOptions( const SwViewOption &rOpt )
if(&rSh == this)
continue;
SwViewOption aOpt( *rSh.GetViewOptions() );
- aOpt.SetFldName( rOpt.IsFldName() );
+ aOpt.SetFieldName( rOpt.IsFieldName() );
aOpt.SetShowHiddenField( rOpt.IsShowHiddenField() );
aOpt.SetShowHiddenPara( rOpt.IsShowHiddenPara() );
aOpt.SetShowHiddenChar( rOpt.IsShowHiddenChar() );
@@ -2020,18 +2020,18 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
if( mpOpt->IsShowHiddenField() != rOpt.IsShowHiddenField() )
{
- static_cast<SwHiddenTxtFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENTXTFLD ))->
+ static_cast<SwHiddenTextFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENTXTFLD ))->
SetHiddenFlag( !rOpt.IsShowHiddenField() );
bReformat = true;
}
if ( mpOpt->IsShowHiddenPara() != rOpt.IsShowHiddenPara() )
{
- SwHiddenParaFieldType* pFldType = static_cast<SwHiddenParaFieldType*>(GetDoc()->
- getIDocumentFieldsAccess().GetSysFldType(RES_HIDDENPARAFLD));
- if( pFldType && pFldType->HasWriterListeners() )
+ SwHiddenParaFieldType* pFieldType = static_cast<SwHiddenParaFieldType*>(GetDoc()->
+ getIDocumentFieldsAccess().GetSysFieldType(RES_HIDDENPARAFLD));
+ if( pFieldType && pFieldType->HasWriterListeners() )
{
- SwMsgPoolItem aHnt( RES_HIDDENPARA_PRINT );
- pFldType->ModifyNotification( &aHnt, 0);
+ SwMsgPoolItem aHint( RES_HIDDENPARA_PRINT );
+ pFieldType->ModifyNotification( &aHint, 0);
}
bReformat = true;
}
@@ -2044,7 +2044,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
// - fieldnames apply or not ...
// ( - SwEndPortion must _no_ longer be generated. )
// - Of course, the screen is something completely different than the printer ...
- bReformat = bReformat || mpOpt->IsFldName() != rOpt.IsFldName();
+ bReformat = bReformat || mpOpt->IsFieldName() != rOpt.IsFieldName();
// The map mode is changed, minima/maxima will be attended by UI
if( mpOpt->GetZoom() != rOpt.GetZoom() && !IsPreview() )
@@ -2110,14 +2110,14 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
{
// #i44963# Good occasion to check if page sizes in
// page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
- mpDoc->CheckDefaultPageFmt();
+ mpDoc->CheckDefaultPageFormat();
CheckBrowseView( true );
}
pMyWin->Invalidate();
if ( bReformat )
{
- // Nothing helps, we need to send all CntntFrms a
+ // Nothing helps, we need to send all ContentFrms a
// Prepare, we format anew:
StartAction();
Reformat();
@@ -2162,7 +2162,7 @@ void SwViewShell::SetReadonlyOption(bool bSet)
// so that the flags can be queried properly.
mpOpt->SetReadonly( false );
- bool bReformat = mpOpt->IsFldName();
+ bool bReformat = mpOpt->IsFieldName();
mpOpt->SetReadonly( bSet );
@@ -2275,12 +2275,12 @@ void SwViewShell::InvalidateAccessibleFocus()
/**
* invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs #i27138#
*/
-void SwViewShell::InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm,
- const SwTxtFrm* _pToTxtFrm )
+void SwViewShell::InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm,
+ const SwTextFrm* _pToTextFrm )
{
if ( GetLayout() && GetLayout()->IsAnyShellAccessible() )
{
- Imp()->_InvalidateAccessibleParaFlowRelation( _pFromTxtFrm, _pToTxtFrm );
+ Imp()->_InvalidateAccessibleParaFlowRelation( _pFromTextFrm, _pToTextFrm );
}
}
@@ -2298,11 +2298,11 @@ void SwViewShell::InvalidateAccessibleParaTextSelection()
/**
* invalidate attributes for paragraphs #i88069#
*/
-void SwViewShell::InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm )
+void SwViewShell::InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm )
{
if ( GetLayout() && GetLayout()->IsAnyShellAccessible() )
{
- Imp()->_InvalidateAccessibleParaAttrs( rTxtFrm );
+ Imp()->_InvalidateAccessibleParaAttrs( rTextFrm );
}
}
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 03bd9c6405b1..1c436df90235 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -100,7 +100,7 @@ void SwViewShell::Init( const SwViewOption *pNewOpt )
// page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
if ( !bBrowseMode )
{
- mpDoc->CheckDefaultPageFmt();
+ mpDoc->CheckDefaultPageFormat();
}
// <--
@@ -126,9 +126,9 @@ void SwViewShell::Init( const SwViewOption *pNewOpt )
if( !mpLayout )
{
// switched to two step construction because creating the layout in SwRootFrm needs a valid pLayout set
- mpLayout = SwRootFrmPtr(new SwRootFrm(mpDoc->GetDfltFrmFmt(), this),
+ mpLayout = SwRootFrmPtr(new SwRootFrm(mpDoc->GetDfltFrameFormat(), this),
&SwFrm::DestroyFrm);
- mpLayout->Init( mpDoc->GetDfltFrmFmt() );
+ mpLayout->Init( mpDoc->GetDfltFrameFormat() );
}
}
SizeChgNotify();
@@ -200,10 +200,10 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window *pWindow,
SET_CURR_SHELL( this );
- static_cast<SwHiddenTxtFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENTXTFLD ))->
+ static_cast<SwHiddenTextFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENTXTFLD ))->
SetHiddenFlag( !mpOpt->IsShowHiddenField() );
- // In Init a standard FrmFmt is created.
+ // In Init a standard FrameFormat is created.
// --> OD 2005-02-11 #i38810#
if ( !mpDoc->GetIDocumentUndoRedo().IsUndoNoResetModified()
&& !bIsDocModified )
@@ -213,8 +213,8 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window *pWindow,
}
// extend format cache.
- if ( SwTxtFrm::GetTxtCache()->GetCurMax() < 2550 )
- SwTxtFrm::GetTxtCache()->IncreaseMax( 100 );
+ if ( SwTextFrm::GetTextCache()->GetCurMax() < 2550 )
+ SwTextFrm::GetTextCache()->IncreaseMax( 100 );
if( mpOpt->IsGridVisible() || getIDocumentDrawModelAccess()->GetDrawModel() )
Imp()->MakeDrawView();
@@ -274,18 +274,18 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window *pWindow,
if ( mbPreview )
mpImp->InitPagePreviewLayout();
- static_cast<SwHiddenTxtFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENTXTFLD ))->
+ static_cast<SwHiddenTextFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENTXTFLD ))->
SetHiddenFlag( !mpOpt->IsShowHiddenField() );
- // In Init a standard FrmFmt is created.
+ // In Init a standard FrameFormat is created.
if( !bModified && !mpDoc->GetIDocumentUndoRedo().IsUndoNoResetModified() )
{
mpDoc->getIDocumentState().ResetModified();
}
// extend format cache.
- if ( SwTxtFrm::GetTxtCache()->GetCurMax() < 2550 )
- SwTxtFrm::GetTxtCache()->IncreaseMax( 100 );
+ if ( SwTextFrm::GetTextCache()->GetCurMax() < 2550 )
+ SwTextFrm::GetTextCache()->IncreaseMax( 100 );
if( mpOpt->IsGridVisible() || getIDocumentDrawModelAccess()->GetDrawModel() )
Imp()->MakeDrawView();
@@ -320,8 +320,8 @@ SwViewShell::~SwViewShell()
SwIterator<SwFrm,SwGrfNode> aIter( *pGNd );
for( SwFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
{
- OSL_ENSURE( pFrm->IsNoTxtFrm(), "GraphicNode with Text?" );
- static_cast<SwNoTxtFrm*>(pFrm)->StopAnimation( mpOut );
+ OSL_ENSURE( pFrm->IsNoTextFrm(), "GraphicNode with Text?" );
+ static_cast<SwNoTextFrm*>(pFrm)->StopAnimation( mpOut );
}
}
}
@@ -345,8 +345,8 @@ SwViewShell::~SwViewShell()
delete mpOpt;
// resize format cache.
- if ( SwTxtFrm::GetTxtCache()->GetCurMax() > 250 )
- SwTxtFrm::GetTxtCache()->DecreaseMax( 100 );
+ if ( SwTextFrm::GetTextCache()->GetCurMax() > 250 )
+ SwTextFrm::GetTextCache()->DecreaseMax( 100 );
// Remove from PaintQueue if necessary
SwPaintQueue::Remove( this );
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 8362b1609f1b..5ea6e10cd807 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -238,8 +238,8 @@ void SwViewShell::ChgAllPageOrientation( Orientation eOri )
GetDoc()->CopyPageDesc(rOld, aNew);
}
aNew.SetLandscape( bNewOri );
- SwFrmFmt& rFmt = aNew.GetMaster();
- SwFmtFrmSize aSz( rFmt.GetFrmSize() );
+ SwFrameFormat& rFormat = aNew.GetMaster();
+ SwFormatFrmSize aSz( rFormat.GetFrmSize() );
// adjust size
// PORTRAIT -> higher than wide
// LANDSCAPE -> wider than high
@@ -250,7 +250,7 @@ void SwViewShell::ChgAllPageOrientation( Orientation eOri )
SwTwips aTmp = aSz.GetHeight();
aSz.SetHeight( aSz.GetWidth() );
aSz.SetWidth( aTmp );
- rFmt.SetFmtAttr( aSz );
+ rFormat.SetFormatAttr( aSz );
}
GetDoc()->ChgPageDesc( i, aNew );
}
@@ -273,7 +273,7 @@ void SwViewShell::ChgAllPageSize( Size &rSz )
::sw::UndoGuard const ug(GetDoc()->GetIDocumentUndoRedo());
GetDoc()->CopyPageDesc( rOld, aNew );
}
- SwFrmFmt& rPgFmt = aNew.GetMaster();
+ SwFrameFormat& rPgFormat = aNew.GetMaster();
Size aSz( rSz );
const bool bOri = aNew.GetLandscape();
if( bOri ? aSz.Height() > aSz.Width()
@@ -284,9 +284,9 @@ void SwViewShell::ChgAllPageSize( Size &rSz )
aSz.Width() = aTmp;
}
- SwFmtFrmSize aFrmSz( rPgFmt.GetFrmSize() );
+ SwFormatFrmSize aFrmSz( rPgFormat.GetFrmSize() );
aFrmSz.SetSize( aSz );
- rPgFmt.SetFmtAttr( aFrmSz );
+ rPgFormat.SetFormatAttr( aFrmSz );
pMyDoc->ChgPageDesc( i, aNew );
}
}
@@ -325,7 +325,7 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
{
OSL_ENSURE( this->IsA( TYPE(SwFEShell) ),"SwViewShell::Prt for FEShell only");
SwFEShell* pFESh = static_cast<SwFEShell*>(this);
- pPrtDoc->getIDocumentFieldsAccess().LockExpFlds();
+ pPrtDoc->getIDocumentFieldsAccess().LockExpFields();
// use given printer
//! Make a copy of it since it gets destroyed with the temporary document
@@ -356,15 +356,15 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
Point aSelPoint;
if( pFESh->IsTableMode() )
{
- SwShellTableCrsr* pShellTblCrsr = pFESh->GetTableCrsr();
+ SwShellTableCrsr* pShellTableCrsr = pFESh->GetTableCrsr();
- const SwCntntNode* pCntntNode = pShellTblCrsr->GetNode().GetCntntNode();
- const SwCntntFrm *pCntntFrm = pCntntNode ? pCntntNode->getLayoutFrm( GetLayout(), 0, pShellTblCrsr->Start() ) : 0;
- if( pCntntFrm )
+ const SwContentNode* pContentNode = pShellTableCrsr->GetNode().GetContentNode();
+ const SwContentFrm *pContentFrm = pContentNode ? pContentNode->getLayoutFrm( GetLayout(), 0, pShellTableCrsr->Start() ) : 0;
+ if( pContentFrm )
{
SwRect aCharRect;
SwCrsrMoveState aTmpState( MV_NONE );
- pCntntFrm->GetCharRect( aCharRect, *pShellTblCrsr->Start(), &aTmpState );
+ pContentFrm->GetCharRect( aCharRect, *pShellTableCrsr->Start(), &aTmpState );
aSelPoint = Point( aCharRect.Left(), aCharRect.Top() );
}
}
@@ -383,12 +383,12 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
if( !pFESh->IsTableMode() && pActCrsr && pActCrsr->HasMark() )
{ // Tweak paragraph attributes of last paragraph
SwNodeIndex aNodeIdx( *pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
- SwTxtNode* pTxtNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx )->GetTxtNode();
- SwCntntNode *pLastNd =
- pActCrsr->GetCntntNode( (*pActCrsr->GetMark()) <= (*pActCrsr->GetPoint()) );
+ SwTextNode* pTextNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx )->GetTextNode();
+ SwContentNode *pLastNd =
+ pActCrsr->GetContentNode( (*pActCrsr->GetMark()) <= (*pActCrsr->GetPoint()) );
// copy the paragraph attributes of the first paragraph
- if( pLastNd && pLastNd->IsTxtNode() )
- static_cast<SwTxtNode*>(pLastNd)->CopyCollFmt( *pTxtNd );
+ if( pLastNd && pLastNd->IsTextNode() )
+ static_cast<SwTextNode*>(pLastNd)->CopyCollFormat( *pTextNd );
}
// fill it with the selected content
@@ -397,26 +397,26 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
// set the page style at the first paragraph
{
SwNodeIndex aNodeIdx( *pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
- SwCntntNode* pCNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx ); // go to 1st ContentNode
+ SwContentNode* pCNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx ); // go to 1st ContentNode
if( pFESh->IsTableMode() )
{
SwTableNode* pTNd = pCNd->FindTableNode();
if( pTNd )
- pTNd->GetTable().GetFrmFmt()->SetFmtAttr( SwFmtPageDesc( pPageDesc ) );
+ pTNd->GetTable().GetFrameFormat()->SetFormatAttr( SwFormatPageDesc( pPageDesc ) );
}
else
{
- pCNd->SetAttr( SwFmtPageDesc( pPageDesc ) );
+ pCNd->SetAttr( SwFormatPageDesc( pPageDesc ) );
if( pFirstCrsr && pFirstCrsr->HasMark() )
{
- SwTxtNode *pTxtNd = pCNd->GetTxtNode();
- if( pTxtNd )
+ SwTextNode *pTextNd = pCNd->GetTextNode();
+ if( pTextNd )
{
- SwCntntNode *pFirstNd =
- pFirstCrsr->GetCntntNode( (*pFirstCrsr->GetMark()) > (*pFirstCrsr->GetPoint()) );
+ SwContentNode *pFirstNd =
+ pFirstCrsr->GetContentNode( (*pFirstCrsr->GetMark()) > (*pFirstCrsr->GetPoint()) );
// copy paragraph attributes of the first paragraph
- if( pFirstNd && pFirstNd->IsTxtNode() )
- static_cast<SwTxtNode*>(pFirstNd)->CopyCollFmt( *pTxtNd );
+ if( pFirstNd && pFirstNd->IsTextNode() )
+ static_cast<SwTextNode*>(pFirstNd)->CopyCollFormat( *pTextNd );
}
}
}
@@ -632,9 +632,9 @@ bool SwViewShell::IsAnyFieldInDoc() const
{
if( 0 != (pItem = mpDoc->GetAttrPool().GetItem2( RES_TXTATR_FIELD, n )))
{
- const SwFmtFld* pFmtFld = static_cast<const SwFmtFld*>(pItem);
- const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
- if( pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+ const SwFormatField* pFormatField = static_cast<const SwFormatField*>(pItem);
+ const SwTextField* pTextField = pFormatField->GetTextField();
+ if( pTextField && pTextField->GetTextNode().GetNodes().IsDocNodes() )
{
return true;
}
@@ -646,9 +646,9 @@ bool SwViewShell::IsAnyFieldInDoc() const
{
if( 0 != (pItem = mpDoc->GetAttrPool().GetItem2( RES_TXTATR_INPUTFIELD, n )))
{
- const SwFmtFld* pFmtFld = static_cast<const SwFmtFld*>(pItem);
- const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
- if( pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+ const SwFormatField* pFormatField = static_cast<const SwFormatField*>(pItem);
+ const SwTextField* pTextField = pFormatField->GetTextField();
+ if( pTextField && pTextField->GetTextNode().GetNodes().IsDocNodes() )
{
return true;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-02 15:04:49 +0000