diff options
Diffstat (limited to 'sw/source/ui/frmdlg/frmdlg.cxx')
| -rw-r--r-- | sw/source/ui/frmdlg/frmdlg.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 171612a77ca7..66fffef1f306 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -44,10 +44,10 @@ #include <svx/xflgrit.hxx> // the dialog's carrier -SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, +SwFrameDlg::SwFrameDlg( SfxViewFrame* pViewFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, - bool bNewFrm, + bool bNewFrame, const OUString& sResType, bool bFormat, const OString& sDefPage, @@ -57,7 +57,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, "modules/swriter/ui/" + sResType.toAsciiLowerCase() + ".ui", &rCoreSet, pStr != nullptr) , m_bFormat(bFormat) - , m_bNew(bNewFrm) + , m_bNew(bNewFrame) , m_rSet(rCoreSet) , m_sDlgType(sResType) , m_pWrtShell(static_cast<SwView*>(pViewFrame->GetViewShell())->GetWrtShellPtr()) @@ -84,10 +84,10 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, SetText(GetText() + SW_RESSTR(STR_COLL_HEADER) + *pStr + ")"); } - m_nStdId = AddTabPage("type", SwFrmPage::Create, nullptr); - m_nAddId = AddTabPage("options", SwFrmAddPage::Create, nullptr); + m_nStdId = AddTabPage("type", SwFramePage::Create, nullptr); + m_nAddId = AddTabPage("options", SwFrameAddPage::Create, nullptr); m_nWrapId = AddTabPage("wrap", SwWrapTabPage::Create, nullptr); - m_nUrlId = AddTabPage("hyperlink", SwFrmURLPage::Create, nullptr); + m_nUrlId = AddTabPage("hyperlink", SwFrameURLPage::Create, nullptr); if (m_sDlgType == "PictureDialog") { m_nPictureId = AddTabPage("picture", SwGrfExtPage::Create, nullptr); @@ -136,25 +136,25 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, SetCurPageId(sDefPage); } -SwFrmDlg::~SwFrmDlg() +SwFrameDlg::~SwFrameDlg() { } -void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) +void SwFrameDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (nId == m_nStdId) { - static_cast<SwFrmPage&>(rPage).SetNewFrame(m_bNew); - static_cast<SwFrmPage&>(rPage).SetFormatUsed(m_bFormat); - static_cast<SwFrmPage&>(rPage).SetFrmType(m_sDlgType); + static_cast<SwFramePage&>(rPage).SetNewFrame(m_bNew); + static_cast<SwFramePage&>(rPage).SetFormatUsed(m_bFormat); + static_cast<SwFramePage&>(rPage).SetFrameType(m_sDlgType); } else if (nId == m_nAddId) { - static_cast<SwFrmAddPage&>(rPage).SetFormatUsed(m_bFormat); - static_cast<SwFrmAddPage&>(rPage).SetFrmType(m_sDlgType); - static_cast<SwFrmAddPage&>(rPage).SetNewFrame(m_bNew); - static_cast<SwFrmAddPage&>(rPage).SetShell(m_pWrtShell); + static_cast<SwFrameAddPage&>(rPage).SetFormatUsed(m_bFormat); + static_cast<SwFrameAddPage&>(rPage).SetFrameType(m_sDlgType); + static_cast<SwFrameAddPage&>(rPage).SetNewFrame(m_bNew); + static_cast<SwFrameAddPage&>(rPage).SetShell(m_pWrtShell); } else if (nId == m_nWrapId) { @@ -164,10 +164,10 @@ void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } else if (nId == m_nColumnId) { - static_cast<SwColumnPage&>(rPage).SetFrmMode(true); + static_cast<SwColumnPage&>(rPage).SetFrameMode(true); static_cast<SwColumnPage&>(rPage).SetFormatUsed(m_bFormat); - const SwFormatFrmSize& rSize = static_cast<const SwFormatFrmSize&>( + const SwFormatFrameSize& rSize = static_cast<const SwFormatFrameSize&>( m_rSet.Get( RES_FRM_SIZE )); static_cast<SwColumnPage&>(rPage).SetPageWidth( rSize.GetWidth() ); } |