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

[Noel Grandin]

 vcl/source/window/layout.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit cacb75aa0bea36d4e5fc083a75a8b376133d3d65
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Jun 19 11:32:58 2017 +0200

    don't parse align and scale in VclAlignment
    
    allow it to pass up to superclasses for parsing, from discussion:
    
    <noel_grandin> caolan, is it intended that the VclAlignment x/y
    align/scale members are effectively unused?
    <caolan> noel_grandin: its based off the GtkAlignment so that's why it
    had them in the first place. Never got around to doing anything about
    scale so no surprise there and might as well remove those
    <noel_grandin> caolan, will do, thanks
    <caolan> I would have expected the xalign/yalign to do something, I
    think looking closer that we should be using those and probably that
    stub impl is blocking the underlying Window::set_property from using the
    supported left/right top/bottom values, so you can try remove those too,
    but I'd do it in a separate commit from the definitely useless scale
    ones
    <noel_grandin> caolan, at the moment, the change will remove them, but
    not the parsing of the values, so it should not change the functionality
    <noel_grandin> caolan, I'll do the removal of the parsing in a separate
    commit, which will pass them up to Window::set_property
    
    Change-Id: I5bb043a5c38d494355bf4766af8521838b7fc3f2
    Reviewed-on: https://gerrit.libreoffice.org/38957
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index c6a7615c4be5..4dab791301f4 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1656,14 +1656,6 @@ bool VclAlignment::set_property(const OString &rKey, const OUString &rValue)
         m_nRightPadding = rValue.toInt32();
     else if (rKey == "top-padding")
         m_nTopPadding = rValue.toInt32();
-    else if (rKey == "xalign")
-        ;
-    else if (rKey == "xscale")
-        ;
-    else if (rKey == "yalign")
-        ;
-    else if (rKey == "yscale")
-        ;
     else
         return VclBin::set_property(rKey, rValue);
     return true;