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/inc/fmtpdsc.hxx | |
| 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 'sw/inc/fmtpdsc.hxx')
| -rw-r--r-- | sw/inc/fmtpdsc.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index f4d6de755c09..0195015709b8 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -36,7 +36,7 @@ class SwEndNoteInfo; /** Pagedescriptor Client of SwPageDesc that is "described" by the attribute. */ -class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient +class SW_DLLPUBLIC SwFormatPageDesc : public SfxPoolItem, public SwClient { /** This "Doc"-function is made friend in order to be able to set the auto-flag after copying!! */ @@ -45,16 +45,16 @@ class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient ::boost::optional<sal_uInt16> oNumOffset; ///< Offset page number. sal_uInt16 nDescNameIdx; ///< SW3-Reader: stringpool-index of style name. SwModify* pDefinedIn; /**< Points to the object in which the - attribute was set (CntntNode/Format). */ + attribute was set (ContentNode/Format). */ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ) SAL_OVERRIDE; public: - SwFmtPageDesc( const SwPageDesc *pDesc = 0 ); - SwFmtPageDesc( const SwFmtPageDesc &rCpy ); - SwFmtPageDesc &operator=( const SwFmtPageDesc &rCpy ); - virtual ~SwFmtPageDesc(); + SwFormatPageDesc( const SwPageDesc *pDesc = 0 ); + SwFormatPageDesc( const SwFormatPageDesc &rCpy ); + SwFormatPageDesc &operator=( const SwFormatPageDesc &rCpy ); + virtual ~SwFormatPageDesc(); TYPEINFO_OVERRIDE(); @@ -84,10 +84,10 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(bool bInP) const - { return static_cast<const SwFmtPageDesc&>(Get( RES_PAGEDESC,bInP)); } +inline const SwFormatPageDesc &SwAttrSet::GetPageDesc(bool bInP) const + { return static_cast<const SwFormatPageDesc&>(Get( RES_PAGEDESC,bInP)); } -inline const SwFmtPageDesc &SwFmt::GetPageDesc(bool bInP) const +inline const SwFormatPageDesc &SwFormat::GetPageDesc(bool bInP) const { return m_aSet.GetPageDesc(bInP); } #endif |