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/charfmt.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/inc/charfmt.hxx')
| -rw-r--r-- | sw/inc/charfmt.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx index db67d1def83c..a9d029924a01 100644 --- a/sw/inc/charfmt.hxx +++ b/sw/inc/charfmt.hxx @@ -21,18 +21,18 @@ #include <format.hxx> -class SW_DLLPUBLIC SwCharFmt : public SwFmt +class SW_DLLPUBLIC SwCharFormat : public SwFormat { friend class SwDoc; - friend class SwTxtFmtColl; + friend class SwTextFormatColl; - SwCharFmt( SwAttrPool& rPool, const sal_Char* pFmtName, - SwCharFmt *pDerivedFrom ) - : SwFmt( rPool, pFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT ) + SwCharFormat( SwAttrPool& rPool, const sal_Char* pFormatName, + SwCharFormat *pDerivedFrom ) + : SwFormat( rPool, pFormatName, aCharFormatSetRange, pDerivedFrom, RES_CHRFMT ) {} - SwCharFmt( SwAttrPool& rPool, const OUString &rFmtName, - SwCharFmt *pDerivedFrom ) - : SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT ) + SwCharFormat( SwAttrPool& rPool, const OUString &rFormatName, + SwCharFormat *pDerivedFrom ) + : SwFormat( rPool, rFormatName, aCharFormatSetRange, pDerivedFrom, RES_CHRFMT ) {} public: @@ -41,11 +41,11 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; -namespace CharFmt +namespace CharFormat { SW_DLLPUBLIC extern const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr ); - extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich ); - extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr ); + extern const SfxPoolItem* GetItem( const SwTextAttr& rAttr, sal_uInt16 nWhich ); + extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTextAttr *pAttr ); } #endif |