summaryrefslogtreecommitdiff
path: root/sw/source/uibase/shells
diff options
context:
space:
mode:
authorRobinson Tryon <qubit@runcibility.com>2015-11-25 06:03:10 -0500
committerRobinson Tryon <qubit@runcibility.com>2015-11-25 06:07:38 -0500
commit49c2b9808df8a6b197dec666dfc0cda6321a4306 (patch)
tree045ef4b9b8dfdb06bfbe18cdf773d59f57d5552d /sw/source/uibase/shells
parent5470a365f25e5052b4dd74f76aa2196f0d70934b (diff)
bin/rename-sw-abbreviations.shlibreoffice-5-1-branch-point
This commit renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8
Diffstat (limited to 'sw/source/uibase/shells')
-rw-r--r--sw/source/uibase/shells/basesh.cxx178
-rw-r--r--sw/source/uibase/shells/beziersh.cxx4
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx22
-rw-r--r--sw/source/uibase/shells/frmsh.cxx98
-rw-r--r--sw/source/uibase/shells/grfsh.cxx44
-rw-r--r--sw/source/uibase/shells/langhelper.cxx6
-rw-r--r--sw/source/uibase/shells/listsh.cxx4
-rw-r--r--sw/source/uibase/shells/mediash.cxx4
-rw-r--r--sw/source/uibase/shells/tabsh.cxx20
-rw-r--r--sw/source/uibase/shells/textdrw.cxx2
-rw-r--r--sw/source/uibase/shells/textfld.cxx24
-rw-r--r--sw/source/uibase/shells/textidx.cxx4
-rw-r--r--sw/source/uibase/shells/textsh.cxx80
-rw-r--r--sw/source/uibase/shells/textsh1.cxx46
-rw-r--r--sw/source/uibase/shells/txtattr.cxx18
-rw-r--r--sw/source/uibase/shells/txtcrsr.cxx20
16 files changed, 287 insertions, 287 deletions
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 1fcfc3a68c4f..2c609e186b11 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -172,7 +172,7 @@ static void lcl_UpdateIMapDlg( SwWrtShell& rSh )
rSh.GetView().GetViewFrame()->GetTopFrame().GetTargetList(*pList);
SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
- rSh.GetFlyFrmAttr( aSet );
+ rSh.GetFlyFrameAttr( aSet );
const SwFormatURL &rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL ));
SvxIMapDlgChildWindow::UpdateIMapDlg(
aGrf, rURL.GetMap(), pList.get(), pEditObj );
@@ -213,7 +213,7 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
if( rSh.IsNoNum() )
{
- rSh.SttCrsrMove();
+ rSh.SttCursorMove();
bool bLeft = rSh.Left( CRSR_SKIP_CHARS, true, 1, false );
if( bLeft )
{
@@ -225,7 +225,7 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
// of a doc, frame, table or an area.
rSh.DelNumRules();
- rSh.EndCrsrMove();
+ rSh.EndCursorMove();
break;
}
@@ -285,8 +285,8 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
// destroyed after the paste.
SwView* pView = &rView;
SwTransferable::Paste( rSh, aDataHelper );
- if( rSh.IsFrmSelected() || rSh.IsObjSelected() )
- rSh.EnterSelFrmMode();
+ if( rSh.IsFrameSelected() || rSh.IsObjSelected() )
+ rSh.EnterSelFrameMode();
pView->AttrChangedNotify( &rSh );
}
else
@@ -316,8 +316,8 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
//Done() has to be called before the shell has been removed
rReq.Done();
bIgnore = true;
- if( rSh.IsFrmSelected() || rSh.IsObjSelected())
- rSh.EnterSelFrmMode();
+ if( rSh.IsFrameSelected() || rSh.IsObjSelected())
+ rSh.EnterSelFrameMode();
pView->AttrChangedNotify( &rSh );
}
}
@@ -348,8 +348,8 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
}
}
- if (rSh.IsFrmSelected() || rSh.IsObjSelected())
- rSh.EnterSelFrmMode();
+ if (rSh.IsFrameSelected() || rSh.IsObjSelected())
+ rSh.EnterSelFrameMode();
pView->AttrChangedNotify( &rSh );
}
else
@@ -363,7 +363,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
TransferableDataHelper::CreateFromSystemClipboard( &rSh.GetView().GetEditWin()) );
if( aDataHelper.GetXTransferable().is()
&& SwTransferable::IsPaste( rSh, aDataHelper )
- && !rSh.CrsrInsideInputField() )
+ && !rSh.CursorInsideInputField() )
{
// Temporary variables, because the shell could already be
// destroyed after the paste.
@@ -383,8 +383,8 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
}
}
- if (rSh.IsFrmSelected() || rSh.IsObjSelected())
- rSh.EnterSelFrmMode();
+ if (rSh.IsFrameSelected() || rSh.IsObjSelected())
+ rSh.EnterSelFrameMode();
pView->AttrChangedNotify( &rSh );
}
else
@@ -435,7 +435,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
case SID_PASTE_SPECIAL:
if( !GetView().IsPasteSpecialAllowed()
- || rSh.CrsrInsideInputField() )
+ || rSh.CursorInsideInputField() )
{
rSet.DisableItem( nWhich );
}
@@ -539,7 +539,7 @@ void SwBaseShell::StateUndo(SfxItemSet &rSet)
case SID_REPEAT:
{ // Repeat is only possible if no REDO is possible - UI-Restriction
if ((!rSh.GetFirstRedoInfo(nullptr)) &&
- !rSh.IsSelFrmMode() &&
+ !rSh.IsSelFrameMode() &&
(UNDO_EMPTY != rSh.GetRepeatInfo(nullptr)))
{
rSet.Put(SfxStringItem(nWhich, rSh.GetRepeatString()));
@@ -602,7 +602,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
rSh.EndAllTableBoxEdit();
rSh.SwViewShell::UpdateFields(true);
- if( rSh.IsCrsrInTable() )
+ if( rSh.IsCursorInTable() )
{
if( !rSh.IsTableComplexForChart() )
SwTableFUNC( &rSh, false).UpdateChart();
@@ -655,16 +655,16 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if (pFieldType)
{
- if (rSh.IsSelFrmMode())
+ if (rSh.IsSelFrameMode())
{
- rSh.UnSelectFrm();
- rSh.LeaveSelFrmMode();
+ rSh.UnSelectFrame();
+ rSh.LeaveSelFrameMode();
}
if (rSh.HasMark())
{
SwMvContext aMvContext(&rSh);
- if (rSh.IsCrsrPtAtEnd())
+ if (rSh.IsCursorPtAtEnd())
rSh.SwapPam();
rSh.ClearMark();
rSh.EndSelect();
@@ -681,10 +681,10 @@ void SwBaseShell::Execute(SfxRequest &rReq)
case FN_START_DOC_DIRECT:
case FN_END_DOC_DIRECT:
{
- if (rSh.IsSelFrmMode())
+ if (rSh.IsSelFrameMode())
{
- rSh.UnSelectFrm();
- rSh.LeaveSelFrmMode();
+ rSh.UnSelectFrame();
+ rSh.LeaveSelFrameMode();
}
rSh.EnterStdMode();
nSlot == FN_START_DOC_DIRECT ?
@@ -697,10 +697,10 @@ void SwBaseShell::Execute(SfxRequest &rReq)
{
bool bSuccess = rSh.GotoObj( nSlot == FN_GOTO_NEXT_OBJ );
rReq.SetReturnValue(SfxBoolItem(nSlot, bSuccess));
- if (bSuccess && !rSh.IsSelFrmMode())
+ if (bSuccess && !rSh.IsSelFrameMode())
{
- rSh.HideCrsr();
- rSh.EnterSelFrmMode();
+ rSh.HideCursor();
+ rSh.EnterSelFrameMode();
GetView().AttrChangedNotify( &rSh );
}
}
@@ -714,7 +714,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
const int nSelType = rSh.GetSelectionType();
sal_Int8 nGalleryItemType( pGalleryItem->GetType() );
- if ( (!rSh.IsSelFrmMode() || nSelType & nsSelectionType::SEL_GRF) &&
+ if ( (!rSh.IsSelFrameMode() || nSelType & nsSelectionType::SEL_GRF) &&
nGalleryItemType == css::gallery::GalleryItemType::GRAPHIC )
{
SwWait aWait( *rView.GetDocShell(), true );
@@ -729,7 +729,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
GetView().GetEditWin().GrabFocus();
}
- else if(!rSh.IsSelFrmMode() &&
+ else if(!rSh.IsSelFrameMode() &&
nGalleryItemType == css::gallery::GalleryItemType::MEDIA )
{
const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGalleryItem->GetURL() );
@@ -915,7 +915,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
pVFrame->ToggleChildWindow( nId );
pVFrame->GetBindings().Invalidate( SID_IMAP );
- if ( pVFrame->HasChildWindow( nId ) && rSh.IsFrmSelected() )
+ if ( pVFrame->HasChildWindow( nId ) && rSh.IsFrameSelected() )
lcl_UpdateIMapDlg( rSh );
}
break;
@@ -924,15 +924,15 @@ void SwBaseShell::Execute(SfxRequest &rReq)
SvxIMapDlg* pDlg = GetIMapDlg(GetView());
// Check, if the allocation is useful or allowed at all.
- if ( rSh.IsFrmSelected() &&
+ if ( rSh.IsFrameSelected() &&
pDlg->GetEditingObject() == rSh.GetIMapInventor() )
{
SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
- rSh.GetFlyFrmAttr( aSet );
+ rSh.GetFlyFrameAttr( aSet );
SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
aURL.SetMap( &pDlg->GetImageMap() );
aSet.Put( aURL );
- rSh.SetFlyFrmAttr( aSet );
+ rSh.SetFlyFrameAttr( aSet );
}
}
break;
@@ -963,7 +963,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
{
rSh.StartAction();
SfxItemSet aSet( rSh.GetAttrPool(), RES_SURROUND, RES_SURROUND);
- rSh.GetFlyFrmAttr( aSet );
+ rSh.GetFlyFrameAttr( aSet );
SwFormatSurround aSur( static_cast<const SwFormatSurround&>(aSet.Get( RES_SURROUND )) );
if ( !aSur.IsContour() )
{
@@ -971,7 +971,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if ( aSur.GetSurround() == SURROUND_NONE )
aSur.SetSurround( SURROUND_PARALLEL );
aSet.Put( aSur );
- rSh.SetFlyFrmAttr( aSet );
+ rSh.SetFlyFrameAttr( aSet );
}
const tools::PolyPolygon aPoly( pDlg->GetPolyPolygon() );
rSh.SetGraphicPolygon( &aPoly );
@@ -1009,11 +1009,11 @@ void SwBaseShell::Execute(SfxRequest &rReq)
rSh.StartUndo();
if (rSh.IsObjSelected())
rSh.ChgAnchor(eSet);
- else if (rSh.IsFrmSelected())
+ else if (rSh.IsFrameSelected())
{
SwFormatAnchor aAnc(eSet, rSh.GetPhyPageNum());
SfxItemSet aSet(SwFEShell::makeItemSetFromFormatAnchor(GetPool(), aAnc));
- rSh.SetFlyFrmAttr(aSet);
+ rSh.SetFlyFrameAttr(aSet);
}
// if new anchor is 'as char' and it is a Math object and the usual
// pre-conditions are met then align the formula to the baseline of the text
@@ -1027,7 +1027,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if( nHtmlMode )
{
SfxItemSet aSet(GetPool(), RES_SURROUND, RES_HORI_ORIENT);
- rSh.GetFlyFrmAttr(aSet);
+ rSh.GetFlyFrameAttr(aSet);
const SwFormatSurround& rSurround = static_cast<const SwFormatSurround&>(aSet.Get(RES_SURROUND));
const SwFormatVertOrient& rVert = static_cast<const SwFormatVertOrient&>(aSet.Get(RES_VERT_ORIENT));
@@ -1080,7 +1080,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
}
if( aSet.Count() )
- rSh.SetFlyFrmAttr( aSet );
+ rSh.SetFlyFrameAttr( aSet );
}
rSh.EndUndo();
@@ -1161,12 +1161,12 @@ void SwBaseShell::Execute(SfxRequest &rReq)
SwFrameFormat *pFormat = rSh.GetTableFormat();
pFormat->SetFormatAttr( *pItem );
}
- else if ( rSh.IsFrmSelected() )
+ else if ( rSh.IsFrameSelected() )
{
// Set border attributes via Frame-Manager.
- SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
+ SwFlyFrameAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
aMgr.SetAttrSet( *pArgs );
- aMgr.UpdateFlyFrm();
+ aMgr.UpdateFlyFrame();
}
else
{
@@ -1193,12 +1193,12 @@ void SwBaseShell::Execute(SfxRequest &rReq)
// Set border attributes Get/SetTabBorders()
rSh.SetTabBorders(*pArgs);
}
- else if ( rSh.IsFrmSelected() )
+ else if ( rSh.IsFrameSelected() )
{
// Set border attributes via Frame-Manager.
- SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
+ SwFlyFrameAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
aMgr.SetAttrSet(*pArgs);
- aMgr.UpdateFlyFrm();
+ aMgr.UpdateFlyFrame();
}
else
{
@@ -1217,7 +1217,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
// Here the state fpr SID_IMAP / SID_CONTOUR will be handled
// until the swapping of the graphic is finished.
-IMPL_LINK_NOARG_TYPED(SwBaseShell, GraphicArrivedHdl, SwCrsrShell&, void)
+IMPL_LINK_NOARG_TYPED(SwBaseShell, GraphicArrivedHdl, SwCursorShell&, void)
{
sal_uInt16 nGrfType;
SwWrtShell &rSh = GetShell();
@@ -1275,7 +1275,7 @@ IMPL_LINK_NOARG_TYPED(SwBaseShell, GraphicArrivedHdl, SwCrsrShell&, void)
if( !bProtect )
{
SfxItemSet aSet(GetPool(), RES_SURROUND, RES_SURROUND);
- rSh.GetFlyFrmAttr(aSet);
+ rSh.GetFlyFrameAttr(aSet);
const SwFormatSurround& rWrap = static_cast<const SwFormatSurround&>(aSet.Get(RES_SURROUND));
bSetState = true;
bState = rWrap.IsContour();
@@ -1324,7 +1324,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
{
case SID_GALLERY_FORMATS:
if ( rSh.IsObjSelected() ||
- (rSh.IsSelFrmMode() &&
+ (rSh.IsSelFrameMode() &&
!(rSh.GetSelectionType() & nsSelectionType::SEL_GRF)) )
rSet.DisableItem( nWhich );
break;
@@ -1338,8 +1338,8 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
break;
case FN_INSERT_REGION:
- if( rSh.CrsrInsideInputField()
- || rSh.IsSelFrmMode()
+ if( rSh.CursorInsideInputField()
+ || rSh.IsSelFrameMode()
|| !rSh.IsInsRegionAvailable() )
{
rSet.DisableItem( nWhich );
@@ -1348,24 +1348,24 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
case FN_CONVERT_TABLE_TO_TEXT:
{
- FrmTypeFlags eFrmType = rSh.GetFrmType(nullptr,true);
- if( (eFrmType & FrmTypeFlags::FOOTNOTE) ||
+ FrameTypeFlags eFrameType = rSh.GetFrameType(nullptr,true);
+ if( (eFrameType & FrameTypeFlags::FOOTNOTE) ||
!rSh.GetTableFormat() )
rSet.DisableItem( nWhich );
}
break;
case FN_CONVERT_TEXT_TO_TABLE:
{
- FrmTypeFlags eFrmType = rSh.GetFrmType(nullptr,true);
- if( (eFrmType & FrmTypeFlags::FOOTNOTE) ||
+ FrameTypeFlags eFrameType = rSh.GetFrameType(nullptr,true);
+ if( (eFrameType & FrameTypeFlags::FOOTNOTE) ||
!rSh.IsTextToTableAvailable() )
rSet.DisableItem( nWhich );
}
break;
case FN_CONVERT_TEXT_TABLE:
{
- FrmTypeFlags eFrmType = rSh.GetFrmType(nullptr,true);
- if( (eFrmType & FrmTypeFlags::FOOTNOTE) ||
+ FrameTypeFlags eFrameType = rSh.GetFrameType(nullptr,true);
+ if( (eFrameType & FrameTypeFlags::FOOTNOTE) ||
(!rSh.GetTableFormat() && !rSh.IsTextToTableAvailable() ) )
rSet.DisableItem( nWhich );
}
@@ -1381,9 +1381,9 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
SwFrameFormat *pFormat = rSh.GetTableFormat();
aSet.Put(pFormat->GetFormatAttr( nWhich ));
}
- else if( rSh.IsFrmSelected() )
+ else if( rSh.IsFrameSelected() )
{
- SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
+ SwFlyFrameAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
aSet.Put( aMgr.GetAttrSet() );
}
else
@@ -1407,7 +1407,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
{
const sal_uInt16 nId = SvxIMapDlgChildWindow::GetChildWindowId();
const bool bHas = pVFrame->HasChildWindow( nId );
- const bool bFrmSel = rSh.IsFrmSelected();
+ const bool bFrameSel = rSh.IsFrameSelected();
const bool bIsGraphicSelection =
rSh.GetSelectionType() == nsSelectionType::SEL_GRF;
@@ -1425,7 +1425,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
else
{
if ( !bHas &&
- ( !bFrmSel ||
+ ( !bFrameSel ||
( bIsGraphicSelection &&
rSh.GetGraphicType() == GRAPHIC_NONE ) ) )
{
@@ -1434,7 +1434,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
else
{
SfxBoolItem aBool(nWhich, bHas);
- if ( bHas && bFrmSel )
+ if ( bHas && bFrameSel )
lcl_UpdateIMapDlg( rSh );
rSet.Put(aBool);
}
@@ -1445,7 +1445,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
case SID_IMAP_EXEC:
{
bool bDisable = false;
- if( !rSh.IsFrmSelected())
+ if( !rSh.IsFrameSelected())
bDisable = true;
sal_uInt16 nId = SvxIMapDlgChildWindow::GetChildWindowId();
if(!bDisable && pVFrame->HasChildWindow( nId ))
@@ -1469,7 +1469,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
case FN_BACKSPACE:
case SID_DELETE:
- if ( ( rSh.HasReadonlySel() && !rSh.CrsrInsideInputField() )
+ if ( ( rSh.HasReadonlySel() && !rSh.CursorInsideInputField() )
|| rSh.IsSelObjProtected( FlyProtectFlags::Content|FlyProtectFlags::Parent ) != FlyProtectFlags::NONE )
{
rSet.DisableItem( nWhich );
@@ -1553,13 +1553,13 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
bool bObj = 0 != rSh.IsObjSelected();
bool bParentCntProt = rSh.IsSelObjProtected( FlyProtectFlags::Content|FlyProtectFlags::Parent ) != FlyProtectFlags::NONE;
- if( !bParentCntProt && (bObj || rSh.IsFrmSelected()))
+ if( !bParentCntProt && (bObj || rSh.IsFrameSelected()))
{
SfxItemSet aSet(GetPool(), RES_ANCHOR, RES_ANCHOR);
if(bObj)
rSh.GetObjAttr(aSet);
else
- rSh.GetFlyFrmAttr(aSet);
+ rSh.GetFlyFrameAttr(aSet);
RndStdIds eSet = static_cast<const SwFormatAnchor&>(aSet.Get(RES_ANCHOR)).GetAnchorId();
const bool bSet =
((nWhich == FN_TOOL_ANCHOR_PAGE) &&
@@ -1623,7 +1623,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
bool bObj = 0 != rSh.IsObjSelected();
bool bParentCntProt = rSh.IsSelObjProtected( FlyProtectFlags::Content|FlyProtectFlags::Parent ) != FlyProtectFlags::NONE;
- if( !bParentCntProt && (bObj || rSh.IsFrmSelected()))
+ if( !bParentCntProt && (bObj || rSh.IsFrameSelected()))
{
SfxItemSet aSet(GetPool(), RES_OPAQUE, RES_ANCHOR);
int nAnchorType;
@@ -1634,7 +1634,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
}
else
{
- rSh.GetFlyFrmAttr(aSet);
+ rSh.GetFlyFrameAttr(aSet);
nAnchorType = static_cast<const SwFormatAnchor&>(aSet.Get(RES_ANCHOR)).GetAnchorId();
}
const SwFormatSurround& rWrap = static_cast<const SwFormatSurround&>(aSet.Get(RES_SURROUND));
@@ -1697,7 +1697,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
if( AddGrfUpdateSlot( nWhich ))
rSh.GetGraphic(false); // start the loading
}
- else if( rSh.IsFrmSelected() )
+ else if( rSh.IsFrameSelected() )
{
// #i102253# applied patch from OD (see task)
bDisable =
@@ -1799,13 +1799,13 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
{
SwWrtShell &rSh = GetShell();
bool bObj = 0 != rSh.IsObjSelected();
- if( bObj || rSh.IsFrmSelected())
+ if( bObj || rSh.IsFrameSelected())
{
SfxItemSet aSet(GetPool(), RES_OPAQUE, RES_SURROUND);
if(bObj)
rSh.GetObjAttr(aSet);
else
- rSh.GetFlyFrmAttr(aSet);
+ rSh.GetFlyFrameAttr(aSet);
SwFormatSurround aWrap( static_cast<const SwFormatSurround&>(aSet.Get(RES_SURROUND)) );
SwSurround nOldSurround(aWrap.GetSurround());
SwSurround nSurround = SURROUND_PARALLEL;
@@ -1876,18 +1876,18 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
rSh.SelectionToHell();
}
else
- rSh.SetFlyFrmAttr(aSet);
+ rSh.SetFlyFrameAttr(aSet);
}
}
//Force update of the status line
-void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh )
+void SwBaseShell::SetFrameMode(FlyMode eMode, SwWrtShell *pSh )
{
eFrameMode = eMode;
SfxBindings &rBnd = pSh->GetView().GetViewFrame()->GetBindings();
- if( eMode == FLY_DRAG || pSh->IsFrmSelected() || pSh->IsObjSelected() )
+ if( eMode == FLY_DRAG || pSh->IsFrameSelected() || pSh->IsObjSelected() )
{
const SfxPointItem aTmp1( SID_ATTR_POSITION, pSh->GetAnchorObjDiff());
const SvxSizeItem aTmp2( SID_ATTR_SIZE, pSh->GetObjSize());
@@ -1921,9 +1921,9 @@ SwBaseShell::~SwBaseShell()
if( rView.GetCurShell() == this )
rView.ResetSubShell();
- Link<SwCrsrShell&,void> aTmp( LINK( this, SwBaseShell, GraphicArrivedHdl));
+ Link<SwCursorShell&,void> aTmp( LINK( this, SwBaseShell, GraphicArrivedHdl));
if( aTmp == rView.GetWrtShell().GetGrfArrivedLnk() )
- rView.GetWrtShell().SetGrfArrivedLnk( Link<SwCrsrShell&,void>() );
+ rView.GetWrtShell().SetGrfArrivedLnk( Link<SwCursorShell&,void>() );
}
void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
@@ -2158,7 +2158,7 @@ void SwBaseShell::GetBckColState(SfxItemSet &rSet)
if(nSelType & nsSelectionType::SEL_GRF || nsSelectionType::SEL_FRM & nSelType)
{
- rSh.GetFlyFrmAttr(aCoreSet);
+ rSh.GetFlyFrameAttr(aCoreSet);
}
else
{
@@ -2217,7 +2217,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
if((nsSelectionType::SEL_FRM & nSelType) || (nsSelectionType::SEL_GRF & nSelType))
{
- rSh.GetFlyFrmAttr(aCoreSet);
+ rSh.GetFlyFrameAttr(aCoreSet);
}
else
{
@@ -2286,7 +2286,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
}
else
{
- rSh.SetFlyFrmAttr(aCoreSet);
+ rSh.SetFlyFrameAttr(aCoreSet);
}
}
else
@@ -2323,9 +2323,9 @@ void SwBaseShell::GetBorderState(SfxItemSet &rSet)
rSh.GetTabBorders( aCoreSet );
rSet.Put( aCoreSet );
}
- else if ( rSh.IsFrmSelected() )
+ else if ( rSh.IsFrameSelected() )
{
- SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
+ SwFlyFrameAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
rSet.Put( aMgr.GetAttrSet() );
bPrepare = false;
}
@@ -2415,10 +2415,10 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
pOutSet = pDlg->GetOutputItemSet();
}
}
- else if ( rSh.IsFrmSelected() )
+ else if ( rSh.IsFrameSelected() )
{
// Set border attributes via Frame-Manager
- SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
+ SwFlyFrameAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
aSet.Put( aMgr.GetAttrSet() );
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -2429,7 +2429,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
if ( pDlg->Execute() == RET_OK )
{
aMgr.SetAttrSet( *pDlg->GetOutputItemSet() );
- aMgr.UpdateFlyFrm();
+ aMgr.UpdateFlyFrame();
pOutSet = pDlg->GetOutputItemSet();
}
}
@@ -2485,10 +2485,10 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
pOutSet = pDlg->GetOutputItemSet();
}
}
- else if ( rSh.IsFrmSelected() )
+ else if ( rSh.IsFrameSelected() )
{
- rSh.GetFlyFrmAttr( aSet );
+ rSh.GetFlyFrameAttr( aSet );
pDlg.reset(pFact->CreateSfxDialog( pMDI, aSet,
rView.GetViewFrame()->GetFrame().GetFrameInterface(),
@@ -2496,7 +2496,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
OSL_ENSURE(pDlg, "Dialog creation failed!");
if ( pDlg->Execute() == RET_OK )
{
- rSh.SetFlyFrmAttr((SfxItemSet &) *pDlg->GetOutputItemSet() );
+ rSh.SetFlyFrameAttr((SfxItemSet &) *pDlg->GetOutputItemSet() );
pOutSet = pDlg->GetOutputItemSet();
}
}
@@ -2543,7 +2543,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
const SfxItemSet* pArgs = _rRequest.GetArgs();
SwWrtShell& rSh = GetShell();
- if ( !( rSh.GetFrmType( nullptr, true ) & FrmTypeFlags::FOOTNOTE ) )
+ if ( !( rSh.GetFrameType( nullptr, true ) & FrameTypeFlags::FOOTNOTE ) )
{
SwView &rTempView = GetView(); // Because GetView() does not work after the shell exchange
bool bHTMLMode = 0 != (::GetHtmlMode(rTempView.GetDocShell())&HTMLMODE_ON);
@@ -2733,13 +2733,13 @@ void SwBaseShell::GetGalleryState( SfxItemSet &rSet )
rLst.push_back( SW_RESSTR( STR_SWBG_OLE ) );
nOlePos = nPos++;
}
- const FrmTypeFlags nType = rSh.GetFrmType(nullptr,true);
- if ( nType & FrmTypeFlags::HEADER )
+ const FrameTypeFlags nType = rSh.GetFrameType(nullptr,true);
+ if ( nType & FrameTypeFlags::HEADER )
{
rLst.push_back( SW_RESSTR( STR_SWBG_HEADER ) );
nHeaderPos = nPos++;
}
- if ( nType & FrmTypeFlags::FOOTER )
+ if ( nType & FrameTypeFlags::FOOTER )
{
rLst.push_back( SW_RESSTR( STR_SWBG_FOOTER ) );
nFooterPos = nPos;
@@ -2793,7 +2793,7 @@ void SwBaseShell::ExecuteGallery(SfxRequest &rReq)
{
SfxItemSet aCoreSet(GetPool(), RES_BACKGROUND, RES_BACKGROUND);
aCoreSet.Put( aBrush );
- rSh.SetFlyFrmAttr( aCoreSet );
+ rSh.SetFlyFrameAttr( aCoreSet );
}
else if ( nPos == nPagePos || nPos == nHeaderPos || nPos == nFooterPos )
{
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index fbe4f54d956a..2595441bcecb 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -89,9 +89,9 @@ void SwBezierShell::Execute(SfxRequest &rReq)
else
{
pSh->DelSelectedObj();
- if (pSh->IsSelFrmMode())
+ if (pSh->IsSelFrameMode())
{
- pSh->LeaveSelFrmMode();
+ pSh->LeaveSelFrameMode();
pSh->NoEdit();
}
GetView().AttrChangedNotify(pSh); // Shell change if applicable...
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index a5fcf6b350b7..6e76baf97afe 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -227,7 +227,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
aSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_ANCHOR, nAnchor));
bool bRTL;
bool bVertL2R;
- aSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT, pSh->IsFrmVertical(true, bRTL, bVertL2R)));
+ aSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT, pSh->IsFrameVertical(true, bRTL, bVertL2R)));
aSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_IN_RTL_TEXT, bRTL));
SwFrameFormat* pFrameFormat = FindFrameFormat( pObj );
@@ -268,7 +268,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
SfxItemState::SET != pOutSet->GetItemState(
SID_ATTR_TRANSFORM_POS_Y, false );
- SfxItemSet aFrmAttrSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END - 1);
+ SfxItemSet aFrameAttrSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END - 1);
bool bSingleSelection = rMarkList.GetMarkCount() == 1;
@@ -283,7 +283,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
{
SwFormatAnchor aAnchor(pFrameFormat->GetAnchor());
aAnchor.SetType((RndStdIds)static_cast<const SfxInt16Item*>(pAnchorItem)->GetValue());
- aFrmAttrSet.Put( aAnchor );
+ aFrameAttrSet.Put( aAnchor );
}
}
const SfxPoolItem* pHoriOrient = nullptr;
@@ -306,7 +306,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
aHOrient.SetPos( static_cast<const SfxInt32Item*>(pHoriPosition)->GetValue());
if(pHoriMirror)
aHOrient.SetPosToggle( static_cast<const SfxBoolItem*>(pHoriMirror)->GetValue());
- aFrmAttrSet.Put(aHOrient);
+ aFrameAttrSet.Put(aHOrient);
}
const SfxPoolItem* pVertOrient = nullptr;
@@ -325,15 +325,15 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
static_cast<const SfxInt16Item*>(pVertRelation)->GetValue());
if(pVertPosition)
aVOrient.SetPos( static_cast<const SfxInt32Item*>(pVertPosition)->GetValue());
- aFrmAttrSet.Put( aVOrient );
+ aFrameAttrSet.Put( aVOrient );
}
const SfxPoolItem* pFollowItem = nullptr;
pOutSet->GetItemState(RES_FOLLOW_TEXT_FLOW, false, &pFollowItem);
if(pFollowItem)
- aFrmAttrSet.Put(*pFollowItem);
+ aFrameAttrSet.Put(*pFollowItem);
- if(aFrmAttrSet.Count())
- pSh->SetDrawingAttr(aFrmAttrSet);
+ if(aFrameAttrSet.Count())
+ pSh->SetDrawingAttr(aFrameAttrSet);
rBind.InvalidateAll(false);
@@ -380,9 +380,9 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
GetView().LeaveDrawCreate(); // Switch to selection mode
}
- if (pSh->IsSelFrmMode())
+ if (pSh->IsSelFrameMode())
{
- pSh->LeaveSelFrmMode();
+ pSh->LeaveSelFrameMode();
// #105852# FME
}
}
@@ -779,7 +779,7 @@ IMPL_LINK_TYPED(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation&, rValid
{
bool bRTL;
bool bVertL2R;
- bIsInVertical = pSh->IsFrmVertical(true, bRTL, bVertL2R);
+ bIsInVertical = pSh->IsFrameVertical(true, bRTL, bVertL2R);
}
if(bIsInVertical)
{
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 3473a2ffa4ab..adc98c129b39 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -88,7 +88,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
// Prototypes
-static void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine);
+static void lcl_FrameGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine);
static const SwFrameFormat* lcl_GetFrameFormatByName(SwWrtShell& rSh, const OUString& rName)
{
const size_t nCount = rSh.GetFlyCount(FLYCNTTYPE_FRM);
@@ -116,7 +116,7 @@ void SwFrameShell::InitInterface_Impl()
void SwFrameShell::Execute(SfxRequest &rReq)
{
- //First those who do not need FrmMgr.
+ //First those who do not need FrameMgr.
SwWrtShell &rSh = GetShell();
bool bMore = false;
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -126,7 +126,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
switch ( nSlot )
{
case FN_FRAME_TO_ANCHOR:
- if ( rSh.IsFrmSelected() )
+ if ( rSh.IsFrameSelected() )
{
rSh.GotoFlyAnchor();
rSh.EnterStdMode();
@@ -166,7 +166,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
nCols = static_cast<const SfxUInt16Item *>(pItem)->GetValue();
SfxItemSet aSet(GetPool(),RES_COL,RES_COL);
- rSh.GetFlyFrmAttr( aSet );
+ rSh.GetFlyFrameAttr( aSet );
SwFormatCol aCol(static_cast<const SwFormatCol&>(aSet.Get(RES_COL)));
// GutterWidth will not always passed, hence get firstly
// (see view2: Execute on this slot)
@@ -184,7 +184,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
else
{
rSh.StartAllAction();
- rSh.SetFlyFrmAttr( aSet );
+ rSh.SetFlyFrameAttr( aSet );
rSh.SetModified();
rSh.EndAllAction();
}
@@ -201,7 +201,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
const OUString& rTarget = rHLinkItem.GetTargetFrame();
SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
- rSh.GetFlyFrmAttr( aSet );
+ rSh.GetFlyFrameAttr( aSet );
SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
OUString sOldName(rHLinkItem.GetName().toAsciiUpperCase());
@@ -222,7 +222,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
aURL.SetTargetFrameName(rTarget);
aSet.Put( aURL );
- rSh.SetFlyFrmAttr( aSet );
+ rSh.SetFlyFrameAttr( aSet );
}
}
break;
@@ -264,7 +264,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
return;
}
- SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
+ SwFlyFrameAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
bool bUpdateMgr = true;
bool bCopyToFormat = false;
switch ( nSlot )
@@ -429,12 +429,12 @@ void SwFrameShell::Execute(SfxRequest &rReq)
}
const SwRect &rPg = rSh.GetAnyCurRect(RECT_PAGE);
- SwFormatFrmSize aFrmSize(ATT_VAR_SIZE, rPg.Width(), rPg.Height());
- aFrmSize.SetWhich(GetPool().GetWhich(SID_ATTR_PAGE_SIZE));
- aSet.Put(aFrmSize);
+ SwFormatFrameSize aFrameSize(ATT_VAR_SIZE, rPg.Width(), rPg.Height());
+ aFrameSize.SetWhich(GetPool().GetWhich(SID_ATTR_PAGE_SIZE));
+ aSet.Put(aFrameSize);
const SwRect &rPr = rSh.GetAnyCurRect(RECT_PAGE_PRT);
- SwFormatFrmSize aPrtSize(ATT_VAR_SIZE, rPr.Width(), rPr.Height());
+ SwFormatFrameSize aPrtSize(ATT_VAR_SIZE, rPr.Width(), rPr.Height());
aPrtSize.SetWhich(GetPool().GetWhich(FN_GET_PRINT_AREA));
aSet.Put(aPrtSize);
@@ -442,10 +442,10 @@ void SwFrameShell::Execute(SfxRequest &rReq)
aSet.SetParent( aMgr.GetAttrSet().GetParent() );
// On % values initialize size
- SwFormatFrmSize& rSize = const_cast<SwFormatFrmSize&>(static_cast<const SwFormatFrmSize&>(aSet.Get(RES_FRM_SIZE)));
- if (rSize.GetWidthPercent() && rSize.GetWidthPercent() != SwFormatFrmSize::SYNCED)
+ SwFormatFrameSize& rSize = const_cast<SwFormatFrameSize&>(static_cast<const SwFormatFrameSize&>(aSet.Get(RES_FRM_SIZE)));
+ if (rSize.GetWidthPercent() && rSize.GetWidthPercent() != SwFormatFrameSize::SYNCED)
rSize.SetWidth(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Width());
- if (rSize.GetHeightPercent() && rSize.GetHeightPercent() != SwFormatFrmSize::SYNCED)
+ if (rSize.GetHeightPercent() && rSize.GetHeightPercent() != SwFormatFrameSize::SYNCED)
rSize.SetHeight(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Height());
// disable vertical positioning for Math Objects anchored 'as char' if baseline alignment is activated
@@ -463,7 +463,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric) ));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact);
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog(
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrameTabDialog(
nSel & nsSelectionType::SEL_GRF ? OUString("PictureDialog") :
nSel & nsSelectionType::SEL_OLE ? OUString("ObjectDialog"):
OUString("FrameDialog"),
@@ -651,7 +651,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
}
else
{
- aMgr.UpdateFlyFrm();
+ aMgr.UpdateFlyFrame();
}
}
@@ -661,7 +661,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
{
SwWrtShell &rSh = GetShell();
bool bHtmlMode = 0 != ::GetHtmlMode(rSh.GetView().GetDocShell());
- if (rSh.IsFrmSelected())
+ if (rSh.IsFrameSelected())
{
SfxItemSet aSet( rSh.GetAttrPool(),
RES_LR_SPACE, RES_UL_SPACE,
@@ -669,15 +669,15 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
RES_OPAQUE, RES_OPAQUE,
RES_PRINT, RES_OPAQUE,
0 );
- rSh.GetFlyFrmAttr( aSet );
+ rSh.GetFlyFrameAttr( aSet );
bool bProtect = rSh.IsSelObjProtected(FlyProtectFlags::Pos) != FlyProtectFlags::NONE;
bool bParentCntProt = rSh.IsSelObjProtected( FlyProtectFlags::Content|FlyProtectFlags::Parent ) != FlyProtectFlags::NONE;
bProtect |= bParentCntProt;
- const FrmTypeFlags eFrmType = rSh.GetFrmType(nullptr,true);
- SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
+ const FrameTypeFlags eFrameType = rSh.GetFrameType(nullptr,true);
+ SwFlyFrameAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
SfxWhichIter aIter( rSet );
sal_uInt16 nWhich = aIter.FirstWhich();
@@ -687,7 +687,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
{
case RES_FRM_SIZE:
{
- SwFormatFrmSize aSz(aMgr.GetFrmSize());
+ SwFormatFrameSize aSz(aMgr.GetFrameSize());
rSet.Put(aSz);
}
break;
@@ -711,7 +711,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
case FN_FRAME_ALIGN_HORZ_CENTER:
case FN_FRAME_ALIGN_HORZ_RIGHT:
case FN_FRAME_ALIGN_HORZ_LEFT:
- if ( (eFrmType & FrmTypeFlags::FLY_INCNT) ||
+ if ( (eFrameType & FrameTypeFlags::FLY_INCNT) ||
bProtect ||
((nWhich == FN_FRAME_ALIGN_HORZ_CENTER || nWhich == SID_OBJECT_ALIGN_CENTER) &&
bHtmlMode ))
@@ -723,7 +723,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
case FN_FRAME_ALIGN_VERT_CHAR_TOP:
case FN_FRAME_ALIGN_VERT_CHAR_CENTER:
case FN_FRAME_ALIGN_VERT_CHAR_BOTTOM:
- if ( !(eFrmType & FrmTypeFlags::FLY_INCNT) || bProtect
+ if ( !(eFrameType & FrameTypeFlags::FLY_INCNT) || bProtect
|| (bHtmlMode && FN_FRAME_ALIGN_VERT_CHAR_BOTTOM == nWhich) )
rSet.DisableItem( nWhich );
break;
@@ -735,12 +735,12 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
case FN_FRAME_ALIGN_VERT_TOP:
case FN_FRAME_ALIGN_VERT_CENTER:
case FN_FRAME_ALIGN_VERT_BOTTOM:
- if ( bProtect || (bHtmlMode && eFrmType & FrmTypeFlags::FLY_ATCNT))
+ if ( bProtect || (bHtmlMode && eFrameType & FrameTypeFlags::FLY_ATCNT))
rSet.DisableItem( nWhich );
else
{
sal_uInt16 nId = 0;
- if (eFrmType & FrmTypeFlags::FLY_INCNT)
+ if (eFrameType & FrameTypeFlags::FLY_INCNT)
{
switch (nWhich)
{
@@ -769,8 +769,8 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
const SwFrameFormat* pFormat = rSh.IsFlyInFly();
if (pFormat)
{
- const SwFormatFrmSize& rFrmSz = pFormat->GetFrmSize();
- if (rFrmSz.GetHeightSizeType() != ATT_FIX_SIZE)
+ const SwFormatFrameSize& rFrameSz = pFormat->GetFrameSize();
+ if (rFrameSz.GetHeightSizeType() != ATT_FIX_SIZE)
{
rSet.DisableItem( nWhich );
break;
@@ -801,7 +801,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
const SfxPoolItem* pItem;
SfxItemSet aURLSet(GetPool(), RES_URL, RES_URL);
- rSh.GetFlyFrmAttr( aURLSet );
+ rSh.GetFlyFrameAttr( aURLSet );
if(SfxItemState::SET == aURLSet.GetItemState(RES_URL, true, &pItem))
{
@@ -948,7 +948,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
{
SwWrtShell &rSh = GetShell();
bool bDefault = false;
- if (!rSh.IsFrmSelected())
+ if (!rSh.IsFrameSelected())
return;
// At first pick the default BoxItem out of the pool.
// If unequal to regular box item, then it has already
@@ -958,7 +958,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
SfxItemSet aFrameSet(rSh.GetAttrPool(), RES_BOX, RES_BOX);
- rSh.GetFlyFrmAttr( aFrameSet );
+ rSh.GetFlyFrameAttr( aFrameSet );
const SvxBoxItem& rBoxItem = static_cast<const SvxBoxItem&>(aFrameSet.Get(RES_BOX));
if (pPoolBoxItem == &rBoxItem)
@@ -981,13 +981,13 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
const SvxBorderLine* pBorderLine;
if ((pBorderLine = aBoxItem.GetTop()) != nullptr)
- lcl_FrmGetMaxLineWidth(pBorderLine, aBorderLine);
+ lcl_FrameGetMaxLineWidth(pBorderLine, aBorderLine);
if ((pBorderLine = aBoxItem.GetBottom()) != nullptr)
- lcl_FrmGetMaxLineWidth(pBorderLine, aBorderLine);
+ lcl_FrameGetMaxLineWidth(pBorderLine, aBorderLine);
if ((pBorderLine = aBoxItem.GetLeft()) != nullptr)
- lcl_FrmGetMaxLineWidth(pBorderLine, aBorderLine);
+ lcl_FrameGetMaxLineWidth(pBorderLine, aBorderLine);
if ((pBorderLine = aBoxItem.GetRight()) != nullptr)
- lcl_FrmGetMaxLineWidth(pBorderLine, aBorderLine);
+ lcl_FrameGetMaxLineWidth(pBorderLine, aBorderLine);
if(aBorderLine.GetOutWidth() == 0)
{
@@ -1117,11 +1117,11 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
rSh.AutoUpdateFrame(pFormat, aFrameSet);
}
else
- rSh.SetFlyFrmAttr( aFrameSet );
+ rSh.SetFlyFrameAttr( aFrameSet );
}
-static void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine)
+static void lcl_FrameGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine)
{
if(pBorderLine->GetWidth() > rBorderLine.GetWidth())
rBorderLine.SetWidth(pBorderLine->GetWidth());
@@ -1137,7 +1137,7 @@ void SwFrameShell::GetLineStyleState(SfxItemSet &rSet)
if (bParentCntProt)
{
- if (rSh.IsFrmSelected())
+ if (rSh.IsFrameSelected())
rSet.DisableItem( SID_FRAME_LINECOLOR );
rSet.DisableItem( SID_ATTR_BORDER );
@@ -1145,11 +1145,11 @@ void SwFrameShell::GetLineStyleState(SfxItemSet &rSet)
}
else
{
- if (rSh.IsFrmSelected())
+ if (rSh.IsFrameSelected())
{
SfxItemSet aFrameSet( rSh.GetAttrPool(), RES_BOX, RES_BOX );
- rSh.GetFlyFrmAttr(aFrameSet);
+ rSh.GetFlyFrameAttr(aFrameSet);
const SvxBorderLine* pLine = static_cast<const SvxBoxItem&>(aFrameSet.Get(RES_BOX)).GetTop();
rSet.Put(SvxColorItem(pLine ? pLine->GetColor() : Color(), SID_FRAME_LINECOLOR));
@@ -1165,7 +1165,7 @@ void SwFrameShell::StateInsert(SfxItemSet &rSet)
{
rSet.DisableItem(FN_INSERT_FRAME);
}
- else if ( GetShell().CrsrInsideInputField() )
+ else if ( GetShell().CursorInsideInputField() )
{
rSet.DisableItem(FN_INSERT_FRAME);
}
@@ -1176,9 +1176,9 @@ void SwFrameShell::GetDrawAttrStateTextFrame(SfxItemSet &rSet)
{
SwWrtShell &rSh = GetShell();
- if(rSh.IsFrmSelected())
+ if(rSh.IsFrameSelected())
{
- rSh.GetFlyFrmAttr(rSet);
+ rSh.GetFlyFrameAttr(rSet);
}
else
{
@@ -1199,9 +1199,9 @@ void SwFrameShell::ExecDrawAttrArgsTextFrame(SfxRequest& rReq)
if(pArgs)
{
- if(rSh.IsFrmSelected())
+ if(rSh.IsFrameSelected())
{
- rSh.SetFlyFrmAttr(const_cast< SfxItemSet& >(*pArgs));
+ rSh.SetFlyFrameAttr(const_cast< SfxItemSet& >(*pArgs));
}
else
{
@@ -1243,14 +1243,14 @@ void SwFrameShell::ExecDrawDlgTextFrame(SfxRequest& rReq)
{
SwWrtShell& rSh = GetShell();
- if(rSh.IsFrmSelected())
+ if(rSh.IsFrameSelected())
{
SdrView* pView = rSh.GetDrawView();
SdrModel* pDoc = pView->GetModel();
SfxItemSet aNewAttr(pDoc->GetItemPool());
// get attributes from FlyFrame
- rSh.GetFlyFrmAttr(aNewAttr);
+ rSh.GetFlyFrameAttr(aNewAttr);
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
assert(pFact);
@@ -1264,7 +1264,7 @@ void SwFrameShell::ExecDrawDlgTextFrame(SfxRequest& rReq)
if(RET_OK == pDlg->Execute())
{
// set attributes at FlyFrame
- rSh.SetFlyFrmAttr(const_cast< SfxItemSet& >(*pDlg->GetOutputItemSet()));
+ rSh.SetFlyFrameAttr(const_cast< SfxItemSet& >(*pDlg->GetOutputItemSet()));
static sal_uInt16 aInval[] =
{
@@ -1304,7 +1304,7 @@ void SwFrameShell::DisableStateTextFrame(SfxItemSet &rSet)
{
SwWrtShell& rSh = GetShell();
- if(!rSh.IsFrmSelected())
+ if(!rSh.IsFrameSelected())
{
rSet.DisableItem(nWhich);
}
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 749474d7c80f..901d9c4cfee0 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -85,13 +85,13 @@ class SwGrfShell::SwExternalToolEdit
{
private:
SwWrtShell *const m_pShell;
- ::std::shared_ptr<SwUnoCrsr> const m_pCursor;
+ ::std::shared_ptr<SwUnoCursor> const m_pCursor;
public:
explicit SwExternalToolEdit(SwWrtShell *const pShell)
: m_pShell(pShell)
, m_pCursor( // need only Point, must point to SwGrfNode
- pShell->GetDoc()->CreateUnoCrsr(
+ pShell->GetDoc()->CreateUnoCursor(
*pShell->GetCurrentShellCursor().GetPoint()))
{
}
@@ -211,7 +211,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
case FN_FORMAT_GRAFIC_DLG:
case FN_DRAW_WRAP_DLG:
{
- SwFlyFrmAttrMgr aMgr( false, &rSh, rSh.IsFrmSelected() ?
+ SwFlyFrameAttrMgr aMgr( false, &rSh, rSh.IsFrameSelected() ?
FRMMGR_TYPE_NONE : FRMMGR_TYPE_GRF);
const SwViewOption* pVOpt = rSh.GetViewOptions();
SwViewOption aUsrPref( *pVOpt );
@@ -259,9 +259,9 @@ void SwGrfShell::Execute(SfxRequest &rReq)
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) );
const SwRect* pRect = &rSh.GetAnyCurRect(RECT_PAGE);
- SwFormatFrmSize aFrmSize( ATT_VAR_SIZE, pRect->Width(), pRect->Height());
- aFrmSize.SetWhich( GetPool().GetWhich( SID_ATTR_PAGE_SIZE ) );
- aSet.Put( aFrmSize );
+ SwFormatFrameSize aFrameSize( ATT_VAR_SIZE, pRect->Width(), pRect->Height());
+ aFrameSize.SetWhich( GetPool().GetWhich( SID_ATTR_PAGE_SIZE ) );
+ aSet.Put( aFrameSize );
aSet.Put(SfxStringItem(FN_SET_FRM_NAME, rSh.GetFlyName()));
if ( nSlot == FN_FORMAT_GRAFIC_DLG )
@@ -271,19 +271,19 @@ void SwGrfShell::Execute(SfxRequest &rReq)
}
pRect = &rSh.GetAnyCurRect(RECT_PAGE_PRT);
- aFrmSize.SetWidth( pRect->Width() );
- aFrmSize.SetHeight( pRect->Height() );
- aFrmSize.SetWhich( GetPool().GetWhich(FN_GET_PRINT_AREA) );
- aSet.Put( aFrmSize );
+ aFrameSize.SetWidth( pRect->Width() );
+ aFrameSize.SetHeight( pRect->Height() );
+ aFrameSize.SetWhich( GetPool().GetWhich(FN_GET_PRINT_AREA) );
+ aSet.Put( aFrameSize );
aSet.Put( aMgr.GetAttrSet() );
aSet.SetParent( aMgr.GetAttrSet().GetParent() );
// At percentage values initialize size
- SwFormatFrmSize aSizeCopy = static_cast<const SwFormatFrmSize&>(aSet.Get(RES_FRM_SIZE));
- if (aSizeCopy.GetWidthPercent() && aSizeCopy.GetWidthPercent() != SwFormatFrmSize::SYNCED)
+ SwFormatFrameSize aSizeCopy = static_cast<const SwFormatFrameSize&>(aSet.Get(RES_FRM_SIZE));
+ if (aSizeCopy.GetWidthPercent() && aSizeCopy.GetWidthPercent() != SwFormatFrameSize::SYNCED)
aSizeCopy.SetWidth(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Width());
- if (aSizeCopy.GetHeightPercent() && aSizeCopy.GetHeightPercent() != SwFormatFrmSize::SYNCED)
+ if (aSizeCopy.GetHeightPercent() && aSizeCopy.GetHeightPercent() != SwFormatFrameSize::SYNCED)
aSizeCopy.SetHeight(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Height());
// and now set the size for "external" tabpages
{
@@ -291,8 +291,8 @@ void SwGrfShell::Execute(SfxRequest &rReq)
aSet.Put( aSzItm );
Size aSz( aSizeCopy.GetWidthPercent(), aSizeCopy.GetHeightPercent() );
- if( SwFormatFrmSize::SYNCED == aSz.Width() ) aSz.Width() = 0;
- if( SwFormatFrmSize::SYNCED == aSz.Height() ) aSz.Height() = 0;
+ if( SwFormatFrameSize::SYNCED == aSz.Width() ) aSz.Width() = 0;
+ if( SwFormatFrameSize::SYNCED == aSz.Height() ) aSz.Height() = 0;
aSzItm.SetSize( aSz );
aSzItm.SetWhich( SID_ATTR_GRAF_FRMSIZE_PERCENT );
@@ -344,7 +344,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "no dialog factory!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog("PictureDialog",
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrameTabDialog("PictureDialog",
GetView().GetViewFrame(),
GetView().GetWindow(),
aSet, false));
@@ -360,11 +360,11 @@ void SwGrfShell::Execute(SfxRequest &rReq)
const SfxPoolItem* pItem;
SfxItemSet* pSet = const_cast<SfxItemSet*>(pDlg->GetOutputItemSet());
rReq.Done(*pSet);
- // change the 2 frmsize SizeItems to the correct SwFrmSizeItem
+ // change the 2 frmsize SizeItems to the correct SwFrameSizeItem
if( SfxItemState::SET == pSet->GetItemState(
SID_ATTR_GRAF_FRMSIZE, false, &pItem ))
{
- SwFormatFrmSize aSize;
+ SwFormatFrameSize aSize;
const Size& rSz = static_cast<const SvxSizeItem*>(pItem)->GetSize();
aSize.SetWidth( rSz.Width() );
aSize.SetHeight( rSz.Height() );
@@ -396,7 +396,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
{
aMgr.SetAttrSet(*pSet);
}
- aMgr.UpdateFlyFrm();
+ aMgr.UpdateFlyFrame();
bool bApplyUsrPref = false;
if (SfxItemState::SET == pSet->GetItemState(
@@ -665,7 +665,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
if( bParentCntProt || !bIsGrfContent )
bDisable = true;
else if ( nWhich == SID_INSERT_GRAPHIC
- && rSh.CrsrInsideInputField() )
+ && rSh.CursorInsideInputField() )
{
bDisable = true;
}
@@ -857,12 +857,12 @@ void SwGrfShell::ExecuteRotation(SfxRequest &rReq)
aTransform.rotate(aRotation);
rShell.ReRead(OUString(), OUString(), const_cast<const Graphic*>(&aGraphic));
- SwFlyFrmAttrMgr aManager(false, &rShell, rShell.IsFrmSelected() ? FRMMGR_TYPE_NONE : FRMMGR_TYPE_GRF);
+ SwFlyFrameAttrMgr aManager(false, &rShell, rShell.IsFrameSelected() ? FRMMGR_TYPE_NONE : FRMMGR_TYPE_GRF);
const long nRotatedWidth = aManager.GetSize().Height();
const long nRotatedHeight = aManager.GetSize().Width();
Size aSize(nRotatedWidth, nRotatedHeight);
aManager.SetSize(aSize);
- aManager.UpdateFlyFrm();
+ aManager.UpdateFlyFrame();
SfxItemSet aSet( rShell.GetAttrPool(), RES_GRFATR_CROPGRF, RES_GRFATR_CROPGRF );
rShell.GetCurAttr( aSet );
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index 1ded2e66fbc1..8ac54052c7c1 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -538,14 +538,14 @@ namespace SwLangHelper
{
// string for guessing language
OUString aText;
- SwPaM *pCrsr = rSh.GetCrsr();
- SwTextNode *pNode = pCrsr->GetNode().GetTextNode();
+ SwPaM *pCursor = rSh.GetCursor();
+ SwTextNode *pNode = pCursor->GetNode().GetTextNode();
if (pNode)
{
aText = pNode->GetText();
if (!aText.isEmpty())
{
- sal_Int32 nEnd = pCrsr->GetPoint()->nContent.GetIndex();
+ sal_Int32 nEnd = pCursor->GetPoint()->nContent.GetIndex();
// at most 100 chars to the left...
const sal_Int32 nStt = nEnd > 100 ? nEnd - 100 : 0;
// ... and 100 to the right of the cursor position
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index 91d0c7355d6d..38d26fb7f9bd 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -136,7 +136,7 @@ void SwListShell::Execute(SfxRequest &rReq)
SwWrtShell& rSh = GetShell();
// #i35572#
- const SwNumRule* pCurRule = rSh.GetNumRuleAtCurrCrsrPos();
+ const SwNumRule* pCurRule = rSh.GetNumRuleAtCurrCursorPos();
OSL_ENSURE( pCurRule, "SwListShell::Execute without NumRule" );
bool bOutline = pCurRule && pCurRule->IsOutlineRule();
@@ -260,7 +260,7 @@ void SwListShell::GetState(SfxItemSet &rSet)
break;
case FN_NUM_BULLET_NONUM:
- if ( rSh.CrsrInsideInputField() )
+ if ( rSh.CursorInsideInputField() )
{
rSet.DisableItem(nWhich);
}
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index b39ade8b7b2e..34473e44c0cf 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -99,8 +99,8 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
pSh->SetModified();
pSh->DelSelectedObj();
- if( pSh->IsSelFrmMode() )
- pSh->LeaveSelFrmMode();
+ if( pSh->IsSelFrameMode() )
+ pSh->LeaveSelFrameMode();
GetView().AttrChangedNotify( pSh );
}
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 55162768b06d..c9ea88a49c18 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -151,7 +151,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
rSet.Put( SfxUInt16Item( FN_PARAM_TABLE_HEADLINE, rSh.GetRowsToRepeat() ) );
rSet.Put( pFormat->GetShadow() );
rSet.Put(SfxUInt16Item(FN_TABLE_SET_VERT_ALIGN, rSh.GetBoxAlign()));
- rSet.Put( pFormat->GetFrmDir() );
+ rSet.Put( pFormat->GetFrameDir() );
SvxULSpaceItem aULSpace( pFormat->GetULSpace() );
rSet.Put( aULSpace );
@@ -182,8 +182,8 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
// Table variant: If multiple table cells are selected.
- rSh.GetCrsr(); //Thus GetCrsrCnt() returns the right thing
- aBoxInfo.SetTable ((rSh.IsTableMode() && rSh.GetCrsrCnt() > 1) ||
+ rSh.GetCursor(); //Thus GetCursorCnt() returns the right thing
+ aBoxInfo.SetTable ((rSh.IsTableMode() && rSh.GetCursorCnt() > 1) ||
!bTableSel);
// Always show distance field.
aBoxInfo.SetDist (true);
@@ -368,7 +368,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
}
else
{
- SwFormatFrmSize aSz( ATT_VAR_SIZE, nWidth );
+ SwFormatFrameSize aSz( ATT_VAR_SIZE, nWidth );
if(pRep->GetWidthPercent())
{
aSz.SetWidthPercent( (sal_uInt8)pRep->GetWidthPercent() );
@@ -451,7 +451,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
const SfxItemSet* pArgs = rReq.GetArgs();
SwWrtShell &rSh = GetShell();
- // At first the slots which doesn't need a FrmMgr.
+ // At first the slots which doesn't need a FrameMgr.
bool bMore = false;
const SfxPoolItem* pItem = nullptr;
sal_uInt16 nSlot = rReq.GetSlot();
@@ -689,7 +689,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
break;
case FN_TABLE_OPTIMAL_HEIGHT:
{
- const SwFormatFrmSize aSz;
+ const SwFormatFrameSize aSz;
rSh.SetRowHeight( aSz );
bCallDone = true;
break;
@@ -1240,7 +1240,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
break;
case FN_INSERT_TABLE:
- if ( rSh.CrsrInsideInputField() )
+ if ( rSh.CursorInsideInputField() )
{
rSet.DisableItem( nSlot );
}
@@ -1249,7 +1249,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
case FN_TABLE_OPTIMAL_HEIGHT:
{
// Disable if auto height already is enabled.
- SwFormatFrmSize *pSz;
+ SwFormatFrameSize *pSz;
rSh.GetRowHeight( pSz );
if ( pSz )
{
@@ -1381,7 +1381,7 @@ SwTableShell::SwTableShell(SwView &_rView) :
SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Table));
}
-void SwTableShell::GetFrmBorderState(SfxItemSet &rSet)
+void SwTableShell::GetFrameBorderState(SfxItemSet &rSet)
{
SfxItemSet aCoreSet( GetPool(),
RES_BOX, RES_BOX,
@@ -1444,7 +1444,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
const SfxItemSet* pArgs = rReq.GetArgs();
SwWrtShell &rSh = GetShell();
- // At first the slots, which doesn't need a FrmMgr.
+ // At first the slots, which doesn't need a FrameMgr.
const SfxPoolItem* pItem = nullptr;
const sal_uInt16 nSlot = rReq.GetSlot();
if(pArgs)
diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx
index 6d3115710e58..b0b4269cd15d 100644
--- a/sw/source/uibase/shells/textdrw.cxx
+++ b/sw/source/uibase/shells/textdrw.cxx
@@ -120,7 +120,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget,
if (rSh.IsObjSelected())
{
- rSh.UnSelectFrm();
+ rSh.UnSelectFrame();
}
}
rSh.EndUndo( UNDO_UI_INSERT_URLBTN );
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 869d845de3cc..652f607d731e 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -195,8 +195,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
{
rSh.SttSelect();
rSh.SelectText(
- SwCrsrShell::StartOfInputFieldAtPos( *(rSh.GetCrsr()->Start()) ) + 1,
- SwCrsrShell::EndOfInputFieldAtPos( *(rSh.GetCrsr()->Start()) ) - 1 );
+ SwCursorShell::StartOfInputFieldAtPos( *(rSh.GetCursor()->Start()) ) + 1,
+ SwCursorShell::EndOfInputFieldAtPos( *(rSh.GetCursor()->Start()) ) - 1 );
}
else
{
@@ -406,7 +406,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
aFieldMgr.InsertField( aData );
rSh.Push();
- rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS);
+ rSh.SwCursorShell::Left(1, CRSR_SKIP_CHARS);
pPostIt = static_cast<SwPostItField*>(aFieldMgr.GetCurField());
rSh.Pop(false); // Restore cursor position
}
@@ -490,7 +490,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
bool bNext = pActRed != nullptr;
rSh.Pop(false); // Restore cursor position
- if( rSh.IsCrsrPtAtEnd() )
+ if( rSh.IsCursorPtAtEnd() )
rSh.SwapPam();
rSh.EndAction();
@@ -707,7 +707,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
case FN_INSERT_FIELD:
{
- if ( rSh.CrsrInsideInputField() )
+ if ( rSh.CursorInsideInputField() )
{
rSet.DisableItem(nWhich);
}
@@ -728,7 +728,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
{
SfxViewFrame* pVFrame = GetView().GetViewFrame();
if ( !pVFrame->KnowsChildWindow(FN_INSERT_FIELD)
- || rSh.CrsrInsideInputField() )
+ || rSh.CursorInsideInputField() )
{
rSet.DisableItem(FN_INSERT_REF_FIELD);
}
@@ -736,7 +736,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
break;
case FN_INSERT_FIELD_CTRL:
- if ( rSh.CrsrInsideInputField() )
+ if ( rSh.CursorInsideInputField() )
{
rSet.DisableItem(nWhich);
}
@@ -765,7 +765,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
{
rSet.DisableItem(nWhich);
}
- else if ( rSh.CrsrInsideInputField() )
+ else if ( rSh.CursorInsideInputField() )
{
rSet.DisableItem(nWhich);
}
@@ -781,7 +781,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
case FN_INSERT_FLD_TITLE:
case FN_INSERT_FLD_TOPIC:
case FN_INSERT_DBFIELD:
- if ( rSh.CrsrInsideInputField() )
+ if ( rSh.CursorInsideInputField() )
{
rSet.DisableItem(nWhich);
}
@@ -813,7 +813,7 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem)
if(SfxItemState::SET == aSet.GetItemState(RES_TXTATR_INETFMT, false, &pItem))
{
// Select links
- rSh.SwCrsrShell::SelectTextAttr(RES_TXTATR_INETFMT, false);
+ rSh.SwCursorShell::SelectTextAttr(RES_TXTATR_INETFMT, false);
}
switch (nType)
{
@@ -864,7 +864,7 @@ IMPL_LINK_TYPED( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog&, rDlg, vo
if (pRedline)
{
// Traveling only if more than one field.
- if( !pSh->IsCrsrPtAtEnd() )
+ if( !pSh->IsCursorPtAtEnd() )
pSh->SwapPam(); // Move the cursor behind the Redline.
pSh->Push();
@@ -884,7 +884,7 @@ IMPL_LINK_TYPED( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog&, rDlg, vo
rDlg.EnableTravel(bEnable, true);
- if( pSh->IsCrsrPtAtEnd() )
+ if( pSh->IsCursorPtAtEnd() )
pSh->SwapPam();
pRedline = pSh->GetCurrRedline();
diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx
index 7eacd872d994..851227bc3c88 100644
--- a/sw/source/uibase/shells/textidx.cxx
+++ b/sw/source/uibase/shells/textidx.cxx
@@ -118,7 +118,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
rSh.CalcBoundRect(aRect, FLY_AS_CHAR);
long nWidth = aRect.Width();
- aSet.Put(SwFormatFrmSize(ATT_VAR_SIZE, nWidth));
+ aSet.Put(SwFormatFrameSize(ATT_VAR_SIZE, nWidth));
// Height = width for a more consistent preview (analogous to edit range)
aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
const SwTOXBase* pCurTOX = nullptr;
@@ -195,7 +195,7 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet)
rSet.Put(SfxBoolItem(FN_INSERT_AUTH_ENTRY_DLG, true));
}
- else if ( rSh.CrsrInsideInputField() )
+ else if ( rSh.CursorInsideInputField() )
{
rSet.DisableItem( FN_INSERT_IDX_ENTRY_DLG );
rSet.DisableItem( FN_INSERT_AUTH_ENTRY_DLG );
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 2ea08ce09815..4834685bc6f1 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -138,7 +138,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
- OSL_ENSURE( !rSh.IsObjSelected() && !rSh.IsFrmSelected(),
+ OSL_ENSURE( !rSh.IsObjSelected() && !rSh.IsFrameSelected(),
"wrong shell on dispatcher" );
const SfxItemSet *pArgs = rReq.GetArgs();
@@ -155,8 +155,8 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
break;
case FN_INSERT_SOFT_HYPHEN:
- if( CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar() &&
- CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( true, -1 ))
+ if( CHAR_SOFTHYPHEN != rSh.SwCursorShell::GetChar() &&
+ CHAR_SOFTHYPHEN != rSh.SwCursorShell::GetChar( true, -1 ))
rSh.Insert( OUString( CHAR_SOFTHYPHEN ) );
break;
@@ -199,7 +199,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
case FN_INSERT_BREAK:
{
- if( !rSh.CrsrInsideInputField() )
+ if( !rSh.CursorInsideInputField() )
{
rSh.SplitNode();
}
@@ -504,20 +504,20 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
Size aSize(16 * MM50, 8 * MM50);
GetShell().LockPaint();
GetShell().StartAllAction();
- SwFlyFrmAttrMgr aMgr( true, GetShellPtr(), FRMMGR_TYPE_TEXT );
+ SwFlyFrameAttrMgr aMgr( true, GetShellPtr(), FRMMGR_TYPE_TEXT );
if(nCols > 1)
{
SwFormatCol aCol;
aCol.Init( nCols, aCol.GetGutterWidth(), aCol.GetWishWidth() );
aMgr.SetCol( aCol );
}
- aMgr.InsertFlyFrm(FLY_AT_PARA, aStartPos, aSize);
+ aMgr.InsertFlyFrame(FLY_AT_PARA, aStartPos, aSize);
GetShell().EndAllAction();
GetShell().UnlockPaint();
}
else
{
- GetView().InsFrmMode(nCols);
+ GetView().InsFrameMode(nCols);
}
rReq.Ignore();
}
@@ -535,7 +535,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
}
// Create new border
- SwFlyFrmAttrMgr aMgr( true, GetShellPtr(), FRMMGR_TYPE_TEXT );
+ SwFlyFrameAttrMgr aMgr( true, GetShellPtr(), FRMMGR_TYPE_TEXT );
if(pArgs)
{
Size aSize(aMgr.GetSize());
@@ -563,7 +563,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
GetShell().LockPaint();
GetShell().StartAllAction();
- aMgr.InsertFlyFrm(eAnchor, aPos, aSize);
+ aMgr.InsertFlyFrame(eAnchor, aPos, aSize);
GetShell().EndAllAction();
GetShell().UnlockPaint();
@@ -576,7 +576,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog("FrameDialog",
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrameTabDialog("FrameDialog",
GetView().GetViewFrame(),
&GetView().GetViewFrame()->GetWindow(),
aSet));
@@ -596,7 +596,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
if( rShell.IsInClickToEdit() )
rShell.DelRight();
- aMgr.InsertFlyFrm();
+ aMgr.InsertFlyFrame();
uno::Reference< frame::XDispatchRecorder > xRecorder =
GetView().GetViewFrame()->GetBindings().GetRecorder();
@@ -659,11 +659,11 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
SfxObjectCreateMode eCreateMode =
GetView().GetDocShell()->GetCreateMode();
- bool bCrsrInHidden = false;
+ bool bCursorInHidden = false;
if( !rSh.HasMark() )
{
rSh.Push();
- bCrsrInHidden = rSh.SelectHiddenRange();
+ bCursorInHidden = rSh.SelectHiddenRange();
rSh.Pop();
}
@@ -674,10 +674,10 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
case SID_INSERT_AVMEDIA:
case SID_INSERT_SOUND:
case SID_INSERT_VIDEO:
- if ( GetShell().IsSelFrmMode()
- || GetShell().CrsrInsideInputField()
+ if ( GetShell().IsSelFrameMode()
+ || GetShell().CursorInsideInputField()
|| SfxObjectCreateMode::EMBEDDED == eCreateMode
- || bCrsrInHidden )
+ || bCursorInHidden )
{
rSet.DisableItem( nWhich );
}
@@ -685,9 +685,9 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
case SID_INSERT_DIAGRAM:
if( !aMOpt.IsChart()
- || GetShell().CrsrInsideInputField()
+ || GetShell().CursorInsideInputField()
|| eCreateMode == SfxObjectCreateMode::EMBEDDED
- || bCrsrInHidden )
+ || bCursorInHidden )
{
rSet.DisableItem( nWhich );
}
@@ -696,8 +696,8 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
case FN_INSERT_SMA:
if( !aMOpt.IsMath()
|| eCreateMode == SfxObjectCreateMode::EMBEDDED
- || bCrsrInHidden
- || rSh.CrsrInsideInputField() )
+ || bCursorInHidden
+ || rSh.CursorInsideInputField() )
{
rSet.DisableItem( nWhich );
}
@@ -707,12 +707,12 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
case SID_INSERT_OBJECT:
case SID_INSERT_PLUGIN:
{
- if( eCreateMode == SfxObjectCreateMode::EMBEDDED || bCrsrInHidden )
+ if( eCreateMode == SfxObjectCreateMode::EMBEDDED || bCursorInHidden )
{
rSet.DisableItem( nWhich );
}
- else if( GetShell().IsSelFrmMode()
- || GetShell().CrsrInsideInputField() )
+ else if( GetShell().IsSelFrameMode()
+ || GetShell().CursorInsideInputField() )
{
rSet.DisableItem( nWhich );
}
@@ -729,10 +729,10 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
case FN_INSERT_FRAME_INTERACT_NOCOL :
case FN_INSERT_FRAME_INTERACT:
{
- if( GetShell().IsSelFrmMode()
+ if( GetShell().IsSelFrameMode()
|| rSh.IsTableMode()
- || GetShell().CrsrInsideInputField()
- || bCrsrInHidden )
+ || GetShell().CursorInsideInputField()
+ || bCursorInHidden )
rSet.DisableItem(nWhich);
}
break;
@@ -764,12 +764,12 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
// Get the text of the Link.
rSh.StartAction();
- rSh.CreateCrsr();
- rSh.SwCrsrShell::SelectTextAttr(RES_TXTATR_INETFMT,true);
+ rSh.CreateCursor();
+ rSh.SwCursorShell::SelectTextAttr(RES_TXTATR_INETFMT,true);
OUString sLinkName = rSh.GetSelText();
aHLinkItem.SetName(sLinkName);
aHLinkItem.SetInsertMode(HLINK_FIELD);
- rSh.DestroyCrsr();
+ rSh.DestroyCursor();
rSh.EndAction();
}
else
@@ -789,13 +789,13 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
break;
case FN_INSERT_FRAME:
- if (rSh.IsSelFrmMode() )
+ if (rSh.IsSelFrameMode() )
{
const int nSel = rSh.GetSelectionType();
- if( ((nsSelectionType::SEL_GRF | nsSelectionType::SEL_OLE ) & nSel ) || bCrsrInHidden )
+ if( ((nsSelectionType::SEL_GRF | nsSelectionType::SEL_OLE ) & nSel ) || bCursorInHidden )
rSet.DisableItem(nWhich);
}
- else if ( rSh.CrsrInsideInputField() )
+ else if ( rSh.CursorInsideInputField() )
{
rSet.DisableItem(nWhich);
}
@@ -936,9 +936,9 @@ SwTextShell::~SwTextShell()
{
}
-SfxItemSet SwTextShell::CreateInsertFrameItemSet(SwFlyFrmAttrMgr& rMgr)
+SfxItemSet SwTextShell::CreateInsertFrameItemSet(SwFlyFrameAttrMgr& rMgr)
{
- static const sal_uInt16 aFrmAttrRange[] =
+ static const sal_uInt16 aFrameAttrRange[] =
{
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
@@ -950,19 +950,19 @@ SfxItemSet SwTextShell::CreateInsertFrameItemSet(SwFlyFrmAttrMgr& rMgr)
0
};
- SfxItemSet aSet(GetPool(), aFrmAttrRange );
+ SfxItemSet aSet(GetPool(), aFrameAttrRange );
aSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell())));
// For the Area tab page.
GetShell().GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->PutAreaListItems(aSet);
const SwRect &rPg = GetShell().GetAnyCurRect(RECT_PAGE);
- SwFormatFrmSize aFrmSize(ATT_VAR_SIZE, rPg.Width(), rPg.Height());
- aFrmSize.SetWhich(GetPool().GetWhich(SID_ATTR_PAGE_SIZE));
- aSet.Put(aFrmSize);
+ SwFormatFrameSize aFrameSize(ATT_VAR_SIZE, rPg.Width(), rPg.Height());
+ aFrameSize.SetWhich(GetPool().GetWhich(SID_ATTR_PAGE_SIZE));
+ aSet.Put(aFrameSize);
const SwRect &rPr = GetShell().GetAnyCurRect(RECT_PAGE_PRT);
- SwFormatFrmSize aPrtSize(ATT_VAR_SIZE, rPr.Width(), rPr.Height());
+ SwFormatFrameSize aPrtSize(ATT_VAR_SIZE, rPr.Width(), rPr.Height());
aPrtSize.SetWhich(GetPool().GetWhich(FN_GET_PRINT_AREA));
aSet.Put(aPrtSize);
@@ -1122,7 +1122,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
rSh.SetMark();
rSh.ExtendSelection( false, aChars.getLength() );
rSh.SetAttrSet( aSet, SetAttrMode::DONTEXPAND | SetAttrMode::NOFORMATATTR );
- if( !rSh.IsCrsrPtAtEnd() )
+ if( !rSh.IsCursorPtAtEnd() )
rSh.SwapPam();
rSh.ClearMark();
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 18656e218b45..1961204eff06 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -309,7 +309,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
aRewriter.AddRule( UndoArg2, SW_RES(STR_YIELDS) );
aRewriter.AddRule( UndoArg3, sReplacement );
rWrtSh.StartUndo(UNDO_REPLACE, &aRewriter);
- rWrtSh.GetCrsr()->Normalize(false);
+ rWrtSh.GetCursor()->Normalize(false);
rWrtSh.ClearMark();
for( sal_uInt32 i=aToggle.CharsToDelete(); i > 0; --i )
rWrtSh.DelLeft();
@@ -753,7 +753,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if(pField && pField->GetTypeId() == TYP_GETREFFLD)
{
rWrtSh.StartAllAction();
- rWrtSh.SwCrsrShell::GotoRefMark( static_cast<SwGetRefField*>(pField)->GetSetRefName(),
+ rWrtSh.SwCursorShell::GotoRefMark( static_cast<SwGetRefField*>(pField)->GetSetRefName(),
static_cast<SwGetRefField*>(pField)->GetSubType(),
static_cast<SwGetRefField*>(pField)->GetSeqNo() );
rWrtSh.EndAllAction();
@@ -792,7 +792,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
aFieldMgr.UpdateCurField( aFieldMgr.GetCurField()->GetFormat(), OUString(), sFormula );
else if( !sFormula.isEmpty() )
{
- if( rWrtSh.IsCrsrInTable() )
+ if( rWrtSh.IsCursorInTable() )
{
SfxItemSet aSet( rWrtSh.GetAttrPool(), RES_BOXATR_FORMULA, RES_BOXATR_FORMULA );
aSet.Put( SwTableBoxFormula( sFormula ));
@@ -911,7 +911,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
}
if ( !pPaM )
- pPaM = rWrtSh.GetCrsr();
+ pPaM = rWrtSh.GetCursor();
FieldUnit eMetric = ::GetDfltMetric( dynamic_cast<SwWebView*>( &GetView()) != nullptr );
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
@@ -987,7 +987,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
::SwToSfxPageDescAttr( aCoreSet );
// Properties of numbering
- if (rWrtSh.GetNumRuleAtCurrCrsrPos())
+ if (rWrtSh.GetNumRuleAtCurrCursorPos())
{
SfxBoolItem aStart( FN_NUMBER_NEWSTART, rWrtSh.IsNumRuleStart( pPaM ) );
aCoreSet.Put(aStart);
@@ -1160,7 +1160,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
//Above code demonstrates that when the cursor is at the start of a paragraph which has bullet,
//press TAB will increase the bullet level.
//So I copied from that ^^
- if ( rWrtSh.GetNumRuleAtCurrCrsrPos() && !rWrtSh.HasReadonlySel() )
+ if ( rWrtSh.GetNumRuleAtCurrCursorPos() && !rWrtSh.HasReadonlySel() )
{
rWrtSh.NumUpDown( SID_INC_INDENT == nSlot );
}
@@ -1346,7 +1346,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
{
rWrtSh.SetReadonlySelectionOption(
!rWrtSh.GetViewOptions()->IsSelectionInReadonly());
- rWrtSh.ShowCrsr();
+ rWrtSh.ShowCursor();
}
break;
case FN_SELECTION_MODE_DEFAULT:
@@ -1495,7 +1495,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
break;
case FN_NUMBER_NEWSTART :
- if(!rSh.GetNumRuleAtCurrCrsrPos())
+ if(!rSh.GetNumRuleAtCurrCursorPos())
rSet.DisableItem(nWhich);
else
rSet.Put(SfxBoolItem(FN_NUMBER_NEWSTART,
@@ -1513,7 +1513,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
rSet.DisableItem(nWhich);
}
else if ( nWhich == FN_EDIT_FORMULA
- && rSh.CrsrInsideInputField() )
+ && rSh.CursorInsideInputField() )
{
rSet.DisableItem( nWhich );
}
@@ -1524,12 +1524,12 @@ void SwTextShell::GetState( SfxItemSet &rSet )
case FN_INSERT_FOOTNOTE:
case FN_INSERT_FOOTNOTE_DLG:
{
- const FrmTypeFlags nNoType =
- FrmTypeFlags::FLY_ANY | FrmTypeFlags::HEADER | FrmTypeFlags::FOOTER | FrmTypeFlags::FOOTNOTE;
- if ( rSh.GetFrmType(nullptr,true) & nNoType )
+ const FrameTypeFlags nNoType =
+ FrameTypeFlags::FLY_ANY | FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER | FrameTypeFlags::FOOTNOTE;
+ if ( rSh.GetFrameType(nullptr,true) & nNoType )
rSet.DisableItem(nWhich);
- if ( rSh.CrsrInsideInputField() )
+ if ( rSh.CursorInsideInputField() )
{
rSet.DisableItem( nWhich );
}
@@ -1540,16 +1540,16 @@ void SwTextShell::GetState( SfxItemSet &rSet )
case SID_INSERTDOC:
case FN_INSERT_GLOSSARY:
case FN_EXPAND_GLOSSARY:
- if ( rSh.CrsrInsideInputField() )
+ if ( rSh.CursorInsideInputField() )
{
rSet.DisableItem( nWhich );
}
break;
case FN_INSERT_TABLE:
- if ( rSh.CrsrInsideInputField()
+ if ( rSh.CursorInsideInputField()
|| rSh.GetTableFormat()
- || (rSh.GetFrmType(nullptr,true) & FrmTypeFlags::FOOTNOTE) )
+ || (rSh.GetFrameType(nullptr,true) & FrameTypeFlags::FOOTNOTE) )
{
rSet.DisableItem( nWhich );
}
@@ -1578,7 +1578,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
//if the paragrah has bullet we'll do the following things:
//1: if the bullet level is the first level, disable the decrease-indent button
//2: if the bullet level is the last level, disable the increase-indent button
- if ( rSh.GetNumRuleAtCurrCrsrPos() && !rSh.HasReadonlySel() )
+ if ( rSh.GetNumRuleAtCurrCursorPos() && !rSh.HasReadonlySel() )
{
const sal_uInt8 nLevel = rSh.GetNumLevel();
if ( ( nLevel == ( MAXLEVEL - 1 ) && nWhich == SID_INC_INDENT )
@@ -1648,7 +1648,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
case FN_INSERT_BOOKMARK:
if( rSh.IsTableMode()
- || rSh.CrsrInsideInputField() )
+ || rSh.CursorInsideInputField() )
{
rSet.DisableItem( nWhich );
}
@@ -1656,7 +1656,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
case FN_INSERT_BREAK:
if ( rSh.HasReadonlySel()
- && !rSh.CrsrInsideInputField() )
+ && !rSh.CursorInsideInputField() )
{
rSet.DisableItem( nWhich );
}
@@ -1665,7 +1665,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
case FN_INSERT_BREAK_DLG:
case FN_INSERT_COLUMN_BREAK:
case FN_INSERT_PAGEBREAK:
- if( rSh.CrsrInsideInputField() )
+ if( rSh.CursorInsideInputField() )
{
rSet.DisableItem( nWhich );
}
@@ -1688,7 +1688,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
{
SvtCJKOptions aCJKOptions;
if( !aCJKOptions.IsRubyEnabled()
- || rSh.CrsrInsideInputField() )
+ || rSh.CursorInsideInputField() )
{
GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, false );
rSet.DisableItem(nWhich);
@@ -1702,7 +1702,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
if( GetView().GetDocShell()->IsReadOnly()
|| ( !GetView().GetViewFrame()->HasChildWindow(nWhich)
&& rSh.HasReadonlySel() )
- || rSh.CrsrInsideInputField() )
+ || rSh.CursorInsideInputField() )
{
rSet.DisableItem(nWhich);
}
@@ -1830,7 +1830,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
case FN_NUM_NUM_RULE_INDEX:
case FN_OUTLINE_RULE_INDEX:
{
- SwNumRule* pCurRule = const_cast<SwNumRule*>(GetShell().GetNumRuleAtCurrCrsrPos());
+ SwNumRule* pCurRule = const_cast<SwNumRule*>(GetShell().GetNumRuleAtCurrCursorPos());
sal_uInt16 nActNumLvl = USHRT_MAX;
if( pCurRule )
{
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index 55aae8590a50..3d004231fa01 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -230,7 +230,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
if ( pSize ) // selected text has one size
{
// must create new one, otherwise document is without pam
- SwPaM* pPaM = rWrtSh.GetCrsr();
+ SwPaM* pPaM = rWrtSh.GetCursor();
vItems.push_back( std::make_pair( pSize, std::unique_ptr<SwPaM>(new SwPaM( *(pPaM->GetMark()), *(pPaM->GetPoint()))) ) );
}
else
@@ -361,10 +361,10 @@ SET_LINESPACE:
else
bChgAdjust = true;
- SvxFrameDirection eFrmDirection =
+ SvxFrameDirection eFrameDirection =
(SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot) ?
FRMDIR_HORI_LEFT_TOP : FRMDIR_HORI_RIGHT_TOP;
- aSet.Put( SvxFrameDirectionItem( eFrmDirection, RES_FRAMEDIR ) );
+ aSet.Put( SvxFrameDirectionItem( eFrameDirection, RES_FRAMEDIR ) );
if (bChgAdjust)
{
@@ -375,7 +375,7 @@ SET_LINESPACE:
aAdjust.SetWhich(SID_ATTR_PARA_ADJUST);
GetView().GetViewFrame()->GetBindings().SetState( aAdjust );
// Toggle numbering alignment
- const SwNumRule* pCurRule = GetShell().GetNumRuleAtCurrCrsrPos();
+ const SwNumRule* pCurRule = GetShell().GetNumRuleAtCurrCursorPos();
if( pCurRule )
{
SvxNumRule aRule = pCurRule->MakeSvxNumRule();
@@ -705,17 +705,17 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
if((!(nHtmlMode & HTMLMODE_ON) || (0 != (nHtmlMode & HTMLMODE_SOME_STYLES))) &&
aCoreSet.GetItemState( RES_FRAMEDIR, false ) >= SfxItemState::DEFAULT)
{
- SvxFrameDirection eFrmDir = (SvxFrameDirection)
+ SvxFrameDirection eFrameDir = (SvxFrameDirection)
static_cast<const SvxFrameDirectionItem& >(aCoreSet.Get(RES_FRAMEDIR)).GetValue();
- if (FRMDIR_ENVIRONMENT == eFrmDir)
+ if (FRMDIR_ENVIRONMENT == eFrameDir)
{
- eFrmDir = rSh.IsInRightToLeftText() ?
+ eFrameDir = rSh.IsInRightToLeftText() ?
FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP;
}
bFlag = (SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot &&
- FRMDIR_HORI_LEFT_TOP == eFrmDir) ||
+ FRMDIR_HORI_LEFT_TOP == eFrameDir) ||
(SID_ATTR_PARA_RIGHT_TO_LEFT == nSlot &&
- FRMDIR_HORI_RIGHT_TOP == eFrmDir);
+ FRMDIR_HORI_RIGHT_TOP == eFrameDir);
}
else
{
diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx
index 1d85bfbd188b..7b5ad39ae64d 100644
--- a/sw/source/uibase/shells/txtcrsr.cxx
+++ b/sw/source/uibase/shells/txtcrsr.cxx
@@ -349,21 +349,21 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
bRet = rSh.GotoObj(true, GotoObjFlags::Any);
if(bRet)
{
- rSh.HideCrsr();
- rSh.EnterSelFrmMode();
+ rSh.HideCursor();
+ rSh.EnterSelFrameMode();
}
break;
case FN_NEXT_FOOTNOTE:
- rSh.MoveCrsr();
+ rSh.MoveCursor();
bRet = rSh.GotoNextFootnoteAnchor();
break;
case FN_PREV_FOOTNOTE:
- rSh.MoveCrsr();
+ rSh.MoveCursor();
bRet = rSh.GotoPrevFootnoteAnchor();
break;
case FN_TO_HEADER:
- rSh.MoveCrsr();
- if ( FrmTypeFlags::HEADER & rSh.GetFrmType(nullptr,false) )
+ rSh.MoveCursor();
+ if ( FrameTypeFlags::HEADER & rSh.GetFrameType(nullptr,false) )
rSh.SttPg();
else
{
@@ -374,8 +374,8 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
bSetRetVal = false;
break;
case FN_TO_FOOTER:
- rSh.MoveCrsr();
- if ( FrmTypeFlags::FOOTER & rSh.GetFrmType(nullptr,false) )
+ rSh.MoveCursor();
+ if ( FrameTypeFlags::FOOTER & rSh.GetFrameType(nullptr,false) )
rSh.EndPg();
else
{
@@ -386,8 +386,8 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
bSetRetVal = false;
break;
case FN_FOOTNOTE_TO_ANCHOR:
- rSh.MoveCrsr();
- if ( FrmTypeFlags::FOOTNOTE & rSh.GetFrmType(nullptr,false) )
+ rSh.MoveCursor();
+ if ( FrameTypeFlags::FOOTNOTE & rSh.GetFrameType(nullptr,false) )
rSh.GotoFootnoteAnchor();
else
rSh.GotoFootnoteText();
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 10:25:12 +0000