summaryrefslogtreecommitdiff
path: root/sw/source/ui/dialog
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/dialog')
-rw-r--r--sw/source/ui/dialog/macassgn.cxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx8
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx4
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx36
4 files changed, 25 insertions, 25 deletions
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 5eadf9a3f2e8..7db602354c48 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -68,7 +68,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
SVX_EVENT_IMAGE_LOAD);
}
// no break;
- case MACASSGN_FRMURL: // Frm - URL-Attributes
+ case MACASSGN_FRMURL: // Frame - URL-Attributes
{
if( !bHtmlMode &&
(MACASSGN_FRMURL == eType || MACASSGN_ALLFRM == eType))
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index fb2fb83e5a7f..a097e030c326 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -924,15 +924,15 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTableMergeDialog(vcl::Wi
return new VclAbstractDialog_Impl( pDlg );
}
-SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog(const OUString &rDialogType,
+SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrameTabDialog(const OUString &rDialogType,
SfxViewFrame *pFrame, vcl::Window *pParent,
const SfxItemSet& rCoreSet,
- bool bNewFrm,
+ bool bNewFrame,
bool bFormat,
const OString& sDefPage,
const OUString* pFormatStr )
{
- VclPtr<SfxTabDialog> pDlg = VclPtr<SwFrmDlg>::Create(pFrame, pParent, rCoreSet, bNewFrm, rDialogType, bFormat, sDefPage, pFormatStr);
+ VclPtr<SfxTabDialog> pDlg = VclPtr<SwFrameDlg>::Create(pFrame, pParent, rCoreSet, bNewFrame, rDialogType, bFormat, sDefPage, pFormatStr);
return new AbstractTabDialog_Impl(pDlg);
}
@@ -1156,7 +1156,7 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
break;
case RID_SW_TP_OPTSHDWCRSR:
case RID_SW_TP_HTML_OPTSHDWCRSR:
- pRet = SwShdwCrsrOptionsTabPage::Create;
+ pRet = SwShdwCursorOptionsTabPage::Create;
break;
case RID_SW_TP_REDLINE_OPT :
pRet = SwRedlineOptionsTabPage::Create;
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index ec09b278f765..45690ebd831b 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -428,10 +428,10 @@ public:
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) override;
virtual VclAbstractDialog* CreateTableMergeDialog(vcl::Window* pParent, bool& rWithPrev) override;
- virtual SfxAbstractTabDialog* CreateFrmTabDialog( const OUString &rDialogType,
+ virtual SfxAbstractTabDialog* CreateFrameTabDialog( const OUString &rDialogType,
SfxViewFrame *pFrame, vcl::Window *pParent,
const SfxItemSet& rCoreSet,
- bool bNewFrm = true,
+ bool bNewFrame = true,
bool bFormat = false,
const OString& sDefPage = OString(),
const OUString* pFormatStr = nullptr) override;
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 35a7b606f67b..44b1119449ee 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -140,7 +140,7 @@ private:
SwFormatFootnoteAtTextEnd m_FootnoteNtAtEnd;
SwFormatEndAtTextEnd m_EndNtAtEnd;
SwFormatNoBalancedColumns m_Balance;
- SvxFrameDirectionItem m_FrmDirItem;
+ SvxFrameDirectionItem m_FrameDirItem;
SvxLRSpaceItem m_LRSpaceItem;
const size_t m_nArrPos;
// shows, if maybe textcontent is in the region
@@ -158,7 +158,7 @@ public:
SwFormatFootnoteAtTextEnd& GetFootnoteNtAtEnd() { return m_FootnoteNtAtEnd; }
SwFormatEndAtTextEnd& GetEndNtAtEnd() { return m_EndNtAtEnd; }
SwFormatNoBalancedColumns& GetBalance() { return m_Balance; }
- SvxFrameDirectionItem& GetFrmDir() { return m_FrmDirItem; }
+ SvxFrameDirectionItem& GetFrameDir() { return m_FrameDirItem; }
SvxLRSpaceItem& GetLRSpace() { return m_LRSpaceItem; }
size_t GetArrPos() const { return m_nArrPos; }
@@ -182,7 +182,7 @@ public:
SectRepr::SectRepr( size_t nPos, SwSection& rSect )
: m_SectionData( rSect )
, m_Brush( RES_BACKGROUND )
- , m_FrmDirItem( FRMDIR_ENVIRONMENT, RES_FRAMEDIR )
+ , m_FrameDirItem( FRMDIR_ENVIRONMENT, RES_FRAMEDIR )
, m_LRSpaceItem( RES_LR_SPACE )
, m_nArrPos(nPos)
, m_bContent(m_SectionData.GetLinkFileName().isEmpty())
@@ -196,7 +196,7 @@ SectRepr::SectRepr( size_t nPos, SwSection& rSect )
m_FootnoteNtAtEnd = pFormat->GetFootnoteAtTextEnd();
m_EndNtAtEnd = pFormat->GetEndAtTextEnd();
m_Balance.SetValue(pFormat->GetBalancedColumns().GetValue());
- m_FrmDirItem = pFormat->GetFrmDir();
+ m_FrameDirItem = pFormat->GetFrameDir();
m_LRSpaceItem = pFormat->GetLRSpace();
}
}
@@ -797,8 +797,8 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OkHdl, Button*, void)
if( pFormat->GetBalancedColumns() != pRepr->GetBalance() )
pSet->Put( pRepr->GetBalance() );
- if( pFormat->GetFrmDir() != pRepr->GetFrmDir() )
- pSet->Put( pRepr->GetFrmDir() );
+ if( pFormat->GetFrameDir() != pRepr->GetFrameDir() )
+ pSet->Put( pRepr->GetFrameDir() );
if( pFormat->GetLRSpace() != pRepr->GetLRSpace())
pSet->Put( pRepr->GetLRSpace());
@@ -1056,7 +1056,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OptionsHdl, Button*, void)
aSet.Put( pSectRepr->GetFootnoteNtAtEnd() );
aSet.Put( pSectRepr->GetEndNtAtEnd() );
aSet.Put( pSectRepr->GetBalance() );
- aSet.Put( pSectRepr->GetFrmDir() );
+ aSet.Put( pSectRepr->GetFrameDir() );
aSet.Put( pSectRepr->GetLRSpace() );
const SwSectionFormats& rDocFormats = rSh.GetDoc()->GetSections();
@@ -1068,7 +1068,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OptionsHdl, Button*, void)
if (!nWidth)
nWidth = USHRT_MAX;
- aSet.Put(SwFormatFrmSize(ATT_VAR_SIZE, nWidth));
+ aSet.Put(SwFormatFrameSize(ATT_VAR_SIZE, nWidth));
aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
ScopedVclPtrInstance< SwSectionPropertyTabDialog > aTabDlg(this, aSet, rSh);
@@ -1079,7 +1079,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OptionsHdl, Button*, void)
{
const SfxPoolItem *pColItem, *pBrushItem,
*pFootnoteItem, *pEndItem, *pBalanceItem,
- *pFrmDirItem, *pLRSpaceItem;
+ *pFrameDirItem, *pLRSpaceItem;
SfxItemState eColState = pOutSet->GetItemState(
RES_COL, false, &pColItem );
SfxItemState eBrushState = pOutSet->GetItemState(
@@ -1090,8 +1090,8 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OptionsHdl, Button*, void)
RES_END_AT_TXTEND, false, &pEndItem );
SfxItemState eBalanceState = pOutSet->GetItemState(
RES_COLUMNBALANCE, false, &pBalanceItem );
- SfxItemState eFrmDirState = pOutSet->GetItemState(
- RES_FRAMEDIR, false, &pFrmDirItem );
+ SfxItemState eFrameDirState = pOutSet->GetItemState(
+ RES_FRAMEDIR, false, &pFrameDirItem );
SfxItemState eLRState = pOutSet->GetItemState(
RES_LR_SPACE, false, &pLRSpaceItem);
@@ -1100,7 +1100,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OptionsHdl, Button*, void)
SfxItemState::SET == eFootnoteState ||
SfxItemState::SET == eEndState ||
SfxItemState::SET == eBalanceState||
- SfxItemState::SET == eFrmDirState||
+ SfxItemState::SET == eFrameDirState||
SfxItemState::SET == eLRState)
{
SvTreeListEntry* pSelEntry = m_pTree->FirstSelected();
@@ -1117,8 +1117,8 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OptionsHdl, Button*, void)
pRepr->GetEndNtAtEnd() = *static_cast<const SwFormatEndAtTextEnd*>(pEndItem);
if( SfxItemState::SET == eBalanceState )
pRepr->GetBalance().SetValue(static_cast<const SwFormatNoBalancedColumns*>(pBalanceItem)->GetValue());
- if( SfxItemState::SET == eFrmDirState )
- pRepr->GetFrmDir().SetValue(static_cast<const SvxFrameDirectionItem*>(pFrmDirItem)->GetValue());
+ if( SfxItemState::SET == eFrameDirState )
+ pRepr->GetFrameDir().SetValue(static_cast<const SvxFrameDirectionItem*>(pFrameDirItem)->GetValue());
if( SfxItemState::SET == eLRState )
pRepr->GetLRSpace() = *static_cast<const SvxLRSpaceItem*>(pLRSpaceItem);
@@ -1443,7 +1443,7 @@ void SwInsertSectionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
else if (nId == m_nColumnPageId)
{
- const SwFormatFrmSize& rSize = static_cast<const SwFormatFrmSize&>(GetInputSetImpl()->Get(RES_FRM_SIZE));
+ const SwFormatFrameSize& rSize = static_cast<const SwFormatFrameSize&>(GetInputSetImpl()->Get(RES_FRM_SIZE));
static_cast<SwColumnPage&>(rPage).SetPageWidth(rSize.GetWidth());
static_cast<SwColumnPage&>(rPage).ShowBalance(true);
static_cast<SwColumnPage&>(rPage).SetInSection(true);
@@ -1464,12 +1464,12 @@ short SwInsertSectionTabDialog::Ok()
"SwInsertSectionTabDialog: no SectionData?");
const SfxItemSet* pOutputItemSet = GetOutputItemSet();
rWrtSh.InsertSection(*m_pSectionData, pOutputItemSet);
- SfxViewFrame* pViewFrm = rWrtSh.GetView().GetViewFrame();
+ SfxViewFrame* pViewFrame = rWrtSh.GetView().GetViewFrame();
uno::Reference< frame::XDispatchRecorder > xRecorder =
- pViewFrm->GetBindings().GetRecorder();
+ pViewFrame->GetBindings().GetRecorder();
if ( xRecorder.is() )
{
- SfxRequest aRequest( pViewFrm, FN_INSERT_REGION);
+ SfxRequest aRequest( pViewFrame, FN_INSERT_REGION);
const SfxPoolItem* pCol;
if(SfxItemState::SET == pOutputItemSet->GetItemState(RES_COL, false, &pCol))
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 11:52:49 +0000