diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 21:01:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 09:41:00 -0600 |
| commit | a27462189d1d6a3d22be23a5eee603edca5d8ea3 (patch) | |
| tree | 065df066de07f3d7194178352f3449702bc34bd5 /sw/inc/tox.hxx | |
| parent | 150420cbff39967e9376cab05b6af45b642edae8 (diff) | |
Remove visual noise from sw
Conflicts:
sw/inc/unodraw.hxx
sw/inc/unoframe.hxx
sw/sdi/swriter.sdi
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/ui/inc/unotxvw.hxx
sw/source/ui/lingu/hyp.cxx
sw/source/ui/lingu/sdrhhcwrap.cxx
sw/source/ui/uno/swdetect.hxx
Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908
Reviewed-on: https://gerrit.libreoffice.org/8322
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/inc/tox.hxx')
| -rw-r--r-- | sw/inc/tox.hxx | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index d87198c2caeb..ee3b6c6ff841 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -248,7 +248,6 @@ struct SwFormTokenEqualToFormTokenType } }; - /// Vector of tokens. typedef std::vector<SwFormToken> SwFormTokens; @@ -454,7 +453,7 @@ class SW_DLLPUBLIC SwTOXBase : public SwClient sal_uInt16 nCreateType; // sources to create the index from sal_uInt16 nOLEOptions; // OLE sources - SwCaptionDisplay eCaptionDisplay; // + SwCaptionDisplay eCaptionDisplay; sal_Bool bProtected : 1; // index protected ? sal_Bool bFromChapter : 1; // create from chapter or document sal_Bool bFromObjectNames : 1; // create a table or object index @@ -479,7 +478,7 @@ public: // If not, so create it an copy all other used things. The return is this SwTOXBase& CopyTOXBase( SwDoc*, const SwTOXBase& ); - const SwTOXType* GetTOXType() const; // + const SwTOXType* GetTOXType() const; sal_uInt16 GetCreateType() const; // creation types @@ -568,14 +567,12 @@ public: void RegisterToTOXType( SwTOXType& rMark ); }; - /*-------------------------------------------------------------------- Description: Inlines --------------------------------------------------------------------*/ -// //SwTOXMark -// + inline OUString SwTOXMark::GetAlternativeText() const { return aAltText; } @@ -670,9 +667,8 @@ inline OUString SwTOXMark::GetSecondaryKeyReading() const return aSecondaryKeyReading; } -// //SwForm -// + inline void SwForm::SetTemplate(sal_uInt16 nLevel, const OUString& rTemplate) { SAL_WARN_IF(nLevel >= GetFormMax(), "sw", "Index >= GetFormMax()"); @@ -695,19 +691,16 @@ inline sal_uInt16 SwForm::GetFormMax() const return nFormMaxLevel; } - -// //SwTOXType -// + inline OUString SwTOXType::GetTypeName() const { return aName; } inline TOXTypes SwTOXType::GetType() const { return eType; } -// // SwTOXBase -// + inline const SwTOXType* SwTOXBase::GetTOXType() const { return (SwTOXType*)GetRegisteredIn(); } @@ -770,7 +763,6 @@ inline void SwTOXBase::SetOptions(sal_uInt16 nOpt) aData.nOptions = nOpt; } - #endif // INCLUDED_SW_INC_TOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |