diff options
Diffstat (limited to 'sw/source/core/inc')
97 files changed, 676 insertions, 695 deletions
diff --git a/sw/source/core/inc/GetMetricVal.hxx b/sw/source/core/inc/GetMetricVal.hxx index 0d897cfa395a..a752aa53b0d1 100644 --- a/sw/source/core/inc/GetMetricVal.hxx +++ b/sw/source/core/inc/GetMetricVal.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ inline sal_uInt16 GetMetricVal( int n ) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index 5b03672f461f..415b8e7b6a68 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ namespace sw { namespace mark }; }} #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx index 393c917bfc45..0d831d3f0b2a 100644 --- a/sw/source/core/inc/SwGrammarMarkUp.hxx +++ b/sw/source/core/inc/SwGrammarMarkUp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/SwPortionHandler.hxx b/sw/source/core/inc/SwPortionHandler.hxx index 11888f67a8ae..a78e00bbc753 100644 --- a/sw/source/core/inc/SwPortionHandler.hxx +++ b/sw/source/core/inc/SwPortionHandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx index 1df5436e7ad2..0eeb4df3f802 100644 --- a/sw/source/core/inc/SwUndoFmt.hxx +++ b/sw/source/core/inc/SwUndoFmt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,7 +95,6 @@ class SwUndoRenameFmt : public SwUndo protected: String sOldName, sNewName; SwDoc * pDoc; -// SwUndoId nId; public: SwUndoRenameFmt(SwUndoId nUndoId, const String & sOldName, @@ -251,3 +251,5 @@ class SwUndoNumruleRename : public SwUndo }; #endif // SW_UNDO_TXT_FMT_COLL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/SwUndoPageDesc.hxx b/sw/source/core/inc/SwUndoPageDesc.hxx index 1de717a453d6..7acb98053e52 100644 --- a/sw/source/core/inc/SwUndoPageDesc.hxx +++ b/sw/source/core/inc/SwUndoPageDesc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,14 +57,14 @@ public: class SwUndoPageDescCreate : public SwUndo { - const SwPageDesc * pDesc; // #116530# + const SwPageDesc * pDesc; SwPageDescExt aNew; SwDoc * pDoc; void DoImpl(); public: - SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc); // #116530# + SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc); virtual ~SwUndoPageDescCreate(); virtual void UndoImpl( ::sw::UndoRedoContext & ); @@ -91,3 +92,5 @@ public: virtual SwRewriter GetRewriter() const; }; #endif // _SW_UNDO_PAGE_DESC_CHANGE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/SwUndoTOXChange.hxx b/sw/source/core/inc/SwUndoTOXChange.hxx index 5fa221b23979..a661ab5de571 100644 --- a/sw/source/core/inc/SwUndoTOXChange.hxx +++ b/sw/source/core/inc/SwUndoTOXChange.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ public: }; #endif // SW_UNDO_TOX_CHANGE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index 59ca2b59540e..8d02e47a4e8f 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ public: void _ExportContent() {} }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index a9aa3bb32b08..4d37e9b417ee 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx index 8208d78db2d6..64c9dbb8c0e9 100644 --- a/sw/source/core/inc/SwXMLBlockListContext.hxx +++ b/sw/source/core/inc/SwXMLBlockListContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -124,3 +125,5 @@ public: ~SwXMLTextBlockParContext ( void ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 8e487a21fc85..c87b08d77360 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index f1ed6bbf1371..931ed54006bf 100644 --- a/sw/source/core/inc/SwXTextDefaults.hxx +++ b/sw/source/core/inc/SwXTextDefaults.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#ifndef _COM_SUN_STAR_BEANS_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <svl/itemprop.hxx> class SwDoc; @@ -82,3 +81,5 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx index 8680dcaa3e59..3d92ff7ce1c7 100644 --- a/sw/source/core/inc/UndoNumbering.hxx +++ b/sw/source/core/inc/UndoNumbering.hxx @@ -28,17 +28,9 @@ #ifndef SW_UNDO_NUMBERING_HXX #define SW_UNDO_NUMBERING_HXX +#include <vector> #include <undobj.hxx> - -#ifndef _SVSTDARR_HXX -#define _SVSTDARR_USHORTS -#define _SVSTDARR_ULONGS -#define _SVSTDARR_BOOLS -#define _SVSTDARR_BYTES -#define _SVSTDARR_USHORTSSORT -#include <svl/svstdarr.hxx> -#endif - +#include <boost/shared_ptr.hpp> #include <numrule.hxx> @@ -78,9 +70,13 @@ public: class SwUndoDelNum : public SwUndo, private SwUndRng { - SvULongs aNodeIdx; - SvBytes aLevels; - SvBools aRstLRSpaces; + struct NodeLevel + { + sal_uLong index; + int level; + inline NodeLevel(sal_uLong idx, int lvl) : index(idx), level(lvl) {}; + }; + std::vector<NodeLevel> aNodes; SwHistory* pHistory; public: SwUndoDelNum( const SwPaM& rPam ); diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index 40032e9dfa86..d7705a398ee2 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -39,10 +39,10 @@ #include <svl/svstdarr.hxx> #endif +#include <vector> #include <swtypes.hxx> #include <itabenum.hxx> - class SfxItemSet; struct SwSaveRowSpan; @@ -188,7 +188,7 @@ class SwUndoTblNdsChg : public SwUndo SvULongs* pNewSttNds; SwUndoSaveSections* pDelSects; } Ptrs; - SvBools aMvBoxes; // for SplitRow (split Nodes of Box) + std::vector<bool> aMvBoxes; // for SplitRow (split Nodes of Box) long nMin, nMax; // for redo of delete column sal_uLong nSttNode, nCurrBox; sal_uInt16 nCount, nRelDiff, nAbsDiff, nSetColType; diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index d90b57b13b50..d8b4f3ae0ffa 100755 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index 178a07c7bec7..88affdb989b2 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,7 +29,7 @@ #define _ANCHOREDOBJECTPOSITION_HXX #include <swtypes.hxx> -// OD 2004-03-16 #i11860# +// #i11860# #include <frame.hxx> class SdrObject; @@ -40,7 +41,7 @@ class SwRect; class SvxLRSpaceItem; class SvxULSpaceItem; class SwFmtHoriOrient; -// OD 2004-03-23 #i26701# +// #i26701# class SwAnchoredObject; namespace objectpositioning @@ -56,7 +57,7 @@ namespace objectpositioning // information about object // does the object represents a Writer fly frame bool mbIsObjFly; - // OD 2004-03-23 #i26791# - anchored object the object belongs to; + // #i26791# - anchored object the object belongs to; SwAnchoredObject* mpAnchoredObj; // frame the object is anchored at SwFrm* mpAnchorFrm; @@ -64,25 +65,20 @@ namespace objectpositioning SwContact* mpContact; // frame format const SwFrmFmt* mpFrmFmt; - // --> OD 2006-03-15 #i62875# + // #i62875# bool mbFollowTextFlow; - // <-- - // --> OD 2006-03-15 #i62875# + // #i62875# // for compatibility option <DoNotCaptureDrawObjsOnPage> bool mbDoNotCaptureAnchoredObj; - // <-- /** determine information about object - OD 30.07.2003 #110978# member <mbIsObjFly>, <mpAnchoredObj>, <mpAnchorFrm>, <mpContact> and <mpFrmFmt> are set - - @author OD */ void _GetInfoAboutObj(); - // --> OD 2006-03-15 #i62875# + // #i62875# // --> OD 2009-09-01 #mongolianlayout# - add parameter <bVertL2R> SwTwips _ImplAdjustVertRelPos( const SwTwips nTopOfAnch, const bool bVert, @@ -93,7 +89,6 @@ namespace objectpositioning const bool bCheckBottom = true ) const; SwTwips _ImplAdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm, const SwTwips _nProposedRelPosX ) const; - // <-- protected: SwAnchoredObjectPosition( SdrObject& _rDrawObj ); @@ -124,27 +119,24 @@ namespace objectpositioning { return *mpFrmFmt; } - // --> OD 2006-03-15 #i62875# + // #i62875# inline bool DoesObjFollowsTextFlow() const { return mbFollowTextFlow; } - // <-- // virtual methods providing data for to character anchored objects. virtual bool IsAnchoredToChar() const; virtual const SwFrm* ToCharOrientFrm() const; virtual const SwRect* ToCharRect() const; - // OD 12.11.2003 #i22341# + // #i22341# virtual SwTwips ToCharTopOfLine() const; // ********************************************************************* /** helper method to determine top of a frame for the vertical object positioning - OD 2004-03-11 #i11860# - - @author OD + #i11860# */ SwTwips _GetTopForObjPos( const SwFrm& _rFrm, const SwRectFn& _fnRect, @@ -158,7 +150,7 @@ namespace objectpositioning SwTwips& _orAlignAreaOffset ) const; // ********************************************************************* - // --> OD 2004-06-17 #i26791# - add output parameter <_roVertOffsetToFrmAnchorPos> + // #i26791# - add output parameter <_roVertOffsetToFrmAnchorPos> SwTwips _GetVertRelPos( const SwFrm& _rVertOrientFrm, const SwFrm& _rPageAlignLayFrm, const sal_Int16 _eVertOrient, @@ -172,9 +164,9 @@ namespace objectpositioning /** adjust calculated vertical in order to keep object inside 'page' alignment layout frame. - OD 2004-07-22 #i31805# - add parameter <bCheckBottom> - OD 2004-10-08 #i26945# - add parameter <bFollowTextFlow> - OD 2006-03-15 #i62875# - made inline, intrinsic actions moved + #i31805# - add parameter <_bCheckBottom> + #i26945# - add parameter <_bFollowTextFlow> + #i62875# - made inline, intrinsic actions moved to private method <_ImplAdjustVertRelPos>, which is only called, if <mbDoNotCaptureAnchoredObj> not set. OD 2009-09-01 #mongolianlayout# - add parameter <bVertL2R> @@ -207,8 +199,6 @@ namespace objectpositioning input parameter - boolean indicating, if bottom of anchored object has to be checked and thus, (if needed) the proposed relative position has to be adjusted. default value <true> - - @author OD */ inline SwTwips _AdjustVertRelPos( const SwTwips nTopOfAnch, const bool bVert, @@ -230,11 +220,9 @@ namespace objectpositioning // ********************************************************************* /** calculate relative horizontal position - --> OD 2004-06-17 #i26791# - add output parameter + #i26791# - add output parameter <_roHoriOffsetToFrmAnchorPos> - @author OD - @param _rHoriOrientFrm input parameter - frame the horizontal position of the object is oriented at. @@ -280,12 +268,10 @@ namespace objectpositioning /** adjust calculated horizontal in order to keep object inside 'page' alignment layout frame for object type position TO_CNTNT - OD 2006-03-15 #i62875# - made inline, intrinsic actions moved + #i62875# - made inline, intrinsic actions moved to private method <_ImplAdjustHoriRelPos>, which is only called, if <mbDoNotCaptureAnchoredObj> not set. - @author OD - @param _rPageAlignLayFrm input paramter - layout frame, which determines the 'page area' the object has to be horizontal positioned in. @@ -307,8 +293,6 @@ namespace objectpositioning // ********************************************************************* /** toggle given horizontal orientation and relative alignment - @author OD - @param _bToggleLeftRight input parameter - boolean indicating, if horizontal orientation and relative alignment has to be toggled. @@ -329,8 +313,6 @@ namespace objectpositioning // ********************************************************************* /** determine alignment values for horizontal position of object - @author OD - @param _rHoriOrientFrm input parameter - frame the horizontal position of the object is oriented at. @@ -378,8 +360,6 @@ namespace objectpositioning /** adjust calculated horizontal position in order to draw object aside other objects with same positioning - @author OD - @param _rHoriOrientFrm input parameter - frame the horizontal position of the object is oriented at. @@ -423,8 +403,6 @@ namespace objectpositioning method used by <_AdjustHoriRelPosForDrawAside(..)> - @author OD - @param _pFly input parameter - fly frame the draw aside check is done for. @@ -468,8 +446,6 @@ namespace objectpositioning positioning. method used by <_DrawAsideFly(..)> - @author OD - @param _eRelOrient1 input parameter - alignment 1 @@ -494,3 +470,5 @@ namespace objectpositioning } // namespace objectpositioning #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index 2f5e2d1bb164..f83cdf6259c7 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -169,3 +170,5 @@ namespace objectpositioning } // namespace objectpositioning #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx index 11f11d6d188a..1a4b0a9252c0 100644 --- a/sw/source/core/inc/blink.hxx +++ b/sw/source/core/inc/blink.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ extern SwBlink *pBlink; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx index 1ab39ff1578c..42b77f36cec8 100644 --- a/sw/source/core/inc/bodyfrm.hxx +++ b/sw/source/core/inc/bodyfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,7 +44,11 @@ protected: public: SwBodyFrm( SwFrmFmt*, SwFrm* ); + virtual void Paint( const SwRect&, const SwPrintData *pPrintData = NULL ) const; + DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm) }; #endif //_BODYFRM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index 9b8a0d7c3876..06933e804888 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,6 +36,7 @@ #include <boost/scoped_ptr.hpp> #include <boost/noncopyable.hpp> #include <map> +#include <rtl/ustring.hxx> #include <IMark.hxx> @@ -74,7 +76,7 @@ namespace sw { namespace mark virtual SwPosition& GetMarkEnd() const { if( !IsExpanded() ) return GetMarkPos(); - if ( GetMarkPos( ) > GetOtherMarkPos( ) ) + if ( GetMarkPos( ) >= GetOtherMarkPos( ) ) return GetMarkPos( ); else return GetOtherMarkPos( ); @@ -254,7 +256,11 @@ namespace sw { namespace mark virtual void InitDoc(SwDoc* const io_pDoc); bool IsChecked() const; void SetChecked(bool checked); + + virtual rtl::OUString toString( ) const; }; }} #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx index 7554271a63c3..66a2f6d36662 100644 --- a/sw/source/core/inc/cellfrm.hxx +++ b/sw/source/core/inc/cellfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index 46bd79377bbb..5f7c69f71cf4 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,5 @@ inline SwCntntFrm *SwCntntFrm::GetFollow() } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx index 90bb547c3333..0485cdf064d7 100644 --- a/sw/source/core/inc/colfrm.hxx +++ b/sw/source/core/inc/colfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ public: }; #endif //_COLFRM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx index 27f920be7651..ef5f8933a81a 100644 --- a/sw/source/core/inc/crossrefbookmark.hxx +++ b/sw/source/core/inc/crossrefbookmark.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ namespace sw { namespace mark }} #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx index 3885d9d7dda5..d290e9c8c178 100644 --- a/sw/source/core/inc/dbg_lay.hxx +++ b/sw/source/core/inc/dbg_lay.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,7 +64,7 @@ #define SNAP_FLYFRAMES 0x00000002 #define SNAP_TABLECONT 0x00000004 -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 #include "swtypes.hxx" @@ -118,3 +119,5 @@ public: #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 23216709a50a..9e3cf0dff55e 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,7 +128,7 @@ public: void SetRect() const; // ist eine URL an einer Grafik gesetzt, dann ist das ein Makro-Object - virtual FASTBOOL HasMacro() const; + virtual bool HasMacro() const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; @@ -138,3 +139,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index dbce10e51db0..26d19dc4d859 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -191,3 +192,4 @@ public: #endif // _DOCFLD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 5d87e37e9219..aa2d096f3cb8 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -24,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #ifndef _SORT_HXX #define _SORT_HXX @@ -174,3 +176,5 @@ private: inline sal_Bool FlatFndBox::HasItemSets() const { return 0 != ppItemSets; } #endif // _NDSORT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx index 5e3adfb1fd3d..842b6a319726 100644 --- a/sw/source/core/inc/doctxm.hxx +++ b/sw/source/core/inc/doctxm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,9 +110,7 @@ public: sal_Bool SetPosAtStartEnd( SwPosition& rPos, sal_Bool bAtStart = sal_True ) const; }; -/* -----------------02.09.99 07:52------------------- - --------------------------------------------------*/ struct SwDefTOXBase_Impl { SwTOXBase* pContBase; @@ -145,3 +144,5 @@ struct SwDefTOXBase_Impl }; #endif // _DOCTXM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/drawdev.hxx b/sw/source/core/inc/drawdev.hxx index 7b851403355b..31d630a741e4 100644 --- a/sw/source/core/inc/drawdev.hxx +++ b/sw/source/core/inc/drawdev.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include "swrect.hxx" -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif /************************************************************************* * class SwDrawDev @@ -138,3 +137,5 @@ inline void SwDrawDev::DrawRect( const SwRect& rRect, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index ba16257d3189..aad3c9f00787 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,6 @@ #include <tools/solar.h> #include <tools/string.hxx> -#include <errhdl.hxx> class SwTxtFrm; class OutputDevice; @@ -94,7 +94,7 @@ class SwDrawTextInfo SwDrawTextInfo(); // nicht zulaessig public: -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 sal_Bool bPos : 1; // These flags should control, that the appropriate sal_Bool bWrong : 1; // Set-function has been called before calling sal_Bool bGrammarCheck : 1; // the Get-function of a member @@ -157,7 +157,7 @@ public: bUpper = sal_False; bDrawSpace = sal_False; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 // these flags control, whether the matching member variables have // been set by using the Set-function before they may be accessed // by their Get-function: @@ -198,13 +198,17 @@ public: const Point &GetPos() const { - ASSERT( bPos, "DrawTextInfo: Undefined Position" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bPos, "DrawTextInfo: Undefined Position" ); +#endif return *pPos; } xub_StrLen *GetHyphPos() const { - ASSERT( bHyph, "DrawTextInfo: Undefined Hyph Position" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bHyph, "DrawTextInfo: Undefined Hyph Position" ); +#endif return pHyphPos; } @@ -215,13 +219,17 @@ public: const SwWrongList* GetWrong() const { - ASSERT( bWrong, "DrawTextInfo: Undefined WrongList" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bWrong, "DrawTextInfo: Undefined WrongList" ); +#endif return pWrong; } const SwWrongList* GetGrammarCheck() const { - ASSERT( bGrammarCheck, "DrawTextInfo: Undefined GrammarCheck List" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bGrammarCheck, "DrawTextInfo: Undefined GrammarCheck List" ); +#endif return pGrammarCheck; } @@ -232,13 +240,17 @@ public: const Size &GetSize() const { - ASSERT( bSize, "DrawTextInfo: Undefined Size" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bSize, "DrawTextInfo: Undefined Size" ); +#endif return *pSize; } SwFont* GetFont() const { - ASSERT( bFnt, "DrawTextInfo: Undefined Font" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bFnt, "DrawTextInfo: Undefined Font" ); +#endif return pFnt; } @@ -259,7 +271,9 @@ public: xub_StrLen GetOfst() const { - ASSERT( bOfst, "DrawTextInfo: Undefined Offset" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bOfst, "DrawTextInfo: Undefined Offset" ); +#endif return nOfst; } @@ -270,19 +284,25 @@ public: long GetLeft() const { - ASSERT( bLeft, "DrawTextInfo: Undefined left range" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bLeft, "DrawTextInfo: Undefined left range" ); +#endif return nLeft; } long GetRight() const { - ASSERT( bRight, "DrawTextInfo: Undefined right range" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bRight, "DrawTextInfo: Undefined right range" ); +#endif return nRight; } long GetKanaDiff() const { - ASSERT( bKana, "DrawTextInfo: Undefined kana difference" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bKana, "DrawTextInfo: Undefined kana difference" ); +#endif return nKanaDiff; } @@ -293,7 +313,9 @@ public: sal_uInt16 GetAscent() const { - ASSERT( bAscent, "DrawTextInfo: Undefined Ascent" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bAscent, "DrawTextInfo: Undefined Ascent" ); +#endif return nAscent; } @@ -304,7 +326,9 @@ public: long GetSperren() const { - ASSERT( bSperr, "DrawTextInfo: Undefined >Sperren<" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bSperr, "DrawTextInfo: Undefined >Sperren<" ); +#endif return nSperren; } @@ -315,13 +339,17 @@ public: long GetSpace() const { - ASSERT( bSpace, "DrawTextInfo: Undefined Spacing" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bSpace, "DrawTextInfo: Undefined Spacing" ); +#endif return nSpace; } xub_StrLen GetNumberOfBlanks() const { - ASSERT( bNumberOfBlanks, "DrawTextInfo::Undefined NumberOfBlanks" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bNumberOfBlanks, "DrawTextInfo::Undefined NumberOfBlanks" ); +#endif return nNumberOfBlanks; } @@ -337,13 +365,17 @@ public: sal_Bool GetUpper() const { - ASSERT( bUppr, "DrawTextInfo: Undefined Upperflag" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bUppr, "DrawTextInfo: Undefined Upperflag" ); +#endif return bUpper; } sal_Bool GetDrawSpace() const { - ASSERT( bDrawSp, "DrawTextInfo: Undefined DrawSpaceflag" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( bDrawSp, "DrawTextInfo: Undefined DrawSpaceflag" ); +#endif return bDrawSpace; } @@ -380,7 +412,7 @@ public: void SetPos( const Point &rNew ) { pPos = &rNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bPos = sal_True; #endif } @@ -388,7 +420,7 @@ public: void SetHyphPos( xub_StrLen *pNew ) { pHyphPos = pNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bHyph = sal_True; #endif } @@ -401,7 +433,7 @@ public: void SetWrong( const SwWrongList* pNew ) { pWrong = pNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bWrong = sal_True; #endif } @@ -409,7 +441,7 @@ public: void SetGrammarCheck( const SwWrongList* pNew ) { pGrammarCheck = pNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bGrammarCheck = sal_True; #endif } @@ -422,7 +454,7 @@ public: void SetSize( const Size &rNew ) { pSize = &rNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bSize = sal_True; #endif } @@ -430,7 +462,7 @@ public: void SetFont( SwFont* pNew ) { pFnt = pNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bFnt = sal_True; #endif } @@ -448,7 +480,7 @@ public: void SetOfst( xub_StrLen nNew ) { nOfst = nNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bOfst = sal_True; #endif } @@ -456,7 +488,7 @@ public: void SetLeft( long nNew ) { nLeft = nNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bLeft = sal_True; #endif } @@ -464,7 +496,7 @@ public: void SetRight( long nNew ) { nRight = nNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bRight = sal_True; #endif } @@ -472,7 +504,7 @@ public: void SetKanaDiff( long nNew ) { nKanaDiff = nNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bKana = sal_True; #endif } @@ -485,7 +517,7 @@ public: void SetAscent( sal_uInt16 nNew ) { nAscent = nNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bAscent = sal_True; #endif } @@ -507,7 +539,7 @@ public: nSpace = nNew; nSperren = 0; } -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bSpace = sal_True; bSperr = sal_True; #endif @@ -515,7 +547,7 @@ public: void SetNumberOfBlanks( xub_StrLen nNew ) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bNumberOfBlanks = sal_True; #endif nNumberOfBlanks = nNew; @@ -544,7 +576,7 @@ public: void SetUpper( sal_Bool bNew ) { bUpper = bNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bUppr = sal_True; #endif } @@ -552,7 +584,7 @@ public: void SetDrawSpace( sal_Bool bNew ) { bDrawSpace = bNew; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 bDrawSp = sal_True; #endif } @@ -592,3 +624,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index 60021d8fef84..b51f555ea384 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -132,3 +133,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx index 00a1d509ece4..0700256555f2 100644 --- a/sw/source/core/inc/environmentofanchoredobject.hxx +++ b/sw/source/core/inc/environmentofanchoredobject.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,10 +41,6 @@ namespace objectpositioning public: /** construtor - OD 05.11.2003 - - @author OD - @param _bFollowTextFlow input parameter - indicates, if the anchored object, for which this environment is instantiated, follow the text flow or not @@ -51,17 +48,12 @@ namespace objectpositioning SwEnvironmentOfAnchoredObject( const bool _bFollowTextFlow ); /** destructor - - OD 05.11.2003 - - @author OD */ ~SwEnvironmentOfAnchoredObject(); /** determine environment layout frame for possible horizontal object positions respectively for alignment to 'page areas' - OD 05.11.2003 this is, if object has to follow the text flow: - cell frame, if anchored inside a cell - fly frame, if anchored inside a fly frame @@ -69,11 +61,9 @@ namespace objectpositioning this is, if object hasn't to follow the text flow: - page frame. - OD 2005-01-20 #118546# - no exception any more. Thus remove + - no exception any more. Thus remove parameter <_bForPageAlignment> - @author OD - @param _rHoriOrientFrm input parameter - frame, at which the horizontal position is oriented at (typically it's the anchor frame). @@ -87,7 +77,6 @@ namespace objectpositioning /** determine environment layout frame for possible vertical object positions respectively for alignments to 'page areas' - OD 05.11.2003 this is, if object has to follow the text flow: - cell frame, if anchored inside a cell - fly frame, if anchored inside a fly frame @@ -97,11 +86,9 @@ namespace objectpositioning this is, if object hasn't to follow the text flow: - page frame. - OD 2005-01-20 #118546# - no exception any more. Thus remove + - no exception any more. Thus remove parameter <_bForPageAlignment> - @author OD - @param _rVertOrientFrm input parameter - frame, at which the vertical position is oriented at (typically it's the anchor frame). @@ -115,3 +102,5 @@ namespace objectpositioning } // namespace objectpositioning #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx index 4d60514506c8..19e902c53a37 100644 --- a/sw/source/core/inc/finalthreadmanager.hxx +++ b/sw/source/core/inc/finalthreadmanager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ private: bool mbRegisteredAtDesktop; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx index d1290c66e989..1403718101d8 100644 --- a/sw/source/core/inc/flowfrm.hxx +++ b/sw/source/core/inc/flowfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,16 +48,13 @@ //diesem befreundet. So kann der FlowFrm anstelle des this-Pointer mit der //Referenz auf den SwFrm arbeiten. -//#include "frame.hxx" //fuer inlines - class SwPageFrm; class SwRect; class SwBorderAttrs; class SwDoc; class SwNodeIndex; -// --> OD 2005-03-04 #i44049# +// #i44049# class SwObjectFormatterTxtFrm; -// <-- void MakeFrms( SwDoc *, const SwNodeIndex &, const SwNodeIndex & ); @@ -67,9 +65,8 @@ class SwFlowFrm friend inline void PrepareUnlock( SwFlowFrm * ); friend inline void TableSplitRecalcLock( SwFlowFrm * ); friend inline void TableSplitRecalcUnlock( SwFlowFrm * ); - // --> OD 2005-03-04 #i44049# + // #i44049# friend class SwObjectFormatterTxtFrm; - // <-- //TblSel darf das Follow-Bit zuruecksetzen. friend inline void UnsetFollow( SwFlowFrm *pFlow ); @@ -92,31 +89,25 @@ class SwFlowFrm /** helper method to determine previous frame for calculation of the upper space - OD 2004-03-10 #i11860# + #i11860# @param _pProposedPrevFrm optional input parameter - pointer to frame, which should be used instead of the direct previous frame. - - @author OD */ const SwFrm* _GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPrevFrm = 0L ) const; /** method to detemine the upper space amount, which is considered for the previous frame - OD 2004-03-11 #i11860# - - @author OD + #i11860# */ SwTwips _GetUpperSpaceAmountConsideredForPrevFrm() const; /** method to detemine the upper space amount, which is considered for the page grid - OD 2004-03-12 #i11860# - - @author OD + #i11860# */ SwTwips _GetUpperSpaceAmountConsideredForPageGrid( const SwTwips _nUpperSpaceWithoutGrid ) const; @@ -137,9 +128,8 @@ protected: //Prueft ob Vorwaertsfluss noch Sinn macht Endloswanderschaften (unterbinden) inline sal_Bool IsFwdMoveAllowed(); - // --> OD 2005-03-08 #i44049# - method <CalcCntnt(..)> has to check this property. + // #i44049# - method <CalcCntnt(..)> has to check this property. friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow ); - // <-- sal_Bool IsKeepFwdMoveAllowed(); //Wie oben, Move fuer Keep. //Prueft ob ein Obj das Umlauf wuenscht ueberlappt. @@ -202,11 +192,9 @@ public: /** method to determine the upper space hold by the frame - OD 2004-03-12 #i11860# - add 3rd parameter <_bConsiderGrid> to get + #i11860# - add 3rd parameter <_bConsiderGrid> to get the upper space with and without considering the page grid (default value: <sal_True>) - - @author ? */ SwTwips CalcUpperSpace( const SwBorderAttrs *pAttrs = NULL, const SwFrm* pPr = NULL, @@ -216,26 +204,18 @@ public: the previous frame and the page grid, if option 'Use former object positioning' is OFF - OD 2004-03-18 #i11860# - - @author OD + #i11860# */ SwTwips GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() const; /** calculation of lower space - - OD 2004-03-02 #106629# - - @author OD */ SwTwips CalcLowerSpace( const SwBorderAttrs* _pAttrs = 0L ) const; /** calculation of the additional space to be considered, if flow frame is the last inside a table cell - OD 2004-07-16 #i26250 - - @author OD + #i26250 @param _pAttrs optional input parameter - border attributes of the flow frame. @@ -271,3 +251,5 @@ inline sal_Bool SwFlowFrm::IsFwdMoveAllowed() #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index ef2744aea127..61726d03ad92 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,7 +57,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, sal_Bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, sal_Bool bMove = sal_True ); //allg. Basisklasse fuer alle Freifliegenden Rahmen -// OD 2004-03-22 #i26791# - inherit also from <SwAnchoredFlyFrm> +// #i26791# - inherit also from <SwAnchoredFlyFrm> class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject { //darf Locken. Definiert in frmtool.cxx @@ -80,7 +81,7 @@ protected: SwFlyFrm *pPrevLink, // Vorgaenger/Nachfolger fuer Verkettung mit *pNextLink; // Textfluss - // OD 2004-05-27 #i26791# - moved to <SwAnchoredObject> + // #i26791# - moved to <SwAnchoredObject> // Point aRelPos; //Die Relative Position zum Master private: @@ -121,8 +122,6 @@ protected: // invisible layer. friend class SwNoTxtFrm; // Darf NotifyBackground rufen -// virtual void NotifyBackground( SwPageFrm *pPage, -// const SwRect& rRect, PrepareHint eHint) = 0; virtual void Format( const SwBorderAttrs *pAttrs = 0 ); void MakePrtArea( const SwBorderAttrs &rAttrs ); @@ -141,9 +140,7 @@ protected: /** method to assure that anchored object is registered at the correct page frame - OD 2004-07-02 #i28701# - - @author OD + #i28701# */ virtual void RegisterAtCorrectPage(); @@ -154,7 +151,7 @@ protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); public: - // OD 2004-03-23 #i26791# + // #i26791# TYPEINFO(); virtual ~SwFlyFrm(); @@ -168,7 +165,7 @@ public: virtual void CheckDirection( sal_Bool bVert ); virtual void Cut(); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); #endif @@ -186,7 +183,7 @@ public: SwFlyFrm *FindChainNeighbour( SwFrmFmt &rFmt, SwFrm *pAnch = 0 ); - // OD 2004-03-24 #i26791# + // #i26791# const SwVirtFlyDrawObj* GetVirtDrawObj() const; SwVirtFlyDrawObj *GetVirtDrawObj(); void NotifyDrawObj(); @@ -225,7 +222,7 @@ public: SwFrm *FindLastLower(); - // OD 16.04.2003 #i13147# - add parameter <_bForPaint> to avoid load of + // #i13147# - add parameter <_bForPaint> to avoid load of // the graphic during paint. Default value: sal_False sal_Bool GetContour( PolyPolygon& rContour, const sal_Bool _bForPaint = sal_False ) const; @@ -234,40 +231,32 @@ public: //Auf dieser Shell painten (PreView, Print-Flag usw. rekursiv beachten)?. static sal_Bool IsPaint( SdrObject *pObj, const ViewShell *pSh ); - /** SwFlyFrm::IsBackgroundTransparent - for feature #99657# + /** SwFlyFrm::IsBackgroundTransparent - OD 12.08.2002 determines, if background of fly frame has to be drawn transparent definition found in /core/layout/paintfrm.cxx - @author OD - @return true, if background color is transparent or a existing background graphic is transparent. */ sal_Bool IsBackgroundTransparent() const; - /** SwFlyFrm::IsShadowTransparent - for feature #99657# + /** SwFlyFrm::IsShadowTransparent - OD 05.08.2002 determine, if shadow color of fly frame has to be drawn transparent definition found in /core/layout/paintfrm.cxx - @author OD - @return true, if shadow color is transparent. */ sal_Bool IsShadowTransparent() const; - // OD 2004-01-19 #110582# void Chain( SwFrm* _pAnchor ); void Unchain(); void InsertCnt(); void DeleteCnt(); - // OD 2004-02-12 #110582#-2 void InsertColumns(); - // OD 2004-03-23 #i26791# - pure virtual methods of base class <SwAnchoredObject> + // #i26791# - pure virtual methods of base class <SwAnchoredObject> virtual void MakeObjPos(); virtual void InvalidateObjPos(); @@ -278,12 +267,10 @@ public: /** method to determine, if a format on the Writer fly frame is possible - OD 2004-05-11 #i28701# + #i28701# refine 'IsFormatPossible'-conditions of method <SwAnchoredObject::IsFormatPossible()> by: format isn't possible, if Writer fly frame is locked resp. col-locked. - - @author OD */ virtual bool IsFormatPossible() const; static void GetAnchoredObjects( std::list<SwAnchoredObject*>&, const SwFmt& rFmt ); @@ -295,3 +282,5 @@ public: virtual SwFlyFrmFmt *GetFmt(); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx index a0a2d9dd1619..8b89e869f21f 100644 --- a/sw/source/core/inc/flyfrms.hxx +++ b/sw/source/core/inc/flyfrms.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,7 +28,7 @@ #ifndef _FLYFRMS_HXX #define _FLYFRMS_HXX #include "flyfrm.hxx" -// --> OD 2004-06-23 #i28701# +// --> #i28701# class SwFlyAtCntFrm; //Basisklasse fuer diejenigen Flys, die sich relativ frei Bewegen koennen - @@ -36,12 +37,12 @@ class SwFlyFreeFrm : public SwFlyFrm { SwPageFrm *pPage; //Bei dieser Seite ist der Fly angemeldet. - // --> OD 2004-11-15 #i34753# - flag for at-page anchored Writer fly frames + // --> #i34753# - flag for at-page anchored Writer fly frames // to prevent a positioning - call of method <MakeObjPos()> -, if Writer // fly frame is already clipped during its format by the object formatter. bool mbNoMakePos; // <-- - // --> OD 2004-11-12 #i37068# - flag to prevent move in method + // --> #i37068# - flag to prevent move in method // <CheckClip(..)> bool mbNoMoveOnCheckClip; // <-- @@ -49,7 +50,7 @@ class SwFlyFreeFrm : public SwFlyFrm /** determines, if direct environment of fly frame has 'auto' size - OD 07.08.2003 #i17297#, #111066#, #111070# + #i17297# start with anchor frame and search for a header, footer, row or fly frame stopping at page frame. return <true>, if such a frame is found and it has 'auto' size. @@ -62,7 +63,7 @@ class SwFlyFreeFrm : public SwFlyFrm bool HasEnvironmentAutoSize() const; protected: - // OD 2004-05-12 #i28701# - new friend class <SwFlyNotify> for access to + // #i28701# - new friend class <SwFlyNotify> for access to // method <NotifyBackground> friend class SwFlyNotify; virtual void NotifyBackground( SwPageFrm *pPage, @@ -71,14 +72,14 @@ protected: SwFlyFreeFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); public: - // --> OD 2004-06-29 #i28701# + // --> #i28701# TYPEINFO(); virtual ~SwFlyFreeFrm(); virtual void MakeAll(); - // --> OD 2004-11-12 #i37068# - accessors for member <mbNoMoveOnCheckClip> + // --> #i37068# - accessors for member <mbNoMoveOnCheckClip> inline void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip ) { mbNoMoveOnCheckClip = _bNewNoMoveOnCheckClip; @@ -88,7 +89,7 @@ public: return mbNoMoveOnCheckClip; } // <-- - // --> OD 2004-11-15 #i34753# - accessors for member <mbNoMakePos> + // --> #i34753# - accessors for member <mbNoMakePos> inline void SetNoMakePos( const bool _bNoMakePos ) { if ( IsFlyLayFrm() ) @@ -111,7 +112,7 @@ public: /** method to determine, if a format on the Writer fly frame is possible - OD 2004-05-11 #i28701# + #i28701# refine 'IsFormatPossible'-conditions of method <SwFlyFrm::IsFormatPossible()> by: format isn't possible, if Writer fly frame isn't registered at a page frame @@ -127,7 +128,7 @@ public: class SwFlyLayFrm : public SwFlyFreeFrm { public: - // --> OD 2004-06-29 #i28701# + // --> #i28701# TYPEINFO(); SwFlyLayFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); @@ -142,13 +143,13 @@ class SwFlyAtCntFrm : public SwFlyFreeFrm protected: virtual void MakeAll(); - // OD 2004-05-12 #i28701# + // #i28701# virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const; /** method to assure that anchored object is registered at the correct page frame - OD 2004-07-02 #i28701# + #i28701# @author OD */ @@ -156,19 +157,19 @@ protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); public: - // --> OD 2004-06-29 #i28701# + // --> #i28701# TYPEINFO(); SwFlyAtCntFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); void SetAbsPos( const Point &rNew ); - // OD 2004-03-23 #i26791# + // #i26791# virtual void MakeObjPos(); /** method to determine, if a format on the Writer fly frame is possible - OD 2004-05-11 #i28701# + #i28701# refine 'IsFormatPossible'-conditions of method <SwFlyFreeFrm::IsFormatPossible()> by: format isn't possible, if method <MakeAll()> is already in progress. @@ -194,7 +195,7 @@ protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); public: - // --> OD 2004-06-29 #i28701# + // --> #i28701# TYPEINFO(); SwFlyInCntFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); @@ -227,10 +228,10 @@ public: //siehe layact.cxx void AddRefOfst( long nOfst ) { aRef.Y() += nOfst; } - // OD 2004-03-23 #i26791# + // #i26791# virtual void MakeObjPos(); - // --> OD 2004-12-02 #115759# - invalidate anchor frame on invalidation + // --> #115759# - invalidate anchor frame on invalidation // of the position, because the position is calculated during the // format of the anchor frame virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ); @@ -255,3 +256,5 @@ inline void SwFlyInCntFrm::ValidateCntnt() const } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index c95fc3f0a8bc..39a739ab41e2 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,7 +52,7 @@ class SwFntCache : public SwCache public: inline SwFntCache() : SwCache(50,50 -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 , ByteString( RTL_CONSTASCII_STRINGPARAM( "Globaler Font-Cache pFntCache" )) #endif @@ -158,3 +159,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index f7967a94b447..56bdd8d9e230 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,12 +28,20 @@ #ifndef SW_FRAME_HXX #define SW_FRAME_HXX +#include <vector> +#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <svl/svarray.hxx> +#include <editeng/borderline.hxx> #include "swtypes.hxx" // fuer SwTwips #include "swrect.hxx" #include "calbck.hxx" // fuer SwClient #include <svl/brdcst.hxx> +#if OSL_DEBUG_LEVEL > 1 +#include <libxml/encoding.h> +#include <libxml/xmlwriter.h> +#endif + class SwLayoutFrm; class SwRootFrm; class SwPageFrm; @@ -254,7 +263,6 @@ extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R; ( (aFrm1.*fnRect->fnGetTop)() != (aFrm2.*fnRect->fnGetTop)() || \ (aFrm1.*fnRect->fnGetLeft)() != (aFrm2.*fnRect->fnGetLeft)() ) - //Fuer GetNextLeaf/GetPrevLeaf. enum MakePageType { @@ -450,7 +458,6 @@ protected: //Adjustierung der Frames einer Seite SwTwips AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst = sal_False ); - //Aendern nur die Framesize, nicht die PrtArea-SSize virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) = 0; virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) = 0; @@ -560,7 +567,9 @@ public: const sal_Bool bLowerMode = sal_False, const sal_Bool bLowerBorder = sal_False ) const; void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*, - const Color *pColor ) const; + const Color *pColor, const SvxBorderStyle = SOLID ) const; + + void ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSequence& rSequence ) const; //Retouche, nicht im Bereich des uebergebenen Rect! void Retouche( const SwPageFrm *pPage, const SwRect &rRect ) const; @@ -664,6 +673,7 @@ public: SwRootFrm *getRootFrm(){ return mpRoot; } SwPageFrm *FindPageFrm(); SwFrm *FindColFrm(); + SwRowFrm *FindRowFrm(); SwFtnBossFrm *FindFtnBossFrm( sal_Bool bFootnotes = sal_False ); SwTabFrm *ImplFindTabFrm(); SwFtnFrm *ImplFindFtnFrm(); @@ -742,7 +752,6 @@ public: sal_Bool OnRightPage() const { return 0 != GetPhyPageNum() % 2; }; sal_Bool WannaRightPage() const; - inline const SwLayoutFrm *GetPrevLayoutLeaf() const; inline const SwLayoutFrm *GetNextLayoutLeaf() const; inline SwLayoutFrm *GetPrevLayoutLeaf(); @@ -953,6 +962,14 @@ public: bool KnowsFormat( const SwFmt& rFmt ) const; void RegisterToFormat( SwFmt& rFmt ); void ValidateThisAndAllLowers( const sal_uInt16 nStage ); + +public: +#if OSL_DEBUG_LEVEL > 1 + virtual void dumpAsXml(xmlTextWriterPtr writer); + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer); + void dumpChildrenAsXml(xmlTextWriterPtr writer); +#endif + bool IsCollapse() const; }; inline sal_Bool SwFrm::IsInDocBody() const @@ -1300,3 +1317,5 @@ inline sal_Bool SwFrm::IsAccessibleFrm() const return GetType() & FRM_ACCESSIBLE ? sal_True : sal_False; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx index 347592a8c5f4..f05658c8ced7 100644 --- a/sw/source/core/inc/frminf.hxx +++ b/sw/source/core/inc/frminf.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index c264e8439092..0cc9898089b6 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,8 @@ #include "layfrm.hxx" #include "frmatr.hxx" #include "swcache.hxx" -// --> OD 2008-12-04 #i96772# +// #i96772# #include <editeng/lrspitem.hxx> -// <-- class SwPageFrm; class SwFlyFrm; @@ -58,24 +58,23 @@ struct SwFindRowSpanCacheObj; #define WEIT_WECH LONG_MAX - 20000 //Initale Position der Flys. #define BROWSE_HEIGHT 56700L * 10L //10 Meter -//#define BROWSE_HEIGHT 1440L * 45L // 45 inch, maximum size for pdf files #define GRFNUM_NO 0 #define GRFNUM_YES 1 #define GRFNUM_REPLACE 2 //Painten des Hintergrunds. Mit Brush oder Graphic. -// OD 05.08.2002 #99657# - add 6th parameter to indicate that method should +// - add 6th parameter to indicate that method should // consider background transparency, saved in the color of the brush item void MA_FASTCALL DrawGraphic( const SvxBrushItem *, OutputDevice *, const SwRect &rOrg, const SwRect &rOut, const sal_uInt8 nGrfNum = GRFNUM_NO, const sal_Bool bConsiderBackgroundTransparency = sal_False ); -// OD 24.01.2003 #106593# - method to align rectangle +// - method to align rectangle // Created declaration here to avoid <extern> declarations void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); -// OD 24.01.2003 #106593# - method to align graphic rectangle +// - method to align graphic rectangle // Created declaration here to avoid <extern> declarations void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut ); @@ -137,7 +136,7 @@ sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm ); const SwFrm * MA_FASTCALL FindPage( const SwRect &rRect, const SwFrm *pPage ); -// JP 07.05.98: wird von SwCntntNode::GetFrm und von SwFlyFrm::GetFrm +// wird von SwCntntNode::GetFrm und von SwFlyFrm::GetFrm // gerufen SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const&, sal_uInt16 const nFrmType, const Point* = 0, const SwPosition *pPos = 0, @@ -146,7 +145,7 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const&, sal_uInt16 con //Sollen ExtraDaten (Reline-Strich, Zeilennummern) gepaintet werden? sal_Bool IsExtraData( const SwDoc *pDoc ); -// OD 14.03.2003 #i11760# - method declaration <CalcCntnt(..)> +// #i11760# - method declaration <CalcCntnt(..)> void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl = false, bool bNoCalcFollow = false ); @@ -167,9 +166,8 @@ protected: sal_Bool bInvaKeep; sal_Bool bValidSize; protected: - // --> OD 2005-07-29 #i49383# + // #i49383# bool mbFrmDeleted; - // <-- public: SwFrmNotify( SwFrm *pFrm ); @@ -178,12 +176,11 @@ public: const SwRect &Frm() const { return aFrm; } const SwRect &Prt() const { return aPrt; } void SetInvaKeep() { bInvaKeep = sal_True; } - // --> OD 2005-07-29 #i49383# + // #i49383# void FrmDeleted() { mbFrmDeleted = true; } - // <-- }; class SwLayNotify : public SwFrmNotify @@ -214,11 +211,11 @@ public: class SwCntntNotify : public SwFrmNotify { private: - // OD 08.01.2004 #i11859# + // #i11859# bool mbChkHeightOfLastLine; SwTwips mnHeightOfLastLine; - // OD 2004-02-26 #i25029# + // #i25029# bool mbInvalidatePrevPrtArea; bool mbBordersJoinedWithPrev; @@ -228,7 +225,7 @@ public: SwCntntNotify( SwCntntFrm *pCntFrm ); ~SwCntntNotify(); - // OD 2004-02-26 #i25029# + // #i25029# void SetInvalidatePrevPrtArea() { mbInvalidatePrevPrtArea = true; @@ -247,15 +244,14 @@ public: //!!!Achtung: Wenn weitere Attribute gecached werden muss unbedingt die //Methode Modify::Modify mitgepflegt werden!!! -// OD 23.01.2003 #106895# - delete old method <SwBorderAttrs::CalcRight()> and +// - delete old method <SwBorderAttrs::CalcRight()> and // the stuff that belongs to it. class SwBorderAttrs : public SwCacheObj { const SwAttrSet &rAttrSet; const SvxULSpaceItem &rUL; - // --> OD 2008-12-04 #i96772# + // #i96772# SvxLRSpaceItem rLR; - // <-- const SvxBoxItem &rBox; const SvxShadowItem &rShadow; const Size aFrmSize; //Die FrmSize @@ -278,12 +274,12 @@ class SwBorderAttrs : public SwCacheObj sal_Bool bCacheGetLine :1; //GetTopLine(), GetBottomLine() cachen? sal_Bool bCachedGetTopLine :1; //GetTopLine() gecached? sal_Bool bCachedGetBottomLine :1; //GetBottomLine() gecached? - // OD 21.05.2003 #108789# - booleans indicating, if values <bJoinedWithPrev> + // - booleans indicating, if values <bJoinedWithPrev> // and <bJoinedWithNext> are cached and valid. // Caching depends on value of <bCacheGetLine>. mutable sal_Bool bCachedJoinedWithPrev :1; mutable sal_Bool bCachedJoinedWithNext :1; - // OD 21.05.2003 #108789# - booleans indicating, if borders are joined + // - booleans indicating, if borders are joined // with previous/next frame. sal_Bool bJoinedWithPrev :1; sal_Bool bJoinedWithNext :1; @@ -310,29 +306,29 @@ class SwBorderAttrs : public SwCacheObj void _IsLine(); - // OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm> + // #i25029# - add optional 2nd parameter <_pPrevFrm> // If set, its value is taken for testing, if borders/shadow have to joined // with previous frame. void _GetTopLine ( const SwFrm& _rFrm, const SwFrm* _pPrevFrm = 0L ); void _GetBottomLine( const SwFrm& _rFrm ); - // OD 21.05.2003 #108789# - private methods to calculate cached values + // - private methods to calculate cached values // <bJoinedWithPrev> and <bJoinedWithNext>. - // OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm> + // #i25029# - add optional 2nd parameter <_pPrevFrm> // If set, its value is taken for testing, if borders/shadow have to joined // with previous frame. void _CalcJoinedWithPrev( const SwFrm& _rFrm, const SwFrm* _pPrevFrm = 0L ); void _CalcJoinedWithNext( const SwFrm& _rFrm ); - // OD 21.05.2003 #108789# - internal helper method for methods + // - internal helper method for methods // <_CalcJoinedWithPrev> and <_CalcJoinedWithNext>. sal_Bool _JoinWithCmp( const SwFrm& _rCallerFrm, const SwFrm& _rCmpFrm ) const; //Rechte und linke Linie sowie LRSpace gleich? - // OD 21.05.2003 #108789# - change name of 1st parameter - "rAttrs" -> "rCmpAttrs". + // - change name of 1st parameter - "rAttrs" -> "rCmpAttrs". sal_Bool CmpLeftRight( const SwBorderAttrs &rCmpAttrs, const SwFrm *pCaller, const SwFrm *pCmp ) const; @@ -365,16 +361,16 @@ public: inline sal_Bool IsBorderDist() const { return bBorderDist; } //Sollen obere bzw. untere Umrandung fuer den Frm ausgewertet werden? - // OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm> + // #i25029# - add optional 2nd parameter <_pPrevFrm> // If set, its value is taken for testing, if borders/shadow have to joined // with previous frame. inline sal_uInt16 GetTopLine ( const SwFrm& _rFrm, const SwFrm* _pPrevFrm = 0L ) const; inline sal_uInt16 GetBottomLine( const SwFrm& _rFrm ) const; inline void SetGetCacheLine( sal_Bool bNew ) const; - // OD 21.05.2003 #108789# - accessors for cached values <bJoinedWithPrev> + // - accessors for cached values <bJoinedWithPrev> // and <bJoinedWithPrev> - // OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm> + // #i25029# - add optional 2nd parameter <_pPrevFrm> // If set, its value is taken for testing, if borders/shadow have to joined // with previous frame. sal_Bool JoinedWithPrev( const SwFrm& _rFrm, @@ -439,7 +435,7 @@ public: //Sollen obere bzw. untere Umrandung fuer den Frm ausgewertet werden? -// OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm> +// #i25029# - add optional 2nd parameter <_pPrevFrm> // If set, its value is taken for testing, if borders/shadow have to joined // with previous frame. inline sal_uInt16 SwBorderAttrs::GetTopLine ( const SwFrm& _rFrm, @@ -462,7 +458,7 @@ inline void SwBorderAttrs::SetGetCacheLine( sal_Bool bNew ) const ((SwBorderAttrs*)this)->bCacheGetLine = bNew; ((SwBorderAttrs*)this)->bCachedGetBottomLine = ((SwBorderAttrs*)this)->bCachedGetTopLine = sal_False; - // OD 21.05.2003 #108789# - invalidate cache for values <bJoinedWithPrev> + // - invalidate cache for values <bJoinedWithPrev> // and <bJoinedWithNext>. bCachedJoinedWithPrev = sal_False; bCachedJoinedWithNext = sal_False; @@ -513,10 +509,10 @@ inline sal_Bool SwBorderAttrs::IsLine() const /** method to determine the spacing values of a frame - OD 2004-03-10 #i28701# + #i28701# Values only provided for flow frames (table, section or text frames) Note: line spacing value is only determined for text frames - OD 2009-08-28 #i102458# + #i102458# Add output parameter <obIsLineSpacingProportional> @param rFrm @@ -529,8 +525,6 @@ inline sal_Bool SwBorderAttrs::IsLine() const output parameter - line spacing of the frame in SwTwips @param obIsLineSpacingProportional - - @author OD */ void GetSpacingValuesOfFrm( const SwFrm& rFrm, SwTwips& onLowerSpacing, @@ -581,3 +575,5 @@ class SwDeletionChecker }; #endif //_FRMTOOL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx index e993951d7143..21aab8886a39 100644 --- a/sw/source/core/inc/ftnboss.hxx +++ b/sw/source/core/inc/ftnboss.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ inline const SwFtnContFrm *SwFtnBossFrm::FindFtnCont() const } #endif //_FTNBOSS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index c70493b3a6ca..773c4eca68b7 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,7 +72,7 @@ class SwFtnFrm: public SwLayoutFrm // --> OD 2005-05-18 #i49383# - control unlock of position of lower anchored objects. bool mbUnlockPosOfLowerObjs : 1; // <-- -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 protected: virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); @@ -86,14 +87,14 @@ public: sal_Bool operator<( const SwTxtFtn* pTxtFtn ) const; -#ifndef DBG_UTIL - const SwCntntFrm *GetRef() const { return pRef; } - SwCntntFrm *GetRef() { return pRef; } -#else - //JP 15.10.2001: in a non pro version test if the attribute has the same - // meaning which his reference is +#if OSL_DEBUG_LEVEL > 1 + // in a non pro version test if the attribute has the same + // meaning which his reference is const SwCntntFrm *GetRef() const; SwCntntFrm *GetRef(); +#else + const SwCntntFrm *GetRef() const { return pRef; } + SwCntntFrm *GetRef() { return pRef; } #endif const SwCntntFrm *GetRefFromAttr() const; SwCntntFrm *GetRefFromAttr(); @@ -148,3 +149,5 @@ public: }; #endif //_FTNFRM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx index f4a098f9cb1a..39f09e9bd45a 100644 --- a/sw/source/core/inc/hffrm.hxx +++ b/sw/source/core/inc/hffrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ public: }; #endif //_HFFRM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/ifinishedthreadlistener.hxx b/sw/source/core/inc/ifinishedthreadlistener.hxx index fe096ba09251..fbf6099f8456 100644 --- a/sw/source/core/inc/ifinishedthreadlistener.hxx +++ b/sw/source/core/inc/ifinishedthreadlistener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ class IFinishedThreadListener }; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/ithreadlistenerowner.hxx b/sw/source/core/inc/ithreadlistenerowner.hxx index 26a5c1bb6fd3..8ba165774ee7 100644 --- a/sw/source/core/inc/ithreadlistenerowner.hxx +++ b/sw/source/core/inc/ithreadlistenerowner.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ class IThreadListenerOwner }; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index 749d5d424fe3..e0ff55d151e4 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -209,13 +210,13 @@ class SwLayIdle sal_Bool bPageValid; // Konnte die Seite alles validiert werden? sal_Bool bAllValid; // Konnte alles validiert werden? -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 sal_Bool bIndicator; #endif #ifdef _LAYACT_CXX -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 void ShowIdle( ColorData eName ); #endif @@ -237,3 +238,5 @@ inline void SwLayAction::SetCheckPageNum( sal_uInt16 nNew ) } #endif //_LAYACT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx index 0f14067d0bda..768a1611010b 100644 --- a/sw/source/core/inc/laycache.hxx +++ b/sw/source/core/inc/laycache.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,9 +70,11 @@ public: return pImpl; } void UnlockImpl() { --nLockCount; } -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 sal_Bool CompareLayout( const SwDoc& rDoc ) const; #endif }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index e782d19ae78f..828e45fe8b27 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,7 +67,7 @@ protected: long CalcRel( const SwFmtFrmSize &rSz, sal_Bool bWidth ) const; public: - // --> OD 2004-06-29 #i28701# + // --> #i28701# TYPEINFO(); void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; @@ -113,7 +114,6 @@ public: inline SwCntntFrm *ContainsCntnt(); const SwCellFrm *FirstCell() const; inline SwCellFrm *FirstCell(); - // --> OD 2006-02-01 #130797# // Method <ContainsAny()> doesn't investigate content of footnotes by default. // But under certain circumstances this investigation is intended. // Thus, introduce new optional parameter <_bInvestigateFtnForSections>. @@ -121,7 +121,6 @@ public: // investigated for sections. const SwFrm *ContainsAny( const bool _bInvestigateFtnForSections = false ) const; inline SwFrm *ContainsAny( const bool _bInvestigateFtnForSections = false ); - // <-- sal_Bool IsAnLower( const SwFrm * ) const; virtual const SwFrmFmt *GetFmt() const; @@ -134,8 +133,8 @@ public: sal_Bool MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, SwFtnBossFrm *pNewBoss, const sal_Bool bFtnNums ); - // --> OD 2004-07-01 #i28701# - change purpose of method and its name - // --> OD 2005-03-11 #i44016# - add parameter <_bUnlockPosOfObjs> to + // --> #i28701# - change purpose of method and its name + // --> #i44016# - add parameter <_bUnlockPosOfObjs> to // force an unlockposition call for the lower objects. void NotifyLowerObjs( const bool _bUnlockPosOfObjs = false ); // <-- @@ -156,7 +155,7 @@ public: /** method to check relative position of layout frame to a given layout frame. - OD 08.11.2002 - refactoring of pseudo-local method <lcl_Apres(..)> in + refactoring of pseudo-local method <lcl_Apres(..)> in <txtftn.cxx> for #104840#. @param _aCheckRefLayFrm @@ -184,12 +183,10 @@ inline SwCellFrm* SwLayoutFrm::FirstCell() return (SwCellFrm*)(((const SwLayoutFrm*)this)->FirstCell()); } -// --> OD 2006-02-01 #130797# inline SwFrm* SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections ) { return (SwFrm*)(((const SwLayoutFrm*)this)->ContainsAny( _bInvestigateFtnForSections )); } -// <-- // Diese SwFrm-inlines sind hier, damit frame.hxx nicht layfrm.hxx includen muss inline sal_Bool SwFrm::IsColBodyFrm() const @@ -208,3 +205,5 @@ inline SwFrm* SwLayoutFrm::GetLastLower() } #endif // SW_LAYFRM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx index db506d302642..7ffa885038dd 100644 --- a/sw/source/core/inc/layouter.hxx +++ b/sw/source/core/inc/layouter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,24 +38,24 @@ class SwPageFrm; class SwLooping; class IDocumentLayoutAccess; -// --> OD 2004-06-23 #i28701# +// --> #i28701# class SwMovedFwdFrmsByObjPos; class SwTxtFrm; // <-- -// --> OD 2004-10-05 #i26945# +// --> #i26945# class SwRowFrm; // <-- -// --> OD 2004-10-22 #i35911# +// --> #i35911# class SwObjsMarkedAsTmpConsiderWrapInfluence; class SwAnchoredObject; // <-- -// --> OD 2005-01-12 #i40155# +// --> #i40155# #include <vector> class SwFrm; // <-- -// --> OD 2006-05-10 #i65250# +// --> #i65250# #include <swtypes.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> class SwFlowFrm; class SwLayoutFrm; // <-- @@ -68,19 +69,19 @@ class SwLayouter void _CollectEndnotes( SwSectionFrm* pSect ); sal_Bool StartLooping( SwPageFrm* pPage ); - // --> OD 2004-06-23 #i28701# + // --> #i28701# SwMovedFwdFrmsByObjPos* mpMovedFwdFrms; // <-- - // --> OD 2004-10-22 #i35911# + // --> #i35911# SwObjsMarkedAsTmpConsiderWrapInfluence* mpObjsTmpConsiderWrapInfl; // <-- - // --> OD 2005-01-12 #i40155# - data structure to collect frames, which are + // --> #i40155# - data structure to collect frames, which are // marked not to wrap around objects. std::vector< const SwFrm* > maFrmsNotToWrap; // <-- public: - // --> OD 2006-05-10 #i65250# + // --> #i65250# // - data structure to collect moving backward layout information struct tMoveBwdLayoutInfoKey { @@ -117,7 +118,7 @@ private: p_key1.mnFreeSpaceInNewUpper == p_key2.mnFreeSpaceInNewUpper; } }; - std::hash_map< const tMoveBwdLayoutInfoKey, sal_uInt16, + boost::unordered_map< const tMoveBwdLayoutInfoKey, sal_uInt16, fMoveBwdLayoutInfoKeyHash, fMoveBwdLayoutInfoKeyEq > maMoveBwdLayoutInfo; // <-- @@ -136,7 +137,7 @@ public: static sal_Bool Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn ); static sal_Bool StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage ); - // --> OD 2004-06-23 #i28701# + // --> #i28701# static void ClearMovedFwdFrms( const SwDoc& _rDoc ); static void InsertMovedFwdFrm( const SwDoc& _rDoc, const SwTxtFrm& _rMovedFwdFrmByObjPos, @@ -145,29 +146,29 @@ public: const SwTxtFrm& _rTxtFrm, sal_uInt32& _ornToPageNum ); // <-- - // --> OD 2005-01-12 #i40155# - ummark given frame as to be moved forward. + // --> #i40155# - ummark given frame as to be moved forward. static void RemoveMovedFwdFrm( const SwDoc& _rDoc, const SwTxtFrm& _rTxtFrm ); // <-- - // --> OD 2004-10-05 #i26945# + // --> #i26945# static bool DoesRowContainMovedFwdFrm( const SwDoc& _rDoc, const SwRowFrm& _rRowFrm ); // <-- - // --> OD 2004-10-22 #i35911# + // --> #i35911# static void ClearObjsTmpConsiderWrapInfluence( const SwDoc& _rDoc ); static void InsertObjForTmpConsiderWrapInfluence( const SwDoc& _rDoc, SwAnchoredObject& _rAnchoredObj ); // <-- - // --> OD 2005-01-12 #i40155# + // --> #i40155# static void ClearFrmsNotToWrap( const SwDoc& _rDoc ); static void InsertFrmNotToWrap( const SwDoc& _rDoc, const SwFrm& _rFrm ); static bool FrmNotToWrap( const IDocumentLayoutAccess& _rIDLA, const SwFrm& _rFrm ); // <-- - // --> OD 2006-05-10 #i65250# + // --> #i65250# static bool MoveBwdSuppressed( const SwDoc& p_rDoc, const SwFlowFrm& p_rFlowFrm, const SwLayoutFrm& p_rNewUpperFrm ); @@ -181,3 +182,4 @@ extern void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTxtFrm& rTxtFrm ); #endif //_LAYOUTER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx index c9cd053802d6..21120f6e5e7a 100644 --- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx +++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,7 @@ class SwTxtNode; class SwTxtFrm; -// --> OD 2004-10-05 #i26945# +// --> #i26945# class SwRowFrm; // <-- @@ -53,14 +54,14 @@ class SwMovedFwdFrmsByObjPos void Insert( const SwTxtFrm& _rMovedFwdFrmByObjPos, const sal_uInt32 _nToPageNum ); - // --> OD 2005-01-12 #i40155# + // --> #i40155# void Remove( const SwTxtFrm& _rTxtFrm ); // <-- bool FrmMovedFwdByObjPos( const SwTxtFrm& _rTxtFrm, sal_uInt32& _ornToPageNum ) const; - // --> OD 2004-10-05 #i26945# + // --> #i26945# bool DoesRowContainMovedFwdFrm( const SwRowFrm& _rRowFrm ) const; // <-- @@ -68,3 +69,5 @@ class SwMovedFwdFrmsByObjPos }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index 9269606f2031..ed4a856de65a 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -211,3 +212,4 @@ public: #endif // SW_MVSAVE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx index c70a084c1b85..ac83381f8c16 100644 --- a/sw/source/core/inc/node2lay.hxx +++ b/sw/source/core/inc/node2lay.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,7 @@ #include <tools/solar.h> -/* -----------------23.02.99 11:33------------------- +/* -------------------------------------------------- * Die Klasse SwNode2Layout stellt die Verbindung von Nodes zum Layout her. * Sie liefert einen intelligenten Iterator ueber die zum Node oder Nodebereich * gehoerenden Frames. Je nach Zweck der Iteration, z.B. um vor oder hinter @@ -79,3 +80,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx index 647e46511991..42db71134c45 100644 --- a/sw/source/core/inc/noteurl.hxx +++ b/sw/source/core/inc/noteurl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,4 @@ extern SwNoteURL *pNoteURL; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index b460d7465f3c..17494b01a7ea 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,7 +40,7 @@ class SwNoTxtFrm: public SwCntntFrm { friend void _FrmFinit(); - short nWeight; // "Wichtigkeit" der Grafik + short nWeight; // importance of the graphic const Size& GetSize() const; @@ -47,7 +48,6 @@ class SwNoTxtFrm: public SwCntntFrm void Format ( const SwBorderAttrs *pAttrs = 0 ); void PaintCntnt ( OutputDevice*, const SwRect&, const SwRect& ) const; - /// OD 25.09.2002 #99739# - delete unused 3rd parameter void PaintPicture( OutputDevice*, const SwRect& ) const; protected: virtual void MakeAll(); @@ -71,9 +71,10 @@ public: void StopAnimation( OutputDevice* = 0 ) const; sal_Bool HasAnimation() const; - // Routinen fuer den Grafik-Cache + // Routine for the graphics cache sal_uInt16 GetWeight() { return nWeight; } }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx index 7a47a4012b30..c78c6f7775c5 100644 --- a/sw/source/core/inc/objectformatter.hxx +++ b/sw/source/core/inc/objectformatter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,19 +31,17 @@ #include <sal/types.h> class SwFrm; -// --> OD 2004-10-08 #i26945# +// #i26945# class SwTxtFrm; -// <-- class SwLayoutFrm; class SwPageFrm; class SwAnchoredObject; class SwLayAction; -// --> OD 2004-10-04 #i26945# +// OD 2004-10-04 #i26945# class SwPageNumAndTypeOfAnchors; -// <-- // ----------------------------------------------------------------------------- -// OD 2004-06-25 #i28701# +// #i28701# // Format floating screen objects, which are anchored at the given anchor frame // and registered at the given page frame. // ----------------------------------------------------------------------------- @@ -64,30 +63,25 @@ class SwObjectFormatter SwLayAction* mpLayAction; // data structure to collect page number of object's 'anchor' - // --> OD 2004-10-04 #i26945# + // #i26945# SwPageNumAndTypeOfAnchors* mpPgNumAndTypeOfAnchors; - // <-- /** helper method for method <_FormatObj(..)> - performs the intrinsic format of the layout of the given layout frame and all its lower layout frames. - OD 2004-06-28 #i28701# + #i28701# IMPORTANT NOTE: Method corresponds to methods <SwLayAction::FormatLayoutFly(..)> and <SwLayAction::FormatLayout(..)>. Thus, its code for the formatting have to be synchronised. - - @author OD */ void _FormatLayout( SwLayoutFrm& _rLayoutFrm ); /** helper method for method <_FormatObj(..)> - performs the intrinsic format of the content of the given floating screen object. - OD 2004-06-28 #i28701# - - @author OD + #i28701# */ void _FormatObjCntnt( SwAnchoredObject& _rAnchoredObj ); @@ -119,8 +113,6 @@ class SwObjectFormatter /** method to restrict the format of floating screen objects to as-character anchored ones - - @author OD */ inline void SetFormatOnlyAsCharAnchored() { @@ -134,23 +126,19 @@ class SwObjectFormatter /** performs the intrinsic format of a given floating screen object and its content. - OD 2004-06-28 #i28701# - - @author OD + #i28701# */ void _FormatObj( SwAnchoredObject& _rAnchoredObj ); /** invokes the intrinsic format method for all floating screen objects, anchored at anchor frame on the given page frame - OD 2004-06-28 #i28701# - OD 2004-10-08 #i26945# - for format of floating screen objects for + #i28701# + #i26945# - for format of floating screen objects for follow text frames, the 'master' text frame is passed to the method. Thus, the objects, whose anchor character is inside the follow text frame can be formatted. - @author OD - @param _pMasterTxtFrm input parameter - pointer to 'master' text frame. default value: NULL */ @@ -158,33 +146,25 @@ class SwObjectFormatter /** accessor to collected anchored object - OD 2004-07-05 #i28701# - - @author OD + #i28701# */ SwAnchoredObject* GetCollectedObj( const sal_uInt32 _nIndex ); /** accessor to 'anchor' page number of collected anchored object - OD 2004-07-05 #i28701# - - @author OD + #i28701# */ sal_uInt32 GetPgNumOfCollected( const sal_uInt32 _nIndex ); /** accessor to 'anchor' type of collected anchored object - OD 2004-10-04 #i26945# - - @author OD + #i26945# */ bool IsCollectedAnchoredAtMaster( const sal_uInt32 _nIndex ); /** accessor to total number of collected anchored objects - OD 2004-07-05 #i28701# - - @author OD + #i28701# */ sal_uInt32 CountOfCollected(); @@ -193,9 +173,7 @@ class SwObjectFormatter /** intrinsic method to format a certain floating screen object - OD 2005-01-10 #i40147# - add parameter <_bCheckForMovedFwd> - - @author OD + #i40147# - add parameter <_bCheckForMovedFwd> @param _rAnchoredObj input parameter - anchored object, which have to be formatted. @@ -212,22 +190,16 @@ class SwObjectFormatter const bool _bCheckForMovedFwd = false ) = 0; /** intrinsic method to format all floating screen objects - - @author OD */ virtual bool DoFormatObjs() = 0; /** method to format all floating screen objects at the given anchor frame - - @author OD */ static bool FormatObjsAtFrm( SwFrm& _rAnchorFrm, const SwPageFrm& _rPageFrm, SwLayAction* _pLayAction = 0L ); /** method to format a given floating screen object - - @author OD */ static bool FormatObj( SwAnchoredObject& _rAnchoredObj, SwFrm* _pAnchorFrm = 0L, @@ -236,3 +208,5 @@ class SwObjectFormatter }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx index 45ee0e3a5918..e51a06e76420 100644 --- a/sw/source/core/inc/observablethread.hxx +++ b/sw/source/core/inc/observablethread.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef _OBSERVABLETHREAD_HXX #define _OBSERVABLETHREAD_HXX -#ifndef _OSL_THREAD_HXX_ #include <osl/thread.hxx> -#endif #include <rtl/ref.hxx> #include <osl/interlck.h> @@ -103,3 +102,5 @@ class ObservableThread : public osl::Thread, }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/pagefrm.hrc b/sw/source/core/inc/pagefrm.hrc new file mode 100644 index 000000000000..302ba9a76b16 --- /dev/null +++ b/sw/source/core/inc/pagefrm.hrc @@ -0,0 +1,47 @@ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Sébastien Le Ray <sebastien-libreoffice@orniz.org> + * Portions created by the Initial Developer are Copyright (C) 2010 the + * Initial Developer. All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef _PAGEFRM_HRC +#define _PAGEFRM_HRC + +#include "rcid.hrc" + +// Bitmaps for page shadow +#define BMP_PAGE_RIGHT_SHADOW_MASK RC_PAGEFRM_BEGIN + 0 +#define BMP_PAGE_BOTTOM_RIGHT_SHADOW_MASK RC_PAGEFRM_BEGIN + 1 +#define BMP_PAGE_BOTTOM_SHADOW_MASK RC_PAGEFRM_BEGIN + 2 + + +// If you add resources, don't forget to update this +#define PAGEFRM_ACT_END BMP_PAGE_BOTTOMLEFT_SHADOW + +// Sanity check +#if PAGEFRM_ACT_END > RC_PAGEFRM_END +#error Not enough room for pagefrm resource in #file:#line +#endif + +#endif diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index c5d63d0895ec..92b11aed27ea 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,12 +46,10 @@ class SdrObject; class SwAttrSetChg; class Font; -// OD 2004-05-07 #i28701# - replaced by class <SwSortedObjs> -//SV_DECL_PTRARR_SORT(SwSortDrawObjs,SdrObjectPtr,1,2); +// #i28701# - replaced by class <SwSortedObjs> class SwSortedObjs; -// --> OD 2004-07-02 #i28701# +// #i28701# class SwAnchoredObject; -// <-- enum SwPageChg { @@ -63,7 +62,7 @@ class SwPageFrm: public SwFtnBossFrm { friend class SwFrm; - // OD 2004-05-07 #i28701# - use <SwSortedObjs> + // #i28701# - use <SwSortedObjs> SwSortedObjs *pSortedObjs; SwPageDesc *pDesc; //PageDesc der die Seite beschreibt. @@ -84,12 +83,10 @@ class SwPageFrm: public SwFtnBossFrm sal_Bool bInvalidWordCount :1; sal_Bool bHasGrid :1; // Grid for Asian layout - // OD 2004-05-17 #i28701# - boolean, indicating that layout of page frame + // #i28701# - boolean, indicating that layout of page frame // is in progress. bool mbLayoutInProgress; - // OD 12.02.2003 #i9719#, #105645# - static const sal_Int8 mnBorderPxWidth; static const sal_Int8 mnShadowPxWidth; void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, @@ -98,35 +95,9 @@ class SwPageFrm: public SwFtnBossFrm // Anpassen der max. Fussnotenhoehen in den einzelnen Spalten void SetColMaxFtnHeight(); - /** determine rectangle for page border - - OD 12.02.2003 for #i9719# and #105645# - - @author OD - - @param _rPageRect - input parameter - constant instance reference of the page rectangle. - Generally, it's the frame area of the page, but for empty pages in print - preview, this parameter is useful. - - @param _pViewShell - input parameter - instance of the view shell, for which the rectangle - has to be generated. - - @param _orBorderRect - output parameter - instance reference of the border rectangle for - the given page rectangle - */ - static void GetBorderRect( const SwRect& _rPageRect, - ViewShell* _pViewShell, - SwRect& _orBorderRect, - bool bRightSidebar ); - /** determine rectangle for right page shadow - OD 12.02.2003 for #i9719# and #105645# - - @author OD + #i9719# @param _rPageRect input parameter - constant instance reference of the page rectangle. @@ -148,9 +119,7 @@ class SwPageFrm: public SwFtnBossFrm /** determine rectangle for bottom page shadow - OD 12.02.2003 for #i9719# and #105645# - - @author OD + #i9719# @param _rPageRect input parameter - constant instance reference of the page rectangle. @@ -169,12 +138,11 @@ class SwPageFrm: public SwFtnBossFrm static void GetBottomShadowRect( const SwRect& _rPageRect, ViewShell* _pViewShell, SwRect& _orBottomShadowRect, + bool bFullBottomShadow, bool bRightSidebar ); /** adds the sidebar used for notes to right and left border - mod 20.10.2007 for #i6193# - - @author mod + #i6193# @param aRect input parameter - current rect, we change borders if we want a sidebar @@ -207,10 +175,9 @@ public: const SwSortedObjs *GetSortedObjs() const { return pSortedObjs; } SwSortedObjs *GetSortedObjs() { return pSortedObjs; } - // --> OD 2004-07-02 #i28701# - new methods to append/remove drawing objects + // #i28701# - new methods to append/remove drawing objects void AppendDrawObjToPage( SwAnchoredObject& _rNewObj ); void RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj ); - // <-- void AppendFlyToPage( SwFlyFrm *pNew ); void RemoveFlyFromPage( SwFlyFrm *pToRemove ); @@ -240,7 +207,7 @@ public: //Schickt an alle ContentFrames ein Prepare wg. geaenderter Registervorlage void PrepareRegisterChg(); - // --> OD 2005-06-09 #i50432# - adjust method description and synopsis. + // #i50432# - adjust method description and synopsis. // Appends a fly frame - the given one or a new one - at the page frame. // Needed for <Modify> and <MakeFrms> // - return value not needed any more @@ -248,7 +215,6 @@ public: // - third parameter only needed for assertion, but calling method assures // this assertion. Thus, delete it. void PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt ); - // <-- virtual sal_Bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0 ) const; @@ -311,26 +277,20 @@ public: sal_Bool IsInvalidAutoCompleteWords() const { return bInvalidAutoCmplWrds; } sal_Bool IsInvalidWordCount() const { return bInvalidWordCount; } - /** SwPageFrm::GetDrawBackgrdColor - for #102450# + /** SwPageFrm::GetDrawBackgrdColor - 29.08.2002: determine the color, that is respectively will be drawn as background for the page frame. - @author OD - @return reference to an instance of class Color */ const Color& GetDrawBackgrdColor() const; /** paint margin area of a page - OD 20.11.2002 for #104598#: implement paint of margin area; margin area will be painted for a view shell with a window and if the document is not in online layout. - @author OD - @param _rOutputRect input parameter - constant instance reference of the rectangle, for which an output has to be generated. @@ -344,11 +304,9 @@ public: /** paint page border and shadow - OD 12.02.2003 for #i9719# and #105645# + #i9719# implement paint of page border and shadow - @author OD - @param _rPageRect input parameter - constant instance reference of the page rectangle. Generally, it's the frame area of the page, but for empty pages in print @@ -357,17 +315,27 @@ public: @param _pViewShell input parameter - instance of the view shell, on which the output has to be generated. + + @param bPaintRightShadow + Should we paint shadow on the right or not (used in book mode) + + @param bFullBottomShadow + Should we have a bottom shadow of the same size as the pages or + not (for right pages in book mode in a LTR environment). + + @param bRightSidebar + Is the note sidebar on the right or not (used to adjust the + shadow with & position). */ static void PaintBorderAndShadow( const SwRect& _rPageRect, ViewShell* _pViewShell, bool bPaintRightShadow, + bool bFullBottomShadow, bool bRightSidebar ); /** get bound rectangle of border and shadow for repaints - OD 12.02.2003 for #i9719# and #105645# - - author OD + #i9719# @param _rPageRect input parameter - constant instance reference of the page rectangle. @@ -390,8 +358,6 @@ public: static void PaintNotesSidebar(const SwRect& _rPageRect, ViewShell* _pViewShell, sal_uInt16 nPageNum, bool bRight); static void PaintNotesSidebarArrows(const Point &aMiddleFirst, const Point &aMiddleSecond, ViewShell* _pViewShell, const Color aColorUp, const Color aColorDown); /** - mod #6i193# - asks the page on which side a margin should be shown, e.g for notes returns true for left side, false for right side */ @@ -399,20 +365,14 @@ public: virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; - // OD 12.02.2003 #i9719#, #105645# - inline sal_Int8 BorderPxWidth() const - { - return mnBorderPxWidth; - } inline sal_Int8 ShadowPxWidth() const { return mnShadowPxWidth; } - // OD 22.09.2003 #110978# const SwRect PrtWithoutHeaderAndFooter() const; - // OD 2004-05-17 #i28701# + // #i28701# inline bool IsLayoutInProgress() const { return mbLayoutInProgress; @@ -540,3 +500,5 @@ inline sal_Bool SwPageFrm::IsInvalidFly() const #endif //_PAGEFRM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx index 9ca795584eb1..f124abaccf27 100644 --- a/sw/source/core/inc/pamtyp.hxx +++ b/sw/source/core/inc/pamtyp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,5 @@ SwCntntNode* GetNode( SwPaM&, sal_Bool&, SwMoveFn, sal_Bool bInReadOnly = sal_Fa #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/prevwpage.hxx b/sw/source/core/inc/prevwpage.hxx index 5e9e0d752a4f..dd35bb65d96e 100644 --- a/sw/source/core/inc/prevwpage.hxx +++ b/sw/source/core/inc/prevwpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,10 +35,6 @@ class SwPageFrm; /** data structure for a preview page in the current preview layout - - OD 12.12.2002 #103492# - struct <PrevwPage> - - @author OD */ struct PrevwPage { @@ -61,3 +58,5 @@ inline PrevwPage::PrevwPage() {}; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/ptqueue.hxx b/sw/source/core/inc/ptqueue.hxx index 57717405998f..9ef7c2017822 100644 --- a/sw/source/core/inc/ptqueue.hxx +++ b/sw/source/core/inc/ptqueue.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx index fd09e1dbaca7..652e14633061 100644 --- a/sw/source/core/inc/retrievedinputstreamdata.hxx +++ b/sw/source/core/inc/retrievedinputstreamdata.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,17 +32,13 @@ #include <sal/types.h> #include <osl/mutex.hxx> #include <com/sun/star/uno/Reference.hxx> -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HXX_ #include <com/sun/star/io/XInputStream.hpp> -#endif #include <map> #include <boost/weak_ptr.hpp> + class SwAsyncRetrieveInputStreamThreadConsumer; -//#ifndef _RETRIEVEINPUTSTREAMCONSUMER_HXX -//#include <retrieveinputstreamconsumer.hxx> -//#endif /** Singleton class to manage retrieved input stream data in Writer @@ -109,3 +106,5 @@ class SwRetrievedInputStreamDataManager }; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx index e16ba350246d..29e0fb532bca 100644 --- a/sw/source/core/inc/retrieveinputstream.hxx +++ b/sw/source/core/inc/retrieveinputstream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,12 +30,7 @@ #include <observablethread.hxx> #include <tools/string.hxx> -//#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_ -//#include <com/sun/star/uno/Reference.hxx> -//#endif -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HXX_ #include <com/sun/star/io/XInputStream.hpp> -#endif #include <retrievedinputstreamdata.hxx> /** class for a thread to retrieve an input stream given by an URL @@ -66,3 +62,5 @@ class SwAsyncRetrieveInputStreamThread : public ObservableThread const String mrLinkedURL; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx index 2417f819bed3..26284034d425 100644 --- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx +++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #define _RETRIEVEINPUTSTREAMCONSUMER_HXX #include <com/sun/star/uno/Reference.hxx> -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HXX_ #include <com/sun/star/io/XInputStream.hpp> -#endif #include <osl/interlck.h> #include <retrievedinputstreamdata.hxx> @@ -41,9 +40,7 @@ class SwAsyncRetrieveInputStreamThread; /** class to provide creation of a thread to retrieve an input stream given by an URL and to consume the retrieved input stream. - OD 2007-01-29 #i73788# - - @author OD + #i73788# */ class SwAsyncRetrieveInputStreamThreadConsumer { @@ -53,14 +50,10 @@ class SwAsyncRetrieveInputStreamThreadConsumer ~SwAsyncRetrieveInputStreamThreadConsumer(); /** method to create thread - - @author OD */ void CreateThread( const String& rURL ); /** method called to provide the retrieved input stream to the thread Consumer - - @author OD */ void ApplyInputStream( com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, @@ -72,3 +65,5 @@ class SwAsyncRetrieveInputStreamThreadConsumer oslInterlockedCount mnThreadID; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index c94383c83377..df9da4bfb9b4 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,13 +70,10 @@ class SwCharFmt; #include <tox.hxx> #include <SwNumberTreeTypes.hxx> -// --> OD 2007-10-17 #i81002# #include <IDocumentMarkAccess.hxx> -// <-- #include <memory> - enum HISTORY_HINT { HSTRY_SETFMTHNT, HSTRY_RESETFMTHNT, @@ -92,7 +90,7 @@ enum HISTORY_HINT { HSTRY_RESETATTRSET, HSTRY_CHGFLYANCHOR, HSTRY_CHGFLYCHAIN, - HSTRY_CHGCHARFMT, // #i27615# + HSTRY_CHGCHARFMT, HSTRY_END }; @@ -127,9 +125,7 @@ class SwHistoryResetFmt : public SwHistoryHint const sal_uInt16 m_nWhich; public: - // --> OD 2008-02-27 #refactorlists# - removed <rDoc> SwHistoryResetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNodeIdx ); - // <-- virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); }; @@ -267,7 +263,6 @@ class SwHistoryBookmark : public SwHistoryHint bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk); const ::rtl::OUString& GetName() const; - private: const ::rtl::OUString m_aName; ::rtl::OUString m_aShortName; @@ -296,7 +291,6 @@ public: }; - class SwHistoryResetAttrSet : public SwHistoryHint { const sal_uLong m_nNodeIndex; @@ -338,7 +332,6 @@ public: virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); }; -// #i27615# class SwHistoryChangeCharFmt : public SwHistoryHint { const SfxItemSet m_OldSet; @@ -350,7 +343,6 @@ public: }; - #endif typedef SwHistoryHint* SwHistoryHintPtr; @@ -376,17 +368,15 @@ public: // call all objects between nStart and TmpEnd; store nStart as TmpEnd bool TmpRollback( SwDoc* pDoc, sal_uInt16 nStart, bool ToFirst = true ); - // --> OD 2008-02-27 #refactorlists# - removed <rDoc> void Add( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue, sal_uLong nNodeIdx ); - // <-- void Add( SwTxtAttr* pTxtHt, sal_uLong nNodeIdx, bool bNewAttr = true ); void Add( SwFmtColl*, sal_uLong nNodeIdx, sal_uInt8 nWhichNd ); void Add( const ::sw::mark::IMark&, bool bSavePos, bool bSaveOtherPos ); void Add( SwFrmFmt& rFmt ); void Add( SwFlyFrmFmt&, sal_uInt16& rSetPos ); void Add( const SwTxtFtn& ); - void Add( const SfxItemSet & rSet, const SwCharFmt & rCharFmt); // #i27615# + void Add( const SfxItemSet & rSet, const SwCharFmt & rCharFmt); sal_uInt16 Count() const { return m_SwpHstry.Count(); } sal_uInt16 GetTmpEnd() const { return m_SwpHstry.Count() - m_nEndDiff; } @@ -409,9 +399,7 @@ public: // used by Undo classes (Delete/Overwrite/Inserts) void CopyAttr( SwpHints* pHts, sal_uLong nNodeIdx, xub_StrLen nStart, xub_StrLen nEnd, bool bFields ); - // --> OD 2008-02-27 #refactorlists# - removed <rDoc> void CopyFmtAttr( const SfxItemSet& rSet, sal_uLong nNodeIdx ); - // <-- }; #ifndef ROLBCK_HISTORY_ONLY @@ -429,13 +417,11 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); public: - // --> OD 2008-02-27 #refactorlists# - removed <rDoc> SwRegHistory( SwHistory* pHst ); - // <-- SwRegHistory( const SwNode& rNd, SwHistory* pHst ); SwRegHistory( SwModify* pRegIn, const SwNode& rNd, SwHistory* pHst ); - /// @return true iff at least 1 item was inserted + /// @return true if at least 1 item was inserted bool InsertItems( const SfxItemSet& rSet, xub_StrLen const nStart, xub_StrLen const nEnd, SetAttrMode const nFlags ); @@ -448,6 +434,6 @@ public: #endif - #endif // _ROLBCK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 8150e9a3536f..64ad72101420 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -208,7 +209,7 @@ public: SwPrintData const*const pPrintData = NULL ) const; virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 virtual void Cut(); virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); #endif @@ -306,10 +307,6 @@ public: void SetBrowseWidth( long n ) { bBrowseWidthValid = sal_True; nBrowseWidth = n;} inline void InvalidateBrowseWidth(); -#ifdef LONG_TABLE_HACK - void HackPrepareLongTblPaint( int nMode ); -#endif - sal_Bool IsNewLayout() const { return bIsNewLayout; } void ResetNewLayout() { bIsNewLayout = sal_False;} @@ -318,8 +315,8 @@ public: void InsertEmptySct( SwSectionFrm* pDel ); void DeleteEmptySct() { if( pDestroy ) _DeleteEmptySct(); } void RemoveFromList( SwSectionFrm* pSct ) { if( pDestroy ) _RemoveFromList( pSct ); } -#ifdef DBG_UTIL - // Wird zur Zeit nur fuer ASSERTs benutzt: +#if OSL_DEBUG_LEVEL > 1 + // Wird zur Zeit nur fuer OSL_ENSURE( benutzt: sal_Bool IsInDelList( SwSectionFrm* pSct ) const; // Ist der SectionFrm in der Liste enthalten? #endif @@ -375,3 +372,4 @@ inline void SwRootFrm::SetVirtPageNum( const sal_Bool bOf) const #endif // SW_ROOTFRM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index e66b521d80ba..d8c3abb0346d 100644 --- a/sw/source/core/inc/rowfrm.hxx +++ b/sw/source/core/inc/rowfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,7 +55,7 @@ class SwRowFrm: public SwLayoutFrm protected: virtual void MakeAll(); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); public: SwRowFrm( const SwTableLine &, SwFrm*, bool bInsertContent = true ); @@ -109,3 +110,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx index 60c6877d4fb3..d814bc089666 100644 --- a/sw/source/core/inc/scriptinfo.hxx +++ b/sw/source/core/inc/scriptinfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,8 +28,6 @@ #ifndef _SCRIPTINFO_HXX #define _SCRIPTINFO_HXX #ifndef _SVSTDARR_HXX -#define _SVSTDARR_SHORTS -#define _SVSTDARR_BYTES #define _SVSTDARR_USHORTS #define _SVSTDARR_XUB_STRLEN #include <svl/svstdarr.hxx> @@ -37,7 +36,6 @@ #include <list> #include <modeltoviewhelper.hxx> -#include <errhdl.hxx> class SwTxtNode; class Point; @@ -98,18 +96,38 @@ public: class SwScriptInfo { private: - SvXub_StrLens aScriptChg; - SvBytes aScriptType; - SvXub_StrLens aDirChg; - SvBytes aDirType; + //! Records a single change in script type. + struct ScriptChangeInfo + { + xub_StrLen position; //!< Character position at which we change script + sal_uInt8 type; //!< Script type (Latin/Asian/Complex) that we change to. + inline ScriptChangeInfo(xub_StrLen pos, sal_uInt8 typ) : position(pos), type(typ) {}; + }; + //TODO - This is sorted, so should probably be a std::set rather than vector. + // But we also use random access (probably unnecessarily). + std::vector<ScriptChangeInfo> aScriptChanges; + //! Records a single change in direction. + struct DirectionChangeInfo + { + xub_StrLen position; //!< Character position at which we change direction. + sal_uInt8 type; //!< Direction that we change to. + inline DirectionChangeInfo(xub_StrLen pos, sal_uInt8 typ) : position(pos), type(typ) {}; + }; + std::vector<DirectionChangeInfo> aDirectionChanges; SvXub_StrLens aKashida; SvXub_StrLens aKashidaInvalid; SvXub_StrLens aNoKashidaLine; SvXub_StrLens aNoKashidaLineEnd; - SvXub_StrLens aCompChg; - SvXub_StrLens aCompLen; SvXub_StrLens aHiddenChg; - SvBytes aCompType; + //! Records a single change in compression. + struct CompressionChangeInfo + { + xub_StrLen position; //!< Character position where the change occurs. + xub_StrLen length; //!< Length of the segment. + sal_uInt8 type; //!< Type of compression that we change to. + inline CompressionChangeInfo(xub_StrLen pos, xub_StrLen len, sal_uInt8 typ) : position(pos), length(len), type(typ) {}; + }; + std::vector<CompressionChangeInfo> aCompressionChanges; xub_StrLen nInvalidityPos; sal_uInt8 nDefaultDir; @@ -356,61 +374,63 @@ inline void SwScriptInfo::SetInvalidity( const xub_StrLen nPos ) if ( nPos < nInvalidityPos ) nInvalidityPos = nPos; }; -inline size_t SwScriptInfo::CountScriptChg() const { return aScriptChg.size(); } +inline size_t SwScriptInfo::CountScriptChg() const { return aScriptChanges.size(); } inline xub_StrLen SwScriptInfo::GetScriptChg( const size_t nCnt ) const { - ASSERT( nCnt < aScriptChg.size(),"No ScriptChange today!"); - return aScriptChg[ nCnt ]; + OSL_ENSURE( nCnt < aScriptChanges.size(),"No ScriptChange today!"); + return aScriptChanges[nCnt].position; } inline sal_uInt8 SwScriptInfo::GetScriptType( const xub_StrLen nCnt ) const { - ASSERT( nCnt < aScriptType.size(),"No ScriptType today!"); - return aScriptType[ nCnt ]; + OSL_ENSURE( nCnt < aScriptChanges.size(),"No ScriptType today!"); + return aScriptChanges[nCnt].type; } -inline size_t SwScriptInfo::CountDirChg() const { return aDirChg.size(); } +inline size_t SwScriptInfo::CountDirChg() const { return aDirectionChanges.size(); } inline xub_StrLen SwScriptInfo::GetDirChg( const size_t nCnt ) const { - ASSERT( nCnt < aDirChg.size(),"No DirChange today!"); - return aDirChg[ nCnt ]; + OSL_ENSURE( nCnt < aDirectionChanges.size(),"No DirChange today!"); + return aDirectionChanges[ nCnt ].position; } inline sal_uInt8 SwScriptInfo::GetDirType( const size_t nCnt ) const { - ASSERT( nCnt < aDirType.size(),"No DirType today!"); - return aDirType[ nCnt ]; + OSL_ENSURE( nCnt < aDirectionChanges.size(),"No DirType today!"); + return aDirectionChanges[ nCnt ].type; } inline size_t SwScriptInfo::CountKashida() const { return aKashida.size(); } inline xub_StrLen SwScriptInfo::GetKashida( const size_t nCnt ) const { - ASSERT( nCnt < aKashida.size(),"No Kashidas today!"); + OSL_ENSURE( nCnt < aKashida.size(),"No Kashidas today!"); return aKashida[ nCnt ]; } -inline size_t SwScriptInfo::CountCompChg() const { return aCompChg.size(); }; +inline size_t SwScriptInfo::CountCompChg() const { return aCompressionChanges.size(); }; inline xub_StrLen SwScriptInfo::GetCompStart( const size_t nCnt ) const { - ASSERT( nCnt < aCompChg.size(),"No CompressionStart today!"); - return aCompChg[ nCnt ]; + OSL_ENSURE( nCnt < aCompressionChanges.size(),"No CompressionStart today!"); + return aCompressionChanges[ nCnt ].position; } inline xub_StrLen SwScriptInfo::GetCompLen( const size_t nCnt ) const { - ASSERT( nCnt < aCompLen.size(),"No CompressionLen today!"); - return aCompLen[ nCnt ]; + OSL_ENSURE( nCnt < aCompressionChanges.size(),"No CompressionLen today!"); + return aCompressionChanges[ nCnt ].length; } inline sal_uInt8 SwScriptInfo::GetCompType( const size_t nCnt ) const { - ASSERT( nCnt < aCompType.size(),"No CompressionType today!"); - return aCompType[ nCnt ]; + OSL_ENSURE( nCnt < aCompressionChanges.size(),"No CompressionType today!"); + return aCompressionChanges[ nCnt ].type; } inline size_t SwScriptInfo::CountHiddenChg() const { return aHiddenChg.size(); }; inline xub_StrLen SwScriptInfo::GetHiddenChg( const size_t nCnt ) const { - ASSERT( nCnt < aHiddenChg.size(),"No HiddenChg today!"); + OSL_ENSURE( nCnt < aHiddenChg.size(),"No HiddenChg today!"); return aHiddenChg[ nCnt ]; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index 77314ff7f956..8c1b84bbd5b8 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,5 @@ inline const SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode ) const #endif //_SECTFRM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/setmapvirtdev.hxx b/sw/source/core/inc/setmapvirtdev.hxx index e438899c2287..c3b6cdf7fea7 100644 --- a/sw/source/core/inc/setmapvirtdev.hxx +++ b/sw/source/core/inc/setmapvirtdev.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ void SetMappingForVirtDev( const Point& _rNewOrigin, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/sortedobjs.hxx b/sw/source/core/inc/sortedobjs.hxx index b983e2c81271..720ff087c936 100644 --- a/sw/source/core/inc/sortedobjs.hxx +++ b/sw/source/core/inc/sortedobjs.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,8 +52,6 @@ class SwAnchoredObject; - internal anchor order number If one of the sort criteria attributes of an anchored object changes, the sorting has to be updated - use method <Update(..)> - - @author OD */ class SwSortedObjs { @@ -69,8 +68,6 @@ class SwSortedObjs @param _nIndex input parameter - index of entry, valid value range [0..Count()-1] - - @author OD */ SwAnchoredObject* operator[]( sal_uInt32 _nIndex ) const; @@ -83,22 +80,15 @@ class SwSortedObjs /** method to update the position of the given anchored object in the sorted list - OD 2004-07-01 - - @author OD - @return boolean, indicating success of the update. */ bool Update( SwAnchoredObject& _rAnchoredObj ); /** Position of object <_rAnchoredObj> in sorted list - OD 2004-05-07 Returns the number of the list position of object <_rAnchoredObj>. Returns <Count()>, if object isn't contained in list. - @author OD - @return sal_uInt32 Number of the list position of object <_rAnchoredObj> */ @@ -106,3 +96,5 @@ class SwSortedObjs }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/sortedobjsimpl.hxx b/sw/source/core/inc/sortedobjsimpl.hxx index c15ed5e0e5dd..1b23cd194ac9 100644 --- a/sw/source/core/inc/sortedobjsimpl.hxx +++ b/sw/source/core/inc/sortedobjsimpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,5 @@ class SwSortedObjsImpl }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index c5d2b9240b22..1ac9455abff7 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <tools/string.hxx> -#ifndef _DATE_HXX //autogen #include <tools/datetime.hxx> -#endif #include <svl/svarray.hxx> @@ -144,99 +143,6 @@ public: virtual sal_Bool PutMuchEntries( sal_Bool bOn ); }; -/* -class Sw3Persist : public SvPersist -{ - virtual void FillClass( SvGlobalName * pClassName, - sal_uLong * pClipFormat, - String * pAppName, - String * pLongUserName, - String * pUserName, - sal_Int32 nFileFormat=SOFFICE_FILEFORMAT_CURRENT ) const; - virtual sal_Bool Save(); - virtual sal_Bool SaveCompleted( SvStorage * ); -public: - Sw3Persist(); -}; - -class SwSwgReader; - -class Sw2TextBlocks : public SwImpBlocks -{ - SvPersistRef refPersist; // Fuer OLE-Objekte - SwSwgReader* pRdr; // Lese-Routinen - SfxMedium* pMed; // der logische Input-Stream - String* pText; // String fuer GetText() - long nDocStart; // Beginn des Doc-Records - long nDocSize; // Laenge des Doc-Records - long nStart; // Beginn des CONTENTS-Records - long nSize; // Laenge des CONTENTS-Records - sal_uInt16 nNamedFmts; // benannte Formate - sal_uInt16 nColls; // Text-Collections - sal_uInt16 nBlks; // Anzahl Elemente im CONTENTS-Record -public: - Sw2TextBlocks( const String& ); - virtual ~Sw2TextBlocks(); - virtual sal_uLong Delete( sal_uInt16 ); - virtual sal_uLong Rename( sal_uInt16, const String&, const String& ); - virtual sal_uLong CopyBlock( SwImpBlocks& rImp, String& rShort, const String& rLong); - virtual sal_uLong GetDoc( sal_uInt16 ); - virtual sal_uLong BeginPutDoc( const String&, const String& ); - virtual sal_uLong PutDoc(); - virtual sal_uLong GetText( sal_uInt16, String& ); - virtual sal_uLong PutText( const String&, const String&, const String& ); - virtual sal_uLong MakeBlockList(); - virtual short GetFileType( ) const; - sal_uLong LoadDoc(); - - virtual sal_uLong OpenFile( sal_Bool bReadOnly = sal_True ); - virtual void CloseFile(); - - void StatLineStartPercent(); // zum Anzeigen des Prozessbars -}; - -class Sw3Io; -class Sw3IoImp; - -class Sw3TextBlocks : public SwImpBlocks -{ - Sw3Io* pIo3; - Sw3IoImp* pImp; - sal_Bool bAutocorrBlock; - -public: - Sw3TextBlocks( const String& ); - Sw3TextBlocks( SvStorage& ); - virtual ~Sw3TextBlocks(); - virtual sal_uLong Delete( sal_uInt16 ); - virtual sal_uLong Rename( sal_uInt16, const String&, const String& ); - virtual sal_uLong CopyBlock( SwImpBlocks& rImp, String& rShort, const String& rLong); - virtual sal_uLong GetDoc( sal_uInt16 ); - virtual sal_uLong GetDocForConversion( sal_uInt16 ); - virtual sal_uLong BeginPutDoc( const String&, const String& ); - virtual sal_uLong PutDoc(); - virtual void SetDoc( SwDoc * pNewDoc); - virtual sal_uLong GetText( sal_uInt16, String& ); - virtual sal_uLong PutText( const String&, const String&, const String& ); - virtual sal_uLong MakeBlockList(); - virtual short GetFileType( ) const; - - virtual sal_uLong OpenFile( sal_Bool bReadOnly = sal_True ); - virtual void CloseFile(); - - // Methoden fuer die neue Autokorrektur - sal_uLong GetText( const String& rShort, String& ); - SwDoc* GetDoc() const { return pDoc; } - - virtual sal_Bool IsOnlyTextBlock( const String& rShort ) const; - - virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTbl, - sal_Bool bFileAlreadyOpen = sal_False ); - virtual sal_uLong SetMacroTable( sal_uInt16 nIdx, - const SvxMacroTableDtor& rMacroTbl, - sal_Bool bFileAlreadyOpen = sal_False ); - - void ReadInfo(); -}; -*/ #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index b23ccb0f834a..cfb585345566 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,11 +58,9 @@ * */ -#ifdef DBG_UTIL -#ifndef _STRING_HXX //autogen +#if OSL_DEBUG_LEVEL > 1 #include <tools/string.hxx> #endif -#endif #ifndef _SVSTDARR_HXX #define _SVSTDARR_USHORTS @@ -91,7 +90,7 @@ class SwCache : public SwCacheObjArr void DeleteObj( SwCacheObj *pObj ); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 ByteString aName; long nAppend; //Anzahl der Eintragungen durch Erweiterung. long nInsertFree; //Anzahl der Eintragungen auf freie Plaetze. @@ -113,7 +112,7 @@ class SwCache : public SwCacheObjArr public: //nur sal_uInt8 hineinstecken!!! -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize, const ByteString &rNm ); ~SwCache(); @@ -194,12 +193,12 @@ public: inline sal_Bool IsLocked() const { return 0 != nLock; } -#ifndef DBG_UTIL - inline void Lock() { ++nLock; } - inline void Unlock() { --nLock; } -#else +#if OSL_DEBUG_LEVEL > 1 void Lock(); void Unlock(); +#else + inline void Lock() { ++nLock; } + inline void Unlock() { --nLock; } #endif SwCacheObj *Next() { return pNext; } @@ -246,7 +245,7 @@ public: inline void SwCache::IncreaseMax( const sal_uInt16 nAdd ) { nCurMax = nCurMax + sal::static_int_cast< sal_uInt16 >(nAdd); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 ++nIncreaseMax; #endif } @@ -254,7 +253,7 @@ inline void SwCache::DecreaseMax( const sal_uInt16 nSub ) { if ( nCurMax > nSub ) nCurMax = nCurMax - sal::static_int_cast< sal_uInt16 >(nSub); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 ++nDecreaseMax; #endif } @@ -300,3 +299,5 @@ inline SwCacheObj *SwCacheAccess::Get() #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index 375139c260d7..e57b6f7b1a41 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,7 +47,7 @@ class SwFontCache : public SwCache public: inline SwFontCache() : SwCache(50,50 -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 , "Globaler AttributSet/Font-Cache pSwFontCache" #endif ) {} @@ -97,3 +98,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 631abab76b38..f0cf7bab6a32 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <i18npool/lang.h> #include <tools/color.hxx> -#ifndef _TOOLS_STREAM_HXX //autogen #include <tools/stream.hxx> -#endif #include <editeng/svxfont.hxx> #include <swtypes.hxx> #include <drawfont.hxx> // SwDrawTextInfo @@ -832,7 +831,7 @@ public: SwFont& GetFont() { - ASSERT( pFnt, "No underline font" ) + OSL_ENSURE( pFnt, "No underline font" ); return *pFnt; } const Point& GetPos() const { return aPos; } @@ -845,9 +844,7 @@ public: * class SvStatistics *************************************************************************/ -#ifndef DBG_UTIL -#define SV_STAT(nWhich) -#else +#if OSL_DEBUG_LEVEL > 1 class SvStatistics { @@ -893,7 +890,10 @@ inline void SvStatistics::PrintOn( SvStream &rOS ) const //$ ostream rOS << "\tnDrawStretchText: " << nDrawStretchText << '\n'; if( nChangeFont ) rOS << "\tnChangeFont: " << nChangeFont << '\n'; if( nGetFontMetric ) rOS << "\tnGetFontMetric: " << nGetFontMetric << '\n'; rOS << "}" << '\n'; } -#endif /* PRODUCT */ +#else +#define SV_STAT(nWhich) +#endif /* DEBUG */ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/swselectionlist.hxx b/sw/source/core/inc/swselectionlist.hxx index 1431a49c5bc3..a3deb52ce66f 100644 --- a/sw/source/core/inc/swselectionlist.hxx +++ b/sw/source/core/inc/swselectionlist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ public: }; #endif //_SWSELECTIONLIST_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx index d3d7ab8bd97b..e997e6dadc26 100644 --- a/sw/source/core/inc/swthreadjoiner.hxx +++ b/sw/source/core/inc/swthreadjoiner.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ class SwThreadJoiner SwThreadJoiner(); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/swthreadmanager.hxx b/sw/source/core/inc/swthreadmanager.hxx index 4ab94ef4cfc2..c44fe5109b62 100644 --- a/sw/source/core/inc/swthreadmanager.hxx +++ b/sw/source/core/inc/swthreadmanager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,10 +41,8 @@ class ThreadManager; /** class to manage threads in Writer using a <ThreadManager> instance - OD 2007-04-13 #i73788# + #i73788# Conforms the singleton pattern - - @author OD */ class SwThreadManager : private ::boost::noncopyable @@ -67,14 +66,10 @@ class SwThreadManager Suspending the starting of further threads is sensible during the destruction of a Writer document. - - @author OD */ void SuspendStartingOfThreads(); /** continues the starting of threads after it has been suspended - - @author OD */ void ResumeStartingOfThreads(); @@ -87,3 +82,5 @@ class SwThreadManager }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index 786383deeecf..3527e2f6deff 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -233,3 +234,5 @@ inline SwTabFrm *SwTabFrm::GetFollow() } #endif // SW_TABFRM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 866e82274de9..659ae318cc92 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,7 +67,7 @@ sal_Bool lcl_BoxSetHeadCondColl( const SwTableBox*& rpBox, void* pPara ); sal_Bool lcl_LineSetHeadCondColl( const SwTableLine*& rpLine, void* pPara ); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ); #endif @@ -226,3 +227,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx index 609e0a0ecc4d..5692c7ae3c7f 100755..100644 --- a/sw/source/core/inc/textapi.hxx +++ b/sw/source/core/inc/textapi.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ public: void SetText( OutlinerParaObject& rText ) { pSource->SetText( rText ); } String GetText() { return pSource->GetText(); } }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx index 9ff03cf37cc4..f6bc5edf8895 100644 --- a/sw/source/core/inc/threadlistener.hxx +++ b/sw/source/core/inc/threadlistener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ class ThreadListener : public IFinishedThreadListener IThreadListenerOwner& mrThreadListenerOwner; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index a167548da7b4..53ea5f7c689f 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -170,3 +171,5 @@ class ThreadManager : public IThreadListenerOwner bool StartThread( const tThreadData& aThreadData ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index 80c788098fde..ac5c8ac5424c 100644 --- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx +++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,7 +41,7 @@ namespace objectpositioning private: // calculated data for object position const SwLayoutFrm* mpVertPosOrientFrm; - // --> OD 2004-06-17 #i26791# + // #i26791# // determine offset to frame anchor position according to the // positioning alignments Point maOffsetToFrmAnchorPos; @@ -54,7 +55,7 @@ namespace objectpositioning virtual bool IsAnchoredToChar() const; virtual const SwFrm* ToCharOrientFrm() const; virtual const SwRect* ToCharRect() const; - // OD 12.11.2003 #i22341# + // #i22341# virtual SwTwips ToCharTopOfLine() const; // method to cast <SwAnchoredObjectPosition::GetAnchorFrm()> to @@ -64,7 +65,6 @@ namespace objectpositioning // ********************************************************************* /** determine frame for horizontal position - OD 04.08.2003 if the given proposed frame is a content frame, the proposed frame is returned. otherwise (given proposed frame is a layout frame), @@ -72,8 +72,6 @@ namespace objectpositioning for the first, that the anchor or a follow of the anchor. If none is found, the proposed frame is returned. - @author OD - @param _pProposedFrm input parameter - proposed frame for horizontal position @@ -87,17 +85,15 @@ namespace objectpositioning virtual ~SwToCntntAnchoredObjectPosition(); /** calculate position of object - - @author OD */ virtual void CalcPosition(); /** frame, at which the vertical position is oriented at - - @author OD */ const SwLayoutFrm& GetVertPosOrientFrm() const; }; } // namespace objectpositioning #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx index e5e77e640057..6387b8e7ced4 100644 --- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx +++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ namespace objectpositioning // calculated data for object position type TO_LAYOUT Point maRelPos; - // --> OD 2004-06-17 #i26791# + // #i26791# // determine offset to frame anchor position according to the // positioning alignments Point maOffsetToFrmAnchorPos; @@ -48,19 +49,15 @@ namespace objectpositioning virtual ~SwToLayoutAnchoredObjectPosition(); /** calculate position for object - - OD 30.07.2003 #110978# - - @author OD */ virtual void CalcPosition(); /** calculated relative position for object - - @author OD */ Point GetRelPos() const; }; } // namespace objectpositioning #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/toxhlp.hxx b/sw/source/core/inc/toxhlp.hxx index 01188e1d8c7e..b254874009bf 100644 --- a/sw/source/core/inc/toxhlp.hxx +++ b/sw/source/core/inc/toxhlp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 4d5e41fe8b71..75ad22213c79 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -292,3 +293,5 @@ public: #endif // SW_TXMSRT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index b5418f8d415d..07deaf40678c 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,13 +85,11 @@ class SwTxtFrm: public SwCntntFrm // OD 2004-03-17 #i11860# - re-factoring of #i11859# // member for height of last line (value needed for proportional line spacing) SwTwips mnHeightOfLastLine; - // --> OD 2008-01-31 #newlistlevelattrs# // member for the additional first line offset, which is caused by the list // label alignment for list level position and space mode LABEL_ALIGNMENT. // This additional first line offset is used for the text formatting. // It is NOT used for the determination of printing area. SwTwips mnAdditionalFirstLineOffset; - // <-- xub_StrLen nOfst; //nOfst gibt den Offset im Cntnt (Anzahl Zeichen) an. @@ -404,10 +403,10 @@ public: inline sal_Bool IsSwapped() const { return bIsSwapped; } // Hat der Frm eine lokale Fussnote (in diesem Frm bzw. Follow)? -#ifndef DBG_UTIL - void CalcFtnFlag(); +#if OSL_DEBUG_LEVEL > 1 + void CalcFtnFlag( xub_StrLen nStop = STRING_LEN );//For testing SplitFrm #else - void CalcFtnFlag( xub_StrLen nStop = STRING_LEN );//Fuer den Test von SplitFrm + void CalcFtnFlag(); #endif // Hidden @@ -504,18 +503,14 @@ public: line offset for the real text formatting due to the value of label adjustment attribute of the list level. - OD 2008-01-31 #newlistlevelattrs# - @author OD */ void CalcAdditionalFirstLineOffset(); - // --> OD 2008-01-31 #newlistlevelattrs# inline SwTwips GetAdditionalFirstLineOffset() const { return mnAdditionalFirstLineOffset; } - // <-- // liefert den zusaetzlichen Zeilenabstand fuer den naechsten Absatz // OD 07.01.2004 #i11859# - change return data type; @@ -614,6 +609,10 @@ public: } static void repaintTextFrames( const SwTxtNode& rNode ); + +#if OSL_DEBUG_LEVEL > 1 + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer); +#endif }; /************************************************************************* @@ -740,47 +739,6 @@ inline void SwTxtFrm::ResetBlinkPor() const ((SwTxtFrm*)this)->bBlinkPor = sal_False; } -#ifdef LINGU_STATISTIK - -class SwLinguStatistik -{ -public: - long nWords; // gepruefte Worte - long nFlushCnt; // zaehlt die Messungen - - long nWrong; // als falsch erkannt - long nAlter; // Alternativvorschlaege - long nSpellTime; // Zeitmessung - long nSynonym; // Thesaurus - long nNoSynonym; // Thesaurus ratlos - long nMeaning; // Thesaurus-Bedeutung - long nNoMeaning; // Thesaurus meinungslos - long nTheTime; // Zeitmessung - long nHyphens; // Trennstellen - long nNoHyph; // Worte ohne Trennstellen - long nHyphErr; // Fehler beim Trennen - long nHyphTime; // Zeitmessung - SpellCheck *pSpell; - LanguageType eLang; - - void Flush(); - - inline SwLinguStatistik() - { nWords = nWrong = nAlter = nSynonym = nNoSynonym = - nHyphens = nNoHyph = nHyphErr = nSpellTime = nTheTime = - nHyphTime = nFlushCnt = 0; - pSpell = NULL; - eLang = LANGUAGE_DONTKNOW; } - inline ~SwLinguStatistik(){ Flush(); } -}; - -// globale Variable, implementiert in txtfrm.cxx -extern SwLinguStatistik aSwLinguStat; - -#define SW_LING(nWhich,nInc) (aSwLinguStat.nWhich) += nInc; - -#endif - #define SWAP_IF_SWAPPED( pFrm )\ sal_Bool bUndoSwap = sal_False; \ if ( pFrm->IsVertical() && pFrm->IsSwapped() )\ @@ -833,3 +791,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx index f9026574245e..86d9e5cd07a6 100644 --- a/sw/source/core/inc/txttypes.hxx +++ b/sw/source/core/inc/txttypes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,5 @@ #define POR_TABLEFT 0x0740 #endif //_TXTTYPES_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/undoflystrattr.hxx b/sw/source/core/inc/undoflystrattr.hxx index 5115f1a37c07..9a44ae2310c3 100644 --- a/sw/source/core/inc/undoflystrattr.hxx +++ b/sw/source/core/inc/undoflystrattr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ class SwUndoFlyStrAttr : public SwUndo }; #endif // SW_UNDO_FLY_STR_ATTR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h index 6ad9ea28d399..09c91e4021b4 100644 --- a/sw/source/core/inc/unofldmid.h +++ b/sw/source/core/inc/unofldmid.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ namespace com { namespace sun { namespace star { namespace uno { String& GetString( const com::sun::star::uno::Any&, String& rStr ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index 52ac418b3861..92333a46ca8a 100755..100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -366,3 +367,4 @@ void getPrefixAndSuffix( #endif // SW_UNOMETA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 3959a815eaa2..84a840f43bc3 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +33,6 @@ #include <vcl/timer.hxx> #include <tools/color.hxx> -// OD 25.06.2003 #108784# #include <svx/svdtypes.hxx> #include <tools/string.hxx> @@ -67,7 +67,7 @@ class SwViewImp friend class SwLayAction; //Lay- und IdleAction tragen sich ein und aus. friend class SwLayIdle; - // OD 12.12.2002 #103492# - for paint of page preview + // for paint of page preview friend class SwPagePreviewLayout; ViewShell *pSh; //Falls jemand einen Imp durchreicht und doch @@ -92,8 +92,6 @@ class SwViewImp sal_Bool bFirstPageInvalid :1; //Pointer auf erste Seite ungueltig? - //sal_Bool bResetXorVisibility:1; //StartAction/EndAction - //HMHBOOL bShowHdlPaint :1; //LockPaint/UnlockPaint sal_Bool bResetHdlHiddenPaint:1;// -- "" -- sal_Bool bSmoothUpdate :1; //Meber fuer SmoothScroll @@ -103,7 +101,6 @@ class SwViewImp sal_uInt16 nRestoreActions ; //Die Anzahl der zu restaurierenden Actions (UNO) SwRect aSmoothRect; - // OD 12.12.2002 #103492# SwPagePreviewLayout* mpPgPrevwLayout; /** @@ -140,12 +137,10 @@ private: /** invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs - OD 2005-12-01 #i27138# + #i27138# implementation for wrapper method <ViewShell::InvalidateAccessibleParaFlowRelation(..)> - @author OD - @param _pFromTxtFrm input parameter - paragraph frame, for which the relation CONTENT_FLOWS_FROM has to be invalidated. @@ -161,21 +156,17 @@ private: /** invalidate text selection for paragraphs - OD 2005-12-12 #i27301# + #i27301# implementation for wrapper method <ViewShell::InvalidateAccessibleParaTextSelection(..)> - - @author OD */ void _InvalidateAccessibleParaTextSelection(); /** invalidate attributes for paragraphs and paragraph's characters - OD 2009-01-06 #i88069# + #i88069# implementation for wrapper method <ViewShell::InvalidateAccessibleParaAttrs(..)> - - @author OD */ void _InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm ); @@ -206,15 +197,16 @@ public: const SdrPageView*GetPageView() const { return pSdrPageView; } void MakeDrawView(); - // OD 29.08.2002 #102450# // add 3rd parameter <const Color* pPageBackgrdColor> for setting this // color as the background color at the outliner of the draw view // for painting layers <hell> and <heaven> - // OD 09.12.2002 #103045# - add 4th parameter for the horizontal text + + // add 4th parameter for the horizontal text // direction of the page in order to set the default horizontal text // direction at the outliner of the draw view for painting layers <hell> // and <heaven>. - // OD 25.06.2003 #108784# - correct type of 1st parameter + + // correct type of 1st parameter void PaintLayer( const SdrLayerID _nLayerID, SwPrintData const*const pPrintData, const SwRect& _rRect, @@ -223,8 +215,6 @@ public: //wird als Link an die DrawEngine uebergeben, entscheidet was wie //gepaintet wird oder nicht. - //#110094#-3 - //DECL_LINK( PaintDispatcher, SdrPaintProcRec * ); // Interface Drawing sal_Bool IsDragPossible( const Point &rPoint ); @@ -249,10 +239,8 @@ public: void SetRestoreActions(sal_uInt16 nSet){nRestoreActions = nSet;} sal_uInt16 GetRestoreActions() const{return nRestoreActions;} - // OD 12.12.2002 #103492# void InitPagePreviewLayout(); - // OD 12.12.2002 #103492# inline SwPagePreviewLayout* PagePreviewLayout() { return mpPgPrevwLayout; @@ -298,8 +286,7 @@ public: const SwFlyFrm *pFollow ); // update data for accessible preview - // OD 15.01.2003 #103492# - change method signature due to new page preview - // functionality + // change method signature due to new page preview functionality void UpdateAccessiblePreview( const std::vector<PrevwPage*>& _rPrevwPages, const Fraction& _rScale, const SwPageFrm* _pSelectedPageFrm, @@ -363,3 +350,4 @@ inline void SwViewImp::AddAccessibleObj( const SdrObject *pObj ) } #endif // SW_VIEWIMP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx index a00921f76c82..b0d63c2baa9c 100644 --- a/sw/source/core/inc/visiturl.hxx +++ b/sw/source/core/inc/visiturl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -24,13 +25,12 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #ifndef _VISITURL_HXX #define _VISITURL_HXX - - - #include <svl/lstner.hxx> + class SwDoc; class SwURLStateChanged : public SfxListener @@ -43,7 +43,6 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; - - #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 7067d63a7adf..71e00c1c9e46 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _WRONG_HXX #define _WRONG_HXX -#ifndef _COM_SUN_STAR_SMARTTAGS_XSMARTTAGPROPERTIES_HPP_ #include <com/sun/star/container/XStringKeyMap.hpp> -#endif #include <vector> @@ -70,8 +69,8 @@ class SwWrongList std::vector<SwWrongArea> maList; WrongListType meType; - xub_StrLen nBeginInvalid; // Start des ungueltigen Bereichs - xub_StrLen nEndInvalid; // Ende des ungueltigen Bereichs + xub_StrLen nBeginInvalid; // Start of the invalid range + xub_StrLen nEndInvalid; // End of the invalid range void ShiftLeft( xub_StrLen &rPos, xub_StrLen nStart, xub_StrLen nEnd ) { if( rPos > nStart ) rPos = rPos > nEnd ? rPos - nEnd + nStart : nStart; } @@ -164,3 +163,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |