From c9bb48386bad7d2a40e6958883328145ae439cad Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 4 Mar 2019 08:56:11 +0200 Subject: Revert "new loplugin typedefparam" This reverts commit 9865440d217d975206a3f91612f0666312bc8fd8. This is not ready to land yet, seems like the latest update of the logic reveals a bunch more places I need to fix before it can land. --- sw/inc/crsrsh.hxx | 2 +- sw/inc/doc.hxx | 4 ++-- sw/inc/swatrset.hxx | 6 +----- sw/inc/swtypes.hxx | 3 +-- sw/source/core/SwNumberTree/SwNumberTree.cxx | 4 ++-- sw/source/core/doc/docfmt.cxx | 2 +- sw/source/core/inc/frmtool.hxx | 10 +++++----- sw/source/core/inc/paintfrm.hxx | 5 +---- sw/source/core/view/viewsh.cxx | 2 +- sw/source/filter/basflt/fltini.cxx | 2 +- sw/source/filter/ww8/ww8scan.hxx | 16 ++++++++-------- 11 files changed, 24 insertions(+), 32 deletions(-) (limited to 'sw') diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index a732b8b8b669..98895e664963 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -802,7 +802,7 @@ public: void SetAutoUpdateCells( bool bFlag ) { m_bAutoUpdateCells = bFlag; } bool GetShadowCursorPos( const Point& rPt, SwFillMode eFillMode, - SwRect& rRect, sal_Int16& rOrient ); + SwRect& rRect, short& rOrient ); bool SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode ); const SwRangeRedline* SelNextRedline(); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index b32263289b2b..e9b3023ce5be 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1151,7 +1151,7 @@ public: */ const SwTable* InsertTable( const SwInsertTableOptions& rInsTableOpts, // HeadlineNoBorder const SwPosition& rPos, sal_uInt16 nRows, - sal_uInt16 nCols, sal_Int16 eAdjust, + sal_uInt16 nCols, short eAdjust, const SwTableAutoFormat* pTAFormat = nullptr, const std::vector *pColArr = nullptr, bool bCalledFromShell = false, @@ -1164,7 +1164,7 @@ public: // Create a balanced table out of the selected range. const SwTable* TextToTable( const SwInsertTableOptions& rInsTableOpts, // HeadlineNoBorder, const SwPaM& rRange, sal_Unicode cCh, - sal_Int16 eAdjust, + short eAdjust, const SwTableAutoFormat* ); // text to table conversion - API support diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index d446dcddcc51..397887d09429 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -128,10 +128,6 @@ class SwTableBoxNumFormat; class SwTableBoxFormula; class SwTableBoxValue; -namespace vcl { - typedef OutputDevice RenderContext; -}; - class SwAttrPool : public SfxItemPool { private: @@ -322,7 +318,7 @@ public: //Helper for filters to find true lineheight of a font SW_DLLPUBLIC long AttrSetToLineHeight( const IDocumentSettingAccess& rIDocumentSettingAccess, const SwAttrSet &rSet, - const vcl::RenderContext &rOut, sal_Int16 nScript); + const OutputDevice &rOut, sal_Int16 nScript); #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index dee697c2eed8..b37c36407a72 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -26,7 +26,6 @@ #include "swdllapi.h" #include #include -#include namespace com { namespace sun { namespace star { namespace linguistic2{ @@ -131,7 +130,7 @@ css::uno::Reference< css::linguistic2::XThesaurus > GetThesaurus(); css::uno::Reference< css::linguistic2::XLinguProperties > GetLinguPropertySet(); // Returns the twip size of this graphic. -SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, vcl::RenderContext* pOutDev ); +SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, OutputDevice* pOutDev ); // Separator for jumps to different content types in document. const sal_Unicode cMarkSeparator = '|'; diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index e4f5c2efe713..30adb4744335 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -297,7 +297,7 @@ void SwNumberTreeNode::Validate(const SwNumberTreeNode * pNode) const } } -void SwNumberTreeNode::GetNumberVector_(SwNumberTree::tNumberVector & rVector, +void SwNumberTreeNode::GetNumberVector_(vector & rVector, bool bValidate) const { if (mpParent) @@ -675,7 +675,7 @@ SwNumberTree::tSwNumTreeNumber SwNumberTreeNode::GetNumber(bool bValidate) } -SwNumberTree::tNumberVector SwNumberTreeNode::GetNumberVector() const +vector SwNumberTreeNode::GetNumberVector() const { vector aResult; diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 9367874f24c5..22ff781213dd 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -2074,7 +2074,7 @@ SwFrameFormats::~SwFrameFormats() DeleteAndDestroyAll(); } -SwFrameFormats::const_iterator SwFrameFormats::find( const value_type& x ) const +SwFrameFormats::iterator SwFrameFormats::find( const value_type& x ) const { ByTypeAndName::iterator it = m_TypeAndNameIndex.find( boost::make_tuple(x->Which(), x->GetName(), x) ); diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 7c76779cd658..0790582777bf 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -75,7 +75,7 @@ void AppendAllObjs(const SwFrameFormats* pTable, const SwFrame* pSib); // transparency, saved in the color of the brush item. void DrawGraphic( const SvxBrushItem *, - vcl::RenderContext *, + OutputDevice *, const SwRect &rOrg, const SwRect &rOut, const sal_uInt8 nGrfNum = GRFNUM_NO, @@ -85,11 +85,11 @@ bool DrawFillAttributes( const SwRect& rOriginalLayoutRect, const SwRegionRects& rPaintRegion, const basegfx::utils::B2DClipState& rClipState, - vcl::RenderContext& rOut); + OutputDevice& rOut); // RotGrfFlyFrame: Adapted to rotation void paintGraphicUsingPrimitivesHelper( - vcl::RenderContext & rOutputDevice, + OutputDevice & rOutputDevice, GraphicObject const& rGraphicObj, GraphicAttr const& rGraphicAttr, const basegfx::B2DHomMatrix& rGraphicTransform, @@ -103,7 +103,7 @@ void SwAlignRect( SwRect &rRect, const SwViewShell *pSh, const vcl::RenderContex // method to align graphic rectangle // Created declaration here to avoid declarations -void SwAlignGrfRect( SwRect *pGrfRect, const vcl::RenderContext &rOut ); +void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut ); /** * Paint border around a run of characters using frame painting code. @@ -144,7 +144,7 @@ extern bool bDontCreateObjects; extern bool bSetCompletePaintOnInvalidate; // for table settings via keyboard -SwTwips CalcRowRstHeight( SwLayoutFrame *pRow ); +long CalcRowRstHeight( SwLayoutFrame *pRow ); long CalcHeightWithFlys( const SwFrame *pFrame ); SwPageFrame *InsertNewPage( SwPageDesc &rDesc, SwFrame *pUpper, diff --git a/sw/source/core/inc/paintfrm.hxx b/sw/source/core/inc/paintfrm.hxx index b3d4812d6aad..6f30539e6ffe 100644 --- a/sw/source/core/inc/paintfrm.hxx +++ b/sw/source/core/inc/paintfrm.hxx @@ -25,11 +25,8 @@ extern Color aGlobalRetoucheColor; class OutputDevice; -namespace vcl { - typedef OutputDevice RenderContext; -}; -void SwCalcPixStatics( vcl::RenderContext const *pOut ); +void SwCalcPixStatics( OutputDevice const *pOut ); #endif // INCLUDED_SW_SOURCE_CORE_INC_PAINTFRM_HXX diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 3d106bb195c4..006b33927a41 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -2076,7 +2076,7 @@ SwRootFrame *SwViewShell::GetLayout() const return mpLayout.get(); } -vcl::RenderContext& SwViewShell::GetRefDev() const +OutputDevice& SwViewShell::GetRefDev() const { OutputDevice* pTmpOut = nullptr; if ( GetWin() && diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index c42086edb0e8..0e7b6622a260 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -184,7 +184,7 @@ void GetWriter( const OUString& rFltName, const OUString& rBaseURL, WriterRef& x } } -Reader* GetReader( const OUString& rFltName ) +SwRead GetReader( const OUString& rFltName ) { SwRead pRead = nullptr; for( int n = 0; n < MAXFILTER; ++n ) diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index b0ba35346da4..a6fa398d9076 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -452,7 +452,7 @@ public: virtual sal_uInt32 GetIdx() const override; virtual void SetIdx(sal_uInt32 nI) override; virtual bool SeekPos(WW8_CP nCpPos) override; - virtual WW8_CP Where() override; + virtual WW8_FC Where() override; virtual void GetSprms( WW8PLCFxDesc* p ) override; virtual void advance() override; @@ -477,7 +477,7 @@ public: virtual sal_uInt32 GetIdx() const override; virtual void SetIdx(sal_uInt32 nI) override; virtual bool SeekPos(WW8_CP nCpPos) override; - virtual WW8_CP Where() override; + virtual WW8_FC Where() override; virtual long GetNoSprms( WW8_CP& rStart, WW8_CP&, sal_Int32& rLen ) override; virtual void advance() override; WW8_CP CurrentPieceStartFc2Cp( WW8_FC nStartPos ); @@ -680,7 +680,7 @@ public: virtual sal_uInt32 GetIdx() const override; virtual void SetIdx(sal_uInt32 nIdx) override; virtual bool SeekPos(WW8_CP nCpPos) override; - virtual WW8_CP Where() override; + virtual WW8_FC Where() override; virtual void GetSprms( WW8PLCFxDesc* p ) override; virtual void advance() override; SprmResult HasSprm( sal_uInt16 nId ) const; @@ -708,7 +708,7 @@ public: virtual sal_uInt32 GetIdx() const override; virtual void SetIdx(sal_uInt32 nIdx) override; virtual bool SeekPos(WW8_CP nCpPos) override; - virtual WW8_CP Where() override; + virtual WW8_FC Where() override; // returns reference descriptors const void* GetData() const @@ -736,7 +736,7 @@ public: virtual sal_uInt32 GetIdx() const override; virtual void SetIdx(sal_uInt32 nIdx) override; virtual bool SeekPos(WW8_CP nCpPos) override; - virtual WW8_CP Where() override; + virtual WW8_FC Where() override; virtual void GetSprms(WW8PLCFxDesc* p) override; virtual void advance() override; bool StartPosIsFieldStart(); @@ -769,7 +769,7 @@ public: virtual sal_uInt32 GetIdx2() const override; virtual void SetIdx2(sal_uInt32 nIdx) override; virtual bool SeekPos(WW8_CP nCpPos) override; - virtual WW8_CP Where() override; + virtual WW8_FC Where() override; virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) override; virtual void advance() override; const OUString* GetName() const; @@ -806,7 +806,7 @@ public: virtual sal_uInt32 GetIdx2() const override; virtual void SetIdx2(sal_uInt32 nIdx) override; virtual bool SeekPos(WW8_CP nCpPos) override; - virtual WW8_CP Where() override; + virtual WW8_FC Where() override; virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) override; virtual void advance() override; @@ -836,7 +836,7 @@ public: virtual sal_uInt32 GetIdx2() const override; virtual void SetIdx2(sal_uInt32 nIdx) override; virtual bool SeekPos(WW8_CP nCpPos) override; - virtual WW8_CP Where() override; + virtual WW8_FC Where() override; virtual long GetNoSprms(WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen) override; virtual void advance() override; -- cgit