3 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx
index 8dbec1ddb59d..fd8bebb74867 100644
--- a/sw/source/ui/table/rowht.cxx
+++ b/sw/source/ui/table/rowht.cxx
@@ -38,13 +38,13 @@
 void SwTableHeightDlg::Apply()
 {
     SwTwips nHeight = static_cast< SwTwips >(m_pHeightEdit->Denormalize(m_pHeightEdit->GetValue(FUNIT_TWIP)));
-    SwFormatFrmSize aSz(ATT_FIX_SIZE, 0, nHeight);
+    SwFormatFrameSize aSz(ATT_FIX_SIZE, 0, nHeight);
 
-    SwFrmSize eFrmSize = m_pAutoHeightCB->IsChecked() ?
+    SwFrameSize eFrameSize = m_pAutoHeightCB->IsChecked() ?
         ATT_MIN_SIZE : ATT_FIX_SIZE;
-    if(eFrmSize != aSz.GetHeightSizeType())
+    if(eFrameSize != aSz.GetHeightSizeType())
     {
-        aSz.SetHeightSizeType(eFrmSize);
+        aSz.SetHeightSizeType(eFrameSize);
     }
     rSh.SetRowHeight( aSz );
 }
@@ -63,7 +63,7 @@ SwTableHeightDlg::SwTableHeightDlg(vcl::Window *pParent, SwWrtShell &rS)
     m_pHeightEdit->SetMin(MINLAY, FUNIT_TWIP);
     if(!m_pHeightEdit->GetMin())
         m_pHeightEdit->SetMin(1);
-    SwFormatFrmSize *pSz;
+    SwFormatFrameSize *pSz;
     rSh.GetRowHeight( pSz );
     if ( pSz )
     {
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 424a47907821..14f74b82c0fa 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1265,8 +1265,8 @@ void  SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
     else if (nId == m_nTextFlowId)
     {
         static_cast<SwTextFlowPage&>(rPage).SetShell(pShell);
-        const FrmTypeFlags eType = pShell->GetFrmType(nullptr,true);
-        if( !(FrmTypeFlags::BODY & eType) )
+        const FrameTypeFlags eType = pShell->GetFrameType(nullptr,true);
+        if( !(FrameTypeFlags::BODY & eType) )
             static_cast<SwTextFlowPage&>(rPage).DisablePageBreak();
     }
 }
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 8b35ec0c77e3..89d26ccb7db4 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -542,7 +542,7 @@ void AutoFormatPreview::Resize()
 
 void AutoFormatPreview::DetectRTL(SwWrtShell* pWrtShell)
 {
-    if (!pWrtShell->IsCrsrInTable()) // We haven't created the table yet
+    if (!pWrtShell->IsCursorInTable()) // We haven't created the table yet
         mbRTL = AllSettings::GetLayoutRTL();
     else
         mbRTL = pWrtShell->IsTableRightToLeft();