[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sc/source

[Attila Szűcs (via logerrit)]

 sc/source/ui/view/output2.cxx |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 75cafb3b64b3801c84e1c2b0a2b7b1b22b72469c
Author:     Attila Szűcs <szucs.attila3 at nisz.hu>
AuthorDate: Sat Aug 29 12:33:01 2020 +0200
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Wed Oct 14 21:42:00 2020 +0200

    tdf#47079 sc layout: fix visibility of Autofilter header
    
    Rotated Autofilter header is shifted under the arrow image, if
    there is not enough space for both of them. An exception if the
    header is a value, and rotated by 90 or 270 degrees, which resulted
    invisible or partially visible cell content in narrow cells. Remove
    this exception.
    
    Co-authored-by: Tibor Nagy (NISZ)
    
    Change-Id: Ide8f8ef84a270b9d7ec92da8d3c6ee00ab5ddc2b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101638
    Tested-by: László Németh <nemeth at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 0bdd533900584f384e2ee4d127fa252e339342c0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104306
    Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 41a9760cc450..940e08a07989 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1339,19 +1339,13 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
             // filter drop-down width is now independent from row height
             const long nFilter = DROPDOWN_BITMAP_SIZE;
             bool bFit = ( nNeeded + nFilter <= nMergeSizeX );
-            if ( bFit || bCellIsValue )
+            if ( bFit )
             {
                 // content fits even in the remaining area without the filter button
                 // -> align within that remaining area
 
                 rParam.maAlignRect.AdjustRight( -(nFilter * nLayoutSign) );
                 rParam.maClipRect.AdjustRight( -(nFilter * nLayoutSign) );
-
-                // if a number doesn't fit, don't hide part of the number behind the button
-                // -> set clip flags, so "###" replacement is used (but also within the smaller area)
-
-                if ( !bFit )
-                    rParam.mbLeftClip = rParam.mbRightClip = true;
             }
         }
     }