summaryrefslogtreecommitdiff
path: root/sw/source/uibase/uiview
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/uiview')
-rw-r--r--sw/source/uibase/uiview/formatclipboard.cxx24
-rw-r--r--sw/source/uibase/uiview/pview.cxx14
-rw-r--r--sw/source/uibase/uiview/swcli.cxx12
-rw-r--r--sw/source/uibase/uiview/view.cxx66
-rw-r--r--sw/source/uibase/uiview/view0.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx94
-rw-r--r--sw/source/uibase/uiview/viewdlg.cxx2
-rw-r--r--sw/source/uibase/uiview/viewdlg2.cxx10
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx18
-rw-r--r--sw/source/uibase/uiview/viewling.cxx46
-rw-r--r--sw/source/uibase/uiview/viewmdi.cxx18
-rw-r--r--sw/source/uibase/uiview/viewport.cxx30
-rw-r--r--sw/source/uibase/uiview/viewprt.cxx2
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx36
-rw-r--r--sw/source/uibase/uiview/viewstat.cxx32
-rw-r--r--sw/source/uibase/uiview/viewtab.cxx196
16 files changed, 301 insertions, 301 deletions
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx
index fb16147de311..8f4117809a2b 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -118,7 +118,7 @@ void lcl_getTableAttributes( SfxItemSet& rSet, SwWrtShell &rSh )
rSet.Put( pFrameFormat->GetPageDesc() );
rSet.Put( pFrameFormat->GetLayoutSplit() );
rSet.Put( pFrameFormat->GetKeep() );
- rSet.Put( pFrameFormat->GetFrmDir() );
+ rSet.Put( pFrameFormat->GetFrameDir() );
}
SwFormatRowSplit* pSplit = nullptr;
@@ -288,12 +288,12 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
// get the current PaM, the cursor
// if there several selection it currently point
// on the last (sort by there creation time) selection
- SwPaM* pCrsr = rWrtShell.GetCrsr();
+ SwPaM* pCursor = rWrtShell.GetCursor();
- bool bHasSelection = pCrsr->HasMark();
+ bool bHasSelection = pCursor->HasMark();
bool bForwardSelection = false;
- if(!bHasSelection && pCrsr->IsMultiSelection())
+ if(!bHasSelection && pCursor->IsMultiSelection())
{
// if cursor has multiple selections
@@ -301,18 +301,18 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
rWrtShell.KillPams();
// reset the cursor to the remaining selection
- pCrsr = rWrtShell.GetCrsr();
+ pCursor = rWrtShell.GetCursor();
bHasSelection = true;
}
bool dontMove = false;
if (bHasSelection)
{
- bForwardSelection = (*pCrsr->GetPoint()) > (*pCrsr->GetMark());
+ bForwardSelection = (*pCursor->GetPoint()) > (*pCursor->GetMark());
// clear the selection leaving just the cursor
- pCrsr->DeleteMark();
- pCrsr->SetMark();
+ pCursor->DeleteMark();
+ pCursor->SetMark();
}
else
{
@@ -325,7 +325,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
// revert left and right
if ( rightToLeft )
{
- if (pCrsr->GetPoint()->nContent == 0)
+ if (pCursor->GetPoint()->nContent == 0)
dontMove = true;
else
bForwardSelection = !bForwardSelection;
@@ -334,13 +334,13 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
// move the cursor in order to select one character
if (!dontMove)
- pCrsr->Move( bForwardSelection ? fnMoveBackward : fnMoveForward );
+ pCursor->Move( bForwardSelection ? fnMoveBackward : fnMoveForward );
}
if(pItemSet_TextAttr)
{
if( nSelectionType & (nsSelectionType::SEL_FRM | nsSelectionType::SEL_OLE | nsSelectionType::SEL_GRF) )
- rWrtShell.GetFlyFrmAttr(*pItemSet_TextAttr);
+ rWrtShell.GetFlyFrameAttr(*pItemSet_TextAttr);
else
{
// get the text attributes from named and automatic formatting
@@ -556,7 +556,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo
// apply the character automatic attributes
if( nSelectionType & (nsSelectionType::SEL_FRM | nsSelectionType::SEL_OLE | nsSelectionType::SEL_GRF) )
- rWrtShell.SetFlyFrmAttr(*pTemplateItemSet);
+ rWrtShell.SetFlyFrameAttr(*pTemplateItemSet);
else if ( !bNoCharacterFormats )
rWrtShell.SetAttrSet(*pTemplateItemSet);
}
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index dc727de22312..a3703054ff52 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -505,12 +505,12 @@ void SwPagePreviewWin::MouseButtonDown( const MouseEvent& rMEvt )
{
// close page preview, set new cursor position and switch to
// normal view.
- OUString sNewCrsrPos = OUString::number( aDocPos.X() ) + ";" +
+ OUString sNewCursorPos = OUString::number( aDocPos.X() ) + ";" +
OUString::number( aDocPos.Y() ) + ";";
- mrView.SetNewCrsrPos( sNewCrsrPos );
+ mrView.SetNewCursorPos( sNewCursorPos );
- SfxViewFrame *pTmpFrm = mrView.GetViewFrame();
- pTmpFrm->GetBindings().Execute( SID_VIEWSHELL0, nullptr, 0,
+ SfxViewFrame *pTmpFrame = mrView.GetViewFrame();
+ pTmpFrame->GetBindings().Execute( SID_VIEWSHELL0, nullptr, 0,
SfxCallMode::ASYNCHRON );
}
else if ( bIsDocPos || bPosInEmptyPage )
@@ -957,8 +957,8 @@ MOVEPAGE:
if(GetViewShell()->IsDummyPage( nSelPage ) && GetViewShell()->IsDummyPage( --nSelPage ))
nSelPage +=2;
SetNewPage( nSelPage );
- SfxViewFrame *pTmpFrm = GetViewFrame();
- pTmpFrm->GetBindings().Execute( SID_VIEWSHELL0, nullptr, 0,
+ SfxViewFrame *pTmpFrame = GetViewFrame();
+ pTmpFrame->GetBindings().Execute( SID_VIEWSHELL0, nullptr, 0,
SfxCallMode::ASYNCHRON );
}
break;
@@ -1226,7 +1226,7 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
{
// Set the current page as the first.
sal_uInt16 nPhysPg, nVirtPg;
- static_cast<SwCrsrShell*>(pVS)->GetPageNum( nPhysPg, nVirtPg, true, false );
+ static_cast<SwCursorShell*>(pVS)->GetPageNum( nPhysPg, nVirtPg, true, false );
if( 1 != pViewWin->GetCol() && 1 == nPhysPg )
--nPhysPg;
pViewWin->SetSttPage( nPhysPg );
diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx
index c67b46899498..93c6cfeb4394 100644
--- a/sw/source/uibase/uiview/swcli.cxx
+++ b/sw/source/uibase/uiview/swcli.cxx
@@ -47,7 +47,7 @@ void SwOleClient::RequestNewObjectArea( Rectangle& aLogRect )
// are set to the desired value. This value will be passed on to the
// InPlaceClient.
// The core accepts or formats the adjusted values not necessarily.
- // If the Ole-Frm is formatted, then the CalcAndSetScale() of the WrtShell
+ // If the Ole-Frame is formatted, then the CalcAndSetScale() of the WrtShell
// will be called. There the scaling of the SwOleClient is set if necessary.
SwWrtShell &rSh = static_cast<SwView*>(GetViewShell())->GetWrtShell();
@@ -78,18 +78,18 @@ void SwOleClient::RequestNewObjectArea( Rectangle& aLogRect )
rSh.EndAllAction();
- SwRect aFrm( rSh.GetAnyCurRect( RECT_FLY_EMBEDDED, nullptr, GetObject() )),
+ SwRect aFrame( rSh.GetAnyCurRect( RECT_FLY_EMBEDDED, nullptr, GetObject() )),
aPrt( rSh.GetAnyCurRect( RECT_FLY_PRT_EMBEDDED, nullptr, GetObject() ));
- aLogRect.SetPos( aPrt.Pos() + aFrm.Pos() );
+ aLogRect.SetPos( aPrt.Pos() + aFrame.Pos() );
aLogRect.SetSize( aPrt.SSize() );
}
void SwOleClient::ObjectAreaChanged()
{
SwWrtShell &rSh = static_cast<SwView*>(GetViewShell())->GetWrtShell();
- SwRect aFrm( rSh.GetAnyCurRect( RECT_FLY_EMBEDDED, nullptr, GetObject() ));
- if ( !aFrm.IsOver( rSh.VisArea() ) )
- rSh.MakeVisible( aFrm );
+ SwRect aFrame( rSh.GetAnyCurRect( RECT_FLY_EMBEDDED, nullptr, GetObject() ));
+ if ( !aFrame.IsOver( rSh.VisArea() ) )
+ rSh.MakeVisible( aFrame );
}
void SwOleClient::ViewChanged()
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 1c2de7cb6c98..0cd0cc34ee14 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -463,7 +463,7 @@ extern "C"
}
}
-IMPL_LINK_NOARG_TYPED(SwView, AttrChangedNotify, SwCrsrShell*, void)
+IMPL_LINK_NOARG_TYPED(SwView, AttrChangedNotify, SwCursorShell*, void)
{
if ( GetEditWin().IsChainMode() )
GetEditWin().SetChainMode( false );
@@ -546,7 +546,7 @@ void SwView::_CheckReadonlyState()
eStateProtAll = rDis.QueryState( FN_EDIT_REGION, pItem );
bool bChgd = false;
- if ( !m_pWrtShell->IsCrsrReadonly() )
+ if ( !m_pWrtShell->IsCursorReadonly() )
{
static sal_uInt16 aROIds[] =
{
@@ -725,7 +725,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
// If the view is switch from one to another, the 'old' view is given by
// parameter <pOldSh>.
- m_bCenterCrsr = m_bTopCrsr = m_bAlwaysShowSel = m_bTabColFromDoc = m_bTabRowFromDoc =
+ m_bCenterCursor = m_bTopCursor = m_bAlwaysShowSel = m_bTabColFromDoc = m_bTabRowFromDoc =
m_bSetTabColFromDoc = m_bSetTabRowFromDoc = m_bAttrChgNotified = m_bAttrChgNotifiedWithRegistrations =
m_bVerbsActive = m_bDrawRotate = m_bInOuterResizePixel = m_bInInnerResizePixel =
m_bPasteState = m_bPasteSpecialState = m_bMakeSelectionVisible = false;
@@ -773,10 +773,10 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
if( dynamic_cast<const SwPagePreview *>(pExistingSh) != nullptr )
{
m_sSwViewData = static_cast<SwPagePreview*>(pExistingSh)->GetPrevSwViewData();
- m_sNewCrsrPos = static_cast<SwPagePreview*>(pExistingSh)->GetNewCrsrPos();
+ m_sNewCursorPos = static_cast<SwPagePreview*>(pExistingSh)->GetNewCursorPos();
m_nNewPage = static_cast<SwPagePreview*>(pExistingSh)->GetNewPage();
m_bOldShellWasPagePreview = true;
- m_bIsPreviewDoubleClick = !m_sNewCrsrPos.isEmpty() || m_nNewPage != USHRT_MAX;
+ m_bIsPreviewDoubleClick = !m_sNewCursorPos.isEmpty() || m_nNewPage != USHRT_MAX;
}
else if( dynamic_cast<const SwSrcView *>(pExistingSh) != nullptr )
bOldShellWasSrcView = true;
@@ -1096,7 +1096,7 @@ void SwView::WriteUserData( OUString &rUserData, bool bBrowse )
rUserData += OUString::number(
(sal_uInt16)m_pWrtShell->GetViewOptions()->GetZoomType());//eZoom;
rUserData += ";";
- rUserData += FrmTypeFlags::NONE == m_pWrtShell->GetSelFrmType() ? OUString("0") : OUString("1");
+ rUserData += FrameTypeFlags::NONE == m_pWrtShell->GetSelFrameType() ? OUString("0") : OUString("1");
}
// Set CursorPos
@@ -1132,7 +1132,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse )
// because which parameter is evaluated first?
long nX = rUserData.getToken( 0, ';', nPos ).toInt32(),
nY = rUserData.getToken( 0, ';', nPos ).toInt32();
- Point aCrsrPos( nX, nY );
+ Point aCursorPos( nX, nY );
sal_uInt16 nZoomFactor =
static_cast< sal_uInt16 >( rUserData.getToken(0, ';', nPos ).toInt32() );
@@ -1160,10 +1160,10 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse )
}
bool bSelectObj = (0 != rUserData.getToken( nOff, ';', nPos ).toInt32())
- && m_pWrtShell->IsObjSelectable( aCrsrPos );
+ && m_pWrtShell->IsObjSelectable( aCursorPos );
// restore editing position
- m_pViewImpl->SetRestorePosition(aCrsrPos, bSelectObj);
+ m_pViewImpl->SetRestorePosition(aCursorPos, bSelectObj);
// set flag value to avoid macro execution.
bool bSavedFlagValue = m_pWrtShell->IsMacroExecAllowed();
m_pWrtShell->SetMacroExecAllowed( false );
@@ -1171,11 +1171,11 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse )
// go to the last editing position when opening own files
if(m_bOldShellWasPagePreview || bIsOwnDocument)
{
- m_pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj );
+ m_pWrtShell->SwCursorShell::SetCursor( aCursorPos, !bSelectObj );
if( bSelectObj )
{
- m_pWrtShell->SelectObj( aCrsrPos );
- m_pWrtShell->EnterSelFrmMode( &aCrsrPos );
+ m_pWrtShell->SelectObj( aCursorPos );
+ m_pWrtShell->EnterSelFrameMode( &aCursorPos );
}
}
@@ -1196,21 +1196,21 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse )
}
//apply information from print preview - if available
- if( !m_sNewCrsrPos.isEmpty() )
+ if( !m_sNewCursorPos.isEmpty() )
{
- long nXTmp = m_sNewCrsrPos.getToken( 0, ';' ).toInt32(),
- nYTmp = m_sNewCrsrPos.getToken( 1, ';' ).toInt32();
- Point aCrsrPos2( nXTmp, nYTmp );
- bSelectObj = m_pWrtShell->IsObjSelectable( aCrsrPos2 );
+ long nXTmp = m_sNewCursorPos.getToken( 0, ';' ).toInt32(),
+ nYTmp = m_sNewCursorPos.getToken( 1, ';' ).toInt32();
+ Point aCursorPos2( nXTmp, nYTmp );
+ bSelectObj = m_pWrtShell->IsObjSelectable( aCursorPos2 );
- m_pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos2 );
+ m_pWrtShell->SwCursorShell::SetCursor( aCursorPos2 );
if( bSelectObj )
{
- m_pWrtShell->SelectObj( aCrsrPos2 );
- m_pWrtShell->EnterSelFrmMode( &aCrsrPos2 );
+ m_pWrtShell->SelectObj( aCursorPos2 );
+ m_pWrtShell->EnterSelFrameMode( &aCursorPos2 );
}
m_pWrtShell->MakeSelVisible();
- m_sNewCrsrPos.clear();
+ m_sNewCursorPos.clear();
}
else if(USHRT_MAX != m_nNewPage)
{
@@ -1254,7 +1254,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
bool bViewLayoutBookMode = pVOpt->IsViewLayoutBookMode();
sal_Int16 nViewLayoutColumns = pVOpt->GetViewLayoutColumns();
- bool bSelectedFrame = ( m_pWrtShell->GetSelFrmType() != FrmTypeFlags::NONE ),
+ bool bSelectedFrame = ( m_pWrtShell->GetSelFrameType() != FrameTypeFlags::NONE ),
bGotVisibleLeft = false,
bGotVisibleTop = false, bGotVisibleRight = false,
bGotVisibleBottom = false, bGotZoomType = false,
@@ -1326,7 +1326,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
}
if (bGotVisibleBottom)
{
- Point aCrsrPos( nX, nY );
+ Point aCursorPos( nX, nY );
const long nAdd = m_pWrtShell->GetViewOptions()->getBrowseMode() ? DOCUMENTBORDER : DOCUMENTBORDER*2;
if (nBottom <= (m_pWrtShell->GetDocSize().Height()+nAdd) )
{
@@ -1342,17 +1342,17 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
}
if (bGotIsSelectedFrame)
{
- bool bSelectObj = bSelectedFrame && m_pWrtShell->IsObjSelectable( aCrsrPos );
+ bool bSelectObj = bSelectedFrame && m_pWrtShell->IsObjSelectable( aCursorPos );
// set flag value to avoid macro execution.
bool bSavedFlagValue = m_pWrtShell->IsMacroExecAllowed();
m_pWrtShell->SetMacroExecAllowed( false );
// os: changed: The user data has to be read if the view is switched back from page preview
// go to the last editing position when opening own files
- m_pViewImpl->SetRestorePosition(aCrsrPos, bSelectObj);
+ m_pViewImpl->SetRestorePosition(aCursorPos, bSelectObj);
if(m_bOldShellWasPagePreview|| bIsOwnDocument)
{
- m_pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj );
+ m_pWrtShell->SwCursorShell::SetCursor( aCursorPos, !bSelectObj );
// Update the shell to toggle Header/Footer edit if needed
bool bInHeader = true;
@@ -1377,8 +1377,8 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
if( bSelectObj )
{
- m_pWrtShell->SelectObj( aCrsrPos );
- m_pWrtShell->EnterSelFrmMode( &aCrsrPos );
+ m_pWrtShell->SelectObj( aCursorPos );
+ m_pWrtShell->EnterSelFrameMode( &aCursorPos );
}
}
@@ -1509,7 +1509,7 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe
pValue++;nIndex++;
pValue->Name = "IsSelectedFrame";
- pValue->Value <<= FrmTypeFlags::NONE != m_pWrtShell->GetSelFrmType();
+ pValue->Value <<= FrameTypeFlags::NONE != m_pWrtShell->GetSelFrameType();
nIndex++;
assert(nIndex == NUM_VIEW_SETTINGS);
@@ -1524,9 +1524,9 @@ void SwView::ShowCursor( bool bOn )
m_pWrtShell->LockView( true ); //lock visible section
if( !bOn )
- m_pWrtShell->HideCrsr();
- else if( !m_pWrtShell->IsFrmSelected() && !m_pWrtShell->IsObjSelected() )
- m_pWrtShell->ShowCrsr();
+ m_pWrtShell->HideCursor();
+ else if( !m_pWrtShell->IsFrameSelected() && !m_pWrtShell->IsObjSelected() )
+ m_pWrtShell->ShowCursor();
if( bUnlockView )
m_pWrtShell->LockView( false );
@@ -1548,7 +1548,7 @@ ErrCode SwView::DoVerb( long nVerb )
bool SwView::HasSelection( bool bText ) const
{
- return bText ? GetWrtShell().SwCrsrShell::HasSelection()
+ return bText ? GetWrtShell().SwCursorShell::HasSelection()
: GetWrtShell().HasSelection();
}
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index aaa4703a9fa5..1218818e8109 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -133,7 +133,7 @@ void SwView::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOpt
m_pWrtShell->ApplyAccessiblityOptions(rAccessibilityOptions);
//to enable the right state of the selection cursor in readonly documents
if(GetDocShell()->IsReadOnly())
- m_pWrtShell->ShowCrsr();
+ m_pWrtShell->ShowCursor();
}
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 853120e3a8ef..a8c83ce524ce 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -249,7 +249,7 @@ int SwView::InsertGraphic( const OUString &rPath, const OUString &rFilter,
}
}
- SwFlyFrmAttrMgr aFrameManager( true, GetWrtShellPtr(), FRMMGR_TYPE_GRF );
+ SwFlyFrameAttrMgr aFrameManager( true, GetWrtShellPtr(), FRMMGR_TYPE_GRF );
SwWrtShell& rShell = GetWrtShell();
// #i123922# determine if we really want to insert or replace the graphic at a selected object
@@ -324,11 +324,11 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
// pool formats
- const ::std::vector<OUString>& rFrmPoolArr(
+ const ::std::vector<OUString>& rFramePoolArr(
SwStyleNameMapper::GetFrameFormatUINameArray());
- for( size_t i = 0; i < rFrmPoolArr.size(); ++i )
+ for( size_t i = 0; i < rFramePoolArr.size(); ++i )
{
- aFormats.push_back(rFrmPoolArr[i]);
+ aFormats.push_back(rFramePoolArr[i]);
}
std::sort(aFormats.begin(), aFormats.end());
@@ -465,7 +465,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
// #i123922# no new FrameFormat for replace mode, only when new object was created,
// else this would reset the current setting for the frame holding the graphic
- if ( !bReplaceMode && rSh.IsFrmSelected() )
+ if ( !bReplaceMode && rSh.IsFrameSelected() )
{
SwFrameFormat* pFormat = pDoc->FindFrameFormatByName( sGraphicFormat );
if(!pFormat)
@@ -558,9 +558,9 @@ void SwView::Execute(SfxRequest &rReq)
Rectangle aVis( GetVisArea() );
SwEditWin& rTmpWin = GetEditWin();
if ( FN_PAGEUP == nSlot || FN_PAGEUP_SEL == nSlot )
- PageUpCrsr(FN_PAGEUP_SEL == nSlot);
+ PageUpCursor(FN_PAGEUP_SEL == nSlot);
else
- PageDownCrsr(FN_PAGEDOWN_SEL == nSlot);
+ PageDownCursor(FN_PAGEDOWN_SEL == nSlot);
rReq.SetReturnValue(SfxBoolItem(nSlot,
aVis != GetVisArea()));
@@ -672,7 +672,7 @@ void SwView::Execute(SfxRequest &rReq)
case FN_REDLINE_REJECT_DIRECT:
{
SwDoc *pDoc = m_pWrtShell->GetDoc();
- SwPaM *pCursor = m_pWrtShell->GetCrsr();
+ SwPaM *pCursor = m_pWrtShell->GetCursor();
if( pCursor->HasMark())
{
if (FN_REDLINE_ACCEPT_DIRECT == nSlot)
@@ -723,7 +723,7 @@ void SwView::Execute(SfxRequest &rReq)
case FN_REDLINE_PREV_CHANGE:
{
- const SwPaM *pCursor = m_pWrtShell->GetCrsr();
+ const SwPaM *pCursor = m_pWrtShell->GetCursor();
const SwPosition initialCursorStart = *pCursor->Start();
const SwRangeRedline *pPrev = m_pWrtShell->SelPrevRedline();
@@ -807,7 +807,7 @@ void SwView::Execute(SfxRequest &rReq)
if ( m_pWrtShell->HasDrawView() && m_pWrtShell->GetDrawView()->IsDragObj() )
{
m_pWrtShell->BreakDrag();
- m_pWrtShell->EnterSelFrmMode();
+ m_pWrtShell->EnterSelFrameMode();
}
else if ( m_pWrtShell->IsDrawCreate() )
{
@@ -854,8 +854,8 @@ void SwView::Execute(SfxRequest &rReq)
const SwFrameFormat* pFormat = m_pWrtShell->GetFlyFrameFormat();
if(m_pWrtShell->GotoFly( pFormat->GetName(), FLYCNTTYPE_FRM ))
{
- m_pWrtShell->HideCrsr();
- m_pWrtShell->EnterSelFrmMode();
+ m_pWrtShell->HideCursor();
+ m_pWrtShell->EnterSelFrameMode();
}
}
else
@@ -929,7 +929,7 @@ void SwView::Execute(SfxRequest &rReq)
{
m_pWrtShell->StartAction();
m_pWrtShell->EnterStdMode();
- bool bOldCrsrInReadOnly = m_pWrtShell->IsReadOnlyAvailable();
+ bool bOldCursorInReadOnly = m_pWrtShell->IsReadOnlyAvailable();
m_pWrtShell->SetReadOnlyAvailable( true );
for( int i = 0; i < 2; ++i )
@@ -965,7 +965,7 @@ void SwView::Execute(SfxRequest &rReq)
pBase = nullptr;
}
}
- m_pWrtShell->SetReadOnlyAvailable( bOldCrsrInReadOnly );
+ m_pWrtShell->SetReadOnlyAvailable( bOldCursorInReadOnly );
m_pWrtShell->EndAction();
}
break;
@@ -1226,15 +1226,15 @@ void SwView::Execute(SfxRequest &rReq)
case SID_RESTORE_EDITING_VIEW:
{
//#i33307# restore editing position
- Point aCrsrPos;
+ Point aCursorPos;
bool bSelectObj;
- if(m_pViewImpl->GetRestorePosition(aCrsrPos, bSelectObj))
+ if(m_pViewImpl->GetRestorePosition(aCursorPos, bSelectObj))
{
- m_pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj );
+ m_pWrtShell->SwCursorShell::SetCursor( aCursorPos, !bSelectObj );
if( bSelectObj )
{
- m_pWrtShell->SelectObj( aCrsrPos );
- m_pWrtShell->EnterSelFrmMode( &aCrsrPos );
+ m_pWrtShell->SelectObj( aCursorPos );
+ m_pWrtShell->EnterSelFrameMode( &aCursorPos );
}
}
}
@@ -1298,19 +1298,19 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
OUString sCurrentSectionName = CurrSect->GetSectionName();
if(sCurrentSectionName != m_sOldSectionName)
{
- SwCrsrShell::FireSectionChangeEvent(2, 1);
+ SwCursorShell::FireSectionChangeEvent(2, 1);
}
m_sOldSectionName = sCurrentSectionName;
}
else if (!m_sOldSectionName.isEmpty())
{
- SwCrsrShell::FireSectionChangeEvent(2, 1);
+ SwCursorShell::FireSectionChangeEvent(2, 1);
m_sOldSectionName= OUString();
}
//get column change event
if(rShell.bColumnChange())
{
- SwCrsrShell::FireColumnChangeEvent(2, 1);
+ SwCursorShell::FireColumnChangeEvent(2, 1);
}
while( nWhich )
@@ -1321,14 +1321,14 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
// number of pages, log. page number
sal_uInt16 nPage, nLogPage;
OUString sDisplay;
- rShell.GetPageNumber( -1, rShell.IsCrsrVisible(), nPage, nLogPage, sDisplay );
+ rShell.GetPageNumber( -1, rShell.IsCursorVisible(), nPage, nLogPage, sDisplay );
rSet.Put( SfxStringItem( FN_STAT_PAGE,
GetPageStr( nPage, nLogPage, sDisplay) ));
//if existing page number is not equal to old page number, send out this event.
if (m_nOldPageNum != nLogPage )
{
if (m_nOldPageNum != 0)
- SwCrsrShell::FirePageChangeEvent(m_nOldPageNum, nLogPage);
+ SwCursorShell::FirePageChangeEvent(m_nOldPageNum, nLogPage);
m_nOldPageNum = nLogPage;
}
const sal_uInt16 nCnt = GetWrtShell().GetPageCnt();
@@ -1466,11 +1466,11 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
case SID_ATTR_POSITION:
case SID_ATTR_SIZE:
{
- if( !rShell.IsFrmSelected() && !rShell.IsObjSelected() )
- SwBaseShell::_SetFrmMode( FLY_DRAG_END );
+ if( !rShell.IsFrameSelected() && !rShell.IsObjSelected() )
+ SwBaseShell::_SetFrameMode( FLY_DRAG_END );
else
{
- FlyMode eFrameMode = SwBaseShell::GetFrmMode();
+ FlyMode eFrameMode = SwBaseShell::GetFrameMode();
if ( eFrameMode == FLY_DRAG_START || eFrameMode == FLY_DRAG )
{
if ( nWhich == SID_ATTR_POSITION )
@@ -1485,7 +1485,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
break;
case SID_TABLE_CELL:
- if( rShell.IsFrmSelected() || rShell.IsObjSelected() )
+ if( rShell.IsFrameSelected() || rShell.IsObjSelected() )
{
// #i39171# Don't put a SvxSizeItem into a slot which is defined as SfxStringItem.
// SvxPosSizeStatusBarControl no longer resets to empty display if only one slot
@@ -1495,7 +1495,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
else
{
OUString sStr;
- if( rShell.IsCrsrInTable() )
+ if( rShell.IsCursorInTable() )
{
// table name + cell coordinate
sStr = rShell.GetTableFormat()->GetName();
@@ -1530,7 +1530,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
}
}
- const SwNumRule* pNumRule = rShell.GetNumRuleAtCurrCrsrPos();
+ const SwNumRule* pNumRule = rShell.GetNumRuleAtCurrCursorPos();
const bool bOutlineNum = pNumRule && pNumRule->IsOutlineRule();
if (pNumRule && !bOutlineNum ) // cursor in numbering
@@ -1776,7 +1776,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
case SID_ATTR_SIZE:
{
sal_uInt16 nId = 0;
- if( rSh.IsCrsrInTable() )
+ if( rSh.IsCursorInTable() )
nId = FN_FORMAT_TABLE_DLG;
else if( rSh.GetCurTOX() )
nId = FN_INSERT_MULTI_TOX;
@@ -1784,7 +1784,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
nId = FN_EDIT_REGION;
else
{
- const SwNumRule* pNumRule = rSh.GetNumRuleAtCurrCrsrPos();
+ const SwNumRule* pNumRule = rSh.GetNumRuleAtCurrCursorPos();
if( pNumRule ) // cursor in numbering
{
if( pNumRule->IsAutoRule() )
@@ -1795,7 +1795,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
nId = 0;
}
}
- else if( rSh.IsFrmSelected() )
+ else if( rSh.IsFrameSelected() )
nId = FN_FORMAT_FRAME_DLG;
else if( rSh.IsObjSelected() )
nId = SID_ATTR_TRANSFORM;
@@ -1877,15 +1877,15 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
}
}
-void SwView::InsFrmMode(sal_uInt16 nCols)
+void SwView::InsFrameMode(sal_uInt16 nCols)
{
if ( m_pWrtShell->HasWholeTabSelection() )
{
- SwFlyFrmAttrMgr aMgr( true, m_pWrtShell, FRMMGR_TYPE_TEXT );
+ SwFlyFrameAttrMgr aMgr( true, m_pWrtShell, FRMMGR_TYPE_TEXT );
const SwFrameFormat &rPageFormat =
m_pWrtShell->GetPageDesc(m_pWrtShell->GetCurPageDesc()).GetMaster();
- SwTwips lWidth = rPageFormat.GetFrmSize().GetWidth();
+ SwTwips lWidth = rPageFormat.GetFrameSize().GetWidth();
const SvxLRSpaceItem &rLR = rPageFormat.GetLRSpace();
lWidth -= rLR.GetLeft() + rLR.GetRight();
aMgr.SetSize(Size(lWidth, aMgr.GetSize().Height()));
@@ -1895,10 +1895,10 @@ void SwView::InsFrmMode(sal_uInt16 nCols)
aCol.Init( nCols, aCol.GetGutterWidth(), aCol.GetWishWidth() );
aMgr.SetCol( aCol );
}
- aMgr.InsertFlyFrm();
+ aMgr.InsertFlyFrame();
}
else
- GetEditWin().InsFrm(nCols);
+ GetEditWin().InsFrame(nCols);
}
/// show "edit link" dialog
@@ -1919,9 +1919,9 @@ bool SwView::JumpToSwMark( const OUString& rMark )
if( !rMark.isEmpty() )
{
// place bookmark at top-center
- bool bSaveCC = IsCrsrAtCenter();
- bool bSaveCT = IsCrsrAtTop();
- SetCrsrAtTop( true );
+ bool bSaveCC = IsCursorAtCenter();
+ bool bSaveCT = IsCursorAtTop();
+ SetCursorAtTop( true );
// For scrolling the FrameSet, the corresponding shell needs to have the focus.
bool bHasShFocus = m_pWrtShell->HasShFcs();
@@ -2015,13 +2015,13 @@ bool SwView::JumpToSwMark( const OUString& rMark )
if( FLYCNTTYPE_FRM == eFlyType )
{
// TextFrames: set Cursor in the frame
- m_pWrtShell->UnSelectFrm();
- m_pWrtShell->LeaveSelFrmMode();
+ m_pWrtShell->UnSelectFrame();
+ m_pWrtShell->LeaveSelFrameMode();
}
else
{
- m_pWrtShell->HideCrsr();
- m_pWrtShell->EnterSelFrmMode();
+ m_pWrtShell->HideCursor();
+ m_pWrtShell->EnterSelFrameMode();
}
}
}
@@ -2035,7 +2035,7 @@ bool SwView::JumpToSwMark( const OUString& rMark )
m_bMakeSelectionVisible = true;
// reset ViewStatus
- SetCrsrAtTop( bSaveCT, bSaveCC );
+ SetCursorAtTop( bSaveCT, bSaveCC );
if( !bHasShFocus )
m_pWrtShell->ShLooseFcs();
@@ -2200,7 +2200,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
uno::Reference<text::XTextRange> const xInsertPosition(
SwXTextRange::CreateXTextRange(*pDoc,
- *m_pWrtShell->GetCrsr()->GetPoint(), nullptr));
+ *m_pWrtShell->GetCursor()->GetPoint(), nullptr));
nErrno = pDocSh->ImportFrom(*pMedium, xInsertPosition)
? 0 : ERR_SWG_READ_ERROR;
}
diff --git a/sw/source/uibase/uiview/viewdlg.cxx b/sw/source/uibase/uiview/viewdlg.cxx
index a14eeee8037c..ef2e8345a143 100644
--- a/sw/source/uibase/uiview/viewdlg.cxx
+++ b/sw/source/uibase/uiview/viewdlg.cxx
@@ -53,7 +53,7 @@ void SwView::ExecDlg(SfxRequest &rReq)
sal_uInt16 nOldValue = m_pWrtShell->GetPageOffset();
sal_uInt16 nPage, nLogPage;
m_pWrtShell->GetPageNum( nPage, nLogPage,
- m_pWrtShell->IsCrsrVisible(), false);
+ m_pWrtShell->IsCursorVisible(), false);
if(nValue != nOldValue || nValue != nLogPage)
{
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index d5ab1c5ef626..4a0273185357 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -179,10 +179,10 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
rSh.EndAllAction();
- if ( rSh.IsFrmSelected() )
+ if ( rSh.IsFrameSelected() )
{
- GetEditWin().StopInsFrm();
- rSh.EnterSelFrmMode();
+ GetEditWin().StopInsFrame();
+ rSh.EnterSelFrameMode();
}
// remember category
@@ -191,9 +191,9 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
else if( eType & nsSelectionType::SEL_TBL)
SetOldTabCat(rName);
else if( eType & nsSelectionType::SEL_FRM)
- SetOldFrmCat(rName);
+ SetOldFrameCat(rName);
else if( eType == nsSelectionType::SEL_TXT)
- SetOldFrmCat(rName);
+ SetOldFrameCat(rName);
else if( eType & nsSelectionType::SEL_DRW)
SetOldDrwCat(rName);
}
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index a8b4cc4768fd..bdda3e628d55 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -240,8 +240,8 @@ void SwView::ExecDraw(SfxRequest& rReq)
SetDrawFuncPtr(nullptr);
}
- if (m_pWrtShell->IsObjSelected() && !m_pWrtShell->IsSelFrmMode())
- m_pWrtShell->EnterSelFrmMode();
+ if (m_pWrtShell->IsObjSelected() && !m_pWrtShell->IsSelFrameMode())
+ m_pWrtShell->EnterSelFrameMode();
LeaveDrawCreate();
GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW);
@@ -252,7 +252,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
LeaveDrawCreate();
- if (m_pWrtShell->IsFrmSelected())
+ if (m_pWrtShell->IsFrameSelected())
m_pWrtShell->EnterStdMode(); // because bug #45639
SwDrawBase* pFuncPtr = nullptr;
@@ -383,8 +383,8 @@ void SwView::ExecDraw(SfxRequest& rReq)
}
else
{
- if (m_pWrtShell->IsObjSelected() && !m_pWrtShell->IsSelFrmMode())
- m_pWrtShell->EnterSelFrmMode();
+ if (m_pWrtShell->IsObjSelected() && !m_pWrtShell->IsSelFrameMode())
+ m_pWrtShell->EnterSelFrameMode();
}
if(bEndTextEdit && pSdrView && pSdrView->IsTextEdit())
@@ -411,7 +411,7 @@ void SwView::ExitDraw()
}
while( pTest && pTest != this && pTest != m_pShell);
if(pTest == m_pShell &&
- // don't call LeaveSelFrmMode() etc. for the below,
+ // don't call LeaveSelFrameMode() etc. for the below,
// because objects may still be selected:
dynamic_cast< const SwDrawBaseShell *>( m_pShell ) == nullptr &&
dynamic_cast< const SwBezierShell *>( m_pShell ) == nullptr &&
@@ -429,8 +429,8 @@ void SwView::ExitDraw()
if (GetDrawFuncPtr())
{
- if (m_pWrtShell->IsSelFrmMode())
- m_pWrtShell->LeaveSelFrmMode();
+ if (m_pWrtShell->IsSelFrameMode())
+ m_pWrtShell->LeaveSelFrameMode();
GetDrawFuncPtr()->Deactivate();
SetDrawFuncPtr(nullptr);
@@ -656,7 +656,7 @@ void SwView::SetSelDrawSlot()
bool SwView::AreOnlyFormsSelected() const
{
- if ( GetWrtShell().IsFrmSelected() )
+ if ( GetWrtShell().IsFrameSelected() )
return false;
bool bForm = true;
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index b9e2ef4589a4..4b4c2a230a3d 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -174,7 +174,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
m_pWrtShell->StartAction();
// remember cursor position data for later restoration of the cursor
- const SwPosition *pPoint = m_pWrtShell->GetCrsr()->GetPoint();
+ const SwPosition *pPoint = m_pWrtShell->GetCursor()->GetPoint();
bool bRestoreCursor = pPoint->nNode.GetNode().IsTextNode();
const SwNodeIndex aPointNodeIndex( pPoint->nNode );
sal_Int32 nPointIndex = pPoint->nContent.GetIndex();
@@ -196,7 +196,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
if (!pTextNode || pTextNode->GetText().getLength() < nPointIndex)
nPointIndex = 0;
// restore cursor to its original position
- m_pWrtShell->GetCrsr()->GetPoint()->nContent.Assign( pTextNode, nPointIndex );
+ m_pWrtShell->GetCursor()->GetPoint()->nContent.Assign( pTextNode, nPointIndex );
}
// enable all, restore view and cursor position
@@ -243,11 +243,11 @@ void SwView::StartTextConversion(
bool bOldIns = m_pWrtShell->IsInsMode();
m_pWrtShell->SetInsMode();
- const bool bSelection = static_cast<SwCrsrShell*>(m_pWrtShell)->HasSelection() ||
- m_pWrtShell->GetCrsr() != m_pWrtShell->GetCrsr()->GetNext();
+ const bool bSelection = static_cast<SwCursorShell*>(m_pWrtShell)->HasSelection() ||
+ m_pWrtShell->GetCursor() != m_pWrtShell->GetCursor()->GetNext();
const bool bStart = bSelection || m_pWrtShell->IsStartOfDoc();
- const bool bOther = !bSelection && !(m_pWrtShell->GetFrmType(nullptr,true) & FrmTypeFlags::BODY);
+ const bool bOther = !bSelection && !(m_pWrtShell->GetFrameType(nullptr,true) & FrameTypeFlags::BODY);
{
const uno::Reference< uno::XComponentContext > xContext(
@@ -451,12 +451,12 @@ void SwView::HyphenateDocument()
m_pWrtShell->StartUndo(UNDO_INSATTR); // valid later
bool bHyphSpecial = xProp.is() && xProp->getIsHyphSpecial();
- bool bSelection = static_cast<SwCrsrShell*>(m_pWrtShell)->HasSelection() ||
- m_pWrtShell->GetCrsr() != m_pWrtShell->GetCrsr()->GetNext();
+ bool bSelection = static_cast<SwCursorShell*>(m_pWrtShell)->HasSelection() ||
+ m_pWrtShell->GetCursor() != m_pWrtShell->GetCursor()->GetNext();
bool bOther = m_pWrtShell->HasOtherCnt() && bHyphSpecial && !bSelection;
bool bStart = bSelection || ( !bOther && m_pWrtShell->IsStartOfDoc() );
bool bStop = false;
- if( !bOther && !(m_pWrtShell->GetFrmType(nullptr,true) & FrmTypeFlags::BODY) && !bSelection )
+ if( !bOther && !(m_pWrtShell->GetFrameType(nullptr,true) & FrameTypeFlags::BODY) && !bSelection )
// turned on no special area
{
// I want also in special areas hyphenation
@@ -488,8 +488,8 @@ bool SwView::IsValidSelectionForThesaurus() const
// must not be a multi-selection, and if it is a selection it needs
// to be within a single paragraph
- const bool bMultiSel = m_pWrtShell->GetCrsr()->IsMultiSelection();
- const bool bSelection = static_cast<SwCrsrShell*>(m_pWrtShell)->HasSelection();
+ const bool bMultiSel = m_pWrtShell->GetCursor()->IsMultiSelection();
+ const bool bSelection = static_cast<SwCursorShell*>(m_pWrtShell)->HasSelection();
return !bMultiSel && (!bSelection || m_pWrtShell->IsSelOnePara() );
}
@@ -527,9 +527,9 @@ void SwView::InsertThesaurusSynonym( const OUString &rSynonmText, const OUString
++nRight;
// adjust existing selection
- SwPaM *pCrsr = m_pWrtShell->GetCrsr();
- pCrsr->GetPoint()->nContent -= nRight;
- pCrsr->GetMark()->nContent += nLeft;
+ SwPaM *pCursor = m_pWrtShell->GetCursor();
+ pCursor->GetPoint()->nContent -= nRight;
+ pCursor->GetMark()->nContent += nLeft;
}
m_pWrtShell->Insert( rSynonmText );
@@ -566,7 +566,7 @@ void SwView::StartThesaurus()
pVOpt->SetIdle( false );
// get initial LookUp text
- const bool bSelection = static_cast<SwCrsrShell*>(m_pWrtShell)->HasSelection();
+ const bool bSelection = static_cast<SwCursorShell*>(m_pWrtShell)->HasSelection();
OUString aTmp = GetThesaurusLookUpText( bSelection );
Reference< XThesaurus > xThes( ::GetThesaurus() );
@@ -635,31 +635,31 @@ bool SwView::ExecSpellPopup(const Point& rPt)
{
if (m_pWrtShell->GetSelectionType() & nsSelectionType::SEL_DRW_TXT)
bRet = ExecDrwTextSpellPopup(rPt);
- else if (!m_pWrtShell->IsSelFrmMode())
+ else if (!m_pWrtShell->IsSelFrameMode())
{
const bool bOldViewLock = m_pWrtShell->IsViewLocked();
m_pWrtShell->LockView( true );
m_pWrtShell->Push();
SwRect aToFill;
- SwCrsrShell *pCrsrShell = static_cast<SwCrsrShell*>(m_pWrtShell);
- SwPaM *pCrsr = pCrsrShell->GetCrsr();
- SwPosition aPoint(*pCrsr->GetPoint());
+ SwCursorShell *pCursorShell = static_cast<SwCursorShell*>(m_pWrtShell);
+ SwPaM *pCursor = pCursorShell->GetCursor();
+ SwPosition aPoint(*pCursor->GetPoint());
const SwTextNode *pNode = aPoint.nNode.GetNode().GetTextNode();
// Spell-check in case the idle jobs haven't had a chance to kick in.
// This makes it possible to suggest spelling corrections for
// wrong words independent of the spell-checking idle job.
if (pNode && pNode->IsWrongDirty() &&
- !pCrsrShell->IsTableMode() &&
- !pCrsr->HasMark() && !pCrsr->IsMultiSelection())
+ !pCursorShell->IsTableMode() &&
+ !pCursor->HasMark() && !pCursor->IsMultiSelection())
{
- SwContentFrm *pContentFrame = pCrsr->GetContentNode()->getLayoutFrm(
- pCrsrShell->GetLayout(),
+ SwContentFrame *pContentFrame = pCursor->GetContentNode()->getLayoutFrame(
+ pCursorShell->GetLayout(),
&rPt, &aPoint, false);
if (pContentFrame)
{
- SwRect aRepaint(static_cast<SwTextFrm*>(pContentFrame)->_AutoSpell(nullptr, 0));
+ SwRect aRepaint(static_cast<SwTextFrame*>(pContentFrame)->_AutoSpell(nullptr, 0));
if (aRepaint.HasArea())
m_pWrtShell->InvalidateWindows(aRepaint);
}
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 12e6596b2c3b..600ab97a8c56 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -61,11 +61,11 @@ using namespace ::com::sun::star::frame;
void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, bool bViewOnly )
{
- bool const bCrsrIsVisible(m_pWrtShell->IsCrsrVisible());
+ bool const bCursorIsVisible(m_pWrtShell->IsCursorVisible());
_SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly );
// fdo#40465 force the cursor to stay in view whilst zooming
- if (bCrsrIsVisible)
- m_pWrtShell->ShowCrsr();
+ if (bCursorIsVisible)
+ m_pWrtShell->ShowCursor();
}
void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
@@ -329,7 +329,7 @@ IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void )
case NID_GRF:
case NID_OLE:
{
- GotoObjFlags eType = GotoObjFlags::FlyFrm;
+ GotoObjFlags eType = GotoObjFlags::FlyFrame;
if(m_nMoveType == NID_GRF)
eType = GotoObjFlags::FlyGrf;
else if(m_nMoveType == NID_OLE)
@@ -339,8 +339,8 @@ IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void )
rSh.GotoPrevFly(eType);
if(bSuccess)
{
- rSh.HideCrsr();
- rSh.EnterSelFrmMode();
+ rSh.HideCursor();
+ rSh.EnterSelFrameMode();
}
}
break;
@@ -370,7 +370,7 @@ IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void )
bNext ? rSh.GotoNextOutline() : rSh.GotoPrevOutline();
break;
case NID_SEL :
- bNext ? rSh.GoNextCrsr() : rSh.GoPrevCrsr();
+ bNext ? rSh.GoNextCursor() : rSh.GoPrevCursor();
break;
case NID_FTN:
rSh.EnterStdMode();
@@ -381,7 +381,7 @@ IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void )
case NID_MARK:
{
// unselect
- rSh.MoveCrsr();
+ rSh.MoveCursor();
rSh.EnterStdMode();
// collect navigator reminders
@@ -434,7 +434,7 @@ IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void )
if(m_pSrchItem)
{
bool bBackward = m_pSrchItem->GetBackward();
- if (rSh.HasSelection() && bNext != rSh.IsCrsrPtAtEnd())
+ if (rSh.HasSelection() && bNext != rSh.IsCursorPtAtEnd())
rSh.SwapPam();
m_pSrchItem->SetBackward(!bNext);
SfxRequest aReq(FN_REPEAT_SEARCH, SfxCallMode::SLOT, GetPool());
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index bbf790402cee..41140112db6b 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -400,7 +400,7 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect,
bool SwView::IsScroll( const Rectangle &rRect ) const
{
- return m_bCenterCrsr || m_bTopCrsr || !m_aVisArea.IsInside(rRect);
+ return m_bCenterCursor || m_bTopCursor || !m_aVisArea.IsInside(rRect);
}
void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRangeY )
@@ -422,7 +422,7 @@ void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRan
{
// If we are not supposed to be centered, lying in the VisArea
// and are not covered by the dialogue ...
- if ( !m_bCenterCrsr && aOldVisArea.IsInside( rRect )
+ if ( !m_bCenterCursor && aOldVisArea.IsInside( rRect )
&& ( rRect.Left() > aDlgRect.Right()
|| rRect.Right() < aDlgRect.Left()
|| rRect.Top() > aDlgRect.Bottom()
@@ -449,7 +449,7 @@ void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRan
}
//s.o. !IsScroll()
- if( !(m_bCenterCrsr || m_bTopCrsr) && m_aVisArea.IsInside( rRect ) )
+ if( !(m_bCenterCursor || m_bTopCursor) && m_aVisArea.IsInside( rRect ) )
{
m_aVisArea = aOldVisArea;
return;
@@ -470,7 +470,7 @@ void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRan
static_cast< sal_uInt16 >((aVisSize.Width() - aSize.Width()) / 2),
static_cast< sal_uInt16 >((aVisSize.Height()- aSize.Height())/ 2) );
- if( m_bTopCrsr )
+ if( m_bTopCursor )
{
const long nBorder = IsDocumentBorder() ? DOCUMENTBORDER : 0;
aPt.Y() = std::min( std::max( nBorder, rRect.Top() ),
@@ -482,12 +482,12 @@ void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRan
SetVisArea( aPt );
return;
}
- if( !m_bCenterCrsr )
+ if( !m_bCenterCursor )
{
Point aPt( m_aVisArea.TopLeft() );
CalcPt( &aPt, rRect, nRangeX, nRangeY );
- if( m_bTopCrsr )
+ if( m_bTopCursor )
{
const long nBorder = IsDocumentBorder() ? DOCUMENTBORDER : 0;
aPt.Y() = std::min( std::max( nBorder, rRect.Top() ),
@@ -619,14 +619,14 @@ long SwView::PhyPageDown()
return 1;
}
-bool SwView::PageUpCrsr( bool bSelect )
+bool SwView::PageUpCursor( bool bSelect )
{
if ( !bSelect )
{
- const FrmTypeFlags eType = m_pWrtShell->GetFrmType(nullptr,true);
- if ( eType & FrmTypeFlags::FOOTNOTE )
+ const FrameTypeFlags eType = m_pWrtShell->GetFrameType(nullptr,true);
+ if ( eType & FrameTypeFlags::FOOTNOTE )
{
- m_pWrtShell->MoveCrsr();
+ m_pWrtShell->MoveCursor();
m_pWrtShell->GotoFootnoteAnchor();
m_pWrtShell->Right(CRSR_SKIP_CHARS, false, 1, false );
return true;
@@ -635,8 +635,8 @@ bool SwView::PageUpCrsr( bool bSelect )
SwTwips lOff = 0;
if ( GetPageScrollUpOffset( lOff ) &&
- (m_pWrtShell->IsCrsrReadonly() ||
- !m_pWrtShell->PageCrsr( lOff, bSelect )) &&
+ (m_pWrtShell->IsCursorReadonly() ||
+ !m_pWrtShell->PageCursor( lOff, bSelect )) &&
PageUp() )
{
m_pWrtShell->ResetCursorStack();
@@ -645,12 +645,12 @@ bool SwView::PageUpCrsr( bool bSelect )
return false;
}
-bool SwView::PageDownCrsr(bool bSelect)
+bool SwView::PageDownCursor(bool bSelect)
{
SwTwips lOff = 0;
if ( GetPageScrollDownOffset( lOff ) &&
- (m_pWrtShell->IsCrsrReadonly() ||
- !m_pWrtShell->PageCrsr( lOff, bSelect )) &&
+ (m_pWrtShell->IsCursorReadonly() ||
+ !m_pWrtShell->PageCursor( lOff, bSelect )) &&
PageDown() )
{
m_pWrtShell->ResetCursorStack();
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index 308d0b89e671..dee0f3ccd5e7 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -218,7 +218,7 @@ void SwView::ExecutePrint(SfxRequest& rReq)
}
else if( rReq.GetSlot() == SID_PRINTDOCDIRECT && ! bSilent )
{
- if( ( pSh->IsSelection() || pSh->IsFrmSelected() || pSh->IsObjSelected() ) )
+ if( ( pSh->IsSelection() || pSh->IsFrameSelected() || pSh->IsObjSelected() ) )
{
short nBtn = ScopedVclPtr<SvxPrtQryBox>::Create(&GetEditWin())->Execute();
if( RET_CANCEL == nBtn )
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 154b08c68747..815fbba15430 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -108,15 +108,15 @@ static void lcl_addContainerToJson(boost::property_tree::ptree& rTree, const OSt
static void lcl_emitSearchResultCallbacks(SvxSearchItem* pSearchItem, SwWrtShell* pWrtShell)
{
// Emit a callback also about the selection rectangles, grouped by matches.
- if (SwPaM* pPaM = pWrtShell->GetCrsr())
+ if (SwPaM* pPaM = pWrtShell->GetCursor())
{
std::vector<OString> aMatches;
for (SwPaM& rPaM : pPaM->GetRingContainer())
{
- if (SwShellCrsr* pShellCrsr = dynamic_cast<SwShellCrsr*>(&rPaM))
+ if (SwShellCursor* pShellCursor = dynamic_cast<SwShellCursor*>(&rPaM))
{
std::vector<OString> aSelectionRectangles;
- pShellCrsr->SwSelPaintRects::Show(&aSelectionRectangles);
+ pShellCursor->SwSelPaintRects::Show(&aSelectionRectangles);
std::vector<OString> aRect;
for (size_t i = 0; i < aSelectionRectangles.size(); ++i)
{
@@ -313,7 +313,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
m_pWrtShell->Push();
OUString aReplace( m_pSrchItem->GetReplaceString() );
SearchOptions aTmp( m_pSrchItem->GetSearchOptions() );
- OUString *pBackRef = ReplaceBackReferences( aTmp, m_pWrtShell->GetCrsr() );
+ OUString *pBackRef = ReplaceBackReferences( aTmp, m_pWrtShell->GetCursor() );
if( pBackRef )
m_pSrchItem->SetReplaceString( *pBackRef );
Replace();
@@ -382,7 +382,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
if (!m_pSrchItem->GetSelection())
{
// create it just to overwrite it with stack cursor
- m_pWrtShell->CreateCrsr();
+ m_pWrtShell->CreateCursor();
// i#8288 restore the original cursor position
m_pWrtShell->Pop(false);
}
@@ -526,7 +526,7 @@ bool SwView::SearchAndWrap(bool bApi)
// selection closest to the end being searched to as to exclude the selected
// region from the search. (This doesn't work in the case of multiple
// selected regions as the cursor doesn't mark the selection in that case.)
- m_pWrtShell->GetCrsr()->Normalize( m_pSrchItem->GetBackward() );
+ m_pWrtShell->GetCursor()->Normalize( m_pSrchItem->GetBackward() );
if (!m_pWrtShell->HasSelection() && (m_pSrchItem->HasStartPoint()))
{
@@ -535,7 +535,7 @@ bool SwView::SearchAndWrap(bool bApi)
// cursor position.
SwEditShell& rShell = GetWrtShell();
Point aPosition(m_pSrchItem->GetStartPointX(), m_pSrchItem->GetStartPointY());
- rShell.SetCrsr(aPosition);
+ rShell.SetCursor(aPosition);
}
// If you want to search in selected areas, they must not be unselected.
@@ -546,10 +546,10 @@ bool SwView::SearchAndWrap(bool bApi)
if( FUNC_Search( aOpts ) )
{
m_bFound = true;
- if(m_pWrtShell->IsSelFrmMode())
+ if(m_pWrtShell->IsSelFrameMode())
{
- m_pWrtShell->UnSelectFrm();
- m_pWrtShell->LeaveSelFrmMode();
+ m_pWrtShell->UnSelectFrame();
+ m_pWrtShell->LeaveSelFrameMode();
}
m_pWrtShell->Pop();
m_pWrtShell->EndAllAction();
@@ -703,8 +703,8 @@ void SwView::Replace()
{
/* check that the selection match the search string*/
//save state
- SwPosition aStartPos = (* m_pWrtShell->GetSwCrsr()->Start());
- SwPosition aEndPos = (* m_pWrtShell->GetSwCrsr()->End());
+ SwPosition aStartPos = (* m_pWrtShell->GetSwCursor()->Start());
+ SwPosition aEndPos = (* m_pWrtShell->GetSwCursor()->End());
bool bHasSelection = m_pSrchItem->GetSelection();
SvxSearchCmd nOldCmd = m_pSrchItem->GetCommand();
@@ -722,13 +722,13 @@ void SwView::Replace()
if(! m_pSrchItem->GetBackward() )
{
- (* m_pWrtShell->GetSwCrsr()->Start()) = aStartPos;
- (* m_pWrtShell->GetSwCrsr()->End()) = aEndPos;
+ (* m_pWrtShell->GetSwCursor()->Start()) = aStartPos;
+ (* m_pWrtShell->GetSwCursor()->End()) = aEndPos;
}
else
{
- (* m_pWrtShell->GetSwCrsr()->Start()) = aEndPos;
- (* m_pWrtShell->GetSwCrsr()->End()) = aStartPos;
+ (* m_pWrtShell->GetSwCursor()->Start()) = aEndPos;
+ (* m_pWrtShell->GetSwCursor()->End()) = aStartPos;
}
bReqReplace = false;
}
@@ -910,8 +910,8 @@ void SwView::StateSearch(SfxItemSet &rSet)
if( m_bJustOpened && m_pWrtShell->IsSelection() )
{
OUString aText;
- if( 1 == m_pWrtShell->GetCrsrCnt() &&
- !( aText = m_pWrtShell->SwCrsrShell::GetSelText() ).isEmpty() )
+ if( 1 == m_pWrtShell->GetCursorCnt() &&
+ !( aText = m_pWrtShell->SwCursorShell::GetSelText() ).isEmpty() )
{
m_pSrchItem->SetSearchString( aText );
m_pSrchItem->SetSelection( false );
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 8da54f5a9399..c37b8d77eac2 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -68,8 +68,8 @@ void SwView::GetState(SfxItemSet &rSet)
{
SfxWhichIter aIter(rSet);
sal_uInt16 nWhich = aIter.FirstWhich();
- FrmTypeFlags eFrmType = FrmTypeFlags::NONE;
- bool bGetFrmType = false;
+ FrameTypeFlags eFrameType = FrameTypeFlags::NONE;
+ bool bGetFrameType = false;
bool bWeb = dynamic_cast<SwWebView*>( this ) != nullptr;
while(nWhich)
@@ -79,7 +79,7 @@ void SwView::GetState(SfxItemSet &rSet)
case FN_EDIT_LINK_DLG:
if( m_pWrtShell->GetLinkManager().GetLinks().empty() )
rSet.DisableItem(nWhich);
- else if( m_pWrtShell->IsSelFrmMode() &&
+ else if( m_pWrtShell->IsSelFrameMode() &&
m_pWrtShell->IsSelObjProtected(FlyProtectFlags::Content) != FlyProtectFlags::NONE)
{
rSet.DisableItem(nWhich);
@@ -87,7 +87,7 @@ void SwView::GetState(SfxItemSet &rSet)
break;
case SID_INSERT_GRAPHIC:
- if( m_pWrtShell->CrsrInsideInputField() )
+ if( m_pWrtShell->CursorInsideInputField() )
{
rSet.DisableItem(nWhich);
}
@@ -96,25 +96,25 @@ void SwView::GetState(SfxItemSet &rSet)
case FN_INSERT_CAPTION:
{
// There are captions for graphics, OLE objects, frames and tables
- if( !bGetFrmType )
+ if( !bGetFrameType )
{
- eFrmType = m_pWrtShell->GetFrmType(nullptr, true);
- bGetFrmType = true;
+ eFrameType = m_pWrtShell->GetFrameType(nullptr, true);
+ bGetFrameType = true;
}
- if (! ( ((eFrmType & FrmTypeFlags::FLY_ANY) && m_nSelectionType != nsSelectionType::SEL_DRW_TXT)||
+ if (! ( ((eFrameType & FrameTypeFlags::FLY_ANY) && m_nSelectionType != nsSelectionType::SEL_DRW_TXT)||
m_nSelectionType & nsSelectionType::SEL_TBL ||
m_nSelectionType & nsSelectionType::SEL_DRW) )
{
rSet.DisableItem(nWhich);
}
- else if((m_pWrtShell->IsObjSelected() || m_pWrtShell->IsFrmSelected()) &&
+ else if((m_pWrtShell->IsObjSelected() || m_pWrtShell->IsFrameSelected()) &&
(m_pWrtShell->IsSelObjProtected( FlyProtectFlags::Parent) != FlyProtectFlags::NONE ||
m_pWrtShell->IsSelObjProtected( FlyProtectFlags::Content ) != FlyProtectFlags::NONE))
{
rSet.DisableItem(nWhich);
}
else if( m_pWrtShell->IsTableMode()
- || m_pWrtShell->CrsrInsideInputField() )
+ || m_pWrtShell->CursorInsideInputField() )
{
rSet.DisableItem(nWhich);
}
@@ -130,9 +130,9 @@ void SwView::GetState(SfxItemSet &rSet)
case FN_CHANGE_PAGENUM:
{
- FrmTypeFlags nType = m_pWrtShell->GetFrmType(nullptr,true);
- if( ( FrmTypeFlags::FLY_ANY | FrmTypeFlags::HEADER | FrmTypeFlags::FOOTER |
- FrmTypeFlags::FOOTNOTE | FrmTypeFlags::DRAWOBJ ) & nType )
+ FrameTypeFlags nType = m_pWrtShell->GetFrameType(nullptr,true);
+ if( ( FrameTypeFlags::FLY_ANY | FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER |
+ FrameTypeFlags::FOOTNOTE | FrameTypeFlags::DRAWOBJ ) & nType )
rSet.DisableItem(nWhich);
else
rSet.Put(SfxUInt16Item(nWhich, m_pWrtShell->GetPageOffset()));
@@ -193,7 +193,7 @@ void SwView::GetState(SfxItemSet &rSet)
break;
case FN_INSERT_OBJ_CTRL:
if( bWeb
- || m_pWrtShell->CrsrInsideInputField() )
+ || m_pWrtShell->CursorInsideInputField() )
{
rSet.DisableItem(nWhich);
}
@@ -272,7 +272,7 @@ void SwView::GetState(SfxItemSet &rSet)
case FN_REDLINE_REJECT_DIRECT:
{
SwDoc *pDoc = m_pWrtShell->GetDoc();
- SwPaM *pCursor = m_pWrtShell->GetCrsr();
+ SwPaM *pCursor = m_pWrtShell->GetCursor();
if (GetDocShell()->HasChangeRecordProtection())
rSet.DisableItem(nWhich);
else if (pCursor->HasMark())
@@ -323,7 +323,7 @@ void SwView::GetState(SfxItemSet &rSet)
case SID_THESAURUS:
{
SwWrtShell &rSh = GetWrtShell();
- if (2 <= rSh.GetCrsrCnt()) // multi selection?
+ if (2 <= rSh.GetCursorCnt()) // multi selection?
rSet.DisableItem(nWhich);
else
{
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index 3f53c38bc6e7..281a2b586a8b 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -223,10 +223,10 @@ void ResizeFrameCols(SwFormatCol& rCol,
void SwView::ExecTabWin( SfxRequest& rReq )
{
SwWrtShell &rSh = GetWrtShell();
- const FrmTypeFlags nFrmType = rSh.IsObjSelected() ?
- FrmTypeFlags::DRAWOBJ :
- rSh.GetFrmType(nullptr,true);
- const bool bFrmSelection = rSh.IsFrmSelected();
+ const FrameTypeFlags nFrameType = rSh.IsObjSelected() ?
+ FrameTypeFlags::DRAWOBJ :
+ rSh.GetFrameType(nullptr,true);
+ const bool bFrameSelection = rSh.IsFrameSelected();
const bool bBrowse = rSh.GetViewOptions()->getBrowseMode();
const sal_uInt16 nSlot = rReq.GetSlot();
@@ -241,15 +241,15 @@ void SwView::ExecTabWin( SfxRequest& rReq )
const SwFormatFooter& rFooterFormat = rDesc.GetMaster().GetFooter();
SwFrameFormat *pFooterFormat = const_cast<SwFrameFormat*>(rFooterFormat.GetFooterFormat());
- const SwFormatFrmSize &rFrmSize = rDesc.GetMaster().GetFrmSize();
+ const SwFormatFrameSize &rFrameSize = rDesc.GetMaster().GetFrameSize();
const SwRect& rPageRect = rSh.GetAnyCurRect(RECT_PAGE);
- const long nPageWidth = bBrowse ? rPageRect.Width() : rFrmSize.GetWidth();
- const long nPageHeight = bBrowse ? rPageRect.Height() : rFrmSize.GetHeight();
+ const long nPageWidth = bBrowse ? rPageRect.Width() : rFrameSize.GetWidth();
+ const long nPageHeight = bBrowse ? rPageRect.Height() : rFrameSize.GetHeight();
bool bUnlockView = false;
rSh.StartAllAction();
- bool bSect = bool(nFrmType & FrmTypeFlags::COLSECT);
+ bool bSect = bool(nFrameType & FrameTypeFlags::COLSECT);
switch (nSlot)
{
@@ -259,7 +259,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
SvxLongLRSpaceItem aLongLR( static_cast<const SvxLongLRSpaceItem&>(pReqArgs->
Get( SID_ATTR_LONG_LRSPACE )) );
SvxLRSpaceItem aLR(RES_LR_SPACE);
- if ( !bSect && (bFrmSelection || nFrmType & FrmTypeFlags::FLY_ANY) )
+ if ( !bSect && (bFrameSelection || nFrameType & FrameTypeFlags::FLY_ANY) )
{
SwFrameFormat* pFormat = static_cast<SwFrameFormat*>(rSh.GetFlyFrameFormat());
const SwRect &rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED);
@@ -268,9 +268,9 @@ void SwView::ExecTabWin( SfxRequest& rReq )
{
bool bRTL;
bool bVertL2R;
- bVerticalFrame = ( bFrmSelection &&
- rSh.IsFrmVertical(true, bRTL, bVertL2R) ) ||
- ( !bFrmSelection && bVerticalWriting);
+ bVerticalFrame = ( bFrameSelection &&
+ rSh.IsFrameVertical(true, bRTL, bVertL2R) ) ||
+ ( !bFrameSelection && bVerticalWriting);
}
long nDeltaX = bVerticalFrame ?
rRect.Right() - rPageRect.Right() + aLongLR.GetRight() :
@@ -295,7 +295,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
aSet.Put( aHoriOrient );
}
- SwFormatFrmSize aSize( pFormat->GetFrmSize() );
+ SwFormatFrameSize aSize( pFormat->GetFrameSize() );
long nOldWidth = (long) aSize.GetWidth();
if(aSize.GetWidthPercent())
@@ -309,7 +309,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
aSize.SetWidth( nPageWidth -
(aLongLR.GetLeft() + aLongLR.GetRight()));
- if( nFrmType & FrmTypeFlags::COLUMN )
+ if( nFrameType & FrameTypeFlags::COLUMN )
{
SwFormatCol aCol(pFormat->GetCol());
@@ -321,17 +321,17 @@ void SwView::ExecTabWin( SfxRequest& rReq )
rSh.StartAction();
rSh.Push();
- rSh.SetFlyFrmAttr( aSet );
+ rSh.SetFlyFrameAttr( aSet );
// Cancel the frame selection
- if(!bFrmSelection && rSh.IsFrmSelected())
+ if(!bFrameSelection && rSh.IsFrameSelected())
{
- rSh.UnSelectFrm();
- rSh.LeaveSelFrmMode();
+ rSh.UnSelectFrame();
+ rSh.LeaveSelFrameMode();
}
rSh.Pop();
rSh.EndAction();
}
- else if ( nFrmType & ( FrmTypeFlags::HEADER | FrmTypeFlags::FOOTER ))
+ else if ( nFrameType & ( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER ))
{
// Subtract out page margins
long nOld = rDesc.GetMaster().GetLRSpace().GetLeft();
@@ -342,12 +342,12 @@ void SwView::ExecTabWin( SfxRequest& rReq )
aLR.SetLeft(aLongLR.GetLeft());
aLR.SetRight(aLongLR.GetRight());
- if ( nFrmType & FrmTypeFlags::HEADER && pHeaderFormat )
+ if ( nFrameType & FrameTypeFlags::HEADER && pHeaderFormat )
pHeaderFormat->SetFormatAttr( aLR );
- else if( nFrmType & FrmTypeFlags::FOOTER && pFooterFormat )
+ else if( nFrameType & FrameTypeFlags::FOOTER && pFooterFormat )
pFooterFormat->SetFormatAttr( aLR );
}
- else if( nFrmType == FrmTypeFlags::DRAWOBJ)
+ else if( nFrameType == FrameTypeFlags::DRAWOBJ)
{
SwRect aRect( rSh.GetObjRect() );
aRect.Left( aLongLR.GetLeft() + rPageRect.Left() );
@@ -418,7 +418,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
SvxLongULSpaceItem aLongULSpace( static_cast<const SvxLongULSpaceItem&>(pReqArgs->
Get( SID_ATTR_LONG_ULSPACE )));
- if( bFrmSelection || nFrmType & FrmTypeFlags::FLY_ANY )
+ if( bFrameSelection || nFrameType & FrameTypeFlags::FLY_ANY )
{
SwFrameFormat* pFormat = static_cast<SwFrameFormat*>(rSh.GetFlyFrameFormat());
const SwRect &rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED);
@@ -430,9 +430,9 @@ void SwView::ExecTabWin( SfxRequest& rReq )
//which of the orientation attributes is to be put depends on the frame's environment
bool bRTL;
bool bVertL2R;
- if ( ( bFrmSelection &&
- rSh.IsFrmVertical(true, bRTL, bVertL2R ) ) ||
- ( !bFrmSelection && bVerticalWriting ) )
+ if ( ( bFrameSelection &&
+ rSh.IsFrameVertical(true, bRTL, bVertL2R ) ) ||
+ ( !bFrameSelection && bVerticalWriting ) )
{
SwFormatHoriOrient aHoriOrient(pFormat->GetHoriOrient());
aHoriOrient.SetHoriOrient(text::HoriOrientation::NONE);
@@ -446,7 +446,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
aVertOrient.SetPos(aVertOrient.GetPos() + nDeltaY );
aSet.Put( aVertOrient );
}
- SwFormatFrmSize aSize(pFormat->GetFrmSize());
+ SwFormatFrameSize aSize(pFormat->GetFrameSize());
if(aSize.GetHeightPercent())
{
SwRect aRect;
@@ -458,9 +458,9 @@ void SwView::ExecTabWin( SfxRequest& rReq )
aSize.SetHeight(nHeight );
aSet.Put( aSize );
- rSh.SetFlyFrmAttr( aSet );
+ rSh.SetFlyFrameAttr( aSet );
}
- else if( nFrmType == FrmTypeFlags::DRAWOBJ )
+ else if( nFrameType == FrameTypeFlags::DRAWOBJ )
{
SwRect aRect( rSh.GetObjRect() );
aRect.Top( aLongULSpace.GetUpper() + rPageRect.Top() );
@@ -498,10 +498,10 @@ void SwView::ExecTabWin( SfxRequest& rReq )
else
{ SwPageDesc aDesc( rDesc );
- if ( nFrmType & ( FrmTypeFlags::HEADER | FrmTypeFlags::FOOTER ))
+ if ( nFrameType & ( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER ))
{
- const bool bHead = bool(nFrmType & FrmTypeFlags::HEADER);
+ const bool bHead = bool(nFrameType & FrameTypeFlags::HEADER);
SvxULSpaceItem aUL( rDesc.GetMaster().GetULSpace() );
if ( bHead )
aUL.SetUpper( (sal_uInt16)aLongULSpace.GetUpper() );
@@ -511,8 +511,8 @@ void SwView::ExecTabWin( SfxRequest& rReq )
if( (bHead && pHeaderFormat) || (!bHead && pFooterFormat) )
{
- SwFormatFrmSize aSz( bHead ? pHeaderFormat->GetFrmSize() :
- pFooterFormat->GetFrmSize() );
+ SwFormatFrameSize aSz( bHead ? pHeaderFormat->GetFrameSize() :
+ pFooterFormat->GetFrameSize() );
aSz.SetHeightSizeType( ATT_FIX_SIZE );
aSz.SetHeight(nPageHeight - aLongULSpace.GetLower() -
aLongULSpace.GetUpper() );
@@ -856,7 +856,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
}
else
{
- if ( bFrmSelection || nFrmType & FrmTypeFlags::FLY_ANY || bSect)
+ if ( bFrameSelection || nFrameType & FrameTypeFlags::FLY_ANY || bSect)
{
SwSectionFormat *pSectFormat = nullptr;
SfxItemSet aSet( GetPool(), RES_COL, RES_COL );
@@ -868,7 +868,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
}
else
{
- rSh.GetFlyFrmAttr( aSet );
+ rSh.GetFlyFrameAttr( aSet );
}
SwFormatCol aCols(
bSect ?
@@ -884,12 +884,12 @@ void SwView::ExecTabWin( SfxRequest& rReq )
{
rSh.StartAction();
rSh.Push();
- rSh.SetFlyFrmAttr( aSet );
+ rSh.SetFlyFrameAttr( aSet );
// Cancel the frame selection again
- if(!bFrmSelection && rSh.IsFrmSelected())
+ if(!bFrameSelection && rSh.IsFrameSelected())
{
- rSh.UnSelectFrm();
- rSh.LeaveSelFrmMode();
+ rSh.UnSelectFrame();
+ rSh.LeaveSelFrameMode();
}
rSh.Pop();
rSh.EndAction();
@@ -996,11 +996,11 @@ void SwView::StateTabWin(SfxItemSet& rSet)
SwWrtShell &rSh = GetWrtShell();
const Point* pPt = IsTabColFromDoc() || IsTabRowFromDoc() ? &m_aTabColFromDocPos : nullptr;
- const FrmTypeFlags nFrmType = rSh.IsObjSelected()
- ? FrmTypeFlags::DRAWOBJ
- : rSh.GetFrmType( pPt, true );
+ const FrameTypeFlags nFrameType = rSh.IsObjSelected()
+ ? FrameTypeFlags::DRAWOBJ
+ : rSh.GetFrameType( pPt, true );
- const bool bFrmSelection = rSh.IsFrmSelected();
+ const bool bFrameSelection = rSh.IsFrameSelected();
const bool bBrowse = rSh.GetViewOptions()->getBrowseMode();
// PageOffset/limiter
const SwRect& rPageRect = rSh.GetAnyCurRect( RECT_PAGE, pPt );
@@ -1012,7 +1012,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
IsTabColFromDoc() || m_bTabRowFromDoc ?
rSh.GetMousePageDesc(m_aTabColFromDocPos) : rSh.GetCurPageDesc() );
- const SvxFrameDirectionItem& rFrameDir = rDesc.GetMaster().GetFrmDir();
+ const SvxFrameDirectionItem& rFrameDir = rDesc.GetMaster().GetFrameDir();
const bool bVerticalWriting = rSh.IsInVerticalText();
//enable tab stop display on the rulers depending on the writing direction
@@ -1092,10 +1092,10 @@ void SwView::StateTabWin(SfxItemSet& rSet)
aLongLR.SetLeft(rPagePrtRect.Left());
aLongLR.SetRight(nPageWidth - rPagePrtRect.Right());
}
- if ( ( nFrmType & FrmTypeFlags::HEADER || nFrmType & FrmTypeFlags::FOOTER ) &&
- !(nFrmType & FrmTypeFlags::COLSECT) )
+ if ( ( nFrameType & FrameTypeFlags::HEADER || nFrameType & FrameTypeFlags::FOOTER ) &&
+ !(nFrameType & FrameTypeFlags::COLSECT) )
{
- SwFrameFormat *pFormat = const_cast<SwFrameFormat*>(nFrmType & FrmTypeFlags::HEADER ?
+ SwFrameFormat *pFormat = const_cast<SwFrameFormat*>(nFrameType & FrameTypeFlags::HEADER ?
rDesc.GetMaster().GetHeader().GetHeaderFormat() :
rDesc.GetMaster().GetFooter().GetFooterFormat());
if( pFormat )// #i80890# if rDesc is not the one belonging to the current page is might crash
@@ -1111,16 +1111,16 @@ void SwView::StateTabWin(SfxItemSet& rSet)
else
{
SwRect aRect;
- if( !bFrmSelection && ((nFrmType & FrmTypeFlags::COLSECT) || rSh.IsDirectlyInSection()) )
+ if( !bFrameSelection && ((nFrameType & FrameTypeFlags::COLSECT) || rSh.IsDirectlyInSection()) )
{
aRect = rSh.GetAnyCurRect(RECT_SECTION_PRT, pPt);
const SwRect aTmpRect = rSh.GetAnyCurRect(RECT_SECTION, pPt);
aRect.Pos() += aTmpRect.Pos();
}
- else if ( bFrmSelection || nFrmType & FrmTypeFlags::FLY_ANY )
+ else if ( bFrameSelection || nFrameType & FrameTypeFlags::FLY_ANY )
aRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED, pPt);
- else if( nFrmType & FrmTypeFlags::DRAWOBJ)
+ else if( nFrameType & FrameTypeFlags::DRAWOBJ)
aRect = rSh.GetObjRect();
if( aRect.Width() )
@@ -1163,21 +1163,21 @@ void SwView::StateTabWin(SfxItemSet& rSet)
(long)aUL.GetLower(),
SID_ATTR_LONG_ULSPACE);
- if ( bFrmSelection || nFrmType & FrmTypeFlags::FLY_ANY )
+ if ( bFrameSelection || nFrameType & FrameTypeFlags::FLY_ANY )
{
// Convert document coordinates into page coordinates.
const SwRect &rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED, pPt);
aLongUL.SetUpper(rRect.Top() - rPageRect.Top());
aLongUL.SetLower(rPageRect.Bottom() - rRect.Bottom());
}
- else if ( nFrmType & FrmTypeFlags::HEADER || nFrmType & FrmTypeFlags::FOOTER )
+ else if ( nFrameType & FrameTypeFlags::HEADER || nFrameType & FrameTypeFlags::FOOTER )
{
SwRect aRect( rSh.GetAnyCurRect( RECT_HEADERFOOTER, pPt));
aRect.Pos() -= rSh.GetAnyCurRect( RECT_PAGE, pPt ).Pos();
aLongUL.SetUpper( aRect.Top() );
aLongUL.SetLower( nPageHeight - aRect.Bottom() );
}
- else if( nFrmType & FrmTypeFlags::DRAWOBJ)
+ else if( nFrameType & FrameTypeFlags::DRAWOBJ)
{
const SwRect &rRect = rSh.GetObjRect();
aLongUL.SetUpper((rRect.Top() - rPageRect.Top()));
@@ -1251,7 +1251,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
if ( nSelType & nsSelectionType::SEL_GRF ||
nSelType & nsSelectionType::SEL_FRM ||
nSelType & nsSelectionType::SEL_OLE ||
- nFrmType == FrmTypeFlags::DRAWOBJ ||
+ nFrameType == FrameTypeFlags::DRAWOBJ ||
(!bVerticalWriting && (SID_ATTR_PARA_LRSPACE_VERTICAL == nWhich)) ||
( bVerticalWriting && (SID_ATTR_PARA_LRSPACE == nWhich))
)
@@ -1319,12 +1319,12 @@ void SwView::StateTabWin(SfxItemSet& rSet)
if ( nSelType & nsSelectionType::SEL_GRF ||
nSelType & nsSelectionType::SEL_FRM ||
nSelType & nsSelectionType::SEL_OLE ||
- nFrmType == FrmTypeFlags::DRAWOBJ )
+ nFrameType == FrameTypeFlags::DRAWOBJ )
rSet.DisableItem(SID_RULER_BORDER_DISTANCE);
else
{
SvxLRSpaceItem aDistLR(SID_RULER_BORDER_DISTANCE);
- if(nFrmType & FrmTypeFlags::FLY_ANY)
+ if(nFrameType & FrameTypeFlags::FLY_ANY)
{
if( IsTabColFromDoc() )
{
@@ -1339,7 +1339,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, 0 );
SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
aCoreSet.Put( aBoxInfo );
- rSh.GetFlyFrmAttr( aCoreSet );
+ rSh.GetFlyFrameAttr( aCoreSet );
const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>(aCoreSet.Get(RES_BOX));
aDistLR.SetLeft(rBox.GetDistance(SvxBoxItemLine::LEFT));
aDistLR.SetRight(rBox.GetDistance(SvxBoxItemLine::RIGHT));
@@ -1358,8 +1358,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
m_nRightBorderDistance = static_cast< sal_uInt16 >(aDistLR.GetRight());
}
else if ( IsTabColFromDoc() ||
- ( rSh.GetTableFormat() && !bFrmSelection &&
- !(nFrmType & FrmTypeFlags::COLSECT ) ) )
+ ( rSh.GetTableFormat() && !bFrameSelection &&
+ !(nFrameType & FrameTypeFlags::COLSECT ) ) )
{
SfxItemSet aCoreSet2( GetPool(),
RES_BOX, RES_BOX,
@@ -1392,7 +1392,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
aDistLR.SetRight(rBox.GetDistance(SvxBoxItemLine::RIGHT));
const SvxBoxItem* pBox = nullptr;
- if(nFrmType & FrmTypeFlags::HEADER)
+ if(nFrameType & FrameTypeFlags::HEADER)
{
rMaster.GetHeader();
const SwFormatHeader& rHeaderFormat = rMaster.GetHeader();
@@ -1400,7 +1400,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
if( pHeaderFormat )// #i80890# if rDesc is not the one belonging to the current page is might crash
pBox = & (const SvxBoxItem&)pHeaderFormat->GetBox();
}
- else if(nFrmType & FrmTypeFlags::FOOTER )
+ else if(nFrameType & FrameTypeFlags::FOOTER )
{
const SwFormatFooter& rFooterFormat = rMaster.GetFooter();
SwFrameFormat *pFooterFormat = const_cast<SwFrameFormat*>(rFooterFormat.GetFooterFormat());
@@ -1434,7 +1434,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
if ( nSelType & nsSelectionType::SEL_GRF ||
nSelType & nsSelectionType::SEL_FRM ||
nSelType & nsSelectionType::SEL_OLE ||
- nFrmType == FrmTypeFlags::DRAWOBJ)
+ nFrameType == FrameTypeFlags::DRAWOBJ)
rSet.DisableItem(nWhich);
else
{
@@ -1451,22 +1451,22 @@ void SwView::StateTabWin(SfxItemSet& rSet)
{
bool bFrameRTL;
bool bFrameVertL2R;
- bFrameHasVerticalColumns = rSh.IsFrmVertical(false, bFrameRTL, bFrameVertL2R) &&
- bFrmSelection;
+ bFrameHasVerticalColumns = rSh.IsFrameVertical(false, bFrameRTL, bFrameVertL2R) &&
+ bFrameSelection;
}
bool bHasTable = ( IsTabColFromDoc() ||
- ( rSh.GetTableFormat() && !bFrmSelection &&
- !(nFrmType & FrmTypeFlags::COLSECT ) ) );
+ ( rSh.GetTableFormat() && !bFrameSelection &&
+ !(nFrameType & FrameTypeFlags::COLSECT ) ) );
bool bTableVertical = bHasTable && rSh.IsTableVertical();
if(((SID_RULER_BORDERS_VERTICAL == nWhich) &&
((bHasTable && !bTableVertical) ||
- (!bVerticalWriting && !bFrmSelection && !bHasTable ) ||
- ( bFrmSelection && !bFrameHasVerticalColumns))) ||
+ (!bVerticalWriting && !bFrameSelection && !bHasTable ) ||
+ ( bFrameSelection && !bFrameHasVerticalColumns))) ||
((SID_RULER_BORDERS == nWhich) &&
((bHasTable && bTableVertical) ||
- (bVerticalWriting && !bFrmSelection&& !bHasTable) || bFrameHasVerticalColumns)))
+ (bVerticalWriting && !bFrameSelection&& !bHasTable) || bFrameHasVerticalColumns)))
rSet.DisableItem(nWhich);
else if ( bHasTable )
{
@@ -1538,11 +1538,11 @@ void SwView::StateTabWin(SfxItemSet& rSet)
}
rSet.Put(aColItem, nWhich);
}
- else if ( bFrmSelection || nFrmType & ( FrmTypeFlags::COLUMN | FrmTypeFlags::COLSECT ) )
+ else if ( bFrameSelection || nFrameType & ( FrameTypeFlags::COLUMN | FrameTypeFlags::COLSECT ) )
{
// Out of frame or page?
sal_uInt16 nNum = 0;
- if(bFrmSelection)
+ if(bFrameSelection)
{
const SwFrameFormat* pFormat = rSh.GetFlyFrameFormat();
if(pFormat)
@@ -1552,10 +1552,10 @@ void SwView::StateTabWin(SfxItemSet& rSet)
nNum = rSh.GetCurColNum();
if(
- // For that matter FrmTypeFlags::COLSECT should not be included
+ // For that matter FrameTypeFlags::COLSECT should not be included
// if the border is selected!
- !bFrmSelection &&
- nFrmType & FrmTypeFlags::COLSECT )
+ !bFrameSelection &&
+ nFrameType & FrameTypeFlags::COLSECT )
{
const SwSection *pSect = rSh.GetAnySection(false, pPt);
OSL_ENSURE( pSect, "Which section?");
@@ -1593,7 +1593,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
rSet.Put(aColItem, nWhich);
}
}
- else if( bFrmSelection || nFrmType & FrmTypeFlags::FLY_ANY )
+ else if( bFrameSelection || nFrameType & FrameTypeFlags::FLY_ANY )
{
// Columns in frame
if ( nNum )
@@ -1608,14 +1608,14 @@ void SwView::StateTabWin(SfxItemSet& rSet)
SvxColumnItem aColItem(nNum);
const SwRect &rSizeRect = rSh.GetAnyCurRect(RECT_FLY_PRT_EMBEDDED, pPt);
- bool bUseVertical = bFrameHasVerticalColumns || (!bFrmSelection && bVerticalWriting);
+ bool bUseVertical = bFrameHasVerticalColumns || (!bFrameSelection && bVerticalWriting);
const long lWidth = bUseVertical ? rSizeRect.Height() : rSizeRect.Width();
const SwRect &rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED, pPt);
long nDist2 = ((bUseVertical ? rRect.Height() : rRect.Width()) - lWidth) /2;
::lcl_FillSvxColumn(rCol, lWidth, aColItem, nDist2);
SfxItemSet aFrameSet(GetPool(), RES_LR_SPACE, RES_LR_SPACE);
- rSh.GetFlyFrmAttr( aFrameSet );
+ rSh.GetFlyFrameAttr( aFrameSet );
if(bUseVertical)
{
@@ -1698,18 +1698,18 @@ void SwView::StateTabWin(SfxItemSet& rSet)
{
bool bFrameRTL;
bool bFrameVertL2R;
- bFrameHasVerticalColumns = rSh.IsFrmVertical(false, bFrameRTL, bFrameVertL2R) &&
- bFrmSelection;
+ bFrameHasVerticalColumns = rSh.IsFrameVertical(false, bFrameRTL, bFrameVertL2R) &&
+ bFrameSelection;
}
if(((SID_RULER_ROWS == nWhich) &&
- ((!bVerticalWriting && !bFrmSelection) || (bFrmSelection && !bFrameHasVerticalColumns))) ||
+ ((!bVerticalWriting && !bFrameSelection) || (bFrameSelection && !bFrameHasVerticalColumns))) ||
((SID_RULER_ROWS_VERTICAL == nWhich) &&
- ((bVerticalWriting && !bFrmSelection) || bFrameHasVerticalColumns)))
+ ((bVerticalWriting && !bFrameSelection) || bFrameHasVerticalColumns)))
rSet.DisableItem(nWhich);
else if ( IsTabRowFromDoc() ||
- ( rSh.GetTableFormat() && !bFrmSelection &&
- !(nFrmType & FrmTypeFlags::COLSECT ) ) )
+ ( rSh.GetTableFormat() && !bFrameSelection &&
+ !(nFrameType & FrameTypeFlags::COLSECT ) ) )
{
SwTabCols aTabCols;
if ( ( m_bSetTabRowFromDoc = IsTabRowFromDoc() ) )
@@ -1790,10 +1790,10 @@ void SwView::StateTabWin(SfxItemSet& rSet)
case SID_RULER_LR_MIN_MAX:
{
Rectangle aRectangle;
- if( ( nFrmType & FrmTypeFlags::COLSECT ) && !IsTabColFromDoc() &&
- ( nFrmType & ( FrmTypeFlags::TABLE|FrmTypeFlags::COLUMN ) ) )
+ if( ( nFrameType & FrameTypeFlags::COLSECT ) && !IsTabColFromDoc() &&
+ ( nFrameType & ( FrameTypeFlags::TABLE|FrameTypeFlags::COLUMN ) ) )
{
- if( nFrmType & FrmTypeFlags::TABLE )
+ if( nFrameType & FrameTypeFlags::TABLE )
{
const size_t nNum = rSh.GetCurTabColNum();
SwTabCols aTabCols;
@@ -1878,18 +1878,18 @@ void SwView::StateTabWin(SfxItemSet& rSet)
}
}
- else if ( ((nFrmType & FrmTypeFlags::TABLE) || IsTabColFromDoc()) &&
- !bFrmSelection )
+ else if ( ((nFrameType & FrameTypeFlags::TABLE) || IsTabColFromDoc()) &&
+ !bFrameSelection )
{
bool bColumn;
if ( IsTabColFromDoc() )
bColumn = rSh.GetCurMouseColNum( m_aTabColFromDocPos ) != 0;
else
- bColumn = bool(nFrmType & (FrmTypeFlags::COLUMN|FrmTypeFlags::FLY_ANY|FrmTypeFlags::COLSECTOUTTAB));
+ bColumn = bool(nFrameType & (FrameTypeFlags::COLUMN|FrameTypeFlags::FLY_ANY|FrameTypeFlags::COLSECTOUTTAB));
if ( !bColumn )
{
- if( nFrmType & FrmTypeFlags::FLY_ANY && IsTabColFromDoc() )
+ if( nFrameType & FrameTypeFlags::FLY_ANY && IsTabColFromDoc() )
{
SwRect aRect( rSh.GetAnyCurRect(
RECT_FLY_PRT_EMBEDDED, pPt ) );
@@ -1912,11 +1912,11 @@ void SwView::StateTabWin(SfxItemSet& rSet)
}
else
{ // Here only for table in multi-column pages and borders.
- bool bSectOutTable = bool(nFrmType & FrmTypeFlags::TABLE);
- bool bFrame = bool(nFrmType & FrmTypeFlags::FLY_ANY);
- bool bColSct = bool(nFrmType & ( bSectOutTable
- ? FrmTypeFlags::COLSECTOUTTAB
- : FrmTypeFlags::COLSECT )
+ bool bSectOutTable = bool(nFrameType & FrameTypeFlags::TABLE);
+ bool bFrame = bool(nFrameType & FrameTypeFlags::FLY_ANY);
+ bool bColSct = bool(nFrameType & ( bSectOutTable
+ ? FrameTypeFlags::COLSECTOUTTAB
+ : FrameTypeFlags::COLSECT )
);
//So you can also drag with the mouse, without being in the table.
CurRectType eRecType = RECT_PAGE_PRT;
@@ -1994,7 +1994,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
}
}
}
- else if ( nFrmType & ( FrmTypeFlags::HEADER | FrmTypeFlags::FOOTER ))
+ else if ( nFrameType & ( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER ))
{
aRectangle.Left() = aPageLRSpace.GetLeft();
aRectangle.Right() = aPageLRSpace.GetRight();
@@ -2009,7 +2009,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
case SID_RULER_PROTECT:
{
- if(bFrmSelection)
+ if(bFrameSelection)
{
FlyProtectFlags nProtect = m_pWrtShell->IsSelObjProtected( FlyProtectFlags::Size|FlyProtectFlags::Pos|FlyProtectFlags::Content );
@@ -2022,7 +2022,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
else
{
SvxProtectItem aProtect(SID_RULER_PROTECT);
- if(bBrowse && !(nFrmType & (FrmTypeFlags::DRAWOBJ|FrmTypeFlags::COLUMN)) && !rSh.GetTableFormat())
+ if(bBrowse && !(nFrameType & (FrameTypeFlags::DRAWOBJ|FrameTypeFlags::COLUMN)) && !rSh.GetTableFormat())
{
aProtect.SetSizeProtect(true);
aProtect.SetPosProtect(true);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 00:17:43 +0000