summaryrefslogtreecommitdiff
path: root/sw/source/ui/fmtui/tmpdlg.cxx
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/ui/fmtui/tmpdlg.cxx
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/ui/fmtui/tmpdlg.cxx')
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx18
1 files changed, 9 insertions, 9 deletions
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<SwFrmPage&>(rPage).SetNewFrame( true );
- static_cast<SwFrmPage&>(rPage).SetFormatUsed( true );
+ static_cast<SwFramePage&>(rPage).SetNewFrame( true );
+ static_cast<SwFramePage&>(rPage).SetFormatUsed( true );
}
else if (nId == m_nOptionsId)
{
- static_cast<SwFrmAddPage&>(rPage).SetFormatUsed(true);
- static_cast<SwFrmAddPage&>(rPage).SetNewFrame(true);
+ static_cast<SwFrameAddPage&>(rPage).SetFormatUsed(true);
+ static_cast<SwFrameAddPage&>(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<SwColumnPage&>(rPage).SetFrmMode(true);
+ static_cast<SwColumnPage&>(rPage).SetFrameMode(true);
static_cast<SwColumnPage&>(rPage).SetFormatUsed( true );
}
//UUUU do not remove; many other style dialog combinations still use the SfxTabPage