sw/source/core/layout/paintfrm.cxx | 43 ------------------------------------- 1 file changed, 43 deletions(-)
New commits: commit be96114514c6824e563ea7e7aa5983b38be017d5 Author: Armin Le Grand <armin.le.gr...@cib.de> Date: Thu Dec 7 11:30:52 2017 +0100 SwFrameBorder: Clang fixes II Change-Id: Ic63d2dcaa05146b600b2c843895c9fac6e46db54 diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 09f2f4280758..d726b06d9310 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -1182,42 +1182,6 @@ void SwAlignRect( SwRect &rRect, const SwViewShell *pSh, const vcl::RenderContex } /** - * Helper for twip adjustments on pixel base - * - * This method compares the x- or y-pixel position of two twip-points. - * If the x-/y-pixel positions are the same, the x-/y-pixel position of - * the second twip point is adjusted by a given amount of pixels -*/ -static void lcl_CompPxPosAndAdjustPos( const vcl::RenderContext& _rOut, - const Point& _rRefPt, - Point& _rCompPt, - const bool _bChkXPos, - const sal_Int8 _nPxAdjustment ) -{ - const Point aRefPxPt = _rOut.LogicToPixel( _rRefPt ); - Point aCompPxPt = _rOut.LogicToPixel( _rCompPt ); - - if ( _bChkXPos ) - { - if ( aCompPxPt.X() == aRefPxPt.X() ) - { - aCompPxPt.X() += _nPxAdjustment ; - const Point aAdjustedCompPt = _rOut.PixelToLogic( aCompPxPt ); - _rCompPt.X() = aAdjustedCompPt.X(); - } - } - else - { - if ( aCompPxPt.Y() == aRefPxPt.Y() ) - { - aCompPxPt.Y() += _nPxAdjustment ; - const Point aAdjustedCompPt = _rOut.PixelToLogic( aCompPxPt ); - _rCompPt.Y() = aAdjustedCompPt.Y(); - } - } -} - -/** * Method to pixel-align rectangle for drawing graphic object * * Because we are drawing graphics from the left-top-corner in conjunction @@ -1263,13 +1227,6 @@ static long lcl_AlignHeight( const long nHeight, SwPaintProperties const & prope return nHeight; } -static long lcl_MinHeightDist( const long nDist, SwPaintProperties const & properties ) -{ - if ( properties.aSScaleX < aMinDistScale || properties.aSScaleY < aMinDistScale ) - return nDist; - return ::lcl_AlignHeight( std::max( nDist, properties.nSMinDistPixelH ), properties); -} - /** * Calculate PrtArea plus surrounding plus shadow */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits