[Libreoffice-commits] core.git: vcl/unx

Stephan Bergmann sbergman at redhat.com
Fri Jan 26 19:00:33 UTC 2018


 vcl/unx/generic/window/salframe.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 63d4ab4bd709b66724c8cb78668fed71f8977098
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 26 15:25:40 2018 +0100

    Remove redundant(?) initialization of frame geometry
    
    The memset of maGeometry was added with 79e2c2577527578629d7bb719a88396645a4cc49
    "INTEGRATION: CWS vclplug" in 2003, before
    f7be39169fef0823e04f556cc9c9fdcda34d8685 "INTEGRATION: CWS presenterview" in
    2008 introduced a user-provided _SalFrameGeometry default ctor, which sets all
    members except nWidth and nHeight to 0, and sets nWidth and nHeight to 1.
    
    So the memset effectively set nWidth and nHeight to back 0 (whether or not that
    was by design or by accident after the latter commit), but that seems to be
    unnecessary after all, seeing that a SAL_USE_VCLPLUGIN=gen soffice appears to
    stll work well after removing the memset.
    
    Change-Id: Ic6d1c6476a1234e84dca1e560149cd1e9af37b73
    Reviewed-on: https://gerrit.libreoffice.org/48696
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 5833463f354a..89ea99b6a7f9 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -822,9 +822,6 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle,
 {
     GenericUnixSalData *pData = GetGenericUnixSalData();
 
-    // initialize frame geometry
-    memset( &maGeometry, 0, sizeof(maGeometry) );
-
     mpParent                    = static_cast< X11SalFrame* >( pParent );
 
     mbTransientForRoot          = false;


More information about the Libreoffice-commits mailing list