INTEGRATION: CWS writercorehandoff (1.23.462); FILE MERGED

2006/05/08 10:40:27 fme 1.23.462.6: #i50348# Make SwDoc accessible via interfaces
2005/11/18 14:52:01 fme 1.23.462.5: #i50348# Make SwDoc accessible via interfaces
2005/09/13 11:34:47 tra 1.23.462.4: RESYNC: (1.23-1.24); FILE MERGED
2005/07/05 08:12:33 tra 1.23.462.3: #i50348#make SwDoc interface based
2005/06/24 11:42:36 fme 1.23.462.2: #i50348# Make SwDoc accessible via interfaces
2005/06/07 14:09:57 fme 1.23.462.1: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.

1 files changed, 88 insertions, 85 deletions

diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index fa8f6f224308..64902695531a 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: format.hxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 01:54:21 $
+ *  last change: $Author: hr $ $Date: 2006-08-14 15:24:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -55,6 +55,9 @@
 #include <hintids.hxx>
 #endif
 
+class IDocumentSettingAccess;
+class IDocumentDrawModelAccess;
+class IDocumentLayoutAccess;
 class SwDoc;
 
 class SwFmt : public SwModify
@@ -78,8 +81,6 @@ class SwFmt : public SwModify
                             // der FmtChg-Message das erkennen kann!!!
     BOOL   bAutoUpdateFmt : 1;  // TRUE: am Format werden die Attribute
                             // eines kompletten Absatzes gesetzt (UI-seitig!)
-    BOOL   bLayerFmt : 1;   // nur fuer SwFrmFmt ( LAYER_IMPL )
-
 
 protected:
     SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
@@ -145,6 +146,20 @@ public:
     const SwDoc *GetDoc() const         { return aSet.GetDoc(); }
           SwDoc *GetDoc()               { return aSet.GetDoc(); }
 
+    /** Provides access to the document settings interface
+     */
+    const IDocumentSettingAccess* getIDocumentSettingAccess() const;
+
+    /** Provides access to the document draw model interface
+     */
+    const IDocumentDrawModelAccess* getIDocumentDrawModelAccess() const;
+          IDocumentDrawModelAccess* getIDocumentDrawModelAccess();
+
+    /** Provides access to the document layout interface
+     */
+    const IDocumentLayoutAccess* getIDocumentLayoutAccess() const;
+          IDocumentLayoutAccess* getIDocumentLayoutAccess();
+
     // erfragen und setzen der Poolvorlagen-Id's
     USHORT GetPoolFmtId() const { return nPoolFmtId; }
     void SetPoolFmtId( USHORT nId ) { nPoolFmtId = nId; }
@@ -159,10 +174,7 @@ public:
         SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const
         { aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); }
     // Das Format-ID fuer Lesen/Schreiben:
-    USHORT GetFmtId() const  { return nFmtId;    }
-    void   SetWritten()      { bWritten = TRUE;  }
     void   ResetWritten()    { bWritten = FALSE; }
-    BOOL   IsWritten() const { return bWritten;  }
 
     // Abfragen/Setzen vom AutoFmt-Flag
     BOOL IsAuto() const                 { return bAutoFmt; }
@@ -174,15 +186,6 @@ public:
 
     BOOL IsFmtInDTOR() const { return bFmtInDTOR; }
 
-    BOOL IsLayerFmt() const { return bLayerFmt; }
-    void SetLayerFmt( BOOL bNew ) { bLayerFmt = bNew; }
-
-    BOOL IsFrmFmt() const { return nWhichId == RES_FLYFRMFMT ||
-                                   nWhichId == RES_DRAWFRMFMT||
-                                   nWhichId == RES_FRMFMT; }
-
-#define INLINE inline
-
     // GetMethoden: das Bool gibt an, ob nur im Set (FALSE) oder auch in
     //              den Parents gesucht werden soll. Wird nichts gefunden,
     //              wird das deflt. Attribut returnt.
@@ -199,7 +202,7 @@ public:
     inline const SvxCrossedOutItem   &GetCrossedOut( BOOL = TRUE ) const;
     inline const SvxFontHeightItem   &GetSize( BOOL = TRUE ) const;
     inline const SvxPropSizeItem     &GetPropSize( BOOL = TRUE ) const;
-    INLINE const SvxFontItem         &GetFont( BOOL = TRUE ) const;
+    inline const SvxFontItem         &GetFont( BOOL = TRUE ) const;
     inline const SvxColorItem        &GetColor( BOOL = TRUE ) const;
     inline const SvxCharSetColorItem &GetCharSetColor( BOOL = TRUE ) const;
     inline const SvxLanguageItem     &GetLanguage( BOOL = TRUE ) const;
@@ -219,49 +222,49 @@ public:
     inline const SvxLanguageItem     &GetCTLLanguage( BOOL = TRUE ) const;
     inline const SvxPostureItem      &GetCTLPosture( BOOL = TRUE ) const;
     inline const SvxWeightItem       &GetCTLWeight( BOOL = TRUE ) const;
-    inline const SfxBoolItem         &GetWritingDirection( BOOL = TRUE ) const;
+    inline const SfxBoolItem           &GetWritingDirection( BOOL = TRUE ) const;
     inline const SvxEmphasisMarkItem &GetEmphasisMark( BOOL = TRUE ) const;
-    inline const SvxTwoLinesItem     &Get2Lines( BOOL = TRUE ) const;
+    inline const SvxTwoLinesItem   &Get2Lines( BOOL = TRUE ) const;
     inline const SvxCharScaleWidthItem &GetCharScaleW( BOOL = TRUE ) const;
-    inline const SvxCharRotateItem   &GetCharRotate( BOOL = TRUE ) const;
-    inline const SvxCharReliefItem   &GetCharRelief( BOOL = TRUE ) const;
+    inline const SvxCharRotateItem     &GetCharRotate( BOOL = TRUE ) const;
+    inline const SvxCharReliefItem     &GetCharRelief( BOOL = TRUE ) const;
     inline const SvxCharHiddenItem   &GetCharHidden( BOOL = TRUE ) const;
 
     // Frame-Attribute  - impl. steht im frmatr.hxx,
-    INLINE const SwFmtFillOrder         &GetFillOrder( BOOL = TRUE ) const;
-    INLINE const SwFmtFrmSize           &GetFrmSize( BOOL = TRUE ) const;
-    INLINE const SwFmtHeader            &GetHeader( BOOL = TRUE ) const;
-    INLINE const SwFmtFooter            &GetFooter( BOOL = TRUE ) const;
-    INLINE const SwFmtSurround          &GetSurround( BOOL = TRUE ) const;
-    INLINE const SwFmtHoriOrient        &GetHoriOrient( BOOL = TRUE ) const;
-    INLINE const SwFmtAnchor            &GetAnchor( BOOL = TRUE ) const;
-    INLINE const SwFmtCol               &GetCol( BOOL = TRUE ) const;
-    INLINE const SvxPaperBinItem        &GetPaperBin( BOOL = TRUE ) const;
-    INLINE const SvxLRSpaceItem         &GetLRSpace( BOOL = TRUE ) const;
-    INLINE const SvxULSpaceItem         &GetULSpace( BOOL = TRUE ) const;
-    INLINE const SwFmtCntnt             &GetCntnt( BOOL = TRUE ) const;
-    INLINE const SvxPrintItem           &GetPrint( BOOL = TRUE ) const;
-    INLINE const SvxOpaqueItem          &GetOpaque( BOOL = TRUE ) const;
-    INLINE const SvxProtectItem         &GetProtect( BOOL = TRUE ) const;
-    INLINE const SwFmtVertOrient        &GetVertOrient( BOOL = TRUE ) const;
-    INLINE const SvxBoxItem             &GetBox( BOOL = TRUE ) const;
-    INLINE const SvxFmtKeepItem         &GetKeep( BOOL = TRUE ) const;
-    INLINE const SvxBrushItem           &GetBackground( BOOL = TRUE ) const;
-    INLINE const SvxShadowItem          &GetShadow( BOOL = TRUE ) const;
-    INLINE const SwFmtPageDesc          &GetPageDesc( BOOL = TRUE ) const;
-    INLINE const SvxFmtBreakItem        &GetBreak( BOOL = TRUE ) const;
-    INLINE const SvxMacroItem           &GetMacro( BOOL = TRUE ) const;
-    INLINE const SwFmtURL               &GetURL( BOOL = TRUE ) const;
-    INLINE const SwFmtEditInReadonly    &GetEditInReadonly( BOOL = TRUE ) const;
-    INLINE const SwFmtLayoutSplit       &GetLayoutSplit( BOOL = TRUE ) const;
-    INLINE const SwFmtRowSplit          &GetRowSplit( BOOL = TRUE ) const;
-    INLINE const SwFmtChain             &GetChain( BOOL = TRUE ) const;
-    INLINE const SwFmtLineNumber        &GetLineNumber( BOOL = TRUE ) const;
-    INLINE const SwFmtFtnAtTxtEnd       &GetFtnAtTxtEnd( BOOL = TRUE ) const;
-    INLINE const SwFmtEndAtTxtEnd       &GetEndAtTxtEnd( BOOL = TRUE ) const;
-    INLINE const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const;
-    INLINE const SvxFrameDirectionItem  &GetFrmDir( BOOL = TRUE ) const;
-    INLINE const SwTextGridItem         &GetTextGrid( BOOL = TRUE ) const;
+    inline const SwFmtFillOrder           &GetFillOrder( BOOL = TRUE ) const;
+    inline const SwFmtFrmSize             &GetFrmSize( BOOL = TRUE ) const;
+    inline const SwFmtHeader          &GetHeader( BOOL = TRUE ) const;
+    inline const SwFmtFooter          &GetFooter( BOOL = TRUE ) const;
+    inline const SwFmtSurround            &GetSurround( BOOL = TRUE ) const;
+    inline const SwFmtHoriOrient      &GetHoriOrient( BOOL = TRUE ) const;
+    inline const SwFmtAnchor          &GetAnchor( BOOL = TRUE ) const;
+    inline const SwFmtCol                 &GetCol( BOOL = TRUE ) const;
+    inline const SvxPaperBinItem      &GetPaperBin( BOOL = TRUE ) const;
+    inline const SvxLRSpaceItem           &GetLRSpace( BOOL = TRUE ) const;
+    inline const SvxULSpaceItem           &GetULSpace( BOOL = TRUE ) const;
+    inline const SwFmtCntnt           &GetCntnt( BOOL = TRUE ) const;
+    inline const SvxPrintItem             &GetPrint( BOOL = TRUE ) const;
+    inline const SvxOpaqueItem            &GetOpaque( BOOL = TRUE ) const;
+    inline const SvxProtectItem           &GetProtect( BOOL = TRUE ) const;
+    inline const SwFmtVertOrient      &GetVertOrient( BOOL = TRUE ) const;
+    inline const SvxBoxItem               &GetBox( BOOL = TRUE ) const;
+    inline const SvxFmtKeepItem         &GetKeep( BOOL = TRUE ) const;
+    inline const SvxBrushItem           &GetBackground( BOOL = TRUE ) const;
+    inline const SvxShadowItem            &GetShadow( BOOL = TRUE ) const;
+    inline const SwFmtPageDesc            &GetPageDesc( BOOL = TRUE ) const;
+    inline const SvxFmtBreakItem      &GetBreak( BOOL = TRUE ) const;
+    inline const SvxMacroItem             &GetMacro( BOOL = TRUE ) const;
+    inline const SwFmtURL             &GetURL( BOOL = TRUE ) const;
+    inline const SwFmtEditInReadonly  &GetEditInReadonly( BOOL = TRUE ) const;
+    inline const SwFmtLayoutSplit     &GetLayoutSplit( BOOL = TRUE ) const;
+    inline const SwFmtRowSplit          &GetRowSplit( BOOL = TRUE ) const;
+    inline const SwFmtChain               &GetChain( BOOL = TRUE ) const;
+    inline const SwFmtLineNumber      &GetLineNumber( BOOL = TRUE ) const;
+    inline const SwFmtFtnAtTxtEnd     &GetFtnAtTxtEnd( BOOL = TRUE ) const;
+    inline const SwFmtEndAtTxtEnd     &GetEndAtTxtEnd( BOOL = TRUE ) const;
+    inline const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const;
+    inline const SvxFrameDirectionItem    &GetFrmDir( BOOL = TRUE ) const;
+    inline const SwTextGridItem         &GetTextGrid( BOOL = TRUE ) const;
     inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE ) const;
     // OD 18.09.2003 #i18732#
     inline const SwFmtFollowTextFlow    &GetFollowTextFlow(BOOL = TRUE) const;
@@ -269,41 +272,41 @@ public:
     inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const;
 
     // Grafik-Attribute - impl. steht im grfatr.hxx
-    INLINE const SwMirrorGrf            &GetMirrorGrf( BOOL = TRUE ) const;
-    inline const SwCropGrf              &GetCropGrf( BOOL = TRUE ) const;
-    inline const SwRotationGrf          &GetRotationGrf(BOOL = TRUE ) const;
-    inline const SwLuminanceGrf         &GetLuminanceGrf(BOOL = TRUE ) const;
-    inline const SwContrastGrf          &GetContrastGrf(BOOL = TRUE ) const;
-    inline const SwChannelRGrf          &GetChannelRGrf(BOOL = TRUE ) const;
-    inline const SwChannelGGrf          &GetChannelGGrf(BOOL = TRUE ) const;
-    inline const SwChannelBGrf          &GetChannelBGrf(BOOL = TRUE ) const;
-    inline const SwGammaGrf             &GetGammaGrf(BOOL = TRUE ) const;
-    inline const SwInvertGrf            &GetInvertGrf(BOOL = TRUE ) const;
-    inline const SwTransparencyGrf      &GetTransparencyGrf(BOOL = TRUE ) const;
-    inline const SwDrawModeGrf          &GetDrawModeGrf(BOOL = TRUE ) const;
+    inline const SwMirrorGrf          &GetMirrorGrf( BOOL = TRUE ) const;
+    inline const SwCropGrf            &GetCropGrf( BOOL = TRUE ) const;
+    inline const SwRotationGrf            &GetRotationGrf(BOOL = TRUE ) const;
+    inline const SwLuminanceGrf       &GetLuminanceGrf(BOOL = TRUE ) const;
+    inline const SwContrastGrf            &GetContrastGrf(BOOL = TRUE ) const;
+    inline const SwChannelRGrf            &GetChannelRGrf(BOOL = TRUE ) const;
+    inline const SwChannelGGrf            &GetChannelGGrf(BOOL = TRUE ) const;
+    inline const SwChannelBGrf            &GetChannelBGrf(BOOL = TRUE ) const;
+    inline const SwGammaGrf           &GetGammaGrf(BOOL = TRUE ) const;
+    inline const SwInvertGrf          &GetInvertGrf(BOOL = TRUE ) const;
+    inline const SwTransparencyGrf        &GetTransparencyGrf(BOOL = TRUE ) const;
+    inline const SwDrawModeGrf            &GetDrawModeGrf(BOOL = TRUE ) const;
 
     // Paragraph-Attribute  - impl. steht im paratr.hxx
-    inline const SvxLineSpacingItem     &GetLineSpacing( BOOL = TRUE ) const;
-    inline const SvxAdjustItem          &GetAdjust( BOOL = TRUE ) const;
-    inline const SvxFmtSplitItem        &GetSplit( BOOL = TRUE ) const;
-    inline const SwRegisterItem         &GetRegister( BOOL = TRUE ) const;
-    inline const SwNumRuleItem          &GetNumRule( BOOL = TRUE ) const;
-    inline const SvxWidowsItem          &GetWidows( BOOL = TRUE ) const;
-    inline const SvxOrphansItem         &GetOrphans( BOOL = TRUE ) const;
-    inline const SvxTabStopItem         &GetTabStops( BOOL = TRUE ) const;
-    inline const SvxHyphenZoneItem      &GetHyphenZone( BOOL = TRUE ) const;
-    inline const SwFmtDrop              &GetDrop( BOOL = TRUE ) const;
-    inline const SvxScriptSpaceItem     &GetScriptSpace(BOOL = TRUE) const;
+    inline const SvxLineSpacingItem       &GetLineSpacing( BOOL = TRUE ) const;
+    inline const SvxAdjustItem            &GetAdjust( BOOL = TRUE ) const;
+    inline const SvxFmtSplitItem      &GetSplit( BOOL = TRUE ) const;
+    inline const SwRegisterItem           &GetRegister( BOOL = TRUE ) const;
+    inline const SwNumRuleItem            &GetNumRule( BOOL = TRUE ) const;
+    inline const SvxWidowsItem            &GetWidows( BOOL = TRUE ) const;
+    inline const SvxOrphansItem           &GetOrphans( BOOL = TRUE ) const;
+    inline const SvxTabStopItem           &GetTabStops( BOOL = TRUE ) const;
+    inline const SvxHyphenZoneItem        &GetHyphenZone( BOOL = TRUE ) const;
+    inline const SwFmtDrop                &GetDrop( BOOL = TRUE ) const;
+    inline const SvxScriptSpaceItem       &GetScriptSpace(BOOL = TRUE) const;
     inline const SvxHangingPunctuationItem &GetHangingPunctuation(BOOL = TRUE) const;
-    inline const SvxForbiddenRuleItem   &GetForbiddenRule(BOOL = TRUE) const;
-    inline const SvxParaVertAlignItem   &GetParaVertAlign(BOOL = TRUE) const;
+    inline const SvxForbiddenRuleItem     &GetForbiddenRule(BOOL = TRUE) const;
+    inline const SvxParaVertAlignItem &GetParaVertAlign(BOOL = TRUE) const;
     inline const SvxParaGridItem        &GetParaGrid(BOOL = TRUE) const;
     inline const SwParaConnectBorderItem &GetParaConnectBorder(BOOL = TRUE ) const;
 
     // TabellenBox-Attribute    - impl. steht im cellatr.hxx
-    INLINE  const SwTblBoxNumFormat     &GetTblBoxNumFmt( BOOL = TRUE ) const;
-    INLINE  const SwTblBoxFormula       &GetTblBoxFormula( BOOL = TRUE ) const;
-    INLINE  const SwTblBoxValue         &GetTblBoxValue( BOOL = TRUE ) const;
+    inline  const SwTblBoxNumFormat     &GetTblBoxNumFmt( BOOL = TRUE ) const;
+    inline  const SwTblBoxFormula       &GetTblBoxFormula( BOOL = TRUE ) const;
+    inline  const SwTblBoxValue         &GetTblBoxValue( BOOL = TRUE ) const;
 
     /** SwFmt::IsBackgroundTransparent - for feature #99657#
 
@@ -332,7 +335,7 @@ public:
     virtual const sal_Bool IsShadowTransparent() const;
 };
 
-// --------------- Inline Implementierungen ------------------------
+// --------------- inline Implementierungen ------------------------
 
 inline const SfxPoolItem& SwFmt::GetAttr( USHORT nWhich,
                                         BOOL bInParents ) const
@@ -353,6 +356,6 @@ inline SfxItemState SwFmt::GetItemState( USHORT nWhich, BOOL bSrchInParent,
     return aSet.GetItemState( nWhich, bSrchInParent, ppItem );
 }
 
-#undef INLINE
+#undef inline
 
 #endif // _FORMAT_HXX