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/pagepreviewlayout.cxx60
-rw-r--r--sw/source/core/view/vdraw.cxx10
-rw-r--r--sw/source/core/view/viewimp.cxx92
-rw-r--r--sw/source/core/view/viewpg.cxx20
-rw-r--r--sw/source/core/view/viewsh.cxx170
-rw-r--r--sw/source/core/view/vnew.cxx28
-rw-r--r--sw/source/core/view/vprint.cxx72
-rw-r--r--sw/source/core/view/vprint.hxx2
8 files changed, 227 insertions, 227 deletions
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index 37cf0b5f4add..05519c54f4a6 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -44,11 +44,11 @@
// methods to initialize page preview layout
SwPagePreviewLayout::SwPagePreviewLayout( SwViewShell& _rParentViewShell,
- const SwRootFrm& _rLayoutRootFrm )
+ const SwRootFrame& _rLayoutRootFrame )
: mnXFree ( 4*142 ),
mnYFree ( 4*142 ),
mrParentViewShell( _rParentViewShell ),
- mrLayoutRootFrm ( _rLayoutRootFrm )
+ mrLayoutRootFrame ( _rLayoutRootFrame )
{
_Clear();
@@ -125,23 +125,23 @@ void SwPagePreviewLayout::_CalcPreviewLayoutSizes()
vcl::RenderContext* pRenderContext = mrParentViewShell.GetOut();
// calculate maximal page size; calculate also number of pages
- const SwPageFrm* pPage = static_cast<const SwPageFrm*>(mrLayoutRootFrm.Lower());
+ const SwPageFrame* pPage = static_cast<const SwPageFrame*>(mrLayoutRootFrame.Lower());
while ( pPage )
{
if ( !mbBookPreview && !mbPrintEmptyPages && pPage->IsEmptyPage() )
{
- pPage = static_cast<const SwPageFrm*>(pPage->GetNext());
+ pPage = static_cast<const SwPageFrame*>(pPage->GetNext());
continue;
}
++mnPages;
pPage->Calc(pRenderContext);
- const Size& rPageSize = pPage->Frm().SSize();
+ const Size& rPageSize = pPage->Frame().SSize();
if ( rPageSize.Width() > maMaxPageSize.Width() )
maMaxPageSize.Width() = rPageSize.Width();
if ( rPageSize.Height() > maMaxPageSize.Height() )
maMaxPageSize.Height() = rPageSize.Height();
- pPage = static_cast<const SwPageFrm*>(pPage->GetNext());
+ pPage = static_cast<const SwPageFrame*>(pPage->GetNext());
}
// calculate and set column width and row height
mnColWidth = maMaxPageSize.Width() + mnXFree;
@@ -555,7 +555,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
return;
// determine start page frame
- const SwPageFrm* pStartPage = mrLayoutRootFrm.GetPageByPageNum( mnPaintPhyStartPageNum );
+ const SwPageFrame* pStartPage = mrLayoutRootFrame.GetPageByPageNum( mnPaintPhyStartPageNum );
// calculate initial paint offset
Point aInitialPaintOffset;
@@ -575,7 +575,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
aInitialPaintOffset += maAdditionalPaintOffset;
// prepare loop data
- const SwPageFrm* pPage = pStartPage;
+ const SwPageFrame* pPage = pStartPage;
sal_uInt16 nCurrCol = mnPaintStartCol;
sal_uInt16 nConsideredRows = 0;
Point aCurrPaintOffset = aInitialPaintOffset;
@@ -587,7 +587,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
{
if ( !mbBookPreview && !mbPrintEmptyPages && pPage->IsEmptyPage() )
{
- pPage = static_cast<const SwPageFrm*>(pPage->GetNext());
+ pPage = static_cast<const SwPageFrame*>(pPage->GetNext());
continue;
}
@@ -604,7 +604,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
pPreviewPage->bVisible = false;
maPreviewPages.push_back( pPreviewPage );
// continue with next page and next column
- pPage = static_cast<const SwPageFrm*>(pPage->GetNext());
+ pPage = static_cast<const SwPageFrame*>(pPage->GetNext());
++nCurrCol;
continue;
}
@@ -641,7 +641,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
}
// prepare data for next loop
- pPage = static_cast<const SwPageFrm*>(pPage->GetNext());
+ pPage = static_cast<const SwPageFrame*>(pPage->GetNext());
/// check whether RTL interface or not
if(!AllSettings::GetLayoutRTL())
@@ -662,7 +662,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
OD 13.12.2002 #103492#
*/
-bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrm& _rPage,
+bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrame& _rPage,
const Point& _rPreviewOffset,
PreviewPage* _opPreviewPage )
{
@@ -672,12 +672,12 @@ bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrm& _rPage,
if ( _rPage.IsEmptyPage() )
{
if ( _rPage.GetPhyPageNum() % 2 == 0 )
- _opPreviewPage->aPageSize = _rPage.GetPrev()->Frm().SSize();
+ _opPreviewPage->aPageSize = _rPage.GetPrev()->Frame().SSize();
else
- _opPreviewPage->aPageSize = _rPage.GetNext()->Frm().SSize();
+ _opPreviewPage->aPageSize = _rPage.GetNext()->Frame().SSize();
}
else
- _opPreviewPage->aPageSize = _rPage.Frm().SSize();
+ _opPreviewPage->aPageSize = _rPage.Frame().SSize();
// position of page in preview window
Point aPreviewWinOffset( _rPreviewOffset );
if ( _opPreviewPage->aPageSize.Width() < maMaxPageSize.Width() )
@@ -693,7 +693,7 @@ bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrm& _rPage,
}
else
{
- _opPreviewPage->aLogicPos = _rPage.Frm().Pos();
+ _opPreviewPage->aLogicPos = _rPage.Frame().Pos();
_opPreviewPage->aMapOffset = _opPreviewPage->aPreviewWinPos - _opPreviewPage->aLogicPos;
}
@@ -1029,7 +1029,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan
}
// OD 17.11.2003 #i22014# - no paint, if <superfluous> flag is set at layout
- if (mrLayoutRootFrm.IsSuperfluous())
+ if (mrLayoutRootFrame.IsSuperfluous())
{
return true;
}
@@ -1050,7 +1050,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan
{
mrParentViewShell.Imp()->m_bFirstPageInvalid = false;
mrParentViewShell.Imp()->m_pFirstVisiblePage =
- const_cast<SwPageFrm*>(maPreviewPages[0]->pPage);
+ const_cast<SwPageFrame*>(maPreviewPages[0]->pPage);
}
// paint preview background
@@ -1077,7 +1077,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan
MapMode aMapMode( pOutputDev->GetMapMode() );
MapMode aSavedMapMode = aMapMode;
- const vcl::Font& rEmptyPgFont = SwPageFrm::GetEmptyPageFont();
+ const vcl::Font& rEmptyPgFont = SwPageFrame::GetEmptyPageFont();
for ( std::vector<PreviewPage*>::const_iterator aPageIter = maPreviewPages.begin();
aPageIter != maPreviewPages.end();
@@ -1116,7 +1116,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan
pOutputDev->SetFont( aOldFont );
// paint shadow and border for empty page
// OD 19.02.2003 #107369# - use new method to paint page border and shadow
- SwPageFrm::PaintBorderAndShadow( aPageRect, &mrParentViewShell, true, false, true );
+ SwPageFrame::PaintBorderAndShadow( aPageRect, &mrParentViewShell, true, false, true );
}
else
{
@@ -1128,11 +1128,11 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan
// paint page border and shadow
{
SwRect aPageBorderRect;
- SwPageFrm::GetBorderAndShadowBoundRect( SwRect( aPageRect ), &mrParentViewShell, &rRenderContext, aPageBorderRect,
+ SwPageFrame::GetBorderAndShadowBoundRect( SwRect( aPageRect ), &mrParentViewShell, &rRenderContext, aPageBorderRect,
(*aPageIter)->pPage->IsLeftShadowNeeded(), (*aPageIter)->pPage->IsRightShadowNeeded(), true );
const vcl::Region aDLRegion(aPageBorderRect.SVRect());
mrParentViewShell.DLPrePaint2(aDLRegion);
- SwPageFrm::PaintBorderAndShadow( aPageRect, &mrParentViewShell, true, false, true );
+ SwPageFrame::PaintBorderAndShadow( aPageRect, &mrParentViewShell, true, false, true );
mrParentViewShell.DLPostPaint2(true);
}
// <--
@@ -1160,7 +1160,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan
mrParentViewShell.Imp()->UpdateAccessiblePreview(
maPreviewPages,
aMapMode.GetScaleX(),
- mrLayoutRootFrm.GetPageByPageNum( mnSelectedPageNum ),
+ mrLayoutRootFrame.GetPageByPageNum( mnSelectedPageNum ),
maWinSize );
}
@@ -1199,7 +1199,7 @@ void SwPagePreviewLayout::Repaint( const Rectangle& rInvalidCoreRect ) const
{
mrParentViewShell.Imp()->m_bFirstPageInvalid = false;
mrParentViewShell.Imp()->m_pFirstVisiblePage =
- const_cast<SwPageFrm*>(maPreviewPages[0]->pPage);
+ const_cast<SwPageFrame*>(maPreviewPages[0]->pPage);
}
// invalidate visible pages, which overlap the invalid core rectangle
@@ -1253,7 +1253,7 @@ void SwPagePreviewLayout::_PaintSelectMarkAtPage(vcl::RenderContext& rRenderCont
SwRect aPageRect( _aSelectedPreviewPage->aLogicPos,
_aSelectedPreviewPage->aPageSize );
// OD 19.02.2003 #107369# - use aligned page rectangle, as it is used for
- // page border and shadow paint - see <SwPageFrm::PaintBorderAndShadow(..)>
+ // page border and shadow paint - see <SwPageFrame::PaintBorderAndShadow(..)>
::SwAlignRect( aPageRect, &mrParentViewShell, pOutputDev );
Rectangle aPxPageRect = pOutputDev->LogicToPixel( aPageRect.SVRect() );
@@ -1444,7 +1444,7 @@ sal_uInt16 SwPagePreviewLayout::ConvertAbsoluteToRelativePageNum( sal_uInt16 _nA
return _nAbsPageNum;
}
- const SwPageFrm* pTmpPage = static_cast<const SwPageFrm*>(mrLayoutRootFrm.Lower());
+ const SwPageFrame* pTmpPage = static_cast<const SwPageFrame*>(mrLayoutRootFrame.Lower());
sal_uInt16 nRet = 1;
@@ -1453,7 +1453,7 @@ sal_uInt16 SwPagePreviewLayout::ConvertAbsoluteToRelativePageNum( sal_uInt16 _nA
if ( !pTmpPage->IsEmptyPage() )
++nRet;
- pTmpPage = static_cast<const SwPageFrm*>( pTmpPage->GetNext() );
+ pTmpPage = static_cast<const SwPageFrame*>( pTmpPage->GetNext() );
}
return nRet;
@@ -1467,8 +1467,8 @@ sal_uInt16 SwPagePreviewLayout::ConvertRelativeToAbsolutePageNum( sal_uInt16 _nR
return _nRelPageNum;
}
- const SwPageFrm* pTmpPage = static_cast<const SwPageFrm*>(mrLayoutRootFrm.Lower());
- const SwPageFrm* pRet = nullptr;
+ const SwPageFrame* pTmpPage = static_cast<const SwPageFrame*>(mrLayoutRootFrame.Lower());
+ const SwPageFrame* pRet = nullptr;
sal_uInt16 i = 0;
while( pTmpPage && i != _nRelPageNum )
@@ -1477,7 +1477,7 @@ sal_uInt16 SwPagePreviewLayout::ConvertRelativeToAbsolutePageNum( sal_uInt16 _nR
++i;
pRet = pTmpPage;
- pTmpPage = static_cast<const SwPageFrm*>( pTmpPage->GetNext() );
+ pTmpPage = static_cast<const SwPageFrame*>( pTmpPage->GetNext() );
}
return pRet->GetPhyPageNum();
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 25f2b87efdd8..2f20aeb33dca 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -174,7 +174,7 @@ bool SwViewShellImp::IsDragPossible( const Point &rPoint )
aRect.Union( aTmp );
}
else
- aRect = GetShell()->GetLayout()->Frm();
+ aRect = GetShell()->GetLayout()->Frame();
aRect.Top( aRect.Top() - FUZZY_EDGE );
aRect.Bottom( aRect.Bottom() + FUZZY_EDGE );
@@ -220,9 +220,9 @@ void SwViewShellImp::NotifySizeChg( const Size &rNewSz )
if( !pCont || dynamic_cast<const SwDrawContact*>( pCont) == nullptr )
continue;
- const SwFrm *pAnchor = static_cast<const SwDrawContact*>(pCont)->GetAnchorFrm();
+ const SwFrame *pAnchor = static_cast<const SwDrawContact*>(pCont)->GetAnchorFrame();
if ( !pAnchor || pAnchor->IsInFly() || !pAnchor->IsValid() ||
- !pAnchor->GetUpper() || !pAnchor->FindPageFrm() ||
+ !pAnchor->GetUpper() || !pAnchor->FindPageFrame() ||
(FLY_AS_CHAR == pCont->GetFormat()->GetAnchor().GetAnchorId()) )
{
continue;
@@ -232,8 +232,8 @@ void SwViewShellImp::NotifySizeChg( const Size &rNewSz )
// Actually this should never happen but currently layouting
// is broken. So don't move anchors, if the page is invalid.
// This should be turned into an DBG_ASSERT, once layouting is fixed!
- const SwPageFrm *pPageFrm = pAnchor->FindPageFrm();
- if (!pPageFrm || pPageFrm->IsInvalid() ) {
+ const SwPageFrame *pPageFrame = pAnchor->FindPageFrame();
+ if (!pPageFrame || pPageFrame->IsInvalid() ) {
SAL_WARN( "sw.core", "Trying to move anchor from invalid page - fix layouting!" );
continue;
}
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 4d3206ea0427..d84ffa91d15d 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -45,15 +45,15 @@ void SwViewShellImp::Init( const SwViewOption *pNewOpt )
{
OSL_ENSURE( m_pDrawView, "SwViewShellImp::Init without DrawView" );
//Create PageView if it doesn't exist
- SwRootFrm *pRoot = m_pShell->GetLayout();
+ SwRootFrame *pRoot = m_pShell->GetLayout();
if ( !m_pSdrPageView )
{
IDocumentDrawModelAccess& rIDDMA = m_pShell->getIDocumentDrawModelAccess();
if ( !pRoot->GetDrawPage() )
pRoot->SetDrawPage( rIDDMA.GetDrawModel()->GetPage( 0 ) );
- if ( pRoot->GetDrawPage()->GetSize() != pRoot->Frm().SSize() )
- pRoot->GetDrawPage()->SetSize( pRoot->Frm().SSize() );
+ if ( pRoot->GetDrawPage()->GetSize() != pRoot->Frame().SSize() )
+ pRoot->GetDrawPage()->SetSize( pRoot->Frame().SSize() );
m_pSdrPageView = m_pDrawView->ShowSdrPage( pRoot->GetDrawPage());
// OD 26.06.2003 #108784# - notify drawing page view about invisible
@@ -73,8 +73,8 @@ void SwViewShellImp::Init( const SwViewOption *pNewOpt )
Fraction aSnGrWdtY(rSz.Height(), pNewOpt->GetDivisionY() + 1);
m_pDrawView->SetSnapGridWidth( aSnGrWdtX, aSnGrWdtY );
- if ( pRoot->Frm().HasArea() )
- m_pDrawView->SetWorkArea( pRoot->Frm().SVRect() );
+ if ( pRoot->Frame().HasArea() )
+ m_pDrawView->SetWorkArea( pRoot->Frame().SVRect() );
if ( GetShell()->IsPreview() )
m_pDrawView->SetAnimationEnabled( false );
@@ -138,7 +138,7 @@ bool SwViewShellImp::AddPaintRect( const SwRect &rRect )
{
// In case of normal rendering, this makes sure only visible rectangles are painted.
// Otherwise get the rectangle of the full document, so all paint rectangles are invalidated.
- const SwRect& rArea = m_pShell->isTiledRendering() ? m_pShell->GetLayout()->Frm() : m_pShell->VisArea();
+ const SwRect& rArea = m_pShell->isTiledRendering() ? m_pShell->GetLayout()->Frame() : m_pShell->VisArea();
m_pRegion = new SwRegionRects( rArea );
}
(*m_pRegion) -= rRect;
@@ -147,10 +147,10 @@ bool SwViewShellImp::AddPaintRect( const SwRect &rRect )
return false;
}
-void SwViewShellImp::CheckWaitCrsr()
+void SwViewShellImp::CheckWaitCursor()
{
if ( m_pLayAction )
- m_pLayAction->CheckWaitCrsr();
+ m_pLayAction->CheckWaitCursor();
}
bool SwViewShellImp::IsCalcLayoutProgress() const
@@ -170,36 +170,36 @@ bool SwViewShellImp::IsUpdateExpFields()
void SwViewShellImp::SetFirstVisPage(OutputDevice* pRenderContext)
{
- if ( m_pShell->mbDocSizeChgd && m_pShell->VisArea().Top() > m_pShell->GetLayout()->Frm().Height() )
+ if ( m_pShell->mbDocSizeChgd && m_pShell->VisArea().Top() > m_pShell->GetLayout()->Frame().Height() )
{
//We are in an action and because of erase actions the VisArea is
//after the first visible page.
//To avoid excessive formatting, hand back the last page.
- m_pFirstVisiblePage = static_cast<SwPageFrm*>(m_pShell->GetLayout()->Lower());
+ m_pFirstVisiblePage = static_cast<SwPageFrame*>(m_pShell->GetLayout()->Lower());
while ( m_pFirstVisiblePage && m_pFirstVisiblePage->GetNext() )
- m_pFirstVisiblePage = static_cast<SwPageFrm*>(m_pFirstVisiblePage->GetNext());
+ m_pFirstVisiblePage = static_cast<SwPageFrame*>(m_pFirstVisiblePage->GetNext());
}
else
{
const SwViewOption* pSwViewOption = GetShell()->GetViewOptions();
const bool bBookMode = pSwViewOption->IsViewLayoutBookMode();
- SwPageFrm *pPage = static_cast<SwPageFrm*>(m_pShell->GetLayout()->Lower());
+ SwPageFrame *pPage = static_cast<SwPageFrame*>(m_pShell->GetLayout()->Lower());
SwRect aPageRect = pPage->GetBoundRect(pRenderContext);
while ( pPage && !aPageRect.IsOver( m_pShell->VisArea() ) )
{
- pPage = static_cast<SwPageFrm*>(pPage->GetNext());
+ pPage = static_cast<SwPageFrame*>(pPage->GetNext());
if ( pPage )
{
aPageRect = pPage->GetBoundRect(pRenderContext);
if ( bBookMode && pPage->IsEmptyPage() )
{
- const SwPageFrm& rFormatPage = pPage->GetFormatPage();
+ const SwPageFrame& rFormatPage = pPage->GetFormatPage();
aPageRect.SSize() = rFormatPage.GetBoundRect(pRenderContext).SSize();
}
}
}
- m_pFirstVisiblePage = pPage ? pPage : static_cast<SwPageFrm*>(m_pShell->GetLayout()->Lower());
+ m_pFirstVisiblePage = pPage ? pPage : static_cast<SwPageFrame*>(m_pShell->GetLayout()->Lower());
}
m_bFirstPageInvalid = false;
}
@@ -268,14 +268,14 @@ Color SwViewShellImp::GetRetoucheColor() const
return aRet;
}
-SwPageFrm *SwViewShellImp::GetFirstVisPage(OutputDevice* pRenderContext)
+SwPageFrame *SwViewShellImp::GetFirstVisPage(OutputDevice* pRenderContext)
{
if ( m_bFirstPageInvalid )
SetFirstVisPage(pRenderContext);
return m_pFirstVisiblePage;
}
-const SwPageFrm *SwViewShellImp::GetFirstVisPage(OutputDevice* pRenderContext) const
+const SwPageFrame *SwViewShellImp::GetFirstVisPage(OutputDevice* pRenderContext) const
{
if ( m_bFirstPageInvalid )
const_cast<SwViewShellImp*>(this)->SetFirstVisPage(pRenderContext);
@@ -302,65 +302,65 @@ void SwViewShellImp::UpdateAccessible()
GetAccessibleMap().GetDocumentView();
}
-void SwViewShellImp::DisposeAccessible( const SwFrm *pFrm,
+void SwViewShellImp::DisposeAccessible( const SwFrame *pFrame,
const SdrObject *pObj,
bool bRecursive )
{
- OSL_ENSURE( !pFrm || pFrm->IsAccessibleFrm(), "frame is not accessible" );
+ OSL_ENSURE( !pFrame || pFrame->IsAccessibleFrame(), "frame is not accessible" );
for(SwViewShell& rTmp : GetShell()->GetRingContainer())
{
if( rTmp.Imp()->IsAccessible() )
- rTmp.Imp()->GetAccessibleMap().Dispose( pFrm, pObj, nullptr, bRecursive );
+ rTmp.Imp()->GetAccessibleMap().Dispose( pFrame, pObj, nullptr, bRecursive );
}
}
-void SwViewShellImp::MoveAccessible( const SwFrm *pFrm, const SdrObject *pObj,
- const SwRect& rOldFrm )
+void SwViewShellImp::MoveAccessible( const SwFrame *pFrame, const SdrObject *pObj,
+ const SwRect& rOldFrame )
{
- OSL_ENSURE( !pFrm || pFrm->IsAccessibleFrm(), "frame is not accessible" );
+ OSL_ENSURE( !pFrame || pFrame->IsAccessibleFrame(), "frame is not accessible" );
for(SwViewShell& rTmp : GetShell()->GetRingContainer())
{
if( rTmp.Imp()->IsAccessible() )
- rTmp.Imp()->GetAccessibleMap().InvalidatePosOrSize( pFrm, pObj, nullptr,
- rOldFrm );
+ rTmp.Imp()->GetAccessibleMap().InvalidatePosOrSize( pFrame, pObj, nullptr,
+ rOldFrame );
}
}
-void SwViewShellImp::InvalidateAccessibleFrmContent( const SwFrm *pFrm )
+void SwViewShellImp::InvalidateAccessibleFrameContent( const SwFrame *pFrame )
{
- OSL_ENSURE( pFrm->IsAccessibleFrm(), "frame is not accessible" );
+ OSL_ENSURE( pFrame->IsAccessibleFrame(), "frame is not accessible" );
for(SwViewShell& rTmp : GetShell()->GetRingContainer())
{
if( rTmp.Imp()->IsAccessible() )
- rTmp.Imp()->GetAccessibleMap().InvalidateContent( pFrm );
+ rTmp.Imp()->GetAccessibleMap().InvalidateContent( pFrame );
}
}
-void SwViewShellImp::InvalidateAccessibleCursorPosition( const SwFrm *pFrm )
+void SwViewShellImp::InvalidateAccessibleCursorPosition( const SwFrame *pFrame )
{
if( IsAccessible() )
- GetAccessibleMap().InvalidateCursorPosition( pFrm );
+ GetAccessibleMap().InvalidateCursorPosition( pFrame );
}
void SwViewShellImp::InvalidateAccessibleEditableState( bool bAllShells,
- const SwFrm *pFrm )
+ const SwFrame *pFrame )
{
if( bAllShells )
{
for(SwViewShell& rTmp : GetShell()->GetRingContainer())
{
if( rTmp.Imp()->IsAccessible() )
- rTmp.Imp()->GetAccessibleMap().InvalidateStates( AccessibleStates::EDITABLE, pFrm );
+ rTmp.Imp()->GetAccessibleMap().InvalidateStates( AccessibleStates::EDITABLE, pFrame );
}
}
else if( IsAccessible() )
{
- GetAccessibleMap().InvalidateStates( AccessibleStates::EDITABLE, pFrm );
+ GetAccessibleMap().InvalidateStates( AccessibleStates::EDITABLE, pFrame );
}
}
-void SwViewShellImp::InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster,
- const SwFlyFrm *pFollow )
+void SwViewShellImp::InvalidateAccessibleRelationSet( const SwFlyFrame *pMaster,
+ const SwFlyFrame *pFollow )
{
for(SwViewShell& rTmp : GetShell()->GetRingContainer())
{
@@ -371,10 +371,10 @@ void SwViewShellImp::InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster,
}
/// invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs
-void SwViewShellImp::_InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm,
- const SwTextFrm* _pToTextFrm )
+void SwViewShellImp::_InvalidateAccessibleParaFlowRelation( const SwTextFrame* _pFromTextFrame,
+ const SwTextFrame* _pToTextFrame )
{
- if ( !_pFromTextFrm && !_pToTextFrm )
+ if ( !_pFromTextFrame && !_pToTextFrame )
{
// No text frame provided. Thus, nothing to do.
return;
@@ -384,15 +384,15 @@ void SwViewShellImp::_InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pF
{
if ( rTmp.Imp()->IsAccessible() )
{
- if ( _pFromTextFrm )
+ if ( _pFromTextFrame )
{
rTmp.Imp()->GetAccessibleMap().
- InvalidateParaFlowRelation( *_pFromTextFrm, true );
+ InvalidateParaFlowRelation( *_pFromTextFrame, true );
}
- if ( _pToTextFrm )
+ if ( _pToTextFrame )
{
rTmp.Imp()->GetAccessibleMap().
- InvalidateParaFlowRelation( *_pToTextFrm, false );
+ InvalidateParaFlowRelation( *_pToTextFrame, false );
}
}
}
@@ -411,13 +411,13 @@ void SwViewShellImp::_InvalidateAccessibleParaTextSelection()
}
/// invalidate attributes for paragraphs
-void SwViewShellImp::_InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm )
+void SwViewShellImp::_InvalidateAccessibleParaAttrs( const SwTextFrame& rTextFrame )
{
for(SwViewShell& rTmp : GetShell()->GetRingContainer())
{
if ( rTmp.Imp()->IsAccessible() )
{
- rTmp.Imp()->GetAccessibleMap().InvalidateAttr( rTextFrm );
+ rTmp.Imp()->GetAccessibleMap().InvalidateAttr( rTextFrame );
}
}
}
@@ -425,12 +425,12 @@ void SwViewShellImp::_InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm )
// OD 15.01.2003 #103492# - method signature change due to new page preview functionality
void SwViewShellImp::UpdateAccessiblePreview( const std::vector<PreviewPage*>& _rPreviewPages,
const Fraction& _rScale,
- const SwPageFrm* _pSelectedPageFrm,
+ const SwPageFrame* _pSelectedPageFrame,
const Size& _rPreviewWinSize )
{
if( IsAccessible() )
GetAccessibleMap().UpdatePreview( _rPreviewPages, _rScale,
- _pSelectedPageFrm, _rPreviewWinSize );
+ _pSelectedPageFrame, _rPreviewWinSize );
}
void SwViewShellImp::InvalidateAccessiblePreviewSelection( sal_uInt16 nSelPage )
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 5ce9b9bae458..60a7cda9bcc8 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -113,8 +113,8 @@ void SwViewShell::PrintProspect(
SwTwips nMaxRowSz, nMaxColSz;
- const SwPageFrm *pStPage = nullptr;
- const SwPageFrm *pNxtPage = nullptr;
+ const SwPageFrame *pStPage = nullptr;
+ const SwPageFrame *pNxtPage = nullptr;
if (rPagesToPrint.first > 0)
{
pStPage = sw_getPage(*aShell.GetLayout(), rPagesToPrint.first);
@@ -132,13 +132,13 @@ void SwViewShell::PrintProspect(
if ( pStPage->IsEmptyPage() )
{
if ( pStPage->GetPhyPageNum() % 2 == 0 )
- aSttPageSize = pStPage->GetPrev()->Frm().SSize();
+ aSttPageSize = pStPage->GetPrev()->Frame().SSize();
else
- aSttPageSize = pStPage->GetNext()->Frm().SSize();
+ aSttPageSize = pStPage->GetNext()->Frame().SSize();
}
else
{
- aSttPageSize = pStPage->Frm().SSize();
+ aSttPageSize = pStPage->Frame().SSize();
}
}
Size aNxtPageSize;
@@ -147,13 +147,13 @@ void SwViewShell::PrintProspect(
if ( pNxtPage->IsEmptyPage() )
{
if ( pNxtPage->GetPhyPageNum() % 2 == 0 )
- aNxtPageSize = pNxtPage->GetPrev()->Frm().SSize();
+ aNxtPageSize = pNxtPage->GetPrev()->Frame().SSize();
else
- aNxtPageSize = pNxtPage->GetNext()->Frm().SSize();
+ aNxtPageSize = pNxtPage->GetNext()->Frame().SSize();
}
else
{
- aNxtPageSize = pNxtPage->Frm().SSize();
+ aNxtPageSize = pNxtPage->Frame().SSize();
}
}
@@ -206,13 +206,13 @@ void SwViewShell::PrintProspect(
if( pStPage )
{
aShell.Imp()->SetFirstVisPageInvalid();
- aShell.maVisArea = pStPage->Frm();
+ aShell.maVisArea = pStPage->Frame();
Point aPos( aSttPt );
aPos -= aShell.maVisArea.Pos();
aMapMode.SetOrigin( aPos );
pPrinter->SetMapMode( aMapMode );
- pStPage->GetUpper()->Paint( *pOutDev, pStPage->Frm() );
+ pStPage->GetUpper()->Paint( *pOutDev, pStPage->Frame() );
}
pStPage = pNxtPage;
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 229b7a551364..1b01d6e6d02c 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -327,14 +327,14 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
// else we get Paint errors!
// e.g. additional mode, page half visible vertically, in the
// middle a selection and with an other cursor jump to left
- // right border. Without ShowCrsr the selection disappears.
- bool bShowCrsr = pRegion && dynamic_cast<const SwCrsrShell*>(this) != nullptr;
- if( bShowCrsr )
- static_cast<SwCrsrShell*>(this)->HideCrsrs();
+ // right border. Without ShowCursor the selection disappears.
+ bool bShowCursor = pRegion && dynamic_cast<const SwCursorShell*>(this) != nullptr;
+ if( bShowCursor )
+ static_cast<SwCursorShell*>(this)->HideCursors();
if ( pRegion )
{
- SwRootFrm* pCurrentLayout = GetLayout();
+ SwRootFrame* pCurrentLayout = GetLayout();
Imp()->m_pRegion = nullptr;
@@ -441,8 +441,8 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
delete pRegion;
Imp()->DelRegion();
}
- if( bShowCrsr )
- static_cast<SwCrsrShell*>(this)->ShowCrsrs( true );
+ if( bShowCursor )
+ static_cast<SwCursorShell*>(this)->ShowCursors( true );
}
else
{
@@ -578,7 +578,7 @@ const SwRect& SwViewShell::VisArea() const
{
// when using the tiled rendering, consider the entire document as our
// visible area
- return isTiledRendering()? GetLayout()->Frm(): maVisArea;
+ return isTiledRendering()? GetLayout()->Frame(): maVisArea;
}
void SwViewShell::MakeVisible( const SwRect &rRect )
@@ -589,15 +589,15 @@ void SwViewShell::MakeVisible( const SwRect &rRect )
{
if( mpWin )
{
- const SwFrm* pRoot = GetLayout();
+ const SwFrame* pRoot = GetLayout();
int nLoopCnt = 3;
long nOldH;
do{
- nOldH = pRoot->Frm().Height();
+ nOldH = pRoot->Frame().Height();
StartAction();
ScrollMDI( this, rRect, USHRT_MAX, USHRT_MAX );
EndAction();
- } while( nOldH != pRoot->Frm().Height() && nLoopCnt-- );
+ } while( nOldH != pRoot->Frame().Height() && nLoopCnt-- );
}
#if OSL_DEBUG_LEVEL > 0
else
@@ -654,16 +654,16 @@ void SwViewShell::UpdateFields(bool bCloseDB)
{
SET_CURR_SHELL( this );
- bool bCrsr = dynamic_cast<const SwCrsrShell*>( this ) != nullptr;
- if ( bCrsr )
- static_cast<SwCrsrShell*>(this)->StartAction();
+ bool bCursor = dynamic_cast<const SwCursorShell*>( this ) != nullptr;
+ if ( bCursor )
+ static_cast<SwCursorShell*>(this)->StartAction();
else
StartAction();
GetDoc()->getIDocumentFieldsAccess().UpdateFields(nullptr, bCloseDB);
- if ( bCrsr )
- static_cast<SwCrsrShell*>(this)->EndAction();
+ if ( bCursor )
+ static_cast<SwCursorShell*>(this)->EndAction();
else
EndAction();
}
@@ -717,8 +717,8 @@ void SwViewShell::LayoutIdle()
{
//Prepare and recover cache, so that it will not get fouled.
- SwSaveSetLRUOfst aSave( *SwTextFrm::GetTextCache(),
- SwTextFrm::GetTextCache()->GetCurMax() - 50 );
+ SwSaveSetLRUOfst aSave( *SwTextFrame::GetTextCache(),
+ SwTextFrame::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!
@@ -731,14 +731,14 @@ void SwViewShell::LayoutIdle()
static void lcl_InvalidateAllContent( SwViewShell& rSh, sal_uInt8 nInv )
{
- bool bCrsr = dynamic_cast<const SwCrsrShell*>( &rSh) != nullptr;
- if ( bCrsr )
- static_cast<SwCrsrShell&>(rSh).StartAction();
+ bool bCursor = dynamic_cast<const SwCursorShell*>( &rSh) != nullptr;
+ if ( bCursor )
+ static_cast<SwCursorShell&>(rSh).StartAction();
else
rSh.StartAction();
rSh.GetLayout()->InvalidateAllContent( nInv );
- if ( bCrsr )
- static_cast<SwCrsrShell&>(rSh).EndAction();
+ if ( bCursor )
+ static_cast<SwCursorShell&>(rSh).EndAction();
else
rSh.EndAction();
@@ -751,16 +751,16 @@ static void lcl_InvalidateAllContent( SwViewShell& rSh, sal_uInt8 nInv )
*/
static void lcl_InvalidateAllObjPos( SwViewShell &_rSh )
{
- const bool bIsCrsrShell = dynamic_cast<const SwCrsrShell*>( &_rSh) != nullptr;
- if ( bIsCrsrShell )
- static_cast<SwCrsrShell&>(_rSh).StartAction();
+ const bool bIsCursorShell = dynamic_cast<const SwCursorShell*>( &_rSh) != nullptr;
+ if ( bIsCursorShell )
+ static_cast<SwCursorShell&>(_rSh).StartAction();
else
_rSh.StartAction();
_rSh.GetLayout()->InvalidateAllObjPos();
- if ( bIsCrsrShell )
- static_cast<SwCrsrShell&>(_rSh).EndAction();
+ if ( bIsCursorShell )
+ static_cast<SwCursorShell&>(_rSh).EndAction();
else
_rSh.EndAction();
@@ -951,8 +951,8 @@ void SwViewShell::CalcLayout()
SwWait aWait( *GetDoc()->GetDocShell(), true );
//prepare and recover cache, so that it will not get fouled.
- SwSaveSetLRUOfst aSaveLRU( *SwTextFrm::GetTextCache(),
- SwTextFrm::GetTextCache()->GetCurMax() - 50 );
+ SwSaveSetLRUOfst aSaveLRU( *SwTextFrame::GetTextCache(),
+ SwTextFrame::GetTextCache()->GetCurMax() - 50 );
//switch on Progress when none is running yet.
const bool bEndProgress = SfxProgress::GetActiveProgress( GetDoc()->GetDocShell() ) == nullptr;
@@ -1011,11 +1011,11 @@ void SwViewShell::SizeChgNotify()
{
mbDocSizeChgd = true;
- if ( !Imp()->IsCalcLayoutProgress() && dynamic_cast<const SwCrsrShell*>( this ) != nullptr )
+ if ( !Imp()->IsCalcLayoutProgress() && dynamic_cast<const SwCursorShell*>( this ) != nullptr )
{
- const SwFrm *pCnt = static_cast<SwCrsrShell*>(this)->GetCurrFrm( false );
- const SwPageFrm *pPage;
- if ( pCnt && nullptr != (pPage = pCnt->FindPageFrm()) )
+ const SwFrame *pCnt = static_cast<SwCursorShell*>(this)->GetCurrFrame( false );
+ const SwPageFrame *pPage;
+ if ( pCnt && nullptr != (pPage = pCnt->FindPageFrame()) )
{
const sal_uInt16 nVirtNum = pPage->GetVirtPageNum();
const SvxNumberType& rNum = pPage->GetPageDesc()->GetNumType();
@@ -1052,7 +1052,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
//First get the old visible page, so we don't have to look
//for it afterwards.
- const SwFrm *pOldPage = Imp()->GetFirstVisPage(GetWin());
+ const SwFrame *pOldPage = Imp()->GetFirstVisPage(GetWin());
const SwRect aPrevArea( VisArea() );
const bool bFull = aPrevArea.IsEmpty();
@@ -1061,7 +1061,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
//When there a PaintRegion still exists and the VisArea has changed,
//the PaintRegion is at least by now obsolete. The PaintRegion can
- //have been created by RootFrm::Paint.
+ //have been created by RootFrame::Paint.
if ( !mbInEndAction &&
Imp()->GetRegion() && Imp()->GetRegion()->GetOrigin() != VisArea() )
Imp()->DelRegion();
@@ -1086,9 +1086,9 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
// If possible, don't scroll the application background
// (PaintDesktop). Also limit the left and right side of
// the scroll range to the pages.
- const SwPageFrm *pPage = static_cast<SwPageFrm*>(GetLayout()->Lower());
- if ( pPage->Frm().Top() > pOldPage->Frm().Top() )
- pPage = static_cast<const SwPageFrm*>(pOldPage);
+ const SwPageFrame *pPage = static_cast<SwPageFrame*>(GetLayout()->Lower());
+ if ( pPage->Frame().Top() > pOldPage->Frame().Top() )
+ pPage = static_cast<const SwPageFrame*>(pOldPage);
SwRect aBoth( VisArea() );
aBoth.Union( aPrevArea );
const SwTwips nBottom = aBoth.Bottom();
@@ -1097,12 +1097,12 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
const bool bBookMode = GetViewOptions()->IsViewLayoutBookMode();
- while ( pPage && pPage->Frm().Top() <= nBottom )
+ while ( pPage && pPage->Frame().Top() <= nBottom )
{
SwRect aPageRect( pPage->GetBoundRect(GetWin()) );
if ( bBookMode )
{
- const SwPageFrm& rFormatPage = static_cast<const SwPageFrm*>(pPage)->GetFormatPage();
+ const SwPageFrame& rFormatPage = static_cast<const SwPageFrame*>(pPage)->GetFormatPage();
aPageRect.SSize() = rFormatPage.GetBoundRect(GetWin()).SSize();
}
@@ -1149,7 +1149,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
}
}
}
- pPage = static_cast<const SwPageFrm*>(pPage->GetNext());
+ pPage = static_cast<const SwPageFrame*>(pPage->GetNext());
}
Rectangle aRect( aPrevArea.SVRect() );
aRect.Left() = nMinLeft;
@@ -1455,13 +1455,13 @@ void SwViewShell::PaintDesktop(vcl::RenderContext& rRenderContext, const SwRect
//Unfortunately we must at any rate Paint the rectangles next to the pages,
//as these are not painted at VisPortChgd.
bool bBorderOnly = false;
- const SwRootFrm *pRoot = GetLayout();
- if ( rRect.Top() > pRoot->Frm().Bottom() )
+ const SwRootFrame *pRoot = GetLayout();
+ if ( rRect.Top() > pRoot->Frame().Bottom() )
{
- const SwFrm *pPg = pRoot->Lower();
+ const SwFrame *pPg = pRoot->Lower();
while ( pPg && pPg->GetNext() )
pPg = pPg->GetNext();
- if ( !pPg || !pPg->Frm().IsOver( VisArea() ) )
+ if ( !pPg || !pPg->Frame().IsOver( VisArea() ) )
bBorderOnly = true;
}
@@ -1477,14 +1477,14 @@ void SwViewShell::PaintDesktop(vcl::RenderContext& rRenderContext, const SwRect
if ( bBorderOnly )
{
- const SwFrm *pPage =pRoot->Lower();
+ const SwFrame *pPage =pRoot->Lower();
SwRect aLeft( rRect ), aRight( rRect );
while ( pPage )
{
- long nTmp = pPage->Frm().Left();
+ long nTmp = pPage->Frame().Left();
if ( nTmp < aLeft.Right() )
aLeft.Right( nTmp );
- nTmp = pPage->Frm().Right();
+ nTmp = pPage->Frame().Right();
if ( nTmp > aRight.Left() )
{
aRight.Left( nTmp + nSidebarWidth );
@@ -1499,20 +1499,20 @@ void SwViewShell::PaintDesktop(vcl::RenderContext& rRenderContext, const SwRect
}
else
{
- const SwFrm *pPage = Imp()->GetFirstVisPage(&rRenderContext);
+ const SwFrame *pPage = Imp()->GetFirstVisPage(&rRenderContext);
const SwTwips nBottom = rRect.Bottom();
while ( pPage && !aRegion.empty() &&
- (pPage->Frm().Top() <= nBottom) )
+ (pPage->Frame().Top() <= nBottom) )
{
- SwRect aPageRect( pPage->Frm() );
+ SwRect aPageRect( pPage->Frame() );
if ( bBookMode )
{
- const SwPageFrm& rFormatPage = static_cast<const SwPageFrm*>(pPage)->GetFormatPage();
- aPageRect.SSize() = rFormatPage.Frm().SSize();
+ const SwPageFrame& rFormatPage = static_cast<const SwPageFrame*>(pPage)->GetFormatPage();
+ aPageRect.SSize() = rFormatPage.Frame().SSize();
}
const bool bSidebarRight =
- static_cast<const SwPageFrm*>(pPage)->SidebarPosition() == sw::sidebarwindows::SidebarPosition::RIGHT;
+ static_cast<const SwPageFrame*>(pPage)->SidebarPosition() == sw::sidebarwindows::SidebarPosition::RIGHT;
aPageRect.Pos().X() -= bSidebarRight ? 0 : nSidebarWidth;
aPageRect.SSize().Width() += nSidebarWidth;
@@ -1583,16 +1583,16 @@ bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect )
if ( !GetWin() )
return false;
- const SwPageFrm *pPage = Imp()->GetFirstVisPage(GetOut());
+ const SwPageFrame *pPage = Imp()->GetFirstVisPage(GetOut());
const SwTwips nBottom = VisArea().Bottom();
const SwTwips nRight = VisArea().Right();
bool bRet = false;
- while ( !bRet && pPage && !((pPage->Frm().Top() > nBottom) ||
- (pPage->Frm().Left() > nRight)))
+ while ( !bRet && pPage && !((pPage->Frame().Top() > nBottom) ||
+ (pPage->Frame().Left() > nRight)))
{
if ( pPage->IsInvalid() || pPage->IsInvalidFly() )
bRet = true;
- pPage = static_cast<const SwPageFrm*>(pPage->GetNext());
+ pPage = static_cast<const SwPageFrame*>(pPage->GetNext());
}
if ( bRet )
@@ -1740,7 +1740,7 @@ void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRe
return;
}
- if ( SwRootFrm::IsInPaint() )
+ if ( SwRootFrame::IsInPaint() )
{
//During the publication of a page at printing the Paint is buffered.
SwPaintQueue::Add( this, SwRect( rRect ) );
@@ -1762,7 +1762,7 @@ void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRe
mbPaintInProgress = true;
SET_CURR_SHELL( this );
- SwRootFrm::SetNoVirDev( true );
+ SwRootFrame::SetNoVirDev( true );
//We don't want to Clip to and fro, we trust that all are limited
//to the rectangle and only need to calculate the clipping once.
@@ -1807,7 +1807,7 @@ void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRe
// <--
}
}
- SwRootFrm::SetNoVirDev( false );
+ SwRootFrame::SetNoVirDev( false );
mbPaintInProgress = false;
UISizeNotify();
}
@@ -1962,9 +1962,9 @@ void SwViewShell::InvalidateLayout( bool bSizeChanged )
// That leads to problems with Invalidate, e.g. when setting up an new View
// the content is inserted and formatted (regardless of empty VisArea).
// Therefore the pages must be roused for formatting.
- if( !GetLayout()->Frm().Height() )
+ if( !GetLayout()->Frame().Height() )
{
- SwFrm* pPage = GetLayout()->Lower();
+ SwFrame* pPage = GetLayout()->Lower();
while( pPage )
{
pPage->_InvalidateSize();
@@ -1976,7 +1976,7 @@ void SwViewShell::InvalidateLayout( bool bSizeChanged )
LockPaint();
StartAction();
- SwPageFrm *pPg = static_cast<SwPageFrm*>(GetLayout()->Lower());
+ SwPageFrame *pPg = static_cast<SwPageFrame*>(GetLayout()->Lower());
do
{ pPg->InvalidateSize();
pPg->_InvalidatePrt();
@@ -1986,26 +1986,26 @@ void SwViewShell::InvalidateLayout( bool bSizeChanged )
pPg->PrepareHeader();
pPg->PrepareFooter();
}
- pPg = static_cast<SwPageFrm*>(pPg->GetNext());
+ pPg = static_cast<SwPageFrame*>(pPg->GetNext());
} while ( pPg );
// When the size ratios in browse mode change,
// 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 layout or mode change, the ContentFrms need a size-Invalidate
+ // In case of layout or mode change, the ContentFrames need a size-Invalidate
// because of printer/screen formatting.
if ( bSizeChanged )
nInv |= INV_SIZE | INV_DIRECTION;
GetLayout()->InvalidateAllContent( nInv );
- SwFrm::CheckPageDescs( static_cast<SwPageFrm*>(GetLayout()->Lower()) );
+ SwFrame::CheckPageDescs( static_cast<SwPageFrame*>(GetLayout()->Lower()) );
EndAction();
UnlockPaint();
}
-SwRootFrm *SwViewShell::GetLayout() const
+SwRootFrame *SwViewShell::GetLayout() const
{
return mpLayout.get();
}
@@ -2037,9 +2037,9 @@ void SwViewShell::DrawSelChanged()
Size SwViewShell::GetDocSize() const
{
Size aSz;
- const SwRootFrm* pRoot = GetLayout();
+ const SwRootFrame* pRoot = GetLayout();
if( pRoot )
- aSz = pRoot->Frm().SSize();
+ aSz = pRoot->Frame().SSize();
return aSz;
}
@@ -2205,7 +2205,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
pMyWin->Invalidate();
if ( bReformat )
{
- // Nothing helps, we need to send all ContentFrms a
+ // Nothing helps, we need to send all ContentFrames a
// Prepare, we format anew:
StartAction();
Reformat();
@@ -2362,12 +2362,12 @@ void SwViewShell::InvalidateAccessibleFocus()
/**
* invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs #i27138#
*/
-void SwViewShell::InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm,
- const SwTextFrm* _pToTextFrm )
+void SwViewShell::InvalidateAccessibleParaFlowRelation( const SwTextFrame* _pFromTextFrame,
+ const SwTextFrame* _pToTextFrame )
{
if ( GetLayout() && GetLayout()->IsAnyShellAccessible() )
{
- Imp()->_InvalidateAccessibleParaFlowRelation( _pFromTextFrm, _pToTextFrm );
+ Imp()->_InvalidateAccessibleParaFlowRelation( _pFromTextFrame, _pToTextFrame );
}
}
@@ -2385,11 +2385,11 @@ void SwViewShell::InvalidateAccessibleParaTextSelection()
/**
* invalidate attributes for paragraphs #i88069#
*/
-void SwViewShell::InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm )
+void SwViewShell::InvalidateAccessibleParaAttrs( const SwTextFrame& rTextFrame )
{
if ( GetLayout() && GetLayout()->IsAnyShellAccessible() )
{
- Imp()->_InvalidateAccessibleParaAttrs( rTextFrm );
+ Imp()->_InvalidateAccessibleParaAttrs( rTextFrame );
}
}
@@ -2441,19 +2441,19 @@ sal_uInt16 SwViewShell::GetPageCount() const
const Size SwViewShell::GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const
{
Size aSize;
- const SwRootFrm* pTmpRoot = GetLayout();
+ const SwRootFrame* pTmpRoot = GetLayout();
if( pTmpRoot && nPageNum )
{
- const SwPageFrm* pPage = static_cast<const SwPageFrm*>
+ const SwPageFrame* pPage = static_cast<const SwPageFrame*>
(pTmpRoot->Lower());
while( --nPageNum && pPage->GetNext() )
- pPage = static_cast<const SwPageFrm*>( pPage->GetNext() );
+ pPage = static_cast<const SwPageFrame*>( pPage->GetNext() );
if( !bSkipEmptyPages && pPage->IsEmptyPage() && pPage->GetNext() )
- pPage = static_cast<const SwPageFrm*>( pPage->GetNext() );
+ pPage = static_cast<const SwPageFrame*>( pPage->GetNext() );
- aSize = pPage->Frm().SSize();
+ aSize = pPage->Frame().SSize();
}
return aSize;
}
@@ -2467,14 +2467,14 @@ sal_Int32 SwViewShell::GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const S
// #i40059# Position out of bounds:
SwRect aRect( rRect );
- aRect.Pos().X() = std::max( aRect.Left(), GetLayout()->Frm().Left() );
+ aRect.Pos().X() = std::max( aRect.Left(), GetLayout()->Frame().Left() );
- const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aRect.Center() );
+ const SwPageFrame* pPage = GetLayout()->GetPageAtPos( aRect.Center() );
if ( pPage )
{
OSL_ENSURE( pPage, "GetPageNumAndSetOffsetForPDF: No page found" );
- Point aOffset( pPage->Frm().Pos() );
+ Point aOffset( pPage->Frame().Pos() );
aOffset.X() = -aOffset.X();
aOffset.Y() = -aOffset.Y();
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 2b8300cdd742..b49ce2ca1575 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -125,9 +125,9 @@ void SwViewShell::Init( const SwViewOption *pNewOpt )
// end of "disable multiple layouts"
if( !mpLayout )
{
- // switched to two step construction because creating the layout in SwRootFrm needs a valid pLayout set
- mpLayout = SwRootFrmPtr(new SwRootFrm(mpDoc->GetDfltFrameFormat(), this),
- &SwFrm::DestroyFrm);
+ // switched to two step construction because creating the layout in SwRootFrame needs a valid pLayout set
+ mpLayout = SwRootFramePtr(new SwRootFrame(mpDoc->GetDfltFrameFormat(), this),
+ &SwFrame::DestroyFrame);
mpLayout->Init( mpDoc->GetDfltFrameFormat() );
}
}
@@ -216,8 +216,8 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window *pWindow,
}
// extend format cache.
- if ( SwTextFrm::GetTextCache()->GetCurMax() < 2550 )
- SwTextFrm::GetTextCache()->IncreaseMax( 100 );
+ if ( SwTextFrame::GetTextCache()->GetCurMax() < 2550 )
+ SwTextFrame::GetTextCache()->IncreaseMax( 100 );
if( mpOpt->IsGridVisible() || getIDocumentDrawModelAccess().GetDrawModel() )
Imp()->MakeDrawView();
@@ -291,8 +291,8 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window *pWindow,
}
// extend format cache.
- if ( SwTextFrm::GetTextCache()->GetCurMax() < 2550 )
- SwTextFrm::GetTextCache()->IncreaseMax( 100 );
+ if ( SwTextFrame::GetTextCache()->GetCurMax() < 2550 )
+ SwTextFrame::GetTextCache()->IncreaseMax( 100 );
if( mpOpt->IsGridVisible() || getIDocumentDrawModelAccess().GetDrawModel() )
Imp()->MakeDrawView();
@@ -324,11 +324,11 @@ SwViewShell::~SwViewShell()
{
if( pGNd->IsAnimated() )
{
- SwIterator<SwFrm,SwGrfNode> aIter( *pGNd );
- for( SwFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+ SwIterator<SwFrame,SwGrfNode> aIter( *pGNd );
+ for( SwFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next() )
{
- OSL_ENSURE( pFrm->IsNoTextFrm(), "GraphicNode with Text?" );
- static_cast<SwNoTextFrm*>(pFrm)->StopAnimation( mpOut );
+ OSL_ENSURE( pFrame->IsNoTextFrame(), "GraphicNode with Text?" );
+ static_cast<SwNoTextFrame*>(pFrame)->StopAnimation( mpOut );
}
}
}
@@ -339,7 +339,7 @@ SwViewShell::~SwViewShell()
}
delete mpImp; // Delete first, so that the LayoutViews are destroyed.
- mpImp = nullptr; // Set to zero, because ~SwFrm relies on it.
+ mpImp = nullptr; // Set to zero, because ~SwFrame relies on it.
if ( mpDoc )
{
@@ -352,8 +352,8 @@ SwViewShell::~SwViewShell()
delete mpOpt;
// resize format cache.
- if ( SwTextFrm::GetTextCache()->GetCurMax() > 250 )
- SwTextFrm::GetTextCache()->DecreaseMax( 100 );
+ if ( SwTextFrame::GetTextCache()->GetCurMax() > 250 )
+ SwTextFrame::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 4c0b4fd02b21..9945b48d2881 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -125,7 +125,7 @@ void SwPaintQueue::Add( SwViewShell *pNew, const SwRect &rNew )
void SwPaintQueue::Repaint()
{
- if (!SwRootFrm::IsInPaint() && s_pPaintQueue)
+ if (!SwRootFrame::IsInPaint() && s_pPaintQueue)
{
SwQueuedPaint *pPt = s_pPaintQueue;
do
@@ -240,7 +240,7 @@ void SwViewShell::ChgAllPageOrientation( Orientation eOri )
}
aNew.SetLandscape( bNewOri );
SwFrameFormat& rFormat = aNew.GetMaster();
- SwFormatFrmSize aSz( rFormat.GetFrmSize() );
+ SwFormatFrameSize aSz( rFormat.GetFrameSize() );
// adjust size
// PORTRAIT -> higher than wide
// LANDSCAPE -> wider than high
@@ -285,9 +285,9 @@ void SwViewShell::ChgAllPageSize( Size &rSz )
aSz.Width() = aTmp;
}
- SwFormatFrmSize aFrmSz( rPgFormat.GetFrmSize() );
- aFrmSz.SetSize( aSz );
- rPgFormat.SetFormatAttr( aFrmSz );
+ SwFormatFrameSize aFrameSz( rPgFormat.GetFrameSize() );
+ aFrameSz.SetSize( aSz );
+ rPgFormat.SetFormatAttr( aFrameSz );
pMyDoc->ChgPageDesc( i, aNew );
}
}
@@ -296,9 +296,9 @@ void SwViewShell::CalcPagesForPrint( sal_uInt16 nMax )
{
SET_CURR_SHELL( this );
- SwRootFrm* pMyLayout = GetLayout();
+ SwRootFrame* pMyLayout = GetLayout();
- const SwFrm *pPage = pMyLayout->Lower();
+ const SwFrame *pPage = pMyLayout->Lower();
SwLayAction aAction( pMyLayout, Imp() );
pMyLayout->StartAllAction();
@@ -306,7 +306,7 @@ void SwViewShell::CalcPagesForPrint( sal_uInt16 nMax )
{
pPage->Calc(GetOut());
SwRect aOldVis( VisArea() );
- maVisArea = pPage->Frm();
+ maVisArea = pPage->Frame();
Imp()->SetFirstVisPageInvalid();
aAction.Reset();
aAction.SetPaint( false );
@@ -346,47 +346,47 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
// the PrintDoc - will be replaced!
pPrtDoc->ReplaceStyles( *GetDoc() );
- SwShellCrsr *pActCrsr = pFESh->_GetCrsr();
- SwShellCrsr *pFirstCrsr = dynamic_cast<SwShellCrsr*>(pActCrsr->GetNext());
- if( !pActCrsr->HasMark() ) // with a multi-selection the current cursor might be empty
+ SwShellCursor *pActCursor = pFESh->_GetCursor();
+ SwShellCursor *pFirstCursor = dynamic_cast<SwShellCursor*>(pActCursor->GetNext());
+ if( !pActCursor->HasMark() ) // with a multi-selection the current cursor might be empty
{
- pActCrsr = dynamic_cast<SwShellCrsr*>(pActCrsr->GetPrev());
+ pActCursor = dynamic_cast<SwShellCursor*>(pActCursor->GetPrev());
}
// Y-position of the first selection
Point aSelPoint;
if( pFESh->IsTableMode() )
{
- SwShellTableCrsr* pShellTableCrsr = pFESh->GetTableCrsr();
+ SwShellTableCursor* pShellTableCursor = pFESh->GetTableCursor();
- const SwContentNode* pContentNode = pShellTableCrsr->GetNode().GetContentNode();
- const SwContentFrm *pContentFrm = pContentNode ? pContentNode->getLayoutFrm( GetLayout(), nullptr, pShellTableCrsr->Start() ) : nullptr;
- if( pContentFrm )
+ const SwContentNode* pContentNode = pShellTableCursor->GetNode().GetContentNode();
+ const SwContentFrame *pContentFrame = pContentNode ? pContentNode->getLayoutFrame( GetLayout(), nullptr, pShellTableCursor->Start() ) : nullptr;
+ if( pContentFrame )
{
SwRect aCharRect;
- SwCrsrMoveState aTmpState( MV_NONE );
- pContentFrm->GetCharRect( aCharRect, *pShellTableCrsr->Start(), &aTmpState );
+ SwCursorMoveState aTmpState( MV_NONE );
+ pContentFrame->GetCharRect( aCharRect, *pShellTableCursor->Start(), &aTmpState );
aSelPoint = Point( aCharRect.Left(), aCharRect.Top() );
}
}
- else if (pFirstCrsr)
+ else if (pFirstCursor)
{
- aSelPoint = pFirstCrsr->GetSttPos();
+ aSelPoint = pFirstCursor->GetSttPos();
}
- const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aSelPoint );
+ const SwPageFrame* pPage = GetLayout()->GetPageAtPos( aSelPoint );
OSL_ENSURE( pPage, "no page found!" );
// get page descriptor - fall back to the first one if pPage could not be found
const SwPageDesc* pPageDesc = pPage ? pPrtDoc->FindPageDesc(
pPage->GetPageDesc()->GetName() ) : &pPrtDoc->GetPageDesc( 0 );
- if( !pFESh->IsTableMode() && pActCrsr && pActCrsr->HasMark() )
+ if( !pFESh->IsTableMode() && pActCursor && pActCursor->HasMark() )
{ // Tweak paragraph attributes of last paragraph
SwNodeIndex aNodeIdx( *pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
SwTextNode* pTextNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx )->GetTextNode();
SwContentNode *pLastNd =
- pActCrsr->GetContentNode( (*pActCrsr->GetMark()) <= (*pActCrsr->GetPoint()) );
+ pActCursor->GetContentNode( (*pActCursor->GetMark()) <= (*pActCursor->GetPoint()) );
// copy the paragraph attributes of the first paragraph
if( pLastNd && pLastNd->IsTextNode() )
static_cast<SwTextNode*>(pLastNd)->CopyCollFormat( *pTextNd );
@@ -408,13 +408,13 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
else
{
pCNd->SetAttr( SwFormatPageDesc( pPageDesc ) );
- if( pFirstCrsr && pFirstCrsr->HasMark() )
+ if( pFirstCursor && pFirstCursor->HasMark() )
{
SwTextNode *pTextNd = pCNd->GetTextNode();
if( pTextNd )
{
SwContentNode *pFirstNd =
- pFirstCrsr->GetContentNode( (*pFirstCrsr->GetMark()) > (*pFirstCrsr->GetPoint()) );
+ pFirstCursor->GetContentNode( (*pFirstCursor->GetMark()) > (*pFirstCursor->GetPoint()) );
// copy paragraph attributes of the first paragraph
if( pFirstNd && pFirstNd->IsTextNode() )
static_cast<SwTextNode*>(pFirstNd)->CopyCollFormat( *pTextNd );
@@ -427,19 +427,19 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
// TODO: there is already a GetPageByPageNum, but it checks some physical page
// number; unsure if we want that here, should find out what that is...
-SwPageFrm const*
-sw_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage)
+SwPageFrame const*
+sw_getPage(SwRootFrame const& rLayout, sal_Int32 const nPage)
{
// yes this is O(n^2) but at least it does not crash...
- SwPageFrm const* pPage = dynamic_cast<const SwPageFrm*>(rLayout.Lower());
+ SwPageFrame const* pPage = dynamic_cast<const SwPageFrame*>(rLayout.Lower());
for (sal_Int32 i = nPage; pPage && (i > 0); --i)
{
if (1 == i) { // note: nPage is 1-based, i.e. 0 is invalid!
return pPage;
}
- pPage = dynamic_cast<SwPageFrm const*>(pPage->GetNext());
+ pPage = dynamic_cast<SwPageFrame const*>(pPage->GetNext());
}
- OSL_ENSURE(pPage, "ERROR: SwPageFrm expected");
+ OSL_ENSURE(pPage, "ERROR: SwPageFrame expected");
OSL_FAIL("non-existent page requested");
return nullptr;
}
@@ -518,7 +518,7 @@ bool SwViewShell::PrintOrPDFExport(
? rPrintData.GetRenderData().m_pPostItShell.get()// post-it page
: pShell; // a 'regular' page, not one from the post-it doc
- SwPageFrm const*const pStPage =
+ SwPageFrame const*const pStPage =
sw_getPage(*pViewSh2->GetLayout(), abs(nPage));
OSL_ENSURE( pStPage, "failed to get start page" );
if (!pStPage)
@@ -528,13 +528,13 @@ bool SwViewShell::PrintOrPDFExport(
//!! applying view options and formatting the document should now only be done in getRendererCount!
- ::SetSwVisArea( pViewSh2, pStPage->Frm() );
+ ::SetSwVisArea( pViewSh2, pStPage->Frame() );
pShell->InitPrt(pOutDev);
- ::SetSwVisArea( pViewSh2, pStPage->Frm() );
+ ::SetSwVisArea( pViewSh2, pStPage->Frame() );
- pStPage->GetUpper()->Paint( *pOutDev, pStPage->Frm(), &rPrintData );
+ pStPage->GetUpper()->Paint( *pOutDev, pStPage->Frame(), &rPrintData );
SwPaintQueue::Repaint();
@@ -557,7 +557,7 @@ bool SwViewShell::PrintOrPDFExport(
//Now scale the recorded page down so the notes
//will fit in the final page
double fScale = 0.75;
- long nOrigHeight = pStPage->Frm().Height();
+ long nOrigHeight = pStPage->Frame().Height();
long nNewHeight = nOrigHeight*fScale;
long nShiftY = (nOrigHeight-nNewHeight)/2;
pMetaFile->Scale( fScale, fScale );
@@ -610,7 +610,7 @@ void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintD
}
// CalcPagesForPrint() should not be necessary here. The pages in the
- // visible area will be formatted in SwRootFrm::Paint().
+ // visible area will be formatted in SwRootFrame::Paint().
// Removing this gives us a performance gain during saving the
// document because the thumbnail creation will not trigger a complete
// formatting of the document.
diff --git a/sw/source/core/view/vprint.hxx b/sw/source/core/view/vprint.hxx
index 38e1bd98f4bc..c2451acd4ae8 100644
--- a/sw/source/core/view/vprint.hxx
+++ b/sw/source/core/view/vprint.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_CORE_VIEW_VPRINT_HXX
#define INCLUDED_SW_SOURCE_CORE_VIEW_VPRINT_HXX
-SwPageFrm const* sw_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage);
+SwPageFrame const* sw_getPage(SwRootFrame const& rLayout, sal_Int32 const nPage);
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 00:10:35 +0000