diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
commit | ab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch) | |
tree | 36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /include/filter | |
parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) |
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'include/filter')
-rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index fc54adeaba6b..a3572ca48f7b 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -55,7 +55,7 @@ class Polygon; namespace tools { class PolyPolygon; } class FmFormModel; class SdrModel; -class SwFlyFrmFmt; +class SwFlyFrameFormat; struct SvxMSDffBLIPInfo; struct SvxMSDffShapeInfo; @@ -695,12 +695,12 @@ public: void StoreShapeOrder(sal_uLong nId, sal_uLong nTxBx, SdrObject* pObject, - SwFlyFrmFmt* pFly = 0, + SwFlyFrameFormat* pFly = 0, short nHdFtSection = 0) const; void ExchangeInShapeOrder(SdrObject* pOldObject, sal_uLong nTxBx, - SwFlyFrmFmt* pFly, + SwFlyFrameFormat* pFly, SdrObject* pObject) const; void RemoveFromShapeOrder( SdrObject* pObject ) const; @@ -778,7 +778,7 @@ struct SvxMSDffShapeOrder { sal_uLong nShapeId; ///< shape id used in PLCF SPA and in mso_fbtSp (FSP) sal_uLong nTxBxComp; ///< chain or box number in the Text-Box-Story (or NULL) - SwFlyFrmFmt* pFly; ///< format of frame that was inserted as a replacement + SwFlyFrameFormat* pFly; ///< format of frame that was inserted as a replacement ///< for a Sdr-Text object in Writer - needed for ///< chaining! short nHdFtSection; ///< used by Writer to find out if linked frames are in |