4 files changed, 15 insertions, 15 deletions

diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index e994fc267774..49e4b3433b00 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -197,8 +197,8 @@ void SwBreakDlg::CheckEnable()
         m_pPageCollBox->Enable(false);
         bEnable = false;
     }
-    else if(rSh.GetFrmType(nullptr,true)
-        & (FrmTypeFlags::FLY_ANY | FrmTypeFlags::HEADER | FrmTypeFlags::FOOTER  | FrmTypeFlags::FOOTNOTE))
+    else if(rSh.GetFrameType(nullptr,true)
+        & (FrameTypeFlags::FLY_ANY | FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER  | FrameTypeFlags::FOOTNOTE))
     {
         m_pPageBtn->Enable(false);
         if(m_pPageBtn->IsChecked())
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index da6c131dafe5..fa8a26a92a0c 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -143,7 +143,7 @@ SwCharURLPage::SwCharURLPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
     get(m_pTextFT, "textft");
     get(m_pTextED, "texted");
     get(m_pNameED, "nameed");
-    get(m_pTargetFrmLB, "targetfrmlb");
+    get(m_pTargetFrameLB, "targetfrmlb");
     get(m_pURLPB, "urlpb");
     get(m_pEventPB, "eventpb");
     get(m_pVisitedLB, "visitedlb");
@@ -177,7 +177,7 @@ SwCharURLPage::SwCharURLPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
 
         for ( size_t i = 0; i < nCount; i++ )
         {
-            m_pTargetFrmLB->InsertEntry( pList->at( i ) );
+            m_pTargetFrameLB->InsertEntry( pList->at( i ) );
         }
     }
     delete pList;
@@ -195,7 +195,7 @@ void SwCharURLPage::dispose()
     m_pTextFT.clear();
     m_pTextED.clear();
     m_pNameED.clear();
-    m_pTargetFrmLB.clear();
+    m_pTargetFrameLB.clear();
     m_pURLPB.clear();
     m_pEventPB.clear();
     m_pVisitedLB.clear();
@@ -231,10 +231,10 @@ void SwCharURLPage::Reset(const SfxItemSet* rSet)
         }
         m_pNotVisitedLB->SelectEntry(sEntry);
 
-        m_pTargetFrmLB->SetText(pINetFormat->GetTargetFrame());
+        m_pTargetFrameLB->SetText(pINetFormat->GetTargetFrame());
         m_pVisitedLB->   SaveValue();
         m_pNotVisitedLB->SaveValue();
-        m_pTargetFrmLB-> SaveValue();
+        m_pTargetFrameLB-> SaveValue();
         pINetItem = new SvxMacroItem(FN_INET_FIELD_MACRO);
 
         if( pINetFormat->GetMacroTable() )
@@ -259,11 +259,11 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet)
             sURL = URIHelper::simpleNormalizedMakeRelative(OUString(), sURL);
     }
 
-    SwFormatINetFormat aINetFormat(sURL, m_pTargetFrmLB->GetText());
+    SwFormatINetFormat aINetFormat(sURL, m_pTargetFrameLB->GetText());
     aINetFormat.SetName(m_pNameED->GetText());
     bool bURLModified = m_pURLED->IsValueChangedFromSaved();
     bool bNameModified = m_pNameED->IsModified();
-    bool bTargetModified = m_pTargetFrmLB->IsValueChangedFromSaved();
+    bool bTargetModified = m_pTargetFrameLB->IsValueChangedFromSaved();
     bModified = bURLModified || bNameModified || bTargetModified;
 
     // set valid settings first
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index ea8de1164edc..23779cc11090 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -278,7 +278,7 @@ void SwDropCapsPict::UpdatePaintSettings()
         {
             // query the Font at paragraph's beginning
             mpPage->rSh.Push();
-            mpPage->rSh.SttCrsrMove();
+            mpPage->rSh.SttCursorMove();
             mpPage->rSh.ClearMark();
             SwWhichPara pSwuifnParaCurr = GetfnParaCurr();
             SwPosPara pSwuifnParaStart = GetfnParaStart();
@@ -292,7 +292,7 @@ void SwDropCapsPict::UpdatePaintSettings()
             // CTL
             GetFontSettings( *mpPage, maCTLFont, RES_CHRATR_CTL_FONT );
 
-            mpPage->rSh.EndCrsrMove();
+            mpPage->rSh.EndCursorMove();
             mpPage->rSh.Pop(false);
         }
         else
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index d3b72a0222aa..0775a2bedbc9 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -208,8 +208,8 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
     else if( m_nParaExt == nId )
     {
         // pagebreak only when the cursor is in the body-area and not in a table
-        const FrmTypeFlags eType = rSh.GetFrmType(nullptr,true);
-        if( !(FrmTypeFlags::BODY & eType) ||
+        const FrameTypeFlags eType = rSh.GetFrameType(nullptr,true);
+        if( !(FrameTypeFlags::BODY & eType) ||
             rSh.GetSelectionType() & nsSelectionType::SEL_TBL )
         {
             aSet.Put(SfxBoolItem(SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,true));
@@ -226,8 +226,8 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
         nHtmlMode & HTMLMODE_SOME_STYLES)
         {
             // pagebreak only when the cursor is in the body-area and not in a table
-            const FrmTypeFlags eType = rSh.GetFrmType(nullptr,true);
-            if(!(FrmTypeFlags::BODY & eType) ||
+            const FrameTypeFlags eType = rSh.GetFrameType(nullptr,true);
+            if(!(FrameTypeFlags::BODY & eType) ||
                 rSh.GetSelectionType() & nsSelectionType::SEL_TBL)
             {
                 aSet.Put(SfxBoolItem(SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,true));