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/tox.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/tox.hxx')
| -rw-r--r-- | sw/inc/tox.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 6e394742b0bb..1b75da2d9472 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { class SwTOXType; class SwTOXMark; -class SwTxtTOXMark; +class SwTextTOXMark; class SwDoc; typedef std::vector<SwTOXMark*> SwTOXMarks; @@ -54,7 +54,7 @@ class SW_DLLPUBLIC SwTOXMark , public SwModify { friend void _InitCore(); - friend class SwTxtTOXMark; + friend class SwTextTOXMark; OUString aAltText; // Text of caption is different. OUString aPrimaryKey; @@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwTOXMark OUString aPrimaryKeyReading; OUString aSecondaryKeyReading; - SwTxtTOXMark* pTxtAttr; + SwTextTOXMark* pTextAttr; sal_uInt16 nLevel; OUString m_aBookmarkName; @@ -137,8 +137,8 @@ public: inline const SwTOXType* GetTOXType() const; - const SwTxtTOXMark* GetTxtTOXMark() const { return pTxtAttr; } - SwTxtTOXMark* GetTxtTOXMark() { return pTxtAttr; } + const SwTextTOXMark* GetTextTOXMark() const { return pTextAttr; } + SwTextTOXMark* GetTextTOXMark() { return pTextAttr; } SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XDocumentIndexMark> const& GetXTOXMark() const @@ -332,7 +332,7 @@ public: static OUString GetFormLinkStt(); static OUString GetFormLinkEnd(); static OUString GetFormEntryNum(); - static OUString GetFormEntryTxt(); + static OUString GetFormEntryText(); static OUString GetFormChapterMark(); static OUString GetFormText(); static OUString GetFormAuth(); @@ -585,10 +585,10 @@ inline void SwTOXMark::SetSecondaryKey( const OUString& rKey ) aSecondaryKey = rKey; } -inline void SwTOXMark::SetTextReading( const OUString& rTxt ) +inline void SwTOXMark::SetTextReading( const OUString& rText ) { SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type"); - aTextReading = rTxt; + aTextReading = rText; } inline void SwTOXMark::SetPrimaryKeyReading( const OUString& rKey ) |