From 49c2b9808df8a6b197dec666dfc0cda6321a4306 Mon Sep 17 00:00:00 2001 From: Robinson Tryon Date: Wed, 25 Nov 2015 06:03:10 -0500 Subject: bin/rename-sw-abbreviations.sh This commit renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8 --- sw/source/ui/fmtui/tmpdlg.cxx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'sw/source/ui/fmtui') diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 21475b35f5e7..2abc0d820384 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -242,10 +242,10 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent, // frame styles case SFX_STYLE_FAMILY_FRAME: { - m_nTypeId = AddTabPage("type", SwFrmPage::Create, - SwFrmPage::GetRanges); - m_nOptionsId = AddTabPage("options", SwFrmAddPage::Create, - SwFrmAddPage::GetRanges); + m_nTypeId = AddTabPage("type", SwFramePage::Create, + SwFramePage::GetRanges); + m_nOptionsId = AddTabPage("options", SwFrameAddPage::Create, + SwFrameAddPage::GetRanges); m_nWrapId = AddTabPage("wrap", SwWrapTabPage::Create, SwWrapTabPage::GetRanges); @@ -448,13 +448,13 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } else if (nId == m_nTypeId) { - static_cast(rPage).SetNewFrame( true ); - static_cast(rPage).SetFormatUsed( true ); + static_cast(rPage).SetNewFrame( true ); + static_cast(rPage).SetFormatUsed( true ); } else if (nId == m_nOptionsId) { - static_cast(rPage).SetFormatUsed(true); - static_cast(rPage).SetNewFrame(true); + static_cast(rPage).SetFormatUsed(true); + static_cast(rPage).SetNewFrame(true); } else if (nId == m_nWrapId) { @@ -463,7 +463,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) else if (nId == m_nColumnId) { if( nType == SFX_STYLE_FAMILY_FRAME ) - static_cast(rPage).SetFrmMode(true); + static_cast(rPage).SetFrameMode(true); static_cast(rPage).SetFormatUsed( true ); } //UUUU do not remove; many other style dialog combinations still use the SfxTabPage -- cgit