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

[Stephan Bergmann]

 editeng/source/editeng/editeng.cxx |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit a622aaf28fbf01a4de44c9e5c2c85b46bf63697b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 9 10:05:00 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    ...uselessly introduced with 94cac4c58d234fa7f75a115351b6d4dc02edab69 "changed
    to new clipboard interface"
    
    Change-Id: I4e446c7e524f1c80fe82d699d8c16e5cfa59932c

diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 910b487..6da4272 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -270,13 +270,9 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P
     if ( bClip )
     {
         // Clip only if necessary...
-        if ( !rStartDocPos.X() && !rStartDocPos.Y() &&
-             ( rOutRect.GetHeight() >= (long)GetTextHeight() ) &&
-             ( rOutRect.GetWidth() >= (long)CalcTextWidth() ) )
-        {
-            bClip = false;
-        }
-        else
+        if ( rStartDocPos.X() || rStartDocPos.Y() ||
+             ( rOutRect.GetHeight() < (long)GetTextHeight() ) ||
+             ( rOutRect.GetWidth() < (long)CalcTextWidth() ) )
         {
             // Some printer drivers cause problems if characters graze the
             // ClipRegion, therefore rather add a pixel more ...