From 56a1f3affcd18957442313e271e3c0ebef565d84 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Fri, 10 Oct 2008 13:02:43 +0000 Subject: CWS-TOOLING: integrate CWS cmcfixes49 --- sw/inc/EnhancedPDFExportHelper.hxx | 14 ++++++++++---- sw/inc/anchoreddrawobject.hxx | 8 ++++---- sw/inc/anchoredobject.hxx | 8 ++++---- sw/inc/dcontact.hxx | 4 ++-- sw/inc/doc.hxx | 2 +- sw/inc/fesh.hxx | 4 ++-- sw/inc/fmtcol.hxx | 4 ++-- sw/inc/fmtflcnt.hxx | 4 ++-- sw/inc/fmtfordr.hxx | 4 ++-- sw/inc/format.hxx | 6 +++--- sw/inc/frmfmt.hxx | 6 +++--- sw/inc/ndnotxt.hxx | 10 +++++----- sw/inc/node.hxx | 8 ++++---- sw/inc/numrule.hxx | 10 +++++----- sw/inc/pagepreviewlayout.hxx | 2 +- sw/inc/section.hxx | 4 ++-- sw/inc/txtinet.hxx | 6 +++--- sw/inc/viewsh.hxx | 4 ++-- 18 files changed, 57 insertions(+), 51 deletions(-) (limited to 'sw/inc') diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index 94e125fac32e..fb4251ffec0c 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: EnhancedPDFExportHelper.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.174.1 $ * * This file is part of OpenOffice.org. * @@ -40,13 +40,19 @@ #include #include -class vcl::PDFExtOutDevData; +namespace vcl +{ + class PDFExtOutDevData; +} class OutputDevice; class SwFrm; class SwLinePortion; class SwTxtPainter; class SwEditShell; -class rtl::OUString; +namespace rtl +{ + class OUString; +} class MultiSelection; class SwTxtNode; class SwNumRule; @@ -247,7 +253,7 @@ class SwEnhancedPDFExportHelper static NumListBodyIdMap& GetNumListBodyIdMap() {return aNumListBodyIdMap; } static FrmTagIdMap& GetFrmTagIdMap() { return aFrmTagIdMap; } - static const LanguageType GetDefaultLanguage() {return eLanguageDefault; } + static LanguageType GetDefaultLanguage() {return eLanguageDefault; } }; #endif diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 0328c9d246d6..bb95a8abf7b6 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: anchoreddrawobject.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.214.1 $ * * This file is part of OpenOffice.org. * @@ -136,8 +136,8 @@ class SwAnchoredDrawObject : public SwAnchoredObject virtual void RegisterAtCorrectPage(); // --> OD 2006-08-10 #i68520# - virtual const bool _SetObjTop( const SwTwips _nTop); - virtual const bool _SetObjLeft( const SwTwips _nLeft); + virtual bool _SetObjTop( const SwTwips _nTop); + virtual bool _SetObjLeft( const SwTwips _nLeft); // <-- // --> OD 2006-10-05 #i70122# @@ -216,7 +216,7 @@ class SwAnchoredDrawObject : public SwAnchoredObject virtual void UpdateLayoutDir(); // <-- // --> OD 2006-03-17 #i62875# - const bool IsOutsidePage() const; + bool IsOutsidePage() const; // <-- // new Loop control diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 395237429413..3cbd93d75104 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: anchoredobject.hxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.214.1 $ * * This file is part of OpenOffice.org. * @@ -237,8 +237,8 @@ class SwAnchoredObject void SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpConsiderWrapInfluence ); // --> OD 2006-08-10 #i68520# - virtual const bool _SetObjTop( const SwTwips _nTop) = 0; - virtual const bool _SetObjLeft( const SwTwips _nLeft) = 0; + virtual bool _SetObjTop( const SwTwips _nTop) = 0; + virtual bool _SetObjLeft( const SwTwips _nLeft) = 0; // <-- // --> OD 2006-10-05 #i70122# @@ -349,7 +349,7 @@ class SwAnchoredObject void ResetLastCharRectHeight(); // accessor to member - const SwTwips GetLastTopOfLine() const; + SwTwips GetLastTopOfLine() const; // OD 2004-05-18 #i28701# - follow-up of #i22341# void AddLastTopOfLineY( SwTwips _nDiff ); diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 9d33932f0440..8c5e55eec11c 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dcontact.hxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.26.210.2 $ * * This file is part of OpenOffice.org. * @@ -149,7 +149,7 @@ public: { return (const SwFrmFmt*)GetRegisteredIn(); } // OD 05.09.2003 #112039# - accessor for member - const bool IsInDTOR() const; + bool IsInDTOR() const; /** method to move drawing object to corresponding visible layer diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 37a01e0e9bf8..3181e2ae95e8 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -2078,7 +2078,7 @@ public: // <-- #i31958# access methods for XForms model(s) // --> OD 2006-03-21 #b6375613# - inline const bool ApplyWorkaroundForB6375613() const + inline bool ApplyWorkaroundForB6375613() const { return mbApplyWorkaroundForB6375613; } diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index f4572a024eb5..8697ee2833d1 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fesh.hxx,v $ - * $Revision: 1.63 $ + * $Revision: 1.63.212.1 $ * * This file is part of OpenOffice.org. * @@ -758,7 +758,7 @@ public: @returns boolean, indicating, if the horizontal text direction of the page, the selected drawing object is on, is right-to-left. */ - const bool IsShapeDefaultHoriTextDirR2L() const; + bool IsShapeDefaultHoriTextDirR2L() const; void ParkCursorInTab(); diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 59de6a923912..4b8de2d8bd9b 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmtcol.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.144.1 $ * * This file is part of OpenOffice.org. * @@ -111,7 +111,7 @@ public: BOOL IsAtDocNodeSet() const; // --> OD 2006-11-22 #i71574# - inline const bool AssignedToListLevelOfOutlineStyle() const + inline bool AssignedToListLevelOfOutlineStyle() const { return ( /*0 <= GetOutlineLevel() &&*/ GetOutlineLevel() < MAXLEVEL ); } diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index 6b77508334c7..c018e8c31c14 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmtflcnt.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.214.1 $ * * This file is part of OpenOffice.org. * @@ -60,7 +60,7 @@ public: SwTxtFlyCnt *GetTxtFlyCnt() { return pTxtAttr; } // OD 27.06.2003 #108784# - const bool Sw3ioExportAllowed() const; + bool Sw3ioExportAllowed() const; }; #endif diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index ed262e7702cb..93107807d1cd 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmtfordr.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.214.1 $ * * This file is part of OpenOffice.org. * @@ -56,7 +56,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual USHORT GetValueCount() const; - const SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); } + SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); } }; inline SwFmtFillOrder &SwFmtFillOrder::operator=( const SwFmtFillOrder &rCpy ) diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 03f9211c1bd4..b68e48042151 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: format.hxx,v $ - * $Revision: 1.32 $ + * $Revision: 1.32.144.1 $ * * This file is part of OpenOffice.org. * @@ -318,7 +318,7 @@ public: @return false, default implementation */ - virtual const sal_Bool IsBackgroundTransparent() const; + virtual sal_Bool IsBackgroundTransparent() const; /** SwFmt::IsShadowTransparent - for feature #99657# @@ -331,7 +331,7 @@ public: @return false, default implementation */ - virtual const sal_Bool IsShadowTransparent() const; + virtual sal_Bool IsShadowTransparent() const; }; // --------------- inline Implementierungen ------------------------ diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index f38e5fc89d3b..07c29b780faf 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: frmfmt.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.214.1 $ * * This file is part of OpenOffice.org. * @@ -187,7 +187,7 @@ public: @return true, if background color is transparent, but not "no fill" or a existing background graphic is transparent. */ - virtual const sal_Bool IsBackgroundTransparent() const; + virtual sal_Bool IsBackgroundTransparent() const; /** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898# @@ -200,7 +200,7 @@ public: @return true, if background brush is "inherited" from parent/grandparent */ - const sal_Bool IsBackgroundBrushInherited() const; + sal_Bool IsBackgroundBrushInherited() const; DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrmFmt) }; diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 34860dc8f01a..5d7cab19f4b2 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ndnotxt.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.212.1 $ * * This file is part of OpenOffice.org. * @@ -82,12 +82,12 @@ public: void SetContour( const PolyPolygon *pPoly, BOOL bAutomatic = FALSE ); const PolyPolygon *HasContour() const; - const BOOL _HasContour() const { return pContour!=0; }; + BOOL _HasContour() const { return pContour!=0; }; void GetContour( PolyPolygon &rPoly ) const; void CreateContour(); void SetAutomaticContour( BOOL bSet ) { bAutomaticContour = bSet; } - const BOOL HasAutomaticContour() const { return bAutomaticContour; } + BOOL HasAutomaticContour() const { return bAutomaticContour; } // set either a MM100 or pixel contour void SetContourAPI( const PolyPolygon *pPoly ); @@ -96,9 +96,9 @@ public: BOOL GetContourAPI( PolyPolygon &rPoly ) const; void SetPixelContour( BOOL bSet ) { bPixelContour = bSet; } - const BOOL IsPixelContour() const; + BOOL IsPixelContour() const; - const BOOL IsContourMapModeValid() const { return bContourMapModeValid; } + BOOL IsContourMapModeValid() const { return bContourMapModeValid; } //Besorgt die Graphic, mit SwapIn fuer GrfNode, per GetData fuer OLE. Graphic GetGraphic() const; diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 433219c407d5..fc15c370db3e 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: node.hxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.144.1 $ * * This file is part of OpenOffice.org. * @@ -128,13 +128,13 @@ public: inline const SwEndNode* EndOfSectionNode() const; inline SwEndNode* EndOfSectionNode(); - inline const BYTE GetAutoFmtLvl() const { return nAFmtNumLvl; } + inline BYTE GetAutoFmtLvl() const { return nAFmtNumLvl; } inline void SetAutoFmtLvl( BYTE nVal ) { nAFmtNumLvl = nVal; } - inline const BOOL IsSetNumLSpace() const { return bSetNumLSpace; } + inline BOOL IsSetNumLSpace() const { return bSetNumLSpace; } inline void SetNumLSpace( BOOL bFlag ) { bSetNumLSpace = bFlag; } - inline const BOOL IsIgnoreDontExpand() const { return bIgnoreDontExpand; } + inline BOOL IsIgnoreDontExpand() const { return bIgnoreDontExpand; } inline void SetIgnoreDontExpand( BOOL bNew ) { bIgnoreDontExpand = bNew; } BYTE GetNodeType() const { return nNodeType; } diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 77bac245aa81..8715cba74ae5 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: numrule.hxx,v $ - * $Revision: 1.39 $ + * $Revision: 1.39.78.1 $ * * This file is part of OpenOffice.org. * @@ -341,7 +341,7 @@ namespace numfunc @author OD */ - const bool IsDefBulletFontUserDefined(); + bool IsDefBulletFontUserDefined(); /** retrieve font used for the default bullet list characters @@ -353,7 +353,7 @@ namespace numfunc @author OD */ - const sal_Unicode GetBulletChar( BYTE nLevel ); + sal_Unicode GetBulletChar( BYTE nLevel ); /** configuration, if at first position of the first list item the -key increased the indent of the complete list or only demotes this list item. @@ -364,14 +364,14 @@ namespace numfunc @author OD */ - const sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem(); + sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem(); /** OD 2008-06-06 #i89178# @author OD */ - const SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode(); + SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode(); } #endif // _NUMRULE_HXX diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index f31a31132b40..589e2850b1ab 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -219,7 +219,7 @@ private: @author OD */ - const void _PaintSelectMarkAtPage( const PrevwPage* _aSelectedPrevwPage ) const; + void _PaintSelectMarkAtPage( const PrevwPage* _aSelectedPrevwPage ) const; public: /** constructor of diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 9bc35e711079..eb6c0361cced 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: section.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.214.1 $ * * This file is part of OpenOffice.org. * @@ -128,7 +128,7 @@ public: const String& GetName() const { return sSectionNm; } void SetName( const String& rName ) { sSectionNm = rName; } - const SectionType GetType() const { return eType; } + SectionType GetType() const { return eType; } void SetType( SectionType eNew ) { eType = eNew; } SwSectionFmt* GetFmt() { return (SwSectionFmt*)pRegisteredIn; } diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index 43ee11b40fdf..ac404ad5ac12 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: txtinet.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.214.1 $ * * This file is part of OpenOffice.org. * @@ -65,10 +65,10 @@ public: const SwCharFmt* GetCharFmt() const { return ((SwTxtINetFmt*)this)->GetCharFmt(); } - const BOOL IsVisited() const { return bVisited; } + BOOL IsVisited() const { return bVisited; } void SetVisited( BOOL bNew ) { bVisited = bNew; } - const BOOL IsValidVis() const { return bValidVis; } + BOOL IsValidVis() const { return bValidVis; } void SetValidVis( BOOL bNew ) { bValidVis = bNew; } BOOL IsProtect() const; diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 26446c7d759a..318490a5113e 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewsh.hxx,v $ - * $Revision: 1.65 $ + * $Revision: 1.64.210.2 $ * * This file is part of OpenOffice.org. * @@ -493,7 +493,7 @@ public: sal_Bool IsPaintLocked() const { return nLockPaint != 0; } // Abfragen/Erzeugen DrawView + PageView - const sal_Bool HasDrawView() const; + sal_Bool HasDrawView() const; void MakeDrawView(); //DrawView darf u.U. am UI benutzt werden. -- cgit