summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-11-30 14:16:05 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-11-30 17:10:45 +0000
commitad215b94ecc372fe56502dcb021cabe3cb5e9f07 (patch)
tree95b0b7c87f742b59a00b3c1ea11910e0439fd3bd /sw/source/core
parent1f6aa8f2a8352cc5cc3ef8981afa278a9759c379 (diff)
tidy this up a bit
Notes
Notes: split repo tag: writer_LIBREOFFICE_PRE_BOOTSTRAP_BUILD
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/doc/doctxm.cxx6
-rw-r--r--sw/source/core/unocore/unodraw.cxx4
2 files changed, 4 insertions, 6 deletions
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 3393a91e10b1..49b3e3618d7d 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1246,8 +1246,7 @@ void SwTOXBaseSection::UpdateOutline( const SwTxtNode* pOwnChapterNode )
::SetProgressState( 0, pDoc->GetDocShell() );
SwTxtNode* pTxtNd = rOutlNds[ n ]->GetTxtNode();
if( pTxtNd && pTxtNd->Len() && pTxtNd->GetDepends() &&
- //USHORT(pTxtNd->GetTxtColl()->GetOutlineLevel()+1) <= GetLevel() && //#outline level,zhaojianwei
- USHORT( pTxtNd->GetAttrOutlineLevel()) <= GetLevel() && //<-end,zhaojianwei
+ USHORT( pTxtNd->GetAttrOutlineLevel()) <= GetLevel() &&
pTxtNd->GetFrm() &&
!pTxtNd->HasHiddenParaField() &&
!pTxtNd->HasHiddenCharAttribute( true ) &&
@@ -1279,8 +1278,7 @@ void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
if( !pColl ||
( TOX_CONTENT == SwTOXBase::GetType() &&
GetCreateType() & nsSwTOXElement::TOX_OUTLINELEVEL &&
- //NO_NUMBERING != pColl->GetOutlineLevel() ) )//#outline level,zhaojianwei
- pColl->IsAssignedToListLevelOfOutlineStyle()) )//<-end,zhaojianwei
+ pColl->IsAssignedToListLevelOfOutlineStyle()) )
continue;
SwClientIter aIter( *pColl );
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 3b5e047829d0..f3a9f1893b2c 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -202,11 +202,11 @@ public:
{
return xTextRange;
}
- sal_Bool IsOpaque()
+ sal_Bool IsOpaque() const
{
return bOpaque;
}
- const sal_Bool& GetOpaque()
+ const sal_Bool& GetOpaque() const
{
return bOpaque;
}