swunolocking1: swtypes.hxx: rename frame anchor types

 enum RndStdIds: rename frame anchor types (FLY_*) to be more intuitive.
 [note the completely ridiculous number of files that care about anchor types]

2 files changed, 15 insertions, 25 deletions

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index aa20281038da..13ae626bc8c7 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -61,9 +61,7 @@
 #include <dflyobj.hxx>
 #include <dcontact.hxx>
 #include <unodraw.hxx>
-#ifndef IDOCUMENTDRAWMODELACCESS_HXX_INCLUDED
 #include <IDocumentDrawModelAccess.hxx>
-#endif
 #include <doc.hxx>
 #include <hints.hxx>
 #include <txtfrm.hxx>
@@ -80,17 +78,9 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
 // AW: For VCOfDrawVirtObj and stuff
-#ifndef _SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX
 #include <svx/sdr/contact/viewcontactofvirtobj.hxx>
-#endif
-
-#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
-#endif
-
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-#endif
 
 #include <com/sun/star/text/WritingMode2.hpp>
 
@@ -1958,7 +1948,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
 
     switch ( pAnch->GetAnchorId() )
     {
-        case FLY_PAGE:
+        case FLY_AT_PAGE:
                 {
                 USHORT nPgNum = pAnch->GetPageNum();
                 SwPageFrm *pPage = static_cast<SwPageFrm*>(pRoot->Lower());
@@ -1978,12 +1968,12 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                 }
                 break;
 
-        case FLY_AUTO_CNTNT:
-        case FLY_AT_CNTNT:
+        case FLY_AT_CHAR:
+        case FLY_AT_PARA:
         case FLY_AT_FLY:
-        case FLY_IN_CNTNT:
+        case FLY_AS_CHAR:
             {
-                if ( pAnch->GetAnchorId() == FLY_IN_CNTNT )
+                if ( pAnch->GetAnchorId() == FLY_AS_CHAR )
                 {
                     ClrContourCache( GetMaster() );
                 }
@@ -2058,7 +2048,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
 
                         // OD 2004-01-20 #110582# - find correct follow for
                         // as character anchored objects.
-                        if ( pAnch->GetAnchorId() == FLY_IN_CNTNT &&
+                        if ((pAnch->GetAnchorId() == FLY_AS_CHAR) &&
                              pFrm->IsTxtFrm() )
                         {
                             pFrm = lcl_GetFlyInCntntAnchor(
@@ -2076,7 +2066,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                         {
                             // append 'virtual' drawing object
                             SwDrawVirtObj* pDrawVirtObj = AddVirtObj();
-                            if ( pAnch->GetAnchorId() == FLY_IN_CNTNT )
+                            if ( pAnch->GetAnchorId() == FLY_AS_CHAR )
                             {
                                 ClrContourCache( pDrawVirtObj );
                             }
@@ -2087,7 +2077,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                             pDrawVirtObj->ActionChanged();
                         }
 
-                        if ( pAnch->GetAnchorId() == FLY_IN_CNTNT )
+                        if ( pAnch->GetAnchorId() == FLY_AS_CHAR )
                         {
                             pFrm->InvalidatePrt();
                         }
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 9843f8f8c34e..8cf40983caf9 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -34,9 +34,7 @@
 #include "hintids.hxx"
 #include <svx/protitem.hxx>
 #include <svx/svdpagv.hxx>
-#ifndef _FM_FMMODEL_HXX
 #include <svx/fmmodel.hxx>
-#endif
 
 #include "swtypes.hxx"
 #include "pagefrm.hxx"
@@ -62,8 +60,6 @@
 
 #include <com/sun/star/embed/EmbedMisc.hpp>
 
-using namespace com::sun::star;
-
 // OD 18.06.2003 #108784#
 //#ifndef _SVDVMARK_HXX //autogen
 //#include <svx/svdvmark.hxx>
@@ -74,6 +70,10 @@ using namespace com::sun::star;
 #include <flyfrms.hxx>
 // <--
 
+
+using namespace com::sun::star;
+
+
 class SwSdrHdl : public SdrHdl
 {
 public:
@@ -258,7 +258,7 @@ void SwDrawView::AddCustomHdl()
     const SwFmtAnchor &rAnchor = pFrmFmt->GetAnchor();
     // <--
 
-    if(FLY_IN_CNTNT == rAnchor.GetAnchorId())
+    if (FLY_AS_CHAR == rAnchor.GetAnchorId())
         return;
 
     const SwFrm* pAnch;
@@ -267,7 +267,7 @@ void SwDrawView::AddCustomHdl()
 
     Point aPos(aAnchorPoint);
 
-    if ( FLY_AUTO_CNTNT == rAnchor.GetAnchorId() )
+    if ( FLY_AT_CHAR == rAnchor.GetAnchorId() )
     {
         // --> OD 2004-06-24 #i28701# - use last character rectangle saved at object
         // in order to avoid a format of the anchor frame
@@ -1019,7 +1019,7 @@ void SwDrawView::CheckPossibilities()
                         "<SwDrawView::CheckPossibilities()> - missing frame format" );
                 bProtect = TRUE;
             }
-            else if ( FLY_IN_CNTNT == pFrmFmt->GetAnchor().GetAnchorId() &&
+            else if ((FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId()) &&
                       rMrkList.GetMarkCount() > 1 )
             {
                 bProtect = TRUE;