summaryrefslogtreecommitdiff
path: root/sw/source/uibase/docvw
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/docvw')
-rw-r--r--sw/source/uibase/docvw/FrameControlsManager.cxx44
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx4
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx54
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx58
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx50
-rw-r--r--sw/source/uibase/docvw/SidebarWinAcc.cxx24
-rw-r--r--sw/source/uibase/docvw/SidebarWinAcc.hxx4
-rw-r--r--sw/source/uibase/docvw/edtdd.cxx28
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx584
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx14
-rw-r--r--sw/source/uibase/docvw/edtwin3.cxx4
-rw-r--r--sw/source/uibase/docvw/frmsidebarwincontainer.cxx80
-rw-r--r--sw/source/uibase/docvw/frmsidebarwincontainer.hxx22
13 files changed, 485 insertions, 485 deletions
diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx
index 3735ef9217eb..f63b96a9ad77 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -46,11 +46,11 @@ const SwFrameControlsManager& SwFrameControlsManager::operator=( const SwFrameCo
return *this;
}
-SwFrameControlPtr SwFrameControlsManager::GetControl( FrameControlType eType, const SwFrm* pFrm )
+SwFrameControlPtr SwFrameControlsManager::GetControl( FrameControlType eType, const SwFrame* pFrame )
{
SwFrameControlPtrMap& rControls = m_aControls[eType];
- SwFrameControlPtrMap::iterator aIt = rControls.find(pFrm);
+ SwFrameControlPtrMap::iterator aIt = rControls.find(pFrame);
if (aIt != rControls.end())
return aIt->second;
@@ -58,22 +58,22 @@ SwFrameControlPtr SwFrameControlsManager::GetControl( FrameControlType eType, co
return SwFrameControlPtr();
}
-void SwFrameControlsManager::RemoveControls( const SwFrm* pFrm )
+void SwFrameControlsManager::RemoveControls( const SwFrame* pFrame )
{
map< FrameControlType, SwFrameControlPtrMap >::iterator pIt = m_aControls.begin();
while ( pIt != m_aControls.end() )
{
SwFrameControlPtrMap& rMap = pIt->second;
- rMap.erase(pFrm);
+ rMap.erase(pFrame);
++pIt;
}
}
-void SwFrameControlsManager::RemoveControlsByType( FrameControlType eType, const SwFrm* pFrm )
+void SwFrameControlsManager::RemoveControlsByType( FrameControlType eType, const SwFrame* pFrame )
{
SwFrameControlPtrMap& rMap = m_aControls[eType];
- rMap.erase(pFrm);
+ rMap.erase(pFrame);
}
void SwFrameControlsManager::HideControls( FrameControlType eType )
@@ -102,7 +102,7 @@ void SwFrameControlsManager::SetReadonlyControls( bool bReadonly )
}
}
-void SwFrameControlsManager::SetHeaderFooterControl( const SwPageFrm* pPageFrm, FrameControlType eType, Point aOffset )
+void SwFrameControlsManager::SetHeaderFooterControl( const SwPageFrame* pPageFrame, FrameControlType eType, Point aOffset )
{
OSL_ASSERT( eType == Header || eType == Footer );
@@ -112,21 +112,21 @@ void SwFrameControlsManager::SetHeaderFooterControl( const SwPageFrm* pPageFrm,
SwFrameControlPtrMap& rControls = m_aControls[eType];
- SwFrameControlPtrMap::iterator lb = rControls.lower_bound(pPageFrm);
- if (lb != rControls.end() && !(rControls.key_comp()(pPageFrm, lb->first)))
+ SwFrameControlPtrMap::iterator lb = rControls.lower_bound(pPageFrame);
+ if (lb != rControls.end() && !(rControls.key_comp()(pPageFrame, lb->first)))
pControl = lb->second;
else
{
SwFrameControlPtr pNewControl(
new SwFrameControl( VclPtr<SwHeaderFooterWin>::Create(
- m_pEditWin, pPageFrm, bHeader ).get() ) );
+ m_pEditWin, pPageFrame, bHeader ).get() ) );
const SwViewOption* pViewOpt = m_pEditWin->GetView().GetWrtShell().GetViewOptions();
pNewControl->SetReadonly( pViewOpt->IsReadonly() );
- rControls.insert(lb, make_pair(pPageFrm, pNewControl));
+ rControls.insert(lb, make_pair(pPageFrame, pNewControl));
pControl.swap( pNewControl );
}
- Rectangle aPageRect = m_pEditWin->LogicToPixel( pPageFrm->Frm().SVRect() );
+ Rectangle aPageRect = m_pEditWin->LogicToPixel( pPageFrame->Frame().SVRect() );
SwHeaderFooterWin* pWin = dynamic_cast<SwHeaderFooterWin *>(pControl->GetWindow());
assert( pWin != nullptr) ;
@@ -137,24 +137,24 @@ void SwFrameControlsManager::SetHeaderFooterControl( const SwPageFrm* pPageFrm,
pControl->ShowAll( true );
}
-void SwFrameControlsManager::SetPageBreakControl( const SwPageFrm* pPageFrm )
+void SwFrameControlsManager::SetPageBreakControl( const SwPageFrame* pPageFrame )
{
// Check if we already have the control
SwFrameControlPtr pControl;
SwFrameControlPtrMap& rControls = m_aControls[PageBreak];
- SwFrameControlPtrMap::iterator lb = rControls.lower_bound(pPageFrm);
- if (lb != rControls.end() && !(rControls.key_comp()(pPageFrm, lb->first)))
+ SwFrameControlPtrMap::iterator lb = rControls.lower_bound(pPageFrame);
+ if (lb != rControls.end() && !(rControls.key_comp()(pPageFrame, lb->first)))
pControl = lb->second;
else
{
SwFrameControlPtr pNewControl( new SwFrameControl(
- VclPtr<SwPageBreakWin>::Create( m_pEditWin, pPageFrm ).get() ) );
+ VclPtr<SwPageBreakWin>::Create( m_pEditWin, pPageFrame ).get() ) );
const SwViewOption* pViewOpt = m_pEditWin->GetView().GetWrtShell().GetViewOptions();
pNewControl->SetReadonly( pViewOpt->IsReadonly() );
- rControls.insert(lb, make_pair(pPageFrm, pNewControl));
+ rControls.insert(lb, make_pair(pPageFrame, pNewControl));
pControl.swap( pNewControl );
}
@@ -166,22 +166,22 @@ void SwFrameControlsManager::SetPageBreakControl( const SwPageFrm* pPageFrm )
pControl->ShowAll( true );
}
-SwFrameMenuButtonBase::SwFrameMenuButtonBase( SwEditWin* pEditWin, const SwFrm* pFrm ) :
+SwFrameMenuButtonBase::SwFrameMenuButtonBase( SwEditWin* pEditWin, const SwFrame* pFrame ) :
MenuButton( pEditWin, WB_DIALOGCONTROL ),
m_pEditWin( pEditWin ),
- m_pFrm( pFrm )
+ m_pFrame( pFrame )
{
}
-const SwPageFrm* SwFrameMenuButtonBase::GetPageFrame()
+const SwPageFrame* SwFrameMenuButtonBase::GetPageFrame()
{
- return static_cast< const SwPageFrm * >( m_pFrm );
+ return static_cast< const SwPageFrame * >( m_pFrame );
}
void SwFrameMenuButtonBase::dispose()
{
m_pEditWin.clear();
- m_pFrm = nullptr;
+ m_pFrame = nullptr;
MenuButton::dispose();
}
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 2531c5d8ae5b..18b746b25977 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -124,8 +124,8 @@ namespace
}
}
-SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwFrm *pFrm, bool bHeader ) :
- SwFrameMenuButtonBase( pEditWin, pFrm ),
+SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwFrame *pFrame, bool bHeader ) :
+ SwFrameMenuButtonBase( pEditWin, pFrame ),
m_bIsHeader( bHeader ),
m_pPopupMenu( nullptr ),
m_pLine( nullptr ),
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index 7533bce6aa8a..7a74b1cfa914 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -91,8 +91,8 @@ namespace
}
}
-SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const SwFrm *pFrm ) :
- SwFrameMenuButtonBase( pEditWin, pFrm ),
+SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const SwFrame *pFrame ) :
+ SwFrameMenuButtonBase( pEditWin, pFrame ),
m_pPopupMenu( nullptr ),
m_pLine( nullptr ),
m_bIsAppearing( false ),
@@ -223,24 +223,24 @@ void SwPageBreakWin::Select( )
{
case FN_PAGEBREAK_EDIT:
{
- const SwLayoutFrm* pBodyFrm = static_cast< const SwLayoutFrm* >( GetPageFrame()->Lower() );
- while ( pBodyFrm && !pBodyFrm->IsBodyFrm() )
- pBodyFrm = static_cast< const SwLayoutFrm* >( pBodyFrm->GetNext() );
+ const SwLayoutFrame* pBodyFrame = static_cast< const SwLayoutFrame* >( GetPageFrame()->Lower() );
+ while ( pBodyFrame && !pBodyFrame->IsBodyFrame() )
+ pBodyFrame = static_cast< const SwLayoutFrame* >( pBodyFrame->GetNext() );
SwEditWin* pEditWin = GetEditWin();
- if ( pBodyFrm )
+ if ( pBodyFrame )
{
SwWrtShell& rSh = pEditWin->GetView().GetWrtShell();
bool bOldLock = rSh.IsViewLocked();
rSh.LockView( true );
- if ( pBodyFrm->Lower()->IsTabFrm() )
+ if ( pBodyFrame->Lower()->IsTabFrame() )
{
rSh.Push( );
rSh.ClearMark();
- SwContentFrm *pCnt = const_cast< SwContentFrm* >( pBodyFrm->ContainsContent() );
+ SwContentFrame *pCnt = const_cast< SwContentFrame* >( pBodyFrame->ContainsContent() );
SwContentNode* pNd = pCnt->GetNode();
rSh.SetSelection( *pNd );
@@ -252,7 +252,7 @@ void SwPageBreakWin::Select( )
}
else
{
- SwContentFrm *pCnt = const_cast< SwContentFrm* >( pBodyFrm->ContainsContent() );
+ SwContentFrame *pCnt = const_cast< SwContentFrame* >( pBodyFrame->ContainsContent() );
SwContentNode* pNd = pCnt->GetNode();
SwPaM aPaM( *pNd );
@@ -268,13 +268,13 @@ void SwPageBreakWin::Select( )
break;
case FN_PAGEBREAK_DELETE:
{
- const SwLayoutFrm* pBodyFrm = static_cast< const SwLayoutFrm* >( GetPageFrame()->Lower() );
- while ( pBodyFrm && !pBodyFrm->IsBodyFrm() )
- pBodyFrm = static_cast< const SwLayoutFrm* >( pBodyFrm->GetNext() );
+ const SwLayoutFrame* pBodyFrame = static_cast< const SwLayoutFrame* >( GetPageFrame()->Lower() );
+ while ( pBodyFrame && !pBodyFrame->IsBodyFrame() )
+ pBodyFrame = static_cast< const SwLayoutFrame* >( pBodyFrame->GetNext() );
- if ( pBodyFrm )
+ if ( pBodyFrame )
{
- SwContentFrm *pCnt = const_cast< SwContentFrm* >( pBodyFrm->ContainsContent() );
+ SwContentFrame *pCnt = const_cast< SwContentFrame* >( pBodyFrame->ContainsContent() );
SwContentNode* pNd = pCnt->GetNode();
pNd->GetDoc()->GetIDocumentUndoRedo( ).StartUndo( UNDO_UI_DELETE_PAGE_BREAK, nullptr );
@@ -330,37 +330,37 @@ void SwPageBreakWin::UpdatePosition( const Point* pEvtPt )
m_pMousePt = pEvtPt;
}
- const SwPageFrm* pPageFrm = GetPageFrame();
- const SwFrm* pPrevPage = pPageFrm;
+ const SwPageFrame* pPageFrame = GetPageFrame();
+ const SwFrame* pPrevPage = pPageFrame;
do
{
pPrevPage = pPrevPage->GetPrev();
}
- while ( pPrevPage && ( ( pPrevPage->Frm().Top( ) == pPageFrm->Frm().Top( ) )
- || static_cast< const SwPageFrm* >( pPrevPage )->IsEmptyPage( ) ) );
+ while ( pPrevPage && ( ( pPrevPage->Frame().Top( ) == pPageFrame->Frame().Top( ) )
+ || static_cast< const SwPageFrame* >( pPrevPage )->IsEmptyPage( ) ) );
- Rectangle aBoundRect = GetEditWin()->LogicToPixel( pPageFrm->GetBoundRect(GetEditWin()).SVRect() );
- Rectangle aFrmRect = GetEditWin()->LogicToPixel( pPageFrm->Frm().SVRect() );
+ Rectangle aBoundRect = GetEditWin()->LogicToPixel( pPageFrame->GetBoundRect(GetEditWin()).SVRect() );
+ Rectangle aFrameRect = GetEditWin()->LogicToPixel( pPageFrame->Frame().SVRect() );
- long nYLineOffset = ( aBoundRect.Top() + aFrmRect.Top() ) / 2;
+ long nYLineOffset = ( aBoundRect.Top() + aFrameRect.Top() ) / 2;
if ( pPrevPage )
{
- Rectangle aPrevFrmRect = GetEditWin()->LogicToPixel( pPrevPage->Frm().SVRect() );
- nYLineOffset = ( aPrevFrmRect.Bottom() + aFrmRect.Top() ) / 2;
+ Rectangle aPrevFrameRect = GetEditWin()->LogicToPixel( pPrevPage->Frame().SVRect() );
+ nYLineOffset = ( aPrevFrameRect.Bottom() + aFrameRect.Top() ) / 2;
}
// Get the page + sidebar coords
- long nPgLeft = aFrmRect.Left();
- long nPgRight = aFrmRect.Right();
+ long nPgLeft = aFrameRect.Left();
+ long nPgRight = aFrameRect.Right();
unsigned long nSidebarWidth = 0;
const SwPostItMgr* pPostItMngr = GetEditWin()->GetView().GetWrtShell().GetPostItMgr();
if ( pPostItMngr && pPostItMngr->HasNotes() && pPostItMngr->ShowNotes() )
nSidebarWidth = pPostItMngr->GetSidebarBorderWidth( true ) + pPostItMngr->GetSidebarWidth( true );
- if ( pPageFrm->SidebarPosition( ) == sw::sidebarwindows::SidebarPosition::LEFT )
+ if ( pPageFrame->SidebarPosition( ) == sw::sidebarwindows::SidebarPosition::LEFT )
nPgLeft -= nSidebarWidth;
- else if ( pPageFrm->SidebarPosition( ) == sw::sidebarwindows::SidebarPosition::RIGHT )
+ else if ( pPageFrame->SidebarPosition( ) == sw::sidebarwindows::SidebarPosition::RIGHT )
nPgRight += nSidebarWidth;
Size aBtnSize( BUTTON_WIDTH + ARROW_WIDTH, BUTTON_HEIGHT );
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index e994b3dbac76..d9859402ac1a 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -140,7 +140,7 @@ SwPostItMgr::SwPostItMgr(SwView* pView)
, mbDeleteNote(true)
, mpAnswer(nullptr)
, mbIsShowAnchor( false )
- , mpFrmSidebarWinContainer( nullptr )
+ , mpFrameSidebarWinContainer( nullptr )
{
if(!mpView->GetDrawView() )
mpView->GetWrtShell().MakeDrawView();
@@ -178,8 +178,8 @@ SwPostItMgr::~SwPostItMgr()
delete (*i);
mPages.clear();
- delete mpFrmSidebarWinContainer;
- mpFrmSidebarWinContainer = nullptr;
+ delete mpFrameSidebarWinContainer;
+ mpFrameSidebarWinContainer = nullptr;
}
void SwPostItMgr::CheckForRemovedPostIts()
@@ -1675,7 +1675,7 @@ void SwPostItMgr::PrepareView(bool bIgnoreCount)
if (!HasNotes() || bIgnoreCount)
{
mpWrtShell->StartAllAction();
- SwRootFrm* pLayout = mpWrtShell->GetLayout();
+ SwRootFrame* pLayout = mpWrtShell->GetLayout();
if ( pLayout )
SwPostItHelper::setSidebarChanged( pLayout,
mpWrtShell->getIDocumentSettingAccess().get( DocumentSettingId::BROWSE_MODE ) );
@@ -1696,16 +1696,16 @@ bool SwPostItMgr::IsHit(const Point &aPointPixel)
if (HasNotes() && ShowNotes())
{
const Point aPoint = mpEditWin->PixelToLogic(aPointPixel);
- const SwRootFrm* pLayout = mpWrtShell->GetLayout();
- SwRect aPageFrm;
- const unsigned long nPageNum = SwPostItHelper::getPageInfo( aPageFrm, pLayout, aPoint );
+ const SwRootFrame* pLayout = mpWrtShell->GetLayout();
+ SwRect aPageFrame;
+ const unsigned long nPageNum = SwPostItHelper::getPageInfo( aPageFrame, pLayout, aPoint );
if( nPageNum )
{
Rectangle aRect;
OSL_ENSURE(mPages.size()>nPageNum-1,"SwPostitMgr:: page container size wrong");
aRect = mPages[nPageNum-1]->eSidebarPosition == sw::sidebarwindows::SidebarPosition::LEFT
- ? Rectangle(Point(aPageFrm.Left()-GetSidebarWidth()-GetSidebarBorderWidth(),aPageFrm.Top()),Size(GetSidebarWidth(),aPageFrm.Height()))
- : Rectangle( Point(aPageFrm.Right()+GetSidebarBorderWidth(),aPageFrm.Top()) , Size(GetSidebarWidth(),aPageFrm.Height()));
+ ? Rectangle(Point(aPageFrame.Left()-GetSidebarWidth()-GetSidebarBorderWidth(),aPageFrame.Top()),Size(GetSidebarWidth(),aPageFrame.Height()))
+ : Rectangle( Point(aPageFrame.Right()+GetSidebarBorderWidth(),aPageFrame.Top()) , Size(GetSidebarWidth(),aPageFrame.Height()));
if (aRect.IsInside(aPoint))
{
// we hit the note's sidebar
@@ -1770,7 +1770,7 @@ Rectangle SwPostItMgr::GetTopScrollRect(const unsigned long aPage) const
return Rectangle(aPointTop,aSize);
}
-//IMPORTANT: if you change the rects here, also change SwPageFrm::PaintNotesSidebar()
+//IMPORTANT: if you change the rects here, also change SwPageFrame::PaintNotesSidebar()
bool SwPostItMgr::ScrollbarHit(const unsigned long aPage,const Point &aPoint)
{
SwRect aPageRect = mPages[aPage-1]->mPageRect;
@@ -2109,10 +2109,10 @@ void SwPostItMgr::AssureStdModeAtShell()
mpWrtShell->LockView( bLockView );
}
- if( mpWrtShell->IsSelFrmMode() || mpWrtShell->IsObjSelected())
+ if( mpWrtShell->IsSelFrameMode() || mpWrtShell->IsObjSelected())
{
- mpWrtShell->UnSelectFrm();
- mpWrtShell->LeaveSelFrmMode();
+ mpWrtShell->UnSelectFrame();
+ mpWrtShell->LeaveSelFrameMode();
mpWrtShell->GetView().LeaveDrawCreate();
mpWrtShell->EnterStdMode();
@@ -2172,16 +2172,16 @@ void SwPostItMgr::ToggleInsModeOnActiveSidebarWin()
}
}
-void SwPostItMgr::ConnectSidebarWinToFrm( const SwFrm& rFrm,
+void SwPostItMgr::ConnectSidebarWinToFrame( const SwFrame& rFrame,
const SwFormatField& rFormatField,
SwSidebarWin& rSidebarWin )
{
- if ( mpFrmSidebarWinContainer == nullptr )
+ if ( mpFrameSidebarWinContainer == nullptr )
{
- mpFrmSidebarWinContainer = new SwFrmSidebarWinContainer();
+ mpFrameSidebarWinContainer = new SwFrameSidebarWinContainer();
}
- const bool bInserted = mpFrmSidebarWinContainer->insert( rFrm, rFormatField, rSidebarWin );
+ const bool bInserted = mpFrameSidebarWinContainer->insert( rFrame, rFormatField, rSidebarWin );
if ( bInserted &&
mpWrtShell->GetAccessibleMap() )
{
@@ -2189,12 +2189,12 @@ void SwPostItMgr::ConnectSidebarWinToFrm( const SwFrm& rFrm,
}
}
-void SwPostItMgr::DisconnectSidebarWinFromFrm( const SwFrm& rFrm,
+void SwPostItMgr::DisconnectSidebarWinFromFrame( const SwFrame& rFrame,
SwSidebarWin& rSidebarWin )
{
- if ( mpFrmSidebarWinContainer != nullptr )
+ if ( mpFrameSidebarWinContainer != nullptr )
{
- const bool bRemoved = mpFrmSidebarWinContainer->remove( rFrm, rSidebarWin );
+ const bool bRemoved = mpFrameSidebarWinContainer->remove( rFrame, rSidebarWin );
if ( bRemoved &&
mpWrtShell->GetAccessibleMap() )
{
@@ -2203,37 +2203,37 @@ void SwPostItMgr::DisconnectSidebarWinFromFrm( const SwFrm& rFrm,
}
}
-bool SwPostItMgr::HasFrmConnectedSidebarWins( const SwFrm& rFrm )
+bool SwPostItMgr::HasFrameConnectedSidebarWins( const SwFrame& rFrame )
{
bool bRet( false );
- if ( mpFrmSidebarWinContainer != nullptr )
+ if ( mpFrameSidebarWinContainer != nullptr )
{
- bRet = !mpFrmSidebarWinContainer->empty( rFrm );
+ bRet = !mpFrameSidebarWinContainer->empty( rFrame );
}
return bRet;
}
-vcl::Window* SwPostItMgr::GetSidebarWinForFrmByIndex( const SwFrm& rFrm,
+vcl::Window* SwPostItMgr::GetSidebarWinForFrameByIndex( const SwFrame& rFrame,
const sal_Int32 nIndex )
{
vcl::Window* pSidebarWin( nullptr );
- if ( mpFrmSidebarWinContainer != nullptr )
+ if ( mpFrameSidebarWinContainer != nullptr )
{
- pSidebarWin = mpFrmSidebarWinContainer->get( rFrm, nIndex );
+ pSidebarWin = mpFrameSidebarWinContainer->get( rFrame, nIndex );
}
return pSidebarWin;
}
-void SwPostItMgr::GetAllSidebarWinForFrm( const SwFrm& rFrm,
+void SwPostItMgr::GetAllSidebarWinForFrame( const SwFrame& rFrame,
std::vector< vcl::Window* >* pChildren )
{
- if ( mpFrmSidebarWinContainer != nullptr )
+ if ( mpFrameSidebarWinContainer != nullptr )
{
- mpFrmSidebarWinContainer->getAll( rFrm, pChildren );
+ mpFrameSidebarWinContainer->getAll( rFrame, pChildren );
}
}
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index fc4c79091848..c0ec62d1acd5 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -187,7 +187,7 @@ SwSidebarWin::SwSidebarWin(SwEditWin& rEditWin,
, mbReadonly(false)
, mbIsFollow(false)
, mrSidebarItem(rSidebarItem)
- , mpAnchorFrm(rSidebarItem.maLayoutInfo.mpAnchorFrm)
+ , mpAnchorFrame(rSidebarItem.maLayoutInfo.mpAnchorFrame)
{
mpShadow = ShadowOverlayObject::CreateShadowOverlayObject( mrView );
if ( mpShadow )
@@ -195,7 +195,7 @@ SwSidebarWin::SwSidebarWin(SwEditWin& rEditWin,
mpShadow->setVisible(false);
}
- mrMgr.ConnectSidebarWinToFrm( *(mrSidebarItem.maLayoutInfo.mpAnchorFrm),
+ mrMgr.ConnectSidebarWinToFrame( *(mrSidebarItem.maLayoutInfo.mpAnchorFrame),
mrSidebarItem.GetFormatField(),
*this );
}
@@ -210,7 +210,7 @@ void SwSidebarWin::dispose()
if (IsDisposed())
return;
- mrMgr.DisconnectSidebarWinFromFrm( *(mrSidebarItem.maLayoutInfo.mpAnchorFrm),
+ mrMgr.DisconnectSidebarWinFromFrame( *(mrSidebarItem.maLayoutInfo.mpAnchorFrame),
*this );
Disable();
@@ -898,29 +898,29 @@ void SwSidebarWin::SetPosAndSize()
SwNodes& rNds = pTextNode->GetDoc()->GetNodes();
SwContentNode* const pContentNd = rNds[mrSidebarItem.maLayoutInfo.mnStartNodeIdx]->GetContentNode();
SwPosition aStartPos( *pContentNd, mrSidebarItem.maLayoutInfo.mnStartContent );
- SwShellCrsr* pTmpCrsr = nullptr;
- const bool bTableCrsrNeeded = pTextNode->FindTableBoxStartNode() != pContentNd->FindTableBoxStartNode();
- if ( bTableCrsrNeeded )
+ SwShellCursor* pTmpCursor = nullptr;
+ const bool bTableCursorNeeded = pTextNode->FindTableBoxStartNode() != pContentNd->FindTableBoxStartNode();
+ if ( bTableCursorNeeded )
{
- SwShellTableCrsr* pTableCrsr = new SwShellTableCrsr( DocView().GetWrtShell(), aStartPos );
- pTableCrsr->SetMark();
- pTableCrsr->GetMark()->nNode = *pTextNode;
- pTableCrsr->GetMark()->nContent.Assign( pTextNode, pTextAnnotationField->GetStart()+1 );
- pTableCrsr->NewTableSelection();
- pTmpCrsr = pTableCrsr;
+ SwShellTableCursor* pTableCursor = new SwShellTableCursor( DocView().GetWrtShell(), aStartPos );
+ pTableCursor->SetMark();
+ pTableCursor->GetMark()->nNode = *pTextNode;
+ pTableCursor->GetMark()->nContent.Assign( pTextNode, pTextAnnotationField->GetStart()+1 );
+ pTableCursor->NewTableSelection();
+ pTmpCursor = pTableCursor;
}
else
{
- SwShellCrsr* pCrsr = new SwShellCrsr( DocView().GetWrtShell(), aStartPos );
- pCrsr->SetMark();
- pCrsr->GetMark()->nNode = *pTextNode;
- pCrsr->GetMark()->nContent.Assign( pTextNode, pTextAnnotationField->GetStart()+1 );
- pTmpCrsr = pCrsr;
+ SwShellCursor* pCursor = new SwShellCursor( DocView().GetWrtShell(), aStartPos );
+ pCursor->SetMark();
+ pCursor->GetMark()->nNode = *pTextNode;
+ pCursor->GetMark()->nContent.Assign( pTextNode, pTextAnnotationField->GetStart()+1 );
+ pTmpCursor = pCursor;
}
- std::unique_ptr<SwShellCrsr> pTmpCrsrForAnnotationTextRange( pTmpCrsr );
+ std::unique_ptr<SwShellCursor> pTmpCursorForAnnotationTextRange( pTmpCursor );
- pTmpCrsrForAnnotationTextRange->FillRects();
- SwRects* pRects(pTmpCrsrForAnnotationTextRange.get());
+ pTmpCursorForAnnotationTextRange->FillRects();
+ SwRects* pRects(pTmpCursorForAnnotationTextRange.get());
for( size_t a(0); a < pRects->size(); ++a )
{
const SwRect aNextRect((*pRects)[a]);
@@ -1583,7 +1583,7 @@ void SwSidebarWin::SwitchToFieldPos()
GotoPos();
sal_uInt32 aCount = MoveCaret();
if (aCount)
- mrView.GetDocShell()->GetWrtShell()->SwCrsrShell::Right(aCount, 0);
+ mrView.GetDocShell()->GetWrtShell()->SwCursorShell::Right(aCount, 0);
GrabFocusToDocument();
}
@@ -1616,14 +1616,14 @@ bool SwSidebarWin::IsScrollbarVisible() const
void SwSidebarWin::ChangeSidebarItem( SwSidebarItem& rSidebarItem )
{
- const bool bAnchorChanged = mpAnchorFrm != rSidebarItem.maLayoutInfo.mpAnchorFrm;
+ const bool bAnchorChanged = mpAnchorFrame != rSidebarItem.maLayoutInfo.mpAnchorFrame;
if ( bAnchorChanged )
{
- mrMgr.DisconnectSidebarWinFromFrm( *(mpAnchorFrm), *this );
+ mrMgr.DisconnectSidebarWinFromFrame( *(mpAnchorFrame), *this );
}
mrSidebarItem = rSidebarItem;
- mpAnchorFrm = mrSidebarItem.maLayoutInfo.mpAnchorFrm;
+ mpAnchorFrame = mrSidebarItem.maLayoutInfo.mpAnchorFrame;
if ( GetWindowPeer() )
{
@@ -1636,7 +1636,7 @@ void SwSidebarWin::ChangeSidebarItem( SwSidebarItem& rSidebarItem )
if ( bAnchorChanged )
{
- mrMgr.ConnectSidebarWinToFrm( *(mrSidebarItem.maLayoutInfo.mpAnchorFrm),
+ mrMgr.ConnectSidebarWinToFrame( *(mrSidebarItem.maLayoutInfo.mpAnchorFrame),
mrSidebarItem.GetFormatField(),
*this );
}
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx
index 842489ede79f..2fefb0754f98 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx
@@ -34,10 +34,10 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
public:
explicit SidebarWinAccessibleContext( SwSidebarWin& rSidebarWin,
SwViewShell& rViewShell,
- const SwFrm* pAnchorFrm )
+ const SwFrame* pAnchorFrame )
: VCLXAccessibleComponent( rSidebarWin.GetWindowPeer() )
, mrViewShell( rViewShell )
- , mpAnchorFrm( pAnchorFrm )
+ , mpAnchorFrame( pAnchorFrame )
, maMutex()
{
rSidebarWin.SetAccessibleRole( css::accessibility::AccessibleRole::COMMENT );
@@ -46,11 +46,11 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
virtual ~SidebarWinAccessibleContext()
{}
- void ChangeAnchor( const SwFrm* pAnchorFrm )
+ void ChangeAnchor( const SwFrame* pAnchorFrame )
{
osl::MutexGuard aGuard(maMutex);
- mpAnchorFrm = pAnchorFrm;
+ mpAnchorFrame = pAnchorFrame;
}
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
@@ -60,10 +60,10 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
css::uno::Reference< css::accessibility::XAccessible > xAccParent;
- if ( mpAnchorFrm &&
+ if ( mpAnchorFrame &&
mrViewShell.GetAccessibleMap() )
{
- xAccParent = mrViewShell.GetAccessibleMap()->GetContext( mpAnchorFrm, false );
+ xAccParent = mrViewShell.GetAccessibleMap()->GetContext( mpAnchorFrame, false );
}
return xAccParent;
@@ -75,10 +75,10 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
sal_Int32 nIndex( -1 );
- if ( mpAnchorFrm && GetWindow() &&
+ if ( mpAnchorFrame && GetWindow() &&
mrViewShell.GetAccessibleMap() )
{
- nIndex = mrViewShell.GetAccessibleMap()->GetChildIndex( *mpAnchorFrm,
+ nIndex = mrViewShell.GetAccessibleMap()->GetChildIndex( *mpAnchorFrame,
*GetWindow() );
}
@@ -87,7 +87,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
private:
SwViewShell& mrViewShell;
- const SwFrm* mpAnchorFrm;
+ const SwFrame* mpAnchorFrame;
::osl::Mutex maMutex;
};
@@ -99,7 +99,7 @@ SidebarWinAccessible::SidebarWinAccessible( SwSidebarWin& rSidebarWin,
: VCLXWindow()
, mrSidebarWin( rSidebarWin )
, mrViewShell( rViewShell )
- , mpAnchorFrm( rSidebarItem.maLayoutInfo.mpAnchorFrm )
+ , mpAnchorFrame( rSidebarItem.maLayoutInfo.mpAnchorFrame )
, bAccContextCreated( false )
{
SetWindow( &mrSidebarWin );
@@ -121,7 +121,7 @@ void SidebarWinAccessible::ChangeSidebarItem( const SwSidebarItem& rSidebarItem
dynamic_cast<SidebarWinAccessibleContext*>(xAcc.get());
if ( pAccContext )
{
- pAccContext->ChangeAnchor( rSidebarItem.maLayoutInfo.mpAnchorFrm );
+ pAccContext->ChangeAnchor( rSidebarItem.maLayoutInfo.mpAnchorFrame );
}
}
}
@@ -132,7 +132,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > SidebarWinAccessib
SidebarWinAccessibleContext* pAccContext =
new SidebarWinAccessibleContext( mrSidebarWin,
mrViewShell,
- mpAnchorFrm );
+ mpAnchorFrame );
css::uno::Reference< css::accessibility::XAccessibleContext > xAcc( pAccContext );
bAccContextCreated = true;
return xAcc;
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx b/sw/source/uibase/docvw/SidebarWinAcc.hxx
index ed0a55402fff..7f1ae0fb9fbb 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx
@@ -24,7 +24,7 @@
class SwViewShell;
class SwSidebarItem;
-class SwFrm;
+class SwFrame;
namespace sw { namespace sidebarwindows {
@@ -46,7 +46,7 @@ class SidebarWinAccessible : public VCLXWindow
private:
SwSidebarWin& mrSidebarWin;
SwViewShell& mrViewShell;
- const SwFrm* mpAnchorFrm;
+ const SwFrame* mpAnchorFrame;
bool bAccContextCreated;
};
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index 1a44f865795a..d95c4c81cf2f 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star;
// no include "dbgoutsw.hxx" here!!!!!!
extern bool g_bNoInterrupt;
-extern bool g_bFrmDrag;
+extern bool g_bFrameDrag;
extern bool g_bDDTimerStarted;
bool g_bExecuteDrag = false;
@@ -61,7 +61,7 @@ void SwEditWin::StopDDTimer(SwWrtShell *pSh, const Point &rPt)
{
m_aTimer.Stop();
g_bDDTimerStarted = false;
- if(!pSh->IsSelFrmMode())
+ if(!pSh->IsSelFrameMode())
pSh->CallSetCursor(&rPt, false);
m_aTimer.SetTimeoutHdl(LINK(this,SwEditWin, TimerHandler));
}
@@ -87,7 +87,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
if ( !rSh.IsInSelect() && rSh.ChgCurrPam( aDocPos, true, true))
//We are not selecting and aren't at a selection
bStart = true;
- else if ( !g_bFrmDrag && rSh.IsSelFrmMode() &&
+ else if ( !g_bFrameDrag && rSh.IsSelFrameMode() &&
rSh.IsInsideSelectedObj( aDocPos ) )
{
//We are not dragging internally and are not at an
@@ -95,7 +95,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
bStart = true;
}
- else if( !g_bFrmDrag && m_rView.GetDocShell()->IsReadOnly() &&
+ else if( !g_bFrameDrag && m_rView.GetDocShell()->IsReadOnly() &&
OBJCNT_NONE != rSh.GetObjCntType( aDocPos, pObj ))
{
rSh.LockPaint();
@@ -115,7 +115,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
{
m_bMBPressed = false;
ReleaseMouse();
- g_bFrmDrag = false;
+ g_bFrameDrag = false;
g_bExecuteDrag = true;
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
@@ -123,7 +123,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
StartExecuteDrag();
if( bDelSelect )
{
- rSh.UnSelectFrm();
+ rSh.UnSelectFrame();
rSh.UnlockPaint();
}
}
@@ -165,7 +165,7 @@ void SwEditWin::DropCleanup()
if ( m_pUserMarker )
CleanupDropUserMarker();
else
- rSh.UnSetVisCrsr();
+ rSh.UnSetVisibleCursor();
}
@@ -395,9 +395,9 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
//Drawing objects in Headers/Footers are not allowed
SwWrtShell *pSrcSh = pMod->m_pDragDrop->GetShell();
- if( (pSrcSh->GetSelFrmType() == FrmTypeFlags::DRAWOBJ) &&
+ if( (pSrcSh->GetSelFrameType() == FrameTypeFlags::DRAWOBJ) &&
pSrcSh->IsSelContainsControl() &&
- (rSh.GetFrmType( &aDocPt, false ) & (FrmTypeFlags::HEADER|FrmTypeFlags::FOOTER)) )
+ (rSh.GetFrameType( &aDocPt, false ) & (FrameTypeFlags::HEADER|FrameTypeFlags::FOOTER)) )
{
bCleanup = true;
}
@@ -418,7 +418,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
if ( bCleanup )
{
CleanupDropUserMarker();
- rSh.UnSetVisCrsr();
+ rSh.UnSetVisibleCursor();
return DND_ACTION_NONE;
}
}
@@ -449,11 +449,11 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
CleanupDropUserMarker();
SwContentAtPos aCont( SwContentAtPos::SW_CONTENT_CHECK );
if(rSh.GetContentAtPos(aDocPt, aCont))
- rSh.SwCrsrShell::SetVisCrsr( aDocPt );
+ rSh.SwCursorShell::SetVisibleCursor( aDocPt );
}
else
{
- rSh.UnSetVisCrsr();
+ rSh.UnSetVisibleCursor();
if ( m_pUserMarkerObj != pObj )
{
@@ -470,7 +470,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
}
CleanupDropUserMarker();
- rSh.UnSetVisCrsr();
+ rSh.UnSetVisibleCursor();
return DND_ACTION_NONE;
}
@@ -481,7 +481,7 @@ IMPL_LINK_NOARG_TYPED(SwEditWin, DDHandler, Timer *, void)
m_aTimer.SetTimeout(240);
m_bMBPressed = false;
ReleaseMouse();
- g_bFrmDrag = false;
+ g_bFrameDrag = false;
if ( m_rView.GetViewFrame() )
{
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index f3b0fe3554a8..277934b50b28 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -172,8 +172,8 @@ extern bool g_bNoInterrupt; // in mainwn.cxx
// To resolve this g_bHoldSelection is set in Down at evaluated in Up.
static bool g_bHoldSelection = false;
-bool g_bFrmDrag = false;
-bool g_bValidCrsrPos = false;
+bool g_bFrameDrag = false;
+bool g_bValidCursorPos = false;
bool g_bModePushed = false;
bool g_bDDTimerStarted = false;
bool g_bFlushCharBuffer = false;
@@ -374,7 +374,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
m_pUserMarker = nullptr;
}
- rSh.SwCrsrShell::SetVisCrsr( rLPt );
+ rSh.SwCursorShell::SetVisibleCursor( rLPt );
}
SetPointer( eStyle );
return;
@@ -427,7 +427,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
bool bHitHandle = false;
bool bCntAtPos = false;
bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly() &&
- rSh.IsCrsrReadonly();
+ rSh.IsCursorReadonly();
m_aActHitType = SDRHIT_NONE;
PointerStyle eStyle = PointerStyle::Text;
if ( !pSdrView )
@@ -491,7 +491,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
// (i.e., position is not protected).
bool bMovable =
(!bNotInSelObj) &&
- (rSh.IsObjSelected() || rSh.IsFrmSelected()) &&
+ (rSh.IsObjSelected() || rSh.IsFrameSelected()) &&
(rSh.IsSelObjProtected(FlyProtectFlags::Pos) == FlyProtectFlags::NONE);
SdrObject* pSelectableObj = rSh.GetObjAt(rLPt);
@@ -504,7 +504,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
}
else
{
- if ( rSh.IsFrmSelected() && !bNotInSelObj )
+ if ( rSh.IsFrameSelected() && !bNotInSelObj )
{
// dvo: this branch appears to be dead and should be
// removed in a future version. Reason: The condition
@@ -567,8 +567,8 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
if ( aSwContentAtPos.pFndTextAttr != nullptr
&& aSwContentAtPos.pFndTextAttr->Which() == RES_TXTATR_INPUTFIELD)
{
- const SwField *pCrsrField = rSh.CrsrInsideInputField() ? rSh.GetCurField( true ) : nullptr;
- if (!(pCrsrField && pCrsrField == aSwContentAtPos.pFndTextAttr->GetFormatField().GetField()))
+ const SwField *pCursorField = rSh.CursorInsideInputField() ? rSh.GetCurField( true ) : nullptr;
+ if (!(pCursorField && pCursorField == aSwContentAtPos.pFndTextAttr->GetFormatField().GetField()))
eStyle = PointerStyle::RefHand;
}
}
@@ -619,7 +619,7 @@ IMPL_LINK_NOARG_TYPED(SwEditWin, TimerHandler, Timer *, void)
m_rView.Scroll( Rectangle(aModPt,Size(1,1)), nMaxScroll, nMaxScroll);
bDone = true;
}
- else if ( g_bFrmDrag )
+ else if ( g_bFrameDrag )
{
rSh.Drag(&aModPt, false);
bDone = true;
@@ -627,7 +627,7 @@ IMPL_LINK_NOARG_TYPED(SwEditWin, TimerHandler, Timer *, void)
if ( !bDone )
aModPt = rSh.GetContentPos( aModPt,aModPt.Y() > rSh.VisArea().Bottom() );
}
- if ( !bDone && !(g_bFrmDrag || m_bInsDraw) )
+ if ( !bDone && !(g_bFrameDrag || m_bInsDraw) )
{
if ( m_pRowColumnSelectionStart )
{
@@ -676,7 +676,7 @@ void SwEditWin::LeaveArea(const Point &rPos)
JustifyAreaTimer();
if( !m_aTimer.IsActive() )
m_aTimer.Start();
- delete m_pShadCrsr, m_pShadCrsr = nullptr;
+ delete m_pShadCursor, m_pShadCursor = nullptr;
}
inline void SwEditWin::EnterArea()
@@ -687,11 +687,11 @@ inline void SwEditWin::EnterArea()
/**
* Insert mode for frames
*/
-void SwEditWin::InsFrm(sal_uInt16 nCols)
+void SwEditWin::InsFrame(sal_uInt16 nCols)
{
StdDrawMode( OBJ_NONE, false );
- m_bInsFrm = true;
- m_nInsFrmColCount = nCols;
+ m_bInsFrame = true;
+ m_nInsFrameColCount = nCols;
}
void SwEditWin::StdDrawMode( SdrObjKind eSdrObjectKind, bool bObjSelect )
@@ -709,11 +709,11 @@ void SwEditWin::StdDrawMode( SdrObjKind eSdrObjectKind, bool bObjSelect )
m_rView.GetDrawFuncPtr()->Activate( SID_OBJECT_SELECT );
else
m_rView.GetDrawFuncPtr()->Activate( sal::static_int_cast< sal_uInt16 >(eSdrObjectKind) );
- m_bInsFrm = false;
- m_nInsFrmColCount = 1;
+ m_bInsFrame = false;
+ m_nInsFrameColCount = 1;
}
-void SwEditWin::StopInsFrm()
+void SwEditWin::StopInsFrame()
{
if (m_rView.GetDrawFuncPtr())
{
@@ -721,18 +721,18 @@ void SwEditWin::StopInsFrm()
m_rView.SetDrawFuncPtr(nullptr);
}
m_rView.LeaveDrawCreate(); // leave construction mode
- m_bInsFrm = false;
- m_nInsFrmColCount = 1;
+ m_bInsFrame = false;
+ m_nInsFrameColCount = 1;
}
-bool SwEditWin::IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr )
+bool SwEditWin::IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCursor )
{
const SvtCTLOptions& rCTLOptions = SW_MOD()->GetCTLOptions();
if ( !rCTLOptions.IsCTLFontEnabled() ||
!rCTLOptions.IsCTLSequenceChecking() )
return false;
- if ( 0 == rCrsr.Start()->nContent.GetIndex() ) /* first char needs not to be checked */
+ if ( 0 == rCursor.Start()->nContent.GetIndex() ) /* first char needs not to be checked */
return false;
SwBreakIt *pBreakIter = SwBreakIt::Get();
@@ -856,7 +856,7 @@ void SwEditWin::FlushInBuffer()
pCheckIt = new SwCheckIt;
uno::Reference < i18n::XExtendedInputSequenceChecker > xISC = pCheckIt->xCheck;
- if ( xISC.is() && IsInputSequenceCheckingRequired( m_aInBuffer, *rSh.GetCrsr() ) )
+ if ( xISC.is() && IsInputSequenceCheckingRequired( m_aInBuffer, *rSh.GetCursor() ) )
{
// apply (Thai) input sequence checking/correction
@@ -866,11 +866,11 @@ void SwEditWin::FlushInBuffer()
// get text from the beginning (i.e left side) of current selection
// to the start of the paragraph
rSh.NormalizePam(); // make point be the first (left) one
- if (!rSh.GetCrsr()->HasMark())
- rSh.GetCrsr()->SetMark();
- rSh.GetCrsr()->GetMark()->nContent = 0;
+ if (!rSh.GetCursor()->HasMark())
+ rSh.GetCursor()->SetMark();
+ rSh.GetCursor()->GetMark()->nContent = 0;
- const OUString aOldText( rSh.GetCrsr()->GetText() );
+ const OUString aOldText( rSh.GetCursor()->GetText() );
const sal_Int32 nOldLen = aOldText.getLength();
SvtCTLOptions& rCTLOptions = SW_MOD()->GetCTLOptions();
@@ -938,14 +938,14 @@ void SwEditWin::FlushInBuffer()
// if text prior to the original selection needs to be changed
// as well, we now expand the selection accordingly.
- SwPaM &rCrsr = *rSh.GetCrsr();
- const sal_Int32 nCrsrStartPos = rCrsr.Start()->nContent.GetIndex();
- OSL_ENSURE( nCrsrStartPos >= nExpandSelection, "cannot expand selection as specified!!" );
- if (nExpandSelection && nCrsrStartPos >= nExpandSelection)
+ SwPaM &rCursor = *rSh.GetCursor();
+ const sal_Int32 nCursorStartPos = rCursor.Start()->nContent.GetIndex();
+ OSL_ENSURE( nCursorStartPos >= nExpandSelection, "cannot expand selection as specified!!" );
+ if (nExpandSelection && nCursorStartPos >= nExpandSelection)
{
- if (!rCrsr.HasMark())
- rCrsr.SetMark();
- rCrsr.Start()->nContent -= nExpandSelection;
+ if (!rCursor.HasMark())
+ rCursor.SetMark();
+ rCursor.Start()->nContent -= nExpandSelection;
}
}
@@ -1006,7 +1006,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb )
RES_COL, RES_COL,
RES_PROTECT, RES_PROTECT,
RES_FOLLOW_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW, 0);
- rSh.GetFlyFrmAttr( aSet );
+ rSh.GetFlyFrameAttr( aSet );
RndStdIds eAnchorId = static_cast<const SwFormatAnchor&>(aSet.Get(RES_ANCHOR)).GetAnchorId();
Size aSnap;
bool bHuge(MOVE_LEFT_HUGE == nDir ||
@@ -1160,7 +1160,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb )
}
rSh.StartAllAction();
if( bSet )
- rSh.SetFlyFrmAttr( aSet );
+ rSh.SetFlyFrameAttr( aSet );
bool bSetPos = (FLY_AS_CHAR != eAnchorId);
if(bSetPos && bWeb)
{
@@ -1262,7 +1262,7 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir )
{
// Check if object is anchored as character and move direction
bool bDummy1, bDummy2;
- const bool bVertAnchor = rSh.IsFrmVertical( true, bDummy1, bDummy2 );
+ const bool bVertAnchor = rSh.IsFrameVertical( true, bDummy1, bDummy2 );
bool bHoriMove = !bVertAnchor == !( nDir % 2 );
bool bMoveAllowed =
!bHoriMove || (rSh.GetAnchorId() != FLY_AS_CHAR);
@@ -1352,7 +1352,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
else if ( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE &&
rSh.IsHeaderFooterEdit( ) )
{
- bool bHeader = bool(FrmTypeFlags::HEADER & rSh.GetFrmType(nullptr,false));
+ bool bHeader = bool(FrameTypeFlags::HEADER & rSh.GetFrameType(nullptr,false));
if ( bHeader )
rSh.SttPg();
else
@@ -1366,11 +1366,11 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
// running on a document, no order is being taken
return;
- delete m_pShadCrsr, m_pShadCrsr = nullptr;
+ delete m_pShadCursor, m_pShadCursor = nullptr;
m_aKeyInputFlushTimer.Stop();
bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly() &&
- rSh.IsCrsrReadonly();
+ rSh.IsCursorReadonly();
//if the language changes the buffer must be flushed
LanguageType eNewLanguage = GetInputLanguage();
@@ -1395,9 +1395,9 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
return; // Event evaluated by SdrView
}
- if ( m_rView.GetDrawFuncPtr() && m_bInsFrm )
+ if ( m_rView.GetDrawFuncPtr() && m_bInsFrame )
{
- StopInsFrm();
+ StopInsFrame();
rSh.Edit();
}
@@ -1415,7 +1415,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
}
else
{
- SwRootFrm* pLayout = GetView().GetDocShell()->GetWrtShell()->GetLayout();
+ SwRootFrame* pLayout = GetView().GetDocShell()->GetWrtShell()->GetLayout();
pLayout->dumpAsXml( );
return;
}
@@ -1423,7 +1423,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
KeyEvent aKeyEvent( rKEvt );
// look for vertical mappings
- if( !bIsDocReadOnly && !rSh.IsSelFrmMode() && !rSh.IsObjSelected() )
+ if( !bIsDocReadOnly && !rSh.IsSelFrameMode() && !rSh.IsObjSelected() )
{
// must changed from switch to if, because the Linux
// compiler has problem with the code. Has to remove if the new general
@@ -1440,10 +1440,10 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
// 2. Exception: For a table cursor in a vertical table, the
// directions should always be mapped.
const bool bVertText = rSh.IsInVerticalText();
- const bool bTableCrsr = rSh.GetTableCrsr();
+ const bool bTableCursor = rSh.GetTableCursor();
const bool bVertTable = rSh.IsTableVertical();
- if( ( bVertText && ( !bTableCrsr || bVertTable ) ) ||
- ( bTableCrsr && bVertTable ) )
+ if( ( bVertText && ( !bTableCursor || bVertTable ) ) ||
+ ( bTableCursor && bVertTable ) )
{
// Attempt to integrate cursor travelling for mongolian layout does not work.
// Thus, back to previous mapping of cursor keys to direction keys.
@@ -1841,7 +1841,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
break;
case KEY_DELETE:
- if ( !rSh.HasReadonlySel() || rSh.CrsrInsideInputField())
+ if ( !rSh.HasReadonlySel() || rSh.CursorInsideInputField())
{
if (rSh.IsInFrontOfLabel() && rSh.NumOrNoNum())
eKeyState = KS_NumOrNoNum;
@@ -1878,7 +1878,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
case KEY_RETURN:
{
if ( !rSh.HasReadonlySel()
- && !rSh.CrsrInsideInputField() )
+ && !rSh.CursorInsideInputField() )
{
const int nSelectionType = rSh.GetSelectionType();
if(nSelectionType & nsSelectionType::SEL_OLE)
@@ -1895,8 +1895,8 @@ KEYINPUT_CHECKTABLE_INSDEL:
//RETURN and empty paragraph in numbering -> end numbering
else if( m_aInBuffer.isEmpty() &&
- rSh.GetNumRuleAtCurrCrsrPos() &&
- !rSh.GetNumRuleAtCurrCrsrPos()->IsOutlineRule() &&
+ rSh.GetNumRuleAtCurrCursorPos() &&
+ !rSh.GetNumRuleAtCurrCursorPos()->IsOutlineRule() &&
!rSh.HasSelection() &&
rSh.IsSttPara() && rSh.IsEndPara() )
eKeyState = KS_NumOff, eNextKeyState = KS_OutlineLvOff;
@@ -1917,8 +1917,8 @@ KEYINPUT_CHECKTABLE_INSDEL:
{
if ( !rSh.HasReadonlySel()
&& !rSh.IsSttPara()
- && rSh.GetNumRuleAtCurrCrsrPos()
- && !rSh.CrsrInsideInputField() )
+ && rSh.GetNumRuleAtCurrCursorPos()
+ && !rSh.CursorInsideInputField() )
{
eKeyState = KS_NoNum;
}
@@ -1928,7 +1928,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
break;
case KEY_BACKSPACE:
case KEY_BACKSPACE | KEY_SHIFT:
- if ( !rSh.HasReadonlySel() || rSh.CrsrInsideInputField())
+ if ( !rSh.HasReadonlySel() || rSh.CursorInsideInputField())
{
bool bDone = false;
// try to add comment for code snip:
@@ -1941,7 +1941,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
const bool bOnlyBackspaceKey( KEY_BACKSPACE == rKeyCode.GetFullCode() );
if ( rSh.IsSttPara()
&& !rSh.HasSelection()
- && ( rSh.GetNumRuleAtCurrCrsrPos() == nullptr
+ && ( rSh.GetNumRuleAtCurrCursorPos() == nullptr
|| ( rSh.IsNoNum() && bOnlyBackspaceKey ) ) )
{
bDone = rSh.TryRemoveIndent();
@@ -1995,7 +1995,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
&& rSh.IsEndPara()
&& !rSh.HasSelection() )
{
- const SwNumRule* pCurrNumRule( rSh.GetNumRuleAtCurrCrsrPos() );
+ const SwNumRule* pCurrNumRule( rSh.GetNumRuleAtCurrCursorPos() );
if ( pCurrNumRule != nullptr
&& pCurrNumRule != rSh.GetOutlineNumRule() )
{
@@ -2033,17 +2033,17 @@ KEYINPUT_CHECKTABLE_INSDEL:
{
eKeyState=KS_GotoNextFieldMark;
}
- else if ( !rSh.IsMultiSelection() && rSh.CrsrInsideInputField() )
+ else if ( !rSh.IsMultiSelection() && rSh.CursorInsideInputField() )
{
GetView().GetViewFrame()->GetDispatcher()->Execute( FN_GOTO_NEXT_INPUTFLD );
eKeyState = KS_End;
}
- else if( rSh.GetNumRuleAtCurrCrsrPos()
+ else if( rSh.GetNumRuleAtCurrCursorPos()
&& rSh.IsSttOfPara()
&& !rSh.HasReadonlySel() )
{
if ( !rSh.IsMultiSelection()
- && rSh.IsFirstOfNumRuleAtCrsrPos()
+ && rSh.IsFirstOfNumRuleAtCursorPos()
&& numfunc::ChangeIndentOnTabAtFirstPosOfFirstListItem() )
eKeyState = KS_NumIndentInc;
else
@@ -2085,17 +2085,17 @@ KEYINPUT_CHECKTABLE_INSDEL:
{
eKeyState=KS_GotoPrevFieldMark;
}
- else if ( !rSh.IsMultiSelection() && rSh.CrsrInsideInputField() )
+ else if ( !rSh.IsMultiSelection() && rSh.CursorInsideInputField() )
{
GetView().GetViewFrame()->GetDispatcher()->Execute( FN_GOTO_PREV_INPUTFLD );
eKeyState = KS_End;
}
- else if( rSh.GetNumRuleAtCurrCrsrPos()
+ else if( rSh.GetNumRuleAtCurrCursorPos()
&& rSh.IsSttOfPara()
&& !rSh.HasReadonlySel() )
{
if ( !rSh.IsMultiSelection()
- && rSh.IsFirstOfNumRuleAtCrsrPos()
+ && rSh.IsFirstOfNumRuleAtCursorPos()
&& numfunc::ChangeIndentOnTabAtFirstPosOfFirstListItem() )
eKeyState = KS_NumIndentDec;
else
@@ -2206,7 +2206,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
eKeyState = rKeyCode.GetModifier() & KEY_SHIFT ?
KS_PrevObject : KS_NextObject;
}
- else if ( !rSh.IsMultiSelection() && rSh.CrsrInsideInputField() )
+ else if ( !rSh.IsMultiSelection() && rSh.CursorInsideInputField() )
{
GetView().GetViewFrame()->GetDispatcher()->Execute(
KEY_SHIFT != rKeyCode.GetModifier() ? FN_GOTO_NEXT_INPUTFLD : FN_GOTO_PREV_INPUTFLD );
@@ -2303,8 +2303,8 @@ KEYINPUT_CHECKTABLE_INSDEL:
}
else if(nSelectionType & nsSelectionType::SEL_FRM)
{
- rSh.UnSelectFrm();
- rSh.LeaveSelFrmMode();
+ rSh.UnSelectFrame();
+ rSh.LeaveSelFrameMode();
m_rView.AttrChangedNotify(&rSh);
rSh.MoveSection( fnSectionCurr, fnSectionEnd );
}
@@ -2326,8 +2326,8 @@ KEYINPUT_CHECKTABLE_INSDEL:
break;
case KS_GoIntoFly:
{
- rSh.UnSelectFrm();
- rSh.LeaveSelFrmMode();
+ rSh.UnSelectFrame();
+ rSh.LeaveSelFrameMode();
m_rView.AttrChangedNotify(&rSh);
rSh.MoveSection( fnSectionCurr, fnSectionEnd );
eKeyState = KS_End;
@@ -2385,7 +2385,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
eKeyState = KS_End;
}
else if ( !rSh.HasReadonlySel()
- || rSh.CrsrInsideInputField() )
+ || rSh.CursorInsideInputField() )
{
const bool bIsNormalChar =
GetAppCharClass().isLetterNumeric( OUString( aCh ), 0 );
@@ -2538,7 +2538,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
case KS_PrevObject:
if(rSh.GotoObj( KS_NextObject == eKeyState, GotoObjFlags::Any))
{
- if( rSh.IsFrmSelected() &&
+ if( rSh.IsFrameSelected() &&
m_rView.GetDrawFuncPtr() )
{
m_rView.GetDrawFuncPtr()->Deactivate();
@@ -2546,8 +2546,8 @@ KEYINPUT_CHECKTABLE_INSDEL:
m_rView.LeaveDrawCreate();
m_rView.AttrChangedNotify( &rSh );
}
- rSh.HideCrsr();
- rSh.EnterSelFrmMode();
+ rSh.HideCursor();
+ rSh.EnterSelFrameMode();
}
break;
case KS_GlossaryExpand:
@@ -2727,7 +2727,7 @@ void SwEditWin::MoveCursor( SwWrtShell &rSh, const Point& rDocPos,
const bool bTmpNoInterrupt = g_bNoInterrupt;
g_bNoInterrupt = false;
- int nTmpSetCrsr = 0;
+ int nTmpSetCursor = 0;
if( !rSh.IsViewLocked() && bLockView )
rSh.LockView( true );
@@ -2738,12 +2738,12 @@ void SwEditWin::MoveCursor( SwWrtShell &rSh, const Point& rDocPos,
// only temporary generate move context because otherwise
// the query to the content form doesn't work!!!
SwMvContext aMvContext( &rSh );
- nTmpSetCrsr = rSh.CallSetCursor(&rDocPos, bOnlyText);
- g_bValidCrsrPos = !(CRSR_POSCHG & nTmpSetCrsr);
+ nTmpSetCursor = rSh.CallSetCursor(&rDocPos, bOnlyText);
+ g_bValidCursorPos = !(CRSR_POSCHG & nTmpSetCursor);
}
// notify the edit window that from now on we do not use the input language
- if ( !(CRSR_POSOLD & nTmpSetCrsr) )
+ if ( !(CRSR_POSOLD & nTmpSetCursor) )
SetUseInputLanguage( false );
if( bLockView )
@@ -2755,7 +2755,7 @@ void SwEditWin::MoveCursor( SwWrtShell &rSh, const Point& rDocPos,
void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
{
SwWrtShell &rSh = m_rView.GetWrtShell();
- const SwField *pCrsrField = rSh.CrsrInsideInputField() ? rSh.GetCurField( true ) : nullptr;
+ const SwField *pCursorField = rSh.CursorInsideInputField() ? rSh.GetCurField( true ) : nullptr;
// We have to check if a context menu is shown and we have an UI
// active inplace client. In that case we have to ignore the mouse
@@ -2796,8 +2796,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
_rMEvt.GetMode(), _rMEvt.GetButtons() );
}
- m_bWasShdwCrsr = nullptr != m_pShadCrsr;
- delete m_pShadCrsr, m_pShadCrsr = nullptr;
+ m_bWasShdwCursor = nullptr != m_pShadCursor;
+ delete m_pShadCursor, m_pShadCursor = nullptr;
const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
@@ -2825,14 +2825,14 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
// Are we clicking on a blank header/footer area?
if ( IsInHeaderFooter( aDocPos, eControl ) || bOverHeaderFooterFly )
{
- const SwPageFrm* pPageFrm = rSh.GetLayout()->GetPageAtPos( aDocPos );
+ const SwPageFrame* pPageFrame = rSh.GetLayout()->GetPageAtPos( aDocPos );
// Is it active?
bool bActive = true;
- const SwPageDesc* pDesc = pPageFrm->GetPageDesc();
+ const SwPageDesc* pDesc = pPageFrame->GetPageDesc();
const SwFrameFormat* pFormat = pDesc->GetLeftFormat();
- if ( pPageFrm->OnRightPage() )
+ if ( pPageFrame->OnRightPage() )
pFormat = pDesc->GetRightFormat();
if ( pFormat )
@@ -3074,16 +3074,16 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
g_bNoInterrupt = false;
return;
}
- else if ( m_rView.GetDrawFuncPtr() && m_bInsFrm )
+ else if ( m_rView.GetDrawFuncPtr() && m_bInsFrame )
{
- StopInsFrm();
+ StopInsFrame();
rSh.Edit();
}
// Without SHIFT because otherwise Toggle doesn't work at selection
if (rMEvt.GetClicks() == 1)
{
- if ( rSh.IsSelFrmMode())
+ if ( rSh.IsSelFrameMode())
{
SdrHdl* pHdl = rSh.GetDrawView()->PickHandle(aDocPos);
bool bHitHandle = pHdl && pHdl->GetKind() != HDL_ANCHOR &&
@@ -3092,7 +3092,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if ((rSh.IsInsideSelectedObj(aDocPos) || bHitHandle) &&
!(rMEvt.GetModifier() == KEY_SHIFT && !bHitHandle))
{
- rSh.EnterSelFrmMode( &aDocPos );
+ rSh.EnterSelFrameMode( &aDocPos );
if ( !m_pApplyTempl )
{
// only if no position to size was hit.
@@ -3102,7 +3102,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
}
- g_bFrmDrag = true;
+ g_bFrameDrag = true;
}
g_bNoInterrupt = false;
return;
@@ -3160,7 +3160,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
bHandledFlyClick = true;
// only try to select frame, if pointer already was
// switched accordingly
- if ( m_aActHitType != SDRHIT_NONE && !rSh.IsSelFrmMode() &&
+ if ( m_aActHitType != SDRHIT_NONE && !rSh.IsSelFrameMode() &&
!GetView().GetViewFrame()->GetDispatcher()->IsLocked() &&
!bExecDrawTextLink)
{
@@ -3170,7 +3170,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if(bShould)
{
m_rView.NoRotate();
- rSh.HideCrsr();
+ rSh.HideCursor();
bool bUnLockView = !rSh.IsViewLocked();
rSh.LockView( true );
@@ -3183,11 +3183,11 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
{
// if the frame was deselected in the macro
// the cursor just has to be displayed again
- if( FrmTypeFlags::NONE == rSh.GetSelFrmType() )
- rSh.ShowCrsr();
+ if( FrameTypeFlags::NONE == rSh.GetSelFrameType() )
+ rSh.ShowCursor();
else
{
- if (rSh.IsFrmSelected() && m_rView.GetDrawFuncPtr())
+ if (rSh.IsFrameSelected() && m_rView.GetDrawFuncPtr())
{
m_rView.GetDrawFuncPtr()->Deactivate();
m_rView.SetDrawFuncPtr(nullptr);
@@ -3195,8 +3195,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
m_rView.AttrChangedNotify( &rSh );
}
- rSh.EnterSelFrmMode( &aDocPos );
- g_bFrmDrag = true;
+ rSh.EnterSelFrameMode( &aDocPos );
+ g_bFrameDrag = true;
UpdatePointer( aDocPos, rMEvt.GetModifier() );
}
return;
@@ -3205,12 +3205,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
bOnlyText = rSh.IsObjSelectable( aDocPos );
if (!m_rView.GetDrawFuncPtr())
- rSh.ShowCrsr();
+ rSh.ShowCursor();
}
else
bOnlyText = KEY_MOD1 != rMEvt.GetModifier();
}
- else if ( rSh.IsSelFrmMode() &&
+ else if ( rSh.IsSelFrameMode() &&
(m_aActHitType == SDRHIT_NONE ||
!rSh.IsInsideSelectedObj( aDocPos )))
{
@@ -3233,10 +3233,10 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if( rMEvt.IsMod1() )
nFlag = nFlag | SW_ENTER_GROUP;
- if ( rSh.IsSelFrmMode() )
+ if ( rSh.IsSelFrameMode() )
{
- rSh.UnSelectFrm();
- rSh.LeaveSelFrmMode();
+ rSh.UnSelectFrame();
+ rSh.LeaveSelFrameMode();
m_rView.AttrChangedNotify(&rSh);
}
@@ -3247,20 +3247,20 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if( !bSelObj )
{
// move cursor here so that it is not drawn in the
- // frame first; ShowCrsr() happens in LeaveSelFrmMode()
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
- rSh.LeaveSelFrmMode();
+ // frame first; ShowCursor() happens in LeaveSelFrameMode()
+ g_bValidCursorPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
+ rSh.LeaveSelFrameMode();
m_rView.AttrChangedNotify( &rSh );
bCallBase = false;
}
else
{
- rSh.HideCrsr();
- rSh.EnterSelFrmMode( &aDocPos );
- rSh.SelFlyGrabCrsr();
+ rSh.HideCursor();
+ rSh.EnterSelFrameMode( &aDocPos );
+ rSh.SelFlyGrabCursor();
rSh.MakeSelVisible();
- g_bFrmDrag = true;
- if( rSh.IsFrmSelected() &&
+ g_bFrameDrag = true;
+ if( rSh.IsFrameSelected() &&
m_rView.GetDrawFuncPtr() )
{
m_rView.GetDrawFuncPtr()->Deactivate();
@@ -3281,7 +3281,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
break;
case 2:
{
- g_bFrmDrag = false;
+ g_bFrameDrag = false;
if ( !bHandledFlyClick && !bIsDocReadOnly && rSh.IsInsideSelectedObj(aDocPos) &&
FlyProtectFlags::NONE == rSh.IsSelObjProtected( FlyProtectFlags::Content|FlyProtectFlags::Parent ) )
{
@@ -3331,7 +3331,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
// if the cursor position was corrected or if a Fly
// was selected in ReadOnlyMode, no word selection, except when tiled rendering.
- if ((!g_bValidCrsrPos || rSh.IsFrmSelected()) && !rSh.isTiledRendering())
+ if ((!g_bValidCursorPos || rSh.IsFrameSelected()) && !rSh.isTiledRendering())
return;
SwField *pField;
@@ -3395,7 +3395,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
case 3:
case 4:
{
- g_bFrmDrag = false;
+ g_bFrameDrag = false;
// in extended mode double and triple
// click has no effect.
if ( rSh.IsExtMode() )
@@ -3403,7 +3403,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
// if the cursor position was corrected or if a Fly
// was selected in ReadOnlyMode, no word selection.
- if ( !g_bValidCrsrPos || rSh.IsFrmSelected() )
+ if ( !g_bValidCursorPos || rSh.IsFrameSelected() )
return;
// select line, AdditionalMode if applicable
@@ -3434,7 +3434,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
case MOUSE_LEFT + KEY_SHIFT:
case MOUSE_LEFT + KEY_SHIFT + KEY_MOD1:
{
- bool bLockView = m_bWasShdwCrsr;
+ bool bLockView = m_bWasShdwCursor;
switch ( rMEvt.GetModifier() )
{
@@ -3443,24 +3443,24 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if ( !m_bInsDraw && IsDrawObjSelectable( rSh, aDocPos ) )
{
m_rView.NoRotate();
- rSh.HideCrsr();
- if ( rSh.IsSelFrmMode() )
+ rSh.HideCursor();
+ if ( rSh.IsSelFrameMode() )
rSh.SelectObj(aDocPos, SW_ADD_SELECT | SW_ENTER_GROUP);
else
{ if ( rSh.SelectObj( aDocPos, SW_ADD_SELECT | SW_ENTER_GROUP ) )
{
- rSh.EnterSelFrmMode( &aDocPos );
+ rSh.EnterSelFrameMode( &aDocPos );
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
- g_bFrmDrag = true;
+ g_bFrameDrag = true;
return;
}
}
}
- else if( rSh.IsSelFrmMode() &&
+ else if( rSh.IsSelFrameMode() &&
rSh.GetDrawView()->PickHandle( aDocPos ))
{
- g_bFrmDrag = true;
+ g_bFrameDrag = true;
g_bNoInterrupt = false;
return;
}
@@ -3472,24 +3472,24 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if ( !m_bInsDraw && IsDrawObjSelectable( rSh, aDocPos ) && !lcl_urlOverBackground( rSh, aDocPos ) )
{
m_rView.NoRotate();
- rSh.HideCrsr();
- if ( rSh.IsSelFrmMode() )
+ rSh.HideCursor();
+ if ( rSh.IsSelFrameMode() )
rSh.SelectObj(aDocPos, SW_ENTER_GROUP);
else
{ if ( rSh.SelectObj( aDocPos, SW_ENTER_GROUP ) )
{
- rSh.EnterSelFrmMode( &aDocPos );
+ rSh.EnterSelFrameMode( &aDocPos );
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
- g_bFrmDrag = true;
+ g_bFrameDrag = true;
return;
}
}
}
- else if( rSh.IsSelFrmMode() &&
+ else if( rSh.IsSelFrameMode() &&
rSh.GetDrawView()->PickHandle( aDocPos ))
{
- g_bFrmDrag = true;
+ g_bFrameDrag = true;
g_bNoInterrupt = false;
return;
}
@@ -3530,47 +3530,47 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if ( !m_bInsDraw && IsDrawObjSelectable( rSh, aDocPos ) )
{
m_rView.NoRotate();
- rSh.HideCrsr();
- if ( rSh.IsSelFrmMode() )
+ rSh.HideCursor();
+ if ( rSh.IsSelFrameMode() )
{
rSh.SelectObj(aDocPos, SW_ADD_SELECT);
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
if (rMarkList.GetMark(0) == nullptr)
{
- rSh.LeaveSelFrmMode();
+ rSh.LeaveSelFrameMode();
m_rView.AttrChangedNotify(&rSh);
- g_bFrmDrag = false;
+ g_bFrameDrag = false;
}
}
else
{ if ( rSh.SelectObj( aDocPos ) )
{
- rSh.EnterSelFrmMode( &aDocPos );
+ rSh.EnterSelFrameMode( &aDocPos );
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
- g_bFrmDrag = true;
+ g_bFrameDrag = true;
return;
}
}
}
else
{
- if ( rSh.IsSelFrmMode() &&
+ if ( rSh.IsSelFrameMode() &&
rSh.IsInsideSelectedObj( aDocPos ) )
{
- rSh.EnterSelFrmMode( &aDocPos );
+ rSh.EnterSelFrameMode( &aDocPos );
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
- g_bFrmDrag = true;
+ g_bFrameDrag = true;
return;
}
- if ( rSh.IsSelFrmMode() )
+ if ( rSh.IsSelFrameMode() )
{
- rSh.UnSelectFrm();
- rSh.LeaveSelFrmMode();
+ rSh.UnSelectFrame();
+ rSh.LeaveSelFrameMode();
m_rView.AttrChangedNotify(&rSh);
- g_bFrmDrag = false;
+ g_bFrameDrag = false;
}
if ( !rSh.IsExtMode() )
{
@@ -3679,12 +3679,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
rSh.IsObjSelectable( aDocPos ) ) && !lcl_urlOverBackground( rSh, aDocPos ) )
{
SwMvContext aMvContext( &rSh );
- rSh.EnterSelFrmMode();
+ rSh.EnterSelFrameMode();
bCallBase = false;
}
}
- if ( !bOverSelect && bEditableFieldClicked && (!pCrsrField ||
- pCrsrField != aFieldAtPos.pFndTextAttr->GetFormatField().GetField()))
+ if ( !bOverSelect && bEditableFieldClicked && (!pCursorField ||
+ pCursorField != aFieldAtPos.pFndTextAttr->GetFormatField().GetField()))
{
// select content of Input Field, but exclude CH_TXT_ATR_INPUTFIELDSTART
// and CH_TXT_ATR_INPUTFIELDEND
@@ -3706,14 +3706,14 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
SwContentAtPos aFieldAtPos(SwContentAtPos::SW_FIELD);
// Are we clicking on a field?
- if (g_bValidCrsrPos
+ if (g_bValidCursorPos
&& rSh.GetContentAtPos(aDocPos, aFieldAtPos)
&& aFieldAtPos.pFndTextAttr != nullptr
&& aFieldAtPos.pFndTextAttr->Which() == RES_TXTATR_INPUTFIELD
- && (!pCrsrField || pCrsrField != aFieldAtPos.pFndTextAttr->GetFormatField().GetField()))
+ && (!pCursorField || pCursorField != aFieldAtPos.pFndTextAttr->GetFormatField().GetField()))
{
// Move the cursor
- MoveCursor( rSh, aDocPos, rSh.IsObjSelectable( aDocPos ), m_bWasShdwCrsr );
+ MoveCursor( rSh, aDocPos, rSh.IsObjSelectable( aDocPos ), m_bWasShdwCursor );
bCallBase = false;
// select content of Input Field, but exclude CH_TXT_ATR_INPUTFIELDSTART
@@ -3756,8 +3756,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
if( rSh.ActionPend() )
return ;
- if( m_pShadCrsr && 0 != (rMEvt.GetModifier() + rMEvt.GetButtons() ) )
- delete m_pShadCrsr, m_pShadCrsr = nullptr;
+ if( m_pShadCursor && 0 != (rMEvt.GetModifier() + rMEvt.GetButtons() ) )
+ delete m_pShadCursor, m_pShadCursor = nullptr;
bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly();
@@ -3788,8 +3788,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
const Point aOldPt( rSh.VisArea().Pos() );
const bool bInsWin = rSh.VisArea().IsInside( aDocPt ) || rSh.isTiledRendering();
- if( m_pShadCrsr && !bInsWin )
- delete m_pShadCrsr, m_pShadCrsr = nullptr;
+ if( m_pShadCursor && !bInsWin )
+ delete m_pShadCursor, m_pShadCursor = nullptr;
if( bInsWin && m_pRowColumnSelectionStart )
{
@@ -3825,7 +3825,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
EnterArea();
return;
}
- else if(!rSh.IsFrmSelected() && !rSh.IsObjSelected())
+ else if(!rSh.IsFrameSelected() && !rSh.IsObjSelected())
{
SfxBindings &rBnd = rSh.GetView().GetViewFrame()->GetBindings();
Point aRelPos = rSh.GetRelativePagePosition(aDocPt);
@@ -3912,7 +3912,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
}
}
- bool bDelShadCrsr = true;
+ bool bDelShadCursor = true;
switch ( rMEvt.GetModifier() + rMEvt.GetButtons() )
{
@@ -3981,7 +3981,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
if ( !m_bMBPressed )
break;
case MOUSE_LEFT + KEY_MOD1:
- if ( g_bFrmDrag && rSh.IsSelFrmMode() )
+ if ( g_bFrameDrag && rSh.IsSelFrameMode() )
{
if( !m_bMBPressed )
break;
@@ -4093,7 +4093,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
EnterArea();
return;
}
- if ( !rSh.IsSelFrmMode() && !g_bDDINetAttr &&
+ if ( !rSh.IsSelFrameMode() && !g_bDDINetAttr &&
(IsMinMove( m_aStartPos,aPixPt ) || m_bIsInMove) &&
(rSh.IsInSelect() || !rSh.ChgCurrPam( aDocPt )) )
{
@@ -4119,7 +4119,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
{
rSh.Drag( &aDocPt, false );
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPt, false));
+ g_bValidCursorPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPt, false));
EnterArea();
}
}
@@ -4156,7 +4156,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
case KEY_MOD1:
if ( !m_bInsDraw )
{
- bool bTstShdwCrsr = true;
+ bool bTstShdwCursor = true;
UpdatePointer( aDocPt, rMEvt.GetModifier() );
@@ -4171,7 +4171,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
if( pINet ||
nullptr != ( pTmp = pFormat = rSh.GetFormatFromAnyObj( aDocPt )))
{
- bTstShdwCrsr = false;
+ bTstShdwCursor = false;
if( pTmp == pINet )
m_aSaveCallEvent.Set( pINet );
else
@@ -4203,8 +4203,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
aLastCallEvent, true );
}
- if( bTstShdwCrsr && bInsWin && !bIsDocReadOnly &&
- !m_bInsFrm &&
+ if( bTstShdwCursor && bInsWin && !bIsDocReadOnly &&
+ !m_bInsFrame &&
!rSh.GetViewOptions()->getBrowseMode() &&
rSh.GetViewOptions()->IsShadowCursor() &&
!(rMEvt.GetModifier() + rMEvt.GetButtons()) &&
@@ -4212,16 +4212,16 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
{
SwRect aRect;
sal_Int16 eOrient;
- SwFillMode eMode = (SwFillMode)rSh.GetViewOptions()->GetShdwCrsrFillMode();
- if( rSh.GetShadowCrsrPos( aDocPt, eMode, aRect, eOrient ))
+ SwFillMode eMode = (SwFillMode)rSh.GetViewOptions()->GetShdwCursorFillMode();
+ if( rSh.GetShadowCursorPos( aDocPt, eMode, aRect, eOrient ))
{
- if( !m_pShadCrsr )
- m_pShadCrsr = new SwShadowCursor( *this,
+ if( !m_pShadCursor )
+ m_pShadCursor = new SwShadowCursor( *this,
SwViewOption::GetDirectCursorColor() );
if( text::HoriOrientation::RIGHT != eOrient && text::HoriOrientation::CENTER != eOrient )
eOrient = text::HoriOrientation::LEFT;
- m_pShadCrsr->SetPos( aRect.Pos(), aRect.Height(), static_cast< sal_uInt16 >(eOrient) );
- bDelShadCrsr = false;
+ m_pShadCursor->SetPos( aRect.Pos(), aRect.Height(), static_cast< sal_uInt16 >(eOrient) );
+ bDelShadCursor = false;
}
}
}
@@ -4230,15 +4230,15 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
if( rSh.IsBlockMode() && !rMEvt.IsSynthetic() )
{
rSh.Drag( &aDocPt, false );
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPt, false));
+ g_bValidCursorPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPt, false));
EnterArea();
}
break;
}
- if( bDelShadCrsr && m_pShadCrsr )
- delete m_pShadCrsr, m_pShadCrsr = nullptr;
- m_bWasShdwCrsr = false;
+ if( bDelShadCursor && m_pShadCursor )
+ delete m_pShadCursor, m_pShadCursor = nullptr;
+ m_bWasShdwCursor = false;
}
/**
@@ -4257,10 +4257,10 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
bool bCallBase = true;
- bool bCallShadowCrsr = m_bWasShdwCrsr;
- m_bWasShdwCrsr = false;
- if( m_pShadCrsr )
- delete m_pShadCrsr, m_pShadCrsr = nullptr;
+ bool bCallShadowCursor = m_bWasShdwCursor;
+ m_bWasShdwCursor = false;
+ if( m_pShadCursor )
+ delete m_pShadCursor, m_pShadCursor = nullptr;
if( m_pRowColumnSelectionStart )
DELETEZ( m_pRowColumnSelectionStart );
@@ -4303,10 +4303,10 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
{
StopDDTimer( &rSh, aDocPt );
m_bMBPressed = false;
- if ( rSh.IsSelFrmMode() )
+ if ( rSh.IsSelFrameMode() )
{
rSh.EndDrag( &aDocPt, false );
- g_bFrmDrag = false;
+ g_bFrameDrag = false;
}
g_bNoInterrupt = false;
const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
@@ -4369,19 +4369,19 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
if ( rSh.IsObjSelected() )
{
- rSh.EnterSelFrmMode();
+ rSh.EnterSelFrameMode();
if (!m_rView.GetDrawFuncPtr())
StdDrawMode( OBJ_NONE, true );
}
- else if ( rSh.IsFrmSelected() )
+ else if ( rSh.IsFrameSelected() )
{
- rSh.EnterSelFrmMode();
- StopInsFrm();
+ rSh.EnterSelFrameMode();
+ StopInsFrame();
}
else
{
const Point aDocPos( PixelToLogic( m_aStartPos ) );
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
+ g_bValidCursorPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
rSh.Edit();
}
@@ -4405,9 +4405,9 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
m_rView.GetDrawFuncPtr()->Deactivate();
m_rView.AttrChangedNotify( &rSh );
if ( rSh.IsObjSelected() )
- rSh.EnterSelFrmMode();
- if ( m_rView.GetDrawFuncPtr() && m_bInsFrm )
- StopInsFrm();
+ rSh.EnterSelFrameMode();
+ if ( m_rView.GetDrawFuncPtr() && m_bInsFrame )
+ StopInsFrame();
}
bCallBase = false;
break;
@@ -4415,7 +4415,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
case MOUSE_LEFT + KEY_MOD1:
case MOUSE_LEFT + KEY_MOD2:
case MOUSE_LEFT + KEY_SHIFT + KEY_MOD1:
- if ( g_bFrmDrag && rSh.IsSelFrmMode() )
+ if ( g_bFrameDrag && rSh.IsSelFrameMode() )
{
if ( rMEvt.IsMod1() ) // copy and don't move.
{
@@ -4426,7 +4426,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
{
rSh.BreakDrag();
Point aEndPt, aSttPt;
- if ( rSh.GetSelFrmType() & FrmTypeFlags::FLY_ATCNT )
+ if ( rSh.GetSelFrameType() & FrameTypeFlags::FLY_ATCNT )
{
aEndPt = aRect.TopLeft();
aSttPt = rSh.GetDrawView()->GetAllMarkedRect().TopLeft();
@@ -4496,18 +4496,18 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
}
rSh.EndDrag( &aDocPt, false );
}
- g_bFrmDrag = false;
+ g_bFrameDrag = false;
bCallBase = false;
break;
}
bPopMode = true;
// no break
case MOUSE_LEFT + KEY_SHIFT:
- if (rSh.IsSelFrmMode())
+ if (rSh.IsSelFrameMode())
{
rSh.EndDrag( &aDocPt, false );
- g_bFrmDrag = false;
+ g_bFrameDrag = false;
bCallBase = false;
break;
}
@@ -4529,7 +4529,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
// the query to the content form doesn't work!!!
SwMvContext aMvContext( &rSh );
const Point aDocPos( PixelToLogic( m_aStartPos ) );
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
+ g_bValidCursorPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
}
g_bNoInterrupt = bTmpNoInterrupt;
@@ -4598,11 +4598,11 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
// the query to the content form doesn't work!!!
SwMvContext aMvContext( &rSh );
const Point aDocPos( PixelToLogic( m_aStartPos ) );
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
+ g_bValidCursorPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
}
else
{
- g_bValidCrsrPos = true;
+ g_bValidCursorPos = true;
}
}
else
@@ -4611,7 +4611,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
// a bit of a mystery what this is good for?
// in this case we assume it's valid since we
// just selected a field
- g_bValidCrsrPos = true;
+ g_bValidCursorPos = true;
}
if (bAddMode)
{
@@ -4652,7 +4652,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
}
rSh.LockView( bViewLocked );
- bCallShadowCrsr = false;
+ bCallShadowCursor = false;
}
else
{
@@ -4674,19 +4674,19 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
OUString sTarget(pField->GetTargetFrame());
::LoadURL(rSh, sURL, nFilter, sTarget);
}
- bCallShadowCrsr = false;
+ bCallShadowCursor = false;
}
else
{
// hit graphic
ReleaseMouse();
if( rSh.ClickToINetGrf( aDocPt, nFilter ))
- bCallShadowCrsr = false;
+ bCallShadowCursor = false;
}
}
}
- if( bCallShadowCrsr &&
+ if( bCallShadowCursor &&
rSh.GetViewOptions()->IsShadowCursor() &&
MOUSE_LEFT == (rMEvt.GetModifier() + rMEvt.GetButtons()) &&
!rSh.HasSelection() &&
@@ -4701,8 +4701,8 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
rSh.Undo();
}
}
- SwFillMode eMode = (SwFillMode)rSh.GetViewOptions()->GetShdwCrsrFillMode();
- rSh.SetShadowCrsrPos( aDocPt, eMode );
+ SwFillMode eMode = (SwFillMode)rSh.GetViewOptions()->GetShdwCursorFillMode();
+ rSh.SetShadowCursorPos( aDocPt, eMode );
}
}
}
@@ -4778,9 +4778,9 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
rSh.SetAttrItem( SvxBrushItem( SwEditWin::m_aWaterCanTextBackColor, nId ) );
else
rSh.SetAttrItem( SvxColorItem( SwEditWin::m_aWaterCanTextColor, nId ) );
- rSh.UnSetVisCrsr();
+ rSh.UnSetVisibleCursor();
rSh.EnterStdMode();
- rSh.SetVisCrsr(aDocPt);
+ rSh.SetVisibleCursor(aDocPt);
bCallBase = false;
m_aTemplateIdle.Stop();
}
@@ -4813,9 +4813,9 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
& eSelection ) && !rSh.HasReadonlySel() )
{
rSh.SetAttrItem( SwFormatCharFormat(m_pApplyTempl->aColl.pCharFormat) );
- rSh.UnSetVisCrsr();
+ rSh.UnSetVisibleCursor();
rSh.EnterStdMode();
- rSh.SetVisCrsr(aDocPt);
+ rSh.SetVisibleCursor(aDocPt);
m_pApplyTempl->nUndo =
std::min(m_pApplyTempl->nUndo, rSh.GetDoc()->GetIDocumentUndoRedo().GetUndoActionCount());
bCallBase = false;
@@ -4947,10 +4947,10 @@ void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
else
{
SetPointer( PointerStyle::Text );
- rSh.UnSetVisCrsr();
+ rSh.UnSetVisibleCursor();
rSh.GetViewOptions()->SetIdle( bIdle );
- if ( !rSh.IsSelFrmMode() )
+ if ( !rSh.IsSelFrameMode() )
rSh.Edit();
}
@@ -4977,7 +4977,7 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
m_pAnchorMarker( nullptr ),
m_pUserMarker( nullptr ),
m_pUserMarkerObj( nullptr ),
- m_pShadCrsr( nullptr ),
+ m_pShadCursor( nullptr ),
m_pRowColumnSelectionStart( nullptr ),
m_rView( rMyView ),
@@ -4988,12 +4988,12 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
m_nDropDestination( SotExchangeDest::NONE ),
m_eBezierMode(SID_BEZIER_INSERT),
- m_nInsFrmColCount( 1 ),
+ m_nInsFrameColCount( 1 ),
m_eDrawMode(OBJ_NONE),
m_bMBPressed(false),
m_bInsDraw(false),
- m_bInsFrm(false),
+ m_bInsFrame(false),
m_bIsInMove(false),
m_bIsInDrag(false),
m_bOldIdle(false),
@@ -5001,7 +5001,7 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
m_bTableInsDelMode(false),
m_bTableIsInsMode(false),
m_bChainMode(false),
- m_bWasShdwCrsr(false),
+ m_bWasShdwCursor(false),
m_bLockInput(false),
m_bIsRowDrag(false),
m_bUseInputLanguage(false),
@@ -5014,8 +5014,8 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
EnableChildTransparentMode();
SetDialogControlFlags( DialogControlFlags::Return | DialogControlFlags::WantFocus );
- m_bMBPressed = m_bInsDraw = m_bInsFrm =
- m_bIsInDrag = m_bOldIdle = m_bOldIdleSet = m_bChainMode = m_bWasShdwCrsr = false;
+ m_bMBPressed = m_bInsDraw = m_bInsFrame =
+ m_bIsInDrag = m_bOldIdle = m_bOldIdleSet = m_bChainMode = m_bWasShdwCursor = false;
// initially use the input language
m_bUseInputLanguage = true;
@@ -5055,8 +5055,8 @@ void SwEditWin::dispose()
{
m_aKeyInputTimer.Stop();
- delete m_pShadCrsr;
- m_pShadCrsr = nullptr;
+ delete m_pShadCursor;
+ m_pShadCursor = nullptr;
delete m_pRowColumnSelectionStart;
m_pRowColumnSelectionStart = nullptr;
@@ -5125,13 +5125,13 @@ bool SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos)
rSh.EndTextEdit(); // clicked aside, end Edit
rSh.SelectObj( aDocPos );
- if ( !rSh.IsObjSelected() && !rSh.IsFrmSelected() )
- rSh.LeaveSelFrmMode();
+ if ( !rSh.IsObjSelected() && !rSh.IsFrameSelected() )
+ rSh.LeaveSelFrameMode();
else
{
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
- g_bFrmDrag = true;
+ g_bFrameDrag = true;
}
if( bUnLockView )
rSh.LockView( false );
@@ -5279,8 +5279,8 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
case CommandEventId::Wheel:
case CommandEventId::StartAutoScroll:
case CommandEventId::AutoScroll:
- if( m_pShadCrsr )
- delete m_pShadCrsr, m_pShadCrsr = nullptr;
+ if( m_pShadCursor )
+ delete m_pShadCursor, m_pShadCursor = nullptr;
bCallBase = !m_rView.HandleWheelCommands( rCEvt );
break;
@@ -5291,7 +5291,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
case CommandEventId::StartExtTextInput:
{
bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly() &&
- rSh.IsCrsrReadonly();
+ rSh.IsCursorReadonly();
if(!bIsDocReadOnly)
{
if( rSh.HasDrawView() && rSh.GetDrawView()->IsTextEdit() )
@@ -5314,7 +5314,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
case CommandEventId::EndExtTextInput:
{
bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly() &&
- rSh.IsCrsrReadonly();
+ rSh.IsCursorReadonly();
if(!bIsDocReadOnly)
{
if( rSh.HasDrawView() && rSh.GetDrawView()->IsTextEdit() )
@@ -5365,7 +5365,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
case CommandEventId::ExtTextInput:
{
bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly() &&
- rSh.IsCrsrReadonly();
+ rSh.IsCursorReadonly();
if(!bIsDocReadOnly)
{
if( m_pQuickHlpData->m_bIsDisplayed )
@@ -5467,77 +5467,77 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
case CommandEventId::SelectionChange:
{
const CommandSelectionChangeData *pData = rCEvt.GetSelectionChangeData();
- rSh.SttCrsrMove();
+ rSh.SttCursorMove();
rSh.GoStartSentence();
- rSh.GetCrsr()->GetPoint()->nContent += sal::static_int_cast<sal_uInt16, sal_uLong>(pData->GetStart());
+ rSh.GetCursor()->GetPoint()->nContent += sal::static_int_cast<sal_uInt16, sal_uLong>(pData->GetStart());
rSh.SetMark();
- rSh.GetCrsr()->GetMark()->nContent += sal::static_int_cast<sal_uInt16, sal_uLong>(pData->GetEnd() - pData->GetStart());
- rSh.EndCrsrMove( true );
+ rSh.GetCursor()->GetMark()->nContent += sal::static_int_cast<sal_uInt16, sal_uLong>(pData->GetEnd() - pData->GetStart());
+ rSh.EndCursorMove( true );
}
break;
case CommandEventId::PrepareReconversion:
if( rSh.HasSelection() )
{
- SwPaM *pCrsr = rSh.GetCrsr();
+ SwPaM *pCursor = rSh.GetCursor();
if( rSh.IsMultiSelection() )
{
- if (pCrsr && !pCrsr->HasMark() &&
- pCrsr->GetPoint() == pCrsr->GetMark())
+ if (pCursor && !pCursor->HasMark() &&
+ pCursor->GetPoint() == pCursor->GetMark())
{
- rSh.GoPrevCrsr();
- pCrsr = rSh.GetCrsr();
+ rSh.GoPrevCursor();
+ pCursor = rSh.GetCursor();
}
// Cancel all selections other than the last selected one.
- while( rSh.GetCrsr()->GetNext() != rSh.GetCrsr() )
- delete rSh.GetCrsr()->GetNext();
+ while( rSh.GetCursor()->GetNext() != rSh.GetCursor() )
+ delete rSh.GetCursor()->GetNext();
}
- if( pCrsr )
+ if( pCursor )
{
- sal_uLong nPosNodeIdx = pCrsr->GetPoint()->nNode.GetIndex();
- const sal_Int32 nPosIdx = pCrsr->GetPoint()->nContent.GetIndex();
- sal_uLong nMarkNodeIdx = pCrsr->GetMark()->nNode.GetIndex();
- const sal_Int32 nMarkIdx = pCrsr->GetMark()->nContent.GetIndex();
+ sal_uLong nPosNodeIdx = pCursor->GetPoint()->nNode.GetIndex();
+ const sal_Int32 nPosIdx = pCursor->GetPoint()->nContent.GetIndex();
+ sal_uLong nMarkNodeIdx = pCursor->GetMark()->nNode.GetIndex();
+ const sal_Int32 nMarkIdx = pCursor->GetMark()->nContent.GetIndex();
- if( !rSh.GetCrsr()->HasMark() )
- rSh.GetCrsr()->SetMark();
+ if( !rSh.GetCursor()->HasMark() )
+ rSh.GetCursor()->SetMark();
- rSh.SttCrsrMove();
+ rSh.SttCursorMove();
if( nPosNodeIdx < nMarkNodeIdx )
{
- rSh.GetCrsr()->GetPoint()->nNode = nPosNodeIdx;
- rSh.GetCrsr()->GetPoint()->nContent = nPosIdx;
- rSh.GetCrsr()->GetMark()->nNode = nPosNodeIdx;
- rSh.GetCrsr()->GetMark()->nContent =
- rSh.GetCrsr()->GetContentNode()->Len();
+ rSh.GetCursor()->GetPoint()->nNode = nPosNodeIdx;
+ rSh.GetCursor()->GetPoint()->nContent = nPosIdx;
+ rSh.GetCursor()->GetMark()->nNode = nPosNodeIdx;
+ rSh.GetCursor()->GetMark()->nContent =
+ rSh.GetCursor()->GetContentNode()->Len();
}
else if( nPosNodeIdx == nMarkNodeIdx )
{
- rSh.GetCrsr()->GetPoint()->nNode = nPosNodeIdx;
- rSh.GetCrsr()->GetPoint()->nContent = nPosIdx;
- rSh.GetCrsr()->GetMark()->nNode = nMarkNodeIdx;
- rSh.GetCrsr()->GetMark()->nContent = nMarkIdx;
+ rSh.GetCursor()->GetPoint()->nNode = nPosNodeIdx;
+ rSh.GetCursor()->GetPoint()->nContent = nPosIdx;
+ rSh.GetCursor()->GetMark()->nNode = nMarkNodeIdx;
+ rSh.GetCursor()->GetMark()->nContent = nMarkIdx;
}
else
{
- rSh.GetCrsr()->GetMark()->nNode = nMarkNodeIdx;
- rSh.GetCrsr()->GetMark()->nContent = nMarkIdx;
- rSh.GetCrsr()->GetPoint()->nNode = nMarkNodeIdx;
- rSh.GetCrsr()->GetPoint()->nContent =
- rSh.GetCrsr()->GetContentNode( false )->Len();
+ rSh.GetCursor()->GetMark()->nNode = nMarkNodeIdx;
+ rSh.GetCursor()->GetMark()->nContent = nMarkIdx;
+ rSh.GetCursor()->GetPoint()->nNode = nMarkNodeIdx;
+ rSh.GetCursor()->GetPoint()->nContent =
+ rSh.GetCursor()->GetContentNode( false )->Len();
}
- rSh.EndCrsrMove( true );
+ rSh.EndCursorMove( true );
}
}
break;
case CommandEventId::QueryCharPosition:
{
bool bVertical = rSh.IsInVerticalText();
- const SwPosition& rPos = *rSh.GetCrsr()->GetPoint();
+ const SwPosition& rPos = *rSh.GetCursor()->GetPoint();
SwDocShell* pDocSh = m_rView.GetDocShell();
SwDoc *pDoc = pDocSh->GetDoc();
SwExtTextInput* pInput = pDoc->GetExtTextInput( rPos.nNode.GetNode(), rPos.nContent.GetIndex() );
@@ -5661,15 +5661,15 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
{
return true;
}
- if ( m_rView.GetDrawFuncPtr() && m_bInsFrm )
+ if ( m_rView.GetDrawFuncPtr() && m_bInsFrame )
{
- StopInsFrm();
+ StopInsFrame();
rSh.Edit();
}
UpdatePointer( aDocPos );
- if( !rSh.IsSelFrmMode() &&
+ if( !rSh.IsSelFrameMode() &&
!GetView().GetViewFrame()->GetDispatcher()->IsLocked() )
{
// Test if there is a draw object at that position and if it should be selected.
@@ -5678,7 +5678,7 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
if(bShould)
{
m_rView.NoRotate();
- rSh.HideCrsr();
+ rSh.HideCursor();
bool bUnLockView = !rSh.IsViewLocked();
rSh.LockView( true );
@@ -5691,11 +5691,11 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
bRet = true;
// in case the frame was deselected in the macro
// just the cursor has to be displayed again.
- if( FrmTypeFlags::NONE == rSh.GetSelFrmType() )
- rSh.ShowCrsr();
+ if( FrameTypeFlags::NONE == rSh.GetSelFrameType() )
+ rSh.ShowCursor();
else
{
- if (rSh.IsFrmSelected() && m_rView.GetDrawFuncPtr())
+ if (rSh.IsFrameSelected() && m_rView.GetDrawFuncPtr())
{
m_rView.GetDrawFuncPtr()->Deactivate();
m_rView.SetDrawFuncPtr(nullptr);
@@ -5703,18 +5703,18 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
m_rView.AttrChangedNotify( &rSh );
}
- rSh.EnterSelFrmMode( &aDocPos );
- g_bFrmDrag = true;
+ rSh.EnterSelFrameMode( &aDocPos );
+ g_bFrameDrag = true;
UpdatePointer( aDocPos );
return bRet;
}
}
if (!m_rView.GetDrawFuncPtr())
- rSh.ShowCrsr();
+ rSh.ShowCursor();
}
}
- else if ( rSh.IsSelFrmMode() &&
+ else if ( rSh.IsSelFrameMode() &&
(m_aActHitType == SDRHIT_NONE ||
!bIsInsideSelectedObj))
{
@@ -5723,10 +5723,10 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
rSh.LockView( true );
sal_uInt8 nFlag = 0;
- if ( rSh.IsSelFrmMode() )
+ if ( rSh.IsSelFrameMode() )
{
- rSh.UnSelectFrm();
- rSh.LeaveSelFrmMode();
+ rSh.UnSelectFrame();
+ rSh.LeaveSelFrameMode();
m_rView.AttrChangedNotify(&rSh);
bRet = true;
}
@@ -5738,21 +5738,21 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
if( !bSelObj )
{
// move cursor here so that it is not drawn in the
- // frame at first; ShowCrsr() happens in LeaveSelFrmMode()
- g_bValidCrsrPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
- rSh.LeaveSelFrmMode();
+ // frame at first; ShowCursor() happens in LeaveSelFrameMode()
+ g_bValidCursorPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false));
+ rSh.LeaveSelFrameMode();
m_rView.LeaveDrawCreate();
m_rView.AttrChangedNotify( &rSh );
bRet = true;
}
else
{
- rSh.HideCrsr();
- rSh.EnterSelFrmMode( &aDocPos );
- rSh.SelFlyGrabCrsr();
+ rSh.HideCursor();
+ rSh.EnterSelFrameMode( &aDocPos );
+ rSh.SelFlyGrabCursor();
rSh.MakeSelVisible();
- g_bFrmDrag = true;
- if( rSh.IsFrmSelected() &&
+ g_bFrameDrag = true;
+ if( rSh.IsFrameSelected() &&
m_rView.GetDrawFuncPtr() )
{
m_rView.GetDrawFuncPtr()->Deactivate();
@@ -5764,7 +5764,7 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
bRet = true;
}
}
- else if ( rSh.IsSelFrmMode() && bIsInsideSelectedObj )
+ else if ( rSh.IsSelFrameMode() && bIsInsideSelectedObj )
{
// Object at the mouse cursor is already selected - do nothing
return false;
@@ -5796,9 +5796,9 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
nSelType == nsSelectionType::SEL_GRF )
{
SwMvContext aMvContext( &rSh );
- if( !rSh.IsFrmSelected() )
+ if( !rSh.IsFrameSelected() )
rSh.GotoNextFly();
- rSh.EnterSelFrmMode();
+ rSh.EnterSelFrameMode();
bRet = true;
}
}
@@ -5854,7 +5854,7 @@ IMPL_LINK_NOARG_TYPED(SwEditWin, TemplateTimerHdl, Idle *, void)
void SwEditWin::SetChainMode( bool bOn )
{
if ( !m_bChainMode )
- StopInsFrm();
+ StopInsFrame();
if ( m_pUserMarker )
{
@@ -6145,9 +6145,9 @@ void SwEditWin::ShowAutoTextCorrectQuickHelp(
bool SwEditWin::IsInHeaderFooter( const Point &rDocPt, FrameControlType &rControl ) const
{
SwWrtShell &rSh = m_rView.GetWrtShell();
- const SwPageFrm* pPageFrm = rSh.GetLayout()->GetPageAtPos( rDocPt );
+ const SwPageFrame* pPageFrame = rSh.GetLayout()->GetPageAtPos( rDocPt );
- if ( pPageFrm && pPageFrm->IsOverHeaderFooterArea( rDocPt, rControl ) )
+ if ( pPageFrame && pPageFrame->IsOverHeaderFooterArea( rDocPt, rControl ) )
return true;
if ( rSh.IsShowHeaderFooterSeparator( Header ) || rSh.IsShowHeaderFooterSeparator( Footer ) )
@@ -6157,7 +6157,7 @@ bool SwEditWin::IsInHeaderFooter( const Point &rDocPt, FrameControlType &rContro
if ( rSh.IsShowHeaderFooterSeparator( Header ) )
{
- SwFrameControlPtr pControl = rMgr.GetControl( Header, pPageFrm );
+ SwFrameControlPtr pControl = rMgr.GetControl( Header, pPageFrame );
if ( pControl.get() && pControl->Contains( aPoint ) )
{
rControl = Header;
@@ -6167,7 +6167,7 @@ bool SwEditWin::IsInHeaderFooter( const Point &rDocPt, FrameControlType &rContro
if ( rSh.IsShowHeaderFooterSeparator( Footer ) )
{
- SwFrameControlPtr pControl = rMgr.GetControl( Footer, pPageFrm );
+ SwFrameControlPtr pControl = rMgr.GetControl( Footer, pPageFrame );
if ( pControl.get() && pControl->Contains( aPoint ) )
{
rControl = Footer;
@@ -6185,7 +6185,7 @@ bool SwEditWin::IsOverHeaderFooterFly( const Point& rDocPos, FrameControlType& r
Point aPt( rDocPos );
SwWrtShell &rSh = m_rView.GetWrtShell();
SwPaM aPam( *rSh.GetCurrentShellCursor().GetPoint() );
- rSh.GetLayout()->GetCrsrOfst( aPam.GetPoint(), aPt, nullptr, true );
+ rSh.GetLayout()->GetCursorOfst( aPam.GetPoint(), aPt, nullptr, true );
const SwStartNode* pStartFly = aPam.GetPoint()->nNode.GetNode().FindFlyStartNode();
if ( pStartFly )
@@ -6234,11 +6234,11 @@ OUString SwEditWin::GetSurroundingText() const
rSh.GetSelectedText( sReturn, GETSELTXT_PARABRK_TO_ONLYCR );
else if( !rSh.HasSelection() )
{
- SwPosition *pPos = rSh.GetCrsr()->GetPoint();
+ SwPosition *pPos = rSh.GetCursor()->GetPoint();
const sal_Int32 nPos = pPos->nContent.GetIndex();
// get the sentence around the cursor
- rSh.HideCrsr();
+ rSh.HideCursor();
rSh.GoStartSentence();
rSh.SetMark();
rSh.GoEndSentence();
@@ -6246,7 +6246,7 @@ OUString SwEditWin::GetSurroundingText() const
pPos->nContent = nPos;
rSh.ClearMark();
- rSh.HideCrsr();
+ rSh.HideCursor();
}
return sReturn;
@@ -6265,16 +6265,16 @@ Selection SwEditWin::GetSurroundingTextSelection() const
{
// Return the position of the visible cursor in the sentence
// around the visible cursor.
- SwPosition *pPos = rSh.GetCrsr()->GetPoint();
+ SwPosition *pPos = rSh.GetCursor()->GetPoint();
const sal_Int32 nPos = pPos->nContent.GetIndex();
- rSh.HideCrsr();
+ rSh.HideCursor();
rSh.GoStartSentence();
- const sal_Int32 nStartPos = rSh.GetCrsr()->GetPoint()->nContent.GetIndex();
+ const sal_Int32 nStartPos = rSh.GetCursor()->GetPoint()->nContent.GetIndex();
pPos->nContent = nPos;
rSh.ClearMark();
- rSh.ShowCrsr();
+ rSh.ShowCursor();
return Selection( nPos - nStartPos, nPos - nStartPos );
}
@@ -6359,7 +6359,7 @@ void SwEditWin::SetCursorTwipPosition(const Point& rPosition, bool bPoint, bool
}
}
- // Not an SwWrtShell, as that would make SwCrsrShell::GetCrsr() inaccessible.
+ // Not an SwWrtShell, as that would make SwCursorShell::GetCursor() inaccessible.
SwEditShell& rShell = m_rView.GetWrtShell();
bool bCreateSelection = false;
@@ -6376,10 +6376,10 @@ void SwEditWin::SetCursorTwipPosition(const Point& rPosition, bool bPoint, bool
// If the mark is to be updated, then exchange the point and mark before
// and after, as we can't easily set the mark.
if (!bPoint)
- rShell.getShellCrsr(/*bBlock=*/false)->Exchange();
- rShell.SetCrsr(rPosition);
+ rShell.getShellCursor(/*bBlock=*/false)->Exchange();
+ rShell.SetCursor(rPosition);
if (!bPoint)
- rShell.getShellCrsr(/*bBlock=*/false)->Exchange();
+ rShell.getShellCursor(/*bBlock=*/false)->Exchange();
}
if (bCreateSelection)
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index c7d7be51932c..ba05744a930f 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -445,20 +445,20 @@ void SwEditWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect
SwWrtShell* pWrtShell = GetView().GetWrtShellPtr();
if(!pWrtShell)
return;
- bool bPaintShadowCrsr = false;
- if( m_pShadCrsr )
+ bool bPaintShadowCursor = false;
+ if( m_pShadCursor )
{
- Rectangle aRect( m_pShadCrsr->GetRect());
+ Rectangle aRect( m_pShadCursor->GetRect());
// fully resides inside?
if( rRect.IsInside( aRect ) )
// dann aufheben
- delete m_pShadCrsr, m_pShadCrsr = nullptr;
+ delete m_pShadCursor, m_pShadCursor = nullptr;
else if( rRect.IsOver( aRect ))
{
// resides somewhat above, then everything is clipped outside
// and we have to make the "inner part" at the end of the
// Paint visible again. Otherwise Paint errors occur!
- bPaintShadowCrsr = true;
+ bPaintShadowCursor = true;
}
}
@@ -472,8 +472,8 @@ void SwEditWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect
pWrtShell->setOutputToWindow(false);
}
- if( bPaintShadowCrsr )
- m_pShadCrsr->Paint();
+ if( bPaintShadowCursor )
+ m_pShadCursor->Paint();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/edtwin3.cxx b/sw/source/uibase/docvw/edtwin3.cxx
index c69ebfcbd4eb..006cf7ff109d 100644
--- a/sw/source/uibase/docvw/edtwin3.cxx
+++ b/sw/source/uibase/docvw/edtwin3.cxx
@@ -78,8 +78,8 @@ void PageNumNotify( SwViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum,
void FrameNotify( SwViewShell* pVwSh, FlyMode eMode )
{
- if ( dynamic_cast< const SwCrsrShell *>( pVwSh ) != nullptr )
- SwBaseShell::SetFrmMode( eMode, static_cast<SwWrtShell*>(pVwSh) );
+ if ( dynamic_cast< const SwCursorShell *>( pVwSh ) != nullptr )
+ SwBaseShell::SetFrameMode( eMode, static_cast<SwWrtShell*>(pVwSh) );
}
// Notify for page number update
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
index 43f1fd332841..dee11c51efc0 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
@@ -50,56 +50,56 @@ namespace {
typedef ::std::map < SidebarWinKey, VclPtr<sw::sidebarwindows::SwSidebarWin>, SidebarWinOrder > SidebarWinContainer;
- struct FrmKey
+ struct FrameKey
{
- const SwFrm* mpFrm;
+ const SwFrame* mpFrame;
- explicit FrmKey( const SwFrm* pFrm )
- : mpFrm( pFrm )
+ explicit FrameKey( const SwFrame* pFrame )
+ : mpFrame( pFrame )
{}
- bool operator < ( const FrmKey& rFrmKey ) const
+ bool operator < ( const FrameKey& rFrameKey ) const
{
- return mpFrm < rFrmKey.mpFrm;
+ return mpFrame < rFrameKey.mpFrame;
}
};
- struct FrmOrder
+ struct FrameOrder
{
- bool operator()( const FrmKey& rFrmKeyA,
- const FrmKey& rFrmKeyB ) const
+ bool operator()( const FrameKey& rFrameKeyA,
+ const FrameKey& rFrameKeyB ) const
{
- return rFrmKeyA < rFrmKeyB;
+ return rFrameKeyA < rFrameKeyB;
}
};
- typedef ::std::map < FrmKey, SidebarWinContainer, FrmOrder > _FrmSidebarWinContainer;
+ typedef ::std::map < FrameKey, SidebarWinContainer, FrameOrder > _FrameSidebarWinContainer;
}
namespace sw { namespace sidebarwindows {
-class FrmSidebarWinContainer : public _FrmSidebarWinContainer
+class FrameSidebarWinContainer : public _FrameSidebarWinContainer
{
};
-SwFrmSidebarWinContainer::SwFrmSidebarWinContainer()
- : mpFrmSidebarWinContainer( new FrmSidebarWinContainer() )
+SwFrameSidebarWinContainer::SwFrameSidebarWinContainer()
+ : mpFrameSidebarWinContainer( new FrameSidebarWinContainer() )
{}
-SwFrmSidebarWinContainer::~SwFrmSidebarWinContainer()
+SwFrameSidebarWinContainer::~SwFrameSidebarWinContainer()
{
- mpFrmSidebarWinContainer->clear();
- delete mpFrmSidebarWinContainer;
+ mpFrameSidebarWinContainer->clear();
+ delete mpFrameSidebarWinContainer;
}
-bool SwFrmSidebarWinContainer::insert( const SwFrm& rFrm,
+bool SwFrameSidebarWinContainer::insert( const SwFrame& rFrame,
const SwFormatField& rFormatField,
SwSidebarWin& rSidebarWin )
{
bool bInserted( false );
- FrmKey aFrmKey( &rFrm );
- SidebarWinContainer& rSidebarWinContainer = (*mpFrmSidebarWinContainer)[ aFrmKey ];
+ FrameKey aFrameKey( &rFrame );
+ SidebarWinContainer& rSidebarWinContainer = (*mpFrameSidebarWinContainer)[ aFrameKey ];
SidebarWinKey aSidebarWinKey( rFormatField.GetTextField()->GetStart() );
if ( rSidebarWinContainer.empty() ||
@@ -112,16 +112,16 @@ bool SwFrmSidebarWinContainer::insert( const SwFrm& rFrm,
return bInserted;
}
-bool SwFrmSidebarWinContainer::remove( const SwFrm& rFrm,
+bool SwFrameSidebarWinContainer::remove( const SwFrame& rFrame,
const SwSidebarWin& rSidebarWin )
{
bool bRemoved( false );
- FrmKey aFrmKey( &rFrm );
- FrmSidebarWinContainer::iterator aFrmIter = mpFrmSidebarWinContainer->find( aFrmKey );
- if ( aFrmIter != mpFrmSidebarWinContainer->end() )
+ FrameKey aFrameKey( &rFrame );
+ FrameSidebarWinContainer::iterator aFrameIter = mpFrameSidebarWinContainer->find( aFrameKey );
+ if ( aFrameIter != mpFrameSidebarWinContainer->end() )
{
- SidebarWinContainer& rSidebarWinContainer = (*aFrmIter).second;
+ SidebarWinContainer& rSidebarWinContainer = (*aFrameIter).second;
for ( SidebarWinContainer::iterator aIter = rSidebarWinContainer.begin();
aIter != rSidebarWinContainer.end();
++aIter )
@@ -138,30 +138,30 @@ bool SwFrmSidebarWinContainer::remove( const SwFrm& rFrm,
return bRemoved;
}
-bool SwFrmSidebarWinContainer::empty( const SwFrm& rFrm )
+bool SwFrameSidebarWinContainer::empty( const SwFrame& rFrame )
{
bool bEmpty( true );
- FrmKey aFrmKey( &rFrm );
- FrmSidebarWinContainer::iterator aFrmIter = mpFrmSidebarWinContainer->find( aFrmKey );
- if ( aFrmIter != mpFrmSidebarWinContainer->end() )
+ FrameKey aFrameKey( &rFrame );
+ FrameSidebarWinContainer::iterator aFrameIter = mpFrameSidebarWinContainer->find( aFrameKey );
+ if ( aFrameIter != mpFrameSidebarWinContainer->end() )
{
- bEmpty = (*aFrmIter).second.empty();
+ bEmpty = (*aFrameIter).second.empty();
}
return bEmpty;
}
-SwSidebarWin* SwFrmSidebarWinContainer::get( const SwFrm& rFrm,
+SwSidebarWin* SwFrameSidebarWinContainer::get( const SwFrame& rFrame,
const sal_Int32 nIndex )
{
SwSidebarWin* pRet( nullptr );
- FrmKey aFrmKey( &rFrm );
- FrmSidebarWinContainer::iterator aFrmIter = mpFrmSidebarWinContainer->find( aFrmKey );
- if ( aFrmIter != mpFrmSidebarWinContainer->end() )
+ FrameKey aFrameKey( &rFrame );
+ FrameSidebarWinContainer::iterator aFrameIter = mpFrameSidebarWinContainer->find( aFrameKey );
+ if ( aFrameIter != mpFrameSidebarWinContainer->end() )
{
- SidebarWinContainer& rSidebarWinContainer = (*aFrmIter).second;
+ SidebarWinContainer& rSidebarWinContainer = (*aFrameIter).second;
sal_Int32 nCounter( nIndex );
for ( SidebarWinContainer::iterator aIter = rSidebarWinContainer.begin();
nCounter >= 0 && aIter != rSidebarWinContainer.end();
@@ -180,16 +180,16 @@ SwSidebarWin* SwFrmSidebarWinContainer::get( const SwFrm& rFrm,
return pRet;
}
-void SwFrmSidebarWinContainer::getAll( const SwFrm& rFrm,
+void SwFrameSidebarWinContainer::getAll( const SwFrame& rFrame,
std::vector< vcl::Window* >* pSidebarWins )
{
pSidebarWins->clear();
- FrmKey aFrmKey( &rFrm );
- FrmSidebarWinContainer::iterator aFrmIter = mpFrmSidebarWinContainer->find( aFrmKey );
- if ( aFrmIter != mpFrmSidebarWinContainer->end() )
+ FrameKey aFrameKey( &rFrame );
+ FrameSidebarWinContainer::iterator aFrameIter = mpFrameSidebarWinContainer->find( aFrameKey );
+ if ( aFrameIter != mpFrameSidebarWinContainer->end() )
{
- SidebarWinContainer& rSidebarWinContainer = (*aFrmIter).second;
+ SidebarWinContainer& rSidebarWinContainer = (*aFrameIter).second;
for ( SidebarWinContainer::iterator aIter = rSidebarWinContainer.begin();
aIter != rSidebarWinContainer.end();
++aIter )
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
index 59aa0df6cebf..77594c969985 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
@@ -22,38 +22,38 @@
#include <sal/types.h>
#include <vector>
-class SwFrm;
+class SwFrame;
class SwFormatField;
namespace vcl { class Window; }
namespace sw { namespace sidebarwindows {
class SwSidebarWin;
-class FrmSidebarWinContainer;
+class FrameSidebarWinContainer;
-class SwFrmSidebarWinContainer
+class SwFrameSidebarWinContainer
{
public:
- SwFrmSidebarWinContainer();
- ~SwFrmSidebarWinContainer();
+ SwFrameSidebarWinContainer();
+ ~SwFrameSidebarWinContainer();
- bool insert( const SwFrm& rFrm,
+ bool insert( const SwFrame& rFrame,
const SwFormatField& rFormatField,
SwSidebarWin& rSidebarWin );
- bool remove( const SwFrm& rFrm,
+ bool remove( const SwFrame& rFrame,
const SwSidebarWin& rSidebarWin );
- bool empty( const SwFrm& rFrm );
+ bool empty( const SwFrame& rFrame );
- SwSidebarWin* get( const SwFrm& rFrm,
+ SwSidebarWin* get( const SwFrame& rFrame,
const sal_Int32 nIndex );
- void getAll( const SwFrm& rFrm,
+ void getAll( const SwFrame& rFrame,
std::vector< vcl::Window* >* pSidebarWins );
private:
- FrmSidebarWinContainer* mpFrmSidebarWinContainer;
+ FrameSidebarWinContainer* mpFrameSidebarWinContainer;
};
} } // eof of namespace sw::sidebarwindows::
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 13:43:18 +0000