[Libreoffice-commits] core.git: include/tools vcl/source

Noel Grandin noel.grandin at collabora.co.uk
Mon Aug 21 13:33:48 UTC 2017


 include/tools/wintypes.hxx   |    2 --
 vcl/source/control/fixed.cxx |    8 --------
 2 files changed, 10 deletions(-)

New commits:
commit d56439981b82a1b1335d7a62e8066906ca62f767
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Aug 21 10:54:50 2017 +0200

    WB_FAST/WB_TOPLEFTVISIBLE are dead
    
    since
    
        commit 2235846149e89dd9fe83cd4fbaf32908983aa571
        Date:   Tue Nov 23 18:50:48 2010 +0100
        vcl117: reduce duplication of enums
    
    Change-Id: Ic34a09ae79c5226e4f07230ac8ec5f528210d988
    Reviewed-on: https://gerrit.libreoffice.org/41384
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 844f82d94e20..85fb52ace63a 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -209,9 +209,7 @@ WinBits const WB_IGNORETAB =            0x20000000;
 WinBits const WB_SIMPLEMODE =           0x20000000;
 
 // Window-Bits for FixedBitmap
-WinBits const WB_FAST =                 0x04000000;
 WinBits const WB_SCALE =                0x08000000;
-WinBits const WB_TOPLEFTVISIBLE =       0x10000000;
 
 // Window-Bits for ToolBox
 WinBits const WB_LINESPACING =          0x01000000;
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 23f06b7f03ca..13c69e2edb19 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -66,14 +66,6 @@ static Point ImplCalcPos( WinBits nStyle, const Point& rPos,
     else
         nY = (rWinSize.Height()-rObjSize.Height())/2;
 
-    if ( nStyle & WB_TOPLEFTVISIBLE )
-    {
-        if ( nX < 0 )
-            nX = 0;
-        if ( nY < 0 )
-            nY = 0;
-    }
-
     Point aPos( nX+rPos.X(), nY+rPos.Y() );
     return aPos;
 }


More information about the Libreoffice-commits mailing list