[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/ui/view/output2.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 45d6b9aa1986c5e68e7bf03d995bc1f8cd1bc817
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Nov 27 17:00:28 2017 +0100

    Address some nitpicks, tdf#39593 follow-up
    
    * clarify the comment in ClearableClipRegion dtor
    * invest some spaces for readability
    * indicate that "auto ClipRegion" is actually a (unique) pointer,
      so name it pClipRegion
    * also const auto
    
    Change-Id: Ia4d822df37a1a783c1b362e9c602567fde4bafa9

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 4ed15a2c2e00..3bb430f9883a 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2782,8 +2782,8 @@ public:
 
     ~ClearableClipRegion()
     {
-        //The Pop() or SetClipRegion() calls must only be in case mpDev is set
-        //mpDev is only set if in the constructor bClip was true
+        // Pop() or SetClipRegion() must only be called in case bClip was true
+        // in the ctor, and only then mpDev is set.
         if (mpDev)
         {
             if (mbMetaFile)
@@ -2793,7 +2793,7 @@ public:
         }
     }
 
-    const tools::Rectangle& getRect() const{return maRect;}
+    const tools::Rectangle& getRect() const { return maRect; }
 
 private:
     tools::Rectangle        maRect;
@@ -3413,7 +3413,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam)
     Point aURLStart;
 
     {
-        auto ClipRegion = Clip( rParam, aCellSize, aAreaParam, nEngineHeight, bWrapFields );
+        const auto pClipRegion = Clip( rParam, aCellSize, aAreaParam, nEngineHeight, bWrapFields );
 
         Point aLogicStart(nStartX, nStartY);
         rParam.calcStartPosForVertical(aLogicStart, aCellSize.Width(), nEngineWidth, nTopM, mpRefDevice);
@@ -3672,7 +3672,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam)
     Point aURLStart;
 
     {
-        const auto ClipRegion = Clip( rParam, aCellSize, aAreaParam, nEngineHeight, bWrapFields );
+        const auto pClipRegion = Clip( rParam, aCellSize, aAreaParam, nEngineHeight, bWrapFields );
 
         Point aLogicStart(nStartX, nStartY);
         rParam.calcStartPosForVertical(aLogicStart, aCellSize.Width(), nEngineWidth, nTopM, mpRefDevice);