sc/source/ui/inc/output.hxx | 2 +- sc/source/ui/view/output2.cxx | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 95da9d4c8f320d865939ef2cea268ad1aac20a8e Author: Eike Rathke <er...@redhat.com> Date: Wed Nov 22 21:14:10 2017 +0100 Follow our naming conventions, tdf#39593 follow-up Change-Id: Iee95b5bf0dd42169447163a41be5b2aa1899e83c diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 7abff2e541e2..2237b7daa560 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -250,7 +250,7 @@ private: bool Clip( DrawEditParam& rParam, const Size& aCellSize, OutputAreaParam& aAreaParam, long nEngineHeight, bool bWrapFields); - bool AdjustAreaParamClipRect(OutputAreaParam& aAreaParam); + bool AdjustAreaParamClipRect(OutputAreaParam& rAreaParam); public: /** diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index a3a0348a3dd5..c6918b04640f 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2720,29 +2720,29 @@ void ScOutputData::DrawEditParam::adjustForHyperlinkInPDF(Point aURLStart, const } // Returns true if the rect is clipped vertically -bool ScOutputData::AdjustAreaParamClipRect(OutputAreaParam& aAreaParam) +bool ScOutputData::AdjustAreaParamClipRect(OutputAreaParam& rAreaParam) { - if( aAreaParam.maClipRect.Left() < nScrX ) + if( rAreaParam.maClipRect.Left() < nScrX ) { - aAreaParam.maClipRect.Left() = nScrX; - aAreaParam.mbLeftClip = true; + rAreaParam.maClipRect.Left() = nScrX; + rAreaParam.mbLeftClip = true; } - if( aAreaParam.maClipRect.Right() > nScrX + nScrW ) + if( rAreaParam.maClipRect.Right() > nScrX + nScrW ) { - aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one? - aAreaParam.mbRightClip = true; + rAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one? + rAreaParam.mbRightClip = true; } bool bVClip = false; - if( aAreaParam.maClipRect.Top() < nScrY ) + if( rAreaParam.maClipRect.Top() < nScrY ) { - aAreaParam.maClipRect.Top() = nScrY; + rAreaParam.maClipRect.Top() = nScrY; bVClip = true; } - if( aAreaParam.maClipRect.Bottom() > nScrY + nScrH ) + if( rAreaParam.maClipRect.Bottom() > nScrY + nScrH ) { - aAreaParam.maClipRect.Bottom() = nScrY + nScrH; //! minus one? + rAreaParam.maClipRect.Bottom() = nScrY + nScrH; //! minus one? bVClip = true; } return bVClip; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits