1 files changed, 25 insertions, 25 deletions

diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 89802c3d41f2..f4fb97a3dc6d 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -24,9 +24,9 @@
 class SdrPage;
 class SdrObject;
 class SfxItemSet;
-class SwFrmFmt;
-class SwFrmFmts;
-class SwFmtCntnt;
+class SwFrameFormat;
+class SwFrameFormats;
+class SwFormatContent;
 class SwDoc;
 class Rectangle;
 class _ZSortFly;
@@ -42,58 +42,58 @@ class SW_DLLPUBLIC SwTextBoxHelper
 {
 public:
     /// Maps a draw format to a fly format.
-    typedef std::map<const SwFrmFmt*, const SwFrmFmt*> SavedLink;
+    typedef std::map<const SwFrameFormat*, const SwFrameFormat*> SavedLink;
     /// Maps a draw format to content.
-    typedef std::map<const SwFrmFmt*, SwFmtCntnt> SavedContent;
+    typedef std::map<const SwFrameFormat*, SwFormatContent> SavedContent;
     /// Create a TextBox for a shape.
-    static void create(SwFrmFmt* pShape);
+    static void create(SwFrameFormat* pShape);
     /// Destroy a TextBox for a shape.
-    static void destroy(SwFrmFmt* pShape);
+    static void destroy(SwFrameFormat* pShape);
     /// Get interface of a shape's TextBox, if there is any.
-    static css::uno::Any queryInterface(SwFrmFmt* pShape, const css::uno::Type& rType);
+    static css::uno::Any queryInterface(SwFrameFormat* pShape, const css::uno::Type& rType);
 
     /// Sync property of TextBox with the one of the shape.
-    static void syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, const css::uno::Any& rValue);
+    static void syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, const css::uno::Any& rValue);
     /// Does the same, but works on properties which lack an sw-specific WID / MemberID.
-    static void syncProperty(SwFrmFmt* pShape, const OUString& rPropertyName, const css::uno::Any& rValue);
+    static void syncProperty(SwFrameFormat* pShape, const OUString& rPropertyName, const css::uno::Any& rValue);
     /// Get a property of the underlying TextFrame.
-    static void getProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue);
+    static void getProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue);
 
     /// Similar to syncProperty(), but used by the internal API (e.g. for UI purposes).
-    static void syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet);
+    static void syncFlyFrmAttr(SwFrameFormat& rShape, SfxItemSet& rSet);
 
     /// If we have an associated TextFrame, then return that.
-    static SwFrmFmt* findTextBox(const SwFrmFmt* pShape);
-    static SwFrmFmt* findTextBox(css::uno::Reference<css::drawing::XShape> xShape);
+    static SwFrameFormat* findTextBox(const SwFrameFormat* pShape);
+    static SwFrameFormat* findTextBox(css::uno::Reference<css::drawing::XShape> xShape);
     /// Return the textbox rectangle of a draw shape (in twips).
-    static Rectangle getTextRectangle(SwFrmFmt* pShape, bool bAbsolute = true);
+    static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = true);
 
     /// Look up TextFrames in a document, which are in fact TextBoxes.
-    static std::set<const SwFrmFmt*> findTextBoxes(const SwDoc* pDoc);
+    static std::set<const SwFrameFormat*> findTextBoxes(const SwDoc* pDoc);
     /**
      * Look up TextFrames in a document, which are in fact TextBoxes.
      *
-     * If rNode has a matching SwCntntFrm, then only TextBoxes of rNode are
+     * If rNode has a matching SwContentFrm, then only TextBoxes of rNode are
      * returned.
      */
-    static std::set<const SwFrmFmt*> findTextBoxes(const SwNode& rNode);
+    static std::set<const SwFrameFormat*> findTextBoxes(const SwNode& rNode);
     /// Is pObject a textbox of a drawinglayer shape?
     static bool isTextBox(const SdrObject* pObject);
     /// Build a textbox -> shape format map.
-    static std::map<SwFrmFmt*, SwFrmFmt*> findShapes(const SwDoc* pDoc);
+    static std::map<SwFrameFormat*, SwFrameFormat*> findShapes(const SwDoc* pDoc);
     /// Count number of shapes in the document, excluding TextBoxes.
-    static sal_Int32 getCount(SdrPage* pPage, std::set<const SwFrmFmt*>& rTextBoxes);
+    static sal_Int32 getCount(SdrPage* pPage, std::set<const SwFrameFormat*>& rTextBoxes);
     /// Get a shape by index, excluding TextBoxes.
-    static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrmFmt*>& rTextBoxes) throw(css::lang::IndexOutOfBoundsException);
+    static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrameFormat*>& rTextBoxes) throw(css::lang::IndexOutOfBoundsException);
     /// Get the order of the shape, excluding TextBoxes.
-    static sal_Int32 getOrdNum(const SdrObject* pObject, std::set<const SwFrmFmt*>& rTextBoxes);
+    static sal_Int32 getOrdNum(const SdrObject* pObject, std::set<const SwFrameFormat*>& rTextBoxes);
 
     /// Saves the current shape -> textbox links in a map, so they can be restored later.
-    static void saveLinks(const SwFrmFmts& rFormats, std::map<const SwFrmFmt*, const SwFrmFmt*>& rLinks);
+    static void saveLinks(const SwFrameFormats& rFormats, std::map<const SwFrameFormat*, const SwFrameFormat*>& rLinks);
     /// Reset the shape -> textbox link on the shape, and save it to the map, so it can be restored later.
-    static void resetLink(SwFrmFmt* pShape, std::map<const SwFrmFmt*, SwFmtCntnt>& rOldContent);
+    static void resetLink(SwFrameFormat* pShape, std::map<const SwFrameFormat*, SwFormatContent>& rOldContent);
     /// Undo the effect of saveLinks() + individual resetLink() calls.
-    static void restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrmFmt*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent);
+    static void restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent);
 };
 
 #endif // INCLUDED_SW_INC_TEXTBOXHELPER_HXX