1 files changed, 19 insertions, 22 deletions

diff --git a/sw/source/core/layout/sortedobjsimpl.cxx b/sw/source/core/layout/sortedobjsimpl.cxx
index 96d3c73e8e3b..8afa7968b5f0 100644
--- a/sw/source/core/layout/sortedobjsimpl.cxx
+++ b/sw/source/core/layout/sortedobjsimpl.cxx
@@ -41,17 +41,14 @@
 #include <ndtxt.hxx>
 #include <fmtsrnd.hxx>
 #include <fmtwrapinfluenceonobjpos.hxx>
-#ifndef IDOCUMENTDRAWMODELACCESS_HXX_INCLUDED
 #include <IDocumentDrawModelAccess.hxx>
-#endif
+
 
 using namespace ::com::sun::star;
 
 typedef std::vector< SwAnchoredObject* >::iterator tIter;
 typedef std::vector< SwAnchoredObject* >::const_iterator tConstIter;
 
-using namespace ::com::sun::star;
-
 
 SwSortedObjsImpl::SwSortedObjsImpl()
 {
@@ -96,36 +93,36 @@ struct ObjAnchorOrder
         const SwFmtAnchor* pAnchorNew = &(rFmtNew.GetAnchor());
 
         // check for to-page anchored objects
-        if ( pAnchorListed->GetAnchorId() == FLY_PAGE &&
-             pAnchorNew->GetAnchorId() != FLY_PAGE )
+        if ((pAnchorListed->GetAnchorId() == FLY_AT_PAGE) &&
+            (pAnchorNew   ->GetAnchorId() != FLY_AT_PAGE))
         {
             return true;
         }
-        else if ( pAnchorListed->GetAnchorId() != FLY_PAGE &&
-                  pAnchorNew->GetAnchorId() == FLY_PAGE )
+        else if ((pAnchorListed->GetAnchorId() != FLY_AT_PAGE) &&
+                 (pAnchorNew   ->GetAnchorId() == FLY_AT_PAGE))
         {
             return false;
         }
-        else if ( pAnchorListed->GetAnchorId() == FLY_PAGE &&
-                  pAnchorNew->GetAnchorId() == FLY_PAGE )
+        else if ((pAnchorListed->GetAnchorId() == FLY_AT_PAGE) &&
+                 (pAnchorNew   ->GetAnchorId() == FLY_AT_PAGE))
         {
             return pAnchorListed->GetOrder() < pAnchorNew->GetOrder();
         }
 
         // Both objects aren't anchored to page.
         // Thus, check for to-fly anchored objects
-        if ( pAnchorListed->GetAnchorId() == FLY_AT_FLY &&
-             pAnchorNew->GetAnchorId() != FLY_AT_FLY )
+        if ((pAnchorListed->GetAnchorId() == FLY_AT_FLY) &&
+            (pAnchorNew   ->GetAnchorId() != FLY_AT_FLY))
         {
             return true;
         }
-        else if ( pAnchorListed->GetAnchorId() != FLY_AT_FLY &&
-                  pAnchorNew->GetAnchorId() == FLY_AT_FLY )
+        else if ((pAnchorListed->GetAnchorId() != FLY_AT_FLY) &&
+                 (pAnchorNew   ->GetAnchorId() == FLY_AT_FLY))
         {
             return false;
         }
-        else if ( pAnchorListed->GetAnchorId() == FLY_AT_FLY &&
-                  pAnchorNew->GetAnchorId() == FLY_AT_FLY )
+        else if ((pAnchorListed->GetAnchorId() == FLY_AT_FLY) &&
+                 (pAnchorNew   ->GetAnchorId() == FLY_AT_FLY))
         {
             return pAnchorListed->GetOrder() < pAnchorNew->GetOrder();
         }
@@ -144,21 +141,21 @@ struct ObjAnchorOrder
         // --> OD 2006-11-29 #???# - objects have to be ordered by anchor node position
         // Thus, compare content anchor node positions and anchor type,
         // if not anchored at-paragraph
-        if ( pAnchorListed->GetAnchorId() != FLY_AT_CNTNT &&
-             pAnchorNew->GetAnchorId() != FLY_AT_CNTNT &&
+        if ((pAnchorListed->GetAnchorId() != FLY_AT_PARA) &&
+            (pAnchorNew   ->GetAnchorId() != FLY_AT_PARA) &&
              pCntntAnchorListed && pCntntAnchorNew )
         {
             if ( pCntntAnchorListed->nContent != pCntntAnchorNew->nContent )
             {
                 return pCntntAnchorListed->nContent < pCntntAnchorNew->nContent;
             }
-            else if ( pAnchorListed->GetAnchorId() == FLY_AUTO_CNTNT &&
-                      pAnchorNew->GetAnchorId() == FLY_IN_CNTNT )
+            else if ((pAnchorListed->GetAnchorId() == FLY_AT_CHAR) &&
+                     (pAnchorNew   ->GetAnchorId() == FLY_AS_CHAR))
             {
                 return true;
             }
-            else if ( pAnchorListed->GetAnchorId() == FLY_IN_CNTNT &&
-                      pAnchorNew->GetAnchorId() == FLY_AUTO_CNTNT )
+            else if ((pAnchorListed->GetAnchorId() == FLY_AS_CHAR) &&
+                     (pAnchorNew   ->GetAnchorId() == FLY_AT_CHAR))
             {
                 return false;
             }