[Libreoffice-commits] .: sw/source

[Caolán McNamara]

 sw/source/core/doc/doctxm.cxx      |    6 ++----
 sw/source/core/unocore/unodraw.cxx |    4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit fb1a51560f614e784f22fb05e25b9a235f1ffd42
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 30 14:16:05 2010 +0000

    tidy this up a bit

diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 2fe5aa8..f34af4f 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 acc3b9e..8f33608 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;
         }