1 files changed, 13 insertions, 13 deletions

diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 941388a86fc6..f78765f267ba 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -24,9 +24,9 @@
 #include "porglue.hxx"
 
 class SwDrawContact;
-class SwFlyInCntFrm;
-class SwTextFrm;
-struct SwCrsrMoveState;
+class SwFlyInContentFrame;
+class SwTextFrame;
+struct SwCursorMoveState;
 
 class SwFlyPortion : public SwFixPortion
 {
@@ -44,28 +44,28 @@ public:
 /// This portion represents an as-character anchored fly (shape, frame, etc.)
 class SwFlyCntPortion : public SwLinePortion
 {
-    void *pContact; // bDraw ? DrawContact : FlyInCntFrm
+    void *pContact; // bDraw ? DrawContact : FlyInContentFrame
     Point aRef;     // Relatively to this point we calculate the AbsPos
     bool bDraw : 1;  // DrawContact?
     bool bMax : 1;   // Line adjustment and height == line height
     sal_uInt8 nAlign : 3; // Line adjustment? No, above, middle, bottom
-    virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override;
+    virtual sal_Int32 GetCursorOfst( const sal_uInt16 nOfst ) const override;
 
 public:
     // Use new datatype for parameter <nFlags>
-    SwFlyCntPortion( const SwTextFrm& rFrm, SwFlyInCntFrm *pFly,
+    SwFlyCntPortion( const SwTextFrame& rFrame, SwFlyInContentFrame *pFly,
                      const Point &rBase,
                      long nAscent, long nDescent, long nFlyAsc, long nFlyDesc,
                      objectpositioning::AsCharFlags nFlags );
     // Use new datatype for parameter <nFlags>
-    SwFlyCntPortion( const SwTextFrm& rFrm, SwDrawContact *pDrawContact,
+    SwFlyCntPortion( const SwTextFrame& rFrame, SwDrawContact *pDrawContact,
                      const Point &rBase,
                      long nAscent, long nDescent, long nFlyAsc, long nFlyDesc,
                      objectpositioning::AsCharFlags nFlags );
     inline const Point& GetRefPoint() const { return aRef; }
-    inline SwFlyInCntFrm *GetFlyFrm() { return static_cast<SwFlyInCntFrm*>(pContact); }
-    inline const SwFlyInCntFrm *GetFlyFrm() const
-        { return static_cast<SwFlyInCntFrm*>(pContact); }
+    inline SwFlyInContentFrame *GetFlyFrame() { return static_cast<SwFlyInContentFrame*>(pContact); }
+    inline const SwFlyInContentFrame *GetFlyFrame() const
+        { return static_cast<SwFlyInContentFrame*>(pContact); }
     inline SwDrawContact *GetDrawContact() { return static_cast<SwDrawContact*>(pContact); }
     inline const SwDrawContact* GetDrawContact() const
         { return static_cast<SwDrawContact*>(pContact); }
@@ -75,12 +75,12 @@ public:
     inline void SetAlign( sal_uInt8 nNew ) { nAlign = nNew; }
     inline void SetMax( bool bNew ) { bMax = bNew; }
     // Use new datatype for parameter <nFlags>
-    void SetBase( const SwTextFrm& rFrm, const Point &rBase,
+    void SetBase( const SwTextFrame& rFrame, const Point &rBase,
                   long nLnAscent, long nLnDescent,
                   long nFlyAscent, long nFlyDescent,
                   objectpositioning::AsCharFlags nFlags );
-    sal_Int32 GetFlyCrsrOfst( const sal_uInt16 nOfst, const Point &rPoint,
-                        SwPosition *pPos, SwCrsrMoveState* pCMS ) const;
+    sal_Int32 GetFlyCursorOfst( const sal_uInt16 nOfst, const Point &rPoint,
+                        SwPosition *pPos, SwCursorMoveState* pCMS ) const;
     virtual bool Format( SwTextFormatInfo &rInf ) override;
     virtual void Paint( const SwTextPaintInfo &rInf ) const override;
     OUTPUT_OPERATOR_OVERRIDE