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 /sw/source/filter/html/htmlfly.hxx | |
parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) |
bin/rename-sw-abbreviations.sh
libreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/source/filter/html/htmlfly.hxx')
-rw-r--r-- | sw/source/filter/html/htmlfly.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 3cdee81cd1ca..d3bce6bbaa46 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -24,7 +24,7 @@ #include <o3tl/sorted_vector.hxx> class SdrObject; -class SwFrmFmt; +class SwFrameFormat; class SwNodeIndex; class SwPosFlyFrm; @@ -84,11 +84,11 @@ extern sal_uInt8 aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS]; class SwHTMLPosFlyFrm { - const SwFrmFmt *pFrmFmt; // der Rahmen + const SwFrameFormat *pFrameFormat; // der Rahmen const SdrObject *pSdrObject; // ggf. Sdr-Objekt SwNodeIndex *pNdIdx; // Node-Index sal_uInt32 nOrdNum; // Aus SwPosFlyFrm - sal_Int32 nCntntIdx; // seine Position im Content + sal_Int32 nContentIdx; // seine Position im Content sal_uInt8 nOutputMode; // Ausgabe-Infos public: @@ -99,12 +99,12 @@ public: bool operator==( const SwHTMLPosFlyFrm& ) const { return false; } bool operator<( const SwHTMLPosFlyFrm& ) const; - const SwFrmFmt& GetFmt() const { return *pFrmFmt; } + const SwFrameFormat& GetFormat() const { return *pFrameFormat; } const SdrObject *GetSdrObject() const { return pSdrObject; } const SwNodeIndex& GetNdIndex() const { return *pNdIdx; } - sal_Int32 GetCntntIndex() const { return nCntntIdx; } + sal_Int32 GetContentIndex() const { return nContentIdx; } sal_uInt8 GetOutMode() const { return nOutputMode; } |