1 files changed, 20 insertions, 18 deletions

diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index feeea971ae06..483de85d82eb 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -331,7 +331,7 @@ Paragraph* OutlineView::GetPrevTitle(const Paragraph* pPara)
         while(nPos)
         {
             pPara = mrOutliner.GetParagraph(--nPos);
-            if( mrOutliner.HasParaFlag(pPara, ParaFlag::ISPAGE) )
+            if( ::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) )
             {
                 return const_cast< Paragraph* >( pPara );
             }
@@ -353,7 +353,7 @@ Paragraph* OutlineView::GetNextTitle(const Paragraph* pPara)
     do
     {
         pResult = mrOutliner.GetParagraph(++nPos);
-        if( pResult && mrOutliner.HasParaFlag(pResult, ParaFlag::ISPAGE) )
+        if( pResult && ::Outliner::HasParaFlag(pResult, ParaFlag::ISPAGE) )
             return pResult;
     }
     while( pResult );
@@ -378,7 +378,9 @@ IMPL_LINK( OutlineView, ParagraphInsertedHdl, ::Outliner *, pOutliner )
 
         UpdateParagraph( nAbsPos );
 
-        if( (nAbsPos == 0) || mrOutliner.HasParaFlag(pPara,ParaFlag::ISPAGE) || mrOutliner.HasParaFlag(mrOutliner.GetParagraph( nAbsPos-1 ), ParaFlag::ISPAGE) )
+        if( (nAbsPos == 0) ||
+            ::Outliner::HasParaFlag(pPara,ParaFlag::ISPAGE) ||
+            ::Outliner::HasParaFlag(mrOutliner.GetParagraph( nAbsPos-1 ), ParaFlag::ISPAGE) )
         {
             InsertSlideForParagraph( pPara );
         }
@@ -511,7 +513,7 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner )
     OutlineViewPageChangesGuard aGuard(this);
 
     Paragraph* pPara = pOutliner->GetHdlParagraph();
-    if( pOutliner->HasParaFlag( pPara, ParaFlag::ISPAGE ) )
+    if( ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) )
     {
         // how many titles are in front of the title paragraph in question?
         sal_uLong nPos = 0L;
@@ -570,7 +572,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
     OutlineViewPageChangesGuard aGuard(this);
 
     Paragraph* pPara = pOutliner->GetHdlParagraph();
-    if( pOutliner->HasParaFlag( pPara, ParaFlag::ISPAGE ) && ((pOutliner->GetPrevFlags() & ParaFlag::ISPAGE) == ParaFlag::NONE) )
+    if( ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) && ((pOutliner->GetPrevFlags() & ParaFlag::ISPAGE) == ParaFlag::NONE) )
     {
         // the current paragraph is transformed into a slide
 
@@ -591,7 +593,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
             {
                 pParagraph = *iter;
 
-                if( !pOutliner->HasParaFlag( pParagraph, ParaFlag::ISPAGE ) &&
+                if( !::Outliner::HasParaFlag( pParagraph, ParaFlag::ISPAGE ) &&
                     (pOutliner->GetDepth( pOutliner->GetAbsPos( pParagraph ) ) <= 0) )
                     mnPagesToProcess++;
             }
@@ -640,7 +642,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
         }
         pOutliner->UpdateFields();
     }
-    else if( !pOutliner->HasParaFlag( pPara, ParaFlag::ISPAGE ) && ((pOutliner->GetPrevFlags() & ParaFlag::ISPAGE) != ParaFlag::NONE) )
+    else if( !::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) && ((pOutliner->GetPrevFlags() & ParaFlag::ISPAGE) != ParaFlag::NONE) )
     {
         // the paragraph was a page but now becomes a normal paragraph
 
@@ -735,7 +737,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
             sal_Int16 nDepth = pOutliner->GetDepth( nPara );
             bool bSubTitle = pPage->GetPresObj(PRESOBJ_TEXT) != NULL;
 
-            if( pOutliner->HasParaFlag(pPara, ParaFlag::ISPAGE) )
+            if( ::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) )
             {
                 pStyleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE );
             }
@@ -831,7 +833,7 @@ IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner )
 
     for (std::vector<Paragraph*>::iterator it = maSelectedParas.begin(); it != maSelectedParas.end();)
     {
-        if (!pOutliner->HasParaFlag(*it, ParaFlag::ISPAGE))
+        if (!::Outliner::HasParaFlag(*it, ParaFlag::ISPAGE))
             it = maSelectedParas.erase(it);
         else
             ++it;
@@ -845,7 +847,7 @@ IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner )
 
     while(pPara)
     {
-        if( pOutliner->HasParaFlag(pPara, ParaFlag::ISPAGE) )                     // one page?
+        if( ::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) )                     // one page?
         {
             maOldParaOrder.push_back(pPara);
             SdPage* pPage = mrDoc.GetSdPage(nPos, PK_STANDARD);
@@ -881,7 +883,7 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner )
     Paragraph*  pPrev = NULL;
     while (pPara && pPara != pSearchIt)
     {
-        if( pOutliner->HasParaFlag(pPara, ParaFlag::ISPAGE) )
+        if( ::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) )
         {
             nPosNewOrder++;
             pPrev = pPara;
@@ -1239,7 +1241,7 @@ SdPage* OutlineView::GetActualPage()
 
 SdPage* OutlineView::GetPageForParagraph( Paragraph* pPara )
 {
-    if( !mrOutliner.HasParaFlag(pPara,ParaFlag::ISPAGE) )
+    if( !::Outliner::HasParaFlag(pPara,ParaFlag::ISPAGE) )
         pPara = GetPrevTitle(pPara);
 
     sal_uInt32 nPageToSelect = 0;
@@ -1267,7 +1269,7 @@ Paragraph* OutlineView::GetParagraphForPage( ::Outliner& rOutl, SdPage* pPage )
     while( pPara )
     {
         // if this paragraph is a page ...
-        if( mrOutliner.HasParaFlag(pPara,ParaFlag::ISPAGE) )
+        if( ::Outliner::HasParaFlag(pPara,ParaFlag::ISPAGE) )
         {
             // see if we already skipped enough pages
             if( 0 == nPagesToSkip )
@@ -1318,7 +1320,7 @@ void OutlineView::SetSelectedPages()
 
     for (std::vector<Paragraph*>::iterator it = aSelParas.begin(); it != aSelParas.end();)
     {
-        if (!mrOutliner.HasParaFlag(*it, ParaFlag::ISPAGE))
+        if (!::Outliner::HasParaFlag(*it, ParaFlag::ISPAGE))
             it = aSelParas.erase(it);
         else
             ++it;
@@ -1332,7 +1334,7 @@ void OutlineView::SetSelectedPages()
 
     while(pPara)
     {
-        if( mrOutliner.HasParaFlag(pPara, ParaFlag::ISPAGE) )                     // one page
+        if( ::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) )                     // one page
         {
             SdPage* pPage = mrDoc.GetSdPage(nPos, PK_STANDARD);
             DBG_ASSERT(pPage!=NULL,
@@ -1674,13 +1676,13 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo)
         Size aOffset( 100, 100 );
 
         // paint slide number
-        if( pPara && mrOutliner.HasParaFlag(pPara,ParaFlag::ISPAGE) )
+        if( pPara && ::Outliner::HasParaFlag(pPara,ParaFlag::ISPAGE) )
         {
             long nPage = 0; // todo, printing??
             for ( sal_Int32 n = 0; n <= pInfo->mnPara; n++ )
             {
                 Paragraph* p = mrOutliner.GetParagraph( n );
-                if ( mrOutliner.HasParaFlag(p,ParaFlag::ISPAGE) )
+                if ( ::Outliner::HasParaFlag(p,ParaFlag::ISPAGE) )
                     nPage++;
             }
 
@@ -1775,7 +1777,7 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
     {
         Paragraph* pPara = mrOutliner.GetParagraph( nPara );
 
-        bool bPage = mrOutliner.HasParaFlag( pPara, ParaFlag::ISPAGE  );
+        bool bPage = ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE  );
 
         if( !bPage )
         {