diff options
author | Philipp Riemer <ruderphilipp@gmail.com> | 2013-08-09 22:42:50 +0200 |
---|---|---|
committer | Philipp Riemer <ruderphilipp@gmail.com> | 2013-08-09 22:44:41 +0200 |
commit | c6e54b85348f27bb82ec922f8a0d092af08d66d7 (patch) | |
tree | ec877629f03988c98daed2e88ca6fa8e2907b59c /sw | |
parent | c99476fcfc1aedcac60df399c6b5efeff1b23045 (diff) |
comments work
Change-Id: Icdccb178d575977f3e9736dcf47e8b23fd9aaf33
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/SwStyleNameMapper.cxx | 12 | ||||
-rw-r--r-- | sw/source/core/doc/docftn.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/htmltbl.cxx | 14 |
3 files changed, 16 insertions, 14 deletions
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index 191a22a2dd81..4fe55088354e 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -663,7 +663,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag return *pHash; } -// This gets the UI Name from the programmatic name +// This gets the UI name from the programmatic name const OUString& SwStyleNameMapper::GetUIName(const OUString& rName, SwGetPoolIdFromName const eFlags) { @@ -671,7 +671,7 @@ const OUString& SwStyleNameMapper::GetUIName(const OUString& rName, return nId != USHRT_MAX ? GetUIName( nId, rName ) : rName; } -// Get the programmatic Name from the UI name +// Get the programmatic name from the UI name const OUString& SwStyleNameMapper::GetProgName( const OUString& rName, SwGetPoolIdFromName const eFlags) { @@ -823,26 +823,26 @@ void SwStyleNameMapper::fillNameFromId( rFillName = getNameFromId(nId, rFillName, bProgName); } -// Get the UI Name from the pool ID +// Get the UI name from the pool ID void SwStyleNameMapper::FillUIName(sal_uInt16 const nId, OUString& rFillName) { fillNameFromId(nId, rFillName, false); } -// Get the UI Name from the pool ID +// Get the UI name from the pool ID const OUString& SwStyleNameMapper::GetUIName( sal_uInt16 const nId, const OUString& rName) { return getNameFromId(nId, rName, false); } -// Get the programmatic Name from the pool ID +// Get the programmatic name from the pool ID void SwStyleNameMapper::FillProgName(sal_uInt16 nId, OUString& rFillName) { fillNameFromId(nId, rFillName, true); } -// Get the programmatic Name from the pool ID +// Get the programmatic name from the pool ID const OUString& SwStyleNameMapper::GetProgName(sal_uInt16 const nId, const OUString& rName) { diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index 7cf10d516657..e5393020a47f 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -33,7 +33,7 @@ #include <poolfmt.hxx> #include <ftninfo.hxx> -/*********************** SwFtnInfo ***************************/ +/*********************** SwEndNoteInfo ***************************/ SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo& rInfo) { @@ -209,6 +209,8 @@ void SwEndNoteInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) CheckRegistration( pOld, pNew ); } +/*********************** SwFtnInfo ***************************/ + SwFtnInfo& SwFtnInfo::operator=(const SwFtnInfo& rInfo) { SwEndNoteInfo::operator=(rInfo); diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index e4cffeb4d269..2a2bb2f8234a 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -212,13 +212,13 @@ SwHTMLTableLayout::~SwHTMLTableLayout() delete[] aCells; } -// The border width are calculated like in Netscape: -// Outer border: BORDER + CELLSPACING + CELLPADDING -// Inner border: CELLSPACING + CELLPADDING -// However, we respect the border width in SW if bSwBorders is set, -// so that we don't wrap wrongly. -// We also need to respect the distance to the content. Even if -// only the opposite side has a border. +/// The border widths are calculated like in Netscape: +/// Outer border: BORDER + CELLSPACING + CELLPADDING +/// Inner border: CELLSPACING + CELLPADDING +/// However, we respect the border widths in SW if bSwBorders is set, +/// so that we don't wrap wrongly. +/// We also need to respect the distance to the content. Even if +/// only the opposite side has a border. sal_uInt16 SwHTMLTableLayout::GetLeftCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan, sal_Bool bSwBorders ) const { |